WinGui:

- Queue now has minimise button.
- Ability to disable tooltips in tools > options
- Added a few more tooltips to items.
- Removed some old files that are no longer needed.
- Updated splash screen.

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

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index aecb259..db4342b 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -25,7 +25,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("2.41")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("2.4.1")]\r
         public string GuiVersion {\r
             get {\r
                 return ((string)(this["GuiVersion"]));\r
@@ -85,7 +85,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
         public string updateStatus {\r
             get {\r
                 return ((string)(this["updateStatus"]));\r
@@ -97,7 +97,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
         public string verbose {\r
             get {\r
                 return ((string)(this["verbose"]));\r
@@ -516,7 +516,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
         public string QuickStartWindow {\r
             get {\r
                 return ((string)(this["QuickStartWindow"]));\r
@@ -562,5 +562,17 @@ namespace Handbrake.Properties {
                 this["defaultError"] = value;\r
             }\r
         }\r
+        \r
+        [global::System.Configuration.UserScopedSettingAttribute()]\r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
+        public string tooltipEnable {\r
+            get {\r
+                return ((string)(this["tooltipEnable"]));\r
+            }\r
+            set {\r
+                this["tooltipEnable"] = value;\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index d518d78..0bf338f 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />\r
   <Settings>\r
     <Setting Name="GuiVersion" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">2.41</Value>\r
+      <Value Profile="(Default)">2.4.1</Value>\r
     </Setting>\r
     <Setting Name="updateFile" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">http://download.m0k.org/handbrake/windows/update.txt</Value>\r
@@ -18,10 +18,10 @@
       <Value Profile="(Default)" />\r
     </Setting>\r
     <Setting Name="updateStatus" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
+      <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
     <Setting Name="verbose" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
+      <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
     <Setting Name="DVDSource" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r
@@ -126,7 +126,7 @@
       <Value Profile="(Default)" />\r
     </Setting>\r
     <Setting Name="QuickStartWindow" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\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
@@ -137,5 +137,8 @@
     <Setting Name="defaultError" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Program Error. Please enable debug more in: Tools &gt; Options. If the error re-occurs, please report it on the forums.</Value>\r
     </Setting>\r
+    <Setting Name="tooltipEnable" Type="System.String" Scope="User">\r
+      <Value Profile="(Default)">Checked</Value>\r
+    </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/C#/Resources/tempSplash.jpg b/win/C#/Resources/tempSplash.jpg
index da5fc10..6994569 100644 (file)
Binary files a/win/C#/Resources/tempSplash.jpg and b/win/C#/Resources/tempSplash.jpg differ

diff --git a/win/C#/app.config b/win/C#/app.config
index 46f1a7d..a5239f9 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -8,7 +8,7 @@
     <userSettings>\r
         <Handbrake.Properties.Settings>\r
             <setting name="GuiVersion" serializeAs="String">\r
-                <value>2.41</value>\r
+                <value>2.4.1</value>\r
             </setting>\r
             <setting name="updateFile" serializeAs="String">\r
                 <value>http://download.m0k.org/handbrake/windows/update.txt</value>\r
@@ -23,10 +23,10 @@
                 <value />\r
             </setting>\r
             <setting name="updateStatus" serializeAs="String">\r
-                <value />\r
+                <value>Checked</value>\r
             </setting>\r
             <setting name="verbose" serializeAs="String">\r
-                <value />\r
+                <value>Checked</value>\r
             </setting>\r
             <setting name="DVDSource" serializeAs="String">\r
                 <value />\r
@@ -128,7 +128,7 @@
                 <value />\r
             </setting>\r
             <setting name="QuickStartWindow" serializeAs="String">\r
-                <value />\r
+                <value>Checked</value>\r
             </setting>\r
             <setting name="CliVersion" serializeAs="String">\r
                 <value>0.9.1</value>\r
@@ -139,6 +139,9 @@
             <setting name="defaultError" serializeAs="String">\r
                 <value>Program Error. Please enable debug more in: Tools &gt; Options. If the error re-occurs, please report it on the forums.</value>\r
             </setting>\r
+            <setting name="tooltipEnable" serializeAs="String">\r
+                <value>Checked</value>\r
+            </setting>\r
         </Handbrake.Properties.Settings>\r
     </userSettings>\r
 </configuration>
\ No newline at end of file

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 76e8b36..386b1ab 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -220,6 +220,10 @@ namespace Handbrake
             this.File_Save.DefaultExt = "hb";\r
             this.File_Save.Filter = "hb|*.hb";\r
             // \r
+            // ToolTip\r
+            // \r
+            this.ToolTip.Active = false;\r
+            // \r
             // drop_chapterFinish\r
             // \r
             this.drop_chapterFinish.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
@@ -428,7 +432,6 @@ namespace Handbrake
             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deInterlace_option.TabIndex = 67;\r
             this.drp_deInterlace_option.Text = "None";\r
-            this.ToolTip.SetToolTip(this.drp_deInterlace_option, "Select the subtitle language you require from this dropdown.");\r
             // \r
             // drp_deNoise\r
             // \r
@@ -445,7 +448,6 @@ namespace Handbrake
             this.drp_deNoise.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deNoise.TabIndex = 72;\r
             this.drp_deNoise.Text = "None";\r
-            this.ToolTip.SetToolTip(this.drp_deNoise, "Select the subtitle language you require from this dropdown.");\r
             // \r
             // DVD_Open\r
             // \r
@@ -539,7 +541,7 @@ namespace Handbrake
             // \r
             this.mnu_encode.Name = "mnu_encode";\r
             this.mnu_encode.Size = new System.Drawing.Size(155, 22);\r
-            this.mnu_encode.Text = "Encode Queue";\r
+            this.mnu_encode.Text = "View Queue";\r
             this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);\r
             // \r
             // mnu_viewDVDdata\r
@@ -1029,7 +1031,7 @@ namespace Handbrake
             this.lbl_update.AutoSize = true;\r
             this.lbl_update.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.lbl_update.ForeColor = System.Drawing.Color.Black;\r
-            this.lbl_update.Location = new System.Drawing.Point(88, 594);\r
+            this.lbl_update.Location = new System.Drawing.Point(102, 594);\r
             this.lbl_update.Name = "lbl_update";\r
             this.lbl_update.Size = new System.Drawing.Size(193, 13);\r
             this.lbl_update.TabIndex = 417;\r
@@ -1074,7 +1076,7 @@ namespace Handbrake
             this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Version.Location = new System.Drawing.Point(12, 594);\r
             this.Version.Name = "Version";\r
-            this.Version.Size = new System.Drawing.Size(79, 20);\r
+            this.Version.Size = new System.Drawing.Size(94, 20);\r
             this.Version.TabIndex = 415;\r
             this.Version.Text = "Version 2.4";\r
             // \r
@@ -1179,6 +1181,7 @@ namespace Handbrake
             this.QueryEditorText.Size = new System.Drawing.Size(605, 104);\r
             this.QueryEditorText.TabIndex = 41;\r
             this.QueryEditorText.Text = "";\r
+            this.ToolTip.SetToolTip(this.QueryEditorText, "Manually add or edit a query generated by the GUI.");\r
             // \r
             // h264Tab\r
             // \r
@@ -1258,6 +1261,7 @@ namespace Handbrake
             this.rtf_h264advanced.Size = new System.Drawing.Size(605, 96);\r
             this.rtf_h264advanced.TabIndex = 41;\r
             this.rtf_h264advanced.Text = "";\r
+            this.ToolTip.SetToolTip(this.rtf_h264advanced, "H.264 advanced options can be added here. See link below for details.");\r
             // \r
             // Label92\r
             // \r
@@ -1350,6 +1354,7 @@ namespace Handbrake
             this.drp_audioBitrate.Size = new System.Drawing.Size(101, 21);\r
             this.drp_audioBitrate.TabIndex = 40;\r
             this.drp_audioBitrate.Text = "128";\r
+            this.ToolTip.SetToolTip(this.drp_audioBitrate, "Set the Audio Bit-Rate");\r
             // \r
             // Label14\r
             // \r
@@ -1425,6 +1430,7 @@ namespace Handbrake
             this.drp_audioSampleRate.Size = new System.Drawing.Size(101, 21);\r
             this.drp_audioSampleRate.TabIndex = 23;\r
             this.drp_audioSampleRate.Text = "44.1";\r
+            this.ToolTip.SetToolTip(this.drp_audioSampleRate, "Set the Audio Sample Rate");\r
             // \r
             // TabPage3\r
             // \r
@@ -1531,6 +1537,7 @@ namespace Handbrake
             this.check_largeFile.Size = new System.Drawing.Size(172, 17);\r
             this.check_largeFile.TabIndex = 51;\r
             this.check_largeFile.Text = "Larger mp4 Files (> 4GB)";\r
+            this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of mp4 files greater than 4GB.");\r
             this.check_largeFile.UseVisualStyleBackColor = true;\r
             this.check_largeFile.Click += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
             // \r
@@ -1543,6 +1550,7 @@ namespace Handbrake
             this.check_turbo.Size = new System.Drawing.Size(110, 17);\r
             this.check_turbo.TabIndex = 50;\r
             this.check_turbo.Text = "Turbo 1st Pass";\r
+            this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");\r
             this.check_turbo.UseVisualStyleBackColor = true;\r
             // \r
             // Label23\r
@@ -1605,6 +1613,7 @@ namespace Handbrake
             this.drp_videoFramerate.Size = new System.Drawing.Size(112, 21);\r
             this.drp_videoFramerate.TabIndex = 21;\r
             this.drp_videoFramerate.Text = "Automatic";\r
+            this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to automcatic in most cases.");\r
             // \r
             // check_2PassEncode\r
             // \r
@@ -1625,6 +1634,7 @@ namespace Handbrake
             this.slider_videoQuality.Size = new System.Drawing.Size(167, 42);\r
             this.slider_videoQuality.TabIndex = 6;\r
             this.slider_videoQuality.TickFrequency = 17;\r
+            this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. (Around 70% is fine for most)");\r
             this.slider_videoQuality.Scroll += new System.EventHandler(this.slider_videoQuality_Scroll);\r
             // \r
             // text_filesize\r
@@ -1635,6 +1645,7 @@ namespace Handbrake
             this.text_filesize.Name = "text_filesize";\r
             this.text_filesize.Size = new System.Drawing.Size(156, 21);\r
             this.text_filesize.TabIndex = 16;\r
+            this.ToolTip.SetToolTip(this.text_filesize, "Set the file size you wish the encoded file to be.");\r
             this.text_filesize.TextChanged += new System.EventHandler(this.text_filesize_TextChanged);\r
             // \r
             // Label46\r
@@ -1665,6 +1676,7 @@ namespace Handbrake
             this.text_bitrate.Name = "text_bitrate";\r
             this.text_bitrate.Size = new System.Drawing.Size(156, 21);\r
             this.text_bitrate.TabIndex = 15;\r
+            this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");\r
             this.text_bitrate.TextChanged += new System.EventHandler(this.text_bitrate_TextChanged);\r
             // \r
             // Label42\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 58ccc7d..27b7ac8 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -58,11 +58,14 @@ namespace Handbrake
             // Display the quick start window if required.\r
             quickStart();\r
 \r
+            // Enable or disable tooltips\r
+            tooltip();\r
+\r
             //MessageBox.Show(System.Environment.OSVersion.Version.ToString());\r
         \r
         }\r
 \r
-        public void showSplash(object sender)\r
+        private void showSplash(object sender)\r
         {\r
             Form splash = new frmSplashScreen();\r
             splash.Show();\r
@@ -70,7 +73,7 @@ namespace Handbrake
             splash.Close();\r
         }\r
 \r
-        public void loadUserDefaults()\r
+        private void loadUserDefaults()\r
         { \r
             try\r
             {\r
@@ -159,7 +162,7 @@ namespace Handbrake
             }\r
         }\r
 \r
-        public void updateCheck()\r
+        private void updateCheck()\r
         {\r
             if (Properties.Settings.Default.updateStatus == "Checked")\r
             {\r
@@ -182,7 +185,7 @@ namespace Handbrake
             }\r
         }\r
 \r
-        public void quickStart()\r
+        private void quickStart()\r
         {\r
             if ((Properties.Settings.Default.QuickStartWindow == "Checked") || (Properties.Settings.Default.QuickStartWindow == ""))\r
             {\r
@@ -191,6 +194,14 @@ 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
 \r
         // -------------------------------------------------------------- \r
         // The main Menu bar.\r
@@ -1389,7 +1400,6 @@ namespace Handbrake
                 drp_audioBitrate.Items.Add("224");\r
                 drp_audioBitrate.Items.Add("256");\r
                 drp_audioBitrate.Items.Add("320");\r
-                drp_audioBitrate.Items.Add("384");\r
             }\r
         }\r
 \r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index e868095..189958b 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -44,6 +44,8 @@ namespace Handbrake
             this.GroupBox1 = new System.Windows.Forms.GroupBox();\r
             this.check_guiDebug = new System.Windows.Forms.CheckBox();\r
             this.btn_close = new System.Windows.Forms.Button();\r
+            this.label3 = new System.Windows.Forms.Label();\r
+            this.check_tooltip = new System.Windows.Forms.CheckBox();\r
             this.GroupBox2.SuspendLayout();\r
             this.GroupBox3.SuspendLayout();\r
             this.GroupBox1.SuspendLayout();\r
@@ -70,6 +72,8 @@ namespace Handbrake
             // GroupBox2\r
             // \r
             this.GroupBox2.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.GroupBox2.Controls.Add(this.label3);\r
+            this.GroupBox2.Controls.Add(this.check_tooltip);\r
             this.GroupBox2.Controls.Add(this.Label1);\r
             this.GroupBox2.Controls.Add(this.check_updateCheck);\r
             this.GroupBox2.Controls.Add(this.Label2);\r
@@ -77,7 +81,7 @@ namespace Handbrake
             this.GroupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.GroupBox2.Location = new System.Drawing.Point(12, 11);\r
             this.GroupBox2.Name = "GroupBox2";\r
-            this.GroupBox2.Size = new System.Drawing.Size(386, 132);\r
+            this.GroupBox2.Size = new System.Drawing.Size(386, 173);\r
             this.GroupBox2.TabIndex = 55;\r
             this.GroupBox2.TabStop = false;\r
             this.GroupBox2.Text = "General Settings";\r
@@ -108,7 +112,7 @@ namespace Handbrake
             // \r
             this.Label2.AutoSize = true;\r
             this.Label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label2.Location = new System.Drawing.Point(13, 72);\r
+            this.Label2.Location = new System.Drawing.Point(13, 67);\r
             this.Label2.Name = "Label2";\r
             this.Label2.Size = new System.Drawing.Size(229, 13);\r
             this.Label2.TabIndex = 46;\r
@@ -118,7 +122,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, 93);\r
+            this.check_userDefaultSettings.Location = new System.Drawing.Point(16, 88);\r
             this.check_userDefaultSettings.Name = "check_userDefaultSettings";\r
             this.check_userDefaultSettings.Size = new System.Drawing.Size(71, 17);\r
             this.check_userDefaultSettings.TabIndex = 47;\r
@@ -192,7 +196,7 @@ namespace Handbrake
             this.GroupBox3.Controls.Add(this.drp_processors);\r
             this.GroupBox3.Controls.Add(this.Label11);\r
             this.GroupBox3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.GroupBox3.Location = new System.Drawing.Point(13, 149);\r
+            this.GroupBox3.Location = new System.Drawing.Point(13, 190);\r
             this.GroupBox3.Name = "GroupBox3";\r
             this.GroupBox3.Size = new System.Drawing.Size(386, 128);\r
             this.GroupBox3.TabIndex = 56;\r
@@ -205,7 +209,7 @@ namespace Handbrake
             this.GroupBox1.Controls.Add(this.check_guiDebug);\r
             this.GroupBox1.Controls.Add(this.check_verbose);\r
             this.GroupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.GroupBox1.Location = new System.Drawing.Point(13, 283);\r
+            this.GroupBox1.Location = new System.Drawing.Point(13, 324);\r
             this.GroupBox1.Name = "GroupBox1";\r
             this.GroupBox1.Size = new System.Drawing.Size(386, 70);\r
             this.GroupBox1.TabIndex = 54;\r
@@ -231,7 +235,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(292, 360);\r
+            this.btn_close.Location = new System.Drawing.Point(292, 410);\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
@@ -239,10 +243,32 @@ namespace Handbrake
             this.btn_close.UseVisualStyleBackColor = false;\r
             this.btn_close.Click += new System.EventHandler(this.btn_close_Click);\r
             // \r
+            // label3\r
+            // \r
+            this.label3.AutoSize = true;\r
+            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label3.Location = new System.Drawing.Point(13, 117);\r
+            this.label3.Name = "label3";\r
+            this.label3.Size = new System.Drawing.Size(116, 13);\r
+            this.label3.TabIndex = 48;\r
+            this.label3.Text = "Enable GUI tooltips";\r
+            // \r
+            // check_tooltip\r
+            // \r
+            this.check_tooltip.AutoSize = true;\r
+            this.check_tooltip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_tooltip.Location = new System.Drawing.Point(16, 138);\r
+            this.check_tooltip.Name = "check_tooltip";\r
+            this.check_tooltip.Size = new System.Drawing.Size(71, 17);\r
+            this.check_tooltip.TabIndex = 49;\r
+            this.check_tooltip.Text = "Enabled";\r
+            this.check_tooltip.UseVisualStyleBackColor = true;\r
+            this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);\r
+            // \r
             // frmOptions\r
             // \r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(411, 394);\r
+            this.ClientSize = new System.Drawing.Size(411, 444);\r
             this.Controls.Add(this.GroupBox2);\r
             this.Controls.Add(this.GroupBox3);\r
             this.Controls.Add(this.GroupBox1);\r
@@ -281,5 +307,7 @@ namespace Handbrake
         internal System.Windows.Forms.GroupBox GroupBox1;\r
         internal System.Windows.Forms.Button btn_close;\r
         internal System.Windows.Forms.CheckBox check_guiDebug;\r
+        internal System.Windows.Forms.Label label3;\r
+        internal System.Windows.Forms.CheckBox check_tooltip;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index b0bab68..a857924 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -37,6 +37,11 @@ namespace Handbrake
             {\r
                 check_guiDebug.CheckState = CheckState.Checked;\r
             }\r
+\r
+            if (Properties.Settings.Default.tooltipEnable == "Checked")\r
+            {\r
+                check_tooltip.CheckState = CheckState.Checked;\r
+            }\r
         }\r
 \r
         private void check_updateCheck_CheckedChanged(object sender, EventArgs e)\r
@@ -75,6 +80,11 @@ namespace Handbrake
             Properties.Settings.Default.GuiDebug = check_guiDebug.CheckState.ToString();\r
         }\r
 \r
+        private void check_tooltip_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            Properties.Settings.Default.tooltipEnable = check_tooltip.CheckState.ToString();\r
+        }\r
+\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index c8377c8..f5db97d 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -39,6 +39,7 @@ namespace Handbrake
             this.progressBar = new System.Windows.Forms.ProgressBar();\r
             this.label2 = new System.Windows.Forms.Label();\r
             this.lbl_progressValue = new System.Windows.Forms.Label();\r
+            this.btn_minimise = new System.Windows.Forms.Button();\r
             this.SuspendLayout();\r
             // \r
             // btn_down\r
@@ -131,9 +132,9 @@ 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(516, 374);\r
+            this.btn_Close.Location = new System.Drawing.Point(532, 374);\r
             this.btn_Close.Name = "btn_Close";\r
-            this.btn_Close.Size = new System.Drawing.Size(124, 22);\r
+            this.btn_Close.Size = new System.Drawing.Size(108, 22);\r
             this.btn_Close.TabIndex = 27;\r
             this.btn_Close.TabStop = false;\r
             this.btn_Close.Text = "Close Window";\r
@@ -166,13 +167,29 @@ namespace Handbrake
             this.lbl_progressValue.TabIndex = 36;\r
             this.lbl_progressValue.Text = "0 %";\r
             // \r
+            // btn_minimise\r
+            // \r
+            this.btn_minimise.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_minimise.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_minimise.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_minimise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_minimise.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_minimise.Location = new System.Drawing.Point(389, 374);\r
+            this.btn_minimise.Name = "btn_minimise";\r
+            this.btn_minimise.Size = new System.Drawing.Size(137, 22);\r
+            this.btn_minimise.TabIndex = 37;\r
+            this.btn_minimise.TabStop = false;\r
+            this.btn_minimise.Text = "Minimize Window";\r
+            this.btn_minimise.UseVisualStyleBackColor = false;\r
+            this.btn_minimise.Click += new System.EventHandler(this.btn_minimise_Click);\r
+            // \r
             // frmQueue\r
             // \r
             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(657, 406);\r
-            this.ControlBox = false;\r
+            this.Controls.Add(this.btn_minimise);\r
             this.Controls.Add(this.lbl_progressValue);\r
             this.Controls.Add(this.label2);\r
             this.Controls.Add(this.progressBar);\r
@@ -185,6 +202,7 @@ namespace Handbrake
             this.Controls.Add(this.btn_Close);\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
+            this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(663, 431);\r
             this.MinimumSize = new System.Drawing.Size(663, 431);\r
             this.Name = "frmQueue";\r
@@ -207,5 +225,6 @@ namespace Handbrake
         private System.Windows.Forms.ProgressBar progressBar;\r
         private System.Windows.Forms.Label label2;\r
         private System.Windows.Forms.Label lbl_progressValue;\r
+        internal System.Windows.Forms.Button btn_minimise;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 8e59e11..c61b907 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -145,5 +145,10 @@ namespace Handbrake
         {\r
             this.Hide();\r
         }\r
+\r
+        private void btn_minimise_Click(object sender, EventArgs e)\r
+        {\r
+            this.WindowState = FormWindowState.Minimized;\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/splash.jpg b/win/C#/splash.jpg
deleted file mode 100644 (file)
index b930b77..0000000
Binary files a/win/C#/splash.jpg and /dev/null differ