WinGui:

- Readded a bit of code that was accidentally removed in the last commit.
- Removed some old error handling code that is no longer required.
- Set frmReadDVD to always display on top

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 1cd982f8f4d637e6252e81768cfd5512f4a3e2d6..328c5126cfb2b498a59b8250e7071bf196b9dd6b 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -70,7 +70,14 @@ namespace Handbrake
             this.mnu_preset_ipod178 = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_preset_ipod235 = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_appleTv = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_iphone = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_presetPS3 = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_psp = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_qt = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_television = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_film = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_Classic = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_normal = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_ProgramDefaultOptions = new System.Windows.Forms.ToolStripMenuItem();\r
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -174,13 +181,6 @@ namespace Handbrake
             this.text_right = new System.Windows.Forms.TextBox();\r
             this.text_left = new System.Windows.Forms.TextBox();\r
             this.advancedOptions = new System.Windows.Forms.TabControl();\r
-            this.mnu_psp = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_Classic = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_qt = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_television = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_film = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_iphone = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_normal = new System.Windows.Forms.ToolStripMenuItem();\r
             Label38 = new System.Windows.Forms.Label();\r
             this.frmMainMenu.SuspendLayout();\r
             this.GroupBox1.SuspendLayout();\r
@@ -304,6 +304,7 @@ namespace Handbrake
             this.btn_Browse.Text = "Browse";\r
             this.ToolTip.SetToolTip(this.btn_Browse, "Step 1 - Select a Source. This can be either a DVD or ts/mpg/iso file");\r
             this.btn_Browse.UseVisualStyleBackColor = true;\r
+            this.btn_Browse.Click += new System.EventHandler(this.btn_Browse_Click);\r
             // \r
             // text_height\r
             // \r
@@ -593,6 +594,12 @@ namespace Handbrake
             this.mnu_appleTv.Text = "Apple TV";\r
             this.mnu_appleTv.Click += new System.EventHandler(this.mnu_appleTv_Click);\r
             // \r
+            // mnu_iphone\r
+            // \r
+            this.mnu_iphone.Name = "mnu_iphone";\r
+            this.mnu_iphone.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_iphone.Text = "iPhone";\r
+            // \r
             // mnu_presetPS3\r
             // \r
             this.mnu_presetPS3.Name = "mnu_presetPS3";\r
@@ -600,6 +607,48 @@ namespace Handbrake
             this.mnu_presetPS3.Text = "PS3";\r
             this.mnu_presetPS3.Click += new System.EventHandler(this.mnu_presetPS3_Click);\r
             // \r
+            // mnu_psp\r
+            // \r
+            this.mnu_psp.Name = "mnu_psp";\r
+            this.mnu_psp.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_psp.Text = "PSP";\r
+            this.mnu_psp.Click += new System.EventHandler(this.mnu_psp_Click);\r
+            // \r
+            // mnu_qt\r
+            // \r
+            this.mnu_qt.Name = "mnu_qt";\r
+            this.mnu_qt.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_qt.Text = "Quicktime";\r
+            this.mnu_qt.Click += new System.EventHandler(this.mnu_qt_Click);\r
+            // \r
+            // mnu_television\r
+            // \r
+            this.mnu_television.Name = "mnu_television";\r
+            this.mnu_television.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_television.Text = "Television";\r
+            this.mnu_television.Click += new System.EventHandler(this.mnu_television_Click);\r
+            // \r
+            // mnu_film\r
+            // \r
+            this.mnu_film.Name = "mnu_film";\r
+            this.mnu_film.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_film.Text = "Film";\r
+            this.mnu_film.Click += new System.EventHandler(this.mnu_film_Click);\r
+            // \r
+            // mnu_Classic\r
+            // \r
+            this.mnu_Classic.Name = "mnu_Classic";\r
+            this.mnu_Classic.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_Classic.Text = "Classic";\r
+            this.mnu_Classic.Click += new System.EventHandler(this.mnu_Classic_Click);\r
+            // \r
+            // mnu_normal\r
+            // \r
+            this.mnu_normal.Name = "mnu_normal";\r
+            this.mnu_normal.Size = new System.Drawing.Size(276, 22);\r
+            this.mnu_normal.Text = "Normal";\r
+            this.mnu_normal.Click += new System.EventHandler(this.mnu_normal_Click);\r
+            // \r
             // ToolStripSeparator4\r
             // \r
             this.ToolStripSeparator4.Name = "ToolStripSeparator4";\r
