Updated shortcuts and color styles

PicView/Shortcuts/MainShortcuts.cs

@@ -406,7 +406,6 @@ namespace PicView.Shortcuts
                         {
                             Paste();
                         }
-
                         break;
 
                     // Ctrl + I
@@ -415,7 +414,6 @@ namespace PicView.Shortcuts
                         {
                             SystemIntegration.NativeMethods.ShowFileProperties(Pics[FolderIndex]);
                         }
-
                         break;
 
                     // Ctrl + P
@@ -424,7 +422,6 @@ namespace PicView.Shortcuts
                         {
                             Print(Pics[FolderIndex]);
                         }
-
                         break;
 
                     // Ctrl + R
@@ -513,6 +510,7 @@ namespace PicView.Shortcuts
 
                     // F5
                     case Key.F5:
+                        Slideshow.StartSlideshow();
                         break;
 
                     // F6
@@ -528,11 +526,6 @@ namespace PicView.Shortcuts
 #endif
                     // F11
                     case Key.F11:
-                        Slideshow.StartSlideshow();
-                        break;
-
-                    // F12
-                    case Key.F12:
                         Fullscreen_Restore();
                         break;
 

PicView/UI/Styles/Colors.xaml

@@ -23,10 +23,8 @@
     <SolidColorBrush x:Key="FadeColorBrush" Color="{StaticResource FadeColor}" />
 
     <!--  Background Color  -->
-    <Color x:Key="BackgroundColor">#FF1B1B1B</Color>
-    <SolidColorBrush x:Key="bgBackgroundColorBrush" Color="{StaticResource BackgroundColor}" />
-    <!--  Used for usercontrol menus  -->
-    <SolidColorBrush x:Key="BackgroundColorBrush" Color="#FF171717" />
+    <Color x:Key="BackgroundColor">#FF2e2e2e</Color>
+    <SolidColorBrush x:Key="BackgroundColorBrush" Color="{StaticResource BackgroundColor}" />
 
     <!--  Background Color Alt  -->
     <Color x:Key="BackgroundColorAlt">#F81F1F1F</Color>

PicView/UI/Styles/Menu.xaml

@@ -44,10 +44,10 @@
                 <ControlTemplate TargetType="{x:Type ContextMenu}">
                     <Border
                         x:Name="Border"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource NoisyBg}"
                         BorderBrush="{StaticResource BorderBrush}"
-                        BorderThickness="1"
-                        CornerRadius="2">
+                        BorderThickness="2"
+                        CornerRadius="4">
                         <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                     </Border>
                     <ControlTemplate.Triggers>
@@ -118,81 +118,6 @@
         </Setter>
     </Style>
 
-    <!--  ScrollViewer for a MenuItem  -->
-    <!--<Style
-        x:Key="MenuScrollViewer"
-        BasedOn="{x:Null}"
-        TargetType="{x:Type ScrollViewer}">
-        <Setter Property="HorizontalScrollBarVisibility" Value="Hidden" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="Template">
-            <Setter.Value>
-    -->
-    <!--<SnippetMenuScrollViewer>-->
-    <!--  ScrollViewer for a MenuItem  -->
-    <!--
-                <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                    <Grid SnapsToDevicePixels="True">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Border Grid.Row="1" Grid.Column="0">
-                            <ScrollContentPresenter Margin="0" />
-                        </Border>
-                        <RepeatButton
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Command="{x:Static ScrollBar.LineUpCommand}"
-                            CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                            Focusable="False"
-                            Style="{StaticResource MenuScrollButton}">
-                            <RepeatButton.Visibility>
-                                <MultiBinding
-                                    Converter="{StaticResource MenuScrollingVisibilityConverter}"
-                                    ConverterParameter="0"
-                                    FallbackValue="Visibility.Collapsed">
-                                    <Binding Path="ComputedVerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="VerticalOffset" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="ExtentHeight" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="ViewportHeight" RelativeSource="{RelativeSource TemplatedParent}" />
-                                </MultiBinding>
-                            </RepeatButton.Visibility>
-                            <Path Data="{StaticResource UpArrow}" Fill="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}" />
-                        </RepeatButton>
-                        <RepeatButton
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Command="{x:Static ScrollBar.LineDownCommand}"
-                            CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                            Focusable="False"
-                            Style="{StaticResource MenuScrollButton}">
-                            <RepeatButton.Visibility>
-                                <MultiBinding
-                                    Converter="{StaticResource MenuScrollingVisibilityConverter}"
-                                    ConverterParameter="100"
-                                    FallbackValue="Visibility.Collapsed">
-                                    <Binding Path="ComputedVerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="VerticalOffset" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="ExtentHeight" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="ViewportHeight" RelativeSource="{RelativeSource TemplatedParent}" />
-                                </MultiBinding>
-                            </RepeatButton.Visibility>
-                            <Path Data="{StaticResource DownArrow}" Fill="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}" />
-                        </RepeatButton>
-                    </Grid>
-                </ControlTemplate>
-    -->
-    <!--</SnippetMenuScrollViewer>-->
-    <!--
-            </Setter.Value>
-        </Setter>
-    </Style>-->
-
     <!--<SnippetMenuItem>-->
     <!--<Seperator>-->
     <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">
@@ -372,7 +297,7 @@
         <Border
             x:Name="Border"
             Padding="3"
