Browse Source

Merge branch 'dev' of https://github.com/Ruben2776/PicView into dev

Ruben 2 years ago
parent
commit
410c43d658
3 changed files with 28 additions and 22 deletions
  1. 5 0
      .github/README.md
  2. 2 2
      PicView/PicView.csproj
  3. 21 20
      PicView/Views/Windows/SettingsWindow.xaml

+ 5 - 0
.github/README.md

@@ -191,6 +191,7 @@ Rename or move files in the titlebar by pressing `F2` or right clicking it.
 | F7                   | Reset Zoom                                                                                                       |
 | F9                   | Open the batch resize window                                                                                     |
 | F11                  | Toggle fulscreen                                                                                                 |
+| F12                  | Toggle viewing fulscreen gallery                                                                                 |
 | Alt + Enter          | Toggle fulscreen                                                                                                 |
 | C                    | Crop Image                                                                                                       |
 | Ctrl + C             | Copy image or copy cropped image                                                                                 |
@@ -232,6 +233,10 @@ Rename or move files in the titlebar by pressing `F2` or right clicking it.
 | Right                | Navigate to next image                                                                                           |
 | Ctrl + D             | Navigate to last image                                                                                           |
 | Ctrl + Right         | Navigate to first image                                                                                          |
+| Ctrl + Shift + Right | Navigate to next folder                                                                                          |
+| Ctrl + Shift + Left  | Navigate to previous folder                                                                                      |
+| Ctrl + Shift + D     | Navigate to next folder                                                                                          |
+| Ctrl + Shift + A     | Navigate to previous folder                                                                                      |
 | Up ⇔ W              | Rotates the image up (clockwise)                                                                                 |
 | Up ⇔ W              | Scrolls up when scrolling is enabled                                                                             |
 | PageUp               | Scrolls up when scrolling is enabled                                                                             |

+ 2 - 2
PicView/PicView.csproj

@@ -359,7 +359,7 @@
   </ItemGroup>
 	
   <PropertyGroup>
-    <FileVersion>1.8.1</FileVersion>
+    <FileVersion>1.8.5</FileVersion>
     <SignAssembly>False</SignAssembly>
     <Copyright>© Ruben Hyldgaard Negendahl</Copyright>
     <PackageProjectUrl>https://PicView.org</PackageProjectUrl>
@@ -370,7 +370,7 @@
     <Authors>Ruben2776</Authors>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageIcon>icon-raster.128b.png</PackageIcon>
-    <AssemblyVersion>1.8.1</AssemblyVersion>
+    <AssemblyVersion>1.8.5</AssemblyVersion>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
     <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>

+ 21 - 20
PicView/Views/Windows/SettingsWindow.xaml

@@ -240,6 +240,27 @@
                         </CheckBox.Content>
                     </CheckBox>
 
+                    <CheckBox
+                        x:Name="SaveDialogRadio"
+                        Margin="0,1,0,0"
+                        Padding="5,0,0,0"
+                        HorizontalContentAlignment="Center"
+                        Focusable="False"
+                        IsChecked="True">
+                        <CheckBox.Foreground>
+                            <SolidColorBrush x:Name="SaveDialogText" Color="{StaticResource MainColor}" />
+                        </CheckBox.Foreground>
+                        <CheckBox.Content>
+                            <TextBlock
+                                Width="279"
+                                Focusable="False"
+                                FontFamily="/PicView;component/Themes/Resources/fonts/#Roboto"
+                                FontSize="13"
+                                Text="{StaticResource ShowFileSavingDialog}"
+                                TextWrapping="Wrap" />
+                        </CheckBox.Content>
+                    </CheckBox>
+
                     <Label
                         x:Name="LanguageLabel"
                         Margin="0,15,0,0"
@@ -513,26 +534,6 @@
                         </CheckBox.Content>
                     </CheckBox>
 
-                    <CheckBox
-                        x:Name="SaveDialogRadio"
-                        Margin="7,0,0,0"
-                        HorizontalContentAlignment="Center"
-                        Focusable="False"
-                        IsChecked="True">
-                        <CheckBox.Foreground>
-                            <SolidColorBrush x:Name="SaveDialogText" Color="{StaticResource MainColor}" />
-                        </CheckBox.Foreground>
-                        <CheckBox.Content>
-                            <TextBlock
-                                Width="279"
-                                Focusable="False"
-                                FontFamily="/PicView;component/Themes/Resources/fonts/#Roboto"
-                                FontSize="13"
-                                Text="{StaticResource ShowFileSavingDialog}"
-                                TextWrapping="Wrap" />
-                        </CheckBox.Content>
-                    </CheckBox>
-
 
                     <CheckBox
                         x:Name="ShowBottomRadio"