WinGui:

- Cleaned up the status update code for the splash screen.
- Added option to turn off automatic preset update on each launch.
- Removed some unneeded variables.

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

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index b210780878dc6bc99191469f6c854a3162dab665..a35ee8deeb9d07f46bbfa7156a1ce2152de9364d 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -191,5 +191,17 @@ namespace Handbrake.Properties {
                 this["skipversion"] = value;\r
             }\r
         }\r
+        \r
+        [global::System.Configuration.UserScopedSettingAttribute()]\r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        public string updatePresets {\r
+            get {\r
+                return ((string)(this["updatePresets"]));\r
+            }\r
+            set {\r
+                this["updatePresets"] = value;\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 1792fcad873e9bd809e745ba768aa44c3cc64390..0af81cbdc258d85311af0ed60357610370bfde1d 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -44,5 +44,8 @@
     <Setting Name="skipversion" Type="System.Int32" Scope="User">\r
       <Value Profile="(Default)">0</Value>\r
     </Setting>\r
+    <Setting Name="updatePresets" Type="System.String" Scope="User">\r
+      <Value Profile="(Default)" />\r
+    </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/C#/app.config b/win/C#/app.config
index 7a76e22adfe17f1883181a752eb87d926f824b93..f71f0560fcbd21e0ead0a3b72cfeadd9da65606c 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -49,6 +49,9 @@
             <setting name="skipversion" serializeAs="String">\r
                 <value>0</value>\r
             </setting>\r
+            <setting name="updatePresets" serializeAs="String">\r
+                <value />\r
+            </setting>\r
         </Handbrake.Properties.Settings>\r
     </userSettings>\r
 </configuration>
\ No newline at end of file

diff --git a/win/C#/frmDownload.cs b/win/C#/frmDownload.cs
index cac6f195da57e962567ec2d3835c828bb29802e1..4fdd10dc41dcfd7ca4f9ff68ff9ada16363859b5 100644 (file)
--- a/win/C#/frmDownload.cs
+++ b/win/C#/frmDownload.cs
@@ -78,7 +78,7 @@ namespace Handbrake
                     else\r
                         this.Invoke(new DownloadCompleteCallback(this.downloadComplete));\r
                 }\r
-                catch (Exception exc)\r
+                catch (Exception)\r
                 {\r
                     // Do Nothing \r
                 }\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 97db9218dee9e1341a88819b99dd79c3ffee49e3..094587357c31449e56ffc4f74a7a1371cbc76e63 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -68,32 +68,43 @@ namespace Handbrake
             Version.Text = "Version " + Properties.Settings.Default.CliVersion;\r
 \r
             // update the status\r
-            lblStatus.Text = "Checking for updates ...";\r
-            // redraw the splash screen\r
-            Application.DoEvents();\r
-            // Run the update checker.\r
             if (Properties.Settings.Default.updateStatus == "Checked")\r
+            {\r
+                lblStatus.Text = "Checking for updates ...";\r
+                // redraw the splash screen\r
+                Application.DoEvents();\r
+                // Run the update checker.\r
                 updateCheck();\r
-            Thread.Sleep(200);\r
+                Thread.Sleep(200);\r
+            }\r
 \r
             // Update the presets\r
-            lblStatus.Text = "Updaing Presets ...";\r
-            Application.DoEvents();\r
-            updatePresets();\r
-            Thread.Sleep(200);\r
+            if (Properties.Settings.Default.updatePresets == "Checked")\r
+            {\r
+                lblStatus.Text = "Updaing Presets ...";\r
+                Application.DoEvents();\r
+                updatePresets();\r
+                Thread.Sleep(200);\r
+            }\r
 \r
             // Now load the users default if required. (Will overide the above setting)\r
-            lblStatus.Text = "Loading User Default Settings...";\r
-            Application.DoEvents();\r
-            loadNormalPreset();\r
-            loadUserDefaults();\r
-            Thread.Sleep(100);\r
+            if (Properties.Settings.Default.defaultSettings == "Checked")\r
+            {\r
+                lblStatus.Text = "Loading User Default Settings...";\r
+                Application.DoEvents();\r
+                loadNormalPreset();\r
+                loadUserDefaults();\r
+                Thread.Sleep(100);\r
+            }\r
 \r
             // Enable or disable tooltips\r
-            lblStatus.Text = "Loading Tooltips ...";\r
-            Application.DoEvents();\r
-            tooltip();\r
-            Thread.Sleep(100);\r
+            if (Properties.Settings.Default.tooltipEnable == "Checked")\r
+            {\r
+                lblStatus.Text = "Loading Tooltips ...";\r
+                Application.DoEvents();\r
+                ToolTip.Active = true;\r
+                Thread.Sleep(100);\r
+            }\r
 \r
             // Hide the preset bar if required.\r
             hidePresetBar();\r
@@ -161,14 +172,6 @@ namespace Handbrake
             }\r
         }\r
 \r
