WinGui: Add Presets button to toolbar. The preset management options are not discover...

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 0e2d5c5eac85d312520f9efa7c8f9884ed5c378a..c366fe1c610ea4dd8fd26ad5b9d597677db3365a 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -742,6 +742,9 @@
   <ItemGroup>\r
     <Resource Include="Views\Images\Movies_small.png" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Resource Include="Views\Images\Presets2.png" />\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 8f70f5be4076d5a449cbefb2a34d31b530ad104d..1166457aa0410655c01fb93e1645e5653c7ad7bd 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -897,7 +897,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Show Queue{0}.\r
+        ///   Looks up a localized string similar to Queue{0}.\r
         /// </summary>\r
         public static string Main_QueueLabel {\r
             get {\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 936c3974143740dc7bcaa91f2bf9960a4c7d8391..2e57bf7a7cf953df1ae28559a4a857a6db8f58b5 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -532,7 +532,7 @@ This could be due to one of the following reasons:
 The Activity log may have further information.</value>\r
   </data>\r
   <data name="Main_QueueLabel" xml:space="preserve">\r
-    <value>Show Queue{0}</value>\r
+    <value>Queue{0}</value>\r
   </data>\r
   <data name="Main_Start" xml:space="preserve">\r
     <value>Start Encode</value>\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 4868b37f51765ba6f1aac42382d2ac85212ba0ea..46ef28a195f257e0632d808128bf710feb18e302 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1006,7 +1006,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Show Preview.\r
+        ///   Looks up a localized string similar to Preview.\r
         /// </summary>\r
         public static string MainView_ShowPreview {\r
             get {\r
@@ -1015,7 +1015,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Show Queue.\r
+        ///   Looks up a localized string similar to Queue.\r
         /// </summary>\r
         public static string MainView_ShowQueue {\r
             get {\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 8379ecb7de08d87549f0a3b71584dfaab5dfa1c4..d7e1da49942548c99b3a8a8646e5c0c9c4e162ad 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -184,7 +184,7 @@
     <value>Remove</value>\r
   </data>\r
   <data name="MainView_ShowQueue" xml:space="preserve">\r
-    <value>Show Queue</value>\r
+    <value>Queue</value>\r
   </data>\r
   <data name="MainView_Source" xml:space="preserve">\r
     <value>Source:</value>\r
@@ -1020,6 +1020,6 @@ This will not affect your current settings in the Subtitle tab.</value>
     <value>Save New Preset</value>\r
   </data>\r
   <data name="MainView_ShowPreview" xml:space="preserve">\r
-    <value>Show Preview</value>\r
+    <value>Preview</value>\r
   </data>\r
 </root>
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 9fce1956c0707109874d744ffc35f79e24110ef3..68b59817e7991ea62ff7c13f670e72e0db277812 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1433,6 +1433,11 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
+        public void ShowPresetPane()\r
+        {\r
+            this.IsPresetPanelShowing = !this.IsPresetPanelShowing;\r
+        }\r
+\r
         /// <summary>\r
         /// Launch the Help pages.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Views/Images/Presets2.png b/win/CS/HandBrakeWPF/Views/Images/Presets2.png
new file mode 100644 (file)
index 0000000..f420530
Binary files /dev/null and b/win/CS/HandBrakeWPF/Views/Images/Presets2.png differ

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 4de963c1f37a36ab185ba4c79df1bb71f211e86b..dfbc93c7c362b15e0a3727cd047780b15c15056f 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -228,7 +228,7 @@
 \r
                 <Separator />\r
 \r
-                <Button Name="ShowQueue" AutomationProperties.Name="Show Queue" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]">\r
+                <Button Name="ShowQueue" AutomationProperties.Name="Queue" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]">\r
                     <StackPanel Orientation="Horizontal">\r
                         <Image Width="32"\r
                                Height="32"\r
@@ -262,6 +262,18 @@
                                Content="Activity Log"/>\r
                     </StackPanel>\r
                 </Button>\r
+\r
+\r
+                <Button Name="PresetPane" AutomationProperties.Name="Show Preset Pane" cal:Message.Attach="[Event Click] = [Action ShowPresetPane]">\r
+                    <StackPanel Orientation="Horizontal">\r
+                        <Image Width="32"\r
+                               Height="32"\r
+                               Source="Images/Presets2.png"/>\r
+                        <Label Margin="8,0,0,0"\r
+                               VerticalAlignment="Center"\r
+                               Content="Presets"/>\r
+                    </StackPanel>\r
+                </Button>\r
             </ToolBar>\r
         </StackPanel>\r
 \r