diff --git a/src/MaaWpfGui/Res/Style.xaml b/src/MaaWpfGui/Res/Style.xaml index 5587eae553..b77449eb67 100644 --- a/src/MaaWpfGui/Res/Style.xaml +++ b/src/MaaWpfGui/Res/Style.xaml @@ -7,7 +7,6 @@ - diff --git a/src/MaaWpfGui/Res/Styles/RadioButton.xaml b/src/MaaWpfGui/Res/Styles/RadioButton.xaml deleted file mode 100644 index e41e217e80..0000000000 --- a/src/MaaWpfGui/Res/Styles/RadioButton.xaml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - diff --git a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs index 980128719a..0f007d0829 100644 --- a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs @@ -44,6 +44,7 @@ using Stylet; using static MaaWpfGui.Helper.CopilotHelper; using static MaaWpfGui.Helper.PathsHelper; using static MaaWpfGui.Models.AsstTasks.AsstCopilotTask; +using static Microsoft.WindowsAPICodePack.Shell.PropertySystem.SystemProperties.System; using DataFormats = System.Windows.Forms.DataFormats; using Task = System.Threading.Tasks.Task; @@ -249,54 +250,6 @@ public partial class CopilotViewModel : Screen } } - [PropertyDependsOn(nameof(CopilotTabIndex))] - public bool IsMainCopilotTabSelected - { - get => CopilotTabIndex == 0; - set { - if (value) - { - CopilotTabIndex = 0; - } - } - } - - [PropertyDependsOn(nameof(CopilotTabIndex))] - public bool IsSssCopilotTabSelected - { - get => CopilotTabIndex == 1; - set { - if (value) - { - CopilotTabIndex = 1; - } - } - } - - [PropertyDependsOn(nameof(CopilotTabIndex))] - public bool IsParadoxCopilotTabSelected - { - get => CopilotTabIndex == 2; - set { - if (value) - { - CopilotTabIndex = 2; - } - } - } - - [PropertyDependsOn(nameof(CopilotTabIndex))] - public bool IsActivityCopilotTabSelected - { - get => CopilotTabIndex == 3; - set { - if (value) - { - CopilotTabIndex = 3; - } - } - } - private string _displayFilename = string.Empty; /// diff --git a/src/MaaWpfGui/Views/UI/CopilotView.xaml b/src/MaaWpfGui/Views/UI/CopilotView.xaml index 20c8e9b877..07a2350ed9 100644 --- a/src/MaaWpfGui/Views/UI/CopilotView.xaml +++ b/src/MaaWpfGui/Views/UI/CopilotView.xaml @@ -38,34 +38,41 @@ Grid.Row="0" HorizontalAlignment="Center" Orientation="Vertical"> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +