WinGui: Fix to the Multiple Title selection feature. UI warning no longer relevant...

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

diff --git a/win/CS/HandBrakeWPF/Model/SelectionTitle.cs b/win/CS/HandBrakeWPF/Model/SelectionTitle.cs
index 63ad47793e614565f082e6f6b8e8af8613a9c611..8983fb9716c93dec3a3bc394f8770e628e54524d 100644 (file)
--- a/win/CS/HandBrakeWPF/Model/SelectionTitle.cs
+++ b/win/CS/HandBrakeWPF/Model/SelectionTitle.cs
@@ -3,7 +3,7 @@
 //   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
 // </copyright>\r
 // <summary>\r
-//   TODO: Update summary.\r
+//   A model for the multiple selection window for adding to the queue.\r
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
index 0da603e0530dbe854254ff963703c141464e4c49..70fda03cb6bcd0515ddcf96da2032ffb8d465dc3 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
@@ -114,25 +114,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Gets a value indicating whether is automatic track selection enabled.\r
-        /// </summary>\r
-        public bool IsAutomaticTrackSelectionEnabled\r
-        {\r
-            get\r
-            {\r
-                // TODO decide what is the minimal requirement to hide the warning message.\r
-                //if (this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage) != Constants.Any ||\r
-                //    this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles) !=\r
-                //    Constants.Any)\r
-                //{\r
-                //    return true;\r
-                //}\r
-\r
-                return false;\r
-            }\r
-        }\r
-\r
         /// <summary>\r
         /// The order by title.\r
         /// </summary>\r
@@ -234,7 +215,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
 \r
             this.NotifyOfPropertyChange(() => this.IsAutoNamingEnabled);\r
-            this.NotifyOfPropertyChange(() => this.IsAutomaticTrackSelectionEnabled);\r
         }\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
index 5e645dc7baf3af0c5464432aa7a11463025bf6f7..75538ef0a6b06e8ad9d2d6439bd3bd6bcf78cfbf 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -48,7 +48,7 @@
                    Source="Images/AddToQueue_small.png" />\r
             <StackPanel VerticalAlignment="Center" Orientation="Vertical">\r
                 <TextBlock FontWeight="Bold" Text="Add to Queue" />\r
-                <TextBlock Text="*** Experimental ***" />\r
+                <TextBlock Text="Select multiple titles to add to the queue." />\r
             </StackPanel>\r
         </StackPanel>\r
 \r
@@ -114,10 +114,6 @@
 \r
         <!-- Checlist -->\r
         <StackPanel Orientation="Vertical" Grid.Row="3" Margin="10,10,10,0">\r
-            <TextBlock Text="{x:Static Properties:Resources.QueueSelection_AutoTrackSelectionWarning}"\r
-                       TextWrapping="Wrap" Visibility="{Binding IsAutomaticTrackSelectionEnabled, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" \r
-                       Margin="0,0,0,10"/>\r
-\r
             <TextBlock Text="{x:Static Properties:Resources.QueueSelection_AutoNameWarning}"\r
                        TextWrapping="Wrap" Visibility="{Binding IsAutoNamingEnabled, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>\r
         </StackPanel>\r