use PALETTE_MODE_STRING directly to set up palette combobox to avoid …

…duplicate definitions
bbbradsmith · Oct 15, 2024 · eca689a · eca689a
1 parent f399587
commit eca689a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/BinxelviewForm.Designer.cs b/BinxelviewForm.Designer.cs
diff --git a/BinxelviewForm.cs b/BinxelviewForm.cs
@@ -32,7 +32,7 @@ enum PaletteMode
             PALETTE_GREY,
             PALETTE_CUBEHELIX,
         };
-        static readonly string[] PaletteModeString =
+        static readonly string[] PALETTE_MODE_STRING =
         {
             "Custom",
             "RGB",
@@ -437,9 +437,9 @@ string parseOption(string optline, string base_path, bool ini_file)
             }
             if (opt == "AUTOPAL")
             {
-                for (int i=1; i<PaletteModeString.Length; ++i)
+                for (int i=1; i<PALETTE_MODE_STRING.Length; ++i)
                 {
-                    if (valu == PaletteModeString[i].ToUpperInvariant())
+                    if (valu == PALETTE_MODE_STRING[i].ToUpperInvariant())
                     {
                         palette_mode = (PaletteMode)i;
                         return "";
@@ -590,7 +590,7 @@ string saveIni(string path)
                     }
                     else if (palette_mode != PaletteMode.PALETTE_CUSTOM)
                     {
-                        sw.WriteLine("autopal=" + PaletteModeString[(int)palette_mode]);
+                        sw.WriteLine("autopal=" + PALETTE_MODE_STRING[(int)palette_mode]);
                     }
                     sw.WriteLine(string.Format("background={0:X6}",background_raw & 0x00FFFFFF));
                     sw.WriteLine(string.Format("zoom={0}",zoom));
@@ -2727,6 +2727,7 @@ private void BinxelviewForm_Load(object sender, EventArgs e)
             split_view_form = new ViewForm(this,pixelBox.ContextMenuStrip);
             posfont_regular = new Font(numericPosByte.Font, FontStyle.Regular);
             posfont_bold = new Font(numericPosByte.Font, FontStyle.Bold);
+            comboBoxPalette.Items.AddRange(PALETTE_MODE_STRING);
             comboBoxPalette.SelectedIndex = (int)PaletteMode.PALETTE_RGB - 1;
             numericZoom.Minimum = 1;
             numericZoom.Maximum = ZOOM_MAX;