From cfd756feb0d92a946d761bc737d2c041bc533c50 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Oct 2014 01:35:59 +0000 Subject: [PATCH] Tastudio - greenzone shall now be called Savestate history when exposed to the user --- .../TAStudio/GreenzoneSettings.Designer.cs | 6 ++-- .../tools/TAStudio/TAStudio.Designer.cs | 32 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs index b6b09b6afb..36fc57bdb3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs @@ -77,9 +77,9 @@ namespace BizHawk.Client.EmuHawk this.SaveGreenzoneCheckbox.AutoSize = true; this.SaveGreenzoneCheckbox.Location = new System.Drawing.Point(13, 20); this.SaveGreenzoneCheckbox.Name = "SaveGreenzoneCheckbox"; - this.SaveGreenzoneCheckbox.Size = new System.Drawing.Size(205, 17); + this.SaveGreenzoneCheckbox.Size = new System.Drawing.Size(234, 17); this.SaveGreenzoneCheckbox.TabIndex = 2; - this.SaveGreenzoneCheckbox.Text = "Save greenzone information in proj file"; + this.SaveGreenzoneCheckbox.Text = "Save savestate history information in proj file"; this.SaveGreenzoneCheckbox.UseVisualStyleBackColor = true; // // CapacityNumeric @@ -178,7 +178,7 @@ namespace BizHawk.Client.EmuHawk this.MinimumSize = new System.Drawing.Size(225, 165); this.Name = "GreenzoneSettingsForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Greenzone Settings"; + this.Text = "Savestate History Settings"; this.Load += new System.EventHandler(this.GreenzoneSettings_Load); ((System.ComponentModel.ISupportInitialize)(this.CapacityNumeric)).EndInit(); this.ResumeLayout(false); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 5a1eab6e3b..74c504edb3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -93,6 +93,8 @@ namespace BizHawk.Client.EmuHawk this.GreenzoneSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CommentsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); + this.DefaultStateSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AutoloadProjectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -129,8 +131,6 @@ namespace BizHawk.Client.EmuHawk this.InsertNumFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); this.TruncateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); - this.DefaultStateSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TASMenu.SuspendLayout(); this.TasStatusStrip.SuspendLayout(); this.RightClickMenu.SuspendLayout(); @@ -448,7 +448,7 @@ namespace BizHawk.Client.EmuHawk // this.ClearGreenzoneMenuItem.Name = "ClearGreenzoneMenuItem"; this.ClearGreenzoneMenuItem.Size = new System.Drawing.Size(282, 22); - this.ClearGreenzoneMenuItem.Text = "&Clear Greenzone"; + this.ClearGreenzoneMenuItem.Text = "&Clear Savestate History"; this.ClearGreenzoneMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click); // // GreenzoneICheckSeparator @@ -638,6 +638,18 @@ namespace BizHawk.Client.EmuHawk this.SubtitlesMenuItem.Text = "&Subtitles..."; this.SubtitlesMenuItem.Click += new System.EventHandler(this.SubtitlesMenuItem_Click); // + // toolStripSeparator21 + // + this.toolStripSeparator21.Name = "toolStripSeparator21"; + this.toolStripSeparator21.Size = new System.Drawing.Size(233, 6); + // + // DefaultStateSettingsMenuItem + // + this.DefaultStateSettingsMenuItem.Name = "DefaultStateSettingsMenuItem"; + this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(236, 22); + this.DefaultStateSettingsMenuItem.Text = "&Default State History Settings..."; + this.DefaultStateSettingsMenuItem.Click += new System.EventHandler(this.DefaultStateSettingsMenuItem_Click); + // // SettingsSubMenu // this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -712,7 +724,7 @@ namespace BizHawk.Client.EmuHawk // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(57, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(149, 6); // // HelpSubMenu // @@ -941,18 +953,6 @@ namespace BizHawk.Client.EmuHawk this.TruncateContextMenuItem.Text = "Truncate Movie"; this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); // - // toolStripSeparator21 - // - this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(233, 6); - // - // DefaultStateSettingsMenuItem - // - this.DefaultStateSettingsMenuItem.Name = "DefaultStateSettingsMenuItem"; - this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(236, 22); - this.DefaultStateSettingsMenuItem.Text = "&Default State History Settings..."; - this.DefaultStateSettingsMenuItem.Click += new System.EventHandler(this.DefaultStateSettingsMenuItem_Click); - // // TAStudio // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);