@@ -1805,54 +1854,6 @@ namespace Handbrake
             this.advancedOptions.TabIndex = 411;\r
             this.advancedOptions.TabStop = false;\r
             // \r
-            // mnu_psp\r
-            // \r
-            this.mnu_psp.Name = "mnu_psp";\r
-            this.mnu_psp.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_psp.Text = "PSP";\r
-            this.mnu_psp.Click += new System.EventHandler(this.mnu_psp_Click);\r
-            // \r
-            // mnu_Classic\r
-            // \r
-            this.mnu_Classic.Name = "mnu_Classic";\r
-            this.mnu_Classic.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_Classic.Text = "Classic";\r
-            this.mnu_Classic.Click += new System.EventHandler(this.mnu_Classic_Click);\r
-            // \r
-            // mnu_qt\r
-            // \r
-            this.mnu_qt.Name = "mnu_qt";\r
-            this.mnu_qt.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_qt.Text = "Quicktime";\r
-            this.mnu_qt.Click += new System.EventHandler(this.mnu_qt_Click);\r
-            // \r
-            // mnu_television\r
-            // \r
-            this.mnu_television.Name = "mnu_television";\r
-            this.mnu_television.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_television.Text = "Television";\r
-            this.mnu_television.Click += new System.EventHandler(this.mnu_television_Click);\r
-            // \r
-            // mnu_film\r
-            // \r
-            this.mnu_film.Name = "mnu_film";\r
-            this.mnu_film.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_film.Text = "Film";\r
-            this.mnu_film.Click += new System.EventHandler(this.mnu_film_Click);\r
-            // \r
-            // mnu_iphone\r
-            // \r
-            this.mnu_iphone.Name = "mnu_iphone";\r
-            this.mnu_iphone.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_iphone.Text = "iPhone";\r
-            // \r
-            // mnu_normal\r
-            // \r
-            this.mnu_normal.Name = "mnu_normal";\r
-            this.mnu_normal.Size = new System.Drawing.Size(276, 22);\r
-            this.mnu_normal.Text = "Normal";\r
-            this.mnu_normal.Click += new System.EventHandler(this.mnu_normal_Click);\r
-            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index a46eb58929303f7896ee45cf43e9c707c51a49d6..9e7643a30563d9d44eaac7a451451c63356ac671 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -660,6 +660,45 @@ namespace Handbrake
         // --------------------------------------------------------------\r
 \r
         #region Buttons\r
+        private void btn_Browse_Click(object sender, EventArgs e)\r
+        {\r
+            String filename =""; \r
+                   text_source.Text = ""; \r
+                                \r
+                   if (RadioDVD.Checked) \r
+                   { \r
+                       DVD_Open.ShowDialog(); \r
+                       filename = DVD_Open.SelectedPath; \r
+                       if (filename != "") \r
+                       { \r
+                           Form frmRD = new frmReadDVD(filename, this, dvdInfoWindow); \r
+                           text_source.Text = filename; \r
+                           frmRD.ShowDialog(); \r
+                       } \r
+                    } \r
+                    else \r
+                    { \r
+                       ISO_Open.ShowDialog(); \r
+                       filename = ISO_Open.FileName; \r
+                       if (filename != "") \r
+                       { \r
+                           Form frmRD = new frmReadDVD(filename, this, dvdInfoWindow); \r
+                           text_source.Text = filename; \r
+                           frmRD.ShowDialog(); \r
+                       } \r
+                    }   \r
+                \r
+                    // Check if there was titles in the dvd title dropdown \r
+                    if (filename == "") \r
+                    { \r
+                       text_source.Text = "Click 'Browse' to continue"; \r
+                    } \r
+                \r
+                    if (drp_dvdtitle.Items.Count == 0) \r
+                    { \r
+                       MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand); \r
+                    }                  \r
+        }\r
 \r
         private void btn_destBrowse_Click(object sender, EventArgs e)\r
         {\r
@@ -1577,6 +1616,8 @@ namespace Handbrake
 \r
         #endregion\r
 \r
+        \r
+\r
 \r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r

diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs
index d26fa202d21958b6ab873b0abdb8ff0a973f6206..7a95d28fde3da3ec4c9c2b8303fa91eecc601bf7 100644 (file)
--- a/win/C#/frmReadDVD.Designer.cs
+++ b/win/C#/frmReadDVD.Designer.cs
@@ -146,6 +146,7 @@ namespace Handbrake
             this.ShowInTaskbar = false;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Reading DVD...";\r
+            this.TopMost = true;\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r