ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save & Load Named State functions added to hotkey dialog, and dynamically update shortcut string on menu items

This commit is contained in:
andres.delikat 2011-04-11 00:22:17 +00:00
parent 2dd1c91174
commit 01aa6850ff
7 changed files with 280 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

293
BizHawk.MultiClient/AboutBox.Designer.cs generated
View File

@ -28,152 +28,153 @@
/// </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";
((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.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();
}

5
BizHawk.MultiClient/AboutBox.cs
View File

@ -81,6 +81,11 @@ namespace BizHawk.MultiClient
pictureBox2.Location = new Point((int)(353 + 800 + -800* Math.Abs(Math.Sin(ctr / 18.0))), pictureBox2.Location.Y);
}
private void AboutBox_Load(object sender, EventArgs e)
{
}
}

8
BizHawk.MultiClient/AboutBox.resx
View File

@ -124,8 +124,8 @@
<data name="mom1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAGkAAACPCAIAAAB2/WLyAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
Cw0B7QfALAAAhcFJREFUeF7NvQVg2+e9LuwyJmnYzAxiZmZGywLLlmSxZAtsy8zMzHFiJw4zNFBm2Lq1
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDAAA
CwwBP0AiyAAAhcFJREFUeF7NvQVg2+e9LuwyJmnYzAxiZmZGywLLlmSxZAtsy8zMzHFiJw4zNFBm2Lq1
27p10EG7dd1WCpPzvUrOOXf3u+fe0++e821HfauqieJIz/+Hz+953/9D9+7di/mPHndvrT/8yEMxMQ+t
37v38MMPgT9w/w/de/ihmDs3rj9059YjTz761We/e+3lF373m4+//stnVy5/98QTTyQkJFy9evXzzz+/
e/fuzZs379y5c/v27ccff/yRRx559NFHv/rm6/ik1JiHHgK/de3aVfDTnnzy8UcefvhPn30O3nMv5u5D
@ -702,8 +702,8 @@
<data name="mom2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAGwAAACQCAIAAABiVBn4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDQAA
Cw0B7QfALAAAh8BJREFUeF7U/QVgm+fdLoxnhbVdIQ3HjmNmEjMzM1kWWBazZIFlWZKZmdmOw3GY0yYp
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDAAA
CwwBP0AiyAAAh8BJREFUeF7U/QVgm+fdLoxnhbVdIQ3HjmNmEjMzM1kWWBazZIFlWZKZmdmOw3GY0yYp
49Zt3dptHXO3vtvecpj+t5IXds75vrOe7+x9t796V33qKLZ8PT+8ftd962v37t1b97ced27efejhr61b
97W79+499NDXwF+4/5fuPfS1dbevX/va7ZsPP/7Ix7//zWsvv/CbX37wyZ9//+UXnz/22GM7duy4cuXK
hx9+eOfOnRs3bty+ffvWrVtf//rXH3744UceeeTjTz/J3Jm77mtfA3909eoV8N0ef/zrDz/00B9//yF4

39
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -481,46 +481,12 @@ namespace BizHawk.MultiClient
private void saveNamedStateToolStripMenuItem_Click(object sender, EventArgs e)
{
var sfd = new SaveFileDialog();
string path = Global.Game.SaveStatePrefix;
sfd.InitialDirectory = path;
sfd.FileName = "QuickSave0.State";
var file = new FileInfo(path);
if (file.Directory.Exists == false)
file.Directory.Create();
var result = sfd.ShowDialog();
if (result != DialogResult.OK)
return;
var writer = new StreamWriter(sfd.FileName);
Global.Emulator.SaveStateText(writer);
writer.Close();
Global.RenderPanel.AddMessage(sfd.FileName + " saved");
SaveStateAs();
}
private void loadNamedStateToolStripMenuItem_Click(object sender, EventArgs e)
{
var ofd = new OpenFileDialog();
ofd.InitialDirectory = Global.Game.SaveStatePrefix;
ofd.Filter = "Save States (*.State)|*.State|All File|*.*";
ofd.RestoreDirectory = true;
Global.Sound.StopSound();
var result = ofd.ShowDialog();
Global.Sound.StartSound();
if (result != DialogResult.OK)
return;
if (File.Exists(ofd.FileName) == false)
return;
var reader = new StreamReader(ofd.FileName);
Global.Emulator.LoadStateText(reader);
reader.Close();
Global.RenderPanel.AddMessage(ofd.FileName + " loaded");
LoadStateAs();
}
private void toolBoxToolStripMenuItem_Click(object sender, EventArgs e)
@ -549,7 +515,6 @@ namespace BizHawk.MultiClient
selectSlot7ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot7;
selectSlot8ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot8;
selectSlot9ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.SelectSlot9;
}
}
}

