WinGui: More UI tweaks and improvements.

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

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 54c0d8e1e3e94960dd37f18f67d0c090b25b6e5c..cd5d06dbfa674eecae4bf46d4f9b98c2bf854895 100644 (file)
--- 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);\r
                     this.ChaptersViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);\r
                     this.AdvancedViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);\r
+\r
+                    // Do this again to force an update for m4v/mp4 selection\r
+                    this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;\r
                 }\r
 \r
                 this.NotifyOfPropertyChange(() => this.SelectedPreset);\r
@@ -1181,7 +1184,9 @@ namespace HandBrakeWPF.ViewModels
             }\r
 \r
             dialog.ShowDialog();\r
+            this.Destination = dialog.FileName;\r
 \r
+            // Set the Extension Dropdown. This will also set Mp4/m4v correctly.\r
             if (!string.IsNullOrEmpty(dialog.FileName))\r
             {\r
                 switch (Path.GetExtension(dialog.FileName))\r
@@ -1197,7 +1202,6 @@ namespace HandBrakeWPF.ViewModels
                         break;\r
                 }\r
 \r
-                this.Destination = dialog.FileName;\r
                 this.NotifyOfPropertyChange(() => this.CurrentTask);\r
             } \r
         }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index e1c8fccb74803de3e4caf0b69fb4bcb8af1e2663..abcf289e5d20769fc613625a444dfd25a59a0181 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -201,7 +201,12 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void Clear()\r
         {\r
-            this.queueProcessor.QueueManager.Clear();\r
+            MessageBoxResult result = this.errorService.ShowMessageBox(\r
+                "Are you sure you wish to clear the queue?", "Confirm", MessageBoxButton.YesNo, MessageBoxImage.Warning);\r
+            if (result == MessageBoxResult.Yes)\r
+            {\r
+                this.queueProcessor.QueueManager.Clear();\r
+            }\r
         }\r
 \r
         /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 7ef652b2965ed0a4e3199cda085ba822a1d7f6fb..8b3b31f0346431ae501703fa4ef697cd2d2fca33 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -146,8 +146,8 @@
 \r
             <ListBox.ContextMenu>\r
                 <ContextMenu>\r
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear" />\r
                     <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />\r
+                    <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear" />\r
                     <Separator />\r
                     <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="Import Queue" />\r
                     <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="Export Queue" />\r