From a16cd68fa55069831184b15caf43d644d154a6dd Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Tue, 30 Aug 2011 22:35:57 +0000
Subject: [PATCH] DiscoHawk - make a windows application instead of console. 
 Add the default bizhawk icon.  Start a new Main form but it isn't the one
 that loads, yet.

---
 DiscoHawk/DiscoHawk.csproj            | 20 +++++++++++++++++++-
 DiscoHawk/DiscoHawkDialog.Designer.cs |  3 ++-
 DiscoHawk/DiscoHawkDialog.cs          |  5 +++++
 DiscoHawk/DiscoHawkDialog.resx        |  4 ++--
 DiscoHawk/ProgressDialog.Designer.cs  |  1 +
 DiscoHawk/ProgressDialog.cs           |  5 +++++
 DiscoHawk/ProgressDialog.resx         |  4 ++--
 7 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/DiscoHawk/DiscoHawk.csproj b/DiscoHawk/DiscoHawk.csproj
index 9dad9f9292..0a5fa0f81f 100644
--- a/DiscoHawk/DiscoHawk.csproj
+++ b/DiscoHawk/DiscoHawk.csproj
@@ -6,7 +6,7 @@
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C4366030-6D03-424B-AE53-F4F43BB217C3}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DiscoHawk</RootNamespace>
     <AssemblyName>DiscoHawk</AssemblyName>
@@ -58,6 +58,12 @@
   <PropertyGroup>
     <NoWin32Manifest>true</NoWin32Manifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>corphawk.ico</ApplicationIcon>
+  </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -74,6 +80,12 @@
     <Compile Include="DiscoHawkDialog.Designer.cs">
       <DependentUpon>DiscoHawkDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="MainDiscoForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainDiscoForm.Designer.cs">
+      <DependentUpon>MainDiscoForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="ProgressDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -95,6 +107,9 @@
     <EmbeddedResource Include="DiscoHawkDialog.resx">
       <DependentUpon>DiscoHawkDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MainDiscoForm.resx">
+      <DependentUpon>MainDiscoForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ProgressDialog.resx">
       <DependentUpon>ProgressDialog.cs</DependentUpon>
     </EmbeddedResource>
@@ -130,4 +145,7 @@
       <Name>BizHawk.Util</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="corphawk.ico" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DiscoHawk/DiscoHawkDialog.Designer.cs b/DiscoHawk/DiscoHawkDialog.Designer.cs
index b5b99ef533..d9eec3d5b9 100644
--- a/DiscoHawk/DiscoHawkDialog.Designer.cs
+++ b/DiscoHawk/DiscoHawkDialog.Designer.cs
@@ -31,7 +31,7 @@
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DiscoHawkDialog));
 			this.btnAddDisc = new System.Windows.Forms.Button();
 			this.lvDiscs = new System.Windows.Forms.ListView();
-			this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+			this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.groupBox1 = new System.Windows.Forms.GroupBox();
 			this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
 			this.lblSize = new System.Windows.Forms.Label();
@@ -401,6 +401,7 @@
 			this.lblMagicDragArea.Size = new System.Drawing.Size(147, 70);
 			this.lblMagicDragArea.TabIndex = 21;
 			this.lblMagicDragArea.Text = "Drag a cue into the DRAG HERE FOR MAGIC area for magic";
+			this.lblMagicDragArea.Click += new System.EventHandler(this.lblMagicDragArea_Click);
 			this.lblMagicDragArea.DragDrop += new System.Windows.Forms.DragEventHandler(this.handleDragDrop);
 			this.lblMagicDragArea.DragEnter += new System.Windows.Forms.DragEventHandler(this.handleDragEnter);
 			// 
diff --git a/DiscoHawk/DiscoHawkDialog.cs b/DiscoHawk/DiscoHawkDialog.cs
index 00b6c0442b..bc12805ae8 100644
--- a/DiscoHawk/DiscoHawkDialog.cs
+++ b/DiscoHawk/DiscoHawkDialog.cs
@@ -224,5 +224,10 @@ namespace BizHawk
 			Dump(cueBin, Path.GetDirectoryName(sfd.FileName), prefs);
 		}
 
+		private void lblMagicDragArea_Click(object sender, EventArgs e)
+		{
+
+		}
+
 	}
 }
diff --git a/DiscoHawk/DiscoHawkDialog.resx b/DiscoHawk/DiscoHawkDialog.resx
index 5141324bbb..570069991b 100644
--- a/DiscoHawk/DiscoHawkDialog.resx
+++ b/DiscoHawk/DiscoHawkDialog.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="label11.Text" xml:space="preserve">
     <value>This stuff is front and center because it is a primary way of visualizing the data. But maybe not later (later it would be tree-and-list). Maybe then all these options and 'output cue preview' will move into another window that pops up when you chooes Export Cue+XXX</value>
diff --git a/DiscoHawk/ProgressDialog.Designer.cs b/DiscoHawk/ProgressDialog.Designer.cs
index f5c0433aa3..9256b5a530 100644
--- a/DiscoHawk/ProgressDialog.Designer.cs
+++ b/DiscoHawk/ProgressDialog.Designer.cs
@@ -70,6 +70,7 @@
 			this.Controls.Add(this.progressBar1);
 			this.Name = "ProgressDialog";
 			this.Text = "Progress";
+			this.Load += new System.EventHandler(this.ProgressDialog_Load);
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
diff --git a/DiscoHawk/ProgressDialog.cs b/DiscoHawk/ProgressDialog.cs
index f3e94d6d31..0abab7385e 100644
--- a/DiscoHawk/ProgressDialog.cs
+++ b/DiscoHawk/ProgressDialog.cs
@@ -39,5 +39,10 @@ namespace BizHawk
 			}
 			lblMessage.Text = pr.Message;
 		}
+
+		private void ProgressDialog_Load(object sender, EventArgs e)
+		{
+
+		}
 	}
 }
diff --git a/DiscoHawk/ProgressDialog.resx b/DiscoHawk/ProgressDialog.resx
index ff31a6db56..c7e0d4bdf1 100644
--- a/DiscoHawk/ProgressDialog.resx
+++ b/DiscoHawk/ProgressDialog.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file