WinGui:

- Fixed a very small bug with the h264 options bug. 1 line fix.
- Quick Start tips added to the help menu and removed from app startup.

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

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index c05a31e..8fe7780 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -516,18 +516,6 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
-        public string QuickStartWindow {\r
-            get {\r
-                return ((string)(this["QuickStartWindow"]));\r
-            }\r
-            set {\r
-                this["QuickStartWindow"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("0.9.1")]\r
         public string CliVersion {\r
             get {\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 355fdc9..96bd2d9 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -125,9 +125,6 @@
     <Setting Name="deblock" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r
     </Setting>\r
-    <Setting Name="QuickStartWindow" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">Checked</Value>\r
-    </Setting>\r
     <Setting Name="CliVersion" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">0.9.1</Value>\r
     </Setting>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index 6becf29..8b3000c 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -127,9 +127,6 @@
             <setting name="deblock" serializeAs="String">\r
                 <value />\r
             </setting>\r
-            <setting name="QuickStartWindow" serializeAs="String">\r
-                <value>Checked</value>\r
-            </setting>\r
             <setting name="CliVersion" serializeAs="String">\r
                 <value>0.9.1</value>\r
             </setting>\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 1a0b622..fd8777a 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -176,6 +176,8 @@ namespace Handbrake
             this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.groupBox3 = new System.Windows.Forms.GroupBox();\r
+            this.mnu_quickStart = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
@@ -672,7 +674,7 @@ namespace Handbrake
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(103, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(152, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -758,6 +760,8 @@ namespace Handbrake
             // HelpToolStripMenuItem\r
             // \r
             this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.mnu_quickStart,\r
+            this.toolStripSeparator1,\r
             this.OnlineDocumentationToolStripMenuItem,\r
             this.WebsiteToolStripMenuItem,\r
             this.ToolStripSeparator3,\r
@@ -775,7 +779,7 @@ namespace Handbrake
             this.mnu_faq,\r
             this.mnu_onlineDocs});\r
             this.OnlineDocumentationToolStripMenuItem.Name = "OnlineDocumentationToolStripMenuItem";\r
-            this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(190, 22);\r
+            this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(197, 22);\r
             this.OnlineDocumentationToolStripMenuItem.Text = "Online Documentation";\r
             // \r
             // mnu_wiki\r
@@ -805,7 +809,7 @@ namespace Handbrake
             this.mnu_homepage,\r
             this.mnu_forum});\r
             this.WebsiteToolStripMenuItem.Name = "WebsiteToolStripMenuItem";\r
-            this.WebsiteToolStripMenuItem.Size = new System.Drawing.Size(190, 22);\r
+            this.WebsiteToolStripMenuItem.Size = new System.Drawing.Size(197, 22);\r
             this.WebsiteToolStripMenuItem.Text = "Website";\r
             // \r
             // mnu_homepage\r
@@ -825,24 +829,24 @@ namespace Handbrake
             // ToolStripSeparator3\r
             // \r
             this.ToolStripSeparator3.Name = "ToolStripSeparator3";\r
-            this.ToolStripSeparator3.Size = new System.Drawing.Size(187, 6);\r
+            this.ToolStripSeparator3.Size = new System.Drawing.Size(194, 6);\r
             // \r
             // mnu_UpdateCheck\r
             // \r
             this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";\r
-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_UpdateCheck.Size = new System.Drawing.Size(197, 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(187, 6);\r
+            this.toolStripSeparator6.Size = new System.Drawing.Size(194, 6);\r
             // \r
             // mnu_about\r
             // \r
             this.mnu_about.Name = "mnu_about";\r
-            this.mnu_about.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_about.Size = new System.Drawing.Size(197, 22);\r
             this.mnu_about.Text = "About...";\r
             this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);\r
             // \r
@@ -1088,7 +1092,7 @@ namespace Handbrake
             this.Version.Name = "Version";\r
             this.Version.Size = new System.Drawing.Size(84, 20);\r
             this.Version.TabIndex = 97;\r
-            this.Version.Text = "Version 2.4.1";\r
+            this.Version.Text = "Version 0.9.1";\r
             // \r
             // lbl_encode\r
             // \r
@@ -1897,6 +1901,18 @@ namespace Handbrake
             this.groupBox3.TabStop = false;\r
             this.groupBox3.Text = "Preset Functions";\r
             // \r
+            // mnu_quickStart\r
+            // \r
+            this.mnu_quickStart.Name = "mnu_quickStart";\r
+            this.mnu_quickStart.Size = new System.Drawing.Size(197, 22);\r
+            this.mnu_quickStart.Text = "Quick Start Information";\r
+            this.mnu_quickStart.Click += new System.EventHandler(this.mnu_quickStart_Click);\r
+            // \r
+            // toolStripSeparator1\r
+            // \r
+            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(194, 6);\r
+            // \r
             // frmMain\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
@@ -2096,6 +2112,8 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;\r
         private System.Windows.Forms.GroupBox groupBox3;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_quickStart;\r
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index e277a85..06bc526 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -51,9 +51,6 @@ namespace Handbrake
             // Now load the users default if required. (Will overide the above setting)\r
             loadUserDefaults();\r
 \r
-            // Display the quick start window if required.\r
-            quickStart();\r
-\r
             // Enable or disable tooltips\r
             tooltip();\r
 \r
@@ -215,15 +212,6 @@ namespace Handbrake
             }\r
         }\r
 \r
