1.3.0

ChiNoel-osu · Jun 15, 2023 · e1b8e90 · e1b8e90
1 parent d31093b
commit e1b8e90
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 34 deletions.
diff --git a/FolderThumbnailExplorer.csproj b/FolderThumbnailExplorer.csproj
@@ -75,6 +75,9 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
+    <None Update="LICENSE-CC-BY-NC-SA">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="NLog.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/Localization/Loc.Designer.cs b/Localization/Loc.Designer.cs
diff --git a/Localization/Loc.resx b/Localization/Loc.resx
@@ -256,7 +256,11 @@ Select the last image in list to continue loading.</value>
   <data name="Copied2Clipboard" xml:space="preserve">
     <value>Copied to clipboard.</value>
   </data>
-  <data name="PVScrollSpeed" xml:space="preserve">
+  <data name="PVPopUpSettingsScrollSpeed" xml:space="preserve">
     <value>Scroll Speed Factor</value>
   </data>
+  <data name="PVPopUpSettingsScrollSpeedTT" xml:space="preserve">
+    <value>Indicates how fast the scrolling is.
+Negative value = Reverse scrolling direction.</value>
+  </data>
 </root>
diff --git a/Localization/Loc.zh-CN.resx b/Localization/Loc.zh-CN.resx
@@ -256,7 +256,11 @@ Esc - 关闭图片浏览器.</value>
   <data name="Copied2Clipboard" xml:space="preserve">
     <value>已复制到剪贴板.</value>
   </data>
-  <data name="PVScrollSpeed" xml:space="preserve">
+  <data name="PVPopUpSettingsScrollSpeed" xml:space="preserve">
     <value>滚动速度倍率</value>
   </data>
+  <data name="PVPopUpSettingsScrollSpeedTT" xml:space="preserve">
+    <value>代表滚动的速度快慢.
+负值则为反向滚动.</value>
+  </data>
 </root>
diff --git a/Model/WheelSpeedScrollViewer.cs b/Model/WheelSpeedScrollViewer.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;

diff --git a/View/ImageControl.xaml b/View/ImageControl.xaml
@@ -148,6 +148,9 @@
 							<TextBlock Text="{x:Static loc:Loc.PVPopUpSettingsSlideshowInterval}"
 									   Foreground="White" />
 							<TextBox Name="SlideInterval"
+									 Background="Transparent"
+									 Foreground="White"
+									 CaretBrush="Azure"
 									 Text="{Binding SlideInterval, UpdateSourceTrigger=PropertyChanged}"
 									 VerticalContentAlignment="Center"
 									 HorizontalContentAlignment="Center"
@@ -156,26 +159,15 @@
 									 MinWidth="20">
 								<TextBox.Style>
 									<Style TargetType="{x:Type TextBox}">
-										<Setter Property="Background"
-												Value="Transparent" />
-										<Setter Property="Foreground"
-												Value="White" />
-										<Setter Property="CaretBrush"
-												Value="Azure" />
 										<Style.Triggers>
-											<Trigger Property="Validation.HasError"
-													 Value="True">
-												<Setter Property="BorderBrush"
-														Value="Red" />
-												<Setter	Property="ToolTip"
-														Value="{x:Static loc:Loc.PVPopUpSettingsSlideshowValueError}" />
-											</Trigger>
-											<Trigger Property="Validation.HasError"
-													 Value="False">
+											<DataTrigger Binding="{Binding Path=(Validation.HasError), RelativeSource={RelativeSource Self}}"
+														 Value="True">
 												<Setter Property="ToolTip"
-														Value="{x:Static loc:Loc.PVPopUpSettingsSlideshowValue}" />
-											</Trigger>
+														Value="{x:Static loc:Loc.PVPopUpSettingsSlideshowValueError}" />
+											</DataTrigger>
 										</Style.Triggers>
+										<Setter Property="ToolTip"
+												Value="{x:Static loc:Loc.PVPopUpSettingsSlideshowValue}" />
 									</Style>
 								</TextBox.Style>
 							</TextBox>
@@ -248,11 +240,13 @@
 									  Command="{Binding LoadScrollViewCommand}"
 									  Style="{DynamicResource ToggleButtonTemplateStyle}" />
 					</DockPanel>
-					<DockPanel Margin="8,-8,0,0" LastChildFill="True">
-						<TextBlock Text="{x:Static loc:Loc.PVScrollSpeed}"
-								   ToolTip="{x:Static loc:Loc.PVScrollSpeed}"
+					<DockPanel Margin="8,-8,0,0"
+							   LastChildFill="True">
+						<TextBlock Text="{x:Static loc:Loc.PVPopUpSettingsScrollSpeed}"
+								   ToolTip="{x:Static loc:Loc.PVPopUpSettingsScrollSpeed}"
 								   Foreground="White" />
 						<TextBox Text="{Binding ScrollFactor, UpdateSourceTrigger=PropertyChanged}"
+								 ToolTip="{x:Static loc:Loc.PVPopUpSettingsScrollSpeedTT}"
 								 Background="Transparent"
 								 Foreground="White"
 								 CaretBrush="Azure"

diff --git a/ViewModel/PhotoViewerViewModel.cs b/ViewModel/PhotoViewerViewModel.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -63,6 +62,7 @@ public double ScrollFactor
 			{
 				Properties.Settings.Default.PV_ScrollSpeedFactor = value;
 				Properties.Settings.Default.Save();
+				OnPropertyChanged(nameof(ScrollFactor));
 			}
 		}