From: sr55 <sr55.hb@outlook.com>
Date: Sun, 3 Mar 2013 14:24:37 +0000 (+0000)
Subject: WinGui: Push Any up to the top of the language lists.
X-Git-Tag: 0.9.9~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b56a9d0fc23ca64f1d63afb797bdc07e1dffc357;p=handbrake

WinGui: Push Any up to the top of the language lists.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
index 93d15dda0..833c6d989 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
@@ -24,7 +24,7 @@ namespace HandBrake.ApplicationServices.Utilities
         {
             IDictionary<string, string> languageMap = new Dictionary<string, string>
                                                           {
-                                                              {"Any", "und"}, 
+                                                              {"(Any)", "und"}, 
                                                               {"Afar", "aar"}, 
                                                               {"Abkhazian", "abk"}, 
                                                               {"Afrikaans", "afr"}, 
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index b611e14d6..4f2bc251b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1536,7 +1536,7 @@ namespace HandBrakeWPF.ViewModels
                 this.preferredLanguages.Add(item);
 
                 // In the available languages should be no "Any" and no selected language.
-                if ((item != "Any") && (!this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages).Contains(item)))
+                if ((item != "(Any)") && (!this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages).Contains(item)))
                 {
                     this.availableLanguages.Add(item);
                 }
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 3fcca18aa..9149fde39 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -14,12 +14,9 @@ namespace HandBrakeWPF.ViewModels
     using System.IO;
     using System.Linq;
 
-    using Caliburn.Micro;
-
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
     using HandBrake.ApplicationServices.Parsing;
-    using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
 
     using HandBrakeWPF.Commands;
@@ -52,13 +49,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>
         /// Initializes a new instance of the <see cref="HandBrakeWPF.ViewModels.SubtitlesViewModel"/> class.
         /// </summary>
-        /// <param name="windowManager">
-        /// The window manager.
-        /// </param>
-        /// <param name="userSettingService">
-        /// The user Setting Service.
-        /// </param>
-        public SubtitlesViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+        public SubtitlesViewModel()
         {
             this.Task = new EncodeTask();