WinGui:

- Few more improvements to the ActivityWindow. Hopefully makes it a bit more user friendly.

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 54ba647..cea2636 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -241,6 +241,7 @@
     <None Include="Resources\ActivityWindow.png" />\r
     <None Include="Resources\AddToQueue.png" />\r
     <Content Include="Resources\ActivityWindow_small.png" />\r
+    <Content Include="Resources\copy.png" />\r
     <Content Include="Resources\disc_small.png" />\r
     <None Include="Resources\hb32.png" />\r
     <None Include="Resources\hb16.png" />\r

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index ff6d278..0a9c4b7 100644 (file)
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -81,6 +81,13 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap copy {\r
+            get {\r
+                object obj = ResourceManager.GetObject("copy", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap disc_small {\r
             get {\r
                 object obj = ResourceManager.GetObject("disc_small", resourceCulture);\r

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index c4f88cf..7fa9934 100644 (file)
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -187,4 +187,7 @@
   <data name="Queue" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Queue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="copy" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\resources\copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/win/C#/Resources/copy.png b/win/C#/Resources/copy.png
new file mode 100644 (file)
index 0000000..c11c6a7
Binary files /dev/null and b/win/C#/Resources/copy.png differ

diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
index d4e5ee3..b6bb55e 100644 (file)
--- a/win/C#/frmActivityWindow.Designer.cs
+++ b/win/C#/frmActivityWindow.Designer.cs
@@ -39,14 +39,14 @@ namespace Handbrake
             this.rtf_actLog = new System.Windows.Forms.RichTextBox();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
-            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();\r
-            this.btn_encode_log = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.btn_scan_log = new System.Windows.Forms.ToolStripMenuItem();\r
             this.panel1 = new System.Windows.Forms.Panel();\r
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();\r
             this.txt_log = new System.Windows.Forms.ToolStripStatusLabel();\r
+            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();\r
+            this.btn_encode_log = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.btn_scan_log = new System.Windows.Forms.ToolStripMenuItem();\r
             this.btn_copy = new System.Windows.Forms.ToolStripButton();\r
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.lbl_slb = new System.Windows.Forms.ToolStripStatusLabel();\r
             this.toolStrip1.SuspendLayout();\r
             this.statusStrip1.SuspendLayout();\r
             this.SuspendLayout();\r
@@ -72,7 +72,6 @@ namespace Handbrake
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.toolStripDropDownButton1,\r
-            this.toolStripSeparator1,\r
             this.btn_copy});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);\r
             this.toolStrip1.Name = "toolStrip1";\r
@@ -81,34 +80,6 @@ namespace Handbrake
             this.toolStrip1.TabIndex = 96;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
-            // toolStripDropDownButton1\r
-            // \r
-            this.toolStripDropDownButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
-            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.btn_encode_log,\r
-            this.btn_scan_log});\r
-            this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));\r
-            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";\r
-            this.toolStripDropDownButton1.Size = new System.Drawing.Size(78, 22);\r
-            this.toolStripDropDownButton1.Text = "Select Log";\r
-            // \r
-            // btn_encode_log\r
-            // \r
-            this.btn_encode_log.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;\r
-            this.btn_encode_log.Name = "btn_encode_log";\r
-            this.btn_encode_log.Size = new System.Drawing.Size(151, 22);\r
-            this.btn_encode_log.Text = "Encode Log";\r
-            this.btn_encode_log.Click += new System.EventHandler(this.btn_encode_log_Click);\r
-            // \r
-            // btn_scan_log\r
-            // \r
-            this.btn_scan_log.Image = global::Handbrake.Properties.Resources.Movies_Small;\r
-            this.btn_scan_log.Name = "btn_scan_log";\r
-            this.btn_scan_log.Size = new System.Drawing.Size(151, 22);\r
-            this.btn_scan_log.Text = "Scan Log";\r
-            this.btn_scan_log.Click += new System.EventHandler(this.btn_scan_log_Click);\r
-            // \r
             // panel1\r
             // \r
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
@@ -120,6 +91,7 @@ namespace Handbrake
             // statusStrip1\r
             // \r
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.lbl_slb,\r
             this.txt_log});\r
             this.statusStrip1.Location = new System.Drawing.Point(0, 555);\r
             this.statusStrip1.Name = "statusStrip1";\r
@@ -134,20 +106,51 @@ namespace Handbrake
             this.txt_log.Size = new System.Drawing.Size(85, 17);\r
             this.txt_log.Text = "{selected log}";\r
             // \r
+            // toolStripDropDownButton1\r
+            // \r
+            this.toolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;\r
+            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.btn_encode_log,\r
+            this.btn_scan_log});\r
+            this.toolStripDropDownButton1.Image = global::Handbrake.Properties.Resources.Output_Small;\r
+            this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";\r
+            this.toolStripDropDownButton1.Size = new System.Drawing.Size(94, 22);\r
+            this.toolStripDropDownButton1.Text = "Select Log";\r
+            // \r
+            // btn_encode_log\r
+            // \r
+            this.btn_encode_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
+            this.btn_encode_log.Name = "btn_encode_log";\r
+            this.btn_encode_log.Size = new System.Drawing.Size(152, 22);\r
+            this.btn_encode_log.Text = "Encode Log";\r
+            this.btn_encode_log.Click += new System.EventHandler(this.btn_encode_log_Click);\r
+            // \r
+            // btn_scan_log\r
+            // \r
+            this.btn_scan_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
+            this.btn_scan_log.Name = "btn_scan_log";\r
+            this.btn_scan_log.Size = new System.Drawing.Size(152, 22);\r
+            this.btn_scan_log.Text = "Scan Log";\r
+            this.btn_scan_log.Click += new System.EventHandler(this.btn_scan_log_Click);\r
+            // \r
             // btn_copy\r
             // \r
