WinGui: Remove the legacy XML based queue import/export funcitonality. One can still...

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index c04e4e97e01a7a13e4f6c49beaffae1a7bf9e0f6..f6a7898f0df536372941d3126e78f811ce517d5d 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1845,7 +1845,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Export Queue.\r
+        ///   Looks up a localized string similar to Export Queue for CLI.\r
         /// </summary>\r
         public static string QueueView_Export {\r
             get {\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 50a0c4bbd07d6795e9d26b3ab93711af1e941e1d..6dce889d239ac3b94ac9a763a1e1ff210b397a4a 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -508,7 +508,7 @@
     <value>Do nothing</value>\r
   </data>\r
   <data name="QueueView_Export" xml:space="preserve">\r
-    <value>Export Queue</value>\r
+    <value>Export Queue for CLI</value>\r
   </data>\r
   <data name="QueueView_Hibernate" xml:space="preserve">\r
     <value>Hibernate</value>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 0c984e032616129b1be433f81d608666381a0a8b..4cd2948dbce0edb80df903ec6a6a66c132e521de 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -392,22 +392,15 @@ namespace HandBrakeWPF.ViewModels
         {\r
             SaveFileDialog dialog = new SaveFileDialog\r
                 {\r
-                    Filter = "Legacy Queue Files (*.hbq)|*.hbq|Json for CLI (*.json)|*.json", \r
+                    Filter = "Json (*.json)|*.json", \r
                     OverwritePrompt = true, \r
-                    DefaultExt = ".hbq", \r
+                    DefaultExt = ".json", \r
                     AddExtension = true\r
                 };\r
 \r
             if (dialog.ShowDialog() == true)\r
             {\r
-                if (Path.GetExtension(dialog.FileName).ToLower().Trim() == ".json")\r
-                {\r
-                    this.queueProcessor.ExportJson(dialog.FileName);\r
-                }\r
-                else\r
-                {\r
-                    this.queueProcessor.BackupQueue(dialog.FileName);\r
-                }\r
+                this.queueProcessor.ExportJson(dialog.FileName);\r
             }\r
         }\r
 \r
@@ -416,7 +409,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void Import()\r
         {\r
-            OpenFileDialog dialog = new OpenFileDialog { Filter = "Legacy Queue Files (*.hbq)|*.hbq", CheckFileExists = true };\r
+            OpenFileDialog dialog = new OpenFileDialog { Filter = "Json (*.json)|*.json", CheckFileExists = true };\r
             if (dialog.ShowDialog() == true)\r
             {\r
                 this.queueProcessor.RestoreQueue(dialog.FileName);\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 127a2513300c21402649da0a6877bcc4b2b38694..ab00f3395cf80e66d6aa325507c9a9aee6165157 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -7,7 +7,6 @@
         xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"\r
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"\r
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"\r
-        xmlns:AttachedProperties="clr-namespace:HandBrakeWPF.AttachedProperties"\r
         xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"\r
         xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"\r
         xmlns:video="clr-namespace:HandBrakeWPF.Converters.Video"\r
@@ -154,7 +153,7 @@
                             <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 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
@@ -197,7 +196,7 @@
                     <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearAll}" />\r
                     <MenuItem cal:Message.Attach="[Event Click] = [Action RemoveSelectedJobs]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearSelected}" />                 \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 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