WinGui:

- Some C# Code fixes. Parser.cs is currently missing in action. Will appear soon hopefully.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@675 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 3cd67f65894a12bbf11676ad2a0ba23639504fc4..10e4b29d6250749b4b4d168d1aabcc160684f713 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -37,6 +37,12 @@
     <Reference Include="System.Xml" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <Compile Include="frmEncodeOutput.cs">\r
+      <SubType>Form</SubType>\r
+    </Compile>\r
+    <Compile Include="frmEncodeOutput.Designer.cs">\r
+      <DependentUpon>frmEncodeOutput.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="frmAbout.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -69,6 +75,10 @@
     <Compile Include="Parsing\Title.cs" />\r
     <Compile Include="Program.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
+    <EmbeddedResource Include="frmEncodeOutput.resx">\r
+      <DependentUpon>frmEncodeOutput.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="frmAbout.resx">\r
       <SubType>Designer</SubType>\r
       <DependentUpon>frmAbout.cs</DependentUpon>\r

diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs
index da1b653ac85809d02f3f63ab699d7bec192759a1..130ffa2f3c5729d1aefee37bbe6206fe4d2ca6a3 100644 (file)
--- a/win/C#/frmDvdInfo.cs
+++ b/win/C#/frmDvdInfo.cs
@@ -8,14 +8,14 @@ using System.Windows.Forms;
 \r
 namespace Handbrake\r
 {\r
-    public partial class frmDVDData : Form\r
+    public partial class frmDvdInfo : Form\r
     {\r
 \r
         /*\r
          * This window should be used to display the RAW output of the handbrake CLI which is produced during the scan.\r
          */\r
 \r
-        public frmDVDData()\r
+        public frmDvdInfo()\r
         {\r
             InitializeComponent();\r
         }\r

diff --git a/win/C#/frmEncodeOutput.Designer.cs b/win/C#/frmEncodeOutput.Designer.cs
index 0cb4fcb47df3db4db7297c20a36660157e2ce5a6..a8d4782b3ddc164633c7522427ae5fd9a44b65b4 100644 (file)
--- a/win/C#/frmEncodeOutput.Designer.cs
+++ b/win/C#/frmEncodeOutput.Designer.cs
@@ -1,6 +1,6 @@
 namespace Handbrake\r
 {\r
-    partial class frmDVDData\r
+    partial class frmDvdInfo\r
     {\r
         /// <summary>\r
         /// Required designer variable.\r
@@ -82,7 +82,6 @@ namespace Handbrake
             this.Name = "frmDVDData";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Read DVD";\r
-            this.Load += new System.EventHandler(this.frmDVDData_Load);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r

diff --git a/win/C#/frmEncodeOutput.cs b/win/C#/frmEncodeOutput.cs
index da1b653ac85809d02f3f63ab699d7bec192759a1..7418a6002a43843e8a79bf881ecb144dd0137861 100644 (file)
--- a/win/C#/frmEncodeOutput.cs
+++ b/win/C#/frmEncodeOutput.cs
@@ -12,7 +12,8 @@ namespace Handbrake
     {\r
 \r
         /*\r
-         * This window should be used to display the RAW output of the handbrake CLI which is produced during the scan.\r
+         * This window will be used to display the raw output of hbcli.exe when it is encoding.\r
+         * \r
          */\r
 \r
         public frmDVDData()\r
@@ -24,5 +25,10 @@ namespace Handbrake
         {\r
             this.Close();\r
         }\r
+\r
+        private void frmDVDData_Load(object sender, EventArgs e)\r
+        {\r
+\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 78c4a9a2e9c80ec9b918dfdde68c2a8c9d35f244..504179e0e58c80c04e4ca46aeea0635d05cfcf55 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -317,13 +317,14 @@ namespace Handbrake
         // TOOLS MENU --------------------------------------------------------------\r
         private void mnu_encode_Click(object sender, EventArgs e)\r
         {\r
-            Form Queue = new frmQueue();\r
+            string query = ""; // temp fix for bug here.\r
+            Form Queue = new frmQueue(query);\r
             Queue.ShowDialog();\r
         }\r
 \r
         private void mnu_viewDVDdata_Click(object sender, EventArgs e)\r
         {\r
-            Form DVDData = new frmDVDData();\r
+            Form DVDData = new frmDvdInfo();\r
             DVDData.Show();\r
         }\r
 \r
@@ -557,7 +558,9 @@ namespace Handbrake
 \r
         private void btn_queue_Click(object sender, EventArgs e)\r
         {\r
-            Form Queue = new frmQueue();\r
+            String query = GenerateTheQuery();\r
+            MessageBox.Show(query);\r
+            Form Queue = new frmQueue(query);\r
             Queue.Show();\r
         }\r
 \r
@@ -1025,7 +1028,7 @@ namespace Handbrake
                     videoEncoder = " -e x264b30";\r
                     break;\r
                 default:\r
-                    Mixdown = " -e x264";\r
+                    videoEncoder = " -e x264";\r
                     break;\r
             }\r
            \r
@@ -1044,7 +1047,7 @@ namespace Handbrake
                     audioEncoder = " -E ac3";\r
                     break;\r
                 default:\r
-                    Mixdown = " -E faac";\r
+                    audioEncoder = " -E faac";\r
                     break;\r
             }\r
 \r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index f17c5099e5741b00edc5821d15f16e99d2ede5d7..cfa3e64514d9ebc845a0175c563bc294497a4118 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -148,6 +148,7 @@ namespace Handbrake
             this.Name = "frmQueue";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Queue";\r
+            this.Load += new System.EventHandler(this.frmQueue_Load);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 16a7ae6f0ceca07e3817f491d8dde32521929357..e806ad87963369707964626f5278487fa1ff971e 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -10,19 +10,31 @@ namespace Handbrake
 {\r
     public partial class frmQueue : Form\r
     {\r
-        public frmQueue()\r
+        private string query = "";\r
+\r
+        public frmQueue(string query)\r
         {\r
             InitializeComponent();\r
+            this.query = query;\r
         }\r
 \r
         public void addItem(String item)\r
         {\r
             list_queue.Items.Add(item);\r
+            MessageBox.Show("test");\r
         }\r
 \r
         private void btn_Close_Click(object sender, EventArgs e)\r
         {\r
             this.Close();\r
         }\r
+\r
+        private void frmQueue_Load(object sender, EventArgs e)\r
+        {\r
+            addItem(query);\r
+            MessageBox.Show("test");\r
+        }\r
+\r
+\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs
index 8959620e7e337c28191f04c45556c367d2f77aff..1cb81113368c7751eecb66d382d74dd9739f75e9 100644 (file)
--- a/win/C#/frmReadDVD.Designer.cs
+++ b/win/C#/frmReadDVD.Designer.cs
@@ -108,7 +108,6 @@ namespace Handbrake
             this.Name = "frmReadDVD";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Reading DVD...";\r
-            this.Load += new System.EventHandler(this.frmReadDVD_Load);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index a491a3ed7c3d405c1edd1d3f01fd73d34a848461..1c18ce7a2d8f622c17b3116fcbeb6b4475a0f916 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -70,10 +70,5 @@ namespace Handbrake
 \r
             updateUIElements();\r
         }\r
-\r
-        private void frmReadDVD_Load(object sender, EventArgs e)\r
-        {\r
-\r
-        }\r
     }\r
 }
\ No newline at end of file