WinGui:

- Fixed small localization issue in the query parser in regard to -q option.
- Changed update checker so if it fails on the startup update scan, it'll fail silently instead of displaying an error message behind the startup screen.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 244eb14..9b00fdc 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -19,7 +19,7 @@ namespace Handbrake.Functions
         /*\r
          * Checks for updates and returns "true" boolean if one exists.\r
          */\r
-        public Boolean updateCheck()\r
+        public Boolean updateCheck(Boolean debug)\r
         {\r
             try\r
             {\r
@@ -42,7 +42,8 @@ namespace Handbrake.Functions
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show(exc.ToString());\r
+                if (debug == true)\r
+                    MessageBox.Show("Unable to check for updates, Please try again later. \n" + exc.ToString(),"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                 return false;\r
             }\r
         }\r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index be3ac74..d83c1dc 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -812,7 +812,7 @@ namespace Handbrake.Functions
                 double qConvert = 0;\r
                 if (videoQuality.Success != false)\r
                 {\r
-                    qConvert = double.Parse(videoQuality.ToString().Replace("-q ", "")) * 100;\r
+                    qConvert = double.Parse(videoQuality.ToString().Replace("-q ", ""), Functions.CLI.Culture) * 100;\r
                     qConvert = System.Math.Ceiling(qConvert);\r
                     thisQuery.q_videoQuality = int.Parse(qConvert.ToString());\r
                 }\r

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index d9c3fe0..93cd6e8 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -18,7 +18,7 @@
     <UpgradeBackupLocation>\r
     </UpgradeBackupLocation>\r
     <OldToolsVersion>2.0</OldToolsVersion>\r
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
     <PublishUrl>publish\</PublishUrl>\r
     <Install>true</Install>\r
     <InstallFrom>Disk</InstallFrom>\r
@@ -83,6 +83,9 @@
   </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="System" />\r
+    <Reference Include="System.Core">\r
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
+    </Reference>\r
     <Reference Include="System.Data" />\r
     <Reference Include="System.Deployment" />\r
     <Reference Include="System.Drawing" />\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index a08aab3..0ce9530 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
@@ -90,9 +90,7 @@ namespace Handbrake
             this.mnu_wiki = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_faq = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_onlineDocs = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.WebsiteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_homepage = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_forum = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();\r
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();\r
@@ -172,6 +170,7 @@ namespace Handbrake
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.advancedOptions = new System.Windows.Forms.TabControl();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
+            this.lbl_warn_chapt = new System.Windows.Forms.Label();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.data_chpt = new System.Windows.Forms.DataGridView();\r
             this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
@@ -202,7 +201,6 @@ namespace Handbrake
             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\r
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);\r
-            this.lbl_warn_chapt = new System.Windows.Forms.Label();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_drc)).BeginInit();\r
@@ -324,7 +322,6 @@ namespace Handbrake
             this.text_destination.Size = new System.Drawing.Size(429, 21);\r
             this.text_destination.TabIndex = 1;\r
             this.ToolTip.SetToolTip(this.text_destination, "Location where the encoded file will be saved.");\r
-            this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged);\r
             // \r
             // btn_Browse\r
             // \r
@@ -458,9 +455,9 @@ namespace Handbrake
             this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.check_turbo.Location = new System.Drawing.Point(37, 57);\r
             this.check_turbo.Name = "check_turbo";\r
-            this.check_turbo.Size = new System.Drawing.Size(122, 17);\r
+            this.check_turbo.Size = new System.Drawing.Size(115, 17);\r
             this.check_turbo.TabIndex = 3;\r
-            this.check_turbo.Text = "Turbo first pPass";\r
+            this.check_turbo.Text = "Turbo first Pass";\r
             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
             this.check_turbo.UseVisualStyleBackColor = false;\r
             // \r
@@ -774,7 +771,7 @@ namespace Handbrake
             // \r
             this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.OnlineDocumentationToolStripMenuItem,\r
