- Reapply changes for #120

- Project wide "Comment out" #748
Krypton-Suite · Jun 12, 2022 · 8b0104e · 8b0104e
1 parent e81ed2f
commit 8b0104e
Show file tree

Hide file tree

Showing 25 changed files with 155 additions and 155 deletions.
diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
@@ -7,6 +7,7 @@
 ## 2022-11-xx - Build 2211 - November 2022 <!--Possible August or September release?-->
 * Implemented [#728](https://github.com/Krypton-Suite/Standard-Toolkit/issues/728), Bring MessageBox `States` inline with latest .Net 6 
 * Made enumeration `SchemeOfficeColors` public, so they can be used to make external themes
+* Resolved [#748](https://github.com/Krypton-Suite/Standard-Toolkit/issues/748), Navigator text is removed via designer changes for Navigator tabs
 * Resolved [#688](https://github.com/Krypton-Suite/Standard-Toolkit/issues/688), KryptonComboBox / KryptonNumericUpDown / KryptonDomainUpDown Anchor Sizing no as expected when anchored Top & Bottom
 * Resolved [#722](https://github.com/Krypton-Suite/Standard-Toolkit/issues/722), KryptonRichTextBox disabled colour cannot be set
 * Resolved [#662](https://github.com/Krypton-Suite/Standard-Toolkit/issues/662), Can not "Control / Set Disabled" Background Colour Of Comboboxes, in DropDown mode

diff --git a/Source/Krypton Components/Krypton.Navigator/ButtonSpecs/ButtonSpecNavFixed.cs b/Source/Krypton Components/Krypton.Navigator/ButtonSpecs/ButtonSpecNavFixed.cs
@@ -74,7 +74,7 @@ protected ButtonSpecNavFixed(KryptonNavigator navigator,
         [Category(@"Behavior")]
         [Description(@"Defines header location for the button.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(HeaderLocation), "PrimaryHeader")]
+        //[DefaultValue(typeof(HeaderLocation), "PrimaryHeader")]
         public HeaderLocation HeaderLocation
         {
             get => _location;

diff --git a/Source/Krypton Components/Krypton.Navigator/ButtonSpecs/ButtonSpecNavigator.cs b/Source/Krypton Components/Krypton.Navigator/ButtonSpecs/ButtonSpecNavigator.cs
@@ -47,7 +47,7 @@ public class ButtonSpecNavigator : ButtonSpecHeaderGroup
         [Category(@"Behavior")]
         [Description(@"Defines a restricted type for a navigator button spec.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(PaletteNavButtonSpecStyle), "Generic")]
+        //[DefaultValue(typeof(PaletteNavButtonSpecStyle), "Generic")]
         public PaletteNavButtonSpecStyle TypeRestricted
         {
             get => PaletteTypeToNavigator(ProtectedType);

diff --git a/Source/Krypton Components/Krypton.Navigator/Controls Navigator/KryptonNavigator.cs b/Source/Krypton Components/Krypton.Navigator/Controls Navigator/KryptonNavigator.cs
@@ -673,7 +673,7 @@ public KryptonPage SelectedPage
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Display mode of the control instance.")]
-        [DefaultValue(typeof(NavigatorMode), "Bar - Tab - Group")]
+        //[DefaultValue(typeof(NavigatorMode), "Bar - Tab - Group")]
         public NavigatorMode NavigatorMode
         {
             get => _mode;
@@ -717,7 +717,7 @@ public void ResetNavigatorMode()
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Page back style.")]
-        [DefaultValue(typeof(PaletteBackStyle), "ControlClient")]
+        //[DefaultValue(typeof(PaletteBackStyle), "ControlClient")]
         public PaletteBackStyle PageBackStyle
         {
             get => _pageBackStyle;

diff --git a/Source/Krypton Components/Krypton.Navigator/Krypton.Navigator 2022.csproj b/Source/Krypton Components/Krypton.Navigator/Krypton.Navigator 2022.csproj
@@ -40,7 +40,7 @@
 		<Configurations>Debug;Release;Preview;Installer;Nightly;Canary;Signed</Configurations>
 	</PropertyGroup>
 
-    <!--<Choose>
+	<!--<Choose>
         <When Condition="'$(Configuration)' == 'Release'">
             <PropertyGroup>
                 ~1~<LangVersion>latest</LangVersion>
@@ -73,19 +73,22 @@
 			<SpecificVersion>True</SpecificVersion>
 			<Version>5.0.0.0</Version>
 		</Reference>
-		<Reference Include="System.Design, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="$(TargetFramework.StartsWith('net6'))">
-			<SpecificVersion>True</SpecificVersion>
-			<Version>6.0.0.0</Version>
+
+		<Reference Include="System.Design, Version=6.0.*, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="$(TargetFramework.StartsWith('net6'))">
+			<!--<SpecificVersion>True</SpecificVersion>-->
+			<Version>6.0.*</Version>
 		</Reference>
+
 		<Reference Include="System.Drawing.Design, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="$(TargetFramework.StartsWith('net5'))">
-			<!-- Needed for `ParentControlDesigner` as this was moved from `System.Design`-->
+			<!--Needed for `ParentControlDesigner` as this was moved from `System.Design`-->
 			<SpecificVersion>True</SpecificVersion>
 			<Version>5.0.0.0</Version>
 		</Reference>
-		<Reference Include="System.Drawing.Design, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="$(TargetFramework.StartsWith('net6'))">
-			<!-- Needed for `ParentControlDesigner` as this was moved from `System.Design`-->
-			<SpecificVersion>True</SpecificVersion>
-			<Version>6.0.0.0</Version>
+
+		<Reference Include="System.Drawing.Design, Version=6.0.*, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="$(TargetFramework.StartsWith('net6'))">
+			<!--Needed for `ParentControlDesigner` as this was moved from `System.Design`-->
+			<!--<SpecificVersion>True</SpecificVersion>-->
+			<Version>6.0.*</Version>
 		</Reference>
 	</ItemGroup>
 

diff --git a/Source/Krypton Components/Krypton.Navigator/Page/KryptonPage.cs b/Source/Krypton Components/Krypton.Navigator/Page/KryptonPage.cs
@@ -696,7 +696,7 @@ public virtual string ToolTipBody
         /// </summary>
         [Category(@"Appearance")]
         [Description(@"Page tooltip label style.")]
-        [DefaultValue(typeof(LabelStyle), "ToolTip")]
+        //[DefaultValue(typeof(LabelStyle), "ToolTip")]
         public virtual LabelStyle ToolTipStyle
         {
             get => _toolTipStyle;

diff --git a/Source/Krypton Components/Krypton.Navigator/Palette/HeaderGroupMappingPrimary.cs b/Source/Krypton Components/Krypton.Navigator/Palette/HeaderGroupMappingPrimary.cs
@@ -72,7 +72,7 @@ public HeaderGroupMappingPrimary(KryptonNavigator navigator,
         /// <summary>
         /// Gets and sets the mapping used for the Image property.
         /// </summary>
-        [DefaultValue(typeof(MapKryptonPageImage), "Small - Medium")]
+        //[DefaultValue(typeof(MapKryptonPageImage), "Small - Medium")]
         public override MapKryptonPageImage MapImage
         {
             get => base.MapImage;
@@ -84,7 +84,7 @@ public override MapKryptonPageImage MapImage
         /// <summary>
         /// Gets and sets the mapping used for the Heading property.
         /// </summary>
-        [DefaultValue(typeof(MapKryptonPageText), "Title - Text")]
+        //[DefaultValue(typeof(MapKryptonPageText), "Title - Text")]
         public override MapKryptonPageText MapHeading
         {
             get => base.MapHeading;
@@ -96,7 +96,7 @@ public override MapKryptonPageText MapHeading
         /// <summary>
         /// Gets and sets the mapping used for the Description property.
         /// </summary>
-        [DefaultValue(typeof(MapKryptonPageText), "None (Empty string)")]
+        //[DefaultValue(typeof(MapKryptonPageText), "None (Empty string)")]
         public override MapKryptonPageText MapDescription
         {
             get => base.MapDescription;

diff --git a/Source/Krypton Components/Krypton.Navigator/Palette/HeaderGroupMappingSecondary.cs b/Source/Krypton Components/Krypton.Navigator/Palette/HeaderGroupMappingSecondary.cs
@@ -78,7 +78,7 @@ public HeaderGroupMappingSecondary(KryptonNavigator navigator,
         /// <summary>
         /// Gets and sets the mapping used for the Image property.
         /// </summary>
-        [DefaultValue(typeof(MapKryptonPageImage), "None (Null image)")]
+        //[DefaultValue(typeof(MapKryptonPageImage), "None (Null image)")]
         public override MapKryptonPageImage MapImage
         {
             get => base.MapImage;
@@ -90,7 +90,7 @@ public override MapKryptonPageImage MapImage
         /// <summary>
         /// Gets and sets the mapping used for the Heading property.
         /// </summary>
-        [DefaultValue(typeof(MapKryptonPageText), "Description")]
+        //[DefaultValue(typeof(MapKryptonPageText), "Description")]
         public override MapKryptonPageText MapHeading
         {
             get => base.MapHeading;
@@ -102,7 +102,7 @@ public override MapKryptonPageText MapHeading
         /// <summary>
         /// Gets and sets the mapping used for the Description property.
         /// </summary>
-        [DefaultValue(typeof(MapKryptonPageText), "None (Empty string)")]
+        //[DefaultValue(typeof(MapKryptonPageText), "None (Empty string)")]
         public override MapKryptonPageText MapDescription
         {
             get => base.MapDescription;

diff --git a/Source/Krypton Components/Krypton.Navigator/Palette/NavigatorBar.cs b/Source/Krypton Components/Krypton.Navigator/Palette/NavigatorBar.cs
@@ -148,7 +148,7 @@ public void ResetBarAnimation()
         [Category(@"Visuals")]
         [Description(@"Orientation for positioning of the bar.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(VisualOrientation), "Top")]
+        //[DefaultValue(typeof(VisualOrientation), "Top")]
         public VisualOrientation BarOrientation
         {
             get => _barOrientation;
@@ -272,7 +272,7 @@ public void ResetBarMinimumHeight()
         [Category(@"Visuals")]
         [Description(@"Multiline items in the bar.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(BarMultiline), "Singleline")]
+        //[DefaultValue(typeof(BarMultiline), "Singleline")]
         public BarMultiline BarMultiline
         {
             get => _barMultiline;
@@ -302,7 +302,7 @@ public void ResetBarMultiline()
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Check button style.")]
-        [DefaultValue(typeof(ButtonStyle), "Standalone")]
+        //[DefaultValue(typeof(ButtonStyle), "Standalone")]
         public ButtonStyle CheckButtonStyle
         {
             get => _checkButtonStyle;
@@ -324,7 +324,7 @@ public ButtonStyle CheckButtonStyle
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Tab style.")]
-        [DefaultValue(typeof(TabStyle), "HighProfile")]
+        //[DefaultValue(typeof(TabStyle), "HighProfile")]
         public TabStyle TabStyle
         {
             get => _tabStyle;
@@ -346,7 +346,7 @@ public TabStyle TabStyle
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Tab border style.")]
-        [DefaultValue(typeof(TabBorderStyle), "RoundedOutsizeMedium")]
+        //[DefaultValue(typeof(TabBorderStyle), "RoundedOutsizeMedium")]
         public TabBorderStyle TabBorderStyle
         {
             get => _tabBorderStyle;
@@ -369,7 +369,7 @@ public TabBorderStyle TabBorderStyle
         [Category(@"Visuals")]
         [Description(@"Alignment of items within the bar.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(RelativePositionAlign), "Near")]
+        //[DefaultValue(typeof(RelativePositionAlign), "Near")]
         public RelativePositionAlign ItemAlignment
         {
             get => _itemAlignment;
@@ -400,7 +400,7 @@ public void ResetItemAlignment()
         [Category(@"Visuals")]
         [Description(@"Minimum size of each bar item.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(Size), "20,20")]
+        //[DefaultValue(typeof(Size), "20,20")]
         public Size ItemMinimumSize
         {
             get => _itemMinimumSize;
@@ -451,7 +451,7 @@ public void ResetItemMinimumSize()
         [Category(@"Visuals")]
         [Description(@"Minimum size of each bar item.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(Size), "200,200")]
+        //[DefaultValue(typeof(Size), "200,200")]
         public Size ItemMaximumSize
         {
             get => _itemMaximumSize;
@@ -502,7 +502,7 @@ public void ResetItemMaximumSize()
         [Category(@"Visuals")]
         [Description(@"Orientation for positioning items on the bar.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(ButtonOrientation), "Auto")]
+        //[DefaultValue(typeof(ButtonOrientation), "Auto")]
         public ButtonOrientation ItemOrientation
         {
             get => _itemOrientation;
@@ -533,7 +533,7 @@ public void ResetItemOrientation()
         [Category(@"Visuals")]
         [Description(@"How to calculate the size of each bar item.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(BarItemSizing), "All Same Height")]
+        //[DefaultValue(typeof(BarItemSizing), "All Same Height")]
         public BarItemSizing ItemSizing
         {
             get => _itemSizing;
@@ -565,7 +565,7 @@ public void ResetItemSizing()
         [Category(@"Visuals")]
         [Description(@"Mapping used for the bar item image.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(MapKryptonPageImage), "Small")]
+        //[DefaultValue(typeof(MapKryptonPageImage), "Small")]
         public virtual MapKryptonPageImage BarMapImage
         {
             get => _barMapImage;
@@ -596,7 +596,7 @@ public void ResetBarMapImage()
         [Category(@"Visuals")]
         [Description(@"Mapping used for the bar item text.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(MapKryptonPageText), "Text - Title")]
+        //[DefaultValue(typeof(MapKryptonPageText), "Text - Title")]
         public MapKryptonPageText BarMapText
         {
             get => _barMapText;
@@ -627,7 +627,7 @@ public void ResetBarMapText()
         [Category(@"Visuals")]
         [Description(@"Mapping used for the bar item description.")]
         [RefreshProperties(RefreshProperties.All)]
-        [DefaultValue(typeof(MapKryptonPageText), "None (Empty string)")]
+        //[DefaultValue(typeof(MapKryptonPageText), "None (Empty string)")]
         public MapKryptonPageText BarMapExtraText
         {
             get => _barMapExtraText;

diff --git a/Source/Krypton Components/Krypton.Navigator/Palette/NavigatorButton.cs b/Source/Krypton Components/Krypton.Navigator/Palette/NavigatorButton.cs
@@ -149,7 +149,7 @@ public NavigatorButton(KryptonNavigator navigator,
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Action to take when the previous button is clicked.")]
-        [DefaultValue(typeof(DirectionButtonAction), "Mode Appropriate Action")]
+        //[DefaultValue(typeof(DirectionButtonAction), "Mode Appropriate Action")]
         public DirectionButtonAction PreviousButtonAction
         {
             get => _actionPrevious;
@@ -171,7 +171,7 @@ public DirectionButtonAction PreviousButtonAction
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Logic used to decide if previous button is Displayed.")]
-        [DefaultValue(typeof(ButtonDisplay), "Logic")]
+        //[DefaultValue(typeof(ButtonDisplay), "Logic")]
         public ButtonDisplay PreviousButtonDisplay
         {
             get => _displayPrevious;
@@ -194,7 +194,7 @@ public ButtonDisplay PreviousButtonDisplay
         [Localizable(true)]
         [Category(@"Visuals")]
         [Description(@"Shortcut for invoking the previous action.")]
-        [DefaultValue(typeof(Keys), "F6, Shift, Control")]
+        //[DefaultValue(typeof(Keys), "F6, Shift, Control")]
         public Keys PreviousButtonShortcut { get; set; }
 
         private bool ShouldSerializePreviousButtonShortcut() => (PreviousButtonShortcut != DEFAULT_SHORTCUT_PREVIOUS);
@@ -227,7 +227,7 @@ public void ResetPreviousButtonShortcut()
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Action to take when the next button is clicked.")]
-        [DefaultValue(typeof(DirectionButtonAction), "Mode Appropriate Action")]
+        //[DefaultValue(typeof(DirectionButtonAction), "Mode Appropriate Action")]
         public DirectionButtonAction NextButtonAction
         {
             get => _actionNext;
@@ -249,7 +249,7 @@ public DirectionButtonAction NextButtonAction
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Logic used to decide if next button is Displayed.")]
-        [DefaultValue(typeof(ButtonDisplay), "Logic")]
+        //[DefaultValue(typeof(ButtonDisplay), "Logic")]
         public ButtonDisplay NextButtonDisplay
         {
             get => _displayNext;
@@ -272,7 +272,7 @@ public ButtonDisplay NextButtonDisplay
         [Localizable(true)]
         [Category(@"Visuals")]
         [Description(@"Shortcut for invoking the next action.")]
-        [DefaultValue(typeof(Keys), "F6, Control")]
+        //[DefaultValue(typeof(Keys), "F6, Control")]
         public Keys NextButtonShortcut { get; set; }
 
         private bool ShouldSerializeNextButtonShortcut() => (NextButtonShortcut != DEFAULT_SHORTCUT_NEXT);
@@ -305,7 +305,7 @@ public void ResetNextButtonShortcut()
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Action to take when the context button is clicked.")]
-        [DefaultValue(typeof(ContextButtonAction), "Select Page")]
+        //[DefaultValue(typeof(ContextButtonAction), "Select Page")]
         public ContextButtonAction ContextButtonAction
         {
             get => _actionContext;
@@ -327,7 +327,7 @@ public ContextButtonAction ContextButtonAction
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Logic used to decide if context button is Displayed.")]
-        [DefaultValue(typeof(ButtonDisplay), "Logic")]
+        //[DefaultValue(typeof(ButtonDisplay), "Logic")]
         public ButtonDisplay ContextButtonDisplay
         {
             get => _displayContext;
@@ -350,7 +350,7 @@ public ButtonDisplay ContextButtonDisplay
         [Localizable(true)]
         [Category(@"Visuals")]
         [Description(@"Shortcut for invoking the context action.")]
-        [DefaultValue(typeof(Keys), "Down, Alt, Control")]
+        //[DefaultValue(typeof(Keys), "Down, Alt, Control")]
         public Keys ContextButtonShortcut { get; set; }
 
         private bool ShouldSerializeContextButtonShortcut() => (ContextButtonShortcut != DEFAULT_SHORTCUT_CONTEXT);
@@ -370,7 +370,7 @@ public void ResetContextButtonShortcut()
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Mapping used to generate context menu item image.")]
-        [DefaultValue(typeof(MapKryptonPageText), "Text - Title")]
+        //[DefaultValue(typeof(MapKryptonPageText), "Text - Title")]
         public MapKryptonPageText ContextMenuMapText { get; set; }
 
         #endregion
@@ -381,7 +381,7 @@ public void ResetContextButtonShortcut()
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Mapping used to generate context menu item text.")]
-        [DefaultValue(typeof(MapKryptonPageImage), "Small")]
+        //[DefaultValue(typeof(MapKryptonPageImage), "Small")]
         public MapKryptonPageImage ContextMenuMapImage { get; set; }
 
         #endregion
@@ -405,7 +405,7 @@ public void ResetContextButtonShortcut()
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Action to take when the close button is clicked.")]
-        [DefaultValue(typeof(CloseButtonAction), "RemovePage & Dispose")]
+        //[DefaultValue(typeof(CloseButtonAction), "RemovePage & Dispose")]
         public CloseButtonAction CloseButtonAction
         {
             get => _actionClosed;
@@ -427,7 +427,7 @@ public CloseButtonAction CloseButtonAction
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Logic used to decide if close button is Displayed.")]
-        [DefaultValue(typeof(ButtonDisplay), "Logic")]
+        //[DefaultValue(typeof(ButtonDisplay), "Logic")]
         public ButtonDisplay CloseButtonDisplay
         {
             get => _displayClosed;
@@ -450,7 +450,7 @@ public ButtonDisplay CloseButtonDisplay
         [Localizable(true)]
         [Category(@"Visuals")]
         [Description(@"Shortcut for invoking the close action.")]
-        [DefaultValue(typeof(Keys), "F4, Control")]
+        //[DefaultValue(typeof(Keys), "F4, Control")]
         public Keys CloseButtonShortcut { get; set; }
 
         private bool ShouldSerializeCloseButtonShortcut() => (CloseButtonShortcut != DEFAULT_SHORTCUT_CLOSE);
@@ -470,7 +470,7 @@ public void ResetCloseButtonShortcut()
         /// </summary>
         [Category(@"Visuals")]
         [Description(@"Define the logic used to control button display.")]
-        [DefaultValue(typeof(ButtonDisplayLogic), "Context")]
+        //[DefaultValue(typeof(ButtonDisplayLogic), "Context")]
         public ButtonDisplayLogic ButtonDisplayLogic
         {
             get => _displayLogic;