diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MeoAsstGui.csproj index 4a912c1437..5ad4dfdb4b 100644 --- a/src/MeoAsstGui/MeoAsstGui.csproj +++ b/src/MeoAsstGui/MeoAsstGui.csproj @@ -126,6 +126,9 @@ ToastSettingsUserControl.xaml + + AboutUserControl.xaml + VersionUpdateSettingsUserControl.xaml @@ -179,6 +182,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile diff --git a/src/MeoAsstGui/UserControl/AboutUserControl.xaml b/src/MeoAsstGui/UserControl/AboutUserControl.xaml new file mode 100644 index 0000000000..01042c0625 --- /dev/null +++ b/src/MeoAsstGui/UserControl/AboutUserControl.xaml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/MeoAsstGui/UserControl/AboutUserControl.xaml.cs b/src/MeoAsstGui/UserControl/AboutUserControl.xaml.cs new file mode 100644 index 0000000000..0937602f1e --- /dev/null +++ b/src/MeoAsstGui/UserControl/AboutUserControl.xaml.cs @@ -0,0 +1,26 @@ +// MeoAsstGui - A part of the MeoAssistantArknights project +// Copyright (C) 2021 MistEO and Contributors +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY + +using System.Windows.Controls; + +namespace MeoAsstGui +{ + /// + /// PenguinReportSettingsUserControl.xaml 的交互逻辑 + /// + public partial class AboutUserControl : UserControl + { + public AboutUserControl() + { + InitializeComponent(); + } + } +} diff --git a/src/MeoAsstGui/UserControl/VersionUpdateSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/VersionUpdateSettingsUserControl.xaml index d8c616d036..8b9792e536 100644 --- a/src/MeoAsstGui/UserControl/VersionUpdateSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/VersionUpdateSettingsUserControl.xaml @@ -8,9 +8,6 @@ mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="550"> - - - diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index a700397f28..173a84b876 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -51,6 +51,7 @@ namespace MeoAsstGui _listTitle.Add("连接设置"); _listTitle.Add("通知显示"); _listTitle.Add("软件更新"); + _listTitle.Add("关于我们"); //_listTitle.Add("其他"); InfrastInit(); diff --git a/src/MeoAsstGui/Views/SettingsView.xaml b/src/MeoAsstGui/Views/SettingsView.xaml index 846d69ae93..f974b4d644 100644 --- a/src/MeoAsstGui/Views/SettingsView.xaml +++ b/src/MeoAsstGui/Views/SettingsView.xaml @@ -46,6 +46,9 @@ + + +