WinGui:

- Tweak to the Activity window to make it clearer which encode log is selected. Also improves the logic which selects the correct log when the window loads.

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

diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
index 7b06669..b71122f 100644 (file)
--- a/win/C#/frmActivityWindow.Designer.cs
+++ b/win/C#/frmActivityWindow.Designer.cs
@@ -42,10 +42,8 @@ namespace Handbrake
             this.mnu_openLogFolder = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
-            this.dropDownLogSelector = 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.logSelector = new System.Windows.Forms.ToolStripComboBox();\r
             this.panel1 = new System.Windows.Forms.Panel();\r
             this.rightClickMenu.SuspendLayout();\r
             this.toolStrip1.SuspendLayout();\r
@@ -96,8 +94,8 @@ namespace Handbrake
             // \r
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.dropDownLogSelector,\r
-            this.btn_copy});\r
+            this.btn_copy,\r
+            this.logSelector});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);\r
             this.toolStrip1.Name = "toolStrip1";\r
             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
@@ -105,35 +103,6 @@ namespace Handbrake
             this.toolStrip1.TabIndex = 96;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
-            // dropDownLogSelector\r
-            // \r
-            this.dropDownLogSelector.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;\r
-            this.dropDownLogSelector.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.btn_encode_log,\r
-            this.btn_scan_log});\r
-            this.dropDownLogSelector.Image = global::Handbrake.Properties.Resources.Output_Small;\r
-            this.dropDownLogSelector.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
-            this.dropDownLogSelector.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.dropDownLogSelector.Name = "dropDownLogSelector";\r
-            this.dropDownLogSelector.Size = new System.Drawing.Size(90, 22);\r
-            this.dropDownLogSelector.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.BtnEncodeLogClick);\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.BtnScanLogClick);\r
-            // \r
             // btn_copy\r
             // \r
             this.btn_copy.Image = ((System.Drawing.Image)(resources.GetObject("btn_copy.Image")));\r
@@ -144,6 +113,17 @@ namespace Handbrake
             this.btn_copy.Text = "Copy to clipboard";\r
             this.btn_copy.Click += new System.EventHandler(this.BtnCopyClick);\r
             // \r
+            // logSelector\r
+            // \r
+            this.logSelector.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;\r
+            this.logSelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.logSelector.Items.AddRange(new object[] {\r
+            "Scan Log",\r
+            "Encode Log"});\r
+            this.logSelector.Name = "logSelector";\r
+            this.logSelector.Size = new System.Drawing.Size(121, 25);\r
+            this.logSelector.SelectedIndexChanged += new System.EventHandler(this.LogSelectorClick);\r
+            // \r
             // panel1\r
             // \r
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
@@ -169,7 +149,7 @@ namespace Handbrake
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Activity Window";\r
-            this.Load += new System.EventHandler(this.NewActivityWindow_Load);\r
+            this.Load += new System.EventHandler(this.ActivityWindowLoad);\r
             this.rightClickMenu.ResumeLayout(false);\r
             this.toolStrip1.ResumeLayout(false);\r
             this.toolStrip1.PerformLayout();\r
@@ -184,12 +164,10 @@ namespace Handbrake
         internal System.Windows.Forms.ToolTip ToolTip;\r
         private System.Windows.Forms.ToolStrip toolStrip1;\r
         private System.Windows.Forms.Panel panel1;\r
-        private System.Windows.Forms.ToolStripDropDownButton dropDownLogSelector;\r
-        private System.Windows.Forms.ToolStripMenuItem btn_encode_log;\r
-        private System.Windows.Forms.ToolStripMenuItem btn_scan_log;\r
         private System.Windows.Forms.ToolStripButton btn_copy;\r
         private System.Windows.Forms.ContextMenuStrip rightClickMenu;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_copy_log;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_openLogFolder;\r
+        private System.Windows.Forms.ToolStripComboBox logSelector;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index c09ceb3..ee3d3bf 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -158,14 +158,27 @@ namespace Handbrake
         /// The sender.\r
         /// </param>\r
         /// <param name="e">\r
-        /// The e.\r
+        /// The EventArgs.\r
         /// </param>\r
-        private void NewActivityWindow_Load(object sender, EventArgs e)\r
+        private void ActivityWindowLoad(object sender, EventArgs e)\r
         {\r
             try\r
             {\r
-                ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);\r
-                SetMode(activitLogMode);\r
+                // Set the inital log file.\r
+                if (encode.IsEncoding)\r
+                {\r
+                    this.logSelector.SelectedIndex = 1;\r
+                }\r
+                else if (scan.IsScanning)\r
+                {\r
+                    this.logSelector.SelectedIndex = 0;\r
+                }\r
+                else\r
+                {\r
+                    // Otherwise, use the last mode the window was in.\r
+                    ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);\r
+                    this.logSelector.SelectedIndex = activitLogMode == ActivityLogMode.Scan ? 0 : 1;\r
+                }\r
             }\r
             catch (Exception exc)\r
             {\r
@@ -430,31 +443,13 @@ namespace Handbrake
         }\r
 \r
         /// <summary>\r
-        /// Set scan mode\r
+        /// Change the Log file in the viewer\r
         /// </summary>\r
-        /// <param name="sender">\r
-        /// The sender.\r
-        /// </param>\r
-        /// <param name="e">\r
-        /// The e.\r
-        /// </param>\r
-        private void BtnScanLogClick(object sender, EventArgs e)\r
+        /// <param name="sender">The Sender </param>\r
+        /// <param name="e">The EventArgs</param>\r
+        private void LogSelectorClick(object sender, EventArgs e)\r
         {\r
-            SetMode(ActivityLogMode.Scan);\r
-        }\r
-\r
-        /// <summary>\r
-        /// Set the encode mode\r
-        /// </summary>\r
-        /// <param name="sender">\r
-        /// The sender.\r
-        /// </param>\r
-        /// <param name="e">\r
-        /// The e.\r
-        /// </param>\r
-        private void BtnEncodeLogClick(object sender, EventArgs e)\r
-        {\r
-            SetMode(ActivityLogMode.Encode);\r
+            this.SetMode((string)this.logSelector.SelectedItem == "Scan Log" ? ActivityLogMode.Scan : ActivityLogMode.Encode);\r
         }\r
 \r
         /* Overrides */\r