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 93d15dda0f6e0b741c278c6385ff033a4d006117..833c6d98940209ffd2226d58622751720e571586 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
@@ -24,7 +24,7 @@ namespace HandBrake.ApplicationServices.Utilities
         {\r
             IDictionary<string, string> languageMap = new Dictionary<string, string>\r
                                                           {\r
-                                                              {"Any", "und"}, \r
+                                                              {"(Any)", "und"}, \r
                                                               {"Afar", "aar"}, \r
                                                               {"Abkhazian", "abk"}, \r
                                                               {"Afrikaans", "afr"}, \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index b611e14d65fe76a639d74086b27a3963f38cfb41..4f2bc251bcb8f8a5e05b0a6d1591e6cd3c4d5e9c 100644 (file)
--- 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);\r
 \r
                 // In the available languages should be no "Any" and no selected language.\r
-                if ((item != "Any") && (!this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages).Contains(item)))\r
+                if ((item != "(Any)") && (!this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages).Contains(item)))\r
                 {\r
                     this.availableLanguages.Add(item);\r
                 }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 3fcca18aa66488092f332157bd334ff6abc66538..9149fde39925f12d97d004dc63823ae2eca1badd 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -14,12 +14,9 @@ namespace HandBrakeWPF.ViewModels
     using System.IO;\r
     using System.Linq;\r
 \r
-    using Caliburn.Micro;\r
-\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Parsing;\r
-    using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
     using HandBrakeWPF.Commands;\r
@@ -52,13 +49,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>\r
         /// Initializes a new instance of the <see cref="HandBrakeWPF.ViewModels.SubtitlesViewModel"/> class.\r
         /// </summary>\r
-        /// <param name="windowManager">\r
-        /// The window manager.\r
-        /// </param>\r
-        /// <param name="userSettingService">\r
-        /// The user Setting Service.\r
-        /// </param>\r
-        public SubtitlesViewModel(IWindowManager windowManager, IUserSettingService userSettingService)\r
+        public SubtitlesViewModel()\r
         {\r
             this.Task = new EncodeTask();\r
 \r