WinGui: Misc UI consistency improvements.

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

9 files changed, 26 insertions, 131 deletions

diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index 56b6c93e7..dd7650b31 100644
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -46,7 +46,7 @@
                 <StackPanel Orientation="Horizontal" MinWidth="100">

                     <Image Source="../Views/Images/folder32.png" Width="32" />

                     <StackPanel Orientation="Vertical">

-                        <TextBlock Text="Folder" VerticalAlignment="Center" Margin="5,0,0,0" />

+                        <TextBlock Text="Folder (Batch Scan)" VerticalAlignment="Center" Margin="5,0,0,0" />

                         <TextBlock Text="Open a folder with one or more files." VerticalAlignment="Center" Margin="5,0,0,0" />

                     </StackPanel>                   

                 </StackPanel>

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 13ba9c645..b7d4a8a85 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -255,9 +255,6 @@
     <Compile Include="Views\StaticPreviewView.xaml.cs">

       <DependentUpon>StaticPreviewView.xaml</DependentUpon>

     </Compile>

-    <Compile Include="Views\TitleSpecificView.xaml.cs">

-      <DependentUpon>TitleSpecificView.xaml</DependentUpon>

-    </Compile>

     <Compile Include="Converters\AdvancedVisibilityConverter.cs" />

     <Compile Include="Converters\BooleanConverter.cs" />

     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />

@@ -429,10 +426,6 @@
       <SubType>Designer</SubType>

       <Generator>MSBuild:Compile</Generator>

     </Page>

-    <Page Include="Views\TitleSpecificView.xaml">

-      <SubType>Designer</SubType>

-      <Generator>MSBuild:Compile</Generator>

-    </Page>

     <Page Include="Views\AboutView.xaml">

       <SubType>Designer</SubType>

       <Generator>MSBuild:Compile</Generator>

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 8400f2b7c..13dd932c8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -157,7 +157,7 @@ namespace HandBrakeWPF.ViewModels
         {

             get

             {

-                return this.ShowDefaultsPanel ? "Switch to Tracks" : "Switch to Defaults";

+                return this.ShowDefaultsPanel ? "Switch Back To Tracks" : "Configure Defaults";

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 21a3dd59d..2c71d0bb1 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -11,7 +11,7 @@
              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"

              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"

              xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"

-             d:DesignHeight="400"

+             d:DesignHeight="350"

              d:DesignWidth="616"

              mc:Ignorable="d"

              x:Name="audioTab">

@@ -52,15 +52,6 @@
                 Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}}"

                 />

 

-        <!--<Grid Grid.Row="0" Grid.Column="1" Margin="0,5,10,0" Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}}">

-            <Border cal:Message.Attach="[Event MouseDown] = [Action ShowAudioDefaults]">

-                <StackPanel Orientation="Horizontal">

-                    <Image Source="../Views/Images/Advanced.png" Width="20"   />

-                    <TextBlock Text="{Binding SwitchDisplayTitle}" VerticalAlignment="Center" Margin="5,0,0,0" />

-                </StackPanel>

-            </Border>

-        </Grid>-->

-

         <!-- Row 1 -->

 

         <Grid Grid.Row="1" Margin="10,5,10,0" Grid.Column="0"

diff --git a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
index b013096e4..103735c63 100644
--- a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
+++ b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
@@ -11,7 +11,7 @@
             <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

         <StackPanel Grid.Row="0"

-                    Height="30"

+                    Height="40"

                     Margin="0,0,0,10"

                     Orientation="Horizontal">

             <Image Width="24"

@@ -27,7 +27,7 @@
         <TextBlock Text="{Binding NoticeMessage}" Grid.Row="1" Margin="40,0,10,0"/>

 

         <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,10,10,5" HorizontalAlignment="Right">

-            <Button Content="Proceed"  HorizontalAlignment="Right" 

+            <Button Content="Proceed"  HorizontalAlignment="Right"

                 cal:Message.Attach="[Event Click] = [Action Proceed]" Padding="8,2" Margin="0,10,10,5"/>

 

             <Button Content="Cancel Action"  HorizontalAlignment="Right" Margin="0,10,10,5"

diff --git a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
index 75538ef0a..c7da33fdb 100644
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -7,8 +7,8 @@
         xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"

         xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

         Title="{Binding Title}"

-        Width="450"

-        MaxHeight="450"

+        Width="550"

+        Height="450"

         SizeToContent="Height"

         WindowStartupLocation="CenterScreen"

         TextOptions.TextFormattingMode="Display"

@@ -37,8 +37,8 @@
 

         <!--  Header  -->

         <StackPanel Grid.Row="0"

-                    Height="36"

-                    Margin="0,0,0,10"

+                    Height="42"

+                    Margin="0,0,0,0"

                     Background="White"

                     Orientation="Horizontal">

             <Image Width="32"

@@ -54,11 +54,13 @@
 

         <!-- Text -->

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

-            <TextBlock Text="Select multiple titles to add: " />

+            <TextBlock Text="Select titles: " />

         </StackPanel>

 

         <!-- Selection -->

         <ListBox Grid.Row="2"

+                 MinHeight="250"

+                 MaxHeight="500"

                  Margin="10,10,10,10"

                  VerticalAlignment="Stretch"

                  Background="LightGray"

@@ -84,7 +86,7 @@
 

             <ListBox.ItemTemplate>

                 <DataTemplate>

