From e485882aedbde7de93f5abc95d6c7e8ace965f12 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Wed, 11 Mar 2015 04:00:01 +0000
Subject: [PATCH] add some remarks in the GUI about QuickNES palette being the
 default

---
 .../config/NES/NESGraphicsConfig.Designer.cs  | 30 +++++++++++++------
 .../config/NES/QuickNesConfig.Designer.cs     |  4 +--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs
index 2e886f6ebd..06175fc714 100644
--- a/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.Designer.cs
@@ -32,6 +32,7 @@
 			this.Cancel = new System.Windows.Forms.Button();
 			this.AllowMoreSprites = new System.Windows.Forms.CheckBox();
 			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.pictureBoxPalette = new System.Windows.Forms.PictureBox();
 			this.AutoLoadPalette = new System.Windows.Forms.CheckBox();
 			this.label1 = new System.Windows.Forms.Label();
 			this.PalettePath = new System.Windows.Forms.TextBox();
@@ -59,8 +60,9 @@
 			this.DispSprites = new System.Windows.Forms.CheckBox();
 			this.BGColorDialog = new System.Windows.Forms.ColorDialog();
 			this.RestoreDefaultsButton = new System.Windows.Forms.Button();
-			this.pictureBoxPalette = new System.Windows.Forms.PictureBox();
+			this.label7 = new System.Windows.Forms.Label();
 			this.groupBox1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBoxPalette)).BeginInit();
 			this.groupBox2.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.PAL_LastLineNumeric)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.PAL_FirstLineNumeric)).BeginInit();
@@ -68,7 +70,6 @@
 			((System.ComponentModel.ISupportInitialize)(this.NTSC_FirstLineNumeric)).BeginInit();
 			this.groupBox3.SuspendLayout();
 			this.groupBox4.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.pictureBoxPalette)).BeginInit();
 			this.SuspendLayout();
 			// 
 			// OK
@@ -107,6 +108,7 @@
 			// 
 			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.label7);
 			this.groupBox1.Controls.Add(this.pictureBoxPalette);
 			this.groupBox1.Controls.Add(this.AutoLoadPalette);
 			this.groupBox1.Controls.Add(this.label1);
@@ -119,6 +121,14 @@
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Palette Config";
 			// 
+			// pictureBoxPalette
+			// 
+			this.pictureBoxPalette.Location = new System.Drawing.Point(6, 89);
+			this.pictureBoxPalette.Name = "pictureBoxPalette";
+			this.pictureBoxPalette.Size = new System.Drawing.Size(340, 89);
+			this.pictureBoxPalette.TabIndex = 11;
+			this.pictureBoxPalette.TabStop = false;
+			// 
 			// AutoLoadPalette
 			// 
 			this.AutoLoadPalette.AutoSize = true;
@@ -427,13 +437,14 @@
 			this.RestoreDefaultsButton.UseVisualStyleBackColor = true;
 			this.RestoreDefaultsButton.Click += new System.EventHandler(this.RestoreDefaultsButton_Click);
 			// 
-			// pictureBoxPalette
+			// label7
 			// 
-			this.pictureBoxPalette.Location = new System.Drawing.Point(6, 89);
-			this.pictureBoxPalette.Name = "pictureBoxPalette";
-			this.pictureBoxPalette.Size = new System.Drawing.Size(340, 89);
-			this.pictureBoxPalette.TabIndex = 11;
-			this.pictureBoxPalette.TabStop = false;
+			this.label7.AutoSize = true;
+			this.label7.Location = new System.Drawing.Point(142, 67);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(183, 13);
+			this.label7.TabIndex = 61;
+			this.label7.Text = "(The QuickNES palette is the default)";
 			// 
 			// NESGraphicsConfig
 			// 
@@ -459,6 +470,7 @@
 			this.Load += new System.EventHandler(this.NESGraphicsConfig_Load);
 			this.groupBox1.ResumeLayout(false);
 			this.groupBox1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBoxPalette)).EndInit();
 			this.groupBox2.ResumeLayout(false);
 			this.groupBox2.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.PAL_LastLineNumeric)).EndInit();
@@ -468,7 +480,6 @@
 			this.groupBox3.ResumeLayout(false);
 			this.groupBox3.PerformLayout();
 			this.groupBox4.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.pictureBoxPalette)).EndInit();
 			this.ResumeLayout(false);
 
 		}
@@ -507,5 +518,6 @@
 		private System.Windows.Forms.NumericUpDown PAL_FirstLineNumeric;
 		private System.Windows.Forms.Label label5;
 		private System.Windows.Forms.PictureBox pictureBoxPalette;
+		private System.Windows.Forms.Label label7;
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs
index 9f06cd9997..e21cfde93a 100644
--- a/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.Designer.cs
@@ -111,9 +111,9 @@
 			this.buttonPalReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.buttonPalReset.Location = new System.Drawing.Point(142, 369);
 			this.buttonPalReset.Name = "buttonPalReset";
-			this.buttonPalReset.Size = new System.Drawing.Size(75, 23);
+			this.buttonPalReset.Size = new System.Drawing.Size(151, 23);
 			this.buttonPalReset.TabIndex = 5;
-			this.buttonPalReset.Text = "Reset...";
+			this.buttonPalReset.Text = "Reset to QuickNES Default";
 			this.buttonPalReset.UseVisualStyleBackColor = true;
 			this.buttonPalReset.Click += new System.EventHandler(this.buttonPalReset_Click);
 			//