WinGui:

- UI re-configured for use without parse.cs (Updateds frmDvdInfo, frmReadDVD, frmMain, frmQueue)

git-svn-id: svn://localhost/HandBrake/trunk@763 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs
index 9e798ea..7f50322 100644 (file)
--- a/win/C#/frmDvdInfo.cs
+++ b/win/C#/frmDvdInfo.cs
@@ -5,6 +5,8 @@ using System.Data;
 using System.Drawing;\r
 using System.Text;\r
 using System.Windows.Forms;\r
+using System.IO;\r
+\r
 \r
 namespace Handbrake\r
 {\r
@@ -17,9 +19,22 @@ namespace Handbrake
         {\r
             InitializeComponent();\r
             this.rtf_dvdInfo.Text = string.Empty;\r
+\r
+            string appPath = Application.StartupPath.ToString();\r
+            appPath = appPath + "\\";\r
+            StreamReader sr = new StreamReader(appPath + "dvdinfo.dat");\r
+            \r
+            string line = sr.ReadLine();\r
+\r
+            while (line != null)\r
+            {\r
+                this.rtf_dvdInfo.AppendText(line + System.Environment.NewLine);\r
+                line = sr.ReadLine();\r
+            }\r
+            sr.Close();\r
         }\r
 \r
-        public void HandleParsedData(object Sender, string Data)\r
+        /*public void HandleParsedData(object Sender, string Data)\r
         {\r
             if (this.InvokeRequired)\r
             {\r
@@ -27,19 +42,19 @@ namespace Handbrake
                 return;\r
             }\r
             this.rtf_dvdInfo.AppendText(Data + System.Environment.NewLine);\r
-        }\r
+        }*/\r
 \r
         private void btn_close_Click(object sender, EventArgs e)\r
         {\r
-            this.Close();\r
+            this.Hide();\r
         }\r
 \r
-        protected override void OnClosing(CancelEventArgs e)\r
+        /*protected override void OnClosing(CancelEventArgs e)\r
         {\r
             e.Cancel = true;\r
             this.Hide();\r
             base.OnClosing(e);\r
-        }\r
+        }*/\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 194275d..6986482 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -194,7 +194,7 @@ namespace Handbrake
             // DVD_Save\r
             // \r
             this.DVD_Save.DefaultExt = "mp4";\r
-            this.DVD_Save.Filter = ".mp4|*.mp4| .m4v|*.m4v |.avi|*.avi |.ogm|*.ogm |.mkv|*.mkv";\r
+            this.DVD_Save.Filter = "*.mp4|*.mp4|*.m4v|*.m4v|*.avi|*.avi|*.ogm|*.ogm|*.mkv|*.mkv";\r
             // \r
             // File_Save\r
             // \r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 39d29ca..1e84ef1 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -669,7 +669,7 @@ namespace Handbrake
         {\r
             btn_eCancel.Enabled = true;\r
             String query = "";\r
-            lbl_encode.Visible = true;\r
+            lbl_encode.Visible = false;\r
  \r
             if (QueryEditorText.Text == "")\r
             {\r
@@ -700,9 +700,9 @@ namespace Handbrake
             }\r
             else\r
             {\r
-                hbProc = process.runCli(this, (string)state, true, true, false, false);\r
-\r
+                hbProc = process.runCli(this, (string)state, false, false, false, false);\r
                 MessageBox.Show("The encode process has now started.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+                hbProc.WaitForExit();\r
 \r
                 try\r
                 {\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e6b48d4..c34fee1 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -121,7 +121,7 @@
     <value>False</value>\r
   </metadata>\r
   <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>530, 18</value>\r
+    <value>529, 18</value>\r
   </metadata>\r
   <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>633, 18</value>\r

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 8d27321..c0c0a8c 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -104,6 +104,9 @@ namespace Handbrake
             if (progressBar.Value == 100)\r
             {\r
                 MessageBox.Show("Encode Queue Completed!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+                progressBar.Value = 0;\r
+                progressBar.Update();\r
+                lbl_progressValue.Text = "0 %";\r
             }\r
         }\r
     }\r

diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs
index 5ba4af9..d26fa20 100644 (file)
--- a/win/C#/frmReadDVD.Designer.cs
+++ b/win/C#/frmReadDVD.Designer.cs
@@ -55,7 +55,7 @@ namespace Handbrake
             this.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_ok.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_ok.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_ok.Location = new System.Drawing.Point(449, 56);\r
+            this.btn_ok.Location = new System.Drawing.Point(351, 56);\r
             this.btn_ok.Name = "btn_ok";\r
             this.btn_ok.Size = new System.Drawing.Size(71, 22);\r
             this.btn_ok.TabIndex = 28;\r
@@ -113,7 +113,7 @@ namespace Handbrake
             this.btn_skip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_skip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_skip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_skip.Location = new System.Drawing.Point(372, 56);\r
+            this.btn_skip.Location = new System.Drawing.Point(351, 4);\r
             this.btn_skip.Name = "btn_skip";\r
             this.btn_skip.Size = new System.Drawing.Size(71, 22);\r
             this.btn_skip.TabIndex = 33;\r
@@ -128,7 +128,7 @@ namespace Handbrake
             this.AcceptButton = this.btn_ok;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(532, 88);\r
+            this.ClientSize = new System.Drawing.Size(434, 88);\r
             this.ControlBox = false;\r
             this.Controls.Add(this.btn_skip);\r
             this.Controls.Add(this.lbl_progress);\r
@@ -142,7 +142,6 @@ namespace Handbrake
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(538, 113);\r
-            this.MinimumSize = new System.Drawing.Size(538, 113);\r
             this.Name = "frmReadDVD";\r
             this.ShowInTaskbar = false;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 92c3a47..d56f0f3 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -33,10 +33,10 @@ namespace Handbrake
         private void btn_ok_Click(object sender, EventArgs e)\r
         {\r
             btn_ok.Enabled = false;\r
-            btn_skip.Visible = true;\r
+            //btn_skip.Visible = true;\r
             lbl_pressOk.Visible = false;\r
             lbl_progress.Text = "0%";\r
-            lbl_progress.Visible = true;\r
+            //lbl_progress.Visible = true;\r
             lbl_status.Visible = true;\r
             // throw cli call and parsing on it's own thread\r
             ThreadPool.QueueUserWorkItem(startProc);\r