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

remove references to GBTools namespace

This commit is contained in:
adelikat 2013-11-09 00:27:07 +00:00
parent 2932a3a83c
commit 52146bff6b
11 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -197,20 +197,30 @@
<Compile Include="config\FirmwaresConfigInfo.Designer.cs">
<DependentUpon>FirmwaresConfigInfo.cs</DependentUpon>
</Compile>
<Compile Include="config\GB\BmpView.cs" />
<Compile Include="config\GB\CGBColorChooserForm.cs" />
<Compile Include="config\GB\BmpView.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="config\GB\CGBColorChooserForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\GB\CGBColorChooserForm.Designer.cs">
<DependentUpon>CGBColorChooserForm.cs</DependentUpon>
</Compile>
<Compile Include="config\GB\ColorChooserForm.cs" />
<Compile Include="config\GB\ColorChooserForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\GB\ColorChooserForm.Designer.cs">
<DependentUpon>ColorChooserForm.cs</DependentUpon>
</Compile>
<Compile Include="config\GB\DualGBFileSelector.cs" />
<Compile Include="config\GB\DualGBFileSelector.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="config\GB\DualGBFileSelector.Designer.cs">
<DependentUpon>DualGBFileSelector.cs</DependentUpon>
</Compile>
<Compile Include="config\GB\DualGBXMLCreator.cs" />
<Compile Include="config\GB\DualGBXMLCreator.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\GB\DualGBXMLCreator.Designer.cs">
<DependentUpon>DualGBXMLCreator.cs</DependentUpon>
</Compile>
@ -235,15 +245,21 @@
<Compile Include="config\MessageConfig.Designer.cs">
<DependentUpon>MessageConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\N64\N64VideoPluginconfig.cs" />
<Compile Include="config\N64\N64VideoPluginconfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\N64\N64VideoPluginconfig.Designer.cs">
<DependentUpon>N64VideoPluginconfig.cs</DependentUpon>
</Compile>
<Compile Include="config\NES\NESGraphicsConfig.cs" />
<Compile Include="config\NES\NESGraphicsConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\NES\NESGraphicsConfig.Designer.cs">
<DependentUpon>NESGraphicsConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\NES\NESSoundConfig.cs" />
<Compile Include="config\NES\NESSoundConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\NES\NESSoundConfig.Designer.cs">
<DependentUpon>NESSoundConfig.cs</DependentUpon>
</Compile>
@ -259,7 +275,9 @@
<Compile Include="config\PathInfo.Designer.cs">
<DependentUpon>PathInfo.cs</DependentUpon>
</Compile>
<Compile Include="config\PCE\PCEGraphicsConfig.cs" />
<Compile Include="config\PCE\PCEGraphicsConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\PCE\PCEGraphicsConfig.Designer.cs">
<DependentUpon>PCEGraphicsConfig.cs</DependentUpon>
</Compile>
@ -269,15 +287,21 @@
<Compile Include="config\RewindConfig.Designer.cs">
<DependentUpon>RewindConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\Saturn\SaturnPrefs.cs" />
<Compile Include="config\Saturn\SaturnPrefs.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\Saturn\SaturnPrefs.Designer.cs">
<DependentUpon>SaturnPrefs.cs</DependentUpon>
</Compile>
<Compile Include="config\SMS\SMSGraphicsConfig.cs" />
<Compile Include="config\SMS\SMSGraphicsConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\SMS\SMSGraphicsConfig.Designer.cs">
<DependentUpon>SMSGraphicsConfig.cs</DependentUpon>
</Compile>
<Compile Include="config\SNES\SNESOptions.cs" />
<Compile Include="config\SNES\SNESOptions.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="config\SNES\SNESOptions.Designer.cs">
<DependentUpon>SNESOptions.cs</DependentUpon>
</Compile>

6
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1195,7 +1195,7 @@ namespace BizHawk.Client.EmuHawk
private void CreateDualGbXmlMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Sound.StopSound();
using (var dlg = new GBtools.DualGBXMLCreator())
using (var dlg = new DualGBXMLCreator())
{
dlg.ShowDialog(this);
}
@ -1547,14 +1547,14 @@ namespace BizHawk.Client.EmuHawk
var gb = Global.Emulator as Gameboy;
if (gb.IsCGBMode())
{
if (GBtools.CGBColorChooserForm.DoCGBColorChooserFormDialog(this))
if (CGBColorChooserForm.DoCGBColorChooserFormDialog(this))
{
gb.SetCGBColors(Global.Config.CGBColors);
}
}
else
{
GBtools.ColorChooserForm.DoColorChooserFormDialog(gb.ChangeDMGColors, this);
ColorChooserForm.DoColorChooserFormDialog(gb.ChangeDMGColors, this);
}
}
}

2
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3350,7 +3350,7 @@ namespace BizHawk.Client.EmuHawk
{
using (StreamReader f = new StreamReader(Global.Config.GB_PaletteFile))
{
int[] colors = GBtools.ColorChooserForm.LoadPalFile(f);
int[] colors = ColorChooserForm.LoadPalFile(f);
if (colors != null)
gb.ChangeDMGColors(colors);
}

2
BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace BizHawk.Client.EmuHawk.GBtools
namespace BizHawk.Client.EmuHawk
{
partial class CGBColorChooserForm
{

2
BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
View File

@ -5,7 +5,7 @@ using BizHawk.Emulation.Consoles.GB;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk.GBtools
namespace BizHawk.Client.EmuHawk
{
public partial class CGBColorChooserForm : Form
{

2
BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace BizHawk.Client.EmuHawk.GBtools
namespace BizHawk.Client.EmuHawk
{
partial class ColorChooserForm
{

2
BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs
View File

@ -6,7 +6,7 @@ using System.IO;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk.GBtools
namespace BizHawk.Client.EmuHawk
{
public partial class ColorChooserForm : Form
{

2
BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace BizHawk.Client.EmuHawk.GBtools
namespace BizHawk.Client.EmuHawk
{
partial class DualGBFileSelector
{

2
BizHawk.Client.EmuHawk/config/GB/DualGBFileSelector.cs
View File

@ -9,7 +9,7 @@ using System.Windows.Forms;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk.GBtools
namespace BizHawk.Client.EmuHawk
{
public partial class DualGBFileSelector : UserControl
{

6
BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace BizHawk.Client.EmuHawk.GBtools
namespace BizHawk.Client.EmuHawk
{
partial class DualGBXMLCreator
{
@ -29,9 +29,9 @@
private void InitializeComponent()
{
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.dualGBFileSelector1 = new BizHawk.Client.EmuHawk.GBtools.DualGBFileSelector();
this.dualGBFileSelector1 = new DualGBFileSelector();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.dualGBFileSelector2 = new BizHawk.Client.EmuHawk.GBtools.DualGBFileSelector();
this.dualGBFileSelector2 = new DualGBFileSelector();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.textBoxName = new System.Windows.Forms.TextBox();
this.buttonOK = new System.Windows.Forms.Button();

2
BizHawk.Client.EmuHawk/config/GB/DualGBXMLCreator.cs
View File

@ -8,7 +8,7 @@ using System.Text;
using System.Windows.Forms;
using System.IO;
namespace BizHawk.Client.EmuHawk.GBtools
namespace BizHawk.Client.EmuHawk
{
public partial class DualGBXMLCreator : Form
{