Skip to content

Commit dfc12e8

Browse files
JiuLing-zhangJiuLing-zhang
committed
调整关闭主面板最小化到托盘或退出程序的设置方式
1 parent 90ea0ac commit dfc12e8

File tree

7 files changed

+96
-25
lines changed

7 files changed

+96
-25
lines changed

‎src/ComputerLock/Components/Settings/GeneralSettings.razor‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,20 @@
2525
Color="Color.Primary"
2626
Class="no-left-padding max-width-fix"
2727
Dense="true" />
28-
<MudCheckBox @bind-Value="@(AppSettings.IsHideWindowWhenClose)"
29-
@bind-Value:after="SaveSettings"
30-
Label="@(Lang["HideWindowWhenClose"])"
31-
Color="Color.Primary"
32-
Class="no-left-padding max-width-fix"
33-
Dense="true" />
28+
<div>
29+
<MudText Typo="Typo.subtitle2" Class="input-title">@(Lang["CloseMainWindow"])</MudText>
30+
<MudSelect T="CloseWindowAction"
31+
Dense="true"
32+
Label=""
33+
Variant="Variant.Outlined"
34+
Value="@(CloseWindowActionValue)"
35+
ValueChanged="CloseWindowActionChanged"
36+
Margin="Margin.Dense"
37+
Style="width:230px; max-width:230px;">
38+
<MudSelectItem Value="@(CloseWindowAction.MinimizeToTray)">@(Lang["MinimizeToSystemTray"])</MudSelectItem>
39+
<MudSelectItem Value="@(CloseWindowAction.Exit)">@(Lang["ExitProgram"])</MudSelectItem>
40+
</MudSelect>
41+
</div>
3442
</MudStack>
3543
</MudPaper>
3644

@@ -61,7 +69,7 @@
6169
Value="@(AppSettings.AppTheme)"
6270
ValueChanged="ThemeChanged"
6371
Margin="Margin.Dense"
64-
Style="width:150px; max-width:150px;">
72+
Style="width:210px; max-width:210px;">
6573
<MudSelectItem Value="@(ThemeEnum.System)">@($"🌓 {Lang["SystemTheme"]}")</MudSelectItem>
6674
<MudSelectItem Value="@(ThemeEnum.Light)">@($"☀️ {Lang["LightTheme"]}")</MudSelectItem>
6775
<MudSelectItem Value="@(ThemeEnum.Dark)">@($"🌙 {Lang["DarkTheme"]}")</MudSelectItem>

‎src/ComputerLock/Components/Settings/GeneralSettings.razor.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ private void SaveSettings()
5757
AppSettingsProvider.SaveSettings(AppSettings);
5858
}
5959

60+
private CloseWindowAction CloseWindowActionValue => AppSettings.IsHideWindowWhenClose ? CloseWindowAction.MinimizeToTray : CloseWindowAction.Exit;
61+
62+
private void CloseWindowActionChanged(CloseWindowAction action)
63+
{
64+
AppSettings.IsHideWindowWhenClose = action == CloseWindowAction.MinimizeToTray;
65+
SaveSettings();
66+
}
67+
6068
private void ThemeChanged(ThemeEnum theme)
6169
{
6270
AppSettings.AppTheme = theme;

‎src/ComputerLock/Enums/CloseWindowAction.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
namespace ComputerLock.Enums;
2+
3+
/// <summary>
4+
/// 窗口关闭时的操作
5+
/// </summary>
6+
public enum CloseWindowAction
7+
{
8+
MinimizeToTray,
9+
Exit,
10+
}

‎src/ComputerLock/Resources/Lang.Designer.cs‎

Lines changed: 36 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ComputerLock/Resources/Lang.en.resx‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@
123123
<data name="HideWindowWhenLaunch" xml:space="preserve">
124124
<value>Minimize to pallet after startup</value>
125125
</data>
126-
<data name="HideWindowWhenClose" xml:space="preserve">
127-
<value>Minimize to tray when window is closed</value>
128-
</data>
129126
<data name="AutoCheckUpdate" xml:space="preserve">
130127
<value>Automatic update</value>
131128
</data>
@@ -435,4 +432,13 @@
435432
<data name="HotkeyDuplicateError" xml:space="preserve">
436433
<value>Lock screen hotkey and unlock hotkey cannot be the same</value>
437434
</data>
435+
<data name="CloseMainWindow" xml:space="preserve">
436+
<value>Close Main Window</value>
437+
</data>
438+
<data name="MinimizeToSystemTray" xml:space="preserve">
439+
<value>Minimize to System Tray</value>
440+
</data>
441+
<data name="ExitProgram" xml:space="preserve">
442+
<value>Exit Program</value>
443+
</data>
438444
</root>

‎src/ComputerLock/Resources/Lang.resx‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@
123123
<data name="HideWindowWhenLaunch" xml:space="preserve">
124124
<value>启动后最小化到托盘</value>
125125
</data>
126-
<data name="HideWindowWhenClose" xml:space="preserve">
127-
<value>关闭窗口时最小化到托盘</value>
128-
</data>
129126
<data name="AutoCheckUpdate" xml:space="preserve">
130127
<value>自动检查更新</value>
131128
</data>
@@ -435,4 +432,13 @@
435432
<data name="HotkeyDuplicateError" xml:space="preserve">
436433
<value>锁屏快捷键和解锁快捷键不能相同</value>
437434
</data>
435+
<data name="CloseMainWindow" xml:space="preserve">
436+
<value>关闭主面板</value>
437+
</data>
438+
<data name="MinimizeToSystemTray" xml:space="preserve">
439+
<value>最小化到托盘</value>
440+
</data>
441+
<data name="ExitProgram" xml:space="preserve">
442+
<value>退出程序</value>
443+
</data>
438444
</root>

‎src/ComputerLock/Resources/Lang.zh.resx‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@
123123
<data name="HideWindowWhenLaunch" xml:space="preserve">
124124
<value>启动后最小化到托盘</value>
125125
</data>
126-
<data name="HideWindowWhenClose" xml:space="preserve">
127-
<value>关闭窗口时最小化到托盘</value>
128-
</data>
129126
<data name="AutoCheckUpdate" xml:space="preserve">
130127
<value>自动检查更新</value>
131128
</data>
@@ -435,4 +432,13 @@
435432
<data name="HotkeyDuplicateError" xml:space="preserve">
436433
<value>锁屏快捷键和解锁快捷键不能相同</value>
437434
</data>
435+
<data name="CloseMainWindow" xml:space="preserve">
436+
<value>关闭主面板</value>
437+
</data>
438+
<data name="MinimizeToSystemTray" xml:space="preserve">
439+
<value>最小化到托盘</value>
440+
</data>
441+
<data name="ExitProgram" xml:space="preserve">
442+
<value>退出程序</value>
443+
</data>
438444
</root>

0 commit comments

Comments
 (0)