WinGui: Remove the legacy XML based queue import/export funcitonality. One can still export to JSON for the CLI but currently import is still not supported for JSON.

4 files changed, 8 insertions, 16 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index c04e4e97e..f6a7898f0 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1845,7 +1845,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Export Queue.

+        ///   Looks up a localized string similar to Export Queue for CLI.

         /// </summary>

         public static string QueueView_Export {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 50a0c4bbd..6dce889d2 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -508,7 +508,7 @@
     <value>Do nothing</value>

   </data>

   <data name="QueueView_Export" xml:space="preserve">

-    <value>Export Queue</value>

+    <value>Export Queue for CLI</value>

   </data>

   <data name="QueueView_Hibernate" xml:space="preserve">

     <value>Hibernate</value>

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 0c984e032..4cd2948db 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -392,22 +392,15 @@ namespace HandBrakeWPF.ViewModels
         {

             SaveFileDialog dialog = new SaveFileDialog

                 {

-                    Filter = "Legacy Queue Files (*.hbq)|*.hbq|Json for CLI (*.json)|*.json", 

+                    Filter = "Json (*.json)|*.json", 

                     OverwritePrompt = true, 

-                    DefaultExt = ".hbq", 

+                    DefaultExt = ".json", 

                     AddExtension = true

                 };

 

             if (dialog.ShowDialog() == true)

             {

-                if (Path.GetExtension(dialog.FileName).ToLower().Trim() == ".json")

-                {

-                    this.queueProcessor.ExportJson(dialog.FileName);

-                }

-                else

-                {

-                    this.queueProcessor.BackupQueue(dialog.FileName);

-                }

+                this.queueProcessor.ExportJson(dialog.FileName);

             }

         }

 

@@ -416,7 +409,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public void Import()

         {

-            OpenFileDialog dialog = new OpenFileDialog { Filter = "Legacy Queue Files (*.hbq)|*.hbq", CheckFileExists = true };

+            OpenFileDialog dialog = new OpenFileDialog { Filter = "Json (*.json)|*.json", CheckFileExists = true };

             if (dialog.ShowDialog() == true)

             {

                 this.queueProcessor.RestoreQueue(dialog.FileName);

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 127a25133..ab00f3395 100644
--- 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"

         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"

         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

-        xmlns:AttachedProperties="clr-namespace:HandBrakeWPF.AttachedProperties"

         xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"

         xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"

         xmlns:video="clr-namespace:HandBrakeWPF.Converters.Video"

@@ -154,7 +153,7 @@
                             <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearCompleted}" />

                             <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="{x:Static Properties:ResourcesUI.QueueView_ClearQueue}" />

                             <Separator />

-                            <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="{x:Static Properties:ResourcesUI.QueueView_Import}" />

+                            <!--<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}" />

 

                         </MenuItem>

@@ -197,7 +196,7 @@
                     <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 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>