Prepare V2.16.0

Author: harborsiem

CHANGELOG.md

@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+### Ribbon V2.16.0, RibbonTools V1.8.0
+
+#### Changed (Ribbon)
+
+- New functions for Gallery controls (InvalidateItemsSource() InvalidateCategories()).
+- Remove deprecated .NET7 assembly
+
+#### Changed (RibbonTools)
+
+- Unlimited Ribbons for an application via Settings (Wrapper class name like Markup file instead of RibbonItems), solves Issue#18.
+
 ### Ribbon V2.15.2, RibbonTools V1.7.2
 
 #### Changed (Ribbon)

HowToUse.md

@@ -24,7 +24,9 @@
     ![Schemas](./Images/Schemas.png)
 
     Insert Application Commands and Application Views as you can see in the samples and the documentation in the wiki.
-    **Hint**: If you have more than one Ribbon Control for different Forms in the project, then you should name the RibbonMarkup.xml to RibbonMarkup1.xml, RibbonMarkup2.xml, ... ,RibbonMarkup9.xml 
+
+    **Hint**: If you have more than one Ribbon Control for different Forms in the project, then you should name the RibbonMarkup.xml to RibbonMarkup1.xml, RibbonMarkup2.xml, ... ,RibbonMarkup9.xml
+	or with a new wrapper option (Version v2.16.0) you can generate wrapper class names like markup xml files (e.g. *First.xml* => *First.Designer.cs* with class name *First* instead RibbonItems.Designer.cs)
 
 7. Because CustomTools, like Bernhard Elbl said, do not work this way in newer Visual Studio versions like VS 2017 you have to
     open a Console Window in the folder of RibbonMarkup.xml (maybe we have a solution for a CustomTool later on). Or you can use the RibbonTools.exe to design, build and preview the markup file.
@@ -33,7 +35,7 @@
 
 9. If the build fails with a "No Tools" error, then check the installation of the Windows SDK and the C++ Tools in Visual Studio. If the installations are OK, start the RibbonTools from Windows Startmenu, go to Settings and search for the tools uicc.exe, rc.exe and link.exe and build again.
 
-12. Now you get some generated files, eg. RibbonMarkup.ribbon and RibbonItems.Designer.cs. Add these files to your project.
+12. Now you get some generated files, eg. RibbonMarkup.ribbon and RibbonItems.Designer.cs. Add these files to your project. (See hint in 6.)
 
 13. Set the Property Build Action of RibbonMarkup.ribbon to Embedded Resource.
 ![Embedded Resource](./Images/Embedded.png)