-            this.btn_copy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
             this.btn_copy.Image = ((System.Drawing.Image)(resources.GetObject("btn_copy.Image")));\r
+            this.btn_copy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_copy.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_copy.Name = "btn_copy";\r
-            this.btn_copy.Size = new System.Drawing.Size(106, 22);\r
+            this.btn_copy.Size = new System.Drawing.Size(122, 22);\r
             this.btn_copy.Text = "Copy to clipboard";\r
             this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click);\r
             // \r
-            // toolStripSeparator1\r
+            // lbl_slb\r
             // \r
-            this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);\r
+            this.lbl_slb.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_slb.Name = "lbl_slb";\r
+            this.lbl_slb.Size = new System.Drawing.Size(94, 17);\r
+            this.lbl_slb.Text = "Selected Log: ";\r
             // \r
             // frmActivityWindow\r
             // \r
@@ -187,7 +190,7 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;\r
         private System.Windows.Forms.ToolStripMenuItem btn_encode_log;\r
         private System.Windows.Forms.ToolStripMenuItem btn_scan_log;\r
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
         private System.Windows.Forms.ToolStripButton btn_copy;\r
+        private System.Windows.Forms.ToolStripStatusLabel lbl_slb;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 6d46a44..c0911ea 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -49,9 +49,9 @@ namespace Handbrake
             startLogThread(read_file);\r
 \r
             if (file == "dvdinfo.dat")\r
-                txt_log.Text = "Selected Log: Scan Log";\r
+                txt_log.Text = "Scan Log";\r
             else if (file == "hb_encode_log.dat")\r
-                txt_log.Text = "Selected Log: Encode Log";\r
+                txt_log.Text = "Encode Log";\r
 \r
 \r
             // When the window closes, we want to abort the monitor thread.\r
@@ -110,7 +110,7 @@ namespace Handbrake
             read_file = "dvdinfo.dat";\r
             displayLogHeader();\r
             startLogThread(read_file);\r
-            txt_log.Text = "Selected Log: Scan Log";\r
+            txt_log.Text = "Scan Log";\r
         }\r
 \r
         /// <summary>\r
@@ -128,7 +128,7 @@ namespace Handbrake
             position = 0;\r
             displayLogHeader();\r
             startLogThread(read_file);\r
-            txt_log.Text = "Selected Log: Encode Log";\r
+            txt_log.Text = "Encode Log";\r
         }\r
 \r
         /// <summary>\r

diff --git a/win/C#/frmActivityWindow.resx b/win/C#/frmActivityWindow.resx
index 0b13bb7..f35a715 100644 (file)
--- a/win/C#/frmActivityWindow.resx
+++ b/win/C#/frmActivityWindow.resx
@@ -124,34 +124,19 @@
     <value>105, 17</value>\r
   </metadata>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
-  <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL\r
-        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI\r
-        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ\r
-        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4\r
-        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9\r
-        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j\r
-        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR\r
-        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb\r
-        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE\r
-        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC\r
-</value>\r
-  </data>\r
   <data name="btn_copy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL\r
-        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI\r
-        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ\r
-        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4\r
-        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9\r
-        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j\r
-        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR\r
-        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb\r
-        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE\r
-        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAeVJREFUOE+lk99P\r
+        kmEYhv1TSsdcdewf0FpZrTbbah7UQVvZOuJAjzpq2WzLNWy0iSHNwtIB9iE0l1KJEIgSYSL2AxfZVrCh\r
+        7vuURPTDruBlSdCGbj7bffbe1/Pc7/O+NTX7Laf3MwVJ7qiQZTRMv3OKqeB79sQumCvL7Ahwrf0ZE17v\r
+        7hD7eLTMn9v+TffAK1z+KBdbu3BPeKpDLGMzAuCKgfQBInGFB+aXSD4Fm1fG6pF5PCajH14Reu2bLwf2\r
+        OwM7E2xu5VDWsiRSaQGorI7BJRpa/DhcoRLEZPOIc33+LXSjCrekn7Q9iTPwZvk/QKsxhXNa4UizA2lk\r
+        sggx5PMWcq9nVJbkDIuJVT7GlzGNJAWgU8oJRRZWuaxLcrj5BYfOD1Hf9LQIKOTdyKo7nbWmGNcN89y3\r
+        LpZNoPxSWfixgX9uDaMUQnP2UQmgpLN8+pZi5kuCQOQ77ndfae8rrvfmYBqtIcmlezHO3Z4VMkpBNKd7\r
+        SoCGU1eoVJt+VgDUfLyUrDIXX2c8rGB/u8LDoQB1jfrq673aMS0A/3b+O0GPbZLa47rqgAs3PGQ2tzEN\r
+        h+m1hzA+D4rOBbPB4uPgsbvVAY1aV/62rUL1TWY0Z3qpO9lN7YmuvLmTA0fv7P7M9/SZ9nvoD8uZ5Oms\r
+        OGJjAAAAAElFTkSuQmCC\r
 </value>\r
   </data>\r
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r