WinGui: Fix to the Multiple Title selection feature. UI warning no longer relevant after audio/sub title behaviour refactor.

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

3 files changed, 2 insertions, 26 deletions

diff --git a/win/CS/HandBrakeWPF/Model/SelectionTitle.cs b/win/CS/HandBrakeWPF/Model/SelectionTitle.cs
index 63ad47793..8983fb971 100644
--- 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.

 // </copyright>

 // <summary>

-//   TODO: Update summary.

+//   A model for the multiple selection window for adding to the queue.

 // </summary>

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

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
index 0da603e05..70fda03cb 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
@@ -115,25 +115,6 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

-        /// Gets a value indicating whether is automatic track selection enabled.

-        /// </summary>

-        public bool IsAutomaticTrackSelectionEnabled

-        {

-            get

-            {

-                // TODO decide what is the minimal requirement to hide the warning message.

-                //if (this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage) != Constants.Any ||

-                //    this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles) !=

-                //    Constants.Any)

-                //{

-                //    return true;

-                //}

-

-                return false;

-            }

-        }

-

-        /// <summary>

         /// The order by title.

         /// </summary>

         public void OrderByTitle()

@@ -234,7 +215,6 @@ namespace HandBrakeWPF.ViewModels
             }

 

             this.NotifyOfPropertyChange(() => this.IsAutoNamingEnabled);

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

         }

     }

 }

diff --git a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
index 5e645dc7b..75538ef0a 100644
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -48,7 +48,7 @@
                    Source="Images/AddToQueue_small.png" />

             <StackPanel VerticalAlignment="Center" Orientation="Vertical">

                 <TextBlock FontWeight="Bold" Text="Add to Queue" />

-                <TextBlock Text="*** Experimental ***" />

+                <TextBlock Text="Select multiple titles to add to the queue." />

             </StackPanel>

         </StackPanel>

 

@@ -114,10 +114,6 @@
 

         <!-- Checlist -->

         <StackPanel Orientation="Vertical" Grid.Row="3" Margin="10,10,10,0">

-            <TextBlock Text="{x:Static Properties:Resources.QueueSelection_AutoTrackSelectionWarning}"

-                       TextWrapping="Wrap" Visibility="{Binding IsAutomaticTrackSelectionEnabled, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" 

-                       Margin="0,0,0,10"/>

-

             <TextBlock Text="{x:Static Properties:Resources.QueueSelection_AutoNameWarning}"

                        TextWrapping="Wrap" Visibility="{Binding IsAutoNamingEnabled, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>

         </StackPanel>