Bläddra i källkod

Update shortcuts

Ruben 4 år sedan
förälder
incheckning
3004db7e87
2 ändrade filer med 87 tillägg och 34 borttagningar
  1. 9 0
      PicView/Shortcuts/MainKeyboardShortcuts.cs
  2. 78 34
      PicView/Views/Windows/InfoWindow.xaml

+ 9 - 0
PicView/Shortcuts/MainKeyboardShortcuts.cs

@@ -444,6 +444,10 @@ namespace PicView.Shortcuts
                         {
                         {
                             ProcessHandling.ProcessLogic.StartNewProcess();
                             ProcessHandling.ProcessLogic.StartNewProcess();
                         }
                         }
+                        else
+                        {
+                            ConfigureWindows.ResizeWindow();
+                        }
                         break;
                         break;
 
 
                     // G
                     // G
@@ -545,6 +549,11 @@ namespace PicView.Shortcuts
                         ResetZoom();
                         ResetZoom();
                         break;
                         break;
 
 
+                    // F9
+                    case Key.F9:
+                        ResizeWindow();
+                        break;
+
                     // F11
                     // F11
                     case Key.F11:
                     case Key.F11:
                         UILogic.Sizing.WindowSizing.Fullscreen_Restore();
                         UILogic.Sizing.WindowSizing.Fullscreen_Restore();

+ 78 - 34
PicView/Views/Windows/InfoWindow.xaml

@@ -1855,6 +1855,7 @@
                         <RowDefinition />
                         <RowDefinition />
                         <RowDefinition />
                         <RowDefinition />
                         <RowDefinition />
                         <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
                     </Grid.RowDefinitions>
 
 
                     <Border
                     <Border
@@ -1963,6 +1964,7 @@
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,0,1,0" />
                         BorderThickness="0,0,1,0" />
 
 
+
                     <Border
                     <Border
                         Grid.Row="3"
                         Grid.Row="3"
                         Grid.Column="0"
                         Grid.Column="0"
@@ -1972,9 +1974,8 @@
                         BorderThickness="1,0,1,0">
                         BorderThickness="1,0,1,0">
                         <TextBlock
                         <TextBlock
                             Margin="10,3,0,3"
                             Margin="10,3,0,3"
-                            d:Text="Close"
                             FontSize="12"
                             FontSize="12"
-                            Text="{StaticResource ResourceKey=Close}" />
+                            Text="{StaticResource ResourceKey=BatchResize}" />
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
@@ -1984,6 +1985,49 @@
                         Background="{StaticResource BackgroundColorBrush}"
                         Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,0,1,0">
                         BorderThickness="0,0,1,0">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Text="N" />
+                    </Border>
+
+                    <Border
+                        Grid.Row="3"
+                        Grid.Column="2"
+                        Padding="0,3,0,3"
+                        Background="{StaticResource BackgroundColorBrush}"
+                        BorderBrush="{StaticResource BorderBrush}"
+                        BorderThickness="0,0,1,0" >
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Text="F9" />
+                    </Border>
+
+
+                    <Border
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Padding="0,3,0,3"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        BorderBrush="{StaticResource BorderBrush}"
+                        BorderThickness="1,0,1,0">
+                        <TextBlock
+                            Margin="10,3,0,3"
+                            d:Text="Close"
+                            FontSize="12"
+                            Text="{StaticResource ResourceKey=Close}" />
+                    </Border>
+
+                    <Border
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Padding="0,3,0,3"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        BorderBrush="{StaticResource BorderBrush}"
+                        BorderThickness="0,0,1,0">
                         <TextBlock
                         <TextBlock
                             HorizontalAlignment="Center"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             VerticalAlignment="Center"
@@ -1994,10 +2038,10 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="3"
+                        Grid.Row="4"
                         Grid.Column="2"
                         Grid.Column="2"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,0,1,0">
                         BorderThickness="0,0,1,0">
                         <StackPanel
                         <StackPanel
