diff --git a/ref/DirectoryPackages b/ref/DirectoryPackages index f785a0bae84..8659d89b2d5 160000 --- a/ref/DirectoryPackages +++ b/ref/DirectoryPackages @@ -1 +1 @@ -Subproject commit f785a0bae844450281a58f5acab260205f68f4a7 +Subproject commit 8659d89b2d540801ab1599d0f777dd996f8f9e3c diff --git a/ref/SteamClient b/ref/SteamClient index 198ec9d8c96..e777bfe1f8b 160000 --- a/ref/SteamClient +++ b/ref/SteamClient @@ -1 +1 @@ -Subproject commit 198ec9d8c96e41aa1cd76f0aa26f5064564feaf8 +Subproject commit e777bfe1f8bd6177b830ce2a072eae0fb0394f0b diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/CarouselBanner.axaml.cs b/src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/CarouselBanner.axaml.cs index eac84a71d98..f634af94dd4 100644 --- a/src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/CarouselBanner.axaml.cs +++ b/src/BD.WTTS.Client.Avalonia/UI/Views/Controls/Widgets/CarouselBanner.axaml.cs @@ -92,7 +92,7 @@ public CarouselBanner() CarouselControl[!Carousel.ItemsSourceProperty] = this[!ItemsSourceProperty]; CarouselControl[!Carousel.ItemTemplateProperty] = this[!ItemTemplateProperty]; - this.GetObservable(ItemsSourceProperty) + CarouselControl.GetObservable(Carousel.ItemCountProperty) .Subscribe(_ => SwipersLoad()); CarouselControl.GetObservable(Carousel.SelectedIndexProperty) @@ -122,6 +122,40 @@ public CarouselBanner() }); } + //protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) + //{ + // if (change.Property == ItemsSourceProperty) + // { + // SwipersLoad(); + // } + // else if (change.Property == AutoScrollProperty) + // { + // if (change.NewValue is bool x) + // { + // if (x && _timer == null) + // { + // _timer = new Timer(_ => + // { + // if (!this.IsPointerOver) + // { + // Dispatcher.UIThread.Post(SwiperNext, DispatcherPriority.Background); + // } + // }, nameof(AutoScroll), AutoScrollInterval, AutoScrollInterval); + // } + // else + // { + // if (_timer != null) + // { + // _timer.Dispose(); + // _timer = null; + // } + // } + // } + // } + + // base.OnPropertyChanged(change); + //} + private void CarouselBannerIndexButton_Click(object? sender, RoutedEventArgs e) { if (sender is Button button && button.Tag is int index) diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/ProxyChartView.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/ProxyChartView.axaml.cs index f67ac58b291..0deb019e979 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/ProxyChartView.axaml.cs +++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/ProxyChartView.axaml.cs @@ -24,7 +24,7 @@ public partial class ProxyChartView : UserControl YToolTipLabelFormatter = (e) => $"{IOPath.GetDisplayFileSizeString(e.Coordinate.PrimaryValue)}/s", Mapping = (rate, point) => { - point.Coordinate = new(rate.Timestamp, rate.Rate); + return new(rate.Timestamp, rate.Rate); //point.PrimaryValue = rate.Rate; //point.SecondaryValue = rate.Timestamp; } @@ -43,7 +43,7 @@ public partial class ProxyChartView : UserControl YToolTipLabelFormatter = (e) => $"{IOPath.GetDisplayFileSizeString(e.Coordinate.PrimaryValue)}/s", Mapping = (rate, point) => { - point.Coordinate = new(rate.Timestamp, rate.Rate); + return new(rate.Timestamp, rate.Rate); //point.PrimaryValue = rate.Rate; //point.SecondaryValue = rate.Timestamp; } diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/GameListPageViewModel.cs b/src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/GameListPageViewModel.cs index fb0f365b9a3..554f40dba93 100644 --- a/src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/GameListPageViewModel.cs +++ b/src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/GameListPageViewModel.cs @@ -208,7 +208,7 @@ public static void ManageCloudArchive_Click(SteamApp app) { if (!ISteamService.Instance.IsRunningSteamProcess) { - Toast.Show(ToastIcon.Warning, Strings.GameList_SteamNotRuning); + Toast.Show(ToastIcon.Warning, Strings.SteamNotRuning); return; } @@ -221,7 +221,7 @@ public static async void UnlockAchievement_Click(SteamApp app) { if (!ISteamService.Instance.IsRunningSteamProcess) { - Toast.Show(ToastIcon.Warning, Strings.GameList_SteamNotRuning); + Toast.Show(ToastIcon.Warning, Strings.SteamNotRuning); return; } switch (app.Type) diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/IdleAppsPageViewModel.cs b/src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/IdleAppsPageViewModel.cs index 791333d77b6..33b8f715b29 100644 --- a/src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/IdleAppsPageViewModel.cs +++ b/src/BD.WTTS.Client.Plugins.GameList/UI/ViewModels/Pages/IdleAppsPageViewModel.cs @@ -177,7 +177,7 @@ public async void RunOrStopAllButton_Click() } else { - await MessageBox.ShowAsync(Strings.GameList_SteamNotRuning, button: MessageBox.Button.OK); + await MessageBox.ShowAsync(Strings.SteamNotRuning, button: MessageBox.Button.OK); } } @@ -202,7 +202,7 @@ public async void RunStopBtn_Click(SteamApp app) } else { - await MessageBox.ShowAsync(Strings.GameList_SteamNotRuning, button: MessageBox.Button.OK); + await MessageBox.ShowAsync(Strings.SteamNotRuning, button: MessageBox.Button.OK); } } diff --git a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/ViewModels/IdleCardPageViewModel.cs b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/ViewModels/IdleCardPageViewModel.cs index c3fc3a24db2..90035a12c0a 100644 --- a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/ViewModels/IdleCardPageViewModel.cs +++ b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/ViewModels/IdleCardPageViewModel.cs @@ -50,7 +50,7 @@ public async void IdleRunStartOrStop_Click() { if (!SteamTool.IsRunningSteamProcess) { - await MessageBox.ShowAsync(Strings.Idle_SteamNotRuning, button: MessageBox.Button.OK); + await MessageBox.ShowAsync(Strings.SteamNotRuning, button: MessageBox.Button.OK); return; } diff --git a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleCardPage.axaml b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleCardPage.axaml index 18bbeed299e..ad17f48c2b0 100644 --- a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleCardPage.axaml +++ b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleCardPage.axaml @@ -3,6 +3,8 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:i="using:Avalonia.Xaml.Interactivity" + xmlns:ia="using:Avalonia.Xaml.Interactions.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:s="https://steampp.net/services" xmlns:spp="https://steampp.net/ui" @@ -219,24 +221,49 @@ Expands="True" IsExpanded="True"> - + + - + - + + + + + + + + + + + - /// 查找类似 启动时自动启动加速 的本地化字符串。 + /// 查找类似 启动时自动开启加速 的本地化字符串。 /// public static string CommunityFix_AutoRunProxy { get { @@ -3032,15 +3032,6 @@ public static string GameList_SetCustomImage { } } - /// - /// 查找类似 Steam 未启动 的本地化字符串。 - /// - public static string GameList_SteamNotRuning { - get { - return ResourceManager.GetString("GameList_SteamNotRuning", resourceCulture); - } - } - /// /// 查找类似 Steam 下载完成定时关机 的本地化字符串。 /// @@ -3492,15 +3483,6 @@ public static string Idle_RuningCount { } } - /// - /// 查找类似 Steam 未启动 的本地化字符串。 - /// - public static string Idle_SteamNotRuning { - get { - return ResourceManager.GetString("Idle_SteamNotRuning", resourceCulture); - } - } - /// /// 查找类似 关闭自动切换游戏 的本地化字符串。 /// @@ -6883,6 +6865,24 @@ public static string SteamIdle_IdleAppTags_ { } } + /// + /// 查找类似 未启动挂卡 的本地化字符串。 + /// + public static string SteamIdle_IdleNotRuning { + get { + return ResourceManager.GetString("SteamIdle_IdleNotRuning", resourceCulture); + } + } + + /// + /// 查找类似 正在挂卡 的本地化字符串。 + /// + public static string SteamIdle_IdleRuning { + get { + return ResourceManager.GetString("SteamIdle_IdleRuning", resourceCulture); + } + } + /// /// 查找类似 {0} 个游戏可掉落卡牌 的本地化字符串。 /// @@ -6940,9 +6940,9 @@ public static string SteamLoginImport { /// /// 查找类似 Steam 未启动 的本地化字符串。 /// - public static string SteamNoRuning { + public static string SteamNotRuning { get { - return ResourceManager.GetString("SteamNoRuning", resourceCulture); + return ResourceManager.GetString("SteamNotRuning", resourceCulture); } } diff --git a/src/BD.WTTS.Client/Resources/Strings.resx b/src/BD.WTTS.Client/Resources/Strings.resx index 17980eb148e..87ea4f22a62 100644 --- a/src/BD.WTTS.Client/Resources/Strings.resx +++ b/src/BD.WTTS.Client/Resources/Strings.resx @@ -246,7 +246,7 @@ 没有启用任何加速项！！ - 启动时自动启动加速 + 启动时自动开启加速 移除证书 @@ -499,9 +499,6 @@ 设置自定义封面 - - - Steam 未启动 全部暂停 @@ -2719,9 +2716,6 @@ 正在运行 {0}/{1} - - - Steam 未启动 关闭自动切换游戏 @@ -2853,7 +2847,13 @@ Steam 已启动 - + Steam 未启动 + + + 正在挂卡 + + + 未启动挂卡 \ No newline at end of file