-        private void tooltip()\r
-        {\r
-            if (Properties.Settings.Default.tooltipEnable == "Checked")\r
-            {\r
-                ToolTip.Active = true;\r
-            }\r
-        }\r
-\r
         private void hidePresetBar()\r
         {\r
             if (Properties.Settings.Default.hidePresets == "Checked")\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 0b26ae8dd744be79bf85b7cc8c6ae3aae2730502..c26b4bb9a05715a167ee8d80e45c00cbff7eb8f6 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -41,6 +41,7 @@ namespace Handbrake
             this.label5 = new System.Windows.Forms.Label();\r
             this.tab_options = new System.Windows.Forms.TabControl();\r
             this.tab_general = new System.Windows.Forms.TabPage();\r
+            this.check_updatePresets = new System.Windows.Forms.CheckBox();\r
             this.check_showPreset = new System.Windows.Forms.CheckBox();\r
             this.check_tooltip = new System.Windows.Forms.CheckBox();\r
             this.check_updateCheck = new System.Windows.Forms.CheckBox();\r
@@ -156,7 +157,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(287, 287);\r
+            this.btn_close.Location = new System.Drawing.Point(288, 297);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(107, 22);\r
             this.btn_close.TabIndex = 53;\r
@@ -177,7 +178,7 @@ namespace Handbrake
             "Lock System",\r
             "Log Off",\r
             "Quit HandBrake"});\r
-            this.drp_completeOption.Location = new System.Drawing.Point(192, 156);\r
+            this.drp_completeOption.Location = new System.Drawing.Point(192, 170);\r
             this.drp_completeOption.Name = "drp_completeOption";\r
             this.drp_completeOption.Size = new System.Drawing.Size(111, 21);\r
             this.drp_completeOption.TabIndex = 43;\r
@@ -187,7 +188,7 @@ namespace Handbrake
             // \r
             this.label5.AutoSize = true;\r
             this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label5.Location = new System.Drawing.Point(13, 158);\r
+            this.label5.Location = new System.Drawing.Point(13, 173);\r
             this.label5.Name = "label5";\r
             this.label5.Size = new System.Drawing.Size(173, 13);\r
             this.label5.TabIndex = 42;\r
@@ -201,12 +202,13 @@ namespace Handbrake
             this.tab_options.Location = new System.Drawing.Point(12, 63);\r
             this.tab_options.Name = "tab_options";\r
             this.tab_options.SelectedIndex = 0;\r
-            this.tab_options.Size = new System.Drawing.Size(382, 218);\r
+            this.tab_options.Size = new System.Drawing.Size(382, 228);\r
             this.tab_options.TabIndex = 58;\r
             // \r
             // tab_general\r
             // \r
             this.tab_general.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.tab_general.Controls.Add(this.check_updatePresets);\r
             this.tab_general.Controls.Add(this.drp_completeOption);\r
             this.tab_general.Controls.Add(this.label5);\r
             this.tab_general.Controls.Add(this.check_showPreset);\r
@@ -218,10 +220,22 @@ namespace Handbrake
             this.tab_general.Location = new System.Drawing.Point(4, 22);\r
             this.tab_general.Name = "tab_general";\r
             this.tab_general.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_general.Size = new System.Drawing.Size(374, 192);\r
+            this.tab_general.Size = new System.Drawing.Size(374, 202);\r
             this.tab_general.TabIndex = 0;\r
             this.tab_general.Text = "General";\r
             // \r
+            // check_updatePresets\r
+            // \r
+            this.check_updatePresets.AutoSize = true;\r
+            this.check_updatePresets.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_updatePresets.Location = new System.Drawing.Point(16, 125);\r
+            this.check_updatePresets.Name = "check_updatePresets";\r
+            this.check_updatePresets.Size = new System.Drawing.Size(112, 17);\r
+            this.check_updatePresets.TabIndex = 59;\r
+            this.check_updatePresets.Text = "Update presets";\r
+            this.check_updatePresets.UseVisualStyleBackColor = true;\r
+            this.check_updatePresets.CheckedChanged += new System.EventHandler(this.check_updatePresets_CheckedChanged);\r
+            // \r
             // check_showPreset\r
             // \r
             this.check_showPreset.AutoSize = true;\r
