From cee04551adc58388453474fd24869c31b845a387 Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 27 Sep 2012 07:27:47 +0000 Subject: [PATCH] snes-firmwares-hook up to gui --- BizHawk.MultiClient/Config.cs | 2 +- BizHawk.MultiClient/MainForm.cs | 1 + .../config/PathConfig.Designer.cs | 39 +++++++++++++++++++ BizHawk.MultiClient/config/PathConfig.cs | 7 ++++ BizHawk.MultiClient/config/PathConfig.resx | 18 +++++++++ 5 files changed, 66 insertions(+), 1 deletion(-) diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index a4e1b6ab92..f12e3a8744 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -84,7 +84,7 @@ namespace BizHawk.MultiClient public string PathSNESSaveRAM = Path.Combine(".", "SaveRAM"); public string PathSNESScreenshots = Path.Combine(".", "Screenshots"); public string PathSNESCheats = Path.Combine(".", "Cheats"); - public string PathSNESFirmware = Path.Combine(".", "Firmware"); + public string PathSNESFirmwares = Path.Combine(".", "Firmwares"); public string BaseSMS = Path.Combine(".", "SMS"); public string PathSMSROMs = "."; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 7951578068..d29f72b82b 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -339,6 +339,7 @@ namespace BizHawk.MultiClient Global.CoreInputComm.SMS_ShowBG = Global.Config.SMSDispBG; Global.CoreInputComm.SMS_ShowOBJ = Global.Config.SMSDispOBJ; + Global.CoreInputComm.SNES_FirmwaresPath = PathManager.MakeAbsolutePath(Global.Config.PathSNESFirmwares, "SNES"); Global.CoreInputComm.SNES_ShowBG1_0 = Global.Config.SNES_ShowBG1_0; Global.CoreInputComm.SNES_ShowBG1_1 = Global.Config.SNES_ShowBG1_1; Global.CoreInputComm.SNES_ShowBG2_0 = Global.Config.SNES_ShowBG2_0; diff --git a/BizHawk.MultiClient/config/PathConfig.Designer.cs b/BizHawk.MultiClient/config/PathConfig.Designer.cs index a00f2d7722..2b617f9ddf 100644 --- a/BizHawk.MultiClient/config/PathConfig.Designer.cs +++ b/BizHawk.MultiClient/config/PathConfig.Designer.cs @@ -280,6 +280,9 @@ this.BaseDescription = new System.Windows.Forms.Label(); this.RecentForROMs = new System.Windows.Forms.CheckBox(); this.SaveButton = new System.Windows.Forms.Button(); + this.SNESFirmwaresDescription = new System.Windows.Forms.Label(); + this.SNESBrowseFirmwares = new System.Windows.Forms.Button(); + this.SNESFirmwaresBox = new System.Windows.Forms.TextBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage12.SuspendLayout(); @@ -829,6 +832,9 @@ // // tabPage12 // + this.tabPage12.Controls.Add(this.SNESFirmwaresDescription); + this.tabPage12.Controls.Add(this.SNESBrowseFirmwares); + this.tabPage12.Controls.Add(this.SNESFirmwaresBox); this.tabPage12.Controls.Add(this.SNESBaseBox); this.tabPage12.Controls.Add(this.SNESSGBDescription); this.tabPage12.Controls.Add(this.SNESBrowseSGB); @@ -3058,6 +3064,36 @@ this.SaveButton.UseVisualStyleBackColor = true; this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); // + // SNESFirmwaresDescription + // + this.SNESFirmwaresDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SNESFirmwaresDescription.AutoSize = true; + this.SNESFirmwaresDescription.Location = new System.Drawing.Point(474, 240); + this.SNESFirmwaresDescription.Name = "SNESFirmwaresDescription"; + this.SNESFirmwaresDescription.Size = new System.Drawing.Size(54, 13); + this.SNESFirmwaresDescription.TabIndex = 94; + this.SNESFirmwaresDescription.Text = "Firmwares"; + // + // SNESBrowseFirmwares + // + this.SNESBrowseFirmwares.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SNESBrowseFirmwares.Image = ((System.Drawing.Image)(resources.GetObject("SNESBrowseFirmwares.Image"))); + this.SNESBrowseFirmwares.Location = new System.Drawing.Point(442, 237); + this.SNESBrowseFirmwares.Name = "SNESBrowseFirmwares"; + this.SNESBrowseFirmwares.Size = new System.Drawing.Size(26, 23); + this.SNESBrowseFirmwares.TabIndex = 93; + this.SNESBrowseFirmwares.UseVisualStyleBackColor = true; + this.SNESBrowseFirmwares.Click += new System.EventHandler(this.SNESBrowseFirmwares_Click); + // + // SNESFirmwaresBox + // + this.SNESFirmwaresBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.SNESFirmwaresBox.Location = new System.Drawing.Point(13, 237); + this.SNESFirmwaresBox.Name = "SNESFirmwaresBox"; + this.SNESFirmwaresBox.Size = new System.Drawing.Size(421, 20); + this.SNESFirmwaresBox.TabIndex = 92; + // // PathConfig // this.AcceptButton = this.OK; @@ -3361,5 +3397,8 @@ private System.Windows.Forms.Label SNESSGBDescription; private System.Windows.Forms.Button SNESBrowseSGB; private System.Windows.Forms.TextBox SNESSGBBox; + private System.Windows.Forms.Label SNESFirmwaresDescription; + private System.Windows.Forms.Button SNESBrowseFirmwares; + private System.Windows.Forms.TextBox SNESFirmwaresBox; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/PathConfig.cs b/BizHawk.MultiClient/config/PathConfig.cs index 12b2317576..7cf1d304ea 100644 --- a/BizHawk.MultiClient/config/PathConfig.cs +++ b/BizHawk.MultiClient/config/PathConfig.cs @@ -74,6 +74,7 @@ namespace BizHawk.MultiClient SNESScreenshotsBox.Text = Global.Config.PathSNESScreenshots; SNESCheatsBox.Text = Global.Config.PathSNESCheats; SNESSGBBox.Text = Global.Config.PathSGBRom; + SNESFirmwaresBox.Text = Global.Config.PathSNESFirmwares; Sega8BaseBox.Text = Global.Config.BaseSMS; Sega8ROMsBox.Text = Global.Config.PathSMSROMs; @@ -176,6 +177,7 @@ namespace BizHawk.MultiClient Global.Config.PathSNESScreenshots = SNESScreenshotsBox.Text; Global.Config.PathSNESCheats = SNESCheatsBox.Text; Global.Config.PathSGBRom = SNESSGBBox.Text; + Global.Config.PathSNESFirmwares = SNESFirmwaresBox.Text; Global.Config.BaseSMS = Sega8BaseBox.Text; Global.Config.PathSMSROMs = Sega8ROMsBox.Text; @@ -732,5 +734,10 @@ namespace BizHawk.MultiClient SNESSGBBox); } + + private void SNESBrowseFirmwares_Click(object sender, EventArgs e) + { + BrowseFolder(SNESFirmwaresBox, SNESFirmwaresDescription.Text); + } } } diff --git a/BizHawk.MultiClient/config/PathConfig.resx b/BizHawk.MultiClient/config/PathConfig.resx index 8cf89cf794..2eda504d3c 100644 --- a/BizHawk.MultiClient/config/PathConfig.resx +++ b/BizHawk.MultiClient/config/PathConfig.resx @@ -368,6 +368,24 @@ u+iVmyMO24njbqvG5VbOz4yjtjyL3vuRdOSKltUuX0+LbAON0o3UJFmiibPi+pXtBLrvWHR2tHZfBuSm xZIrPk9mfAiJlwKMleWsvxsnj+7H9YAD+xxssbexwnqbBVs2m7HV3GxlI631E9fa/wGRpaRpa3TTbQAA AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAgAA + CwIBm8luNgAAAn9JREFUOE+lk2tI01EYxhf0oU8WqVEIRpaIBWJgSPUhROmippS3QkkTylsXDMW8ts3b + 1G06daVibuqaOq0sxbBCKBSJ0PJCialZUFSKqaGSt1//TbIsww8deOBwznl+5zkv71kHiP5rGAFrKb1Q + 5ypR6bmaVU6m2kCiXJv007Om2XgwJEaNT4QiyDi/GF9mKRVgsWkav+CYQkR1utwAQfypphqZ4l/JIhOL + jvtGKfCOyDMB6O/WMjNea9L3MT1zIxoM5QrqdWnS1SA+kUq8w1V4hhUgqq1QMj1WtcK88KmIud5oqsqy + qCzOQFMopSQvhRvyBApkcQLzV91E1docpr9ol29eFMz0J0Bv2Kr6C3CrVMa3jyWm2EZzc12OSQ8M2TTo + ZdytzMCgSUVfIqFcfY2bqiSKlQmoc+JNaUSVJRlMvsvHGHuoVUx9lZKFIQkMp63UW2FtMBH6YuBVFF01 + /lwO9aoQadSpTAxkwXs596oVtD+ULx36/Qkvg6HDl/k2D2YeufCmwoELZ45MCIA9olKVmK+vJQy3JVOv + l7M4KIae8CVAV6hgPMV8uxczLYeZbDrIaN1eJBG2nHazyDN1cZEymdHueG7rcuh8KiTpixYA56AziMVn + J5h9coyp5kOM1TvxudqejvRNBHrY4GRnZmcCqLMT6GlJ4Y4uGwZS4IUQ97kfs62eTD12YbzBmRGDAx+0 + u+iVmyMO24njbqvG5VbOz4yjtjyL3vuRdOSKltUuX0+LbAON0o3UJFmiibPi+pXtBLrvWHR2tHZfBuSm + xZIrPk9mfAiJlwKMleWsvxsnj+7H9YAD+xxssbexwnqbBVs2m7HV3GxlI631E9fa/wGRpaRpa3TTbQAA + AABJRU5ErkJggg==