Make interim flag (set to true currently) that flips a lot of settings all at once (such as disabling unfinished dialogs, setting the mainform text, and the about box (lol))

This commit is contained in:
andres.delikat 2011-09-11 00:11:46 +00:00
parent 79e5a399f7
commit 95c4e658ac
5 changed files with 1202 additions and 181 deletions

View File

@ -166,8 +166,14 @@
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox1);
this.DoubleBuffered = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MaximumSize = new System.Drawing.Size(527, 524);
this.MinimumSize = new System.Drawing.Size(527, 524);
this.Name = "AboutBox";
this.Text = "AboutBox";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.Text = "BizHawk Interim Build";
this.Load += new System.EventHandler(this.AboutBox_Load);
((System.ComponentModel.ISupportInitialize)(this.mom1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mom2)).EndInit();

File diff suppressed because it is too large Load Diff

View File

@ -1458,20 +1458,20 @@
//
this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox;
this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem";
this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.toolBoxToolStripMenuItem.Text = "&Tool Box";
this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(149, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6);
//
// rAMWatchToolStripMenuItem
//
this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
//
@ -1479,7 +1479,7 @@
//
this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search;
this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
//
@ -1487,7 +1487,7 @@
//
this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem";
this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMPokeToolStripMenuItem.Text = "RAM &Poke";
this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click);
//
@ -1495,7 +1495,7 @@
//
this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click);
//
@ -1503,20 +1503,20 @@
//
this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem";
this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.tAStudioToolStripMenuItem.Text = "&TAStudio";
this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6);
//
// luaConsoleToolStripMenuItem
//
this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua;
this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.luaConsoleToolStripMenuItem.Text = "Lua Console";
this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click);
//
@ -1524,7 +1524,7 @@
//
this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem";
this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.cheatsToolStripMenuItem.Text = "Cheats";
this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click);
//
@ -1543,7 +1543,6 @@
//
// debuggerToolStripMenuItem
//
this.debuggerToolStripMenuItem.Enabled = false;
this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem";
this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(228, 22);
this.debuggerToolStripMenuItem.Text = "&Debugger";

View File

@ -311,7 +311,9 @@ namespace BizHawk.MultiClient
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
//new AboutBox().ShowDialog();
if (INTERIM)
new AboutBox().ShowDialog();
else
new BizBox().ShowDialog();
}
@ -1108,6 +1110,8 @@ namespace BizHawk.MultiClient
private void MainForm_Load(object sender, EventArgs e)
{
Text = "BizHawk" + (INTERIM ? " (interim) " : "");
//Hide platform specific menus until an appropriate ROM is loaded
NESToolStripMenuItem.Visible = false;
tI83ToolStripMenuItem.Visible = false;

View File

@ -19,6 +19,7 @@ namespace BizHawk.MultiClient
public partial class MainForm : Form
{
public bool INTERIM = true;
public const string EMUVERSION = "BizHawk v1.0.0";
private Control renderTarget;
private RetainedViewportPanel retainedPanel;
@ -231,6 +232,12 @@ namespace BizHawk.MultiClient
if (Global.Config.StartPaused)
PauseEmulator();
if (!INTERIM)
{
debuggerToolStripMenuItem.Enabled = false;
luaConsoleToolStripMenuItem.Enabled = false;
}
}
void SyncCoreInputComm()
@ -787,19 +794,21 @@ namespace BizHawk.MultiClient
private string DisplayNameForSystem(string system)
{
string str = "";
if (INTERIM) str += "(interim) ";
switch (system)
{
case "SG": return "SG-1000";
case "SMS": return "Sega Master System";
case "GG": return "Game Gear";
case "PCE": return "TurboGrafx-16";
case "SGX": return "SuperGrafx";
case "GEN": return "Genesis";
case "TI83": return "TI-83";
case "NES": return "NES";
case "GB": return "Game Boy";
case "SG": str += "SG-1000"; break;
case "SMS": str += "Sega Master System"; break;
case "GG": str += "Game Gear"; break;
case "PCE": str += "TurboGrafx-16"; break;
case "SGX": str += "SuperGrafx"; break;
case "GEN": str += "Genesis"; break;
case "TI83": str += "TI-83"; break;
case "NES": str += "NES"; break;
case "GB": str += "Game Boy"; break;
}
return "";
return str;
}
private void HandlePlatformMenus()
@ -2114,7 +2123,7 @@ namespace BizHawk.MultiClient
NESDebug1.Restart();
TI83KeyPad1.Restart();
Cheats1.Restart();
Text = "BizHawk";
Text = "BizHawk" + (INTERIM ? " (interim) " : "");
HandlePlatformMenus();
StateSlots.Clear();
UpdateDumpIcon();