WinGui:

- Save Filter settings in presets by default. Seems to be common mistake.
- Set the AcceptButton property on a few windows so they react properly to keyboard commands.

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

4 files changed, 22 insertions, 18 deletions

diff --git a/win/CS/frmAddPreset.Designer.cs b/win/CS/frmAddPreset.Designer.cs
index 530122101..5535b6f6b 100644
--- a/win/CS/frmAddPreset.Designer.cs
+++ b/win/CS/frmAddPreset.Designer.cs
@@ -66,13 +66,14 @@ namespace Handbrake
             // btn_add

             // 

             this.btn_add.BackColor = System.Drawing.Color.Transparent;

+            this.btn_add.DialogResult = System.Windows.Forms.DialogResult.Cancel;

             this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;

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

             this.btn_add.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

             this.btn_add.Location = new System.Drawing.Point(185, 133);

             this.btn_add.Name = "btn_add";

             this.btn_add.Size = new System.Drawing.Size(57, 22);

-            this.btn_add.TabIndex = 2;

+            this.btn_add.TabIndex = 3;

             this.btn_add.Text = "Add";

             this.btn_add.UseVisualStyleBackColor = false;

             this.btn_add.Click += new System.EventHandler(this.BtnAddClick);

@@ -80,13 +81,14 @@ namespace Handbrake
             // btn_cancel

             // 

             this.btn_cancel.BackColor = System.Drawing.Color.Transparent;

+            this.btn_cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;

             this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;

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

             this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

             this.btn_cancel.Location = new System.Drawing.Point(248, 133);

             this.btn_cancel.Name = "btn_cancel";

             this.btn_cancel.Size = new System.Drawing.Size(57, 22);

-            this.btn_cancel.TabIndex = 3;

+            this.btn_cancel.TabIndex = 4;

             this.btn_cancel.Text = "Cancel";

             this.btn_cancel.UseVisualStyleBackColor = false;

             this.btn_cancel.Click += new System.EventHandler(this.BtnCancelClick);

@@ -94,11 +96,13 @@ namespace Handbrake
             // check_useFilters

             // 

             this.check_useFilters.AutoSize = true;

+            this.check_useFilters.Checked = true;

+            this.check_useFilters.CheckState = System.Windows.Forms.CheckState.Checked;

             this.check_useFilters.Location = new System.Drawing.Point(130, 106);

             this.check_useFilters.Name = "check_useFilters";

-            this.check_useFilters.Size = new System.Drawing.Size(112, 17);

-            this.check_useFilters.TabIndex = 1;

-            this.check_useFilters.Text = "Use Picture Filters";

+            this.check_useFilters.Size = new System.Drawing.Size(119, 17);

+            this.check_useFilters.TabIndex = 2;

+            this.check_useFilters.Text = "Save Filter Settings";

             this.toolTip.SetToolTip(this.check_useFilters, "Save Picture Width/Height and Crop Values");

             this.check_useFilters.UseVisualStyleBackColor = true;

             // 

@@ -112,7 +116,7 @@ namespace Handbrake
             this.cb_usePictureSettings.Location = new System.Drawing.Point(130, 79);

             this.cb_usePictureSettings.Name = "cb_usePictureSettings";

             this.cb_usePictureSettings.Size = new System.Drawing.Size(172, 21);

-            this.cb_usePictureSettings.TabIndex = 6;

+            this.cb_usePictureSettings.TabIndex = 1;

             // 

             // label2

             // 

@@ -136,10 +140,12 @@ namespace Handbrake
             // 

             // frmAddPreset

             // 

+            this.AcceptButton = this.btn_add;

             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;

             this.AutoSize = true;

             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

+            this.CancelButton = this.btn_cancel;

             this.ClientSize = new System.Drawing.Size(319, 166);

             this.Controls.Add(this.label3);

             this.Controls.Add(this.label2);

diff --git a/win/CS/frmAddPreset.resx b/win/CS/frmAddPreset.resx
index 341225412..aeea816b3 100644
--- a/win/CS/frmAddPreset.resx
+++ b/win/CS/frmAddPreset.resx
@@ -112,15 +112,15 @@
     <value>2.0</value>

   </resheader>

   <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

   <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 17</value>

   </metadata>

-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA

