WinGui:

- Removed Red Background colour on chapter selection dropdown menus. This is no longer needed.
- Prevent the user from selecting an invalid combination of Chapters. e.g 12-5. Dropdowns now have the same behaviour as the macgui.
- Fixed Start/Stop Tooltips on the mainwindow

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index acd734f..da4d0da 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;\r
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
@@ -644,9 +644,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle2.Format = "N0";\r
+            dataGridViewCellStyle2.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 092e9b7..005ac9b 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -313,10 +313,9 @@ namespace Handbrake
                 lbl_encode.Text = "Encoding in Progress";\r
 \r
                 btn_start.Text = "Stop";\r
+                btn_start.ToolTipText = "Stop the encoding process. \nWarning: This may break your file. Press ctrl-c in the CLI window if you wish it to exit cleanly.";\r
                 btn_start.Image = Properties.Resources.stop;\r
             }\r
-\r
-\r
         }\r
         private void btn_add2Queue_Click(object sender, EventArgs e)\r
         {\r
@@ -506,36 +505,43 @@ namespace Handbrake
         }\r
         private void drop_chapterStart_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            calculateDuration();\r
+            int c_start, c_end = 1;\r
 \r
-            drop_chapterStart.BackColor = Color.White;\r
-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
-            {\r
-                int chapterFinish, chapterStart = 0;\r
-                int.TryParse(drop_chapterFinish.Text, out chapterFinish);\r
-                int.TryParse(drop_chapterStart.Text, out chapterStart);\r
+            if (drop_chapterFinish.Text == "Auto" && drop_chapterFinish.Items.Count != 0)\r
+                drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count-1;\r
+           \r
+            int.TryParse(drop_chapterStart.Text, out c_start);\r
+            int.TryParse(drop_chapterFinish.Text, out c_end);\r
 \r
-                if (chapterFinish < chapterStart)\r
-                    drop_chapterStart.BackColor = Color.LightCoral;\r
+            if (c_end != 0)\r
+            {\r
+                if (c_start > c_end)\r
+                    drop_chapterFinish.Text = c_start.ToString();\r
             }\r
+\r
+            calculateDuration();\r
+\r
             // Run the Autonaming function\r
             hb_common_func.autoName(this);\r
         }\r
         private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            calculateDuration();\r
+            int c_start, c_end = 1;\r
 \r
-            drop_chapterFinish.BackColor = Color.White;\r
-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
-            {\r
-                int chapterFinish, chapterStart = 0;\r
-                int.TryParse(drop_chapterFinish.Text, out chapterFinish);\r
-                int.TryParse(drop_chapterStart.Text, out chapterStart);\r
+            if (drop_chapterStart.Text == "Auto" && drop_chapterStart.Items.Count >= 1)\r
+                drop_chapterStart.SelectedIndex = 1;\r
+\r
+            int.TryParse(drop_chapterStart.Text, out c_start);\r
+            int.TryParse(drop_chapterFinish.Text, out c_end);\r
 \r
-                if (chapterFinish < chapterStart)\r
-                    drop_chapterFinish.BackColor = Color.LightCoral;\r
+            if (c_start != 0)\r
+            {\r
+                if (c_end < c_start)\r
+                    drop_chapterFinish.Text = c_start.ToString();\r
             }\r
 \r
+            calculateDuration();\r
+\r
             // Run the Autonaming function\r
             hb_common_func.autoName(this);\r
         }\r
@@ -1846,6 +1852,7 @@ namespace Handbrake
             }\r
             lbl_encode.Text = "Encoding Finished";\r
             btn_start.Text = "Start";\r
+            btn_start.ToolTipText = "Start the encoding process";\r
             btn_start.Image = Properties.Resources.Play;\r
         }\r
         public Boolean isEncoding()\r
@@ -1894,9 +1901,6 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
-\r
-\r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index a016a18..5bc2f65 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -155,6 +155,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>223, 15</value>\r
   </metadata>\r