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, 54 insertions, 21 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index c4e048bc5..7743dfc2d 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -1,12 +1,17 @@
 <Window x:Class="HandBrakeWPF.Views.AboutView"

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

-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" Title="{Binding Title}" 

-        Height="320" Width="600">

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

+        xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"

+        Title="{Binding Title}"

+        Width="600"

+        Height="320"

+        ResizeMode="NoResize"

+        WindowStartupLocation="CenterScreen">

 

     <Grid>

         <Grid.RowDefinitions>

-            <RowDefinition Height="*"/>

-            <RowDefinition Height="Auto"/>

+            <RowDefinition Height="*" />

+            <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

 

         <Grid Grid.Row="0">

@@ -14,8 +19,15 @@
                 <ColumnDefinition Width="Auto" />

                 <ColumnDefinition Width="*" />

             </Grid.ColumnDefinitions>

-            

-            <Image Source="Images/logo64.png" Width="64" Height="64" Grid.Column="0" SnapsToDevicePixels="True" Margin="10,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" />

+

+            <Image Grid.Column="0"

+                   Width="64"

+                   Height="64"

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

+                   HorizontalAlignment="Left"

+                   VerticalAlignment="Top"

+                   SnapsToDevicePixels="True"

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

 

             <Grid Grid.Column="1">

                 <Grid.RowDefinitions>

@@ -25,29 +37,50 @@
                     <RowDefinition Height="*" />

                 </Grid.RowDefinitions>

 

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

-                    <TextBlock Text="HandBrake" FontWeight="Bold" FontSize="14" Margin="0,0,5,0" />

-                    <TextBlock Text="{Binding Version}" Margin="0,0,0,1" VerticalAlignment="Bottom" />

+                <StackPanel Grid.Row="0"

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

+                            Orientation="Horizontal">

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

+                               FontSize="14"

+                               FontWeight="Bold"

+                               Text="HandBrake" />

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

+                               VerticalAlignment="Bottom"

+                               Text="{Binding Version}" />

                 </StackPanel>

-                

-                <TextBlock Text="Copyright 2003-2012 HandBrake Team" Margin="5,0,0,0 " Grid.Row="1" />

-

-                <TextBlock Text="License:" Margin="5,10,0,5" Grid.Row="2" />

-                <TextBox VerticalAlignment="Stretch" HorizontalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" 

-                         VerticalScrollBarVisibility="Auto" Margin="10,0,10,10" Grid.Row="3">

-                    This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

 

-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

+                <TextBlock Grid.Row="1"

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

+                           Text="Copyright 2003-2012 HandBrake Team" />

 

-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+                <TextBlock Grid.Row="2"

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

+                           Text="License:" />

+                <TextBox Grid.Row="3"

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

+                         HorizontalAlignment="Stretch"

+                         VerticalAlignment="Stretch"

+                         IsReadOnly="True"

+                         TextWrapping="Wrap"

+                         VerticalScrollBarVisibility="Auto">

+                    This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

+                    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

+                    You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

                 </TextBox>

 

             </Grid>

         </Grid>

 

-        <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1">

-            <Button Content="Close" IsDefault="True" Micro:Message.Attach="[Event Click] = [Action Close]"

-                    HorizontalAlignment="Right" Padding="12,2" Margin="0,5,10,5" VerticalAlignment="Center" />

+        <StackPanel Grid.Row="1"

+                    HorizontalAlignment="Stretch"

+                    Background="LightGray">

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

+                    HorizontalAlignment="Right"

+                    VerticalAlignment="Center"

+                    Content="Close"

+                    IsDefault="True"

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

+                    Padding="12,2" />

         </StackPanel>

     </Grid>

 </Window>