diff --git a/src/MeoAsstGui/ViewModels/StartSelfModel.cs b/src/MeoAsstGui/Helper/AutoStart.cs similarity index 98% rename from src/MeoAsstGui/ViewModels/StartSelfModel.cs rename to src/MeoAsstGui/Helper/AutoStart.cs index cb8f9348b4..aebdc7c28c 100644 --- a/src/MeoAsstGui/ViewModels/StartSelfModel.cs +++ b/src/MeoAsstGui/Helper/AutoStart.cs @@ -19,7 +19,7 @@ namespace MeoAsstGui /// /// The model of auto-starting settings. /// - public class StartSelfModel + public class AutoStart { private static readonly string fileValue = Process.GetCurrentProcess().MainModule?.FileName; diff --git a/src/MeoAsstGui/ViewModels/ErrorView.xaml.cs b/src/MeoAsstGui/Helper/ErrorView.xaml.cs similarity index 100% rename from src/MeoAsstGui/ViewModels/ErrorView.xaml.cs rename to src/MeoAsstGui/Helper/ErrorView.xaml.cs diff --git a/src/MeoAsstGui/MaaWpfGui.csproj b/src/MeoAsstGui/MaaWpfGui.csproj index 198d634cb8..d366067eff 100644 --- a/src/MeoAsstGui/MaaWpfGui.csproj +++ b/src/MeoAsstGui/MaaWpfGui.csproj @@ -103,9 +103,9 @@ MSBuild:Compile Designer - + - + @@ -131,135 +131,135 @@ - + GUISettingsUserControl.xaml - + HotKeyEditorUserControl.xaml - + HotKeySettingsUserControl.xaml - + StartSettingsUserControl.xaml - + TimerSettingsUserControl.xaml - + AutoRecruitSettingsUserControl.xaml - + ConnectSettingsUserControl.xaml - + RoguelikeSettingsUserControl.xaml - + MallSettingsUserControl.xaml - + InfrastSettingsUserControl.xaml - + FightSettingsUserControl.xaml - + PenguinReportSettingsUserControl.xaml - + AboutUserControl.xaml - + VersionUpdateSettingsUserControl.xaml - - - - - - - - + + + + + + + + App.xaml Code - - + + MSBuild:Compile Designer - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + MSBuild:Compile Designer - - + + MSBuild:Compile Designer - - + + MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + Designer MSBuild:Compile diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Main/AsstProxy.cs similarity index 100% rename from src/MeoAsstGui/Helper/AsstProxy.cs rename to src/MeoAsstGui/Main/AsstProxy.cs diff --git a/src/MeoAsstGui/Bootstrapper.cs b/src/MeoAsstGui/Main/Bootstrapper.cs similarity index 100% rename from src/MeoAsstGui/Bootstrapper.cs rename to src/MeoAsstGui/Main/Bootstrapper.cs diff --git a/src/MeoAsstGui/ViewModels/CopilotViewModel.cs b/src/MeoAsstGui/Main/CopilotViewModel.cs similarity index 100% rename from src/MeoAsstGui/ViewModels/CopilotViewModel.cs rename to src/MeoAsstGui/Main/CopilotViewModel.cs diff --git a/src/MeoAsstGui/ViewModels/DepotViewModel.cs b/src/MeoAsstGui/Main/DepotViewModel.cs similarity index 100% rename from src/MeoAsstGui/ViewModels/DepotViewModel.cs rename to src/MeoAsstGui/Main/DepotViewModel.cs diff --git a/src/MeoAsstGui/ViewModels/RecruitViewModel.cs b/src/MeoAsstGui/Main/RecruitViewModel.cs similarity index 100% rename from src/MeoAsstGui/ViewModels/RecruitViewModel.cs rename to src/MeoAsstGui/Main/RecruitViewModel.cs diff --git a/src/MeoAsstGui/ViewModels/RootViewModel.cs b/src/MeoAsstGui/Main/RootViewModel.cs similarity index 100% rename from src/MeoAsstGui/ViewModels/RootViewModel.cs rename to src/MeoAsstGui/Main/RootViewModel.cs diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/Main/SettingsViewModel.cs similarity index 99% rename from src/MeoAsstGui/ViewModels/SettingsViewModel.cs rename to src/MeoAsstGui/Main/SettingsViewModel.cs index 68f5b89665..4612352091 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/Main/SettingsViewModel.cs @@ -273,7 +273,7 @@ namespace MeoAsstGui } /* 启动设置 */ - private bool _startSelf = StartSelfModel.CheckStart(); + private bool _startSelf = MeoAsstGui.AutoStart.CheckStart(); /// /// Gets or sets a value indicating whether to start itself. @@ -284,7 +284,7 @@ namespace MeoAsstGui set { SetAndNotify(ref _startSelf, value); - StartSelfModel.SetStart(value); + MeoAsstGui.AutoStart.SetStart(value); } } diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/Main/TaskQueueViewModel.cs similarity index 100% rename from src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs rename to src/MeoAsstGui/Main/TaskQueueViewModel.cs diff --git a/src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs b/src/MeoAsstGui/Main/VersionUpdateViewModel.cs similarity index 100% rename from src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs rename to src/MeoAsstGui/Main/VersionUpdateViewModel.cs diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Res/Localizations/en-us.xaml similarity index 100% rename from src/MeoAsstGui/Resources/Localizations/en-us.xaml rename to src/MeoAsstGui/Res/Localizations/en-us.xaml diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Res/Localizations/ja-jp.xaml similarity index 100% rename from src/MeoAsstGui/Resources/Localizations/ja-jp.xaml rename to src/MeoAsstGui/Res/Localizations/ja-jp.xaml diff --git a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml b/src/MeoAsstGui/Res/Localizations/ko-kr.xaml similarity index 100% rename from src/MeoAsstGui/Resources/Localizations/ko-kr.xaml rename to src/MeoAsstGui/Res/Localizations/ko-kr.xaml diff --git a/src/MeoAsstGui/Resources/Localizations/pallas.py b/src/MeoAsstGui/Res/Localizations/pallas.py similarity index 100% rename from src/MeoAsstGui/Resources/Localizations/pallas.py rename to src/MeoAsstGui/Res/Localizations/pallas.py diff --git a/src/MeoAsstGui/Resources/Localizations/pallas.xaml b/src/MeoAsstGui/Res/Localizations/pallas.xaml similarity index 100% rename from src/MeoAsstGui/Resources/Localizations/pallas.xaml rename to src/MeoAsstGui/Res/Localizations/pallas.xaml diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Res/Localizations/zh-cn.xaml similarity index 100% rename from src/MeoAsstGui/Resources/Localizations/zh-cn.xaml rename to src/MeoAsstGui/Res/Localizations/zh-cn.xaml diff --git a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml b/src/MeoAsstGui/Res/Localizations/zh-tw.xaml similarity index 100% rename from src/MeoAsstGui/Resources/Localizations/zh-tw.xaml rename to src/MeoAsstGui/Res/Localizations/zh-tw.xaml diff --git a/src/MeoAsstGui/UserControl/AboutUserControl.xaml b/src/MeoAsstGui/Views/UserControl/AboutUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/AboutUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/AboutUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/AboutUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/AboutUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/AboutUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/AboutUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/ConnectSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/ConnectSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/ConnectSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/ConnectSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/FightSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/GUISettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/GUISettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/GUISettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/GUISettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/GUISettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/GUISettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/GUISettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/GUISettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/HotKeyEditorUserControl.xaml b/src/MeoAsstGui/Views/UserControl/HotKeyEditorUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/HotKeyEditorUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/HotKeyEditorUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/HotKeyEditorUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/HotKeyEditorUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/HotKeyEditorUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/HotKeyEditorUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/HotKeySettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/HotKeySettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/HotKeySettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/HotKeySettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/HotKeySettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/HotKeySettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/HotKeySettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/HotKeySettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/InfrastSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/MallSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/PenguinReportSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/PenguinReportSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/PenguinReportSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/PenguinReportSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/PenguinReportSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/RoguelikeSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/StartSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/StartSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/StartSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/StartSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/StartSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/StartSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/StartSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/StartSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/TimerSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/TimerSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/TimerSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/TimerSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/VersionUpdateSettingsUserControl.xaml b/src/MeoAsstGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/VersionUpdateSettingsUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/VersionUpdateSettingsUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/VersionUpdateSettingsUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml.cs diff --git a/src/MeoAsstGui/UserControl/WarehouseUserControl.xaml b/src/MeoAsstGui/Views/UserControl/WarehouseUserControl.xaml similarity index 100% rename from src/MeoAsstGui/UserControl/WarehouseUserControl.xaml rename to src/MeoAsstGui/Views/UserControl/WarehouseUserControl.xaml diff --git a/src/MeoAsstGui/UserControl/WarehouseUserControl.xaml.cs b/src/MeoAsstGui/Views/UserControl/WarehouseUserControl.xaml.cs similarity index 100% rename from src/MeoAsstGui/UserControl/WarehouseUserControl.xaml.cs rename to src/MeoAsstGui/Views/UserControl/WarehouseUserControl.xaml.cs