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

9 files changed, 42 insertions, 17 deletions

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 3cd67f658..10e4b29d6 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -37,6 +37,12 @@
     <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

+    <Compile Include="frmEncodeOutput.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="frmEncodeOutput.Designer.cs">

+      <DependentUpon>frmEncodeOutput.cs</DependentUpon>

+    </Compile>

     <Compile Include="frmAbout.cs">

       <SubType>Form</SubType>

     </Compile>

@@ -69,6 +75,10 @@
     <Compile Include="Parsing\Title.cs" />

     <Compile Include="Program.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

+    <EmbeddedResource Include="frmEncodeOutput.resx">

+      <DependentUpon>frmEncodeOutput.cs</DependentUpon>

+      <SubType>Designer</SubType>

+    </EmbeddedResource>

     <EmbeddedResource Include="frmAbout.resx">

       <SubType>Designer</SubType>

       <DependentUpon>frmAbout.cs</DependentUpon>

diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs
index da1b653ac..130ffa2f3 100644
--- a/win/C#/frmDvdInfo.cs
+++ b/win/C#/frmDvdInfo.cs
@@ -8,14 +8,14 @@ using System.Windows.Forms;
 

 namespace Handbrake

 {

-    public partial class frmDVDData : Form

+    public partial class frmDvdInfo : Form

     {

 

         /*

          * This window should be used to display the RAW output of the handbrake CLI which is produced during the scan.

          */

 

-        public frmDVDData()

+        public frmDvdInfo()

         {

             InitializeComponent();

         }

diff --git a/win/C#/frmEncodeOutput.Designer.cs b/win/C#/frmEncodeOutput.Designer.cs
index 0cb4fcb47..a8d4782b3 100644
--- a/win/C#/frmEncodeOutput.Designer.cs
+++ b/win/C#/frmEncodeOutput.Designer.cs
@@ -1,6 +1,6 @@
 namespace Handbrake

 {

-    partial class frmDVDData

+    partial class frmDvdInfo

     {

         /// <summary>

         /// Required designer variable.

@@ -82,7 +82,6 @@ namespace Handbrake
             this.Name = "frmDVDData";

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

             this.Text = "Read DVD";

-            this.Load += new System.EventHandler(this.frmDVDData_Load);

             this.ResumeLayout(false);

             this.PerformLayout();

 

diff --git a/win/C#/frmEncodeOutput.cs b/win/C#/frmEncodeOutput.cs
index da1b653ac..7418a6002 100644
--- a/win/C#/frmEncodeOutput.cs
+++ b/win/C#/frmEncodeOutput.cs
@@ -12,7 +12,8 @@ namespace Handbrake
     {

 

         /*

-         * This window should be used to display the RAW output of the handbrake CLI which is produced during the scan.

+         * This window will be used to display the raw output of hbcli.exe when it is encoding.

+         * 

          */

 

         public frmDVDData()

@@ -24,5 +25,10 @@ namespace Handbrake
         {

             this.Close();

         }

+

+        private void frmDVDData_Load(object sender, EventArgs e)

+        {

+

+        }

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 78c4a9a2e..504179e0e 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -317,13 +317,14 @@ namespace Handbrake
         // TOOLS MENU --------------------------------------------------------------

         private void mnu_encode_Click(object sender, EventArgs e)

         {

-            Form Queue = new frmQueue();

+            string query = ""; // temp fix for bug here.

+            Form Queue = new frmQueue(query);

             Queue.ShowDialog();

         }

 

         private void mnu_viewDVDdata_Click(object sender, EventArgs e)

         {

-            Form DVDData = new frmDVDData();

+            Form DVDData = new frmDvdInfo();

             DVDData.Show();

         }

 

@@ -557,7 +558,9 @@ namespace Handbrake
 

         private void btn_queue_Click(object sender, EventArgs e)

         {

-            Form Queue = new frmQueue();

+            String query = GenerateTheQuery();

+            MessageBox.Show(query);

+            Form Queue = new frmQueue(query);

             Queue.Show();

         }

 

@@ -1025,7 +1028,7 @@ namespace Handbrake
                     videoEncoder = " -e x264b30";

                     break;

                 default:

-                    Mixdown = " -e x264";

+                    videoEncoder = " -e x264";

                     break;

             }

            

@@ -1044,7 +1047,7 @@ namespace Handbrake
                     audioEncoder = " -E ac3";

                     break;

                 default:

-                    Mixdown = " -E faac";

+                    audioEncoder = " -E faac";

                     break;

             }

 

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index f17c5099e..cfa3e6451 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -148,6 +148,7 @@ namespace Handbrake
             this.Name = "frmQueue";

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

             this.Text = "Queue";

+            this.Load += new System.EventHandler(this.frmQueue_Load);

             this.ResumeLayout(false);

             this.PerformLayout();

 

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 16a7ae6f0..e806ad879 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -10,19 +10,31 @@ namespace Handbrake
 {

     public partial class frmQueue : Form

     {

-        public frmQueue()

+        private string query = "";

+

+        public frmQueue(string query)

         {

             InitializeComponent();

+            this.query = query;

         }

 

         public void addItem(String item)

         {

             list_queue.Items.Add(item);

+            MessageBox.Show("test");

         }

 

         private void btn_Close_Click(object sender, EventArgs e)

         {

             this.Close();

         }

+

+        private void frmQueue_Load(object sender, EventArgs e)

+        {

+            addItem(query);

+            MessageBox.Show("test");

+        }

+

+

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs
index 8959620e7..1cb811133 100644
--- a/win/C#/frmReadDVD.Designer.cs
+++ b/win/C#/frmReadDVD.Designer.cs
@@ -108,7 +108,6 @@ namespace Handbrake
             this.Name = "frmReadDVD";

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

             this.Text = "Reading DVD...";

-            this.Load += new System.EventHandler(this.frmReadDVD_Load);

             this.ResumeLayout(false);

             this.PerformLayout();

 

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index a491a3ed7..1c18ce7a2 100644
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -70,10 +70,5 @@ namespace Handbrake
 

             updateUIElements();

         }

-

-        private void frmReadDVD_Load(object sender, EventArgs e)

-        {

-

-        }

     }

 }
\ No newline at end of file