diff --git a/win/CS/frmOptions.Designer.cs b/win/CS/frmOptions.Designer.cs
index a7886bca1..47b938942 100644
--- a/win/CS/frmOptions.Designer.cs
+++ b/win/CS/frmOptions.Designer.cs
@@ -424,7 +424,7 @@ namespace Handbrake
             this.check_autoNaming.AutoSize = true;

             this.check_autoNaming.Location = new System.Drawing.Point(111, 13);

             this.check_autoNaming.Name = "check_autoNaming";

-            this.check_autoNaming.Size = new System.Drawing.Size(176, 17);

+            this.check_autoNaming.Size = new System.Drawing.Size(171, 17);

             this.check_autoNaming.TabIndex = 72;

             this.check_autoNaming.Text = "Automatically name output files";

             this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");

@@ -626,7 +626,7 @@ namespace Handbrake
             this.radio_preferredAudioAndSubs.AutoSize = true;

             this.radio_preferredAudioAndSubs.Location = new System.Drawing.Point(200, 99);

             this.radio_preferredAudioAndSubs.Name = "radio_preferredAudioAndSubs";

-            this.radio_preferredAudioAndSubs.Size = new System.Drawing.Size(254, 17);

+            this.radio_preferredAudioAndSubs.Size = new System.Drawing.Size(250, 17);

             this.radio_preferredAudioAndSubs.TabIndex = 93;

             this.radio_preferredAudioAndSubs.TabStop = true;

             this.radio_preferredAudioAndSubs.Text = "Use Preferred Language for Audio and Subtitles";

@@ -639,7 +639,7 @@ namespace Handbrake
             this.check_AddCCTracks.AutoSize = true;

             this.check_AddCCTracks.Location = new System.Drawing.Point(200, 131);

             this.check_AddCCTracks.Name = "check_AddCCTracks";

-            this.check_AddCCTracks.Size = new System.Drawing.Size(199, 17);

+            this.check_AddCCTracks.Size = new System.Drawing.Size(198, 17);

             this.check_AddCCTracks.TabIndex = 92;

             this.check_AddCCTracks.Text = "Add Closed Captions when available";

             this.ToolTip.SetToolTip(this.check_AddCCTracks, "Add any CC tracks if they exist");

@@ -672,7 +672,7 @@ namespace Handbrake
             this.radio_foreignAndSubs.AutoSize = true;

             this.radio_foreignAndSubs.Location = new System.Drawing.Point(200, 76);

             this.radio_foreignAndSubs.Name = "radio_foreignAndSubs";

-            this.radio_foreignAndSubs.Size = new System.Drawing.Size(358, 17);

+            this.radio_foreignAndSubs.Size = new System.Drawing.Size(347, 17);

             this.radio_foreignAndSubs.TabIndex = 90;

             this.radio_foreignAndSubs.TabStop = true;

             this.radio_foreignAndSubs.Text = "Use foreign language audio and add first preferred language subtitle.";

@@ -697,7 +697,7 @@ namespace Handbrake
             this.radio_dub.AutoSize = true;

             this.radio_dub.Location = new System.Drawing.Point(200, 53);

             this.radio_dub.Name = "radio_dub";

-            this.radio_dub.Size = new System.Drawing.Size(164, 17);

+            this.radio_dub.Size = new System.Drawing.Size(167, 17);

             this.radio_dub.TabIndex = 89;

             this.radio_dub.TabStop = true;

             this.radio_dub.Text = "DUB Foreign Language Audio";

@@ -1547,6 +1547,7 @@ namespace Handbrake
             // 

             // frmOptions

             // 

+            this.AcceptButton = this.btn_close;

             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;

             this.AutoSize = true;

diff --git a/win/CS/frmOptions.resx b/win/CS/frmOptions.resx
index d9b4cc472..1c6c329c6 100644
--- a/win/CS/frmOptions.resx
+++ b/win/CS/frmOptions.resx
@@ -120,9 +120,6 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>132, 18</value>

   </metadata>

-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

-    <value>132, 18</value>

-  </metadata>

   <data name="cb_mp4FileMode.ToolTip" xml:space="preserve">

     <value>The default file extension for MP4 Files.

 Automatic   - This will use M4v when AC3 Audio, SRT Subtitles or Chapters are present, otherwise MP4.