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

Rename all "new" config dialogs to their correct names

This commit is contained in:
adelikat 2013-10-06 20:45:04 +00:00
parent b299430408
commit 8557c96758
17 changed files with 190 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -167,6 +167,12 @@
<Compile Include="config\AutofireConfig.Designer.cs">
<DependentUpon>AutofireConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\ControllerConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\ControllerConfig.Designer.cs">
<DependentUpon>ControllerConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\ControllerConfig\AnalogBindControl.cs">
<SubType>UserControl</SubType>
</Compile>
@ -194,6 +200,12 @@
<Compile Include="config\GifAnimator.Designer.cs">
<DependentUpon>GifAnimator.cs</DependentUpon>
</Compile>
<Compile Include="config\HotkeyConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\HotkeyConfig.Designer.cs">
<DependentUpon>HotkeyConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\InputWidget.cs">
<SubType>Component</SubType>
</Compile>
@ -203,17 +215,11 @@
<Compile Include="config\MessageConfig.Designer.cs">
<DependentUpon>MessageConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\NewControllerConfig.cs">
<Compile Include="config\PathConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\NewControllerConfig.Designer.cs">
<DependentUpon>NewControllerConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\NewHotkeyWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\NewHotkeyWindow.Designer.cs">
<DependentUpon>NewHotkeyWindow.cs</DependentUpon>
<Compile Include="config\PathConfig.Designer.cs">
<DependentUpon>PathConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\PathInfo.cs">
<SubType>Form</SubType>
@ -317,12 +323,6 @@
<Compile Include="NameStateForm.Designer.cs">
<DependentUpon>NameStateForm.cs</DependentUpon>
</Compile>
<Compile Include="config\NewPathConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\NewPathConfig.Designer.cs">
<DependentUpon>NewPathConfig.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="tools\Cheats\Cheat.cs" />
@ -573,7 +573,9 @@
<DependentUpon>SNESOptions.cs</DependentUpon>
</Compile>
<Compile Include="tools\StateVisualizer.cs" />
<Compile Include="tools\TI83\TI83KeyPad.cs" />
<Compile Include="tools\TI83\TI83KeyPad.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\TI83\TI83KeyPad.Designer.cs">
<DependentUpon>TI83KeyPad.cs</DependentUpon>
</Compile>
@ -725,6 +727,9 @@
<EmbeddedResource Include="AVOut\VideoWriterChooserForm.resx">
<DependentUpon>VideoWriterChooserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\ControllerConfig.resx">
<DependentUpon>ControllerConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\ControllerConfig\AnalogBindControl.resx">
<DependentUpon>AnalogBindControl.cs</DependentUpon>
</EmbeddedResource>
@ -737,11 +742,11 @@
<EmbeddedResource Include="config\GifAnimator.resx">
<DependentUpon>GifAnimator.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\NewControllerConfig.resx">
<DependentUpon>NewControllerConfig.cs</DependentUpon>
<EmbeddedResource Include="config\HotkeyConfig.resx">
<DependentUpon>HotkeyConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\NewHotkeyWindow.resx">
<DependentUpon>NewHotkeyWindow.cs</DependentUpon>
<EmbeddedResource Include="config\PathConfig.resx">
<DependentUpon>PathConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\PathInfo.resx">
<DependentUpon>PathInfo.cs</DependentUpon>
@ -763,9 +768,6 @@
<DependentUpon>NameStateForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="config\NewPathConfig.resx">
<DependentUpon>NewPathConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>

48
BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
View File

