WinGui:

- Fix for PictureSettings Panel
- Small UI improvements for Audio and Subs panels

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

3 files changed, 15 insertions, 11 deletions

diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index b6e284895..46a5c2938 100644
--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -89,7 +89,7 @@ namespace Handbrake.Controls
             this.lv_audioList.Location = new System.Drawing.Point(16, 150);

             this.lv_audioList.MultiSelect = false;

             this.lv_audioList.Name = "lv_audioList";

-            this.lv_audioList.Size = new System.Drawing.Size(689, 153);

+            this.lv_audioList.Size = new System.Drawing.Size(689, 140);

             this.lv_audioList.TabIndex = 65;

             this.lv_audioList.UseCompatibleStateImageBehavior = false;

             this.lv_audioList.View = System.Windows.Forms.View.Details;

diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index 8352f52af..e31b6824d 100644
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -58,8 +58,12 @@ namespace Handbrake.Controls
                 }

                 else

                 {

-                    text_width.Value = _SourceTitle.Resolution.Width;

-                    text_height.Value = _SourceTitle.Resolution.Height - (int)crop_top.Value - (int)crop_bottom.Value;

+                    if (text_width.Value == 0 && text_height.Value ==0)// Only update the values if the fields don't already have values.

+                    { 

+                        text_width.Value = _SourceTitle.Resolution.Width;

+                        text_height.Value = _SourceTitle.Resolution.Height - (int) crop_top.Value - (int) crop_bottom.Value;

+                    }

+

                     labelDisplaySize.Text = calculateAnamorphicSizes().Width + "x" + calculateAnamorphicSizes().Height;

                 }

 

@@ -130,7 +134,7 @@ namespace Handbrake.Controls
                         if (preventChangingCustom)

                             break;

 

-                        preventChangingDisplayWidth = true; 

+                        preventChangingDisplayWidth = true;

                         updownDisplayWidth.Value = text_width.Value * updownParWidth.Value / updownParHeight.Value;

                         preventChangingDisplayWidth = false;

 

@@ -235,7 +239,7 @@ namespace Handbrake.Controls
                 preventChangingCustom = false;

             }

 

-            if (preventChangingDisplayWidth == false  && check_KeepAR.CheckState == CheckState.Checked)

+            if (preventChangingDisplayWidth == false && check_KeepAR.CheckState == CheckState.Checked)

             {

                 // - Changes HEIGHT to keep DAR

                 // - Changes PIXEL WIDTH to new DISPLAY WIDTH

@@ -246,7 +250,7 @@ namespace Handbrake.Controls
                 int modulus = 16;

                 int.TryParse(drp_modulus.SelectedItem.ToString(), out modulus);

 

-                int rawCalculatedHeight = (int) ((int)updownDisplayWidth.Value/cachedDar);

+                int rawCalculatedHeight = (int)((int)updownDisplayWidth.Value / cachedDar);

                 int modulusHeight = rawCalculatedHeight - (rawCalculatedHeight % modulus);

 

                 // Update value

@@ -254,9 +258,9 @@ namespace Handbrake.Controls
                 text_height.Value = (decimal)modulusHeight;

                 updownParWidth.Value = updownDisplayWidth.Value;

                 updownParHeight.Value = text_width.Value;

-                preventChangingHeight = false;  

+                preventChangingHeight = false;

             }

-           

+

         }

 

         // Anamorphic Controls

diff --git a/win/C#/Controls/Subtitles.Designer.cs b/win/C#/Controls/Subtitles.Designer.cs
index 451db23f8..6be93128b 100644
--- a/win/C#/Controls/Subtitles.Designer.cs
+++ b/win/C#/Controls/Subtitles.Designer.cs
@@ -149,7 +149,7 @@
             this.btn_addSubTrack.BackColor = System.Drawing.Color.Transparent;

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

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

-            this.btn_addSubTrack.Location = new System.Drawing.Point(15, 39);

+            this.btn_addSubTrack.Location = new System.Drawing.Point(16, 38);

             this.btn_addSubTrack.Name = "btn_addSubTrack";

             this.btn_addSubTrack.Size = new System.Drawing.Size(78, 23);

             this.btn_addSubTrack.TabIndex = 68;

@@ -162,7 +162,7 @@
             this.btn_RemoveSubTrack.BackColor = System.Drawing.Color.Transparent;

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

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

-            this.btn_RemoveSubTrack.Location = new System.Drawing.Point(229, 39);

+            this.btn_RemoveSubTrack.Location = new System.Drawing.Point(230, 38);

             this.btn_RemoveSubTrack.Name = "btn_RemoveSubTrack";

             this.btn_RemoveSubTrack.Size = new System.Drawing.Size(73, 23);

             this.btn_RemoveSubTrack.TabIndex = 69;

@@ -475,7 +475,7 @@
             this.btn_srtAdd.BackColor = System.Drawing.Color.Transparent;

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

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

-            this.btn_srtAdd.Location = new System.Drawing.Point(99, 39);

+            this.btn_srtAdd.Location = new System.Drawing.Point(100, 38);

             this.btn_srtAdd.Name = "btn_srtAdd";

             this.btn_srtAdd.Size = new System.Drawing.Size(124, 23);

             this.btn_srtAdd.TabIndex = 73;