@@ -2015,10 +2059,10 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="4"
+                        Grid.Row="5"
                         Grid.Column="0"
                         Grid.Column="0"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="1,1,1,0">
                         BorderThickness="1,1,1,0">
                         <TextBlock
                         <TextBlock
@@ -2029,10 +2073,10 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="4"
+                        Grid.Row="5"
                         Grid.Column="1"
                         Grid.Column="1"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,1,1,0">
                         BorderThickness="0,1,1,0">
                         <StackPanel
                         <StackPanel
@@ -2055,18 +2099,18 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="4"
+                        Grid.Row="5"
                         Grid.Column="2"
                         Grid.Column="2"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,1,1,0" />
                         BorderThickness="0,1,1,0" />
 
 
                     <Border
                     <Border
-                        Grid.Row="5"
+                        Grid.Row="6"
                         Grid.Column="0"
                         Grid.Column="0"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="1,0,1,0">
                         BorderThickness="1,0,1,0">
                         <TextBlock
                         <TextBlock
@@ -2077,10 +2121,10 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="5"
+                        Grid.Row="6"
                         Grid.Column="1"
                         Grid.Column="1"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,0,1,0">
                         BorderThickness="0,0,1,0">
                         <TextBlock
                         <TextBlock
@@ -2092,18 +2136,18 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="5"
+                        Grid.Row="6"
                         Grid.Column="2"
                         Grid.Column="2"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,0,1,0" />
                         BorderThickness="0,0,1,0" />
 
 
                     <Border
                     <Border
-                        Grid.Row="6"
+                        Grid.Row="7"
                         Grid.Column="0"
                         Grid.Column="0"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="1,1,1,1">
                         BorderThickness="1,1,1,1">
                         <TextBlock
                         <TextBlock
@@ -2113,10 +2157,10 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="6"
+                        Grid.Row="7"
                         Grid.Column="1"
                         Grid.Column="1"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,1,1,1">
                         BorderThickness="0,1,1,1">
                         <StackPanel
                         <StackPanel
@@ -2133,18 +2177,18 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="6"
+                        Grid.Row="7"
                         Grid.Column="2"
                         Grid.Column="2"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,1,1,1" />
                         BorderThickness="0,1,1,1" />
 
 
                     <Border
                     <Border
-                        Grid.Row="7"
+                        Grid.Row="8"
                         Grid.Column="0"
                         Grid.Column="0"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="1,1,1,1">
                         BorderThickness="1,1,1,1">
                         <TextBlock
                         <TextBlock
@@ -2154,10 +2198,10 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="7"
+                        Grid.Row="8"
                         Grid.Column="1"
                         Grid.Column="1"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,1,1,1">
                         BorderThickness="0,1,1,1">
                         <StackPanel
                         <StackPanel
@@ -2174,18 +2218,18 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="7"
+                        Grid.Row="8"
                         Grid.Column="2"
                         Grid.Column="2"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundColorBrush}"
+                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,1,1,1" />
                         BorderThickness="0,1,1,1" />
 
 
                     <Border
                     <Border
-                        Grid.Row="8"
+                        Grid.Row="9"
                         Grid.Column="0"
                         Grid.Column="0"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="1,1,1,1">
                         BorderThickness="1,1,1,1">
                         <TextBlock
                         <TextBlock
@@ -2195,10 +2239,10 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="8"
+                        Grid.Row="9"
                         Grid.Column="1"
                         Grid.Column="1"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,1,1,1">
                         BorderThickness="0,1,1,1">
                         <TextBlock
                         <TextBlock
@@ -2209,10 +2253,10 @@
                     </Border>
                     </Border>
 
 
                     <Border
                     <Border
-                        Grid.Row="8"
+                        Grid.Row="9"
                         Grid.Column="2"
                         Grid.Column="2"
                         Padding="0,3,0,3"
                         Padding="0,3,0,3"
-                        Background="{StaticResource BackgroundSubtleHighlightBrush}"
+                        Background="{StaticResource BackgroundColorBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderBrush="{StaticResource BorderBrush}"
                         BorderThickness="0,1,1,1" />
                         BorderThickness="0,1,1,1" />