@@ -262,7 +276,7 @@ namespace Handbrake
             // \r
             this.check_userDefaultSettings.AutoSize = true;\r
             this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_userDefaultSettings.Location = new System.Drawing.Point(16, 104);\r
+            this.check_userDefaultSettings.Location = new System.Drawing.Point(16, 102);\r
             this.check_userDefaultSettings.Name = "check_userDefaultSettings";\r
             this.check_userDefaultSettings.Size = new System.Drawing.Size(166, 17);\r
             this.check_userDefaultSettings.TabIndex = 56;\r
@@ -274,7 +288,7 @@ namespace Handbrake
             // \r
             this.label2.AutoSize = true;\r
             this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label2.Location = new System.Drawing.Point(13, 135);\r
+            this.label2.Location = new System.Drawing.Point(13, 156);\r
             this.label2.Name = "label2";\r
             this.label2.Size = new System.Drawing.Size(80, 13);\r
             this.label2.TabIndex = 54;\r
@@ -286,9 +300,9 @@ namespace Handbrake
             this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.label1.Location = new System.Drawing.Point(13, 13);\r
             this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(55, 13);\r
+            this.label1.Size = new System.Drawing.Size(76, 13);\r
             this.label1.TabIndex = 0;\r
-            this.label1.Text = "Startup";\r
+            this.label1.Text = "On Startup";\r
             // \r
             // tab_debug\r
             // \r
@@ -298,7 +312,7 @@ namespace Handbrake
             this.tab_debug.Controls.Add(this.label6);\r
             this.tab_debug.Location = new System.Drawing.Point(4, 22);\r
             this.tab_debug.Name = "tab_debug";\r
-            this.tab_debug.Size = new System.Drawing.Size(374, 192);\r
+            this.tab_debug.Size = new System.Drawing.Size(374, 202);\r
             this.tab_debug.TabIndex = 2;\r
             this.tab_debug.Text = "Debug Options";\r
             // \r
@@ -323,7 +337,7 @@ namespace Handbrake
             this.tab_advanced.Location = new System.Drawing.Point(4, 22);\r
             this.tab_advanced.Name = "tab_advanced";\r
             this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tab_advanced.Size = new System.Drawing.Size(374, 192);\r
+            this.tab_advanced.Size = new System.Drawing.Size(374, 202);\r
             this.tab_advanced.TabIndex = 1;\r
             this.tab_advanced.Text = "Advanced";\r
             // \r
@@ -368,7 +382,7 @@ namespace Handbrake
             // frmOptions\r
             // \r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(407, 316);\r
+            this.ClientSize = new System.Drawing.Size(407, 328);\r
             this.Controls.Add(this.label7);\r
             this.Controls.Add(this.label8);\r
             this.Controls.Add(this.pictureBox2);\r
@@ -422,5 +436,6 @@ namespace Handbrake
         private System.Windows.Forms.Label label8;\r
         private System.Windows.Forms.PictureBox pictureBox2;\r
         private System.Windows.Forms.Label label7;\r
+        internal System.Windows.Forms.CheckBox check_updatePresets;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index fda77169f77339ea836b17e6e1bc43069850d6b2..75796ddd2d2fd08545e1ceb265ba8703082a70c8 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -48,6 +48,11 @@ namespace Handbrake
             {\r
                 check_showPreset.CheckState = CheckState.Checked;\r
             }\r
+\r
+            if (Properties.Settings.Default.updatePresets == "Checked")\r
+            {\r
+                check_updatePresets.CheckState = CheckState.Checked;\r
+            }\r
         }\r
 \r
         private void check_updateCheck_CheckedChanged(object sender, EventArgs e)\r
@@ -101,6 +106,11 @@ namespace Handbrake
             Properties.Settings.Default.hidePresets = check_showPreset.CheckState.ToString();\r
         }\r
 \r
+        private void check_updatePresets_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            Properties.Settings.Default.updatePresets = check_updatePresets.CheckState.ToString();\r
+        }\r
+\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index ddc16dbcdd3e8c55e392c011ec8798eab98c4fa5..516f746bb81c024cdfa2b3a4d5842fe6a894c608 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -18,7 +18,6 @@ namespace Handbrake
         private frmMain mainWindow;\r
         private frmDvdInfo dvdInfo;\r
         private Parsing.DVD thisDvd;\r
-        private Process hbProc;\r
         private delegate void UpdateUIHandler();\r
 \r
         public frmReadDVD(string inputFile, frmMain parent, frmDvdInfo dvdInfoWindow)\r