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

8 files changed, 45 insertions, 67 deletions

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index c05a31e91..8fe778080 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -516,18 +516,6 @@ namespace Handbrake.Properties {
         

         [global::System.Configuration.UserScopedSettingAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]

-        public string QuickStartWindow {

-            get {

-                return ((string)(this["QuickStartWindow"]));

-            }

-            set {

-                this["QuickStartWindow"] = value;

-            }

-        }

-        

-        [global::System.Configuration.UserScopedSettingAttribute()]

-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

         [global::System.Configuration.DefaultSettingValueAttribute("0.9.1")]

         public string CliVersion {

             get {

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 355fdc927..96bd2d9d6 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -125,9 +125,6 @@
     <Setting Name="deblock" Type="System.String" Scope="User">

       <Value Profile="(Default)" />

     </Setting>

-    <Setting Name="QuickStartWindow" Type="System.String" Scope="User">

-      <Value Profile="(Default)">Checked</Value>

-    </Setting>

     <Setting Name="CliVersion" Type="System.String" Scope="User">

       <Value Profile="(Default)">0.9.1</Value>

     </Setting>

diff --git a/win/C#/app.config b/win/C#/app.config
index 6becf29af..8b3000c21 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -127,9 +127,6 @@
             <setting name="deblock" serializeAs="String">

                 <value />

             </setting>

-            <setting name="QuickStartWindow" serializeAs="String">

-                <value>Checked</value>

-            </setting>

             <setting name="CliVersion" serializeAs="String">

                 <value>0.9.1</value>

             </setting>

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 1a0b62289..fd8777ae7 100644
--- 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();

             this.groupBox2 = new System.Windows.Forms.GroupBox();

             this.groupBox3 = new System.Windows.Forms.GroupBox();

+            this.mnu_quickStart = new System.Windows.Forms.ToolStripMenuItem();

+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();

             Label38 = new System.Windows.Forms.Label();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

             this.frmMainMenu.SuspendLayout();

@@ -672,7 +674,7 @@ namespace Handbrake
             // mnu_exit

             // 

             this.mnu_exit.Name = "mnu_exit";

-            this.mnu_exit.Size = new System.Drawing.Size(103, 22);

+            this.mnu_exit.Size = new System.Drawing.Size(152, 22);

             this.mnu_exit.Text = "E&xit";

             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);

             // 

@@ -758,6 +760,8 @@ namespace Handbrake
             // HelpToolStripMenuItem

             // 

             this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.mnu_quickStart,

+            this.toolStripSeparator1,

             this.OnlineDocumentationToolStripMenuItem,

             this.WebsiteToolStripMenuItem,

             this.ToolStripSeparator3,

@@ -775,7 +779,7 @@ namespace Handbrake
             this.mnu_faq,

             this.mnu_onlineDocs});

             this.OnlineDocumentationToolStripMenuItem.Name = "OnlineDocumentationToolStripMenuItem";

-            this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(190, 22);

+            this.OnlineDocumentationToolStripMenuItem.Size = new System.Drawing.Size(197, 22);

             this.OnlineDocumentationToolStripMenuItem.Text = "Online Documentation";

             // 

             // mnu_wiki

@@ -805,7 +809,7 @@ namespace Handbrake
             this.mnu_homepage,

             this.mnu_forum});

             this.WebsiteToolStripMenuItem.Name = "WebsiteToolStripMenuItem";

-            this.WebsiteToolStripMenuItem.Size = new System.Drawing.Size(190, 22);

+            this.WebsiteToolStripMenuItem.Size = new System.Drawing.Size(197, 22);

             this.WebsiteToolStripMenuItem.Text = "Website";

             // 

             // mnu_homepage

@@ -825,24 +829,24 @@ namespace Handbrake
             // ToolStripSeparator3

             // 

             this.ToolStripSeparator3.Name = "ToolStripSeparator3";

-            this.ToolStripSeparator3.Size = new System.Drawing.Size(187, 6);

