WinGui: (WPF) Numerous fixes / UI tweaks.

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

2 files changed, 33 insertions, 16 deletions

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index af9e27a7b..e6a4e6997 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -3,8 +3,9 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework" 

         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

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

-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" Title="{Data:Binding Path=WindowTitle}" Height="655" Width="1015" FontSize="11" Background="#FFF0F0F0"

+        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" Title="{Data:Binding Path=WindowTitle}" Height="625" Width="1015" FontSize="11" Background="#FFF0F0F0"

         Micro:Message.Attach="[Event Loaded] = [Action Load]"

+        UseLayoutRounding="True"

         AllowDrop="True">

 

     <i:Interaction.Triggers>

@@ -74,14 +75,30 @@
                     </MenuItem>

 

                     <MenuItem Header="Tools">

-                        <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]" />

-                        <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]" />

+                        <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]" >

+                            <MenuItem.Icon>

+                                <Image Source="Images/Queue_Small.png" Width="16" />

+                            </MenuItem.Icon>

+                        </MenuItem>

+                        <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]" >

+                            <MenuItem.Icon>

+                                <Image Source="Images/Output_Small.png" Width="16" />

+                            </MenuItem.Icon>

+                        </MenuItem>

                         <Separator />

-                        <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]" />

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

+                            <MenuItem.Icon>

+                                <Image Source="Images/Pref_Small.png" Width="16" />

+                            </MenuItem.Icon>

+                        </MenuItem>

                     </MenuItem>

 

                     <MenuItem Header="Help">

-                        <MenuItem Header="HandBrake User Guide" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" />

+                        <MenuItem Header="HandBrake User Guide" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" >

+                            <MenuItem.Icon>

+                                <Image Source="Images/Help16.png" Width="16" />

+                            </MenuItem.Icon>

+                        </MenuItem>

                         <Separator />

                         <MenuItem Header="Check for Updates" Micro:Message.Attach="[Event Click] = [Action CheckForUpdates]" />

                         <Separator />

@@ -135,21 +152,21 @@
 

                     <Button Name="Stop" Micro:Message.Attach="[Event Click] = [Action StopEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">

                         <StackPanel Orientation="Horizontal">

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

+                            <Image Source="Images/stop.png" Height="32" Width="32" SnapsToDevicePixels="True" />

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

                         </StackPanel>

                     </Button>

 

                     <Button Name="AddToQueue"  Micro:Message.Attach="[Event Click] = [Action AddToQueue]">

                         <StackPanel Orientation="Horizontal">

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

+                            <Image Source="Images/AddToQueue.png" Height="32" Width="32" SnapsToDevicePixels="True" />

                             <Label Content="Add To Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />

                         </StackPanel>

                     </Button>

 

                     <Button Name="ShowQueue"  Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">

                         <StackPanel Orientation="Horizontal">

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

+                            <Image Source="Images/Queue.png" Height="32" Width="32" SnapsToDevicePixels="True" />

                             <Label Content="Show Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />

                         </StackPanel>

                     </Button>

@@ -158,7 +175,7 @@
 

                     <Button Name="Preview" Micro:Message.Attach="[Event Click] = [Action OpenPreviewWindow]">

                         <StackPanel Orientation="Horizontal">

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

+                            <Image Source="Images/window.png" Height="32" Width="32" SnapsToDevicePixels="True" />

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

                         </StackPanel>

                     </Button>

@@ -236,7 +253,7 @@
                     </StackPanel>

 

                     <!-- Tab Control -->

-                    <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="330" Margin="10,10,10,10" Name="tabControl" >

+                    <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="300" Margin="10,10,10,10" Name="tabControl" >

                         <TabItem Header="Picture" Name="pictureTab">

                             <ContentControl x:Name="PictureSettingsViewModel" ></ContentControl>

                         </TabItem>

@@ -268,7 +285,7 @@
                         <StackPanel Orientation="Vertical">

 

                             <TreeView ItemsSource="{Binding Source={StaticResource presetsCvs}, Path=Groups}" 

-                                      ItemTemplate="{StaticResource presetsCategoryTemplate}" Width="240" Height="460"

+                                      ItemTemplate="{StaticResource presetsCategoryTemplate}" Width="240" Height="430"

                                       >

                                 <i:Interaction.Triggers>

                                     <i:EventTrigger EventName="SelectedItemChanged">

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index cc5d5f775..6852e5704 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="HandBrakeWPF.Views.OptionsView"

         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:Helpers="clr-namespace:HandBrakeWPF.Helpers" Title="{Binding Title}" MinWidth="620" MinHeight="600" Width="620" Height="600">

+        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers" Title="{Binding Title}" MinWidth="620" MinHeight="545" Width="620" Height="545">

 

     <Window.Resources>

         <Style TargetType="Button">

@@ -35,7 +35,7 @@
         </StackPanel>

 

         <!-- Options Panel-->

-        <TabControl Margin="10,10,10,10" Height="460">

+        <TabControl Margin="10,10,10,10" Height="405">

             <TabItem Header="General">

                 <StackPanel Orientation="Vertical">

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

@@ -178,7 +178,7 @@
 

                         <TextBlock Text="Additional Tracks:" Grid.Column="0"/>

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

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

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

                                 <Grid.ColumnDefinitions>

                                     <ColumnDefinition Width="*" />

                                     <ColumnDefinition Width="*" />

@@ -189,7 +189,7 @@
                                 <StackPanel Orientation="Vertical" Grid.Column="0">

                                     <TextBlock Text="Available Langauges" Margin="0,0,0,5"/>

                                     <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 

-                                             SelectionMode="Extended" Width="140" Height="160"></ListBox>

+                                             SelectionMode="Extended" Width="140" Height="140"></ListBox>

                                 </StackPanel>

 

                                 <DockPanel Grid.Column="1" Margin="10,0,10,0">

@@ -207,7 +207,7 @@
                                 <StackPanel Orientation="Vertical" Grid.Column="2">

                                     <TextBlock Text="Selected Langauges"  Margin="0,0,0,5"/>

                                     <ListBox Name="selectedLangauges" ItemsSource="{Binding SelectedLangauges}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 

-                                             SelectionMode="Extended" Width="140" Height="160" />

+                                             SelectionMode="Extended" Width="140" Height="140" />

                                 </StackPanel>

 

                                 <DockPanel Grid.Column="3" Margin="10,0,10,0">