-                    <Grid HorizontalAlignment="Stretch" MinHeight="28">

+                    <Grid HorizontalAlignment="Stretch" MinHeight="32" Margin="5">

                         <Grid.RowDefinitions>

                             <RowDefinition Height="Auto" />

                             <RowDefinition Height="Auto" />

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 043fcc480..de2418ed7 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -11,8 +11,8 @@
              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"

              xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"

              xmlns:subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"

-             d:DesignHeight="153"

-             d:DesignWidth="319"

+             d:DesignHeight="350"

+             d:DesignWidth="500"

              mc:Ignorable="d"

              x:Name="subTab">

     <UserControl.Resources>

@@ -39,14 +39,12 @@
                    VerticalAlignment="Top"

                    Text="{Binding PanelTitle}" />

 

-        <Grid Grid.Row="0" Grid.Column="1" Margin="0,5,10,0">

-            <Border cal:Message.Attach="[Event MouseDown] = [Action ShowSubtitleDefaultsPanel]">

-                <StackPanel Orientation="Horizontal">

-                    <Image Source="../Views/Images/Advanced.png" Width="20"   />

-                    <TextBlock Text="{Binding SwitchDisplayTitle}" VerticalAlignment="Center" Margin="5,0,0,0" />

-                </StackPanel>

-            </Border> 

-        </Grid>

+        <Button MinWidth="65" Grid.Row="0" Grid.Column="1"

+                Margin="0,5,10,0"

+                cal:Message.Attach="[Event Click] = [Action ShowSubtitleDefaultsPanel]"

+                Content="{Binding SwitchDisplayTitle}"

+                Visibility="{Binding ShowDefaultsPanel, Converter={StaticResource booleanToVisConverter}}"

+                />

 

         <!-- Row 1 -->

         <StackPanel Grid.Row="1" Margin="10,5,10,0" Orientation="Horizontal"

@@ -68,6 +66,11 @@
                     Margin="0,0,10,0"

                     cal:Message.Attach="[Event Click] = [Action Clear]"

                     Content="Clear" />

+

+            <Button MinWidth="65"

+                    Margin="0,0,10,0"

+                    cal:Message.Attach="[Event Click] = [Action ShowSubtitleDefaultsPanel]"

+                    Content="{Binding SwitchDisplayTitle}" />

         </StackPanel>

 

 

diff --git a/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml b/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml
deleted file mode 100644
index 00add413e..000000000
--- a/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<Window x:Class="HandBrakeWPF.Views.TitleSpecificView"

-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

-        xmlns:cal="http://www.caliburnproject.org"

-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

-        xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"

-        xmlns:controls="clr-namespace:HandBrakeWPF.Controls"

-        Title="Scan Title"

-        Width="250"

-        Background="#FFF1F0EF"

-        ResizeMode="NoResize"

-        SizeToContent="Height"

-        WindowStartupLocation="CenterScreen"

-        mc:Ignorable="d">

-    <Grid>

-        <Grid.RowDefinitions>

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

-        </Grid.RowDefinitions>

-

-        <!--  Header  -->

-        <StackPanel Grid.Row="0"

-                    Height="30"

-                    Margin="0,0,0,10"

-                    Background="White"

-                    Orientation="Horizontal">

-            <Image Width="24"

-                   Height="24"

-                   Margin="10,0,5,0"

-                   VerticalAlignment="Center"

-                   Source="Images/Movies.png" />

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

-                <TextBlock FontWeight="Bold" Text="Title Specific Scan" />

-            </StackPanel>

-        </StackPanel>

-

-        <StackPanel Grid.Row="1"

-                    Margin="10,10,0,10"

-                    Orientation="Horizontal">

-            <TextBlock Text="Choose a title to scan:" />

-

-            <controls:NumberBox Width="60" Height="24" Margin="10,0,0,0"

-                                Minimum="0" Maximum="1000" Number="{Binding SelectedTitle, Mode=TwoWay}" />

-        </StackPanel>

-

-        <StackPanel Grid.Row="2"

-                    Margin="0,0,0,10"

-                    HorizontalAlignment="Right"

-                    Orientation="Horizontal">

-            <Button Name="Cancel"

-                    Margin="0,0,10,0"

-                    cal:Message.Attach="[Event Click] = [Action Cancel]"

-                    Content="Cancel"

-                    IsCancel="True"

-                    Padding="8,1" />

-            <Button Name="OpenTitle"

-                    Margin="0,0,10,0"

-                    cal:Message.Attach="[Event Click] = [Action Open]"

-                    Content="Open Title"

-                    IsDefault="True"

-                    Padding="8,1" />

-        </StackPanel>

-

-    </Grid>

-</Window>

diff --git a/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml.cs b/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml.cs
deleted file mode 100644
index 1f60792be..000000000
--- a/win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="TitleSpecificView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   Interaction logic for TitleSpecificView.xaml

-// </summary>

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

-

-namespace HandBrakeWPF.Views

-{

-    using System.Windows;

-

-    /// <summary>

-    /// Interaction logic for TitleSpecific.xaml

-    /// </summary>

-    public partial class TitleSpecificView : Window

-    {

-        /// <summary>

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

-        /// </summary>

-        public TitleSpecificView()

-        {

-            this.InitializeComponent();

-        }

-    }

-}