WinGui:

- Number of code corrections + Code cleanup

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

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 6239923..530f45a 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -73,7 +73,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("0.9.2")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("0.9.3")]\r
         public string hb_version {\r
             get {\r
                 return ((string)(this["hb_version"]));\r
@@ -121,7 +121,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("2008021901")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("2008041701")]\r
         public int hb_build {\r
             get {\r
                 return ((int)(this["hb_build"]));\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 946b661..c6aa3a3 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -15,7 +15,7 @@
       <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
     <Setting Name="hb_version" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">0.9.2</Value>\r
+      <Value Profile="(Default)">0.9.3</Value>\r
     </Setting>\r
     <Setting Name="tooltipEnable" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Checked</Value>\r
@@ -27,7 +27,7 @@
       <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
     <Setting Name="hb_build" Type="System.Int32" Scope="User">\r
-      <Value Profile="(Default)">2008021901</Value>\r
+      <Value Profile="(Default)">2008041701</Value>\r
     </Setting>\r
     <Setting Name="skipversion" Type="System.Int32" Scope="User">\r
       <Value Profile="(Default)">0</Value>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index dd553ee..32e36ee 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -20,7 +20,7 @@
                 <value>Checked</value>\r
             </setting>\r
             <setting name="hb_version" serializeAs="String">\r
-                <value>0.9.2</value>\r
+                <value>0.9.3</value>\r
             </setting>\r
             <setting name="tooltipEnable" serializeAs="String">\r
                 <value>Checked</value>\r
@@ -32,7 +32,7 @@
                 <value>Checked</value>\r
             </setting>\r
             <setting name="hb_build" serializeAs="String">\r
-                <value>2008021901</value>\r
+                <value>2008041701</value>\r
             </setting>\r
             <setting name="skipversion" serializeAs="String">\r
                 <value>0</value>\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 5603b43..ad7f0ce 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.Label Label38;\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.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -621,9 +621,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
@@ -2078,6 +2078,7 @@ namespace Handbrake
             this.lbl_RecomendedCrop.Size = new System.Drawing.Size(72, 12);\r
             this.lbl_RecomendedCrop.TabIndex = 4;\r
             this.lbl_RecomendedCrop.Text = "Select a Title";\r
+            this.ToolTip.SetToolTip(this.lbl_RecomendedCrop, "Top / Bottom / Left / Right");\r
             // \r
             // Label8\r
             // \r
@@ -2088,6 +2089,7 @@ namespace Handbrake
             this.Label8.Size = new System.Drawing.Size(70, 13);\r
             this.Label8.TabIndex = 2;\r
             this.Label8.Text = "Auto Crop:";\r
+            this.ToolTip.SetToolTip(this.Label8, "Top / Bottom / Left / Right");\r
             // \r
             // Label1\r
             // \r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 541af04..978d9b0 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -69,7 +69,7 @@ namespace Handbrake
             }\r
 \r
             //H264 Panel Loading\r
-            lblStatus.Text = "Loading H264 Panel";\r
+            lblStatus.Text = "Loading H264 Panel ...";\r
             Application.DoEvents();\r
             setupH264Panel();\r
             Thread.Sleep(100);\r
@@ -135,9 +135,10 @@ namespace Handbrake
                     updateWindow.Show();\r
                 }\r
             }\r
-            catch (Exception exc)\r
+            catch (Exception)\r
             {\r
-                MessageBox.Show(exc.ToString());\r
+                // Don't want to have an exception messagebox displayed behind the splash screen,\r
+                // So, exception is ignored. Lets hope there are no bugs here :)\r
             }\r
         }\r
         private void splashTimer(object sender)\r
@@ -283,9 +284,9 @@ namespace Handbrake
                 Functions.QueryParser presetQuery = Functions.QueryParser.Parse(userDefaults);\r
                 hb_common_func.presetLoader(this, presetQuery, "User Defaults ");\r
             }\r
-            catch (Exception exc)\r
+            catch (Exception)\r
             {\r
-                MessageBox.Show("Unable to load user Default Settings. \n\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                // Do Nothing. We don't want an error appearing behind the splash screen.\r
             }\r
         }\r
 \r
@@ -351,7 +352,6 @@ namespace Handbrake
             Options.ShowDialog();\r
         }\r
 \r
-\r
         #endregion\r
 \r
         #region Presets Menu\r
@@ -364,7 +364,7 @@ namespace Handbrake
             if (treeView_presets.Nodes.Count == 0)\r
                 MessageBox.Show("Unable to load the presets.dat file. Please select \"Update Built-in Presets\" from the Presets Menu \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             else\r
-                MessageBox.Show("Presets have been updated", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+                MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
         }\r
         private void mnu_SelectDefault_Click(object sender, EventArgs e)\r
         {\r
@@ -499,7 +499,7 @@ namespace Handbrake
         }\r
         private void drp_dvdtitle_Click(object sender, EventArgs e)\r
         {\r
-            if (drp_dvdtitle.Items.Count == 0)\r
+            if (drp_dvdtitle.Items.Count == 1)\r
                 MessageBox.Show("There are no titles to select. Please scan the DVD by clicking the 'browse' button above before trying to select a title.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
         }\r
         private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -539,22 +539,22 @@ namespace Handbrake
                 drp_track1Audio.Items.Add("Automatic");\r
                 drp_track1Audio.Items.Add("None");\r
                 drp_track1Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track1Audio.SelectedItem = 0;\r
+                drp_track1Audio.SelectedIndex = 0;\r
 \r
                 drp_track2Audio.Items.Clear();\r
                 drp_track2Audio.Items.Add("None");\r
                 drp_track2Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track1Audio.SelectedItem = 0;\r
+                drp_track2Audio.SelectedIndex = 0;\r
 \r
                 drp_track3Audio.Items.Clear();\r
                 drp_track3Audio.Items.Add("None");\r
                 drp_track3Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track1Audio.SelectedItem = 0;\r
+                drp_track3Audio.SelectedIndex = 0;\r
 \r
                 drp_track4Audio.Items.Clear();\r
                 drp_track4Audio.Items.Add("None");\r
                 drp_track4Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track1Audio.SelectedItem = 0;\r
+                drp_track4Audio.SelectedIndex = 0;\r
 \r
                 // Populate the Subtitles dropdown\r
                 drp_subtitle.Items.Clear();\r
@@ -730,7 +730,6 @@ namespace Handbrake
         {\r
             try\r
             {\r
-\r
                 if ((int.Parse(text_width.Text) % 16) != 0)\r
                     text_width.BackColor = Color.LightCoral;\r
                 else\r
@@ -820,7 +819,6 @@ namespace Handbrake
                 text_right.Text = "0";\r
                 text_top.Text = "0";\r
                 text_bottom.Text = "0";\r
-\r
             }\r
         }\r
         private void check_vfr_CheckedChanged(object sender, EventArgs e)\r
@@ -2188,8 +2186,6 @@ namespace Handbrake
         #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 e91100b..e9b8e49 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -149,6 +149,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