GithubStar/SteamTools
1
0
Fork 0
mirror of https://github.com/BeyondDimension/SteamTools.git synced 2026-10-27 21:43:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

💄 New Icon

Browse Source
This commit is contained in:
RMBGAME
2023-07-11 00:31:31 +08:00
parent 23eab3fcd3
commit 60315f7cf7
16 changed files with 166 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BD.WTTS.Client.Avalonia/UI/Views/Pages/DebugPage.axaml
+3 -1
View File
@@ -11,11 +11,13 @@
d:DesignWidth="800"
x:CompileBindings="True"
x:DataType="spp:DebugPageViewModel"
PreviewImage="{StaticResource AppIcon}"
mc:Ignorable="d">
<Design.DataContext>
<spp:DebugPageViewModel />
</Design.DataContext>
<spp:PageBase.PreviewImage>
<ui:ImageIconSource Source="{Binding IconKey, Mode=OneWay, Converter={StaticResource BitmapAssetValueConverter}}" />
</spp:PageBase.PreviewImage>
<spp:PageBase.TabContent>
<TabStrip
Margin="4"
src/BD.WTTS.Client.Avalonia/UI/Views/Pages/HomePage.axaml
+3 -1
View File
@@ -11,8 +11,10 @@
d:DesignWidth="1080"
x:CompileBindings="True"
x:DataType="spp:HomePageViewModel"
PreviewImage="{StaticResource AppIcon}"
mc:Ignorable="d">
<spp:PageBase.PreviewImage>
<ui:ImageIconSource Source="{Binding IconKey, Mode=OneWay, Converter={StaticResource BitmapAssetValueConverter}}" />
</spp:PageBase.PreviewImage>
<spp:PageBase.TabContent>
<TabStrip
Margin="4"
src/BD.WTTS.Client.Avalonia/UI/Views/Pages/MainView.axaml
+78 -63
View File
@@ -195,70 +195,85 @@
</Border>-->
<DockPanel Grid.Column="4">
<DropDownButton
Padding="4"
<StackPanel
DockPanel.Dock="Left"
Theme="{DynamicResource TransparentButton}">
<Border
Width="32"
Height="32"
ClipToBounds="True"
CornerRadius="30">
<Image RenderOptions.BitmapInterpolationMode="HighQuality" Source="/UI/Assets/Icons/avatar.ico" />
</Border>
<DropDownButton.Flyout>
<MenuFlyout FlyoutPresenterClasses="NoPadding" Placement="BottomEdgeAlignedRight">
<MenuItem IsHitTestVisible="False">
<MenuItem.Header>
<DockPanel>
<Border
Width="64"
Height="64"
Margin="0,0,8,0"
ClipToBounds="True"
CornerRadius="64"
DockPanel.Dock="Left">
<Image Source="/UI/Assets/avatar.jpg" />
</Border>
<StackPanel VerticalAlignment="Center">
<TextBlock Text="Name" />
<TextBlock Text="rrrr@rwerwer.net" />
</StackPanel>
</DockPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Header="-" />
<MenuItem Header="个人中心" />
<MenuItem Header="用户钱包" />
<MenuItem Header="绑定第三方账号" />
<MenuItem Header="-" />
<MenuItem
Command="{ReflectionBinding Path=SignOut,
Source={x:Static s:UserService.Current}}"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
Header="{ReflectionBinding Path=Res.SignOut,
Mode=OneWay,
Source={x:Static s:ResourceService.Current}}"
IsVisible="{ReflectionBinding Path=User,
Mode=OneWay,
Source={x:Static s:UserService.Current},
Converter={StaticResource IsNullConverter},
ConverterParameter=invert}" />
<MenuItem
Command="{ReflectionBinding Path=ShowWindow,
Source={x:Static s:UserService.Current}}"
CommandParameter="{x:Static spp:AppEndPoint.LoginOrRegister}"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
Header="{ReflectionBinding Path=Res.LoginAndRegister,
Mode=OneWay,
Source={x:Static s:ResourceService.Current}}"
IsVisible="{ReflectionBinding Path=User,
Mode=OneWay,
Source={x:Static s:UserService.Current},
Converter={StaticResource IsNullConverter}}" />
</MenuFlyout>
</DropDownButton.Flyout>
</DropDownButton>
Orientation="Horizontal"
Spacing="8">
<Button
Width="40"
Height="40"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Theme="{DynamicResource TransparentButton}">
<Viewbox Width="20" Height="20">
<ui:SymbolIcon Symbol="Alert" />
</Viewbox>
</Button>
<DropDownButton Padding="4" Theme="{DynamicResource TransparentButton}">
<Border
Width="32"
Height="32"
Background="{DynamicResource ControlOnImageFillColorDefaultBrush}"
ClipToBounds="True"
CornerRadius="30">
<Image RenderOptions.BitmapInterpolationMode="HighQuality" Source="/UI/Assets/Icons/avatar.ico" />
</Border>
<DropDownButton.Flyout>
<MenuFlyout FlyoutPresenterClasses="NoPadding" Placement="BottomEdgeAlignedRight">
<MenuItem IsHitTestVisible="False">
<MenuItem.Header>
<DockPanel>
<Border
Width="64"
Height="64"
Margin="0,0,8,0"
ClipToBounds="True"
CornerRadius="64"
DockPanel.Dock="Left">
<Image Source="/UI/Assets/avatar.jpg" />
</Border>
<StackPanel VerticalAlignment="Center">
<TextBlock Text="Name" />
<TextBlock Text="rrrr@rwerwer.net" />
</StackPanel>
</DockPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem Header="-" />
<MenuItem Header="个人中心" />
<MenuItem Header="用户钱包" />
<MenuItem Header="绑定第三方账号" />
<MenuItem Header="-" />
<MenuItem
Command="{ReflectionBinding Path=SignOut,
Source={x:Static s:UserService.Current}}"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
Header="{ReflectionBinding Path=Res.SignOut,
Mode=OneWay,
Source={x:Static s:ResourceService.Current}}"
IsVisible="{ReflectionBinding Path=User,
Mode=OneWay,
Source={x:Static s:UserService.Current},
Converter={StaticResource IsNullConverter},
ConverterParameter=invert}" />
<MenuItem
Command="{ReflectionBinding Path=ShowWindow,
Source={x:Static s:UserService.Current}}"
CommandParameter="{x:Static spp:AppEndPoint.LoginOrRegister}"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
Header="{ReflectionBinding Path=Res.LoginAndRegister,
Mode=OneWay,
Source={x:Static s:ResourceService.Current}}"
IsVisible="{ReflectionBinding Path=User,
Mode=OneWay,
Source={x:Static s:UserService.Current},
Converter={StaticResource IsNullConverter}}" />
</MenuFlyout>
</DropDownButton.Flyout>
</DropDownButton>
</StackPanel>
<Separator
Height="18"
src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/SettingsPage.axaml
+3 -1
View File
@@ -12,8 +12,10 @@
d:DesignWidth="1080"
x:CompileBindings="True"
x:DataType="spp:SettingsPageViewModel"
PreviewImage="{StaticResource AppIcon}"
mc:Ignorable="d">
<spp:PageBase.PreviewImage>
<ui:ImageIconSource Source="{Binding IconKey, Mode=OneWay, Converter={StaticResource BitmapAssetValueConverter}}" />
</spp:PageBase.PreviewImage>
<spp:PageBase.TabContent>
<TabStrip
Name="SettingsScrollTab"
src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_General.axaml
+6 -1
View File
@@ -14,7 +14,12 @@
x:DataType="spp:SettingsPageViewModel"
mc:Ignorable="d">
<StackPanel Margin="{StaticResource PageMargin}" Spacing="{StaticResource SettingsSpacing}">
<TextBlock Margin="0,0,0,5" Text="{ReflectionBinding Path=Res.Settings_General, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
<TextBlock
Margin="0,0,0,10"
Text="{ReflectionBinding Path=Res.Settings_General,
Mode=OneWay,
Source={x:Static s:ResourceService.Current}}"
Theme="{StaticResource SubtitleTextBlockStyle}" />
<spp:OptionsDisplayItem Description="系统启动时程序自动运行" Header="{ReflectionBinding Path=Res.Settings_General_StartAutoRun, Mode=OneWay, Source={x:Static s:ResourceService.Current}}">
<spp:OptionsDisplayItem.Icon>
<ui:FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE770;" />
src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Plugin.axaml
+48 -26
View File
@@ -14,18 +14,26 @@
x:DataType="spp:SettingsPageViewModel"
mc:Ignorable="d">
<StackPanel Margin="{StaticResource PageMargin}" Spacing="{StaticResource SettingsSpacing}">
<TextBlock Margin="0,0,0,5" Text="{ReflectionBinding Path=Res.Settings_Plugin, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
<TextBlock
Margin="0,0,0,10"
Text="{ReflectionBinding Path=Res.Settings_Plugin,
Mode=OneWay,
Source={x:Static s:ResourceService.Current}}"
Theme="{StaticResource SubtitleTextBlockStyle}" />
<ui:SettingsExpander Description="系统启动时程序自动运行" Header="{ReflectionBinding Path=Res.Settings_General_StartAutoRun, Mode=OneWay, Source={x:Static s:ResourceService.Current}}">
<ui:SettingsExpander Description="仅加载官方插件" Header="安全模式">
<ui:SettingsExpander.IconSource>
<ui:FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE770;" />
<ui:FontIconSource FontFamily="Segoe Fluent Icons" Glyph="{StaticResource DefenderApp}" />
</ui:SettingsExpander.IconSource>
<ui:SettingsExpander.Footer>
<ToggleSwitch Classes="LeftContent" IsChecked="{ReflectionBinding Source={x:Static ms:GeneralSettings.AutoRunOnStartup}, Path=Value, Mode=TwoWay}" />
<ToggleSwitch Classes="LeftContent" />
</ui:SettingsExpander.Footer>
</ui:SettingsExpander>
<TextBlock Margin="0,10,0,5" Text="已安装插件" />
<TextBlock
Margin="0,10,0,5"
Text="已安装插件"
Theme="{StaticResource BodyStrongTextBlockStyle}" />
<ItemsControl ItemsSource="{Binding Plugins}">
<ItemsControl.ItemsPanel>
@@ -43,24 +51,34 @@
<ui:ImageIconSource Source="{Binding Data.Icon, Converter={StaticResource BitmapAssetValueConverter}}" />
</ui:SettingsExpander.IconSource>
<ui:SettingsExpander.Footer>
<StackPanel Orientation="Horizontal" Spacing="8">
<ToggleSwitch Classes="LeftContent" />
<DropDownButton
Padding="8"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="{StaticResource More}"
FontFamily="{StaticResource SymbolThemeFontFamily}"
FontSize="20"
Theme="{StaticResource TransparentButton}">
<DropDownButton.Flyout>
<MenuFlyout>
<MenuItem Header="Tets" />
</MenuFlyout>
</DropDownButton.Flyout>
</DropDownButton>
</StackPanel>
<ToggleSwitch Classes="LeftContent" />
</ui:SettingsExpander.Footer>
<ui:SettingsExpanderItem
ActionIconSource="Refresh"
Content="检查更新"
IsClickEnabled="True">
<ui:SettingsExpanderItem.Description>
<MultiBinding StringFormat="{}{0}{1}">
<Binding
Mode="OneWay"
Path="Res.Plugin_Version"
Source="{x:Static s:ResourceService.Current}" />
<Binding Mode="OneWay" Path="Data.Version" />
</MultiBinding>
</ui:SettingsExpanderItem.Description>
</ui:SettingsExpanderItem>
<ui:SettingsExpanderItem
ActionIconSource="Open"
Content="打开插件文件夹"
IsClickEnabled="True" />
<ui:SettingsExpanderItem
ActionIconSource="Open"
Content="打开插件缓存文件夹"
IsClickEnabled="True" />
<ui:SettingsExpanderItem
ActionIconSource="Delete"
Content="删除"
IsClickEnabled="True" />
</ui:SettingsExpander>
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -90,8 +108,8 @@
<ui:ImageIconSource Source="{Binding Data.Icon, Converter={StaticResource BitmapAssetValueConverter}}" />
</ui:SettingsExpanderItem.IconSource>
<ui:SettingsExpanderItem.Footer>
<ToggleSwitch Classes="LeftContent" IsChecked="{Binding !IsDisable}" />
<!--<StackPanel Orientation="Horizontal" Spacing="8">
<!--<ToggleSwitch Classes="LeftContent" IsChecked="{Binding !IsDisable}" />-->
<StackPanel Orientation="Horizontal" Spacing="8">
<ToggleSwitch Classes="LeftContent" />
<DropDownButton
Padding="8"
@@ -103,11 +121,15 @@
Theme="{StaticResource TransparentButton}">
<DropDownButton.Flyout>
<MenuFlyout>
<MenuItem Header="Tets" />
<MenuItem Header="检查更新" />
<MenuItem Header="打开插件文件夹" />
<MenuItem Header="打开插件缓存文件夹" />
<MenuItem Header="-" />
<MenuItem Header="删除" />
</MenuFlyout>
</DropDownButton.Flyout>
</DropDownButton>
</StackPanel>-->
</StackPanel>
</ui:SettingsExpanderItem.Footer>
</ui:SettingsExpanderItem>
</DataTemplate>
src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_Steam.axaml
+6 -1
View File
@@ -14,7 +14,12 @@
x:DataType="spp:SettingsPageViewModel"
mc:Ignorable="d">
<StackPanel Margin="{StaticResource PageMargin}" Spacing="{StaticResource SettingsSpacing}">
<TextBlock Margin="0,0,0,5" Text="{ReflectionBinding Path=Res.Settings_Steam, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
<TextBlock
Margin="0,0,0,10"
Text="{ReflectionBinding Path=Res.Settings_Steam,
Mode=OneWay,
Source={x:Static s:ResourceService.Current}}"
Theme="{StaticResource SubtitleTextBlockStyle}" />
<spp:OptionsDisplayItem Description="{ReflectionBinding Source={x:Static ms:SteamSettings.SteamProgramPath}, Path=Value, Mode=OneWay}" Header="{ReflectionBinding Path=Res.Settings_Steam_Path, Mode=OneWay, Source={x:Static s:ResourceService.Current}}">
<spp:OptionsDisplayItem.Icon>
<ui:FontIcon FontFamily="Segoe Fluent Icons" Glyph="&#xE756;" />
src/BD.WTTS.Client.Avalonia/UI/Views/Pages/Settings/Settings_UI.axaml
+6 -1
View File
@@ -15,7 +15,12 @@
x:DataType="spp:SettingsPageViewModel"
mc:Ignorable="d">
<StackPanel Margin="{StaticResource PageMargin}" Spacing="{StaticResource SettingsSpacing}">
<TextBlock Margin="0,0,0,5" Text="{ReflectionBinding Path=Res.Settings_UI, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
<TextBlock
Margin="0,0,0,10"
Text="{ReflectionBinding Path=Res.Settings_UI,
Mode=OneWay,
Source={x:Static s:ResourceService.Current}}"
Theme="{StaticResource SubtitleTextBlockStyle}" />
<spp:OptionsDisplayItem
Description="设置程序的主题风格"
Header="{ReflectionBinding Path=Res.Settings_Theme,
src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/GameAccountPage.axaml.cs
-4
View File
@@ -12,10 +12,6 @@ public partial class GameAccountPage : PageBase<GameAccountPageViewModel>
InitializeComponent();
DataContext = new GameAccountPageViewModel();
Title = Strings.UserFastChange;
Subtitle = "插件作者: Steam++ 官方";
Description = "可支持自行添加多平台账号快速切换功能，Steam 可自动读取账号信息，其它平台请手动添加账号信息。 ";
//this.WhenActivated(disposable =>
//{
// ViewModel?.LoadPlatforms();
src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/GameListPage.axaml.cs
-4
View File
@@ -10,9 +10,5 @@ public partial class GameListPage : PageBase<GameListPageViewModel>
InitializeComponent();
DataContext = new GameListPageViewModel();
Title = Strings.GameList;
Subtitle = "插件作者: Steam++ 官方";
Description = "管理库存游戏";
}
}
src/BD.WTTS.Client.Plugins.GameTools/BD.WTTS.Client.Plugins.GameTools.csproj
+4
View File
@@ -6,6 +6,10 @@
<DefineConstants>WTTS_PLUGIN;WTTS_PLUGIN_GAMETOOLS;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="UI\Assets\toolbox.ico" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\AssemblyInfo.Xaml.cs">
<LinkBase>Properties</LinkBase>
src/BD.WTTS.Client.Plugins.GameTools/Plugins/Plugin.cs
+1 -1
View File
@@ -13,7 +13,7 @@ public sealed class Plugin : PluginBase<Plugin>, 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<TabItemViewModel>? GetMenuTabItems()
{
src/BD.WTTS.Client/UI/ViewModels/Abstractions/Items/ItemViewModel.cs
+2 -2
View File
@@ -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));
}
}
src/BD.WTTS.Client/UI/ViewModels/Pages/DebugPageViewModel.cs
+2
View File
@@ -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;
src/BD.WTTS.Client/UI/ViewModels/Pages/HomePageViewModel.cs
+2
View File
@@ -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<string> Navigations { get; set; }
src/BD.WTTS.Client/UI/ViewModels/Pages/SettingsPageViewModel.props.cs
+2
View File
@@ -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<string, string> _SelectLanguage;