ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove save button, no point in it compared to save and run, Use current Rom button should only be enabled on Gameboy core!

This commit is contained in:
adelikat 2014-05-11 18:34:20 +00:00
parent 77e1d31217
commit 5abd6f8387
3 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.cs
View File

@ -9,6 +9,7 @@ using System.Windows.Forms;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -88,13 +89,13 @@ namespace BizHawk.Client.EmuHawk
private void DualGBFileSelector_Load(object sender, EventArgs e) private void DualGBFileSelector_Load(object sender, EventArgs e)
{ {
Update(); UpdateValues();
} }
public void Update() public void UpdateValues()
{ {
UseCurrentRomButton.Enabled = Global.Emulator != null && // For the designer UseCurrentRomButton.Enabled = Global.Emulator != null && // For the designer
!(Global.Emulator is NullEmulator) && (Global.Emulator is Gameboy) &&
!string.IsNullOrEmpty(GlobalWin.MainForm.CurrentlyOpenRom) && !string.IsNullOrEmpty(GlobalWin.MainForm.CurrentlyOpenRom) &&
!GlobalWin.MainForm.CurrentlyOpenRom.Contains('|') && // Can't be archive !GlobalWin.MainForm.CurrentlyOpenRom.Contains('|') && // Can't be archive
!GlobalWin.MainForm.CurrentlyOpenRom.Contains(".xml"); // Can't already be an xml !GlobalWin.MainForm.CurrentlyOpenRom.Contains(".xml"); // Can't already be an xml

43
BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.Designer.cs generated
View File

@ -33,15 +33,14 @@
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.textBoxName = new System.Windows.Forms.TextBox(); this.textBoxName = new System.Windows.Forms.TextBox();
this.buttonOK = new System.Windows.Forms.Button();
this.buttonCancel = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.textBoxOutputDir = new System.Windows.Forms.TextBox(); this.textBoxOutputDir = new System.Windows.Forms.TextBox();
this.groupBox5 = new System.Windows.Forms.GroupBox(); this.groupBox5 = new System.Windows.Forms.GroupBox();
this.textBoxXML = new System.Windows.Forms.TextBox(); this.textBoxXML = new System.Windows.Forms.TextBox();
this.SaveRunButton = new System.Windows.Forms.Button();
this.dualGBFileSelector2 = new BizHawk.Client.EmuHawk.DualGBFileSelector(); this.dualGBFileSelector2 = new BizHawk.Client.EmuHawk.DualGBFileSelector();
this.dualGBFileSelector1 = new BizHawk.Client.EmuHawk.DualGBFileSelector(); this.dualGBFileSelector1 = new BizHawk.Client.EmuHawk.DualGBFileSelector();
this.SaveRunButton = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
@ -95,18 +94,6 @@
this.textBoxName.TabIndex = 0; this.textBoxName.TabIndex = 0;
this.textBoxName.TextChanged += new System.EventHandler(this.textBoxName_TextChanged); this.textBoxName.TextChanged += new System.EventHandler(this.textBoxName_TextChanged);
// //
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.Enabled = false;
this.buttonOK.Location = new System.Drawing.Point(318, 477);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(60, 23);
this.buttonOK.TabIndex = 6;
this.buttonOK.Text = "&Save";
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
// buttonCancel // buttonCancel
// //
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@ -168,6 +155,18 @@
this.textBoxXML.TabIndex = 5; this.textBoxXML.TabIndex = 5;
this.textBoxXML.WordWrap = false; this.textBoxXML.WordWrap = false;
// //
// SaveRunButton
//
this.SaveRunButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.SaveRunButton.Enabled = false;
this.SaveRunButton.Location = new System.Drawing.Point(293, 477);
this.SaveRunButton.Name = "SaveRunButton";
this.SaveRunButton.Size = new System.Drawing.Size(85, 23);
this.SaveRunButton.TabIndex = 8;
this.SaveRunButton.Text = "&Save and Run";
this.SaveRunButton.UseVisualStyleBackColor = true;
this.SaveRunButton.Click += new System.EventHandler(this.SaveRunButton_Click);
//
// dualGBFileSelector2 // dualGBFileSelector2
// //
this.dualGBFileSelector2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.dualGBFileSelector2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@ -188,21 +187,9 @@
this.dualGBFileSelector1.TabIndex = 0; this.dualGBFileSelector1.TabIndex = 0;
this.dualGBFileSelector1.NameChanged += new System.EventHandler(this.dualGBFileSelector1_NameChanged); this.dualGBFileSelector1.NameChanged += new System.EventHandler(this.dualGBFileSelector1_NameChanged);
// //
// SaveRunButton
//
this.SaveRunButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.SaveRunButton.Enabled = false;
this.SaveRunButton.Location = new System.Drawing.Point(214, 477);
this.SaveRunButton.Name = "SaveRunButton";
this.SaveRunButton.Size = new System.Drawing.Size(98, 23);
this.SaveRunButton.TabIndex = 8;
this.SaveRunButton.Text = "&Save and Run";
this.SaveRunButton.UseVisualStyleBackColor = true;
this.SaveRunButton.Click += new System.EventHandler(this.SaveRunButton_Click);
//
// DualGBXMLCreator // DualGBXMLCreator
// //
this.AcceptButton = this.buttonOK; this.AcceptButton = this.SaveRunButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.buttonCancel; this.CancelButton = this.buttonCancel;
@ -211,7 +198,6 @@
this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox4);
this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
@ -240,7 +226,6 @@
private DualGBFileSelector dualGBFileSelector2; private DualGBFileSelector dualGBFileSelector2;
private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.TextBox textBoxName; private System.Windows.Forms.TextBox textBoxName;
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.Button buttonCancel; private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.TextBox textBoxOutputDir; private System.Windows.Forms.TextBox textBoxOutputDir;

6
BizHawk.Client.EmuHawk/tools/GB/DualGBXMLCreator.cs
View File

@ -103,14 +103,14 @@ namespace BizHawk.Client.EmuHawk
textBoxOutputDir.Text = BasePath; textBoxOutputDir.Text = BasePath;
textBoxXML.Text = XML.ToString(); textBoxXML.Text = XML.ToString();
SaveRunButton.Enabled = buttonOK.Enabled = true; SaveRunButton.Enabled = true;
return true; return true;
} }
catch (Exception e) catch (Exception e)
{ {
textBoxOutputDir.Text = ""; textBoxOutputDir.Text = string.Empty;
textBoxXML.Text = "Failed!\n" + e.ToString(); textBoxXML.Text = "Failed!\n" + e.ToString();
buttonOK.Enabled = false; SaveRunButton.Enabled = false;
return false; return false;
} }
} }