WinGui:

More Keyboard ShortCuts
- Ctrl-A remapped to add to queue
- Ctrl-L for log window
- Ctrl-S to start an encode

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3084 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 61 insertions, 37 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index b3397cfba..f716d9274 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -40,7 +40,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

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

@@ -401,9 +401,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle2.Format = "N0";

-            dataGridViewCellStyle2.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle2;

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

             this.number.Frozen = true;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

@@ -613,7 +613,7 @@ namespace Handbrake
             this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;

             this.mnu_encode.Name = "mnu_encode";

             this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));

-            this.mnu_encode.Size = new System.Drawing.Size(203, 22);

+            this.mnu_encode.Size = new System.Drawing.Size(201, 22);

             this.mnu_encode.Text = "Show Queue";

             this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);

             // 

@@ -621,21 +621,21 @@ namespace Handbrake
             // 

             this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;

             this.mnu_encodeLog.Name = "mnu_encodeLog";

-            this.mnu_encodeLog.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));

-            this.mnu_encodeLog.Size = new System.Drawing.Size(203, 22);

+            this.mnu_encodeLog.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));

+            this.mnu_encodeLog.Size = new System.Drawing.Size(201, 22);

             this.mnu_encodeLog.Text = "Activity Window";

             this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);

             // 

             // ToolStripSeparator5

             // 

             this.ToolStripSeparator5.Name = "ToolStripSeparator5";

-            this.ToolStripSeparator5.Size = new System.Drawing.Size(200, 6);

+            this.ToolStripSeparator5.Size = new System.Drawing.Size(198, 6);

             // 

             // mnu_options

             // 

             this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;

             this.mnu_options.Name = "mnu_options";

-            this.mnu_options.Size = new System.Drawing.Size(203, 22);

+            this.mnu_options.Size = new System.Drawing.Size(201, 22);

             this.mnu_options.Text = "Options";

             this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);

             // 

@@ -1678,6 +1678,7 @@ namespace Handbrake
             this.DoubleBuffered = true;

             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

+            this.KeyPreview = true;

             this.MinimumSize = new System.Drawing.Size(900, 500);

             this.Name = "frmMain";

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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index fc8728f4c..2f8c1c142 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1666,6 +1666,34 @@ namespace Handbrake
                 if (!string.IsNullOrEmpty(selectedTitle.SourceName)) // If it's one of multiple source files, make sure we don't use the folder name

                     labelSource.Text = Path.GetFileName(selectedTitle.SourceName);

         }

+

+        public void RecievingJob(Job job)

+        {

+            string query = job.Query;

+            StartScan(job.Source, 0);

+

+

+            if (query != null)

+            {

+                //Ok, Reset all the H264 widgets before changing the preset

+                x264Panel.reset2Defaults();

+

+                // Send the query from the file to the Query Parser class

+                QueryParser presetQuery = QueryParser.Parse(query);

+

+                // Now load the preset

+                PresetLoader.presetLoader(this, presetQuery, "Load Back From Queue", true);

+

+                // The x264 widgets will need updated, so do this now:

+                x264Panel.X264_StandardizeOptString();

+                x264Panel.X264_SetCurrentSettingsInPanel();

+

+                // Finally, let this window have a copy of the preset settings.

+                CurrentlySelectedPreset = null;

+                PictureSettings.SetPresetCropWarningLabel(null);

+            }

+

+        }

         #endregion

 

         #region GUI

@@ -1783,6 +1811,29 @@ namespace Handbrake
         #endregion

 

         #region Overrides

+

+        /// <summary>

+        /// Handle GUI shortcuts

+        /// </summary>

+        /// <param name="msg"></param>

+        /// <param name="keyData"></param>

+        /// <returns></returns>

+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)

+        {

+            if (keyData == (Keys.Control | Keys.S))

+            {

+                btn_start_Click(this, new EventArgs());

+                return true;

+            }

+

+            if (keyData == (Keys.Control | Keys.A))

+            {

+                btn_add2Queue_Click(this, new EventArgs());

+                return true;

+            }

+            return base.ProcessCmdKey(ref msg, keyData);

+        }

+

         /// <summary>

         /// If the queue is being processed, prompt the user to confirm application close.

         /// </summary>

@@ -1838,34 +1889,6 @@ namespace Handbrake
         }

         #endregion

 

-        public void RecievingJob(Job job)

-        {

-            string query = job.Query;

-            StartScan(job.Source, 0);

-     

-

-            if (query != null)

-            {

-                //Ok, Reset all the H264 widgets before changing the preset

-                x264Panel.reset2Defaults();

-

-                // Send the query from the file to the Query Parser class

-                QueryParser presetQuery = QueryParser.Parse(query);

-

-                // Now load the preset

-                PresetLoader.presetLoader(this, presetQuery, "Load Back From Queue", true);

-

-                // The x264 widgets will need updated, so do this now:

-                x264Panel.X264_StandardizeOptString();

-                x264Panel.X264_SetCurrentSettingsInPanel();

-

-                // Finally, let this window have a copy of the preset settings.

-                CurrentlySelectedPreset = null;

-                PictureSettings.SetPresetCropWarningLabel(null);

-            }

-

-        }

-

         // This is the END of the road ****************************************

     }

 }
\ No newline at end of file