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

2 files changed, 38 insertions, 65 deletions

diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
index 7b066695f..b71122f64 100644
--- 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();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

             this.toolStrip1 = new System.Windows.Forms.ToolStrip();

-            this.dropDownLogSelector = new System.Windows.Forms.ToolStripDropDownButton();

-            this.btn_encode_log = new System.Windows.Forms.ToolStripMenuItem();

-            this.btn_scan_log = new System.Windows.Forms.ToolStripMenuItem();

             this.btn_copy = new System.Windows.Forms.ToolStripButton();

+            this.logSelector = new System.Windows.Forms.ToolStripComboBox();

             this.panel1 = new System.Windows.Forms.Panel();

             this.rightClickMenu.SuspendLayout();

             this.toolStrip1.SuspendLayout();

@@ -96,8 +94,8 @@ namespace Handbrake
             // 

             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;

             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

-            this.dropDownLogSelector,

-            this.btn_copy});

+            this.btn_copy,

+            this.logSelector});

             this.toolStrip1.Location = new System.Drawing.Point(0, 0);

             this.toolStrip1.Name = "toolStrip1";

             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;

@@ -105,35 +103,6 @@ namespace Handbrake
             this.toolStrip1.TabIndex = 96;

             this.toolStrip1.Text = "toolStrip1";

             // 

-            // dropDownLogSelector

-            // 

-            this.dropDownLogSelector.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;

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

-            this.btn_encode_log,

-            this.btn_scan_log});

-            this.dropDownLogSelector.Image = global::Handbrake.Properties.Resources.Output_Small;

-            this.dropDownLogSelector.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

-            this.dropDownLogSelector.ImageTransparentColor = System.Drawing.Color.Magenta;

-            this.dropDownLogSelector.Name = "dropDownLogSelector";

-            this.dropDownLogSelector.Size = new System.Drawing.Size(90, 22);

-            this.dropDownLogSelector.Text = "Select Log";

-            // 

-            // btn_encode_log

-            // 

-            this.btn_encode_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;

-            this.btn_encode_log.Name = "btn_encode_log";

-            this.btn_encode_log.Size = new System.Drawing.Size(152, 22);

-            this.btn_encode_log.Text = "Encode Log";

-            this.btn_encode_log.Click += new System.EventHandler(this.BtnEncodeLogClick);

-            // 

-            // btn_scan_log

-            // 

-            this.btn_scan_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;

-            this.btn_scan_log.Name = "btn_scan_log";

-            this.btn_scan_log.Size = new System.Drawing.Size(152, 22);

-            this.btn_scan_log.Text = "Scan Log";

-            this.btn_scan_log.Click += new System.EventHandler(this.BtnScanLogClick);

-            // 

             // btn_copy

             // 

             this.btn_copy.Image = ((System.Drawing.Image)(resources.GetObject("btn_copy.Image")));

@@ -144,6 +113,17 @@ namespace Handbrake
             this.btn_copy.Text = "Copy to clipboard";

             this.btn_copy.Click += new System.EventHandler(this.BtnCopyClick);

             // 

+            // logSelector

+            // 

+            this.logSelector.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;

+            this.logSelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.logSelector.Items.AddRange(new object[] {

+            "Scan Log",

+            "Encode Log"});

+            this.logSelector.Name = "logSelector";

+            this.logSelector.Size = new System.Drawing.Size(121, 25);

+            this.logSelector.SelectedIndexChanged += new System.EventHandler(this.LogSelectorClick);

+            // 

             // panel1

             // 

             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;

@@ -169,7 +149,7 @@ namespace Handbrake
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

             this.Text = "Activity Window";

-            this.Load += new System.EventHandler(this.NewActivityWindow_Load);

+            this.Load += new System.EventHandler(this.ActivityWindowLoad);

             this.rightClickMenu.ResumeLayout(false);

             this.toolStrip1.ResumeLayout(false);

             this.toolStrip1.PerformLayout();

@@ -184,12 +164,10 @@ namespace Handbrake
         internal System.Windows.Forms.ToolTip ToolTip;

         private System.Windows.Forms.ToolStrip toolStrip1;

         private System.Windows.Forms.Panel panel1;

-        private System.Windows.Forms.ToolStripDropDownButton dropDownLogSelector;

-        private System.Windows.Forms.ToolStripMenuItem btn_encode_log;

-        private System.Windows.Forms.ToolStripMenuItem btn_scan_log;

         private System.Windows.Forms.ToolStripButton btn_copy;

         private System.Windows.Forms.ContextMenuStrip rightClickMenu;

         private System.Windows.Forms.ToolStripMenuItem mnu_copy_log;

         private System.Windows.Forms.ToolStripMenuItem mnu_openLogFolder;

+        private System.Windows.Forms.ToolStripComboBox logSelector;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index c09ceb382..ee3d3bf75 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -158,14 +158,27 @@ namespace Handbrake
         /// The sender.

         /// </param>

         /// <param name="e">

-        /// The e.

+        /// The EventArgs.

         /// </param>

-        private void NewActivityWindow_Load(object sender, EventArgs e)

+        private void ActivityWindowLoad(object sender, EventArgs e)

         {

             try

             {

-                ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);

-                SetMode(activitLogMode);

+                // Set the inital log file.

+                if (encode.IsEncoding)

+                {

+                    this.logSelector.SelectedIndex = 1;

+                }

+                else if (scan.IsScanning)

+                {

+                    this.logSelector.SelectedIndex = 0;

+                }

+                else

+                {

+                    // Otherwise, use the last mode the window was in.

+                    ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);

+                    this.logSelector.SelectedIndex = activitLogMode == ActivityLogMode.Scan ? 0 : 1;

+                }

             }

             catch (Exception exc)

             {

@@ -430,31 +443,13 @@ namespace Handbrake
         }

 

         /// <summary>

-        /// Set scan mode

+        /// Change the Log file in the viewer

         /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void BtnScanLogClick(object sender, EventArgs e)

+        /// <param name="sender">The Sender </param>

+        /// <param name="e">The EventArgs</param>

+        private void LogSelectorClick(object sender, EventArgs e)

         {

-            SetMode(ActivityLogMode.Scan);

-        }

-

-        /// <summary>

-        /// Set the encode mode

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void BtnEncodeLogClick(object sender, EventArgs e)

-        {

-            SetMode(ActivityLogMode.Encode);

+            this.SetMode((string)this.logSelector.SelectedItem == "Scan Log" ? ActivityLogMode.Scan : ActivityLogMode.Encode);

         }

 

         /* Overrides */