+            this.ToolStripSeparator3.Size = new System.Drawing.Size(194, 6);

             // 

             // mnu_UpdateCheck

             // 

             this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";

-            this.mnu_UpdateCheck.Size = new System.Drawing.Size(190, 22);

+            this.mnu_UpdateCheck.Size = new System.Drawing.Size(197, 22);

             this.mnu_UpdateCheck.Text = "Check for Updates";

             this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);

             // 

             // toolStripSeparator6

             // 

             this.toolStripSeparator6.Name = "toolStripSeparator6";

-            this.toolStripSeparator6.Size = new System.Drawing.Size(187, 6);

+            this.toolStripSeparator6.Size = new System.Drawing.Size(194, 6);

             // 

             // mnu_about

             // 

             this.mnu_about.Name = "mnu_about";

-            this.mnu_about.Size = new System.Drawing.Size(190, 22);

+            this.mnu_about.Size = new System.Drawing.Size(197, 22);

             this.mnu_about.Text = "About...";

             this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);

             // 

@@ -1088,7 +1092,7 @@ namespace Handbrake
             this.Version.Name = "Version";

             this.Version.Size = new System.Drawing.Size(84, 20);

             this.Version.TabIndex = 97;

-            this.Version.Text = "Version 2.4.1";

+            this.Version.Text = "Version 0.9.1";

             // 

             // lbl_encode

             // 

@@ -1897,6 +1901,18 @@ namespace Handbrake
             this.groupBox3.TabStop = false;

             this.groupBox3.Text = "Preset Functions";

             // 

+            // mnu_quickStart

+            // 

+            this.mnu_quickStart.Name = "mnu_quickStart";

+            this.mnu_quickStart.Size = new System.Drawing.Size(197, 22);

+            this.mnu_quickStart.Text = "Quick Start Information";

+            this.mnu_quickStart.Click += new System.EventHandler(this.mnu_quickStart_Click);

+            // 

+            // toolStripSeparator1

+            // 

+            this.toolStripSeparator1.Name = "toolStripSeparator1";

+            this.toolStripSeparator1.Size = new System.Drawing.Size(194, 6);

+            // 

             // frmMain

             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

@@ -2096,6 +2112,8 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck;

         private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;

         private System.Windows.Forms.GroupBox groupBox3;

+        private System.Windows.Forms.ToolStripMenuItem mnu_quickStart;

+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;

 

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index e277a853e..06bc526f4 100644
--- 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)

             loadUserDefaults();

 

-            // Display the quick start window if required.

-            quickStart();

-

             // Enable or disable tooltips

             tooltip();

 

@@ -215,15 +212,6 @@ namespace Handbrake
             }

         }

 

-        private void quickStart()

-        {

-            if ((Properties.Settings.Default.QuickStartWindow == "Checked") || (Properties.Settings.Default.QuickStartWindow == ""))

-            {

-                frmQuickStart quickstart = new frmQuickStart();

-                quickstart.ShowDialog();

-            }

-        }

