WinGui: Further Minor UI tweaks. F1 Keyboard shortcut for Help.

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

5 files changed, 30 insertions, 12 deletions

diff --git a/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs b/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
index b351e71bd..06c566991 100644
--- a/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
@@ -96,6 +96,12 @@ namespace HandBrakeWPF.Commands
                     mainViewModel.FolderScan();

                 }

 

+                // Launch Help (F1)

+                if (gesture.Key == Key.F1)

+                {

+                    mainViewModel.LaunchHelp();

+                }

+

                 if (gesture.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift) && gesture.Key == Key.G)

                 {

                     GC.Collect();

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
index a47a70865..38e0d5913 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
@@ -50,6 +50,11 @@ namespace HandBrakeWPF.ViewModels.Interfaces
         bool AddToQueue();

 

         /// <summary>

+        /// The launch help.

+        /// </summary>

+        void LaunchHelp();

+

+        /// <summary>

         /// The select source window.

         /// </summary>

         void SelectSourceWindow();

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 018a1fce2..69505a83f 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -18,8 +18,8 @@
         <Converters:EnumComboConverter x:Key="enumComboConverter" />

 

         <Style TargetType="Button">

-            <Setter Property="FontWeight" Value="Bold" />

-            <Setter Property="Padding" Value="5,1" />

+

+            <Setter Property="Padding" Value="8,2" />

             <Setter Property="FontSize" Value="11.5" />

             <Setter Property="VerticalAlignment" Value="Center" />

             <Setter Property="MinHeight" Value="22" />

@@ -97,7 +97,7 @@
                   VerticalAlignment="Top"

                   >

                 <MenuItem Header="_File">

-                    <MenuItem Header="Choose Source" Micro:Message.Attach="[Event Click] = [Action SelectSourceWindow]" />

+                    <MenuItem Header="Choose Source" Micro:Message.Attach="[Event Click] = [Action SelectSourceWindow]" InputGestureText="Alt + O" />

                     <Separator />

                     <MenuItem Header="_Exit" Micro:Message.Attach="[Event Click] = [Action ExitApplication]"  InputGestureText="Alt + F4" />

                 </MenuItem>

@@ -122,7 +122,7 @@
                 </MenuItem>

 

 

-                <MenuItem Header="_Presets" x:Name="presetMenu">

+                <MenuItem Header="_Presets" x:Name="presetMenu" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">

                     <MenuItem Header="_Presets" ItemsSource="{Binding Presets}">

                         <MenuItem.ItemContainerStyle>

                             <Style TargetType="MenuItem">

@@ -150,7 +150,7 @@
                 </MenuItem>

 

                 <MenuItem Header="_Help">

-                    <MenuItem Header="_HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]">

+                    <MenuItem Header="_HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" InputGestureText="F1">

                         <MenuItem.Icon>

                             <Image Width="16" Height="16"  Source="Images/information.png" />

                         </MenuItem.Icon>

@@ -460,7 +460,7 @@
                     </TextBox>

                     <Button Name="DestinationBrowser"

                             Grid.Column="2"

-                            Margin="8,0,0,0"

+                            Margin="8,0,0,0" FontWeight="Bold"

                             Content="Browse"

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

                             />

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index a558cd525..cea1f5f98 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -7,8 +7,7 @@
 

     <UserControl.Resources>

         <Style TargetType="Button">

-            <Setter Property="FontWeight" Value="Bold" />

-            <Setter Property="Padding" Value="5,1" />

+            <Setter Property="Padding" Value="8,2" />

             <Setter Property="FontSize" Value="11.5" />

             <Setter Property="VerticalAlignment" Value="Center" />

             <Setter Property="MinHeight" Value="22" />

@@ -44,6 +43,7 @@
                 <x:Type TypeName="local:OptionsTab" />

             </ObjectDataProvider.MethodParameters>

         </ObjectDataProvider>

+

     </UserControl.Resources>

 

     <Grid>

@@ -59,7 +59,12 @@
         </Grid.RowDefinitions>

 

         <!-- Row 1 -->

-        <TextBlock Text="Options" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />

+        <StackPanel  Grid.Row="0" Grid.ColumnSpan="2" Orientation="Horizontal">

+            <TextBlock Text="Options" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />

+

+        </StackPanel>

+        

+   

 

         <Border BorderBrush="DarkGray"  Grid.Column="0" Grid.Row="1"  BorderThickness="0,0,1,0">

             <StackPanel Orientation="Vertical" Margin="11,5,-1,0">

@@ -370,7 +375,7 @@
             </StackPanel>

         </ScrollViewer>

 

-        <StackPanel HorizontalAlignment="Stretch" Grid.Row="2" Grid.ColumnSpan="2" >

+        <StackPanel HorizontalAlignment="Stretch" Grid.Row="2" Grid.Column="0" >

             <StackPanel.Style>

                 <Style TargetType="StackPanel">

                     <Style.Triggers>

@@ -381,8 +386,8 @@
                 </Style>

             </StackPanel.Style>

 

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

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

+            <Button Content="&#60; Back" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]" Style="{StaticResource }"

+                    HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" FontWeight="Bold" />

         </StackPanel>

     </Grid>

 

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
index ebfb1743d..7f8be26ab 100644
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
@@ -71,6 +71,8 @@ namespace HandBrakeWPF.Views
             this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.O, ModifierKeys.Alt)), new KeyGesture(Key.O, ModifierKeys.Alt)));     // Scan Window

             this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.O, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.O, ModifierKeys.Control | ModifierKeys.Shift))); // Scan a Folder

             this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.G, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.G, ModifierKeys.Control | ModifierKeys.Shift))); // Garbage Colleciton

+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.F1, ModifierKeys.None)), new KeyGesture(Key.F1, ModifierKeys.None))); // Help

+

 

             // Enable Windows 7 Taskbar progress indication.

             if (this.TaskbarItemInfo == null)