Skip to content

Commit ecf682f

Browse files
committed
display version
1 parent 26be5b0 commit ecf682f

4 files changed

Lines changed: 23 additions & 1 deletion

File tree

MyPasswordDesktop/Resources/Strings.en.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<x:String x:Key="settings.delete_after">Delete items in trash after:</x:String>
3030
<x:String x:Key="settings.db_file">Database file:</x:String>
3131
<x:String x:Key="settings.log_dir">Log directory:</x:String>
32+
<x:String x:Key="settings.version">Version:</x:String>
3233
<x:String x:Key="settings.open_dir">Show in file explorer</x:String>
3334
<x:String x:Key="settings.minutes">{0} minute(s)</x:String>
3435
<x:String x:Key="settings.days">{0} days</x:String>

MyPasswordDesktop/Resources/Strings.zh.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<x:String x:Key="settings.delete_after">回收站项目保留时长:</x:String>
3030
<x:String x:Key="settings.db_file">数据库文件:</x:String>
3131
<x:String x:Key="settings.log_dir">日志目录:</x:String>
32+
<x:String x:Key="settings.version">版本:</x:String>
3233
<x:String x:Key="settings.open_dir">在文件管理器中显示</x:String>
3334
<x:String x:Key="settings.minutes">{0} 分钟</x:String>
3435
<x:String x:Key="settings.days">{0} 天</x:String>

MyPasswordDesktop/Views/SettingsWindow.axaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:controls="using:MyPasswordDesktop.Controls"
44
x:Class="MyPasswordDesktop.Views.SettingsWindow"
5-
Width="580" Height="540"
5+
Width="620" Height="500"
66
CanResize="False"
77
WindowStartupLocation="CenterOwner"
88
ShowInTaskbar="False"
@@ -37,6 +37,10 @@
3737
<TextBlock x:Name="LogDirText" Foreground="#3070D0" Cursor="Hand"
3838
ToolTip.Tip="{DynamicResource settings.open_dir}" Margin="4,0,0,0" />
3939
</StackPanel>
40+
<StackPanel Orientation="Horizontal">
41+
<TextBlock Text="{DynamicResource settings.version}" Foreground="Gray" />
42+
<TextBlock x:Name="VersionText" Foreground="Gray" Margin="4,0,0,0" />
43+
</StackPanel>
4044
</StackPanel>
4145
</Grid>
4246
</TabItem>

MyPasswordDesktop/Views/SettingsWindow.axaml.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4+
using System.Reflection;
45
using Avalonia.Controls;
56
using Avalonia.Input;
67
using Avalonia.Layout;
@@ -85,6 +86,21 @@ private void BuildGeneral()
8586
{
8687
if (!string.IsNullOrEmpty(logDirPath)) ShellUtils.OpenUrl(logDirPath);
8788
};
89+
90+
this.FindControl<TextBlock>("VersionText").Text = GetAppVersion();
91+
}
92+
93+
private static string GetAppVersion()
94+
{
95+
Assembly asm = Assembly.GetExecutingAssembly();
96+
string informational = asm.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
97+
if (!string.IsNullOrEmpty(informational))
98+
{
99+
int plus = informational.IndexOf('+');
100+
return plus >= 0 ? informational.Substring(0, plus) : informational;
101+
}
102+
Version v = asm.GetName().Version;
103+
return v == null ? "" : $"{v.Major}.{v.Minor}.{v.Build}";
88104
}
89105

90106
// ── Security ─────────────────────────────────────────────────────────

0 commit comments

Comments
 (0)