diff --git a/BizHawk.MultiClient/BizBox.Designer.cs b/BizHawk.MultiClient/BizBox.Designer.cs index 1bacf2c739..6484cd6a07 100644 --- a/BizHawk.MultiClient/BizBox.Designer.cs +++ b/BizHawk.MultiClient/BizBox.Designer.cs @@ -125,9 +125,9 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(267, 56); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(151, 13); + this.label6.Size = new System.Drawing.Size(124, 13); this.label6.TabIndex = 8; - this.label6.Text = "Released September 30, 2011"; + this.label6.Text = "Released March 3, 2012"; // // BizBox // diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 936122d263..234c89eb68 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -219,6 +219,7 @@ this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StatusSlot0 = new System.Windows.Forms.StatusStrip(); this.DumpStatus = new System.Windows.Forms.ToolStripDropDownButton(); this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); @@ -309,7 +310,7 @@ // this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); // @@ -322,7 +323,7 @@ this.autoloadMostRecentToolStripMenuItem}); this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.recentROMToolStripMenuItem.Text = "Recent ROM"; this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); // @@ -355,14 +356,14 @@ // this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; - this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.closeROMToolStripMenuItem.Text = "&Close ROM"; this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6); // // saveStateToolStripMenuItem // @@ -380,7 +381,7 @@ this.toolStripSeparator6, this.saveNamedStateToolStripMenuItem}); this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.saveStateToolStripMenuItem.Text = "Save State"; this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); // @@ -484,7 +485,7 @@ this.toolStripSeparator21, this.autoLoadLastSlotToolStripMenuItem}); this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.loadStateToolStripMenuItem.Text = "Load State"; this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); // @@ -601,7 +602,7 @@ this.saveToCurrentSlotToolStripMenuItem, this.loadCurrentSlotToolStripMenuItem}); this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; - this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.saveSlotToolStripMenuItem.Text = "SaveSlot"; this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); // @@ -713,7 +714,7 @@ // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); // // movieToolStripMenuItem // @@ -730,7 +731,7 @@ this.bindSavestatesToMoviesToolStripMenuItem, this.automaticallyBackupMoviesToolStripMenuItem}); this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; - this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.movieToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.movieToolStripMenuItem.Text = "Movie"; this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); // @@ -848,7 +849,7 @@ this.recordAVIToolStripMenuItem, this.stopAVIToolStripMenuItem}); this.aVIWAVToolStripMenuItem.Name = "aVIWAVToolStripMenuItem"; - this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.aVIWAVToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.aVIWAVToolStripMenuItem.Text = "AVI/WAV"; this.aVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); // @@ -874,7 +875,7 @@ this.screenshotF12ToolStripMenuItem, this.screenshotAsToolStripMenuItem}); this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; - this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.screenshotToolStripMenuItem.Text = "Screenshot"; // // screenshotF12ToolStripMenuItem @@ -895,13 +896,13 @@ // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -1764,6 +1765,7 @@ // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.helpToolStripMenuItem1, + this.forumsToolStripMenuItem, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 19); @@ -1773,7 +1775,7 @@ // this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); this.helpToolStripMenuItem1.Text = "&Online Help..."; this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); // @@ -1781,10 +1783,18 @@ // this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // + // forumsToolStripMenuItem + // + this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem"; + this.forumsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.forumsToolStripMenuItem.Text = "Forums..."; + this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click); + // // StatusSlot0 // this.StatusSlot0.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2365,6 +2375,7 @@ private System.Windows.Forms.ToolStripMenuItem showMenuToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem autoSavestatesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importMovieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem forumsToolStripMenuItem; } } diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 2d656467a3..6e5652a0ed 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -322,7 +322,7 @@ namespace BizHawk.MultiClient private void helpToolStripMenuItem1_Click(object sender, EventArgs e) { - System.Diagnostics.Process.Start("http://code.google.com/p/bizhawk/"); + System.Diagnostics.Process.Start("http://tasvideos.org/BizHawk.thml"); } private void aboutToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index df60c1d134..373557514b 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -19,7 +19,7 @@ namespace BizHawk.MultiClient public partial class MainForm : Form { - public bool INTERIM = true; + public bool INTERIM = false; public const string EMUVERSION = "BizHawk v1.0.0"; private Control renderTarget; private RetainedViewportPanel retainedPanel; @@ -241,7 +241,7 @@ namespace BizHawk.MultiClient if (!INTERIM) { debuggerToolStripMenuItem.Enabled = false; - luaConsoleToolStripMenuItem.Enabled = false; + //luaConsoleToolStripMenuItem.Enabled = false; } } @@ -2514,5 +2514,10 @@ namespace BizHawk.MultiClient Global.RenderPanel.AddMessage(Path.GetFileName(fn) + " imported as .tas"); } } + + private void forumsToolStripMenuItem_Click(object sender, EventArgs e) + { + System.Diagnostics.Process.Start("http://tasvideos.org/forum/viewforum.php?f=64"); + } } } \ No newline at end of file