-

         private void tooltip()

         {

             if (Properties.Settings.Default.tooltipEnable == "Checked")

@@ -324,6 +312,13 @@ namespace Handbrake
 

         #region Help Menu

 

+

+        private void mnu_quickStart_Click(object sender, EventArgs e)

+        {

+            Form QuickStart = new frmQuickStart();

+            QuickStart.ShowDialog();

+        }

+

         private void mnu_wiki_Click(object sender, EventArgs e)

         {

            Process.Start("http://handbrake.m0k.org/trac");

@@ -1313,6 +1308,7 @@ namespace Handbrake
                 CheckCRF.Enabled = false;

                 check_turbo.Enabled = false;

                 h264Tab.Enabled = false;

+                rtf_h264advanced.Text = "";

             }

             else

             {

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index bc45d31b8..a08591c51 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -24,11 +24,15 @@ namespace Handbrake
 

         private void btn_q_encoder_Click(object sender, EventArgs e)

         {

-            progressBar.Value = 0;

-            lbl_progressValue.Text = "0 %";

-            progressBar.Step = 100 / list_queue.Items.Count;

-            progressBar.Update();

-            ThreadPool.QueueUserWorkItem(startProc);

+            if (list_queue.Items.Count != 0)

+            {

+                progressBar.Value = 0;

+                lbl_progressValue.Text = "0 %";

+                progressBar.Step = 100 / list_queue.Items.Count;

+                progressBar.Update();

+                ThreadPool.QueueUserWorkItem(startProc);

+            }

+             

         }

 

         [DllImport("user32.dll")]

diff --git a/win/C#/frmQuickStart.Designer.cs b/win/C#/frmQuickStart.Designer.cs
index 07f9488b4..759634fd5 100644
--- a/win/C#/frmQuickStart.Designer.cs
+++ b/win/C#/frmQuickStart.Designer.cs
@@ -29,7 +29,6 @@ namespace Handbrake
         private void InitializeComponent()

         {

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

-            this.check_disableWindow = new System.Windows.Forms.CheckBox();

             this.btn_close = new System.Windows.Forms.Button();

             this.label1 = new System.Windows.Forms.Label();

             this.pictureBox1 = new System.Windows.Forms.PictureBox();

@@ -55,18 +54,6 @@ namespace Handbrake
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit();

             this.SuspendLayout();

             // 

-            // check_disableWindow

-            // 

-            this.check_disableWindow.AutoSize = true;

-            this.check_disableWindow.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_disableWindow.Location = new System.Drawing.Point(12, 406);

-            this.check_disableWindow.Name = "check_disableWindow";

-            this.check_disableWindow.Size = new System.Drawing.Size(185, 17);

-            this.check_disableWindow.TabIndex = 0;

-            this.check_disableWindow.Text = "Do not show on next launch";

-            this.check_disableWindow.UseVisualStyleBackColor = true;

-            this.check_disableWindow.CheckedChanged += new System.EventHandler(this.check_disableWindow_CheckedChanged);

-            // 

             // btn_close

             // 

             this.btn_close.BackColor = System.Drawing.SystemColors.Control;

@@ -74,7 +61,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_close.Location = new System.Drawing.Point(399, 402);

+            this.btn_close.Location = new System.Drawing.Point(399, 387);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(111, 22);

             this.btn_close.TabIndex = 415;

@@ -247,7 +234,7 @@ namespace Handbrake
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

             this.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.ClientSize = new System.Drawing.Size(522, 439);

+            this.ClientSize = new System.Drawing.Size(522, 420);

             this.Controls.Add(this.label8);

             this.Controls.Add(this.pictureBox8);

             this.Controls.Add(this.label7);

@@ -264,7 +251,6 @@ namespace Handbrake
             this.Controls.Add(this.pictureBox1);

             this.Controls.Add(this.label1);

             this.Controls.Add(this.btn_close);

-            this.Controls.Add(this.check_disableWindow);

             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

             this.Name = "frmQuickStart";

@@ -285,7 +271,6 @@ namespace Handbrake
 

         #endregion

 

-        private System.Windows.Forms.CheckBox check_disableWindow;

         internal System.Windows.Forms.Button btn_close;

         private System.Windows.Forms.Label label1;

         private System.Windows.Forms.PictureBox pictureBox1;

diff --git a/win/C#/frmQuickStart.cs b/win/C#/frmQuickStart.cs
index 70206e04c..8f0f4ba13 100644
--- a/win/C#/frmQuickStart.cs
+++ b/win/C#/frmQuickStart.cs
@@ -26,12 +26,5 @@ namespace Handbrake
         {

             this.Close();

         }

-

-        private void check_disableWindow_CheckedChanged(object sender, EventArgs e)

-        {

-            Properties.Settings.Default.QuickStartWindow = "UnChecked";

-            Properties.Settings.Default.Save();

-        }

-

     }

 }
\ No newline at end of file