WinGui: Add a warning to the "Audio and Subtitles" tab to notify people that automatic audio settings will override those stored in presets.

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

2 files changed, 30 insertions, 19 deletions

diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index a3fb2889c..3e912579b 100644
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -576,6 +576,7 @@ namespace Handbrake.Controls
             }

 

             // If the Native Language is not set. Just set Track information in each output track.

+            // Presets have control over audio selected

             if (Properties.Settings.Default.NativeLanguage == "Any")

             {

                 drp_audioTrack.SelectedIndex = 0;

@@ -586,6 +587,7 @@ namespace Handbrake.Controls
                         track.ScannedTrack = this.drp_audioTrack.SelectedItem as Audio;

                     }

                 }

+

                 return;

             }

 

@@ -602,9 +604,6 @@ namespace Handbrake.Controls
             // New DUB Settings

             int mode = Properties.Settings.Default.DubModeAudio;

 

-            if (Properties.Settings.Default.NativeLanguage == "Any")

-                mode = 2;

-

             // Native Language is not 'Any', so initialising the Language Dictionary

             if (mode >= 3)

             {

diff --git a/win/CS/frmOptions.Designer.cs b/win/CS/frmOptions.Designer.cs
index d3f03cd67..05cee599d 100644
--- a/win/CS/frmOptions.Designer.cs
+++ b/win/CS/frmOptions.Designer.cs
@@ -165,6 +165,7 @@ namespace Handbrake
             this.label37 = new System.Windows.Forms.Label();

             this.panel2 = new System.Windows.Forms.Panel();

             this.pictureBox2 = new System.Windows.Forms.PictureBox();

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

             this.tab_options.SuspendLayout();

             this.tab_general.SuspendLayout();

             this.tab_outputFiles.SuspendLayout();

@@ -626,6 +627,7 @@ namespace Handbrake
             // 

             // tab_audio_sub

             // 

+            this.tab_audio_sub.Controls.Add(this.label48);

             this.tab_audio_sub.Controls.Add(this.label39);

             this.tab_audio_sub.Controls.Add(this.audioSelectionPanel);

             this.tab_audio_sub.Controls.Add(this.label45);

@@ -644,7 +646,7 @@ namespace Handbrake
             // label39

             // 

             this.label39.AutoSize = true;

-            this.label39.Location = new System.Drawing.Point(16, 62);

+            this.label39.Location = new System.Drawing.Point(16, 82);

             this.label39.Name = "label39";

             this.label39.Size = new System.Drawing.Size(92, 13);

             this.label39.TabIndex = 109;

@@ -661,7 +663,7 @@ namespace Handbrake
             this.audioSelectionPanel.Controls.Add(this.label47);

             this.audioSelectionPanel.Controls.Add(this.button_removeLanguage);

             this.audioSelectionPanel.Controls.Add(this.button_clearLanguage);

-            this.audioSelectionPanel.Location = new System.Drawing.Point(125, 59);

+            this.audioSelectionPanel.Location = new System.Drawing.Point(125, 79);

             this.audioSelectionPanel.Name = "audioSelectionPanel";

             this.audioSelectionPanel.Size = new System.Drawing.Size(381, 166);

             this.audioSelectionPanel.TabIndex = 108;

@@ -762,7 +764,7 @@ namespace Handbrake
             // 

             this.label45.AutoSize = true;

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

-            this.label45.Location = new System.Drawing.Point(253, 37);

+            this.label45.Location = new System.Drawing.Point(253, 57);

             this.label45.Name = "label45";

             this.label45.Size = new System.Drawing.Size(84, 11);

             this.label45.TabIndex = 107;

@@ -778,7 +780,7 @@ namespace Handbrake
             this.groupBox2.Controls.Add(this.check_AddOnlyOneAudioPerLanguage);

             this.groupBox2.Controls.Add(this.check_AddCCTracks);

             this.groupBox2.Controls.Add(this.label43);

-            this.groupBox2.Location = new System.Drawing.Point(19, 231);

+            this.groupBox2.Location = new System.Drawing.Point(19, 243);

             this.groupBox2.Name = "groupBox2";

             this.groupBox2.Size = new System.Drawing.Size(537, 106);

             this.groupBox2.TabIndex = 106;

@@ -900,7 +902,7 @@ namespace Handbrake
             // label15

             // 

             this.label15.AutoSize = true;

-            this.label15.Location = new System.Drawing.Point(16, 35);

+            this.label15.Location = new System.Drawing.Point(16, 52);

             this.label15.Name = "label15";

             this.label15.Size = new System.Drawing.Size(107, 13);

             this.label15.TabIndex = 88;

@@ -910,7 +912,7 @@ namespace Handbrake
             // 

             this.drop_preferredLang.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_preferredLang.FormattingEnabled = true;

-            this.drop_preferredLang.Location = new System.Drawing.Point(129, 32);

+            this.drop_preferredLang.Location = new System.Drawing.Point(129, 52);

             this.drop_preferredLang.Name = "drop_preferredLang";

             this.drop_preferredLang.Size = new System.Drawing.Size(118, 21);

             this.drop_preferredLang.TabIndex = 87;

@@ -961,7 +963,7 @@ namespace Handbrake
             this.check_preventSleep.AutoSize = true;

             this.check_preventSleep.Location = new System.Drawing.Point(73, 45);

             this.check_preventSleep.Name = "check_preventSleep";

-            this.check_preventSleep.Size = new System.Drawing.Size(266, 17);

+            this.check_preventSleep.Size = new System.Drawing.Size(260, 17);

             this.check_preventSleep.TabIndex = 91;

             this.check_preventSleep.Text = "Prevent the system from sleeping when encoding.";

             this.ToolTip.SetToolTip(this.check_preventSleep, "Prevent system from sleeping during encoding.");

@@ -974,7 +976,7 @@ namespace Handbrake
             this.check_clearOldLogs.AutoSize = true;

             this.check_clearOldLogs.Location = new System.Drawing.Point(73, 234);

             this.check_clearOldLogs.Name = "check_clearOldLogs";

-            this.check_clearOldLogs.Size = new System.Drawing.Size(166, 17);

+            this.check_clearOldLogs.Size = new System.Drawing.Size(162, 17);

             this.check_clearOldLogs.TabIndex = 90;

             this.check_clearOldLogs.Text = "Clear logs older than 30 days";

             this.ToolTip.SetToolTip(this.check_clearOldLogs, "Clear logs which are older than 30 days.\r\nThis only applies to HandBrakes Applica" +

@@ -1069,7 +1071,7 @@ namespace Handbrake
             this.check_logsInSpecifiedLocation.AutoSize = true;

             this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 139);

             this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";

-            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);