-            this.WebsiteToolStripMenuItem,\r
+            this.mnu_handbrake_home,\r
             this.ToolStripSeparator3,\r
             this.mnu_UpdateCheck,\r
             this.toolStripSeparator6,\r
@@ -790,7 +787,7 @@ namespace Handbrake
             this.mnu_faq,\r
             this.mnu_onlineDocs});\r
             this.OnlineDocumentationToolStripMenuItem.Name = "OnlineDocumentationToolStripMenuItem";\r
-            this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(211, 22);\r
+            this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(213, 22);\r
             this.OnlineDocumentationToolStripMenuItem.Text = "Online Documentation";\r
             // \r
             // mnu_wiki\r
@@ -814,50 +811,34 @@ namespace Handbrake
             this.mnu_onlineDocs.Text = "Full Documentation List";\r
             this.mnu_onlineDocs.Click += new System.EventHandler(this.mnu_onlineDocs_Click);\r
             // \r
-            // WebsiteToolStripMenuItem\r
-            // \r
-            this.WebsiteToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_homepage,\r
-            this.mnu_forum});\r
-            this.WebsiteToolStripMenuItem.Name = "WebsiteToolStripMenuItem";\r
-            this.WebsiteToolStripMenuItem.Size = new System.Drawing.Size(211, 22);\r
-            this.WebsiteToolStripMenuItem.Text = "Website";\r
-            // \r
-            // mnu_homepage\r
-            // \r
-            this.mnu_homepage.Name = "mnu_homepage";\r
-            this.mnu_homepage.Size = new System.Drawing.Size(146, 22);\r
-            this.mnu_homepage.Text = "Homepage";\r
-            this.mnu_homepage.Click += new System.EventHandler(this.mnu_homepage_Click);\r
-            // \r
-            // mnu_forum\r
+            // mnu_handbrake_home\r
             // \r
-            this.mnu_forum.Name = "mnu_forum";\r
-            this.mnu_forum.Size = new System.Drawing.Size(146, 22);\r
-            this.mnu_forum.Text = "Forum";\r
-            this.mnu_forum.Click += new System.EventHandler(this.mnu_forum_Click);\r
+            this.mnu_handbrake_home.Name = "mnu_handbrake_home";\r
+            this.mnu_handbrake_home.Size = new System.Drawing.Size(213, 22);\r
+            this.mnu_handbrake_home.Text = "HandBrake Homepage";\r
+            this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);\r
             // \r
             // ToolStripSeparator3\r
             // \r
             this.ToolStripSeparator3.Name = "ToolStripSeparator3";\r
-            this.ToolStripSeparator3.Size = new System.Drawing.Size(208, 6);\r
+            this.ToolStripSeparator3.Size = new System.Drawing.Size(210, 6);\r
             // \r
             // mnu_UpdateCheck\r
             // \r
             this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";\r
-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(211, 22);\r
+            this.mnu_UpdateCheck.Size = new System.Drawing.Size(213, 22);\r
             this.mnu_UpdateCheck.Text = "Check for Updates";\r
             this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);\r
             // \r
             // toolStripSeparator6\r
             // \r
             this.toolStripSeparator6.Name = "toolStripSeparator6";\r
-            this.toolStripSeparator6.Size = new System.Drawing.Size(208, 6);\r
+            this.toolStripSeparator6.Size = new System.Drawing.Size(210, 6);\r
             // \r
             // mnu_about\r
             // \r
             this.mnu_about.Name = "mnu_about";\r
-            this.mnu_about.Size = new System.Drawing.Size(211, 22);\r
+            this.mnu_about.Size = new System.Drawing.Size(213, 22);\r
             this.mnu_about.Text = "About...";\r
             this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
             // \r
@@ -1830,6 +1811,15 @@ namespace Handbrake
             this.tab_chapters.TabIndex = 6;\r
             this.tab_chapters.Text = "Chapters";\r
             // \r