59
BizHawk.MultiClient/MainForm.cs
View File

@ -307,6 +307,8 @@ namespace BizHawk.MultiClient
controls.BindMulti("LoadSlot8", Global.Config.LoadSlot8);
controls.BindMulti("LoadSlot9", Global.Config.LoadSlot9);
controls.BindMulti("ToolBox", Global.Config.ToolBox);
controls.BindMulti("Save Named State", Global.Config.SaveNamedState);
controls.BindMulti("Load Named State", Global.Config.LoadNamedState);
Global.ClientControls = controls;
var smsControls = new Controller(SMS.SmsController);
@ -712,8 +714,20 @@ namespace BizHawk.MultiClient
Global.ClientControls.UnpressButton("Toggle Fullscreen");
ToggleFullscreen();
}
}
if (Global.ClientControls["Save Named State"])
{
SaveStateAs();
Global.ClientControls.UnpressButton("Save Named State");
}
if (Global.ClientControls["Load Named State"])
{
LoadStateAs();
Global.ClientControls.UnpressButton("Load Named State");
}
}
void StepRunLoop_Throttle()
{
throttle.signal_fastForward = Global.ClientControls["Fast Forward"];
@ -857,6 +871,27 @@ namespace BizHawk.MultiClient
Global.RenderPanel.AddMessage("Saved state: " + name);
}
private void SaveStateAs()
{
var sfd = new SaveFileDialog();
string path = Global.Game.SaveStatePrefix;
sfd.InitialDirectory = path;
sfd.FileName = "QuickSave0.State";
var file = new FileInfo(path);
if (file.Directory.Exists == false)
file.Directory.Create();
var result = sfd.ShowDialog();
if (result != DialogResult.OK)
return;
var writer = new StreamWriter(sfd.FileName);
Global.Emulator.SaveStateText(writer);
writer.Close();
Global.RenderPanel.AddMessage(sfd.FileName + " saved");
}
private void LoadState(string name)
{
string path = Global.Game.SaveStatePrefix + "." + name + ".State";
@ -869,6 +904,28 @@ namespace BizHawk.MultiClient
Global.RenderPanel.AddMessage("Loaded state: " + name);
}
private void LoadStateAs()
{
var ofd = new OpenFileDialog();
ofd.InitialDirectory = Global.Game.SaveStatePrefix;
ofd.Filter = "Save States (*.State)|*.State|All File|*.*";
ofd.RestoreDirectory = true;
Global.Sound.StopSound();
var result = ofd.ShowDialog();
Global.Sound.StartSound();
if (result != DialogResult.OK)
return;
if (File.Exists(ofd.FileName) == false)
return;
var reader = new StreamReader(ofd.FileName);
Global.Emulator.LoadStateText(reader);
reader.Close();
Global.RenderPanel.AddMessage(ofd.FileName + " loaded");
}
private void SaveSlotSelectedMessage()
{

66
BizHawk.MultiClient/config/HotkeyWindow.Designer.cs generated
View File

@ -52,6 +52,11 @@
this.label31 = new System.Windows.Forms.Label();
this.IDW_QuickSave = new BizHawk.MultiClient.InputWidget();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.HR = new BizHawk.Core.HorizontalLine();
this.label48 = new System.Windows.Forms.Label();
this.IDW_LOADNAMEDSTATE = new BizHawk.MultiClient.InputWidget();
this.label47 = new System.Windows.Forms.Label();
this.IDW_SAVENAMEDSTATE = new BizHawk.MultiClient.InputWidget();
this.IDW_SS1 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST7 = new BizHawk.MultiClient.InputWidget();
this.IDW_ST0 = new BizHawk.MultiClient.InputWidget();
@ -141,7 +146,7 @@
this.hotkeyTabs.Location = new System.Drawing.Point(12, 12);
this.hotkeyTabs.Name = "hotkeyTabs";
this.hotkeyTabs.SelectedIndex = 0;
this.hotkeyTabs.Size = new System.Drawing.Size(598, 290);
this.hotkeyTabs.Size = new System.Drawing.Size(598, 328);
this.hotkeyTabs.TabIndex = 97;
this.hotkeyTabs.TabStop = false;
this.hotkeyTabs.SelectedIndexChanged += new System.EventHandler(this.hotkeyTabs_SelectedIndexChanged);
@ -171,7 +176,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 28);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(590, 258);
this.tabPage1.Size = new System.Drawing.Size(590, 296);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "General";
this.tabPage1.UseVisualStyleBackColor = true;
@ -356,6 +361,11 @@
//
// tabPage2
//
this.tabPage2.Controls.Add(this.HR);
this.tabPage2.Controls.Add(this.label48);
this.tabPage2.Controls.Add(this.IDW_LOADNAMEDSTATE);
this.tabPage2.Controls.Add(this.label47);
this.tabPage2.Controls.Add(this.IDW_SAVENAMEDSTATE);
this.tabPage2.Controls.Add(this.IDW_SS1);
this.tabPage2.Controls.Add(this.IDW_ST7);
this.tabPage2.Controls.Add(this.IDW_ST0);
@ -419,11 +429,50 @@
this.tabPage2.Location = new System.Drawing.Point(4, 28);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(590, 258);
this.tabPage2.Size = new System.Drawing.Size(590, 296);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Save States";
this.tabPage2.UseVisualStyleBackColor = true;
//
// HR
//
this.HR.Location = new System.Drawing.Point(10, 251);
this.HR.Name = "HR";
this.HR.Size = new System.Drawing.Size(558, 2);
this.HR.TabIndex = 0;
//
// label48
//
this.label48.AutoSize = true;
this.label48.Location = new System.Drawing.Point(282, 268);
this.label48.Name = "label48";
this.label48.Size = new System.Drawing.Size(96, 13);
this.label48.TabIndex = 122;
this.label48.Text = "Load Named State";
//
// IDW_LOADNAMEDSTATE
//
this.IDW_LOADNAMEDSTATE.Location = new System.Drawing.Point(382, 264);
this.IDW_LOADNAMEDSTATE.Name = "IDW_LOADNAMEDSTATE";
this.IDW_LOADNAMEDSTATE.Size = new System.Drawing.Size(100, 20);
this.IDW_LOADNAMEDSTATE.TabIndex = 121;
//
// label47
//
this.label47.AutoSize = true;
this.label47.Location = new System.Drawing.Point(55, 268);
this.label47.Name = "label47";
this.label47.Size = new System.Drawing.Size(97, 13);
this.label47.TabIndex = 120;
this.label47.Text = "Save Named State";
//
// IDW_SAVENAMEDSTATE
//
this.IDW_SAVENAMEDSTATE.Location = new System.Drawing.Point(154, 264);
this.IDW_SAVENAMEDSTATE.Name = "IDW_SAVENAMEDSTATE";
this.IDW_SAVENAMEDSTATE.Size = new System.Drawing.Size(100, 20);
this.IDW_SAVENAMEDSTATE.TabIndex = 119;
//
// IDW_SS1
//
this.IDW_SS1.BackColor = System.Drawing.SystemColors.Window;
@ -920,7 +969,7 @@
this.tabPage3.Location = new System.Drawing.Point(4, 28);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(590, 258);
this.tabPage3.Size = new System.Drawing.Size(590, 296);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "MultiTrack";
this.tabPage3.UseVisualStyleBackColor = true;
@ -1040,7 +1089,7 @@
// label38
//
this.label38.AutoSize = true;
this.label38.Location = new System.Drawing.Point(22, 305);
this.label38.Location = new System.Drawing.Point(22, 343);
this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(153, 13);
this.label38.TabIndex = 3;
@ -1050,7 +1099,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(622, 327);
this.ClientSize = new System.Drawing.Size(622, 362);
this.Controls.Add(this.label38);
this.Controls.Add(this.IDB_CANCEL);
this.Controls.Add(this.IDB_SAVE);
@ -1172,5 +1221,10 @@
private System.Windows.Forms.Label label45;
private InputWidget IDW_TOOLBOX;
private System.Windows.Forms.Label label46;
private System.Windows.Forms.Label label48;
private InputWidget IDW_LOADNAMEDSTATE;
private System.Windows.Forms.Label label47;
private InputWidget IDW_SAVENAMEDSTATE;
private BizHawk.Core.HorizontalLine HR;
}
}

4
BizHawk.MultiClient/config/HotkeyWindow.cs
View File

@ -58,6 +58,8 @@ namespace BizHawk.MultiClient.tools
IDW_ST8.Text = Global.Config.SelectSlot8;
IDW_ST9.Text = Global.Config.SelectSlot9;
IDW_TOOLBOX.Text = Global.Config.ToolBox;
IDW_SAVENAMEDSTATE.Text = Global.Config.SaveNamedState;
IDW_LOADNAMEDSTATE.Text = Global.Config.LoadNamedState;
}
private void button2_Click(object sender, EventArgs e)
{
@ -111,6 +113,8 @@ namespace BizHawk.MultiClient.tools
Global.Config.SelectSlot8 = IDW_ST8.Text;
Global.Config.SelectSlot9 = IDW_ST9.Text;
Global.Config.ToolBox = IDW_TOOLBOX.Text;
Global.Config.SaveNamedState = IDW_SAVENAMEDSTATE.Text;
Global.Config.LoadNamedState = IDW_LOADNAMEDSTATE.Text;
this.DialogResult = DialogResult.OK;
this.Close();
}