Tidy up some code for the new inline queue view.

3 files changed, 0 insertions, 26 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueViewModel.cs
index 865454a82..3530e84c1 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueViewModel.cs
@@ -14,12 +14,5 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     /// </summary>

     public interface IQueueViewModel

     {

-        /// <summary>

-        /// Activate this window. Either in-line or displayed as a window.

-        /// </summary>

-        /// <param name="isInline">

-        /// The is inline.

-        /// </param>

-        void Activate(bool isInline);

     }

 }
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 64b75e793..febfd5b00 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1220,14 +1220,12 @@ namespace HandBrakeWPF.ViewModels
             {

                 this.IsQueueShowingInLine = !this.IsQueueShowingInLine;

                 this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);

-                this.QueueViewModel.Activate(true);

             }

             else

             {

                 this.IsQueueShowingInLine = false;

                 this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);

 

-                this.QueueViewModel.Activate(false);

                 Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueView));

                 if (window != null)

                 {

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index cd3405d78..8b4d247c3 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -17,8 +17,6 @@ namespace HandBrakeWPF.ViewModels
 

     using Caliburn.Micro;

 

-    using HandBrake.ApplicationServices.Model;

-

     using HandBrakeWPF.EventArgs;

     using HandBrakeWPF.Properties;

     using HandBrakeWPF.Services.Interfaces;

@@ -162,11 +160,6 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public BindingList<QueueTask> SelectedItems { get; set; }

 

-        /// <summary>

-        /// Display the current job status information.

-        /// </summary>

-        public bool IsQueueEmbedded { get; set; } = false;

-

         #endregion

 

         #region Public Methods

@@ -387,16 +380,6 @@ namespace HandBrakeWPF.ViewModels
             mvm.EditQueueJob(new EncodeTask(task.Task));

         }

 

-        /// <summary>

-        /// Activate this window in the correct mode

-        /// </summary>

-        /// <param name="isInline">Indicdates if this panel is displayed in-line with the main view.</param>

-        public void Activate(bool isInline)

-        {

-            this.IsQueueEmbedded = !isInline;

-            this.NotifyOfPropertyChange(() => this.IsQueueEmbedded);

-        }

-

         #endregion

 

         #region Methods