WinGui:

- Copy to clipboard button on the dvd information window.
- Show / hide presets button removed and replaced with an item in the presets menu.
- Re-enabled the update status text.

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

diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs
index f07cb6f..2c5f83a 100644 (file)
--- a/win/C#/frmDvdInfo.Designer.cs
+++ b/win/C#/frmDvdInfo.Designer.cs
@@ -36,6 +36,7 @@ namespace Handbrake
             this.pictureBox1 = new System.Windows.Forms.PictureBox();\r
             this.label1 = new System.Windows.Forms.Label();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
+            this.btn_copy = new System.Windows.Forms.Button();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
@@ -100,6 +101,21 @@ namespace Handbrake
             // \r
             this.ToolTip.Active = false;\r
             // \r
+            // btn_copy\r
+            // \r
+            this.btn_copy.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_copy.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_copy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_copy.Location = new System.Drawing.Point(19, 451);\r
+            this.btn_copy.Name = "btn_copy";\r
+            this.btn_copy.Size = new System.Drawing.Size(134, 23);\r
+            this.btn_copy.TabIndex = 93;\r
+            this.btn_copy.Text = "Copy to Clipboard";\r
+            this.btn_copy.UseVisualStyleBackColor = false;\r
+            this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click);\r
+            // \r
             // frmDvdInfo\r
             // \r
             this.AcceptButton = this.btn_close;\r
@@ -107,6 +123,7 @@ namespace Handbrake
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.ClientSize = new System.Drawing.Size(636, 493);\r
+            this.Controls.Add(this.btn_copy);\r
             this.Controls.Add(this.label1);\r
             this.Controls.Add(this.pictureBox1);\r
             this.Controls.Add(this.Label2);\r
@@ -136,5 +153,6 @@ namespace Handbrake
         private System.Windows.Forms.PictureBox pictureBox1;\r
         private System.Windows.Forms.Label label1;\r
         internal System.Windows.Forms.ToolTip ToolTip;\r
+        internal System.Windows.Forms.Button btn_copy;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs
index 02338c1..ee3a4e5 100644 (file)
--- a/win/C#/frmDvdInfo.cs
+++ b/win/C#/frmDvdInfo.cs
@@ -54,5 +54,11 @@ namespace Handbrake
                 // Don't do anything\r
             }\r
         }\r
+\r
+        private void btn_copy_Click(object sender, EventArgs e)\r
+        {\r
+            if (rtf_dvdInfo.Text != "")\r
+                Clipboard.SetText(rtf_dvdInfo.Text, TextDataFormat.Text);\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 08201d0..4c8eebd 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -58,7 +58,6 @@ namespace Handbrake
             this.text_filesize = new System.Windows.Forms.TextBox();\r
             this.text_bitrate = new System.Windows.Forms.TextBox();\r
             this.drp_subtitle = new System.Windows.Forms.ComboBox();\r
-            this.btn_presets = new System.Windows.Forms.Button();\r
             this.btn_setDefault = new System.Windows.Forms.Button();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -75,8 +74,8 @@ namespace Handbrake
             this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();\r
             this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.mnu_showPresets = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();\r
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_quickStart = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -179,6 +178,7 @@ namespace Handbrake
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.listview_presets = new System.Windows.Forms.ListView();\r
             this.presetname = new System.Windows.Forms.ColumnHeader();\r
+            this.toolStripSeparator7 = 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
@@ -555,22 +555,6 @@ namespace Handbrake
             this.drp_subtitle.Text = "None";\r
             this.ToolTip.SetToolTip(this.drp_subtitle, "Select the subtitle language you require from this dropdown.");\r
             // \r
-            // btn_presets\r
-            // \r
-            this.btn_presets.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_presets.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_presets.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_presets.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_presets.Location = new System.Drawing.Point(549, 12);\r
-            this.btn_presets.Name = "btn_presets";\r
-            this.btn_presets.Size = new System.Drawing.Size(111, 22);\r
-            this.btn_presets.TabIndex = 102;\r
-            this.btn_presets.Text = "Show Presets";\r
-            this.ToolTip.SetToolTip(this.btn_presets, "Show or Hide the preset section");\r
-            this.btn_presets.UseVisualStyleBackColor = true;\r
-            this.btn_presets.Visible = false;\r
-            this.btn_presets.Click += new System.EventHandler(this.btn_presets_Click);\r
-            // \r
             // btn_setDefault\r
             // \r
             this.btn_setDefault.BackColor = System.Drawing.SystemColors.ControlLight;\r
@@ -697,13 +681,22 @@ namespace Handbrake
             // \r
             this.PresetsToolStripMenuItem.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_presetReset,\r
-            this.toolStripSeparator4,\r
-            this.mnu_SelectDefault});\r
+            this.mnu_showPresets,\r
+            this.mnu_SelectDefault,\r
+            this.toolStripSeparator7,\r
+            this.mnu_presetReset});\r
             this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";\r
             this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20);\r
             this.PresetsToolStripMenuItem.Text = "&Presets";\r
             // \r
+            // mnu_showPresets\r
+            // \r
+            this.mnu_showPresets.Name = "mnu_showPresets";\r
+            this.mnu_showPresets.Size = new System.Drawing.Size(194, 22);\r
+            this.mnu_showPresets.Text = "Show Presets";\r
+            this.mnu_showPresets.Visible = false;\r
+            this.mnu_showPresets.Click += new System.EventHandler(this.mnu_showPresets_Click);\r
+            // \r
             // mnu_presetReset\r
             // \r
             this.mnu_presetReset.Name = "mnu_presetReset";\r
