WinGui: (WPF) Move all the main UI tab UserControls into an MVVM format. Mostly code shuffling.

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

1 files changed, 3 insertions, 10 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
index c300487e3..e506fb987 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -25,11 +25,6 @@ namespace HandBrakeWPF.ViewModels
     public class AboutViewModel : ViewModelBase, IAboutViewModel

     {

         /// <summary>

-        /// Backing Field for the User setting service.

-        /// </summary>

-        private readonly IUserSettingService userSettingService;

-

-        /// <summary>

         /// Initializes a new instance of the <see cref="AboutViewModel"/> class.

         /// </summary>

         /// <param name="windowManager">

@@ -39,9 +34,7 @@ namespace HandBrakeWPF.ViewModels
         /// The user Setting Service.

         /// </param>

         public AboutViewModel(IWindowManager windowManager, IUserSettingService userSettingService)

-            : base(windowManager)

         {

-            this.userSettingService = userSettingService;

             this.Title = "About HandBrake";

         }

 

@@ -52,11 +45,11 @@ namespace HandBrakeWPF.ViewModels
         {

             get

             {

-                string nightly = userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion).Contains("svn") ? " (SVN / Nightly Build)" : string.Empty;

+                string nightly = UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion).Contains("svn") ? " (SVN / Nightly Build)" : string.Empty;

                 return string.Format(

                     "{0} ({1}) {2}",

-                    userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),

-                    userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild),

+                    UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),

+                    UserSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild),

                     nightly);

             }

         }