From ba5551d29b4a9c2d648056d2e83d565fc2249d39 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 26 May 2014 12:34:52 +0000
Subject: [PATCH] smartly hande the text property on the Gb/GG game genie
 dialog (only show one of the cores not a slash)

---
 BizHawk.Client.EmuHawk/MainForm.Designer.cs            |  6 +++---
 .../tools/GB/GBGameGenie.Designer.cs                   | 10 ++++------
 BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs         | 10 ++++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index 7db75c136a..ee96447814 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -1967,10 +1967,10 @@
             this.SMSFix3DGameDisplayToolStripMenuItem,
             this.ShowClippedRegionsMenuItem,
             this.HighlightActiveDisplayRegionMenuItem,
-            this.toolStripSeparator24,
             this.SMSGraphicsSettingsMenuItem,
-            this.GGGameGenieMenuItem,
-            this.SMSVDPViewerToolStripMenuItem});
+            this.toolStripSeparator24,
+            this.SMSVDPViewerToolStripMenuItem,
+            this.GGGameGenieMenuItem});
 			this.SMSSubMenu.Name = "SMSSubMenu";
 			this.SMSSubMenu.Size = new System.Drawing.Size(42, 19);
 			this.SMSSubMenu.Text = "&SMS";
diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.Designer.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.Designer.cs
index 3baf27e5e3..697e8d483b 100644
--- a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.Designer.cs
@@ -144,9 +144,8 @@
 			// 
 			// addcheatbt
 			// 
-			this.addcheatbt.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.addcheatbt.Enabled = false;
-			this.addcheatbt.Location = new System.Drawing.Point(84, 163);
+			this.addcheatbt.Location = new System.Drawing.Point(86, 163);
 			this.addcheatbt.Margin = new System.Windows.Forms.Padding(0);
 			this.addcheatbt.Name = "addcheatbt";
 			this.addcheatbt.Size = new System.Drawing.Size(65, 26);
@@ -408,7 +407,6 @@
 			// 
 			// ClearButton
 			// 
-			this.ClearButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
 			this.ClearButton.Location = new System.Drawing.Point(31, 163);
 			this.ClearButton.Margin = new System.Windows.Forms.Padding(2);
 			this.ClearButton.Name = "ClearButton";
@@ -425,7 +423,7 @@
             this.OptionsSubMenu});
 			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
 			this.menuStrip1.Name = "menuStrip1";
-			this.menuStrip1.Size = new System.Drawing.Size(292, 24);
+			this.menuStrip1.Size = new System.Drawing.Size(322, 24);
 			this.menuStrip1.TabIndex = 8;
 			this.menuStrip1.Text = "menuStrip1";
 			// 
@@ -514,7 +512,7 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(292, 252);
+			this.ClientSize = new System.Drawing.Size(322, 252);
 			this.Controls.Add(this.groupBox2);
 			this.Controls.Add(this.ClearButton);
 			this.Controls.Add(this.groupBox1);
@@ -525,7 +523,7 @@
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
 			this.MainMenuStrip = this.menuStrip1;
 			this.MaximizeBox = false;
-			this.MaximumSize = new System.Drawing.Size(312, 294);
+			this.MaximumSize = new System.Drawing.Size(342, 294);
 			this.MinimumSize = new System.Drawing.Size(312, 294);
 			this.Name = "GBGameGenie";
 			this.ShowIcon = false;
diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
index 0a7f5a3c21..cbdacd29f5 100644
--- a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
@@ -179,6 +179,16 @@ namespace BizHawk.Client.EmuHawk
 			{
 				Location = Global.Config.GbGGSettings.WindowPosition;
 			}
+
+			//"Game Boy/Game Gear Game Genie Encoder / Decoder"
+			if (Global.Emulator.SystemId == "GB")
+			{
+				Text = "Game Boy Game Genie Encoder/Decoder";
+			}
+			else
+			{
+				Text = "Game Gear Game Genie Encoder/Decoder";
+			}
 		}
 
 		private void SaveConfigSettings()