WinGui: Strip out the overlay panel code. It's not used.

8 files changed, 1 insertions, 211 deletions

diff --git a/win/CS/HandBrakeWPF/Commands/CloseOverlayPanelCommand.cs b/win/CS/HandBrakeWPF/Commands/CloseOverlayPanelCommand.cs
deleted file mode 100644
index 582cca925..000000000
--- a/win/CS/HandBrakeWPF/Commands/CloseOverlayPanelCommand.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="CloseOverlayPanelCommand.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   The open overlay panel command.

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrakeWPF.Commands

-{

-    using System;

-    using System.Windows.Input;

-

-    using Caliburn.Micro;

-

-    using HandBrakeWPF.ViewModels.Interfaces;

-

-    /// <summary>

-    /// The open overlay panel command.

-    /// </summary>

-    public class CloseOverlayPanelCommand : ICommand

-    {

-        /// <summary>

-        /// The execute.

-        /// </summary>

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

-        /// The parameter.

-        /// </param>

-        public void Execute(object parameter)

-        {

-            IShellViewModel shellViewModel = IoC.Get<IShellViewModel>();

-            if (shellViewModel != null)

-            {

-                shellViewModel.HideOverlay();

-            }

-        }

-

-        /// <summary>

-        /// The can execute.

-        /// </summary>

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

-        /// The parameter.

-        /// </param>

-        /// <returns>

-        /// The <see cref="bool"/>.

-        /// </returns>

-        public bool CanExecute(object parameter)

-        {

-            return true;

-        }

-

-        /// <summary>

-        /// The can execute changed.

-        /// </summary>

-        public event EventHandler CanExecuteChanged;

-    }

-}

diff --git a/win/CS/HandBrakeWPF/Commands/OpenOverlayPanelCommand.cs b/win/CS/HandBrakeWPF/Commands/OpenOverlayPanelCommand.cs
deleted file mode 100644
index 5d2e3cba2..000000000
--- a/win/CS/HandBrakeWPF/Commands/OpenOverlayPanelCommand.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="OpenOverlayPanelCommand.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   The open overlay panel command.

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrakeWPF.Commands

-{

-    using System;

-    using System.Windows.Input;

-

-    using Caliburn.Micro;

-

-    using HandBrakeWPF.ViewModels.Interfaces;

-

-    /// <summary>

-    /// The open overlay panel command.

-    /// </summary>

-    public class OpenOverlayPanelCommand : ICommand

-    {

-        /// <summary>

-        /// The execute.

-        /// </summary>

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

-        /// The parameter.

-        /// </param>

-        public void Execute(object parameter)

-        {

-            IOverlayPanel overlayPanel = parameter as IOverlayPanel;

-            if (overlayPanel != null)

-            {

-                IShellViewModel shellViewModel = IoC.Get<IShellViewModel>();

-                if (shellViewModel != null)

-                {

-                    shellViewModel.ShowOverlay(overlayPanel);

-                }

-            }

-        }

-

-        /// <summary>

-        /// The can execute.

-        /// </summary>

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

-        /// The parameter.

-        /// </param>

-        /// <returns>

-        /// The <see cref="bool"/>.

-        /// </returns>

-        public bool CanExecute(object parameter)

-        {

-            return true;

-        }

-

-        /// <summary>

-        /// The can execute changed.

-        /// </summary>

-        public event EventHandler CanExecuteChanged;

-    }

-}

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 4ba16c677..5869f24bb 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -138,8 +138,6 @@
     <Compile Include="Commands\Menu\QueueCommandParams.cs" />

     <Compile Include="Commands\Menu\QueueCommands.cs" />

     <Compile Include="Commands\OpenOptionsScreenCommand.cs" />

-    <Compile Include="Commands\CloseOverlayPanelCommand.cs" />

-    <Compile Include="Commands\OpenOverlayPanelCommand.cs" />

     <Compile Include="Commands\ProcessShortcutCommand.cs" />

     <Compile Include="Commands\SourceMenuCommand.cs" />

     <Compile Include="Commands\AdvancedEncoderOptionsCommand.cs" />

@@ -263,7 +261,6 @@
     <Compile Include="Controls\SourceSelection.xaml.cs">

       <DependentUpon>SourceSelection.xaml</DependentUpon>

     </Compile>

