WinGui: Some layout tweaks by beta-tester

- disabling sizing on windows, where sizing makes no sense;
- limit sizing on windows, where sizing in a wrong directions makes problems;
- make controls full sizable, where the readability/information will benefit from;
- all windows appears now in ScreenCenter;


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

1 files changed, 61 insertions, 27 deletions

diff --git a/win/CS/HandBrakeWPF/Views/PreviewView.xaml b/win/CS/HandBrakeWPF/Views/PreviewView.xaml
index 460501930..e1ffbda19 100644
--- a/win/CS/HandBrakeWPF/Views/PreviewView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PreviewView.xaml
@@ -1,11 +1,16 @@
 <Window x:Class="HandBrakeWPF.Views.PreviewView"

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

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

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

-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"

-        mc:Ignorable="d" 

-             Title="{Binding Title}" 

-             Width="380" SizeToContent="Height" Background="#FFF1F0EF">

+        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"

+        Title="{Binding Title}"

+        Width="380"

+        Background="#FFF1F0EF"

+        ResizeMode="NoResize"

+        SizeToContent="Height"

+        WindowStartupLocation="CenterScreen"

+        mc:Ignorable="d">

 

     <Window.Resources>

         <Style TargetType="Button">

@@ -16,33 +21,62 @@
             <Setter Property="VerticalAlignment" Value="Center" />

         </Style>

     </Window.Resources>

-    

-    <StackPanel Orientation="Vertical" >

 

-        <StackPanel Orientation="Horizontal" Grid.Row="0"  Background="White" Height="30" Margin="0,0,0,10" >

-            <Image Source="Images/window.png" Margin="10,0,5,0"  Width="24" Height="24" VerticalAlignment="Center" />

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

-                <TextBlock Text="Create a video preview" FontWeight="Bold" />

+    <StackPanel Orientation="Vertical">

+

+        <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/window.png" />

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

+                <TextBlock FontWeight="Bold" Text="Create a video preview" />

             </StackPanel>

         </StackPanel>

-        

-        <StackPanel Orientation="Horizontal" Margin="10,0,0,0">

-            <TextBlock Text="Start at Preview:" Margin="0,0,5,0" VerticalAlignment="Center" />

-            <ComboBox ItemsSource="{Binding StartPoints}" Width="60" SelectedItem="{Binding StartAt}" />

 

-            <TextBlock Text="Duration:" VerticalAlignment="Center" Margin="10,0,5,0" />

-            <ComboBox ItemsSource="{Binding AvailableDurations}" Width="60" SelectedItem="{Binding Duration}" />

+        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">

+            <TextBlock Margin="0,0,5,0"

+                       VerticalAlignment="Center"

+                       Text="Start at Preview:" />

+            <ComboBox Width="60"

+                      ItemsSource="{Binding StartPoints}"

+                      SelectedItem="{Binding StartAt}" />

+

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

+                       VerticalAlignment="Center"

+                       Text="Duration:" />

+            <ComboBox Width="60"

+                      ItemsSource="{Binding AvailableDurations}"

+                      SelectedItem="{Binding Duration}" />

         </StackPanel>

-        

-        <StackPanel Orientation="Horizontal" Margin="10,10,0,0">

-            <ProgressBar Minimum="0" Maximum="100" Width="310" Height="22" Value="{Binding PercentageValue}" />

-            <TextBlock Text="{Binding Percentage}" Margin="5,0,0,0" />

+

+        <StackPanel Margin="10,10,0,0" Orientation="Horizontal">

+            <ProgressBar Width="310"

+                         Height="22"

+                         Maximum="100"

+                         Minimum="0"

+                         Value="{Binding PercentageValue}" />

+            <TextBlock Margin="5,0,0,0" Text="{Binding Percentage}" />

         </StackPanel>

 

-        <StackPanel Orientation="Horizontal" Margin="10,10,0,10" Width="360">

-            <CheckBox Content="Use system default player" VerticalAlignment="Center" IsChecked="{Binding UseSystemDefaultPlayer}" />

-            <Button Content="Play" HorizontalAlignment="Right" IsDefault="True" VerticalAlignment="Center" Padding="8,2" Margin="10,0,0,0"

-                    cal:Message.Attach="[Event Click] = [Action Play]" />

+        <StackPanel Width="360"

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

+                    Orientation="Horizontal">

+            <CheckBox VerticalAlignment="Center"

+                      Content="Use system default player"

+                      IsChecked="{Binding UseSystemDefaultPlayer}" />

+            <Button Margin="10,0,0,0"

+                    HorizontalAlignment="Right"

+                    VerticalAlignment="Center"

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

+                    Content="Play"

+                    IsDefault="True"

+                    Padding="8,2" />

         </StackPanel>

     </StackPanel>

 </Window>