chore: 重命名战斗设置相关文件名

This commit is contained in:
uye
2023-02-06 00:24:34 +08:00
parent cd55db0cf5
commit 2a3077092c
9 changed files with 15 additions and 18 deletions

View File

@@ -173,8 +173,8 @@
<DependentUpon>FightSettingsUserControl.xaml</DependentUpon>
</Compile>
<Compile Include="Helper\DragItemViewModel.cs" />
<Compile Include="Views\UserControl\PenguinReportSettingsUserControl.xaml.cs">
<DependentUpon>PenguinReportSettingsUserControl.xaml</DependentUpon>
<Compile Include="Views\UserControl\OtherCombatSettingsUserControl.xaml.cs">
<DependentUpon>OtherCombatSettingsUserControl.xaml</DependentUpon>
</Compile>
<Compile Include="Views\UserControl\AboutUserControl.xaml.cs">
<DependentUpon>AboutUserControl.xaml</DependentUpon>
@@ -257,7 +257,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\UserControl\PenguinReportSettingsUserControl.xaml">
<Page Include="Views\UserControl\OtherCombatSettingsUserControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>

View File

@@ -11,7 +11,7 @@
<system:String x:Key="RoguelikeSettings">肉鸽设置</system:String>
<system:String x:Key="RecruitingSettings">自动公招</system:String>
<system:String x:Key="MallSettings">信用相关</system:String>
<system:String x:Key="OtherCombatSettings">理智设置</system:String>
<system:String x:Key="OtherCombatSettings">战斗设置</system:String>
<system:String x:Key="ConnectionSettings">连接设置</system:String>
<system:String x:Key="StartupSettings">启动设置</system:String>
<system:String x:Key="ScheduleSettings">定时执行</system:String>

View File

@@ -10,7 +10,7 @@
<system:String x:Key="RoguelikeSettings">肉鴿設定</system:String>
<system:String x:Key="RecruitingSettings">自動公招</system:String>
<system:String x:Key="MallSettings">信用相關</system:String>
<system:String x:Key="OtherCombatSettings">理智設定</system:String>
<system:String x:Key="OtherCombatSettings">戰鬥設定</system:String>
<system:String x:Key="ConnectionSettings">連接設定</system:String>
<system:String x:Key="StartupSettings">啟動設定</system:String>
<system:String x:Key="ScheduleSettings">定時執行</system:String>

View File

@@ -120,7 +120,7 @@
Foreground="Gray"
Style="{StaticResource TextBlockDefault}"
Text="{Binding ListTitle[5]}" />
<local:PenguinReportSettingsUserControl
<local:OtherCombatSettingsUserControl
Margin="20"
HorizontalAlignment="Center"
IsEnabled="{Binding Idle}" />

View File

@@ -19,7 +19,7 @@ using System.Windows.Documents;
namespace MaaWpfGui
{
/// <summary>
/// PenguinReportSettingsUserControl.xaml 的交互逻辑
/// OtherCombatSettingsUserControl.xaml 的交互逻辑
/// </summary>
public partial class AboutUserControl : UserControl
{

View File

@@ -11,15 +11,12 @@
// but WITHOUT ANY WARRANTY
// </copyright>
using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
namespace MaaWpfGui
{
/// <summary>
/// PenguinReportSettingsUserControl.xaml 的交互逻辑
/// GameClientUserControl.xaml 的交互逻辑
/// </summary>
public partial class GameClientUserControl : UserControl
{

View File

@@ -1,5 +1,5 @@
<UserControl
x:Class="MaaWpfGui.PenguinReportSettingsUserControl"
x:Class="MaaWpfGui.OtherCombatSettingsUserControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"

View File

@@ -1,4 +1,4 @@
// <copyright file="PenguinReportSettingsUserControl.xaml.cs" company="MaaAssistantArknights">
// <copyright file="OtherCombatSettingsUserControl.xaml.cs" company="MaaAssistantArknights">
// MaaWpfGui - A part of the MaaCoreArknights project
// Copyright (C) 2021 MistEO and Contributors
//
@@ -16,14 +16,14 @@ using System.Windows.Controls;
namespace MaaWpfGui
{
/// <summary>
/// PenguinReportSettingsUserControl.xaml 的交互逻辑
/// OtherCombatSettingsUserControl.xaml 的交互逻辑
/// </summary>
public partial class PenguinReportSettingsUserControl : UserControl
public partial class OtherCombatSettingsUserControl : UserControl
{
/// <summary>
/// Initializes a new instance of the <see cref="PenguinReportSettingsUserControl"/> class.
/// Initializes a new instance of the <see cref="OtherCombatSettingsUserControl"/> class.
/// </summary>
public PenguinReportSettingsUserControl()
public OtherCombatSettingsUserControl()
{
InitializeComponent();
}

View File

@@ -16,7 +16,7 @@ using System.Windows.Controls;
namespace MaaWpfGui
{
/// <summary>
/// PenguinReportSettingsUserControl.xaml 的交互逻辑
/// OtherCombatSettingsUserControl.xaml 的交互逻辑
/// </summary>
public partial class VersionUpdateSettingsUserControl : UserControl
{