@@ -49,7 +51,7 @@
 ```
 
 to the Form1.cs. In the Constructor (Ctor) of the Forms1 after InitializeComponents() you have to call   RibbonItems ribbonItems = new RibbonItems(ribbon1);
-This is a wrapper class for all defined Ribbon Items. You can extend this class because it is a partial class.
+This is a wrapper class for all defined Ribbon Items. You can extend this class because it is a partial class. (See hint in 6.)
 
 16. Define the code behind for the Ribbon items in C# or VB language.
 

Ribbon/Controls/Properties/GalleryPropertiesProvider.cs

@@ -37,6 +37,16 @@ public interface IGalleryPropertiesProvider
         /// </summary>
         IUICollection ItemsSource { get; }
 
+        /// <summary>
+        /// Invalidate GalleryCategories or Categories if one change a value
+        /// </summary>
+        void InvalidateCategories();
+
+        /// <summary>
+        /// Invalidate GalleryItemItemsSource or ItemsSource if one change a value
+        /// </summary>
+        void InvalidateItemsSource();
+
         /// <summary>
         /// Selected item property
         /// </summary>
@@ -210,6 +220,28 @@ public IUICollection ItemsSource
             }
         }
 
+        /// <summary>
+        /// Invalidate GalleryCategories or Categories if one change a value
+        /// </summary>
+        public void InvalidateCategories()
+        {
+            if (_ribbon.Framework != null)
+            {
+                    _ribbon.Framework.InvalidateUICommand(_commandID, Invalidations.Property, PropertyKeyRef.From(RibbonProperties.Categories));
+            }
+        }
+
+        /// <summary>
+        /// Invalidate GalleryItemItemsSource or ItemsSource if one change a value
+        /// </summary>
+        public void InvalidateItemsSource()
+        {
+            if (_ribbon.Framework != null)
+            {
+                    _ribbon.Framework.InvalidateUICommand(_commandID, Invalidations.Property, PropertyKeyRef.From(RibbonProperties.ItemsSource));
+            }
+        }
+
         /// <summary>
         /// Selected item property
         /// </summary>

Ribbon/Controls/RibbonComboBox.cs

@@ -100,6 +100,22 @@ public IUICollection ItemsSource
             }
         }
 
+        /// <summary>
+        /// Invalidate GalleryCategories or Categories if one change a value
+        /// </summary>
+        public void InvalidateCategories()
+        {
+            _galleryPropertiesProvider.InvalidateCategories();
+        }
+
+        /// <summary>
+        /// Invalidate GalleryItemItemsSource or ItemsSource if one change a value
+        /// </summary>
+        public void InvalidateItemsSource()
+        {
+            _galleryPropertiesProvider.InvalidateItemsSource();
+        }
+
         /// <summary>
         /// The index of the selected item in the ComboBox.
         /// If nothing is selected returns UI_Collection_InvalidIndex,

Ribbon/Controls/RibbonDropDownGallery.cs

@@ -102,6 +102,22 @@ public IUICollection ItemsSource
             }
         }
 
+        /// <summary>
+        /// Invalidate GalleryCategories or Categories if one change a value
+        /// </summary>
+        public void InvalidateCategories()
+        {
+            _galleryPropertiesProvider.InvalidateCategories();
+        }
+
+        /// <summary>
+        /// Invalidate GalleryItemItemsSource or ItemsSource if one change a value
+        /// </summary>
+        public void InvalidateItemsSource()
+        {
+            _galleryPropertiesProvider.InvalidateItemsSource();
+        }
+
         /// <summary>
         /// The index of the selected item in the DropDownGallery.
         /// If nothing is selected returns UI_Collection_InvalidIndex,

Ribbon/Controls/RibbonInRibbonGallery.cs

@@ -102,6 +102,22 @@ public IUICollection ItemsSource
             }
         }
 
+        /// <summary>
+        /// Invalidate GalleryCategories or Categories if one change a value
+        /// </summary>
+        public void InvalidateCategories()
+        {
+            _galleryPropertiesProvider.InvalidateCategories();
+        }
+
+        /// <summary>
+        /// Invalidate GalleryItemItemsSource or ItemsSource if one change a value
+        /// </summary>
+        public void InvalidateItemsSource()
+        {
+            _galleryPropertiesProvider.InvalidateItemsSource();
+        }
+
         /// <summary>
         /// The index of the selected item in the InRibbonGallery.
         /// If nothing is selected returns UI_Collection_InvalidIndex,

Ribbon/Controls/RibbonSplitButtonGallery.cs

@@ -124,6 +124,22 @@ public IUICollection ItemsSource
             }
         }
 
+        /// <summary>
+        /// Invalidate GalleryCategories or Categories if one change a value
+        /// </summary>
+        public void InvalidateCategories()
+        {
+            _galleryPropertiesProvider.InvalidateCategories();
+        }
+
+        /// <summary>
+        /// Invalidate GalleryItemItemsSource or ItemsSource if one change a value
+        /// </summary>
+        public void InvalidateItemsSource()
+        {
+            _galleryPropertiesProvider.InvalidateItemsSource();
+        }
+
         /// <summary>
         /// The index of the selected item in the SplitButtonGallery.
         /// If nothing is selected returns UI_Collection_InvalidIndex,

Ribbon/Properties/AssemblyInfo.cs

@@ -37,5 +37,5 @@
 #else
 [assembly: AssemblyVersion("1.0.0.0")]
 #endif
-[assembly: AssemblyFileVersion("2.15.2.0")]
+[assembly: AssemblyFileVersion("2.16.0.0")]
 

Ribbon/RibbonCore.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net8.0-windows;net7.0-windows;net6.0-windows;net40</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows;net6.0-windows;net40</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon />
@@ -20,7 +20,7 @@
 
     <PackageId>WindowsRibbon</PackageId>
     <Product>Windows Ribbon Control</Product>
-    <Version>2.15.2</Version>
+    <Version>2.16.0</Version>
     <Authors>Hartmut Borkenhagen</Authors>
     <Company>RibbonLib</Company>
     <PackageIcon>Ribbon64.png</PackageIcon>

RibbonTools/Build/AbstractCodeBuilder.cs

@@ -41,25 +41,31 @@ protected AbstractCodeBuilder() { }
         /// Method builds a C# file RibbonItems.Designer.cs
         /// </summary>
         /// <param name="path">RibbonMarkup.xml with path</param>
-        public void Execute(string path, RibbonParser parser)
+        public void Execute(string path, RibbonParser parser, bool advWrapperClassFile)
         {
             //string @namespace = System.Reflection.Assembly.GetEntryAssembly().EntryPoint.DeclaringType.Namespace;
             if (File.Exists(path))
             {
                 string directory = Path.GetDirectoryName(path);
 
-                string xmlFileName = Path.GetFileNameWithoutExtension(path);
-                char last = xmlFileName[xmlFileName.Length - 1];
-                if (Char.IsNumber(last))
+                if (advWrapperClassFile)
                 {
-                    ribbonItemsClass = RibbonItems + last.ToString();
+                    ribbonItemsClass = Path.GetFileNameWithoutExtension(path);
                 }
                 else
                 {
-                    ribbonItemsClass = RibbonItems;
+                    string xmlFileName = Path.GetFileNameWithoutExtension(path);
+                    char last = xmlFileName[xmlFileName.Length - 1];
+                    if (Char.IsNumber(last))
+                    {
+                        ribbonItemsClass = RibbonItems + last.ToString();
+                    }
+                    else
+                    {
+                        ribbonItemsClass = RibbonItems;
+                    }
                 }
 
-
                 RibbonParser.ParseResult results = parser.Results;
 #if OldCode
                 pair1List = (results.Pair1List);