mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-19 02:23:01 +08:00
Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
编队|Squads|編成|편성
|
||||
干员|Operator|人事|오퍼레이터
|
||||
采购中心|Store|購買部|구매센터
|
||||
招募|Recruitment||모집
|
||||
招募|Recruitment|SCOUT|모집
|
||||
公开招募|Recruit|公開求人|공개모집
|
||||
干员寻访|Headhunt|人材発掘|헤드헌팅
|
||||
任务|Mission|任務|임무
|
||||
|
||||
@@ -23,6 +23,7 @@ namespace MeoAsstGui
|
||||
{
|
||||
private NotifyIcon notifyIcon = new NotifyIcon();
|
||||
private TaskQueueViewModel taskQueueViewModel;
|
||||
private SettingsViewModel settingsViewModel;
|
||||
private WindowState ws; //记录窗体状态
|
||||
private bool _isMinimizeToTaskbar = false;
|
||||
|
||||
@@ -43,11 +44,25 @@ namespace MeoAsstGui
|
||||
startMenu.Click += StartTask;
|
||||
MenuItem stopMenu = new System.Windows.Forms.MenuItem("全部停止");
|
||||
stopMenu.Click += StopTask;
|
||||
|
||||
MenuItem switchLangMenu = new System.Windows.Forms.MenuItem(Localization.GetString("SwitchLanguage"));
|
||||
|
||||
foreach (var lang in Localization.SupportedLanguages)
|
||||
{
|
||||
var langMenu = new MenuItem(lang.Value);
|
||||
langMenu.Click += delegate (object sender, EventArgs e)
|
||||
{
|
||||
settingsViewModel.Language = lang.Key;
|
||||
};
|
||||
switchLangMenu.MenuItems.Add(langMenu);
|
||||
}
|
||||
|
||||
MenuItem exitMenu = new System.Windows.Forms.MenuItem("退出");
|
||||
exitMenu.Click += App_exit;
|
||||
System.Windows.Forms.MenuItem[] menuItems = new MenuItem[] { startMenu, stopMenu, exitMenu };
|
||||
System.Windows.Forms.MenuItem[] menuItems = new MenuItem[] { startMenu, stopMenu, switchLangMenu, exitMenu };
|
||||
this.notifyIcon.ContextMenu = new System.Windows.Forms.ContextMenu(menuItems);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 只应该在TaskQueueViewModel的构造函数中调用这个函数,不要传入一个随便new出来的TaskQueueViewModel
|
||||
/// </summary>
|
||||
@@ -57,6 +72,11 @@ namespace MeoAsstGui
|
||||
this.taskQueueViewModel = taskQueueViewModel;
|
||||
}
|
||||
|
||||
public void SetSettingsViewModel(SettingsViewModel settingsViewModel)
|
||||
{
|
||||
this.settingsViewModel = settingsViewModel;
|
||||
}
|
||||
|
||||
private void MainWindow_StateChanged(object sender, EventArgs e)
|
||||
{
|
||||
ws = App.Current.MainWindow.WindowState;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
xmlns:system="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:local="clr-namespaces:MeoAsstGui">
|
||||
<!--Settings-->
|
||||
<system:String x:Key="SwitchLanguage">Switch Language</system:String>
|
||||
<system:String x:Key="Language">Language</system:String>
|
||||
<system:String x:Key="Settings">Settings</system:String>
|
||||
<system:String x:Key="LanguageChangedTip">The language setting has been changed, do you want to restart the application immediately to apply the language setting?</system:String>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
xmlns:system="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:local="clr-namespaces:MeoAsstGui">
|
||||
<!--设置-->
|
||||
<system:String x:Key="SwitchLanguage">切换语言</system:String>
|
||||
<system:String x:Key="Language">语言</system:String>
|
||||
<system:String x:Key="Settings">设置</system:String>
|
||||
<system:String x:Key="LanguageChangedTip">语言设置已更改,是否现在重启App以应用语言设置?</system:String>
|
||||
|
||||
@@ -63,6 +63,7 @@ namespace MeoAsstGui
|
||||
var trayObj = _container.Get<TrayIcon>();
|
||||
trayObj.SetVisible(UseTray);
|
||||
trayObj.SetMinimizeToTaskbar(MinimizeToTray);
|
||||
trayObj.SetSettingsViewModel(this);
|
||||
Bootstrapper.SetTrayIconInSettingsViewModel(this);
|
||||
}
|
||||
|
||||
@@ -1218,6 +1219,10 @@ namespace MeoAsstGui
|
||||
get { return _language; }
|
||||
set
|
||||
{
|
||||
if (value == _language)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var backup = _language;
|
||||
ViewStatusStorage.Set("GUI.Localization", value);
|
||||
var result = _windowManager.ShowMessageBox(
|
||||
|
||||
Reference in New Issue
Block a user