WinGui:

- Fix: Correctly set KeepAR for presets with w&h and w only.

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

3 files changed, 15 insertions, 10 deletions

diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index 2c0d54463..cf8f022f1 100644
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -325,7 +325,7 @@ namespace Handbrake.Controls
                     labelStaticDisplaySize.Visible = false;

                     labelDisplaySize.Visible = false;

 

-                    check_KeepAR.Checked = true;

+                    // check_KeepAR.Checked = true;

                     drp_modulus.SelectedIndex = 0;

 

                     if (check_KeepAR.Checked)

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 5f0459040..65fe8b169 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -95,7 +95,7 @@ namespace Handbrake.Functions
             // Set the anamorphic mode 0,1,2,3

             mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;

 

-            // Aspect Ratio

+            // Keep Aspect Ration Anamorphic Setting.

             mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;

 

             // Set the Width and height as Required.

@@ -122,6 +122,10 @@ namespace Handbrake.Functions
                 if (mainWindow.selectedTitle != null && mainWindow.selectedTitle.Resolution.Width != 0)

                     mainWindow.PictureSettings.text_width.Value = mainWindow.selectedTitle.Resolution.Width;

 

+            // Aspect Ratio for non anamorphic sources

+            if (presetQuery.AnamorphicMode == 0)

+                mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.Height == 0 ? CheckState.Checked : CheckState.Unchecked;

+

             // Custom Anamorphic Controls

             mainWindow.PictureSettings.updownDisplayWidth.Text = presetQuery.displayWidthValue.ToString();

             mainWindow.PictureSettings.updownParHeight.Text = presetQuery.pixelAspectWidth.ToString();

@@ -165,9 +169,9 @@ namespace Handbrake.Functions
                     double x264step = cqStep;

                     double presetValue = presetQuery.VideoQuality;

 

-                    double x = 51/x264step;

+                    double x = 51 / x264step;

 

-                    double calculated = presetValue/x264step;

+                    double calculated = presetValue / x264step;

                     calculated = x - calculated;

 

                     int.TryParse(calculated.ToString(), out value);

@@ -224,10 +228,7 @@ namespace Handbrake.Functions
                     newTrack.SubItems.Add(track.Encoder);

                     newTrack.SubItems.Add(track.MixDown);

                     newTrack.SubItems.Add(track.SampleRate);

-                    if (track.Encoder.Contains("AC3"))

-                        newTrack.SubItems.Add("Auto");

-                    else

-                        newTrack.SubItems.Add(track.Bitrate);

+                    newTrack.SubItems.Add(track.Encoder.Contains("AC3") ? "Auto" : track.Bitrate);

                     newTrack.SubItems.Add(track.DRC);

                     mainWindow.AudioSettings.AddTrackForPreset(newTrack);

                 }

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 9fd7c2246..5427aeb20 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -144,6 +144,7 @@ namespace Handbrake
             // Enable / Disable Query editor tab

             if (Properties.Settings.Default.QueryEditorTab)

                 check_queryEditorTab.CheckState = CheckState.Checked;

+            check_promptOnUnmatchingQueries.Enabled = check_queryEditorTab.Checked;

 

             // Prompt on inconsistant queries

             check_promptOnUnmatchingQueries.Checked = Properties.Settings.Default.PromptOnUnmatchingQueries;

@@ -156,7 +157,8 @@ namespace Handbrake
             if (Properties.Settings.Default.enocdeStatusInGui)

                 check_inGuiStatus.CheckState = CheckState.Checked;

 

-             check_showCliForInGUIEncode.Checked = Properties.Settings.Default.showCliForInGuiEncodeStatus;

+            check_showCliForInGUIEncode.Checked = Properties.Settings.Default.showCliForInGuiEncodeStatus;

+            check_showCliForInGUIEncode.Enabled = check_inGuiStatus.Checked;

 

             // Set the preview count

             drop_previewScanCount.SelectedItem = Properties.Settings.Default.previewScanCount.ToString();

@@ -399,12 +401,14 @@ namespace Handbrake
         {

             Properties.Settings.Default.enocdeStatusInGui = check_inGuiStatus.Checked;

 

+            check_showCliForInGUIEncode.Enabled = check_inGuiStatus.Checked;

+

             if (this.IsHandleCreated)

                 if (check_inGuiStatus.Checked)

                 {

                     MessageBox.Show("This feature is experimental!\n\n You will not be able to �Stop� an encode mid-process.\n"

                                     + "Doing so will render the file unplayable.\n" +

-                                    "If you enable 'Show CLI Window', you'll be ablt to hit ctrl-c in the encode window to cleanly exit the CLI. This will give you a playable file.\n\n" +                                    

+                                    "If you enable 'Show CLI Window', you'll be ablt to hit ctrl-c in the encode window to cleanly exit the CLI. This will give you a playable file.\n\n" +

                                     "You are also limited to 1 instance of HandBrakeCLI on your system.",

                                     "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

                 }