diff --git a/BinxelviewForm.Designer.cs b/BinxelviewForm.Designer.cs index 9c8465f..104b1f3 100644 --- a/BinxelviewForm.Designer.cs +++ b/BinxelviewForm.Designer.cs @@ -905,12 +905,6 @@ private void InitializeComponent() this.comboBoxPalette.FormattingEnabled = true; this.comboBoxPalette.ImeMode = System.Windows.Forms.ImeMode.Off; this.comboBoxPalette.ItemHeight = 13; - this.comboBoxPalette.Items.AddRange(new object[] { - "Custom", - "RGB", - "Random", - "Greyscale", - "Cubehelix"}); this.comboBoxPalette.Location = new System.Drawing.Point(193, 58); this.comboBoxPalette.Name = "comboBoxPalette"; this.comboBoxPalette.Size = new System.Drawing.Size(83, 21); diff --git a/BinxelviewForm.cs b/BinxelviewForm.cs index 7ebd574..03e0a90 100644 --- 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