Move Exception box from Client.Common to Client.EmuHawk, it is inappropriate to be in Client.Common
This commit is contained in:
parent
75e6216ca2
commit
6ff3215a5f
|
@ -111,12 +111,6 @@
|
||||||
<Compile Include="config\ToolDialogSettings.cs" />
|
<Compile Include="config\ToolDialogSettings.cs" />
|
||||||
<Compile Include="ControllerBinding.cs" />
|
<Compile Include="ControllerBinding.cs" />
|
||||||
<Compile Include="CoreFileProvider.cs" />
|
<Compile Include="CoreFileProvider.cs" />
|
||||||
<Compile Include="ExceptionBox.cs">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="ExceptionBox.Designer.cs">
|
|
||||||
<DependentUpon>ExceptionBox.cs</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="ExceptionClasses.cs" />
|
<Compile Include="ExceptionClasses.cs" />
|
||||||
<Compile Include="FirmwareManager.cs" />
|
<Compile Include="FirmwareManager.cs" />
|
||||||
<Compile Include="GLManager.cs">
|
<Compile Include="GLManager.cs">
|
||||||
|
@ -275,11 +269,6 @@
|
||||||
<Name>BizHawk.Bizware.BizwareGL</Name>
|
<Name>BizHawk.Bizware.BizwareGL</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<EmbeddedResource Include="ExceptionBox.resx">
|
|
||||||
<DependentUpon>ExceptionBox.cs</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
|
|
|
@ -466,6 +466,12 @@
|
||||||
<Compile Include="CoreFeatureAnalysis.Designer.cs">
|
<Compile Include="CoreFeatureAnalysis.Designer.cs">
|
||||||
<DependentUpon>CoreFeatureAnalysis.cs</DependentUpon>
|
<DependentUpon>CoreFeatureAnalysis.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="CustomControls\ExceptionBox.cs">
|
||||||
|
<SubType>Form</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="CustomControls\ExceptionBox.designer.cs">
|
||||||
|
<DependentUpon>ExceptionBox.cs</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="CustomControls\FolderBrowserDialogEx.cs">
|
<Compile Include="CustomControls\FolderBrowserDialogEx.cs">
|
||||||
<SubType>Component</SubType>
|
<SubType>Component</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
@ -1290,6 +1296,9 @@
|
||||||
<EmbeddedResource Include="CoreFeatureAnalysis.resx">
|
<EmbeddedResource Include="CoreFeatureAnalysis.resx">
|
||||||
<DependentUpon>CoreFeatureAnalysis.cs</DependentUpon>
|
<DependentUpon>CoreFeatureAnalysis.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="CustomControls\ExceptionBox.resx">
|
||||||
|
<DependentUpon>ExceptionBox.cs</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="CustomControls\InputConfigBase.resx">
|
<EmbeddedResource Include="CustomControls\InputConfigBase.resx">
|
||||||
<DependentUpon>InputConfigBase.cs</DependentUpon>
|
<DependentUpon>InputConfigBase.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
namespace BizHawk.Client.Common
|
namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
partial class ExceptionBox
|
partial class ExceptionBox
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
this.txtException = new System.Windows.Forms.TextBox();
|
this.txtException = new System.Windows.Forms.TextBox();
|
||||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||||
this.btnCopy = new System.Windows.Forms.Button();
|
this.btnCopy = new System.Windows.Forms.Button();
|
||||||
this.lblDone = new BizHawk.Client.Common.ExceptionBox.MyLabel();
|
this.lblDone = new ExceptionBox.MyLabel();
|
||||||
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
||||||
this.tableLayoutPanel1.SuspendLayout();
|
this.tableLayoutPanel1.SuspendLayout();
|
||||||
this.flowLayoutPanel1.SuspendLayout();
|
this.flowLayoutPanel1.SuspendLayout();
|
|
@ -7,7 +7,7 @@ using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
|
||||||
namespace BizHawk.Client.Common
|
namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
public partial class ExceptionBox : Form
|
public partial class ExceptionBox : Form
|
||||||
{
|
{
|
||||||
|
@ -26,10 +26,10 @@ namespace BizHawk.Client.Common
|
||||||
void DoCopy()
|
void DoCopy()
|
||||||
{
|
{
|
||||||
string txt = txtException.Text;
|
string txt = txtException.Text;
|
||||||
System.Windows.Forms.Clipboard.SetText(txt);
|
Clipboard.SetText(txt);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (System.Windows.Forms.Clipboard.GetText() == txt)
|
if (Clipboard.GetText() == txt)
|
||||||
{
|
{
|
||||||
lblDone.Text = "Done!";
|
lblDone.Text = "Done!";
|
||||||
lblDone.ForeColor = SystemColors.ControlText;
|
lblDone.ForeColor = SystemColors.ControlText;
|
Loading…
Reference in New Issue