WinGui: (WPF) Further UI work on the new interface.

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

2 files changed, 77 insertions, 39 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index 0c8bf0ecb..1a86c7a76 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -1,30 +1,53 @@
 <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="AboutView" 

-        Height="270" Width="500">

+        Height="320" Width="600">

 

-    <StackPanel Orientation="Horizontal">

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

+    <Grid>

+        <Grid.RowDefinitions>

+            <RowDefinition Height="*"/>

+            <RowDefinition Height="Auto"/>

+        </Grid.RowDefinitions>

 

-        <StackPanel Orientation="Vertical">

-            <StackPanel Orientation="Horizontal" Margin="0,10,0,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>

-            <TextBlock Text="Copyright 2003-2011 HandBrake Team" />

+        <Grid Grid.Row="0">

+            <Grid.ColumnDefinitions>

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

 

-            <Label Content="License:" />

-            <TextBox Width="380" Height="125" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Margin="10,0,10,10">

-                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.

+            <Grid Grid.Column="1">

+                <Grid.RowDefinitions>

+                    <RowDefinition Height="Auto" />

+                    <RowDefinition Height="Auto" />

+                    <RowDefinition Height="Auto" />

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

+                

+                <TextBlock Text="Copyright 2003-2011 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.

 

 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>

+                </TextBox>

 

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

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

+            </Grid>

+        </Grid>

 

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

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

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

         </StackPanel>

-    </StackPanel>

+    </Grid>

 </Window>

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index d959c18d8..07f880ae5 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -45,18 +45,33 @@
                 <!-- ToolBar -->

                 <ToolBar Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  SnapsToDevicePixels="False">

 

-                    <Button Name="Source">

-                        <StackPanel Orientation="Horizontal">

-                            <Image Source="Images/Movies.png" Height="32" Width="32" />

-                            <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />

-                        </StackPanel>

-                        <Button.ContextMenu>

-                            <ContextMenu  >

-                                <MenuItem Header="Open Folder" Micro:Message.Attach="[Event Click] = [Action FolderScan]"/>

-                                <MenuItem Header="Open File" Micro:Message.Attach="[Event Click] = [Action FileScan]"/>

-                            </ContextMenu>

-                        </Button.ContextMenu>

-                    </Button>

+                    <Menu Background="Transparent" >

+                        <MenuItem>

+                            <MenuItem.Header>

+                                <StackPanel Orientation="Horizontal">

+                                    <Image Source="Images/Movies.png" Height="32" Width="32" />

+                                    <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />

+                                </StackPanel>

+                            </MenuItem.Header>

+

+                            <MenuItem Micro:Message.Attach="[Event Click] = [Action FolderScan]">

+                                <MenuItem.Header>

+                                    <StackPanel Orientation="Horizontal">

+                                        <Image Source="Images/folder.png" Height="20" Width="20" />

+                                        <Label Content="Open Folder"  Margin="8,0,0,0" VerticalAlignment="Center" />

+                                    </StackPanel>

+                                </MenuItem.Header>

+                            </MenuItem>

+                            <MenuItem Micro:Message.Attach="[Event Click] = [Action FileScan]">

+                                <MenuItem.Header>

+                                    <StackPanel Orientation="Horizontal">

+                                        <Image Source="Images/Movies.png" Height="20" Width="20" />

+                                        <Label Content="Open File"  Margin="8,0,0,0" VerticalAlignment="Center" />

+                                    </StackPanel>

+                                </MenuItem.Header>

+                            </MenuItem>

+                        </MenuItem>

+                    </Menu>

 

                     <Separator />

 

@@ -115,14 +130,14 @@
                             <ComboBox Name="Titles" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding ScannedSource.Titles}" SelectedItem="{Binding Path=SelectedTitle}" />

 

                             <Label Content="Angle" Margin="8,0,0,0" />

-                            <ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60"  SelectedItem="{Binding Path=CurrentTask.Angle}"/>

+                            <ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding Angles}"  SelectedItem="{Binding SelectedAngle}"/>

 

-                            <ComboBox Name="PointToPointMode" Margin="8,0,0,0" MinWidth="80" SelectedItem="{Binding Path=CurrentTask.PointToPointMode}" />

-                            <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" SelectedItem="{Binding Path=CurrentTask.StartPoint}" />

+                            <ComboBox Name="PointToPointMode" Margin="8,0,0,0" MinWidth="80" ItemsSource="{Binding RangeMode}" SelectedItem="{Binding SelectedPointToPoint}" />

+                            <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedStartPoint}" />

                             <Label Content="through" Margin="8,0,0,0" />

-                            <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" SelectedItem="{Binding Path=CurrentTask.EndPoint}" />

+                            <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedEndPoint}" />

                             <Label Content="Duration" Margin="8,0,0,0" />

-                            <Label Content="--:--:--" Margin="8,0,0,0" />

+                            <Label Content="{Binding Duration}" Margin="8,0,0,0" />

                         </StackPanel>

                     </StackPanel>

 

@@ -207,7 +222,7 @@
 

                             </Grid>

                         </TabItem>

-                        

+

                         <TabItem Header="Video" Name="videoTab">

                             <Grid Margin="10,5,0,0">

                                 <Grid.RowDefinitions>

@@ -225,12 +240,12 @@
                                     <StackPanel Orientation="Vertical" Grid.Column="0" >

 

                                         <TextBlock Text="Video" FontWeight="Bold" Margin="0,0,0,10"/>

-                                        

+

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

                                             <TextBlock Text="Video Codec:" Width="100" />

                                             <ComboBox Width="120"/>

                                         </StackPanel>

-                                        

+

                                         <StackPanel Orientation="Horizontal">

                                             <TextBlock Text="Franerate (FPS):" Width="100"/>

                                             <StackPanel Orientation="Vertical">

@@ -245,15 +260,15 @@
 

                                     <StackPanel Orientation="Vertical" Grid.Column="1" >

                                         <TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>

-                                                              

+

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

                                             <RadioButton Content="Constant Quality:" Margin="0,0,10,0"/>

                                             <TextBlock Text="0" Width="25" />

                                             <TextBlock Text="RF" FontWeight="Bold" />

                                         </StackPanel>

-                                        

+

                                         <Slider Width="240" Margin="0,0,0,20" />

-                                                        

+

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

                                             <RadioButton Content="Avg Bitrate (kbps):" Margin="0,0,10,0"/>

                                             <TextBox Width="75" />