diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index cb1a1b0b..326b990f 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -854,8 +854,8 @@ - - + + diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index a0aa7de4..ead43a37 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -301,6 +301,11 @@ private void Window_Loaded(object sender, RoutedEventArgs e) if (response.Contains("Special Version") && !File.Exists(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Versions.ini")) { LogHelper.WriteLogToFile("Welcome Window Show Dialog", LogHelper.LogType.Event); + + if (response.Contains("Special Version Alhua")) + { + WelcomeWindow.IsNewBuilding = true; + } new WelcomeWindow().ShowDialog(); } else @@ -310,6 +315,16 @@ private void Window_Loaded(object sender, RoutedEventArgs e) lastVersion = File.ReadAllText(System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "Versions.ini"); } catch { } + if (response.Contains("Special Version") && !lastVersion.Contains("3.2.5.0")) + { + LogHelper.WriteLogToFile("Welcome Window Show Dialog (Second time)", LogHelper.LogType.Event); + + if (response.Contains("Special Version Alhua")) + { + WelcomeWindow.IsNewBuilding = true; + } + new WelcomeWindow().ShowDialog(); + } if (!lastVersion.Contains(version.ToString())) { LogHelper.WriteLogToFile("Change Log Window Show Dialog", LogHelper.LogType.Event); @@ -1036,7 +1051,7 @@ private void ToggleSwitchModeFinger_Toggled(object sender, RoutedEventArgs e) ToggleSwitchAutoEnterModeFinger.IsOn = ToggleSwitchModeFinger.IsOn; if (ToggleSwitchModeFinger.IsOn) { - BoundsWidth = 10; //35 + BoundsWidth = 15; //35 } else { diff --git a/Ink Canvas/Properties/AssemblyInfo.cs b/Ink Canvas/Properties/AssemblyInfo.cs index 220572a8..ad592545 100644 --- a/Ink Canvas/Properties/AssemblyInfo.cs +++ b/Ink Canvas/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.4.0")] -[assembly: AssemblyFileVersion("3.2.4.0")] +[assembly: AssemblyVersion("3.2.5.0")] +[assembly: AssemblyFileVersion("3.2.5.0")] diff --git a/Ink Canvas/WelcomeWindow.xaml b/Ink Canvas/WelcomeWindow.xaml index 10e21f82..6b1349c0 100644 --- a/Ink Canvas/WelcomeWindow.xaml +++ b/Ink Canvas/WelcomeWindow.xaml @@ -6,7 +6,7 @@ xmlns:local="clr-namespace:Ink_Canvas" xmlns:ui="http://schemas.modernwpf.com/2019" mc:Ignorable="d" Topmost="True" ResizeMode="NoResize" ui:WindowHelper.UseModernWindowStyle="True" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei UI" Closing="Window_Closing" - Title="欢迎向导 - Ink Canvas 画板" Height="250" Width="400"> + Title="欢迎向导 - Ink Canvas 画板" Height="280" Width="400" Loaded="Window_Loaded"> @@ -20,6 +20,7 @@ +