WinGui: Add right click menu to preset listbox.

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

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 4a6ce460259199ca6213e553b21c6dd7359910a9..c2aee92a6f784c0eaa62b782257e050fd8ef6938 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -519,24 +519,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Export.\r
-        /// </summary>\r
-        public static string Generic_Export {\r
-            get {\r
-                return ResourceManager.GetString("Generic_Export", resourceCulture);\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Import.\r
-        /// </summary>\r
-        public static string Generic_Import {\r
-            get {\r
-                return ResourceManager.GetString("Generic_Import", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Move Left.\r
         /// </summary>\r
@@ -1536,6 +1518,24 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Export to file.\r
+        /// </summary>\r
+        public static string Preset_Export {\r
+            get {\r
+                return ResourceManager.GetString("Preset_Export", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Import from file.\r
+        /// </summary>\r
+        public static string Preset_Import {\r
+            get {\r
+                return ResourceManager.GetString("Preset_Import", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Choose titles:.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index b07140b5423d6ceee8e5d9262c128e8395841ff2..ad6e0450fae96792e5ed6d0399a3b319604077f3 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -267,11 +267,11 @@
   <data name="ChapterView_ResetChapterNames" xml:space="preserve">\r
     <value>Reset Chapter Names</value>\r
   </data>\r
-  <data name="Generic_Export" xml:space="preserve">\r
-    <value>Export</value>\r
+  <data name="Preset_Export" xml:space="preserve">\r
+    <value>Export to file</value>\r
   </data>\r
-  <data name="Generic_Import" xml:space="preserve">\r
-    <value>Import</value>\r
+  <data name="Preset_Import" xml:space="preserve">\r
+    <value>Import from file</value>\r
   </data>\r
   <data name="LogView_CopyClipboard" xml:space="preserve">\r
     <value>Copy to clipboard</value>\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 1487e46e1e8102c0dd6e2bf401069c31b033da8b..fe2e4dad77fcefca6c342db992494a4b8f99384c 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -113,8 +113,8 @@
                         </MenuItem.ItemContainerStyle>\r
                     </MenuItem>\r
                     <Separator />\r
-                    <MenuItem Header="_Import" cal:Message.Attach="[Event Click] = [Action PresetImport]" />\r
-                    <MenuItem Header="_Export" cal:Message.Attach="[Event Click] = [Action PresetExport]" />\r
+                    <MenuItem Header="_Import from file" cal:Message.Attach="[Event Click] = [Action PresetImport]" />\r
+                    <MenuItem Header="_Export to file" cal:Message.Attach="[Event Click] = [Action PresetExport]" />\r
                     <Separator />\r
                     <MenuItem Header="_Set Current as Default" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
                     <MenuItem Header="_Reset Built-In Presets" cal:Message.Attach="[Event Click] = [Action PresetReset]" />\r
@@ -548,6 +548,20 @@
                             </Style>\r
                         </ListBox.Resources>\r
                         \r
+                        <ListBox.ContextMenu>\r
+                            <ContextMenu AutomationProperties.Name="Presets List Context Menu">\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
+                                <Separator />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />\r
+                                <Separator />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />\r
+                                <Separator />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />\r
+                            </ContextMenu>\r
+\r
+                        </ListBox.ContextMenu>\r
+                        \r
                         <i:Interaction.Triggers>\r
                             <commands:InputBindingTrigger>\r
                                 <commands:InputBindingTrigger.InputBinding>\r
@@ -632,8 +646,8 @@
                                 <Separator />\r
                                 <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />\r
                                 <Separator />\r
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />\r
-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Generic_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />\r
+                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />\r
                                 <Separator />\r
                                 <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />\r
                             </MenuItem>\r