WinGui: Further UI design updates to Queue selection and Task action countdown.

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

2 files changed, 10 insertions, 38 deletions

diff --git a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
index 103735c63..b063f85ba 100644
--- a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
+++ b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
@@ -10,19 +10,8 @@
             <RowDefinition Height="Auto" />

             <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

-        <StackPanel Grid.Row="0"

-                    Height="40"

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

-                    Orientation="Horizontal">

-            <Image Width="24"

-                   Height="24"

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

-                   VerticalAlignment="Center"

-                   Source="../Views/Images/Advanced.png" />

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

-                <TextBlock FontWeight="Bold" Text="When Done Action" />

-            </StackPanel>

-        </StackPanel>

+

+        <TextBlock Text="When Done Action" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />

         

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

 

diff --git a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
index c7da33fdb..13ddd9cc9 100644
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -25,8 +25,7 @@
     </Window.Resources>

 

     <Grid HorizontalAlignment="Stretch"

-          VerticalAlignment="Stretch"

-          Background="#FFF1F0EF">

+          VerticalAlignment="Stretch">

         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

             <RowDefinition Height="Auto" />

@@ -36,25 +35,11 @@
         </Grid.RowDefinitions>

 

         <!--  Header  -->

-        <StackPanel Grid.Row="0"

-                    Height="42"

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

-                    Background="White"

-                    Orientation="Horizontal">

-            <Image Width="32"

-                   Height="32"

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

-                   VerticalAlignment="Center"

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

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

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

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

-            </StackPanel>

-        </StackPanel>

+        <TextBlock Text="Add to Queue" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />

 

         <!-- Text -->

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

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

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

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

         </StackPanel>

 

         <!-- Selection -->

@@ -63,13 +48,12 @@
                  MaxHeight="500"

                  Margin="10,10,10,10"

                  VerticalAlignment="Stretch"

-                 Background="LightGray"

+                 HorizontalAlignment="Stretch"

                  ItemsSource="{Binding TitleList}"

                  SelectionMode="Single">

             <ListBox.ItemContainerStyle>

                 <Style TargetType="ListBoxItem">

                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />

-                    <Setter Property="Background" Value="WhiteSmoke" />

                     <Setter Property="Margin" Value="0,0,0,1" />

                 </Style>

             </ListBox.ItemContainerStyle>

@@ -122,8 +106,7 @@
 

         <!--  Controls  -->

         <Grid Grid.Row="4"

-              Margin="0,20,0,0"

-              Background="LightGray">

+              Margin="0,20,0,0">

             <Grid.ColumnDefinitions>

                 <ColumnDefinition Width="*" />

                 <ColumnDefinition Width="Auto" />

@@ -131,13 +114,13 @@
             </Grid.ColumnDefinitions>

 

             <Button Grid.Column="1"

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

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

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

                     Content="Cancel"

                     IsCancel="True"

                     Padding="8,2" />

             <Button Grid.Column="2"

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

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

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

                     Content="Add"

                     IsDefault="True"