summaryrefslogtreecommitdiffstats
path: root/win/C#/frmOptions.cs
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-01-17 16:12:04 +0000
committersr55 <[email protected]>2010-01-17 16:12:04 +0000
commit4ce078d06a1c45c562cfd1732ffcbfd60a8e5e5a (patch)
treeb5a543d94c03b81ad647ea2b440c106bd432b86e /win/C#/frmOptions.cs
parent21df9865a43a25f48a87da0c02d8b28f12939375 (diff)
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
Diffstat (limited to 'win/C#/frmOptions.cs')
-rw-r--r--win/C#/frmOptions.cs8
1 files changed, 6 insertions, 2 deletions
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);
}