diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index d55052d27f..2e1fc680b7 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -133,5 +133,10 @@ namespace BizHawk.Client.Common
return base.GetInput(frame);
}
+
+ public TasStateManager.ManagerSettings GreenzoneSettings
+ {
+ get { return StateManager.Settings; }
+ }
}
}
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 915d646987..8795a0d8ce 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -823,6 +823,12 @@
BookmarksBranchesBox.cs
+
+ Form
+
+
+ GreenzoneSettings.cs
+
Form
@@ -1252,6 +1258,9 @@
BookmarksBranchesBox.cs
+
+ GreenzoneSettings.cs
+
HeaderEditor.cs
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs
new file mode 100644
index 0000000000..bb4ba6c841
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs
@@ -0,0 +1,200 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace BizHawk.Client.EmuHawk
+{
+ public partial class GreenzoneSettings
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GreenzoneSettings));
+ this.CancelBtn = new System.Windows.Forms.Button();
+ this.OkBtn = new System.Windows.Forms.Button();
+ this.SaveGreenzoneCheckbox = new System.Windows.Forms.CheckBox();
+ this.CapacityNumeric = new System.Windows.Forms.NumericUpDown();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.SavestateSizeLabel = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.NumStatesLabel = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.CapacityNumeric)).BeginInit();
+ this.SuspendLayout();
+ //
+ // CancelBtn
+ //
+ this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.CancelBtn.Location = new System.Drawing.Point(236, 96);
+ this.CancelBtn.Name = "CancelBtn";
+ this.CancelBtn.Size = new System.Drawing.Size(60, 23);
+ this.CancelBtn.TabIndex = 0;
+ this.CancelBtn.Text = "&Cancel";
+ this.CancelBtn.UseVisualStyleBackColor = true;
+ this.CancelBtn.Click += new System.EventHandler(this.CancelBtn_Click);
+ //
+ // OkBtn
+ //
+ this.OkBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.OkBtn.Location = new System.Drawing.Point(170, 96);
+ this.OkBtn.Name = "OkBtn";
+ this.OkBtn.Size = new System.Drawing.Size(60, 23);
+ this.OkBtn.TabIndex = 1;
+ this.OkBtn.Text = "&Ok";
+ this.OkBtn.UseVisualStyleBackColor = true;
+ this.OkBtn.Click += new System.EventHandler(this.OkBtn_Click);
+ //
+ // SaveGreenzoneCheckbox
+ //
+ 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.TabIndex = 2;
+ this.SaveGreenzoneCheckbox.Text = "Save greenzone information in proj file";
+ this.SaveGreenzoneCheckbox.UseVisualStyleBackColor = true;
+ //
+ // CapacityNumeric
+ //
+ this.CapacityNumeric.Location = new System.Drawing.Point(13, 67);
+ this.CapacityNumeric.Maximum = new decimal(new int[] {
+ 1024,
+ 0,
+ 0,
+ 0});
+ this.CapacityNumeric.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.CapacityNumeric.Name = "CapacityNumeric";
+ this.CapacityNumeric.Size = new System.Drawing.Size(48, 20);
+ this.CapacityNumeric.TabIndex = 3;
+ this.CapacityNumeric.Value = new decimal(new int[] {
+ 512,
+ 0,
+ 0,
+ 0});
+ this.CapacityNumeric.ValueChanged += new System.EventHandler(this.CapacityNumeric_ValueChanged);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(61, 70);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(21, 13);
+ this.label1.TabIndex = 4;
+ this.label1.Text = "mb";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(13, 50);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(103, 13);
+ this.label2.TabIndex = 5;
+ this.label2.Text = "Greenzone Capacity";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(127, 50);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(79, 13);
+ this.label3.TabIndex = 6;
+ this.label3.Text = "Savestate size:";
+ //
+ // SavestateSizeLabel
+ //
+ this.SavestateSizeLabel.AutoSize = true;
+ this.SavestateSizeLabel.Location = new System.Drawing.Point(209, 50);
+ this.SavestateSizeLabel.Name = "SavestateSizeLabel";
+ this.SavestateSizeLabel.Size = new System.Drawing.Size(25, 13);
+ this.SavestateSizeLabel.TabIndex = 7;
+ this.SavestateSizeLabel.Text = "1kb";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(122, 70);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(84, 13);
+ this.label4.TabIndex = 8;
+ this.label4.Text = "Max num states:";
+ //
+ // NumStatesLabel
+ //
+ this.NumStatesLabel.AutoSize = true;
+ this.NumStatesLabel.Location = new System.Drawing.Point(209, 70);
+ this.NumStatesLabel.Name = "NumStatesLabel";
+ this.NumStatesLabel.Size = new System.Drawing.Size(25, 13);
+ this.NumStatesLabel.TabIndex = 9;
+ this.NumStatesLabel.Text = "1kb";
+ //
+ // GreenzoneSettings
+ //
+ this.AcceptButton = this.OkBtn;
+ this.CancelButton = this.CancelBtn;
+ this.ClientSize = new System.Drawing.Size(308, 131);
+ this.Controls.Add(this.NumStatesLabel);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.SavestateSizeLabel);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.CapacityNumeric);
+ this.Controls.Add(this.SaveGreenzoneCheckbox);
+ this.Controls.Add(this.OkBtn);
+ this.Controls.Add(this.CancelBtn);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MinimumSize = new System.Drawing.Size(225, 165);
+ this.Name = "GreenzoneSettings";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Greenzone Settings";
+ this.Load += new System.EventHandler(this.GreenzoneSettings_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.CapacityNumeric)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ private Button CancelBtn;
+ private Button OkBtn;
+ private CheckBox SaveGreenzoneCheckbox;
+ private NumericUpDown CapacityNumeric;
+ private Label label1;
+ private Label label2;
+ private Label label3;
+ private Label SavestateSizeLabel;
+ private Label label4;
+ private Label NumStatesLabel;
+ }
+}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs
new file mode 100644
index 0000000000..fdebb39652
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+using BizHawk.Client.Common;
+
+namespace BizHawk.Client.EmuHawk
+{
+ public partial class GreenzoneSettings : Form
+ {
+ private readonly TasStateManager.ManagerSettings Settings;
+ private decimal _stateSizeMb;
+ public GreenzoneSettings(TasStateManager.ManagerSettings settings)
+ {
+ Settings = settings;
+ InitializeComponent();
+ }
+
+ private void GreenzoneSettings_Load(object sender, EventArgs e)
+ {
+ _stateSizeMb = Global.Emulator.SaveStateBinary().Length / (decimal)1024 / (decimal)1024;
+
+ SaveGreenzoneCheckbox.Checked = Settings.SaveGreenzone;
+ CapacityNumeric.Value = Settings.Capacitymb == 0 ? 1 : Settings.Capacitymb < CapacityNumeric.Maximum ?
+ Settings.Capacitymb :
+ CapacityNumeric.Maximum;
+
+ SavestateSizeLabel.Text = Math.Round(_stateSizeMb, 2).ToString() + " mb";
+ }
+
+ private decimal MaxStatesInCapacity
+ {
+ get { return CapacityNumeric.Value / _stateSizeMb; }
+ }
+
+ private void OkBtn_Click(object sender, EventArgs e)
+ {
+ Settings.SaveGreenzone = SaveGreenzoneCheckbox.Checked;
+ Settings.Capacitymb = (int)CapacityNumeric.Value;
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+
+ private void CancelBtn_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+
+ private void CapacityNumeric_ValueChanged(object sender, EventArgs e)
+ {
+ NumStatesLabel.Text = Math.Round(MaxStatesInCapacity, 2).ToString();
+ }
+ }
+}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.resx b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.resx
new file mode 100644
index 0000000000..76776a95aa
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.resx
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+
+ AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAA////AP64aABQUFAAwNjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAMDAAMDAwAAAAAAAAAAAAMCAgMDAwMDAwAAAAMDAAADAgICAwMDAwMDAwMCAgMAAAMCAwMD
+ AwMDAwMDAgIDAAMEBAQDAgMDAwMDAwICAgMDBAQEAwICAwQDAwQDAgIDAAMDAwICAgMCAgIDAwMDAAAA
+ AwICAgMCAgIDAgMAAAAAAAAAAwMEBAQEBAQCAwAAAAAAAwMEBAQDAwMDAwMAAAAAAwQEAwMEBAMEBAQC
+ AwAAAAMEBAMDBAMEBAQEAgMAAAAAAwMDBAQDBAMDAwIDAAAAAAMCAgICAgICAgMEBAMAAAAAAwICAgIC
+ AwMEBAQDAAAAAAADAwMDAwAAAwMDAJH/AAAAcwAAAAEAAIABAAAAAAAAAAAAAIABAADABwAA8AMAAOAD
+ AADAAQAAwAEAAOABAADgAAAA8AAAAPgxAAA=
+
+
+
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index dea5f2e799..869ead9042 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -67,17 +67,13 @@ namespace BizHawk.Client.EmuHawk
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.TruncateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem();
- this.ProjectOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.SetGreenzoneCapacityMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
- this.EnableGreenzoningMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AutofirePatternSkipsLagMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.CombineConsecutiveRecordingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.Use1PKeysMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.UseInputKeysItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.BindMarkersToInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -89,6 +85,7 @@ namespace BizHawk.Client.EmuHawk
this.AutopauseAtEndOfMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MetaSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.HeaderMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.GreenzoneSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.CommentsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -416,17 +413,13 @@ namespace BizHawk.Client.EmuHawk
// ConfigSubMenu
//
this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.ProjectOptionsMenuItem,
this.SetMaxUndoLevelsMenuItem,
- this.SetGreenzoneCapacityMenuItem,
this.toolStripSeparator9,
- this.EnableGreenzoningMenuItem,
this.AutofirePatternSkipsLagMenuItem,
this.AutoadjustInputMenuItem,
this.toolStripSeparator11,
this.DrawInputByDraggingMenuItem,
this.CombineConsecutiveRecordingsMenuItem,
- this.Use1PKeysMenuItem,
this.UseInputKeysItem,
this.toolStripSeparator4,
this.BindMarkersToInputMenuItem,
@@ -441,13 +434,6 @@ namespace BizHawk.Client.EmuHawk
this.ConfigSubMenu.Text = "&Config";
this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened);
//
- // ProjectOptionsMenuItem
- //
- this.ProjectOptionsMenuItem.Enabled = false;
- this.ProjectOptionsMenuItem.Name = "ProjectOptionsMenuItem";
- this.ProjectOptionsMenuItem.Size = new System.Drawing.Size(288, 22);
- this.ProjectOptionsMenuItem.Text = "&Project file saving options";
- //
// SetMaxUndoLevelsMenuItem
//
this.SetMaxUndoLevelsMenuItem.Enabled = false;
@@ -455,25 +441,11 @@ namespace BizHawk.Client.EmuHawk
this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(288, 22);
this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels";
//
- // SetGreenzoneCapacityMenuItem
- //
- this.SetGreenzoneCapacityMenuItem.Enabled = false;
- this.SetGreenzoneCapacityMenuItem.Name = "SetGreenzoneCapacityMenuItem";
- this.SetGreenzoneCapacityMenuItem.Size = new System.Drawing.Size(288, 22);
- this.SetGreenzoneCapacityMenuItem.Text = "Set Greenzone capacity";
- //
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(285, 6);
//
- // EnableGreenzoningMenuItem
- //
- this.EnableGreenzoningMenuItem.Enabled = false;
- this.EnableGreenzoningMenuItem.Name = "EnableGreenzoningMenuItem";
- this.EnableGreenzoningMenuItem.Size = new System.Drawing.Size(288, 22);
- this.EnableGreenzoningMenuItem.Text = "Enable Greenzoning";
- //
// AutofirePatternSkipsLagMenuItem
//
this.AutofirePatternSkipsLagMenuItem.Enabled = false;
@@ -507,13 +479,6 @@ namespace BizHawk.Client.EmuHawk
this.CombineConsecutiveRecordingsMenuItem.Size = new System.Drawing.Size(288, 22);
this.CombineConsecutiveRecordingsMenuItem.Text = "Combine consecutive Recordings/Draws";
//
- // Use1PKeysMenuItem
- //
- this.Use1PKeysMenuItem.Enabled = false;
- this.Use1PKeysMenuItem.Name = "Use1PKeysMenuItem";
- this.Use1PKeysMenuItem.Size = new System.Drawing.Size(288, 22);
- this.Use1PKeysMenuItem.Text = "Use 1P keys for all single Recordings";
- //
// UseInputKeysItem
//
this.UseInputKeysItem.Enabled = false;
@@ -575,6 +540,7 @@ namespace BizHawk.Client.EmuHawk
//
this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.HeaderMenuItem,
+ this.GreenzoneSettingsMenuItem,
this.CommentsMenuItem,
this.SubtitlesMenuItem});
this.MetaSubMenu.Name = "MetaSubMenu";
@@ -584,21 +550,28 @@ namespace BizHawk.Client.EmuHawk
// HeaderMenuItem
//
this.HeaderMenuItem.Name = "HeaderMenuItem";
- this.HeaderMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.HeaderMenuItem.Size = new System.Drawing.Size(184, 22);
this.HeaderMenuItem.Text = "&Header...";
this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click);
//
+ // GreenzoneSettingsMenuItem
+ //
+ this.GreenzoneSettingsMenuItem.Name = "GreenzoneSettingsMenuItem";
+ this.GreenzoneSettingsMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.GreenzoneSettingsMenuItem.Text = "&Greenzone Settings...";
+ this.GreenzoneSettingsMenuItem.Click += new System.EventHandler(this.GreenzoneSettingsMenuItem_Click);
+ //
// CommentsMenuItem
//
this.CommentsMenuItem.Name = "CommentsMenuItem";
- this.CommentsMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.CommentsMenuItem.Size = new System.Drawing.Size(184, 22);
this.CommentsMenuItem.Text = "&Comments...";
this.CommentsMenuItem.Click += new System.EventHandler(this.CommentsMenuItem_Click);
//
// SubtitlesMenuItem
//
this.SubtitlesMenuItem.Name = "SubtitlesMenuItem";
- this.SubtitlesMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.SubtitlesMenuItem.Size = new System.Drawing.Size(184, 22);
this.SubtitlesMenuItem.Text = "&Subtitles...";
this.SubtitlesMenuItem.Click += new System.EventHandler(this.SubtitlesMenuItem_Click);
//
@@ -837,21 +810,17 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.ToolStripMenuItem SelectBetweenMarkersMenuItem;
private System.Windows.Forms.ToolStripMenuItem ReselectClipboardMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
- private System.Windows.Forms.ToolStripMenuItem ProjectOptionsMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStripMenuItem HelpSubMenu;
private System.Windows.Forms.ToolStripMenuItem EnableTooltipsMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SetMaxUndoLevelsMenuItem;
- private System.Windows.Forms.ToolStripMenuItem SetGreenzoneCapacityMenuItem;
- private System.Windows.Forms.ToolStripMenuItem EnableGreenzoningMenuItem;
private System.Windows.Forms.ToolStripMenuItem AutofirePatternSkipsLagMenuItem;
private System.Windows.Forms.ToolStripMenuItem AutoadjustInputMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
private System.Windows.Forms.ToolStripMenuItem DrawInputByDraggingMenuItem;
private System.Windows.Forms.ToolStripMenuItem CombineConsecutiveRecordingsMenuItem;
- private System.Windows.Forms.ToolStripMenuItem Use1PKeysMenuItem;
private System.Windows.Forms.ToolStripMenuItem UseInputKeysItem;
private System.Windows.Forms.ToolStripMenuItem BindMarkersToInputMenuItem;
private System.Windows.Forms.ToolStripMenuItem EmptyNewMarkerNotesMenuItem;
@@ -877,5 +846,6 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.ToolStripMenuItem HeaderMenuItem;
private System.Windows.Forms.ToolStripMenuItem CommentsMenuItem;
private System.Windows.Forms.ToolStripMenuItem SubtitlesMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem GreenzoneSettingsMenuItem;
}
}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index c6d450f021..23c26a362e 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -396,6 +396,12 @@ namespace BizHawk.Client.EmuHawk
}
+ private void GreenzoneSettingsMenuItem_Click(object sender, EventArgs e)
+ {
+ new GreenzoneSettings(_tas.GreenzoneSettings).Show();
+ UpdateChangesIndicator();
+ }
+
private void CommentsMenuItem_Click(object sender, EventArgs e)
{
var form = new EditCommentsForm();