+            // lbl_warn_chapt\r
+            // \r
+            this.lbl_warn_chapt.AutoSize = true;\r
+            this.lbl_warn_chapt.Location = new System.Drawing.Point(13, 52);\r
+            this.lbl_warn_chapt.Name = "lbl_warn_chapt";\r
+            this.lbl_warn_chapt.Size = new System.Drawing.Size(394, 13);\r
+            this.lbl_warn_chapt.TabIndex = 23;\r
+            this.lbl_warn_chapt.Text = "Please make sure you have selected a DVD tile in the \"Source\" box";\r
+            // \r
             // label31\r
             // \r
             this.label31.AutoSize = true;\r
@@ -1857,9 +1847,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
@@ -2161,15 +2151,6 @@ namespace Handbrake
             this.toolStripSeparator8.Name = "toolStripSeparator8";\r
             this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);\r
             // \r
-            // lbl_warn_chapt\r
-            // \r
-            this.lbl_warn_chapt.AutoSize = true;\r
-            this.lbl_warn_chapt.Location = new System.Drawing.Point(13, 52);\r
-            this.lbl_warn_chapt.Name = "lbl_warn_chapt";\r
-            this.lbl_warn_chapt.Size = new System.Drawing.Size(394, 13);\r
-            this.lbl_warn_chapt.TabIndex = 23;\r
-            this.lbl_warn_chapt.Text = "Please make sure you have selected a DVD tile in the \"Source\" box";\r
-            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
@@ -2247,9 +2228,6 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripMenuItem mnu_wiki;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_onlineDocs;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_faq;\r
-        internal System.Windows.Forms.ToolStripMenuItem WebsiteToolStripMenuItem;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_homepage;\r
-        internal System.Windows.Forms.ToolStripMenuItem mnu_forum;\r
         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator3;\r
         internal System.Windows.Forms.ToolStripMenuItem mnu_about;\r
         internal System.Windows.Forms.MenuStrip frmMainMenu;\r
@@ -2395,6 +2373,7 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;\r
         private System.Windows.Forms.ToolTip toolTip1;\r
         private System.Windows.Forms.Label lbl_warn_chapt;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_home;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index ce55b61..d93bbfa 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -132,7 +132,7 @@ namespace Handbrake
                     return;\r
                 }\r
                 \r
-                Boolean update = hb_common_func.updateCheck();\r
+                Boolean update = hb_common_func.updateCheck(false);\r
                 if (update == true)\r
                 {\r
                     frmUpdater updateWindow = new frmUpdater();\r
@@ -309,19 +309,14 @@ namespace Handbrake
             Process.Start("http://handbrake.fr/?article=documentation");\r
         }\r
 \r
-        private void mnu_homepage_Click(object sender, EventArgs e)\r
+        private void mnu_handbrake_home_Click(object sender, EventArgs e)\r
         {\r
             Process.Start("http://handbrake.fr");\r
         }\r
-\r
-        private void mnu_forum_Click(object sender, EventArgs e)\r
-        {\r
-            Process.Start("http://handbrake.fr/forum");\r
-        }\r
-\r
+        \r
         private void mnu_UpdateCheck_Click(object sender, EventArgs e)\r
         {\r
-            Boolean update = hb_common_func.updateCheck();\r
+            Boolean update = hb_common_func.updateCheck(true);\r
             if (update == true)\r
             {\r
                 frmUpdater updateWindow = new frmUpdater();\r
@@ -1212,10 +1207,7 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        private void text_destination_TextChanged(object sender, EventArgs e)\r
-        {\r
 \r
-        }\r
 \r
 \r
 \r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 4d4ebc0..e4500ad 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -189,6 +189,12 @@ Best used in conjunction with forced subtitles.</value>
   <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="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="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>731, 18</value>\r
   </metadata>\r