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

@ -28,153 +28,159 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutBox));
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.HR = new BizHawk.Core.HorizontalLine();
this.label5 = new System.Windows.Forms.Label();
this.mom1 = new System.Windows.Forms.PictureBox();
this.mom2 = new System.Windows.Forms.PictureBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.mom1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mom2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 72F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(0, -3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(490, 108);
this.label1.TabIndex = 1;
this.label1.Text = "BIZHAWK";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(12, 311);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(291, 165);
this.label2.TabIndex = 2;
this.label2.Text = "EMULATES\r\nYOUR\r\nMOM";
//
// timer1
//
this.timer1.Enabled = true;
this.timer1.Interval = 50;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(216, 449);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(291, 39);
this.label3.TabIndex = 3;
this.label3.Text = "COPYRITE 2001";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(338, 223);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(175, 48);
this.label4.TabIndex = 5;
this.label4.Text = "(LEVAR BURTON\r\nCAMEO)";
//
// HR
//
this.HR.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.HR.Location = new System.Drawing.Point(349, 213);
this.HR.Name = "HR";
this.HR.Size = new System.Drawing.Size(158, 2);
this.HR.TabIndex = 4;
this.HR.Text = "COPYRITE 2001";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label5.Location = new System.Drawing.Point(222, 369);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(104, 55);
this.label5.TabIndex = 8;
this.label5.Text = "--->";
//
// mom1
//
this.mom1.Image = ((System.Drawing.Image)(resources.GetObject("mom1.Image")));
this.mom1.Location = new System.Drawing.Point(372, 274);
this.mom1.Name = "mom1";
this.mom1.Size = new System.Drawing.Size(115, 150);
this.mom1.TabIndex = 7;
this.mom1.TabStop = false;
this.mom1.Visible = false;
//
// mom2
//
this.mom2.Image = ((System.Drawing.Image)(resources.GetObject("mom2.Image")));
this.mom2.Location = new System.Drawing.Point(372, 274);
this.mom2.Name = "mom2";
this.mom2.Size = new System.Drawing.Size(115, 150);
this.mom2.TabIndex = 6;
this.mom2.TabStop = false;
//
// pictureBox1
//
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(155, 108);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(171, 216);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
// pictureBox2
//
this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
this.pictureBox2.Location = new System.Drawing.Point(353, 97);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(122, 108);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox2.TabIndex = 9;
this.pictureBox2.TabStop = false;
//
// AboutBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(519, 497);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.label5);
this.Controls.Add(this.mom1);
this.Controls.Add(this.mom2);
this.Controls.Add(this.label4);
this.Controls.Add(this.HR);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox1);
this.Name = "AboutBox";
this.Text = "AboutBox";
this.Load += new System.EventHandler(this.AboutBox_Load);
((System.ComponentModel.ISupportInitialize)(this.mom1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mom2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutBox));
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.HR = new BizHawk.Core.HorizontalLine();
this.label5 = new System.Windows.Forms.Label();
this.mom1 = new System.Windows.Forms.PictureBox();
this.mom2 = new System.Windows.Forms.PictureBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.mom1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mom2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 72F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(0, -3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(490, 108);
this.label1.TabIndex = 1;
this.label1.Text = "BIZHAWK";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(12, 311);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(291, 165);
this.label2.TabIndex = 2;
this.label2.Text = "EMULATES\r\nYOUR\r\nMOM";
//
// timer1
//
this.timer1.Enabled = true;
this.timer1.Interval = 50;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(216, 449);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(291, 39);
this.label3.TabIndex = 3;
this.label3.Text = "COPYRITE 2001";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(338, 223);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(175, 48);
this.label4.TabIndex = 5;
this.label4.Text = "(LEVAR BURTON\r\nCAMEO)";
//
// HR
//
this.HR.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.HR.Location = new System.Drawing.Point(349, 213);
this.HR.Name = "HR";
this.HR.Size = new System.Drawing.Size(158, 2);
this.HR.TabIndex = 4;
this.HR.Text = "COPYRITE 2001";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label5.Location = new System.Drawing.Point(222, 369);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(104, 55);
this.label5.TabIndex = 8;
this.label5.Text = "--->";
//
// mom1
//
this.mom1.Image = ((System.Drawing.Image)(resources.GetObject("mom1.Image")));
this.mom1.Location = new System.Drawing.Point(372, 274);
this.mom1.Name = "mom1";
this.mom1.Size = new System.Drawing.Size(115, 150);
this.mom1.TabIndex = 7;
this.mom1.TabStop = false;
this.mom1.Visible = false;
//
// mom2
//
this.mom2.Image = ((System.Drawing.Image)(resources.GetObject("mom2.Image")));
this.mom2.Location = new System.Drawing.Point(372, 274);
this.mom2.Name = "mom2";
this.mom2.Size = new System.Drawing.Size(115, 150);
this.mom2.TabIndex = 6;
this.mom2.TabStop = false;
//
// pictureBox1
//
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(155, 108);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(171, 216);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
// pictureBox2
//
this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
this.pictureBox2.Location = new System.Drawing.Point(353, 97);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(122, 108);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox2.TabIndex = 9;
this.pictureBox2.TabStop = false;
//
// AboutBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(519, 497);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.label5);
this.Controls.Add(this.mom1);
this.Controls.Add(this.mom2);
this.Controls.Add(this.label4);
this.Controls.Add(this.HR);
this.Controls.Add(this.label3);
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.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();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}

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,8 +311,10 @@ namespace BizHawk.MultiClient
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
//new AboutBox().ShowDialog();
new BizBox().ShowDialog();
if (INTERIM)
new AboutBox().ShowDialog();
else
new BizBox().ShowDialog();
}
private void controllersToolStripMenuItem_Click(object sender, EventArgs e)
@ -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;
@ -70,7 +71,7 @@ namespace BizHawk.MultiClient
Global.MovieSession.Movie = new Movie();
Icon = BizHawk.MultiClient.Properties.Resources.logo;
InitializeComponent();
Global.Game = GameInfo.GetNullGame();
Global.Game = GameInfo.GetNullGame();
if (Global.Config.ShowLogWindow)
{
LogConsole.ShowConsole();
@ -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()
@ -967,7 +976,7 @@ namespace BizHawk.MultiClient
game = new GameInfo();
game.System = "PCE";
game.Name = Path.GetFileNameWithoutExtension(file.Name);
game.Hash = hash;
game.Hash = hash;
}
switch (game.System)
@ -2114,7 +2123,7 @@ namespace BizHawk.MultiClient
NESDebug1.Restart();
TI83KeyPad1.Restart();
Cheats1.Restart();
Text = "BizHawk";
Text = "BizHawk" + (INTERIM ? " (interim) " : "");
HandlePlatformMenus();
StateSlots.Clear();
UpdateDumpIcon();