@ -169,6 +169,12 @@
<Compile Include="config\AutofireConfig.Designer.cs">
<DependentUpon>AutofireConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\ControllerConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\ControllerConfig.Designer.cs">
<DependentUpon>ControllerConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\ControllerConfig\AnalogBindControl.cs">
<SubType>UserControl</SubType>
</Compile>
@ -196,6 +202,12 @@
<Compile Include="config\GifAnimator.Designer.cs">
<DependentUpon>GifAnimator.cs</DependentUpon>
</Compile>
<Compile Include="config\HotkeyConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\HotkeyConfig.Designer.cs">
<DependentUpon>HotkeyConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\InputWidget.cs">
<SubType>Component</SubType>
</Compile>
@ -205,23 +217,11 @@
<Compile Include="config\MessageConfig.Designer.cs">
<DependentUpon>MessageConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\NewControllerConfig.cs">
<Compile Include="config\PathConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\NewControllerConfig.Designer.cs">
<DependentUpon>NewControllerConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\NewHotkeyWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\NewHotkeyWindow.Designer.cs">
<DependentUpon>NewHotkeyWindow.cs</DependentUpon>
</Compile>
<Compile Include="config\NewPathConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\NewPathConfig.Designer.cs">
<DependentUpon>NewPathConfig.cs</DependentUpon>
<Compile Include="config\PathConfig.Designer.cs">
<DependentUpon>PathConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\PathInfo.cs">
<SubType>Form</SubType>
@ -575,7 +575,9 @@
<DependentUpon>SNESOptions.cs</DependentUpon>
</Compile>
<Compile Include="tools\StateVisualizer.cs" />
<Compile Include="tools\TI83\TI83KeyPad.cs" />
<Compile Include="tools\TI83\TI83KeyPad.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\TI83\TI83KeyPad.Designer.cs">
<DependentUpon>TI83KeyPad.cs</DependentUpon>
</Compile>
@ -727,6 +729,9 @@
<EmbeddedResource Include="AVOut\VideoWriterChooserForm.resx">
<DependentUpon>VideoWriterChooserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\ControllerConfig.resx">
<DependentUpon>ControllerConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\ControllerConfig\AnalogBindControl.resx">
<DependentUpon>AnalogBindControl.cs</DependentUpon>
</EmbeddedResource>
@ -739,14 +744,11 @@
<EmbeddedResource Include="config\GifAnimator.resx">
<DependentUpon>GifAnimator.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\NewControllerConfig.resx">
<DependentUpon>NewControllerConfig.cs</DependentUpon>
<EmbeddedResource Include="config\HotkeyConfig.resx">
<DependentUpon>HotkeyConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\NewHotkeyWindow.resx">
<DependentUpon>NewHotkeyWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\NewPathConfig.resx">
<DependentUpon>NewPathConfig.cs</DependentUpon>
<EmbeddedResource Include="config\PathConfig.resx">
<DependentUpon>PathConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="config\PathInfo.resx">
<DependentUpon>PathInfo.cs</DependentUpon>

