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

diff --git a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
index 103735c6322d2cbff315b8ec8290273a95ace8d9..b063f85ba8bc39ddd4f2e1392b427ec1d413b83a 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
+++ b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
@@ -10,19 +10,8 @@
             <RowDefinition Height="Auto" />\r
             <RowDefinition Height="Auto" />\r
         </Grid.RowDefinitions>\r
-        <StackPanel Grid.Row="0"\r
-                    Height="40"\r
-                    Margin="0,0,0,10"\r
-                    Orientation="Horizontal">\r
-            <Image Width="24"\r
-                   Height="24"\r
-                   Margin="10,0,5,0"\r
-                   VerticalAlignment="Center"\r
-                   Source="../Views/Images/Advanced.png" />\r
-            <StackPanel VerticalAlignment="Center" Orientation="Vertical">\r
-                <TextBlock FontWeight="Bold" Text="When Done Action" />\r
-            </StackPanel>\r
-        </StackPanel>\r
+\r
+        <TextBlock Text="When Done Action" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />\r
         \r
         <TextBlock Text="{Binding NoticeMessage}" Grid.Row="1" Margin="40,0,10,0"/>\r
 \r

diff --git a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
index c7da33fdb32cce8210bebdf87e3bd1f0c09c25c0..13ddd9cc95d0222018c51eb62f96baa611291fdc 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -25,8 +25,7 @@
     </Window.Resources>\r
 \r
     <Grid HorizontalAlignment="Stretch"\r
-          VerticalAlignment="Stretch"\r
-          Background="#FFF1F0EF">\r
+          VerticalAlignment="Stretch">\r
         <Grid.RowDefinitions>\r
             <RowDefinition Height="Auto" />\r
             <RowDefinition Height="Auto" />\r
@@ -36,25 +35,11 @@
         </Grid.RowDefinitions>\r
 \r
         <!--  Header  -->\r
-        <StackPanel Grid.Row="0"\r
-                    Height="42"\r
-                    Margin="0,0,0,0"\r
-                    Background="White"\r
-                    Orientation="Horizontal">\r
-            <Image Width="32"\r
-                   Height="32"\r
-                   Margin="10,0,5,0"\r
-                   VerticalAlignment="Center"\r
-                   Source="Images/AddToQueue_small.png" />\r
-            <StackPanel VerticalAlignment="Center" Orientation="Vertical">\r
-                <TextBlock FontWeight="Bold" Text="Add to Queue" />\r
-                <TextBlock Text="Select multiple titles to add to the queue." />\r
-            </StackPanel>\r
-        </StackPanel>\r
+        <TextBlock Text="Add to Queue" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />\r
 \r
         <!-- Text -->\r
-        <StackPanel Orientation="Vertical" Grid.Row="1" Margin="10,10,10,0">\r
-            <TextBlock Text="Select titles: " />\r
+        <StackPanel Orientation="Vertical" Grid.Row="1" Margin="10,0,10,0">\r
+            <TextBlock Text="Choose titles: " />\r
         </StackPanel>\r
 \r
         <!-- Selection -->\r
@@ -63,13 +48,12 @@
                  MaxHeight="500"\r
                  Margin="10,10,10,10"\r
                  VerticalAlignment="Stretch"\r
-                 Background="LightGray"\r
+                 HorizontalAlignment="Stretch"\r
                  ItemsSource="{Binding TitleList}"\r
                  SelectionMode="Single">\r
             <ListBox.ItemContainerStyle>\r
                 <Style TargetType="ListBoxItem">\r
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />\r
-                    <Setter Property="Background" Value="WhiteSmoke" />\r
                     <Setter Property="Margin" Value="0,0,0,1" />\r
                 </Style>\r
             </ListBox.ItemContainerStyle>\r
@@ -122,8 +106,7 @@
 \r
         <!--  Controls  -->\r
         <Grid Grid.Row="4"\r
-              Margin="0,20,0,0"\r
-              Background="LightGray">\r
+              Margin="0,20,0,0">\r
             <Grid.ColumnDefinitions>\r
                 <ColumnDefinition Width="*" />\r
                 <ColumnDefinition Width="Auto" />\r
@@ -131,13 +114,13 @@
             </Grid.ColumnDefinitions>\r
 \r
             <Button Grid.Column="1"\r
-                    Margin="0,5,10,5"\r
+                    Margin="0,5,10,10"\r
                     cal:Message.Attach="[Event Click] = [Action Cancel]"\r
                     Content="Cancel"\r
                     IsCancel="True"\r
                     Padding="8,2" />\r
             <Button Grid.Column="2"\r
-                    Margin="0,5,10,5"\r
+                    Margin="0,5,10,10"\r
                     cal:Message.Attach="[Event Click] = [Action Add]"\r
                     Content="Add"\r
                     IsDefault="True"\r