disabled > hidden

weissm · Dec 5, 2023 · 940866e · 940866e
1 parent 5dea48f
commit 940866e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/OneMore/Commands/Settings/ColorizerSheet.cs b/OneMore/Commands/Settings/ColorizerSheet.cs
@@ -15,6 +15,9 @@ namespace River.OneMoreAddIn.Settings
 
 	internal partial class ColorizerSheet : SheetBase
 	{
+		public const string HiddenKey = "hidden";
+
+
 		public ColorizerSheet(SettingsProvider provider) : base(provider)
 		{
 			InitializeComponent();
@@ -68,13 +71,13 @@ public ColorizerSheet(SettingsProvider provider) : base(provider)
 			size = settings.Get("size2", StyleBase.DefaultCodeSize);
 			size2Box.SelectedIndex = size2Box.Items.IndexOf(size.ToString());
 
-			LoadLanguages(settings.Get("disabled", new XElement("disabled")));
+			LoadLanguages(settings.Get(HiddenKey, new XElement(HiddenKey)));
 
 			applyBox.Focus();
 		}
 
 
-		private void LoadLanguages(XElement disabled)
+		private void LoadLanguages(XElement hidden)
 		{
 			var languages = Colorizer.Colorizer.LoadLanguageNames();
 			var images = new ImageList();
@@ -85,7 +88,7 @@ private void LoadLanguages(XElement disabled)
 
 				var item = new ListViewItem(name, images.Images.Count - 1)
 				{
-					Checked = disabled.Element(tag) == null,
+					Checked = hidden.Element(tag) == null,
 					Tag = tag
 				};
 
@@ -163,8 +166,8 @@ public override bool CollectSettings()
 			}
 
 			var updated = false;
-			var oldset = settings.Get("disabled", new XElement("disabled"));
-			var newset = new XElement("disabled");
+			var oldset = settings.Get(HiddenKey, new XElement(HiddenKey));
+			var newset = new XElement(HiddenKey);
 
 			for (var i = 0; i < langView.Items.Count; i++)
 			{
@@ -187,11 +190,11 @@ public override bool CollectSettings()
 
 			if (newset.Elements().Any())
 			{
-				settings.Add("disabled", newset);
+				settings.Add(HiddenKey, newset);
 			}
 			else
 			{
-				settings.Remove("disabled");
+				settings.Remove(HiddenKey);
 			}
 
 			updated |= oldset.Elements().Any();

diff --git a/OneMore/Ribbon/AddinRibbon.cs b/OneMore/Ribbon/AddinRibbon.cs
@@ -127,14 +127,15 @@ private void AddColorizerCommands(XElement root, SettingsCollection settings)
 					return;
 				}
 
-				var disabled = settings.Get("disabled", new XElement("disabled"));
+				var hidden = settings.Get(
+					ColorizerSheet.HiddenKey, new XElement(ColorizerSheet.HiddenKey));
 
 				var languages = Colorizer.Colorizer.LoadLanguageNames();
 				foreach (var name in languages.Keys)
 				{
 					var tag = languages[name];
 
-					if (disabled.Element(tag) == null)
+					if (hidden.Element(tag) == null)
 					{
 						menu.Add(new XElement(ns + "button",
 							new XAttribute("id", $"ribColorize{tag}Button"),