WinGui:

- Added a Label on the cropping panel to indicate that preset crop values are in use.

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

4 files changed, 27 insertions, 2 deletions

diff --git a/win/C#/Controls/PictureSettings.Designer.cs b/win/C#/Controls/PictureSettings.Designer.cs
index 30a893392..67b427a2e 100644
--- a/win/C#/Controls/PictureSettings.Designer.cs
+++ b/win/C#/Controls/PictureSettings.Designer.cs
@@ -65,6 +65,7 @@ namespace Handbrake.Controls
             this.drp_modulus = new System.Windows.Forms.ComboBox();

             this.label8 = new System.Windows.Forms.Label();

             this.label26 = new System.Windows.Forms.Label();

+            this.lbl_presetCropWarning = new System.Windows.Forms.Label();

             this.tableLayoutPanel3.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.crop_left)).BeginInit();

             ((System.ComponentModel.ISupportInitialize)(this.crop_right)).BeginInit();

@@ -644,10 +645,21 @@ namespace Handbrake.Controls
             this.label26.TabIndex = 113;

             this.label26.Text = "Size";

             // 

+            // lbl_presetCropWarning

+            // 

+            this.lbl_presetCropWarning.AutoSize = true;

+            this.lbl_presetCropWarning.ForeColor = System.Drawing.Color.Black;

+            this.lbl_presetCropWarning.Location = new System.Drawing.Point(479, 13);

+            this.lbl_presetCropWarning.Name = "lbl_presetCropWarning";

+            this.lbl_presetCropWarning.Size = new System.Drawing.Size(140, 13);

+            this.lbl_presetCropWarning.TabIndex = 118;

+            this.lbl_presetCropWarning.Text = "( Preset values are in use! )";

+            // 

             // PictureSettings

             // 

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

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

+            this.Controls.Add(this.lbl_presetCropWarning);

             this.Controls.Add(this.tableLayoutPanel3);

             this.Controls.Add(this.tableLayoutPanel2);

             this.Controls.Add(this.tableLayoutPanel1);

@@ -716,6 +728,7 @@ namespace Handbrake.Controls
         internal System.Windows.Forms.Label label26;

         internal System.Windows.Forms.NumericUpDown text_width;

         internal System.Windows.Forms.NumericUpDown text_height;

+        private System.Windows.Forms.Label lbl_presetCropWarning;

 

 

 

diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index a0c269f5e..2c0d54463 100644
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -51,13 +51,14 @@ namespace Handbrake.Controls
                     crop_left.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[2]);

                     crop_right.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[3]);

                 }

-                else if (CurrentlySelectedPreset == null )

+                else if (CurrentlySelectedPreset == null)

                 {

                     crop_top.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[0]);

                     crop_bottom.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[1]);

                     crop_left.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[2]);

                     crop_right.Value = GetCropMod2Clean(_sourceTitle.AutoCropDimensions[3]);

                 }

+                SetPresetCropWarningLabel(CurrentlySelectedPreset);

 

                 // Set the Resolution Boxes

                 if (drp_anamorphic.SelectedIndex == 0)

@@ -120,6 +121,15 @@ namespace Handbrake.Controls
             }

         }

 

+        public void SetPresetCropWarningLabel(Preset selectedPreset)

+        {

+            lbl_presetCropWarning.Visible = true;

+            if (selectedPreset != null && selectedPreset.PictureSettings == false)

+                lbl_presetCropWarning.Visible = false;

+            else if (selectedPreset == null)

+                lbl_presetCropWarning.Visible = false;

+        }

+

         // Picture Controls

         private void text_width_ValueChanged(object sender, EventArgs e)

         {

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 645a2ba81..b484b6958 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -184,7 +184,8 @@ namespace Handbrake.Functions
             {

                 int presetVal;

                 int.TryParse(presetQuery.VideoQuality.ToString(), out presetVal);

-                mainWindow.slider_videoQuality.Value = presetVal;

+                if (presetVal > mainWindow.slider_videoQuality.Minimum)

+                    mainWindow.slider_videoQuality.Value = presetVal;

             }

 

 

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 546ef4efb..cfcc7274d 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -603,6 +603,7 @@ namespace Handbrake
 

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

                         CurrentlySelectedPreset = preset;

+                        PictureSettings.SetPresetCropWarningLabel(preset);

                     }

                 }

             }