@@ -712,12 +705,6 @@ namespace Handbrake
             this.mnu_presetReset.ToolTipText = "Resets all presets.";\r
             this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click);\r
             // \r
-            // toolStripSeparator4\r
-            // \r
-            this.toolStripSeparator4.Name = "toolStripSeparator4";\r
-            this.toolStripSeparator4.Size = new System.Drawing.Size(191, 6);\r
-            this.toolStripSeparator4.Visible = false;\r
-            // \r
             // mnu_SelectDefault\r
             // \r
             this.mnu_SelectDefault.Name = "mnu_SelectDefault";\r
@@ -1946,13 +1933,17 @@ namespace Handbrake
             this.presetname.Text = "Presets";\r
             this.presetname.Width = 175;\r
             // \r
+            // toolStripSeparator7\r
+            // \r
+            this.toolStripSeparator7.Name = "toolStripSeparator7";\r
+            this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6);\r
+            // \r
             // frmMain\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(874, 566);\r
-            this.Controls.Add(this.btn_presets);\r
             this.Controls.Add(this.groupBox2);\r
             this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.btn_eCancel);\r
@@ -2129,9 +2120,7 @@ namespace Handbrake
         private System.Windows.Forms.Label label23;\r
         internal System.Windows.Forms.Button btn_copy;\r
         private System.Windows.Forms.GroupBox groupBox2;\r
-        internal System.Windows.Forms.Button btn_presets;\r
         internal System.Windows.Forms.Button btn_setDefault;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;\r
@@ -2146,6 +2135,8 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_save;\r
         internal System.Windows.Forms.ListView listview_presets;\r
         internal System.Windows.Forms.ColumnHeader presetname;\r
+        private System.Windows.Forms.ToolStripMenuItem mnu_showPresets;\r
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 12d7a5d..d9c1387 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -116,7 +116,7 @@ namespace Handbrake
 \r
         private void splashTimer(object sender)\r
         {\r
-            Thread.Sleep(2000);  //sit for 2 seconds then exit\r
+            Thread.Sleep(1000);  //sit for 1 seconds then exit\r
         }\r
 \r
         private void showSplash(object sender)\r
@@ -134,7 +134,7 @@ namespace Handbrake
 \r
             if (item != null)\r
             {\r
-                listview_presets.SelectedItems.Clear();\r
+                //listview_presets.SelectedItems.Clear();\r
                 item.Selected = true;\r
             }\r
         }\r
@@ -178,7 +178,7 @@ namespace Handbrake
 \r
                     Boolean update = ((verdata > vergui) || (verd1 > cliversion));\r
 \r
-                    //lbl_update.Visible = update;\r
+                    lbl_update.Visible = update;\r
 \r
                     return update;\r
                 }\r
@@ -206,7 +206,7 @@ namespace Handbrake
         {\r
             if (Properties.Settings.Default.hidePresets == "Checked")\r
             {\r
-                btn_presets.Visible = true;\r
+                mnu_showPresets.Visible = true;\r
                 this.Width = 591;\r
             }\r
 \r
@@ -313,6 +313,23 @@ namespace Handbrake
         #endregion\r
 \r
         #region Presets Menu\r
+        Boolean presetStatus;\r
+\r
+        private void mnu_showPresets_Click(object sender, EventArgs e)\r
+        {\r
+            if (presetStatus == false)\r
+            {\r
+                this.Width = 881;\r
+                presetStatus = true;\r
+                mnu_showPresets.Text = "Hide Presets";\r
+            }\r
+            else\r
+            {\r
+                this.Width = 590;\r
+                presetStatus = false;\r
+                mnu_showPresets.Text = "Show Presets";\r
+            }\r
+        }\r
 \r
         private void mnu_presetReset_Click(object sender, EventArgs e)\r
         {\r
@@ -330,13 +347,6 @@ namespace Handbrake
                 listview_presets.SelectedItems.Clear();\r
                 item.Selected = true;\r
             }\r
-\r
-            if (presetStatus == false)\r
-            {\r
-                this.Width = 881;\r
-                presetStatus = true;\r
-                btn_presets.Text = "Hide Presets";\r
-            }\r
         }\r
 \r
         #endregion\r
@@ -563,27 +573,7 @@ namespace Handbrake
 \r
         }\r
 \r
-        // Varibles\r
-        private Boolean presetStatus = false;\r
-\r
         // Buttons\r
-        private void btn_presets_Click(object sender, EventArgs e)\r
-        {\r
-            if (presetStatus == false)\r
-            {\r
-                this.Width = 881;\r
-                presetStatus = true;\r
-                btn_presets.Text = "Hide Presets";\r
-            }\r
-            else\r
-            {\r
-                this.Width = 590;\r
-                presetStatus = false;\r
-                btn_presets.Text = "Show Presets";\r
-            }\r
-\r
-        }\r
-\r
         private void btn_setDefault_Click(object sender, EventArgs e)\r
         {\r
             String query = GenerateTheQuery();\r
@@ -648,6 +638,7 @@ namespace Handbrake
 \r
            \r
         }\r
+\r
         #endregion\r
 \r
         //---------------------------------------------------\r