-            Background="{StaticResource BackgroundColorBrush}">
+            Background="{StaticResource NoisyBg}">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" SharedSizeGroup="Icon" />
@@ -393,7 +318,7 @@
                 <TextBlock
                     x:Name="InputGestureText"
                     Grid.Column="2"
-                    Margin="5,2,0,2"
+                    Margin="0,2,0,2"
                     DockPanel.Dock="Right"
                     Foreground="{StaticResource MainColorFadedBrush}"
                     Text="{TemplateBinding InputGestureText}" />
@@ -417,9 +342,10 @@
                     <!--  Sub level border  -->
                     <Border
                         x:Name="SubmenuBorder"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource NoisyBg}"
                         BorderBrush="{StaticResource BorderBrush}"
-                        BorderThickness="1"
+                        BorderThickness="2"
+                        CornerRadius="1"
                         SnapsToDevicePixels="True">
                         <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                     </Border>

PicView/UI/Styles/ToolTip.xaml

@@ -7,8 +7,6 @@
         <Setter Property="FontFamily" Value="/PicView;component/Library/Resources/fonts/#TeX Gyre Heros" />
         <Setter Property="FontSize" Value="12" />
         <Setter Property="Foreground" Value="{StaticResource MainColorBrush}" />
-        <!--<Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#F90F0F0F" />-->
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToolTip">
@@ -16,13 +14,13 @@
                         Name="Border"
                         Width="{TemplateBinding Width}"
                         Height="{TemplateBinding Height}"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource BorderBrushAlt}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="1"
-                        CornerRadius="2">
+                        CornerRadius="3">
 
                         <ContentPresenter
-                            Margin="6"
+                            Margin="7"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top" />
                     </Border>

PicView/UI/UserControls/Menus/FileMenu.xaml

@@ -219,11 +219,11 @@
             Height="2"
             Margin="29,-2,0,0"
             HorizontalAlignment="Left"
-            Fill="{StaticResource BackgroundColorBrush}" />
+            Fill="{StaticResource BorderBrushAlt}" />
         <Polygon
             Margin="25,-7,0,0"
             Panel.ZIndex="-1"
-            Fill="{StaticResource BackgroundColorBrush}"
+            Fill="{StaticResource BorderBrushAlt}"
             Points="0,0 15,30, 30,0"
             Stroke="{StaticResource BorderBrush}"
             StrokeThickness="2" />

PicView/UI/UserControls/Menus/ImageSettings.xaml

@@ -71,7 +71,7 @@
                     BorderBrush="{x:Null}"
                     FontWeight="Bold"
                     Foreground="{x:Null}"
-                    ToolTip="Start Slideshow [F11]">
+                    ToolTip="Start Slideshow [F5]">
                     <Button.Background>
                         <SolidColorBrush x:Name="SlideshowButtonBrush" Color="{StaticResource BackgroundColorAlt}" />
                     </Button.Background>
@@ -253,11 +253,11 @@
             Height="2"
             Margin="33,-2,0,0"
             HorizontalAlignment="Left"
-            Fill="{StaticResource BackgroundColorBrush}" />
+            Fill="{StaticResource BorderBrushAlt}" />
         <Polygon
             Margin="30,-7,0,0"
             Panel.ZIndex="-1"
-            Fill="{StaticResource BackgroundColorBrush}"
+            Fill="{StaticResource BorderBrushAlt}"
             Points="0,0 15,30, 30,0"
             Stroke="{StaticResource BorderBrush}"
             StrokeThickness="2" />

PicView/UI/UserControls/Menus/QuickSettingsMenu.xaml

@@ -262,11 +262,11 @@
             Height="2"
             Margin="0,-2,46,0"
             HorizontalAlignment="Right"
-            Fill="{StaticResource BackgroundColorBrush}" />
+            Fill="{StaticResource BorderBrushAlt}" />
         <Polygon
             Margin="244,-7,0,0"
             Panel.ZIndex="-1"
-            Fill="{StaticResource BackgroundColorBrush}"
+            Fill="{StaticResource BorderBrushAlt}"
             Points="0,0 15,30, 30,0"
             Stroke="{StaticResource BorderBrush}"
             StrokeThickness="2" />

PicView/UI/UserControls/Menus/ToolsAndEffectsMenu.xaml

@@ -231,11 +231,11 @@
             Height="2"
             Margin="308,-2,0,0"
             HorizontalAlignment="Left"
-            Fill="{StaticResource BackgroundColorBrush}" />
+            Fill="{StaticResource BorderBrushAlt}" />
         <Polygon
             Margin="305,-7,0,0"
             Panel.ZIndex="-1"
-            Fill="{StaticResource BackgroundColorBrush}"
+            Fill="{StaticResource BorderBrushAlt}"
             Points="0,0 15,30, 30,0"
             Stroke="{StaticResource BorderBrush}"
             StrokeThickness="2" />

PicView/UI/Windows/InfoWindow.xaml.cs

@@ -27,7 +27,6 @@ namespace PicView.UI.Windows
         {
             KeyDown += KeysDown;
             KeyUp += KeysUp;
-            FlowDoc.PreviewMouseWheel += Info_MouseWheel;
             Scroller.MouseWheel += Info_MouseWheel;
 
             // CloseButton