diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml
index 099bfe55d..7452cb0d3 100644
--- a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml
+++ b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml
@@ -11,11 +11,13 @@
d:DesignWidth="800"
x:CompileBindings="True"
x:DataType="spp:DebugPageViewModel"
- PreviewImage="{StaticResource AppIcon}"
mc:Ignorable="d">
+
+
+
+
+
+
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Orientation="Horizontal"
+ Spacing="8">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml
index 30ea14633..8e8c11054 100644
--- a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml
+++ b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml
@@ -14,18 +14,26 @@
x:DataType="spp:SettingsPageViewModel"
mc:Ignorable="d">
-
+
-
+
-
+
-
+
-
+
@@ -43,24 +51,34 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -90,8 +108,8 @@
-
-
+
-
+
+
+
+
+
- -->
+
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Steam.axaml b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Steam.axaml
index 614cca060..2d04d6cd7 100644
--- a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Steam.axaml
+++ b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Steam.axaml
@@ -14,7 +14,12 @@
x:DataType="spp:SettingsPageViewModel"
mc:Ignorable="d">
-
+
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_UI.axaml b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_UI.axaml
index 289207d27..2dd656a62 100644
--- a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_UI.axaml
+++ b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_UI.axaml
@@ -15,7 +15,12 @@
x:DataType="spp:SettingsPageViewModel"
mc:Ignorable="d">
-
+
//{
// ViewModel?.LoadPlatforms();
diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/GameListPage.axaml.cs b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/GameListPage.axaml.cs
index 76a3c6575..876db57ef 100644
--- a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/GameListPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/GameListPage.axaml.cs
@@ -10,9 +10,5 @@ public partial class GameListPage : PageBase
InitializeComponent();
DataContext = new GameListPageViewModel();
-
- Title = Strings.GameList;
- Subtitle = "插件作者: Steam++ 官方";
- Description = "管理库存游戏";
}
}
diff --git a/src/BD.WTTS.Client.Plugins.GameTools/BD.WTTS.Client.Plugins.GameTools.csproj b/src/BD.WTTS.Client.Plugins.GameTools/BD.WTTS.Client.Plugins.GameTools.csproj
index f812a25c3..3094e4bfa 100644
--- a/src/BD.WTTS.Client.Plugins.GameTools/BD.WTTS.Client.Plugins.GameTools.csproj
+++ b/src/BD.WTTS.Client.Plugins.GameTools/BD.WTTS.Client.Plugins.GameTools.csproj
@@ -6,6 +6,10 @@
WTTS_PLUGIN;WTTS_PLUGIN_GAMETOOLS;$(DefineConstants)
+
+
+
+
Properties
diff --git a/src/BD.WTTS.Client.Plugins.GameTools/Plugins/Plugin.cs b/src/BD.WTTS.Client.Plugins.GameTools/Plugins/Plugin.cs
index e4d975b3b..0728863c5 100644
--- a/src/BD.WTTS.Client.Plugins.GameTools/Plugins/Plugin.cs
+++ b/src/BD.WTTS.Client.Plugins.GameTools/Plugins/Plugin.cs
@@ -13,7 +13,7 @@ public sealed class Plugin : PluginBase, IPlugin
public sealed override string Author => "Steam++ 官方";
- public sealed override string? Icon => "avares://BD.WTTS.Client.Plugins.GameList/UI/Assets/game.ico";
+ public sealed override string? Icon => "avares://BD.WTTS.Client.Plugins.GameTools/UI/Assets/toolbox.ico";
public override IEnumerable? GetMenuTabItems()
{
diff --git a/src/BD.WTTS.Client/UI/ViewModels/Abstractions/Items/ItemViewModel.cs b/src/BD.WTTS.Client/UI/ViewModels/Abstractions/Items/ItemViewModel.cs
index 56fd8cb6a..ded26429b 100644
--- a/src/BD.WTTS.Client/UI/ViewModels/Abstractions/Items/ItemViewModel.cs
+++ b/src/BD.WTTS.Client/UI/ViewModels/Abstractions/Items/ItemViewModel.cs
@@ -32,7 +32,7 @@ public abstract partial class ItemViewModel : ViewModelBase
#region Resource Key 图标
- public virtual string? IconSource => IApplication.Instance.GetIconSourceByIconKey(IconKey);
+ //public virtual string? IconSource => IApplication.Instance.GetIconSourceByIconKey(IconKey);
protected string? _IconKey;
@@ -42,7 +42,7 @@ public abstract partial class ItemViewModel : ViewModelBase
set
{
this.RaiseAndSetIfChanged(ref _IconKey, value);
- this.RaisePropertyChanged(nameof(IconSource));
+ //this.RaisePropertyChanged(nameof(IconSource));
}
}
diff --git a/src/BD.WTTS.Client/UI/ViewModels/Pages/DebugPageViewModel.cs b/src/BD.WTTS.Client/UI/ViewModels/Pages/DebugPageViewModel.cs
index d34b2bed7..9ea421ad6 100644
--- a/src/BD.WTTS.Client/UI/ViewModels/Pages/DebugPageViewModel.cs
+++ b/src/BD.WTTS.Client/UI/ViewModels/Pages/DebugPageViewModel.cs
@@ -11,6 +11,8 @@ public sealed partial class DebugPageViewModel : TabItemViewModel
public override string Name => "Debug";
+ public override string IconKey => "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/bug.ico";
+
public DebugPageViewModel() { }
string _DebugString = string.Empty;
diff --git a/src/BD.WTTS.Client/UI/ViewModels/Pages/HomePageViewModel.cs b/src/BD.WTTS.Client/UI/ViewModels/Pages/HomePageViewModel.cs
index 2436bca65..7af952aa5 100644
--- a/src/BD.WTTS.Client/UI/ViewModels/Pages/HomePageViewModel.cs
+++ b/src/BD.WTTS.Client/UI/ViewModels/Pages/HomePageViewModel.cs
@@ -6,6 +6,8 @@ public sealed class HomePageViewModel : TabItemViewModel
{
public override string Name => Strings.Welcome;
+ public override string IconKey => "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/home.ico";
+
[Reactive]
public ObservableCollection Navigations { get; set; }
diff --git a/src/BD.WTTS.Client/UI/ViewModels/Pages/SettingsPageViewModel.props.cs b/src/BD.WTTS.Client/UI/ViewModels/Pages/SettingsPageViewModel.props.cs
index 5254617fa..01112cab3 100644
--- a/src/BD.WTTS.Client/UI/ViewModels/Pages/SettingsPageViewModel.props.cs
+++ b/src/BD.WTTS.Client/UI/ViewModels/Pages/SettingsPageViewModel.props.cs
@@ -9,6 +9,8 @@ public sealed partial class SettingsPageViewModel : TabItemViewModel
public override string Name => AppResources.Settings;
+ public override string IconKey => "avares://BD.WTTS.Client.Avalonia/UI/Assets/Icons/settings.ico";
+
public static string? SelectLanguageKey { get; private set; }
KeyValuePair _SelectLanguage;