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

First Run of Hotkey Dialog.

This commit is contained in:
kylethomson 2011-02-20 02:59:15 +00:00
parent 14977cfc36
commit 1197a1bd33
5 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -151,6 +151,12 @@
<Compile Include="RecordMovie.Designer.cs">
<DependentUpon>RecordMovie.cs</DependentUpon>
</Compile>
<Compile Include="tools\HotkeyWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\HotkeyWindow.Designer.cs">
<DependentUpon>HotkeyWindow.cs</DependentUpon>
</Compile>
<Compile Include="tools\LuaWindow.cs">
<SubType>Form</SubType>
</Compile>
@ -229,6 +235,10 @@
<DependentUpon>RecordMovie.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="tools\HotkeyWindow.resx">
<DependentUpon>HotkeyWindow.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="tools\LuaWindow.resx">
<DependentUpon>LuaWindow.cs</DependentUpon>
<SubType>Designer</SubType>

24
BizHawk.MultiClient/Config.cs
View File

@ -73,6 +73,30 @@
public string SelectSlot7 = "7";
public string SelectSlot8 = "8";
public string SelectSlot9 = "9";
public string SaveSlot0 = "SHIFT+F0";
public string SaveSlot1 = "SHIFT+F1";
public string SaveSlot2 = "SHIFT+F2";
public string SaveSlot3 = "SHIFT+F3";
public string SaveSlot4 = "SHIFT+F4";
public string SaveSlot5 = "SHIFT+F5";
public string SaveSlot6 = "SHIFT+F6";
public string SaveSlot7 = "SHIFT+F7";
public string SaveSlot8 = "SHIFT+F8";
public string SaveSlot9 = "SHIFT+F9";
public string LoadSlot0 = "CTRL+F0";
public string LoadSlot1 = "CTRL+F1";
public string LoadSlot2 = "CTRL+F2";
public string LoadSlot3 = "CTRL+F3";
public string LoadSlot4 = "CTRL+F4";
public string LoadSlot5 = "CTRL+F5";
public string LoadSlot6 = "CTRL+F6";
public string LoadSlot7 = "CTRL+F7";
public string LoadSlot8 = "CTRL+F8";
public string LoadSlot9 = "CTRL+F9";
// SMS / GameGear Settings

2
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

@ -848,7 +848,7 @@
//
// hotkeysToolStripMenuItem
//
this.hotkeysToolStripMenuItem.Enabled = false;
this.hotkeysToolStripMenuItem.Enabled = true;
this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem";
this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(171, 24);
this.hotkeysToolStripMenuItem.Text = "&Hotkeys";

3
BizHawk.MultiClient/MainForm.cs
View File

@ -711,7 +711,8 @@ namespace BizHawk.MultiClient
private void hotkeysToolStripMenuItem_Click(object sender, EventArgs e)
{
BizHawk.MultiClient.tools.HotkeyWindow h = new BizHawk.MultiClient.tools.HotkeyWindow();
h.ShowDialog();
}
private void displayFPSToolStripMenuItem_Click(object sender, EventArgs e)

7
BizHawk.MultiClient/config/InputConfig.cs
View File

@ -85,6 +85,7 @@ namespace BizHawk.MultiClient
}
private void UpdateSMS(int prev)
{
ButtonsGroupBox.Controls.Clear();
InputWidget TempBox;
Label TempLabel;
TempBox = TextBoxes[0] as InputWidget;
@ -153,6 +154,7 @@ namespace BizHawk.MultiClient
}
private void UpdatePCE(int prev)
{
ButtonsGroupBox.Controls.Clear();
InputWidget TempBox;
Label TempLabel;
TempBox = TextBoxes[0] as InputWidget;
@ -217,8 +219,8 @@ namespace BizHawk.MultiClient
ButtonMappings[6] = TruncateButtonMapping(Global.Config.GameBoyController.Start);
ButtonMappings[7] = TruncateButtonMapping(Global.Config.GameBoyController.Select);
Changed = true;
Labels.Clear();
TextBoxes.Clear();
Labels.Clear();
TextBoxes.Clear();
for (int i = 0; i < NESControlList.Length; i++)
{
TempLabel = new Label();
@ -236,6 +238,7 @@ namespace BizHawk.MultiClient
}
private void UpdateGameBoy()
{
ButtonsGroupBox.Controls.Clear();
InputWidget TempBox;
Label TempLabel;
TempBox = TextBoxes[0] as InputWidget;