kriastans/InkCanvasForClass
kriastans/InkCanvasForClass
1
Fork 0
Code Issues 1 Actions Projects 1 Releases Wiki Activity

Update version number and release new version

Browse Source
This commit is contained in:
XY Wang 2021-10-31 00:26:10 +08:00
parent 9a9a77f73c
commit 29ba726144
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ink Canvas/App.xaml.cs
View File

@ -15,6 +15,8 @@ namespace Ink_Canvas
{ {
System.Threading.Mutex mutex; System.Threading.Mutex mutex;
public static string[] StartArgs = null;
public App() public App()
{ {
this.Startup += new StartupEventHandler(App_Startup); this.Startup += new StartupEventHandler(App_Startup);
@ -25,12 +27,11 @@ namespace Ink_Canvas
bool ret; bool ret;
mutex = new System.Threading.Mutex(true, "Ink_Canvas", out ret); mutex = new System.Threading.Mutex(true, "Ink_Canvas", out ret);
if (!ret) if (!ret && !e.Args.Contains("-m")) //-m multiple
{ {
MessageBox.Show("已有一个程序实例正在运行"); MessageBox.Show("已有一个程序实例正在运行");
Environment.Exit(0); Environment.Exit(0);
} }
} }
} }
} }

6
Ink Canvas/ChangeLogWindow.xaml
View File

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:Ink_Canvas" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" ShowInTaskbar="False" xmlns:local="clr-namespace:Ink_Canvas" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" ShowInTaskbar="False"
xmlns:ui="http://schemas.modernwpf.com/2019" FontFamily="Microsoft YaHei UI" Topmost="True" xmlns:ui="http://schemas.modernwpf.com/2019" FontFamily="Microsoft YaHei UI" Topmost="True"
mc:Ignorable="d" ui:WindowHelper.UseModernWindowStyle="True" Loaded="Window_Loaded" Closed="Window_Closed" mc:Ignorable="d" ui:WindowHelper.UseModernWindowStyle="True" Loaded="Window_Loaded" Closed="Window_Closed"
Title="" Height="250" Width="500"> Title="" Height="280" Width="500">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
@ -16,9 +16,9 @@
<Label Content="新功能更新！" FontFamily="Microsoft YaHei UI" FontSize="26" Margin="20,0"/> <Label Content="新功能更新！" FontFamily="Microsoft YaHei UI" FontSize="26" Margin="20,0"/>
<StackPanel Grid.Row="1"> <StackPanel Grid.Row="1">
<TextBlock Name="TextBlockChangeLogTitle" Text="更新日志" FontSize="18" FontWeight="Bold" Margin="35,10,35,0"/> <TextBlock Name="TextBlockChangeLogTitle" Text="更新日志" FontSize="18" FontWeight="Bold" Margin="35,10,35,0"/>
<TextBlock Name="TextBlockChangeLog" Text="" FontSize="14" Margin="55,5"/> <TextBlock Name="TextBlockChangeLog" Text="" TextWrapping="Wrap" FontSize="14" Margin="55,5"/>
<TextBlock Name="TextBlockSuggestionTitle" Text="建议" FontSize="18" FontWeight="Bold" Margin="35,10,35,0"/> <TextBlock Name="TextBlockSuggestionTitle" Text="建议" FontSize="18" FontWeight="Bold" Margin="35,10,35,0"/>
<TextBlock Name="TextBlockSuggestion" Text="" FontSize="14" Margin="55,5"/> <TextBlock Name="TextBlockSuggestion" Text="" TextWrapping="Wrap" FontSize="14" Margin="55,5"/>
</StackPanel> </StackPanel>
<Label Name="LabelVersion" Grid.Row="2" VerticalContentAlignment="Center" FontSize="12" Margin="20,0"/> <Label Name="LabelVersion" Grid.Row="2" VerticalContentAlignment="Center" FontSize="12" Margin="20,0"/>
<Button Content="确定" Grid.Row="2" HorizontalAlignment="Right" Margin="10" Width="100" FontFamily="Microsoft YaHei UI" Click="Button_Click"/> <Button Content="确定" Grid.Row="2" HorizontalAlignment="Right" Margin="10" Width="100" FontFamily="Microsoft YaHei UI" Click="Button_Click"/>

4
Ink Canvas/ChangeLogWindow.xaml.cs
View File

@ -46,8 +46,8 @@ namespace Ink_Canvas
//Version 2.1.2-release //Version 2.1.2-release
TextBlockChangeLog.Text = "" + TextBlockChangeLog.Text = "" +
"1. 添加“计时器”功能\n" + "1. 添加“墨迹识别”功能，目前可实现智能识别圆、三角形、特殊四边形，并自动转换为规范图形。可自动识别同心圆，相切圆，可自动识别球的截面圆。\n" +
"2. 添加“抽奖”功能\n"; "2. 优化“抽奖”中的“名单导入”功能\n";
TextBlockSuggestionTitle.Visibility = Visibility.Collapsed; TextBlockSuggestionTitle.Visibility = Visibility.Collapsed;
//TextBlockSuggestion.Text = "老师讲评试卷可以点击右侧的背景和深色按钮，即可启动黑板功能（同样支持用笔来擦除），\n双指可以缩放和拖动，左边也会有工具栏方便画图形。"; //TextBlockSuggestion.Text = "老师讲评试卷可以点击右侧的背景和深色按钮，即可启动黑板功能（同样支持用笔来擦除），\n双指可以缩放和拖动，左边也会有工具栏方便画图形。";

2
Ink Canvas/MainWindow.xaml.cs
View File

@ -604,7 +604,7 @@ namespace Ink_Canvas
private void BtnRestart_Click(object sender, RoutedEventArgs e) private void BtnRestart_Click(object sender, RoutedEventArgs e)
{ {
Process.Start(System.Windows.Forms.Application.ExecutablePath); Process.Start(System.Windows.Forms.Application.ExecutablePath, "-m");
Application.Current.Shutdown(); Application.Current.Shutdown();
} }

4
Ink Canvas/Properties/AssemblyInfo.cs
View File

@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.4.0.0")] [assembly: AssemblyVersion("2.4.1.0")]
[assembly: AssemblyFileVersion("2.4.0.0")] [assembly: AssemblyFileVersion("2.4.1.0")]