WinGui: Change the Preset Selection to a Menu based design as it offers faster naviga...

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 29bf21352481a80a7499dc076f33ab4b0aee4a17..58f88cf3bf65946a3d73a98dd8cf4a334602d260 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1753,6 +1753,15 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Custom.\r
+        /// </summary>\r
+        public static string Preset_Custom {\r
+            get {\r
+                return ResourceManager.GetString("Preset_Custom", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Export to file.\r
         /// </summary>\r
@@ -1771,6 +1780,15 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Official.\r
+        /// </summary>\r
+        public static string Preset_Official {\r
+            get {\r
+                return ResourceManager.GetString("Preset_Official", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Change the behaviour of the subtitle track selection for this preset.  \r
         ///This will not affect your current settings in the Subtitle tab..\r
@@ -1907,15 +1925,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Import Queue.\r
-        /// </summary>\r
-        public static string QueueView_Import {\r
-            get {\r
-                return ResourceManager.GetString("QueueView_Import", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Lock System.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 0fa80b85b54f0cd551cdaa0f2e685e2fc02ff8ca..8efdc2de5ab70e819673e04ebaadb6d81ed9ae0a 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -510,9 +510,6 @@
   <data name="QueueView_Hibernate" xml:space="preserve">\r
     <value>Hibernate</value>\r
   </data>\r
-  <data name="QueueView_Import" xml:space="preserve">\r
-    <value>Import Queue</value>\r
-  </data>\r
   <data name="QueueView_LockSystem" xml:space="preserve">\r
     <value>Lock System</value>\r
   </data>\r
@@ -980,4 +977,10 @@ This will not affect your current settings in the Subtitle tab.</value>
   <data name="MainView_PresetRemove" xml:space="preserve">\r
     <value>Delete Preset</value>\r
   </data>\r
+  <data name="Preset_Custom" xml:space="preserve">\r
+    <value>Custom</value>\r
+  </data>\r
+  <data name="Preset_Official" xml:space="preserve">\r
+    <value>Official</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
index 1afeefb94c4396e04521360bfb56f9ddb0845cb6..d0cd4c6177536ec1c1ff8601770f952f13dea444 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
@@ -13,6 +13,7 @@ namespace HandBrakeWPF.Services.Presets.Model
 \r
     using HandBrakeWPF.Model.Audio;\r
     using HandBrakeWPF.Model.Subtitles;\r
+    using HandBrakeWPF.Properties;\r
     using HandBrakeWPF.Services.Presets.Interfaces;\r
 \r
     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;\r
@@ -76,6 +77,15 @@ namespace HandBrakeWPF.Services.Presets.Model
         /// </summary>\r
         public bool IsExpanded { get; set; }\r
 \r
+        public string DisplayValue\r
+        {\r
+            get\r
+            {\r
+                string globalCateogry = this.IsBuildIn ? ResourcesUI.Preset_Official : ResourcesUI.Preset_Custom;\r
+                return string.Format("{0} > {1} > {2}", globalCateogry, this.Category, this.Name);\r
+            }\r
+        }\r
+\r
         public bool IsSelected\r
         {\r
             get\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 34a7c159af64c40c56d9c213b93830d69d5fe2c1..06e1904f4b94853f5ffa363d7fed8fd6bb7f5536 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -104,7 +104,6 @@
                     <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearAll}" Header="{x:Static Properties:ResourcesUI.QueueView_ClearAll}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
                     <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearSelected}" Header="{x:Static Properties:ResourcesUI.QueueView_ClearSelected}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
                     <Separator Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
-                    <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.Import}" Header="{x:Static Properties:ResourcesUI.QueueView_Import}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
                     <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.Export}" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
                 </MenuItem>\r
 \r
@@ -346,7 +345,29 @@
             <StackPanel Grid.Row="1" Orientation="Vertical"  Margin="10,5,10,5">\r
                 <Label Content="Presets" FontWeight="Bold" VerticalAlignment="Center" />\r
                 <StackPanel Orientation="Horizontal" Margin="8,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">\r
-                    <ComboBox ItemsSource="{Binding PresetsCategories}" SelectedItem="{Binding SelectedPresetCategory}" Width="150" DisplayMemberPath="Category"  Margin="5,0,0,0" VerticalAlignment="Center" />\r
+\r
+                    <Button x:Name="SelectPresetsButton"  Margin="15,0,0,0" VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="350">\r
+                        <Button.Content>\r
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch">\r
+                                <TextBlock Margin="0,0,5,0" Padding="0"\r
+                                           VerticalAlignment="Center" Width="315"\r
+                                           Text="{Binding SelectedPreset.DisplayValue}" />\r
+\r
+                                <Path Height="8" Margin="2,0,0,1" VerticalAlignment="Center" HorizontalAlignment="Center"\r
+                                      Data="M 0 0 L 4 4 L 0 8 Z"\r
+                                      Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowSelectPreset" />\r
+                            </StackPanel>\r
+                        </Button.Content>\r
+\r
+                        <Button.ContextMenu>\r
+                            <ContextMenu x:Name="PresetSelectContextMenu" \r
+                                         PlacementRectangle="{Binding RelativeSource={RelativeSource Self}}" \r
+                                         ItemsSource="{Binding PresetsCategories, Converter={StaticResource presetsMenuConverter}}">\r
+                            </ContextMenu>\r
+                        </Button.ContextMenu>\r
+                    </Button>\r
+                    \r
+                    <!--<ComboBox ItemsSource="{Binding PresetsCategories}" SelectedItem="{Binding SelectedPresetCategory}" Width="150" DisplayMemberPath="Category"  Margin="5,0,0,0" VerticalAlignment="Center" />\r
                     <ComboBox ItemsSource="{Binding CategoryPresets}" SelectedItem="{Binding SelectedPreset}" Width="250" Margin="10,0,0,0" VerticalAlignment="Center">\r
                         <ComboBox.Resources>\r
                             <Style TargetType="ToolTip">\r
@@ -382,7 +403,7 @@
                                 </StackPanel>\r
                             </DataTemplate>\r
                         </ComboBox.ItemTemplate>\r
-                    </ComboBox>\r
+                    </ComboBox>-->\r
 \r
                     <Button Content="Reload" cal:Message.Attach="[Event Click] = [Action PresetSelect]"  Margin="15,0,0,0" VerticalAlignment="Center" />\r
                     <Button Content="Save Custom Preset" cal:Message.Attach="[Event Click] = [Action PresetAdd]"  Margin="5,0,0,0" VerticalAlignment="Center" />\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml.cs b/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
index 74220b160ee0293d109b1a0295028b740b24d00a..26ac5a3404b28a41f185c24c75c34c0ef6147457 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml.cs
@@ -87,6 +87,17 @@ namespace HandBrakeWPF.Views
             }\r
         }\r
 \r
+        private void SelectPreset_OnClick(object sender, RoutedEventArgs e)\r
+        {\r
+            var button = sender as FrameworkElement;\r
+            if (button != null && button.ContextMenu != null)\r
+            {\r
+                button.ContextMenu.PlacementTarget = button;\r
+                button.ContextMenu.Placement = System.Windows.Controls.Primitives.PlacementMode.Right;\r
+                button.ContextMenu.IsOpen = true;\r
+            }\r
+        }\r
+\r
         private void ToolBarLoaded(object sender, RoutedEventArgs e)\r
         {\r
             ToolBar toolBar = sender as ToolBar;\r

diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
index 114556c4360593d73f910417b53ae58249e68a90..ae7ecf37aa1641631d9d0718e18c63e290fd611b 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
@@ -72,7 +72,6 @@
                     <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearAll}" />
                     <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearSelected}" />                 
                     <Separator />
-                    <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:ResourcesUI.QueueView_Import}" />
                     <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />
                 </ContextMenu>
             </ListBox.ContextMenu>

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 03923696ce197d12e20807753354309b3064ebfa..e13c646bdded29d54e8adbc5b3ac78b91a7da6d1 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -153,7 +153,6 @@
                             <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearCompleted}" />\r
                             <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearQueue}" />\r
                             <Separator />\r
-                            <!--<MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:ResourcesUI.QueueView_Import}" />-->\r
                             <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />\r
 \r
                         </MenuItem>\r
@@ -199,7 +198,6 @@
                     <MenuItem Header="{x:Static Properties:ResourcesUI.QueueView_OpenSourceDir}" x:Name="openSourceDir" Click="OpenSourceDir_OnClick" />\r
                     <MenuItem Header="{x:Static Properties:ResourcesUI.QueueView_OpenDestDir}" x:Name="openDestDir" Click="OpenDestDir_OnClick" />\r
                     <Separator />\r
-                    <!--<MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:ResourcesUI.QueueView_Import}" />-->\r
                     <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="{x:Static Properties:ResourcesUI.QueueView_Export}" />\r
                 </ContextMenu>\r
             </ListBox.ContextMenu>\r