2
BizHawk.MultiClient/Config.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.MultiClient
{
public Config()
{
config.NewControllerConfig.ConfigCheckAllControlDefaults(this);
ControllerConfig.ConfigCheckAllControlDefaults(this);
}
public void ResolveDefaults()

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

@ -439,7 +439,7 @@ namespace BizHawk.MultiClient
private void OpenControllerConfig()
{
config.NewControllerConfig c = new config.NewControllerConfig(Global.Emulator.ControllerDefinition);
ControllerConfig c = new ControllerConfig(Global.Emulator.ControllerDefinition);
c.ShowDialog();
if (c.DialogResult == DialogResult.OK)
{
@ -455,7 +455,7 @@ namespace BizHawk.MultiClient
private void OpenHotkeyDialog()
{
NewHotkeyWindow h = new NewHotkeyWindow();
HotkeyConfig h = new HotkeyConfig();
h.ShowDialog();
if (h.DialogResult == DialogResult.OK)
{
@ -691,7 +691,7 @@ namespace BizHawk.MultiClient
private void pathsToolStripMenuItem_Click(object sender, EventArgs e)
{
new NewPathConfig().ShowDialog();
new PathConfig().ShowDialog();
}
private void displayRerecordCountToolStripMenuItem_Click(object sender, EventArgs e)
@ -2330,7 +2330,7 @@ namespace BizHawk.MultiClient
private void pathsToolStripMenuItem1_Click(object sender, EventArgs e)
{
new NewPathConfig().ShowDialog();
new PathConfig().ShowDialog();
}
private void soundToolStripMenuItem1_Click(object sender, EventArgs e)

4
BizHawk.MultiClient/MainForm.cs
View File

@ -1785,9 +1785,9 @@ namespace BizHawk.MultiClient
//modals that need to capture input for binding purposes get input, of course
//if (ActiveForm is HotkeyWindow) return true;
if (ActiveForm is NewHotkeyWindow) return true;
if (ActiveForm is HotkeyConfig) return true;
//if (ActiveForm is ControllerConfig) return true;
if (ActiveForm is config.NewControllerConfig) return true;
if (ActiveForm is ControllerConfig) return true;
if (ActiveForm is TAStudio) return true;
if (ActiveForm is VirtualPadForm) return true;
//if no form is active on this process, then the background input setting applies

6
BizHawk.MultiClient/config/NewControllerConfig.Designer.cs → BizHawk.MultiClient/config/ControllerConfig.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace BizHawk.MultiClient.config
namespace BizHawk.MultiClient
{
partial class NewControllerConfig
partial class ControllerConfig
{
/// <summary>
/// Required designer variable.
@ -28,7 +28,7 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewControllerConfig));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControllerConfig));
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();

11
BizHawk.MultiClient/config/NewControllerConfig.cs → BizHawk.MultiClient/config/ControllerConfig.cs
View File

@ -3,14 +3,13 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using BizHawk.MultiClient.config.ControllerConfig;
namespace BizHawk.MultiClient.config
namespace BizHawk.MultiClient
{
public partial class NewControllerConfig : Form
public partial class ControllerConfig : Form
{
static readonly Dictionary<string, Bitmap> ControllerImages = new Dictionary<string, Bitmap>();
static NewControllerConfig()
static ControllerConfig()
{
ControllerImages.Add("NES Controller", Properties.Resources.NES_Controller);
ControllerImages.Add("SNES Controller", Properties.Resources.SNES_Controller);
@ -38,7 +37,7 @@ namespace BizHawk.MultiClient.config
const int MAXPLAYERS = 8;
string ControllerType;
private NewControllerConfig()
private ControllerConfig()
{
InitializeComponent();
}
@ -132,7 +131,7 @@ namespace BizHawk.MultiClient.config
private ControllerDefinition the_definition;
public NewControllerConfig(ControllerDefinition def)
public ControllerConfig(ControllerDefinition def)
: this()
{
the_definition = def;

0
BizHawk.MultiClient/config/NewControllerConfig.resx → BizHawk.MultiClient/config/ControllerConfig.resx
View File

2
BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace BizHawk.MultiClient.config.ControllerConfig
namespace BizHawk.MultiClient
{
partial class AnalogBindControl
{

2
BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs
View File

@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace BizHawk.MultiClient.config.ControllerConfig
namespace BizHawk.MultiClient
{
public partial class AnalogBindControl : UserControl
{

2
BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs
View File

@ -5,7 +5,7 @@ using System.Text;
using System.Windows.Forms;
using System.Drawing;
namespace BizHawk.MultiClient.config.ControllerConfig
namespace BizHawk.MultiClient
{
class AnalogBindPanel : UserControl
{

4
BizHawk.MultiClient/config/NewHotkeyWindow.Designer.cs → BizHawk.MultiClient/config/HotkeyConfig.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace BizHawk.MultiClient
{
partial class NewHotkeyWindow
partial class HotkeyConfig
{
/// <summary>
/// Required designer variable.
@ -28,7 +28,7 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewHotkeyWindow));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeyConfig));
this.label38 = new System.Windows.Forms.Label();
this.AutoTabCheckBox = new System.Windows.Forms.CheckBox();
this.HotkeyTabControl = new System.Windows.Forms.TabControl();

4
BizHawk.MultiClient/config/NewHotkeyWindow.cs → BizHawk.MultiClient/config/HotkeyConfig.cs
View File

@ -9,9 +9,9 @@ using System.Windows.Forms;
namespace BizHawk.MultiClient
{
public partial class NewHotkeyWindow : Form
public partial class HotkeyConfig : Form
{
public NewHotkeyWindow()
public HotkeyConfig()
{
InitializeComponent();
}

0
BizHawk.MultiClient/config/NewHotkeyWindow.resx → BizHawk.MultiClient/config/HotkeyConfig.resx
View File

2
BizHawk.MultiClient/config/NewPathConfig.Designer.cs → BizHawk.MultiClient/config/PathConfig.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace BizHawk.MultiClient
{
partial class NewPathConfig
partial class PathConfig
{
/// <summary>
/// Required designer variable.

4
BizHawk.MultiClient/config/NewPathConfig.cs → BizHawk.MultiClient/config/PathConfig.cs
View File

@ -9,7 +9,7 @@ using System.Windows.Forms;
namespace BizHawk.MultiClient
{
public partial class NewPathConfig : Form
public partial class PathConfig : Form
{
//All path text boxes should do some kind of error checking
//config path under base, config will default to %exe%
@ -42,7 +42,7 @@ namespace BizHawk.MultiClient
}
}
public NewPathConfig()
public PathConfig()
{
InitializeComponent();
}

0
BizHawk.MultiClient/config/NewPathConfig.resx → BizHawk.MultiClient/config/PathConfig.resx
View File