diff options
| author | sr55 <[email protected]> | 2012-06-26 20:58:31 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-06-26 20:58:31 +0000 |
| commit | 39866ea0d97700256a6c88aad0a4dcddc900a3b0 (patch) | |
| tree | 2ec715cbed49cfacdc79a61b18da50d988d3e040 /win | |
| parent | a47da7b31e9150888bcd8a495841be00f97b1114 (diff) | |
WinGui: More UI tweaks and improvements.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4782 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 6 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs | 7 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/QueueView.xaml | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 54c0d8e1e..cd5d06dbf 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -399,6 +399,9 @@ namespace HandBrakeWPF.ViewModels this.SubtitleViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
this.ChaptersViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
this.AdvancedViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
+
+ // Do this again to force an update for m4v/mp4 selection
+ this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;
}
this.NotifyOfPropertyChange(() => this.SelectedPreset);
@@ -1181,7 +1184,9 @@ namespace HandBrakeWPF.ViewModels }
dialog.ShowDialog();
+ this.Destination = dialog.FileName;
+ // Set the Extension Dropdown. This will also set Mp4/m4v correctly.
if (!string.IsNullOrEmpty(dialog.FileName))
{
switch (Path.GetExtension(dialog.FileName))
@@ -1197,7 +1202,6 @@ namespace HandBrakeWPF.ViewModels break;
}
- this.Destination = dialog.FileName;
this.NotifyOfPropertyChange(() => this.CurrentTask);
}
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs index e1c8fccb7..abcf289e5 100644 --- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs @@ -201,7 +201,12 @@ namespace HandBrakeWPF.ViewModels /// </summary>
public void Clear()
{
- this.queueProcessor.QueueManager.Clear();
+ MessageBoxResult result = this.errorService.ShowMessageBox(
+ "Are you sure you wish to clear the queue?", "Confirm", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+ if (result == MessageBoxResult.Yes)
+ {
+ this.queueProcessor.QueueManager.Clear();
+ }
}
/// <summary>
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml index 7ef652b29..8b3b31f03 100644 --- a/win/CS/HandBrakeWPF/Views/QueueView.xaml +++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml @@ -146,8 +146,8 @@ <ListBox.ContextMenu>
<ContextMenu>
- <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear" />
<MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />
+ <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear" />
<Separator />
<MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="Import Queue" />
<MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="Export Queue" />
|