+            this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(305, 17);

             this.check_logsInSpecifiedLocation.TabIndex = 87;

             this.check_logsInSpecifiedLocation.Text = "Put a copy of individual encode logs in a specified location:";

             this.ToolTip.SetToolTip(this.check_logsInSpecifiedLocation, "Place a copy of the encode log in the same folder as the encoded movie.");

@@ -1206,7 +1208,7 @@ namespace Handbrake
             this.check_showCliForInGUIEncode.BackColor = System.Drawing.Color.Transparent;

             this.check_showCliForInGUIEncode.Location = new System.Drawing.Point(81, 129);

             this.check_showCliForInGUIEncode.Name = "check_showCliForInGUIEncode";

-            this.check_showCliForInGUIEncode.Size = new System.Drawing.Size(330, 17);

+            this.check_showCliForInGUIEncode.Size = new System.Drawing.Size(324, 17);

             this.check_showCliForInGUIEncode.TabIndex = 96;

             this.check_showCliForInGUIEncode.Text = "Show CLI window (Allows you to cleanly exit encode with ctrl-c)";

             this.ToolTip.SetToolTip(this.check_showCliForInGUIEncode, resources.GetString("check_showCliForInGUIEncode.ToolTip"));

@@ -1260,7 +1262,7 @@ namespace Handbrake
             this.check_trayStatusAlerts.BackColor = System.Drawing.Color.Transparent;

             this.check_trayStatusAlerts.Location = new System.Drawing.Point(81, 37);

             this.check_trayStatusAlerts.Name = "check_trayStatusAlerts";

-            this.check_trayStatusAlerts.Size = new System.Drawing.Size(296, 17);

