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, 58 insertions, 18 deletions

diff --git a/win/CS/HandBrakeWPF/Views/ErrorView.xaml b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
index 263d2486a..17acaddb3 100644
--- a/win/CS/HandBrakeWPF/Views/ErrorView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ErrorView.xaml
@@ -1,7 +1,15 @@
 <Window x:Class="HandBrakeWPF.Views.ErrorView"

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

-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"

-        Title="{Binding Title}" Height="380" Width="680" FontSize="11" Background="#FFF0F0F0">

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

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

+        Title="{Binding Title}"

+        Width="680"

+        Height="380"

+        MinWidth="680"

+        MinHeight="380"

+        Background="#FFF0F0F0"

+        FontSize="11"

+        WindowStartupLocation="CenterScreen">

     <Grid>

         <Grid.RowDefinitions>

             <RowDefinition Height="70" />

@@ -9,47 +17,79 @@
             <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

 

-        <!-- Header -->

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

-            <Image Source="Images/ErrorX.png" Width="64" Height="64" Margin="10,0,0,0" />

-            <Grid Margin="10,0,0,0" Height="64">

+        <!--  Header  -->

+        <StackPanel Grid.Row="0"

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

+                    Background="White"

+                    Orientation="Horizontal">

+            <Image Width="64"

+                   Height="64"

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

+                   Source="Images/ErrorX.png" />

+            <Grid Height="64" Margin="10,0,0,0">

                 <Grid.RowDefinitions>

                     <RowDefinition Height="Auto" />

                     <RowDefinition Height="Auto" />

                     <RowDefinition Height="*" />

                 </Grid.RowDefinitions>

-                <TextBlock Text="{Binding ErrorMessage}" FontWeight="Bold" Grid.Row="0" Margin="0,5,0,0" />

-                <TextBlock Text="{Binding Solution}" Grid.Row="1" Margin="0,5,0,0" />

+                <TextBlock Grid.Row="0"

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

+                           FontWeight="Bold"

+                           Text="{Binding ErrorMessage}" />

+                <TextBlock Grid.Row="1"

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

+                           Text="{Binding Solution}" />

 

-                <TextBlock Text="Error Details:" FontWeight="Bold" Margin="0,0,0,2" VerticalAlignment="Bottom" Grid.Row="2" />

+                <TextBlock Grid.Row="2"

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

+                           VerticalAlignment="Bottom"

+                           FontWeight="Bold"

+                           Text="Error Details:" />

             </Grid>

         </StackPanel>

 

-        <!-- Details -->

-        <TextBox Text="{Binding Details}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" 

-                         VerticalScrollBarVisibility="Auto" Margin="84,10,10,10" Grid.Row="1"  />

+        <!--  Details  -->

+        <TextBox Grid.Row="1"

+                 Margin="84,10,10,10"

+                 HorizontalAlignment="Stretch"

+                 VerticalAlignment="Stretch"

+                 IsReadOnly="True"

+                 Text="{Binding Details}"

+                 TextWrapping="Wrap"

+                 VerticalScrollBarVisibility="Auto" />

 

 

-        <!-- Controls -->

-        <Grid Grid.Row ="2" Background="LightGray">

+        <!--  Controls  -->

+        <Grid Grid.Row="2" Background="LightGray">

             <Grid.ColumnDefinitions>

                 <ColumnDefinition Width="*" />

                 <ColumnDefinition Width="Auto" />

                 <ColumnDefinition Width="Auto" />

             </Grid.ColumnDefinitions>

 

-            <Button Padding="8,2" Margin="5" Grid.Column="1" cal:Message.Attach="[Event Click] = [Action Copy]">

+            <Button Grid.Column="1"

+                    Margin="5"

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

+                    Padding="8,2">

                 <Grid>

                     <Grid.ColumnDefinitions>

                         <ColumnDefinition Width="Auto" />

                         <ColumnDefinition Width="Auto" />

                     </Grid.ColumnDefinitions>

-                    <Image Source="Images/copy.png" Grid.Column="0" Width="16" Height="16" Margin="0,0,5,0" />

-                    <TextBlock Text="Copy to Clipboard" Grid.Column="1" />

+                    <Image Grid.Column="0"

+                           Width="16"

+                           Height="16"

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

+                           Source="Images/copy.png" />

+                    <TextBlock Grid.Column="1" Text="Copy to Clipboard" />

                 </Grid>

             </Button>

 

-            <Button Content="Close" Padding="8,2" Margin="0,5,10,5" Grid.Column="2" cal:Message.Attach="[Event Click] = [Action Close]"></Button>

+            <Button Grid.Column="2"

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

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

+                    Content="Close"

+                    Padding="8,2" />

         </Grid>

     </Grid>

 </Window>