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://svn.handbrake.fr/HandBrake/trunk@1736 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 37 insertions, 27 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index acd734f0f..da4d0da94 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

@@ -644,9 +644,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            dataGridViewCellStyle2.Format = "N0";

+            dataGridViewCellStyle2.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle2;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 092e9b7de..005ac9b6c 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -313,10 +313,9 @@ namespace Handbrake
                 lbl_encode.Text = "Encoding in Progress";

 

                 btn_start.Text = "Stop";

+                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.";

                 btn_start.Image = Properties.Resources.stop;

             }

-

-

         }

         private void btn_add2Queue_Click(object sender, EventArgs e)

         {

@@ -506,36 +505,43 @@ namespace Handbrake
         }

         private void drop_chapterStart_SelectedIndexChanged(object sender, EventArgs e)

         {

-            calculateDuration();

+            int c_start, c_end = 1;

 

-            drop_chapterStart.BackColor = Color.White;

-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))

-            {

-                int chapterFinish, chapterStart = 0;

-                int.TryParse(drop_chapterFinish.Text, out chapterFinish);

-                int.TryParse(drop_chapterStart.Text, out chapterStart);

+            if (drop_chapterFinish.Text == "Auto" && drop_chapterFinish.Items.Count != 0)

+                drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count-1;

+           

+            int.TryParse(drop_chapterStart.Text, out c_start);

+            int.TryParse(drop_chapterFinish.Text, out c_end);

 

-                if (chapterFinish < chapterStart)

-                    drop_chapterStart.BackColor = Color.LightCoral;

+            if (c_end != 0)

+            {

+                if (c_start > c_end)

+                    drop_chapterFinish.Text = c_start.ToString();

             }

+

+            calculateDuration();

+

             // Run the Autonaming function

             hb_common_func.autoName(this);

         }

         private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e)

         {

-            calculateDuration();

+            int c_start, c_end = 1;

 

-            drop_chapterFinish.BackColor = Color.White;

-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))

-            {

-                int chapterFinish, chapterStart = 0;

-                int.TryParse(drop_chapterFinish.Text, out chapterFinish);

-                int.TryParse(drop_chapterStart.Text, out chapterStart);

+            if (drop_chapterStart.Text == "Auto" && drop_chapterStart.Items.Count >= 1)

+                drop_chapterStart.SelectedIndex = 1;

+

+            int.TryParse(drop_chapterStart.Text, out c_start);

+            int.TryParse(drop_chapterFinish.Text, out c_end);

 

-                if (chapterFinish < chapterStart)

-                    drop_chapterFinish.BackColor = Color.LightCoral;

+            if (c_start != 0)

+            {

+                if (c_end < c_start)

+                    drop_chapterFinish.Text = c_start.ToString();

             }

 

+            calculateDuration();

+

             // Run the Autonaming function

             hb_common_func.autoName(this);

         }

@@ -1846,6 +1852,7 @@ namespace Handbrake
             }

             lbl_encode.Text = "Encoding Finished";

             btn_start.Text = "Start";

+            btn_start.ToolTipText = "Start the encoding process";

             btn_start.Image = Properties.Resources.Play;

         }

         public Boolean isEncoding()

@@ -1894,9 +1901,6 @@ namespace Handbrake
         }

         #endregion

 

-

-

-

         // This is the END of the road ------------------------------------------------------------------------------

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index a016a1825..5bc2f65cb 100644
--- 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.

 Note: Do not change any of the chapter numbers!</value>

   </data>

+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+    <value>True</value>

+  </metadata>

+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+    <value>True</value>

+  </metadata>

   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>223, 15</value>

   </metadata>