-        private void quickStart()\r
-        {\r
-            if ((Properties.Settings.Default.QuickStartWindow == "Checked") || (Properties.Settings.Default.QuickStartWindow == ""))\r
-            {\r
-                frmQuickStart quickstart = new frmQuickStart();\r
-                quickstart.ShowDialog();\r
-            }\r
-        }\r
-\r
         private void tooltip()\r
         {\r
             if (Properties.Settings.Default.tooltipEnable == "Checked")\r
@@ -324,6 +312,13 @@ namespace Handbrake
 \r
         #region Help Menu\r
 \r
+\r
+        private void mnu_quickStart_Click(object sender, EventArgs e)\r
+        {\r
+            Form QuickStart = new frmQuickStart();\r
+            QuickStart.ShowDialog();\r
+        }\r
+\r
         private void mnu_wiki_Click(object sender, EventArgs e)\r
         {\r
            Process.Start("http://handbrake.m0k.org/trac");\r
@@ -1313,6 +1308,7 @@ namespace Handbrake
                 CheckCRF.Enabled = false;\r
                 check_turbo.Enabled = false;\r
                 h264Tab.Enabled = false;\r
+                rtf_h264advanced.Text = "";\r
             }\r
             else\r
             {\r

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index bc45d31..a08591c 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -24,11 +24,15 @@ namespace Handbrake
 \r
         private void btn_q_encoder_Click(object sender, EventArgs e)\r
         {\r
-            progressBar.Value = 0;\r
-            lbl_progressValue.Text = "0 %";\r
-            progressBar.Step = 100 / list_queue.Items.Count;\r
-            progressBar.Update();\r
-            ThreadPool.QueueUserWorkItem(startProc);\r
+            if (list_queue.Items.Count != 0)\r
+            {\r
+                progressBar.Value = 0;\r
+                lbl_progressValue.Text = "0 %";\r
+                progressBar.Step = 100 / list_queue.Items.Count;\r
+                progressBar.Update();\r
+                ThreadPool.QueueUserWorkItem(startProc);\r
+            }\r
+             \r
         }\r
 \r
         [DllImport("user32.dll")]\r

diff --git a/win/C#/frmQuickStart.Designer.cs b/win/C#/frmQuickStart.Designer.cs
index 07f9488..759634f 100644 (file)
--- a/win/C#/frmQuickStart.Designer.cs
+++ b/win/C#/frmQuickStart.Designer.cs
@@ -29,7 +29,6 @@ namespace Handbrake
         private void InitializeComponent()\r
         {\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmQuickStart));\r
-            this.check_disableWindow = new System.Windows.Forms.CheckBox();\r
             this.btn_close = new System.Windows.Forms.Button();\r
             this.label1 = new System.Windows.Forms.Label();\r
             this.pictureBox1 = new System.Windows.Forms.PictureBox();\r
@@ -55,18 +54,6 @@ namespace Handbrake
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
-            // check_disableWindow\r
-            // \r
-            this.check_disableWindow.AutoSize = true;\r
-            this.check_disableWindow.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_disableWindow.Location = new System.Drawing.Point(12, 406);\r
-            this.check_disableWindow.Name = "check_disableWindow";\r
-            this.check_disableWindow.Size = new System.Drawing.Size(185, 17);\r
-            this.check_disableWindow.TabIndex = 0;\r
-            this.check_disableWindow.Text = "Do not show on next launch";\r
-            this.check_disableWindow.UseVisualStyleBackColor = true;\r
-            this.check_disableWindow.CheckedChanged += new System.EventHandler(this.check_disableWindow_CheckedChanged);\r
-            // \r
             // btn_close\r
             // \r
             this.btn_close.BackColor = System.Drawing.SystemColors.Control;\r
@@ -74,7 +61,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(399, 402);\r
+            this.btn_close.Location = new System.Drawing.Point(399, 387);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(111, 22);\r
             this.btn_close.TabIndex = 415;\r
@@ -247,7 +234,7 @@ namespace Handbrake
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(522, 439);\r
+            this.ClientSize = new System.Drawing.Size(522, 420);\r
             this.Controls.Add(this.label8);\r
             this.Controls.Add(this.pictureBox8);\r
             this.Controls.Add(this.label7);\r
@@ -264,7 +251,6 @@ namespace Handbrake
             this.Controls.Add(this.pictureBox1);\r
             this.Controls.Add(this.label1);\r
             this.Controls.Add(this.btn_close);\r
-            this.Controls.Add(this.check_disableWindow);\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.Name = "frmQuickStart";\r
@@ -285,7 +271,6 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        private System.Windows.Forms.CheckBox check_disableWindow;\r
         internal System.Windows.Forms.Button btn_close;\r
         private System.Windows.Forms.Label label1;\r
         private System.Windows.Forms.PictureBox pictureBox1;\r

diff --git a/win/C#/frmQuickStart.cs b/win/C#/frmQuickStart.cs
index 70206e0..8f0f4ba 100644 (file)
--- a/win/C#/frmQuickStart.cs
+++ b/win/C#/frmQuickStart.cs
@@ -26,12 +26,5 @@ namespace Handbrake
         {\r
             this.Close();\r
         }\r
-\r
-        private void check_disableWindow_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.QuickStartWindow = "UnChecked";\r
-            Properties.Settings.Default.Save();\r
-        }\r
-\r
     }\r
 }
\ No newline at end of file