v1.1.0.316

Author: zdy1988

README.md

@@ -6,6 +6,41 @@ ZHAI PICTURE VIEW build for .Net 6
 
 ![Snapshot](/Snapshot.jpg)
 
+![Snapshot](/Snapshot2.jpg)
+
+## Future
+
+- [x] Dragging
+- [x] Rotate Left/Right
+- [x] Zoom In/Out
+- [x] Zoom In/Out based on a point
+- [x] Double click to zoom in
+- [x] Thumb list
+- [x] Thumb map
+- [x] Auto Play
+- [x] Print Picture
+- [x] Delete Picture
+- [x] Prev Picture
+- [x] Next Picture
+- [x] Prev Picture Floder
+- [x] Next Picture Floder
+- [x] Exif
+- [x] Effects
+- [x] Gallery
+
+## Shortcuts
+
+| Keys      | Description |
+| ----------- | ----------- |
+| Key.Left      | Prev Picture or Prev Picture Floder     |
+| Key.Right   | Next Picture or Next Picture Floder       |
+| Key.Up or Key.OemPlus | Zoom In |
+| Key.Down or Key.OemMinus | Zoom Out |
+| Key.OemPeriod | Rotate Right |
+| Key.OemComma | Rotate Left |
+| Key.Back | Reset |
+| Key.Tab | Show/Hide Gallery |
+
 ## File support
 
 ```
@@ -17,7 +52,7 @@ ZHAI PICTURE VIEW build for .Net 6
 
 RAW camera formats may be slower to load
 
-# Thanks
+## Thanks
 
 [Magick.NET](https://github.com/dlemstra/Magick.NET) 
 
@@ -27,4 +62,6 @@ RAW camera formats may be slower to load
 
 [Pfim](https://nickbabcock.github.io/Pfim/)
 
-[SkiaSharp](https://github.com/mono/SkiaSharp)
+[SkiaSharp](https://github.com/mono/SkiaSharp)
+
+[VirtualizingWrapPanel](https://github.com/sbaeumlisberger/VirtualizingWrapPanel)

Snapshot2.jpg

@@ -1,3 +1,7 @@
+v1.1.0.316
+1.新增画廊功能
+2.新增开屏状态设置
+
 v1.1.0.304
 1.优化了列表加载
 2.增加图片文件拖入打开功能

changelog.txt

@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Zhai.PictureView"
+        xmlns:wpftk="clr-namespace:WpfToolkit.Controls;assembly=VirtualizingWrapPanel"
         xmlns:Controls="clr-namespace:Zhai.PictureView.Controls"
         xmlns:XamlServices="clr-namespace:Zhai.PictureView.XamlServices"
         Title="{Binding CurrentPicture, Converter={StaticResource PictureViewTitleConverter}}" 
@@ -357,7 +358,7 @@
                 </DockPanel>
             </Border>
         </Grid>
-        <Grid Grid.ColumnSpan="3" Grid.Row="2">
+        <Grid Grid.ColumnSpan="3" Grid.Row="2" x:Name="PictureController">
             <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal" Margin="8">
                 <StackPanel Orientation="Horizontal" IsEnabled="{Binding CurrentPicture, Converter={StaticResource NullableToBoolConverter}}">
                     <Button x:Name="PictureListViewToggleButton" Click="PictureListViewToggleButton_Click">
@@ -425,7 +426,7 @@
                         <Path Data="{StaticResource Icon.RotateRight}"/>
                     </Button>
                     <Button x:Name="AutoPlayButton" Click="AutoPlayButton_Click" ToolTip="自动播放"
-                            Visibility="{Binding IsShowPictureListView, Converter={StaticResource BoolToVisibilityConverter}}">
+                            Visibility="{Binding CanPictureCarouselPlay, Converter={StaticResource BoolToVisibilityConverter}}">
                         <Button.Style>
                             <Style TargetType="{x:Type Button}" BasedOn="{StaticResource PictureView.IconButton}">
                                 <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
@@ -480,5 +481,79 @@
                 </StackPanel>
             </StackPanel>
         </Grid>
+        <Grid Grid.ColumnSpan="3" Grid.RowSpan="3" x:Name="GalleryView" 
+              Background="{StaticResource PictureWindowPaperColorBrush}" 
+              Visibility="{Binding IsShowGallery, Converter={StaticResource BoolToVisibilityConverter}}">
+            <ListView ItemsSource="{Binding ElementName=PictureList, Path=Items}"
+                      SelectedItem="{Binding CurrentPicture}"
+                      Margin="3 36 3 8" Background="Transparent" BorderThickness="0"
+                      VirtualizingPanel.CacheLengthUnit="Item"
+                      VirtualizingPanel.ScrollUnit="Pixel"
+                      VirtualizingPanel.VirtualizationMode="Standard">
+                <ListBox.ItemContainerStyle>
+                    <Style TargetType="{x:Type ListBoxItem}">
+                        <Setter Property="Margin" Value="0"/>
+                        <Setter Property="Padding" Value="0"/>
+                        <Setter Property="BorderThickness" Value="2"/>
+                        <Setter Property="BorderBrush" Value="Transparent"/>
+                        <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
+                        <Setter Property="RenderTransform">
+                            <Setter.Value>
+                                <ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="0.95" ScaleY="0.95" />
+                            </Setter.Value>
+                        </Setter>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border BorderBrush="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter Property="RenderTransform">
+                                                <Setter.Value>
+                                                    <ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="1" ScaleY="1" />
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Trigger>
+                                        <Trigger Property="IsSelected" Value="True">
+                                            <Setter Property="BorderBrush" Value="DeepSkyBlue"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </ListBox.ItemContainerStyle>
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <wpftk:VirtualizingWrapPanel Orientation="Vertical" SpacingMode="StartAndEndOnly" StretchItems="True"/>
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Border Width="120" Height="120">
+                            <Image Stretch="Uniform" Source="{Binding ThumbSource}" ToolTip="{Binding Name}"
+                                   XamlServices:PictureService.Picture="{Binding}"/>
+                        </Border>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+            <Grid.Style>
+                <Style TargetType="{x:Type Grid}">
+                    <Style.Triggers>
+                        <Trigger Property="Visibility" Value="Visible">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:0.3"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </Grid.Style>
+        </Grid>
     </Grid>
 </local:PictureWindow>

src/MainWindow.xaml

@@ -4,13 +4,14 @@
 using System.IO;
 using System.Linq;
 using System.Security.AccessControl;
+using System.Threading;
 using System.Threading.Tasks;
-using System.Timers;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
 using System.Windows.Threading;
+using Timer = System.Timers.Timer;
 
 namespace Zhai.PictureView
 {
@@ -22,6 +23,8 @@ public MainWindow()
         {
             InitializeComponent();
 
+            InitializeMainWindow();
+
             Loaded += MainWindow_Loaded;
 
             ViewModel.CurrentPictureChanged += ViewModel_CurrentPictureChanged;
@@ -42,6 +45,16 @@ public MainWindow()
             VisualStateManager.GoToElementState(this.PictureEditView, ViewModel.IsShowPictureEditView ? "PictureEditViewShow" : "PictureEditViewHide", false);
         }
 
+        private void InitializeMainWindow()
+        {
+            var settings = Properties.Settings.Default;
+
+            if (settings.StartWindowMaximized)
+            {
+                this.WindowState = WindowState.Maximized;
+            }
+        }
+
         private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
             var arg = Application.Current.Properties["ArbitraryArgName"];
@@ -62,10 +75,10 @@ public async Task OpenPicture(DirectoryInfo dir, string filename = null, List<Di
 
                 ViewModel.Folder = newFolder;
                 await ViewModel.Folder.LoadAsync();
-                ViewModel.IsShowPictureListView = ViewModel.Folder?.Count > 1;
+                ViewModel.CanPictureCarouselPlay = ViewModel.Folder?.Count > 1;
                 ViewModel.CurrentPicture = (filename == null ? ViewModel.Folder : ViewModel.Folder.Where(t => t.PicturePath == filename)).FirstOrDefault();
 
-                oldFolder?.Clean();
+                ThreadPool.QueueUserWorkItem(_ => this.Dispatcher.Invoke(() => oldFolder?.Clean()));
 
                 ViewModel.IsShowPictureListView = ViewModel.Folder != null && ViewModel.Folder.Count > 1;
                 VisualStateManager.GoToElementState(this.PictureListView, ViewModel.IsShowPictureListView ? "PictureListViewShow" : "PictureListViewHide", false);
@@ -666,7 +679,10 @@ private void AutoPlayButton_Click(object sender, RoutedEventArgs e)
         {
             if (ViewModel.Folder == null || ViewModel.Folder.Count <= 1) return;
 
-            ViewModel.IsPictureCarouselPlaing = !ViewModel.IsPictureCarouselPlaing;
+            if (ViewModel.CanPictureCarouselPlay)
+            {
+                ViewModel.IsPictureCarouselPlaing = !ViewModel.IsPictureCarouselPlaing;
+            }
         }
 
         private void AdjustButton_Click(object sender, RoutedEventArgs e)
@@ -748,6 +764,10 @@ public void PressShortcutKey(object sender, KeyEventArgs e)
             {
                 ResetPicture();
             }
+            else if (e.Key == Key.Tab)
+            { 
+                ViewModel.IsShowGallery = !ViewModel.IsShowGallery;
+            }
         }
 
         private void MainWindow_PreviewKeyDown(object sender, KeyEventArgs e)

src/MainWindow.xaml.cs

@@ -100,6 +100,13 @@ public double Scale
             }
         }
 
+        private bool canPictureCarouselPlay = false;
+        public bool CanPictureCarouselPlay
+        {
+            get => canPictureCarouselPlay;
+            set => SetProperty(ref canPictureCarouselPlay, value);
+        }
+
         private bool isPictureCarouselPlaing = false;
         public bool IsPictureCarouselPlaing
         {
@@ -119,6 +126,13 @@ public bool IsPictureCarouselPlaing
             }
         }
 
+        private bool isShowGallery = false;
+        public bool IsShowGallery
+        {
+            get => isShowGallery;
+            set => SetProperty(ref isShowGallery, value);
+        }
+
         private PictureEffect currentPictureEffect;
         public PictureEffect CurrentPictureEffect
         {

src/PictureWindowViewModel.cs

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Zhai.PictureView.Properties" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="StartWindowMaximized" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>

src/Properties/Settings.Designer.cs

@@ -16,9 +16,17 @@
         <Grid Margin="13 36 12 16">
             <Border BorderBrush="#56EEEEEE" BorderThickness="1 0 0 0" Margin="60.5 0 0 0" Panel.ZIndex="-100"/>
             <TabControl TabStripPlacement="Left">
+                <TabItem Header="基本设置">
+                    <StackPanel Margin="12 8.5 0 0">
+                        <StackPanel Orientation="Horizontal" Margin="0 0 16 8">
+                            <TextBlock Margin="0 0 8 0" Text="启动时全屏显示"/>
+                            <CheckBox IsChecked="{Binding StartWindowMaximized}"/>
+                        </StackPanel>
+                    </StackPanel>
+                </TabItem>
                 <TabItem Header="文件关联">
-                    <StackPanel Margin="12 0 0 0">
-                        <TextBlock Text="设置默认使用ZDY ' PICTURE打开以下文件类型" Margin="-1 8 0 18"/>
+                    <StackPanel Margin="12 8.5 0 0">
+                        <TextBlock Text="设置默认使用ZDY ' PICTURE打开以下文件类型" Margin="-1 0 0 18"/>
                         <ItemsControl ItemsSource="{Binding AllSupported}" HorizontalAlignment="Left">
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>

src/Properties/Settings.settings

@@ -12,6 +12,20 @@ namespace Zhai.PictureView
 {
     internal class SettingsWindowViewModel: BaseViewModel
     {
+        private bool startWindowMaximized = Properties.Settings.Default.StartWindowMaximized;
+        public bool StartWindowMaximized
+        {
+            get => startWindowMaximized;
+            set
+            {
+                if (SetProperty(ref startWindowMaximized, value))
+                {
+                    Properties.Settings.Default.StartWindowMaximized = value;
+                    Properties.Settings.Default.Save();
+                }
+            }
+        }
+
         public List<PictureSupportedItem> AllSupported { get; }
 
         public SettingsWindowViewModel()