+            this.check_trayStatusAlerts.Size = new System.Drawing.Size(288, 17);

             this.check_trayStatusAlerts.TabIndex = 93;

             this.check_trayStatusAlerts.Text = "Display status messages from tray icon (balloon popups)";

             this.ToolTip.SetToolTip(this.check_trayStatusAlerts, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +

@@ -1276,7 +1278,7 @@ namespace Handbrake
             this.check_mainMinimize.BackColor = System.Drawing.Color.Transparent;

             this.check_mainMinimize.Location = new System.Drawing.Point(81, 14);

             this.check_mainMinimize.Name = "check_mainMinimize";

-            this.check_mainMinimize.Size = new System.Drawing.Size(230, 17);

+            this.check_mainMinimize.Size = new System.Drawing.Size(221, 17);

             this.check_mainMinimize.TabIndex = 82;

             this.check_mainMinimize.Text = "Minimize to system tray (Requires Restart)";

             this.ToolTip.SetToolTip(this.check_mainMinimize, "Minimize the window to the system tray rather than the task bar.\r\nThe system tray" +

@@ -1290,7 +1292,7 @@ namespace Handbrake
             this.check_promptOnUnmatchingQueries.AutoSize = true;

             this.check_promptOnUnmatchingQueries.Location = new System.Drawing.Point(100, 83);

             this.check_promptOnUnmatchingQueries.Name = "check_promptOnUnmatchingQueries";

-            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(305, 17);

+            this.check_promptOnUnmatchingQueries.Size = new System.Drawing.Size(300, 17);

             this.check_promptOnUnmatchingQueries.TabIndex = 63;

             this.check_promptOnUnmatchingQueries.Text = "Prompt when a manual query does not match GUI settings";

             this.check_promptOnUnmatchingQueries.UseVisualStyleBackColor = true;

@@ -1303,7 +1305,7 @@ namespace Handbrake
             this.check_dvdnav.BackColor = System.Drawing.Color.Transparent;

             this.check_dvdnav.Location = new System.Drawing.Point(82, 274);

             this.check_dvdnav.Name = "check_dvdnav";

-            this.check_dvdnav.Size = new System.Drawing.Size(276, 17);

+            this.check_dvdnav.Size = new System.Drawing.Size(277, 17);

             this.check_dvdnav.TabIndex = 90;

             this.check_dvdnav.Text = "Disable LibDVDNav. (libdvdread will be used instead)";

             this.check_dvdnav.UseVisualStyleBackColor = false;

@@ -1316,7 +1318,7 @@ namespace Handbrake
             this.check_queryEditorTab.BackColor = System.Drawing.Color.Transparent;

             this.check_queryEditorTab.Location = new System.Drawing.Point(81, 60);

             this.check_queryEditorTab.Name = "check_queryEditorTab";

-            this.check_queryEditorTab.Size = new System.Drawing.Size(241, 17);

+            this.check_queryEditorTab.Size = new System.Drawing.Size(236, 17);

             this.check_queryEditorTab.TabIndex = 84;

             this.check_queryEditorTab.Text = "Enable \"Query Editor\" tab (Requires Restart)";

             this.ToolTip.SetToolTip(this.check_queryEditorTab, "Enables the Query Editor tab on the main window. Requires program restart to take" +

@@ -1368,7 +1370,7 @@ namespace Handbrake
             this.check_disablePresetNotification.BackColor = System.Drawing.Color.Transparent;

             this.check_disablePresetNotification.Location = new System.Drawing.Point(81, 106);

             this.check_disablePresetNotification.Name = "check_disablePresetNotification";

-            this.check_disablePresetNotification.Size = new System.Drawing.Size(222, 17);

+            this.check_disablePresetNotification.Size = new System.Drawing.Size(216, 17);

             this.check_disablePresetNotification.TabIndex = 91;

             this.check_disablePresetNotification.Text = "Disable built-in preset update notification";

             this.ToolTip.SetToolTip(this.check_disablePresetNotification, "Disables the notification you recieve when presets are updated when a new version" +

@@ -1781,6 +1783,15 @@ namespace Handbrake
             this.pictureBox2.TabIndex = 60;

             this.pictureBox2.TabStop = false;

             // 

+            // label48

+            // 

+            this.label48.AutoSize = true;

+            this.label48.Location = new System.Drawing.Point(16, 28);

+            this.label48.Name = "label48";

+            this.label48.Size = new System.Drawing.Size(296, 13);

+            this.label48.TabIndex = 110;

+            this.label48.Text = "Note: These settings will override settings stored in presets.";

+            // 

             // frmOptions

             // 

             this.AcceptButton = this.btn_close;

@@ -1959,5 +1970,6 @@ namespace Handbrake
         private System.Windows.Forms.Label label39;

         private System.Windows.Forms.NumericUpDown ud_minTitleLength;

         private System.Windows.Forms.Label label40;

+        private System.Windows.Forms.Label label48;

     }

 }
\ No newline at end of file