-    <Compile Include="ViewModels\Interfaces\IOverlayPanel.cs" />

     <Compile Include="ViewModels\Interfaces\IPopupWindowViewModel.cs" />

     <Compile Include="ViewModels\Interfaces\IStaticPreviewViewModel.cs" />

     <Compile Include="ViewModels\Interfaces\IMiniViewModel.cs" />

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs
index e9e31d0ab..897568ed8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     /// <summary>

     /// The Audio View Model Interface

     /// </summary>

-    public interface IAudioDefaultsViewModel : IOverlayPanel, IViewModelBase

+    public interface IAudioDefaultsViewModel : IViewModelBase

     {

         /// <summary>

         /// Gets the audio behaviours.

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOverlayPanel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOverlayPanel.cs
deleted file mode 100644
index c713ce283..000000000
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IOverlayPanel.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="IOverlayPanel.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   The OverlayPanel interface.

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrakeWPF.ViewModels.Interfaces

-{

-    /// <summary>

-    /// The OverlayPanel interface.

-    /// </summary>

-    public interface IOverlayPanel

-    {

-    }

-}

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IShellViewModel.cs
index 0b156109a..6c537ef66 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IShellViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IShellViewModel.cs
@@ -17,19 +17,6 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     public interface IShellViewModel

     {

         /// <summary>

-        /// The show overlay.

-        /// </summary>

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

-        /// The panel.

-        /// </param>

-        void ShowOverlay(IOverlayPanel panel);

-

-        /// <summary>

-        /// The hide overlay.

-        /// </summary>

-        void HideOverlay();

-

-        /// <summary>

         /// Change the page displayed on this window.

         /// </summary>

         /// <param name="window">

diff --git a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
index 848472899..35c8d6a86 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs
@@ -42,12 +42,8 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         private bool showOptions;

 

-        private bool showOverlayPanel;

-

         private bool isMainPanelEnabled;

 

-        private IMainViewModel mainViewModel;

-

         #endregion

 

         /// <summary>

@@ -73,28 +69,6 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

-        /// The show overlay.

-        /// </summary>

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

-        /// The panel.

-        /// </param>

-        public void ShowOverlay(IOverlayPanel panel)

-        {

-            this.OverlayPanelViewModel = panel;

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

-            this.ShowOverlayPanel = true;

-        }

-

-        /// <summary>

-        /// The hide overlay.

-        /// </summary>

-        public void HideOverlay()

-        {          

-            this.ShowOverlayPanel = false;

-            this.OverlayPanelViewModel = null;

-        }

-

-        /// <summary>

         /// Change the page displayed on this window.

         /// </summary>

         /// <param name="window">

@@ -132,11 +106,6 @@ namespace HandBrakeWPF.ViewModels
         public IOptionsViewModel OptionsViewModel { get; set; }

 

         /// <summary>

-        /// Gets or sets the overlay panel view model.

-        /// </summary>

-        public IOverlayPanel OverlayPanelViewModel { get; set; }

-

-        /// <summary>

         /// Gets or sets a value indicating whether ShowMainWindow.

         /// </summary>

         public bool ShowMainWindow

@@ -189,27 +158,6 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

-        /// Gets or sets a value indicating whether show overlay panel.

-        /// </summary>

-        public bool ShowOverlayPanel

-        {

-            get

-            {

-                return this.showOverlayPanel;

-            }

-            set

-            {

-                if (value.Equals(this.showOverlayPanel))

-                {

-                    return;

-                }

-                this.showOverlayPanel = value;

-                this.IsMainPanelEnabled = !value;

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

-            }

-        }

-

-        /// <summary>

         /// Gets WindowTitle.

         /// </summary>

         public string WindowTitle

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 9cc976584..fafa28d31 100644
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -34,9 +34,5 @@
                         IsEnabled="{Binding IsMainPanelEnabled}" />

         <ContentControl x:Name="OptionsViewModel"  Panel.ZIndex="0"  Visibility="{Binding ShowOptions, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"

                         IsEnabled="{Binding IsMainPanelEnabled}" />

-

-        <DockPanel Background="Black" Opacity="0.60" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="1"

-               Visibility="{Binding ShowOverlayPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

-

     </Grid>

 </Window>