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

整体UI改进

Browse Source
This commit is contained in:
rmbgame
2021-07-30 12:14:14 +08:00
parent a91abe6de5
commit bc25996f85
20 changed files with 285 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml
+5 -2
View File
@@ -163,7 +163,7 @@
</StreamGeometry>
<StreamGeometry x:Key="AddDrawing">
M14.5 13.0001V3.75391C14.5 3.33991 14.164 3.00391 13.75 3.00391C13.336 3.00391 13 3.33991 13 3.75391V13.0001H3.75388C3.33988 13.0001 3.00388 13.3361 3.00388 13.7501C3.00388 14.1641 3.33988 14.5001 3.75388 14.5001H13V23.7525C13 24.1665 13.336 24.5025 13.75 24.5025C14.164 24.5025 14.5 24.1665 14.5 23.7525V14.5001L23.7498 14.5032C24.1638 14.5032 24.4998 14.1672 24.4998 13.7532C24.4998 13.3392 24.1638 13.0032 23.7498 13.0032L14.5 13.0001Z
M11.8834 3.00673L12 3C12.5128 3 12.9355 3.38604 12.9933 3.88338L13 4V11H20C20.5128 11 20.9355 11.386 20.9933 11.8834L21 12C21 12.5128 20.614 12.9355 20.1166 12.9933L20 13H13V20C13 20.5128 12.614 20.9355 12.1166 20.9933L12 21C11.4872 21 11.0645 20.614 11.0067 20.1166L11 20V13H4C3.48716 13 3.06449 12.614 3.00673 12.1166L3 12C3 11.4872 3.38604 11.0645 3.88338 11.0067L4 11H11V4C11 3.48716 11.386 3.06449 11.8834 3.00673L12 3L11.8834 3.00673Z
</StreamGeometry>
<StreamGeometry x:Key="EditDrawing">
@@ -234,7 +234,10 @@
<StreamGeometry x:Key="InfoDrawing">
M14,2 C20.6274,2 26,7.37258 26,14 C26,20.6274 20.6274,26 14,26 C7.37258,26 2,20.6274 2,14 C2,7.37258 7.37258,2 14,2 Z M14,3.5 C8.20101,3.5 3.5,8.20101 3.5,14 C3.5,19.799 8.20101,24.5 14,24.5 C19.799,24.5 24.5,19.799 24.5,14 C24.5,8.20101 19.799,3.5 14,3.5 Z M14,11 C14.3796833,11 14.6934889,11.2821653 14.7431531,11.6482323 L14.75,11.75 L14.75,19.25 C14.75,19.6642 14.4142,20 14,20 C13.6203167,20 13.3065111,19.7178347 13.2568469,19.3517677 L13.25,19.25 L13.25,11.75 C13.25,11.3358 13.5858,11 14,11 Z M14,7 C14.5523,7 15,7.44772 15,8 C15,8.55228 14.5523,9 14,9 C13.4477,9 13,8.55228 13,8 C13,7.44772 13.4477,7 14,7 Z
</StreamGeometry>
<StreamGeometry x:Key="ClockArrowDownloadDrawing">
M3 9.5C3 5.35786 6.35786 2 10.5 2C14.6421 2 18 5.35786 18 9.5C18 13.6421 14.6421 17 10.5 17C10.4668 17 10.4336 16.9998 10.4005 16.9994C10.5633 16.6808 10.6959 16.3442 10.7947 15.9934C14.2478 15.8394 17 12.9911 17 9.5C17 5.91015 14.0899 3 10.5 3C7.00897 3 4.16073 5.75214 4.00657 9.20514C3.6558 9.30386 3.31924 9.43651 3.00064 9.5993C3.00022 9.56625 3 9.53315 3 9.5ZM10.5 5C10.7761 5 11 5.22386 11 5.5V9H13.5C13.7761 9 14 9.22386 14 9.5C14 9.77614 13.7761 10 13.5 10H10.5C10.2239 10 10 9.77614 10 9.5V5.5C10 5.22386 10.2239 5 10.5 5ZM5 10.0275C2.75002 10.2762 1 12.1837 1 14.5C1 16.9853 3.01472 19 5.5 19C7.98528 19 10 16.9853 10 14.5C10 12.1837 8.24998 10.2762 6 10.0275V13.7929L6.64645 13.1464C6.84171 12.9512 7.15829 12.9512 7.35355 13.1464C7.54882 13.3417 7.54882 13.6583 7.35355 13.8536L5.85355 15.3536C5.65829 15.5488 5.34171 15.5488 5.14645 15.3536L3.64645 13.8536C3.45118 13.6583 3.45118 13.3417 3.64645 13.1464C3.84171 12.9512 4.15829 12.9512 4.35355 13.1464L5 13.7929V10.0275ZM3.5 16H7.5C7.77614 16 8 16.2239 8 16.5C8 16.7761 7.77614 17 7.5 17H3.5C3.22386 17 3 16.7761 3 16.5C3 16.2239 3.22386 16 3.5 16Z
</StreamGeometry>
<!--菜单图标-->
<StreamGeometry x:Key="LocalAuthPageSvg">
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml
+4 -2
View File
@@ -19,7 +19,7 @@
x:Class="System.Application.UI.Views.Pages.ASF_BotPage">
<ScrollViewer HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"
Padding="{StaticResource ScrollMargin}">
Padding="0 0 0 10">
<ItemsRepeater Items="{CompiledBinding SteamBots}">
<ItemsRepeater.Layout>
<!--<UniformGridLayout ItemsJustification="SpaceEvenly" MinRowSpacing="20" Orientation="Horizontal"
@@ -29,7 +29,9 @@
<ItemsRepeater.ItemTemplate>
<DataTemplate>
<Border x:Name="card"
Classes="paper" Background="{DynamicResource ThemeBrushKey}">
Margin="10 0"
Classes="paper"
Background="{DynamicResource ThemeBrushKey}">
<!--<Border.Background>
<SolidColorBrush Color="{DynamicResource ThemeColorKey}"
Opacity="{ReflectionBinding Value,Source={x:Static ms:UISettings.AcrylicOpacity},Mode=OneWay}"/>
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
+10 -4
View File
@@ -186,7 +186,10 @@
Spacing="15"
HorizontalAlignment="Right"
VerticalAlignment="Center">
<TextBox Watermark="{ReflectionBinding Path=Res.Search,Mode=OneWay,Source={x:Static resx:R.Current}}" Text="{CompiledBinding SearchText,Mode=TwoWay}" VerticalAlignment="Center"
<TextBox Watermark="{ReflectionBinding Path=Res.Search,Mode=OneWay,Source={x:Static resx:R.Current}}"
Text="{CompiledBinding SearchText,Mode=TwoWay}"
VerticalAlignment="Center"
Background="Transparent"
Width="300"
MinWidth="200">
<TextBox.InnerLeftContent>
@@ -221,7 +224,10 @@
Text="{ReflectionBinding Path=Res.GameList_IsEmpty,Mode=OneWay,Source={x:Static resx:R.Current}}"
TextWrapping="WrapWithOverflow"
VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="0 0 0 10">
<ScrollViewer
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"
Padding="0 0 0 10">
<ItemsRepeater x:Name="Apps" Items="{Binding SteamApps}">
<ItemsRepeater.Layout>
<UniformGridLayout ItemsJustification="SpaceEvenly"
@@ -233,10 +239,10 @@
<ItemsRepeater.ItemTemplate>
<DataTemplate>
<StackPanel Spacing="8">
<Border DockPanel.Dock="Top"
<Border DockPanel.Dock="Top"
Cursor="Hand"
x:Name="AppAvater"
Classes="paper"
Classes="paper"
Width="{ReflectionBinding Value,Source={x:Static ms:UISettings.AppGridSize},Mode=OneWay}">
<FlyoutBase.AttachedFlyout>
<MenuFlyout Placement="Auto">
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml
+11 -4
View File
@@ -26,17 +26,24 @@
TextWrapping="WrapWithOverflow"></TextBlock>
</StackPanel>-->
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Padding="40 0 40 10">
<ScrollViewer HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"
Padding="20 0 20 10">
<ItemsRepeater Items="{Binding Authenticators,Mode=OneWay}">
<ItemsRepeater.Layout>
<UniformGridLayout ItemsJustification="SpaceAround"
MinRowSpacing="20" MaximumRowsOrColumns="8"/>
MinRowSpacing="20"
MaximumRowsOrColumns="8"/>
<!--<WrapLayout HorizontalSpacing="40"
VerticalSpacing="20" Orientation="Horizontal"></WrapLayout>-->
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate>
<Border x:Name="panel" Classes="paper" Width="250" Height="250" Background="{DynamicResource ThemeBrushKey}">
<Border x:Name="panel"
Classes="paper"
Width="250"
Height="250"
Background="{DynamicResource ThemeBrushKey}">
<Border.ContextMenu>
<ContextMenu>
<MenuItem
@@ -156,7 +163,7 @@
<Button Cursor="Hand"
Classes="flatbutton"
ToolTip.Tip="查看二维码" >
ToolTip.Tip="{ReflectionBinding Path=Res.LocalAuth_ExportAuth_ToQRCode,Mode=OneWay,Source={x:Static resx:R.Current}}" >
<Button.Content>
<PathIcon Data="{DynamicResource QRCodeDrawing}" Width="20"></PathIcon>
</Button.Content>
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
+110 -95
View File
@@ -17,7 +17,11 @@
x:CompileBindings="True"
x:Class="System.Application.UI.Views.Pages.ProxyScriptManagePage">
<DockPanel>
<Border DockPanel.Dock="Top" Classes="paper" Background="{DynamicResource ThemeBrushKey}" Padding="10" Margin="20 0 20 10">
<Border DockPanel.Dock="Top"
Classes="paper"
Background="{DynamicResource ThemeBrushKey}"
Padding="10"
Margin="{StaticResource ScrollMargin}">
<DockPanel>
<StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Left">
<ToggleSwitch Content="" OnContent="" OffContent=""
@@ -43,8 +47,14 @@
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="15" HorizontalAlignment="Right" VerticalAlignment="Center">
<TextBox Watermark="{ReflectionBinding Path=Res.Search,Mode=OneWay,Source={x:Static resx:R.Current}}" Text="{CompiledBinding SearchText,Mode=TwoWay}" VerticalAlignment="Center"
<StackPanel Orientation="Horizontal"
Spacing="15"
HorizontalAlignment="Right"
VerticalAlignment="Center">
<TextBox Watermark="{ReflectionBinding Path=Res.Search,Mode=OneWay,Source={x:Static resx:R.Current}}"
Text="{CompiledBinding SearchText,Mode=TwoWay}"
Background="Transparent"
VerticalAlignment="Center"
Width="300"
MinWidth="200">
<TextBox.InnerLeftContent>
@@ -61,11 +71,13 @@
<Panel>
<TextBlock IsVisible="{Binding IsProxyScriptsEmpty}"
Text="{ReflectionBinding Path=Res.ScriptConfig_ScriptEmptyTip,Mode=OneWay,Source={x:Static resx:R.Current}}"
TextWrapping="WrapWithOverflow"
VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
Text="{ReflectionBinding Path=Res.ScriptConfig_ScriptEmptyTip,Mode=OneWay,Source={x:Static resx:R.Current}}"
TextWrapping="WrapWithOverflow"
VerticalAlignment="Center"
HorizontalAlignment="Center"></TextBlock>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" Padding="{StaticResource ScrollMargin}">
<ScrollViewer HorizontalScrollBarVisibility="Disabled"
Padding="0 0 0 10">
<ItemsRepeater Items="{Binding ProxyScripts}">
<ItemsRepeater.Layout>
<StackLayout Spacing="20" Orientation="Vertical"/>
@@ -73,111 +85,114 @@
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate>
<Border Classes="paper" Background="{DynamicResource ThemeBrushKey}" Padding="20 10">
<DockPanel>
<Image Source="{Binding Icon}" DockPanel.Dock="Left"></Image>
<StackPanel Spacing="8" DockPanel.Dock="Right">
<DockPanel>
<controls:ScrollingTextBlock
Width="{Binding $parent.Width}"
Text="{Binding Name,Mode=OneWay}"
FontSize="16"
<Border Classes="paper"
Margin="20 0"
Background="{DynamicResource ThemeBrushKey}"
Padding="20 10">
<DockPanel>
<Image Source="{Binding Icon}" DockPanel.Dock="Left"></Image>
<StackPanel Spacing="8" DockPanel.Dock="Right">
<DockPanel>
<controls:ScrollingTextBlock
Width="{Binding $parent.Width}"
Text="{Binding Name,Mode=OneWay}"
FontSize="16"
VerticalAlignment="Center"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
<WrapPanel HorizontalAlignment="Right" VerticalAlignment="Center">
<TextBlock
Text="{Binding Author}"
FontSize="14"
VerticalAlignment="Center"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
<WrapPanel HorizontalAlignment="Right" VerticalAlignment="Center">
<TextBlock
Text="{Binding Author}"
FontSize="14"
VerticalAlignment="Center"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
<TextBlock Text=" / v" FontSize="14"></TextBlock>
<TextBlock
Text="{Binding Version}"
FontSize="14"
VerticalAlignment="Center"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
</WrapPanel>
</DockPanel>
<TextBlock Text=" / v" FontSize="14"></TextBlock>
<TextBlock
Text="{Binding Version}"
FontSize="14"
VerticalAlignment="Center"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
</WrapPanel>
</DockPanel>
<Separator Classes="Separator" Margin="0 0 0 5"></Separator>
<Separator Classes="Separator" Margin="0 0 0 5"></Separator>
<TextBlock
Width="{Binding $parent.Width}"
TextWrapping="WrapWithOverflow"
Text="{Binding Description}"
FontSize="12"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
<TextBlock
Width="{Binding $parent.Width}"
TextWrapping="WrapWithOverflow"
Text="{Binding Description}"
FontSize="12"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
<DockPanel VerticalAlignment="Bottom">
<StackPanel Orientation="Horizontal" Spacing="10">
<ToggleSwitch OnContent="" OffContent="" IsChecked="{Binding Enable,Mode=TwoWay}">
</ToggleSwitch>
<Button Background="Transparent" Cursor="Hand"
Command="{ReflectionBinding #u.DataContext.EditScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Edit,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="20" Data="{StaticResource CodeDrawing}" />
</Button>
<DockPanel VerticalAlignment="Bottom">
<StackPanel Orientation="Horizontal" Spacing="10">
<ToggleSwitch OnContent="" OffContent="" IsChecked="{Binding Enable,Mode=TwoWay}">
</ToggleSwitch>
<Button Background="Transparent" Cursor="Hand"
Command="{ReflectionBinding #u.DataContext.EditScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Edit,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="20" Data="{StaticResource CodeDrawing}" />
</Button>
<Button Background="Transparent" Cursor="Hand"
Command="{ReflectionBinding #u.DataContext.RefreshScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Refresh,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="16" Data="{StaticResource RefreshDrawing}" />
</Button>
<Button Background="Transparent" Cursor="Hand"
Command="{ReflectionBinding #u.DataContext.RefreshScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Refresh,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="16" Data="{StaticResource RefreshDrawing}" />
</Button>
<Button Background="Transparent" Cursor="Hand"
Command="{ReflectionBinding #u.DataContext.OpenHomeScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Home,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="16" Data="{StaticResource HomeDrawing}" />
</Button>
<Button Background="Transparent" Cursor="Hand"
Command="{ReflectionBinding #u.DataContext.OpenHomeScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Home,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="16" Data="{StaticResource HomeDrawing}" />
</Button>
<Button Background="Transparent" IsVisible="{Binding !IsBasics}" Cursor="Hand" HorizontalAlignment="Right"
Command="{ReflectionBinding #u.DataContext.DeleteScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Delete,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="20" Data="{StaticResource DeleteDrawing}" />
</Button>
<Button Background="Transparent" IsVisible="{Binding !IsBasics}" Cursor="Hand" HorizontalAlignment="Right"
Command="{ReflectionBinding #u.DataContext.DeleteScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Delete,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="20" Data="{StaticResource DeleteDrawing}" />
</Button>
</StackPanel>
</StackPanel>
<WrapPanel
DockPanel.Dock="Right"
HorizontalAlignment="Right"
VerticalAlignment="Center"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Update,Mode=OneWay,Source={x:Static resx:R.Current}}"
IsVisible="{Binding IsUpdate}">
<!--<Button Background="Transparent" IsVisible="{Binding IsUpdate}" Cursor="Hand" HorizontalAlignment="Right"
<WrapPanel
DockPanel.Dock="Right"
HorizontalAlignment="Right"
VerticalAlignment="Center"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Update,Mode=OneWay,Source={x:Static resx:R.Current}}"
IsVisible="{Binding IsUpdate}">
<!--<Button Background="Transparent" IsVisible="{Binding IsUpdate}" Cursor="Hand" HorizontalAlignment="Right"
Command="{ReflectionBinding #u.DataContext.DownloadScriptItemButton}"
CommandParameter="{Binding}"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_Update,Mode=OneWay,Source={x:Static resx:R.Current}}">
<PathIcon Width="20" Height="20" Data="{StaticResource DownloadDrawing}" />
</Button>-->
<controls:ProgressRing IsIndeterminate="True"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_ImportLoading,Mode=OneWay,Source={x:Static resx:R.Current}}" HorizontalAlignment="Stretch" Height="30" Width="30"
IsVisible="{Binding IsLoading}" />
<Button Classes="Hyperlink"
Command="{ReflectionBinding #u.DataContext.DownloadScriptItemButton}"
CommandParameter="{Binding}"
Content="{Binding NewVersion,StringFormat={}v{0}}"
FontSize="{DynamicResource FontSizeH7}"
VerticalContentAlignment="Center"
VerticalAlignment="Center"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
<Ellipse VerticalAlignment="Center"
HorizontalAlignment="Center"
Height="6" Width="6" Margin="5 0"
Fill="{DynamicResource ValidationErrorColorKey}">
</Ellipse>
</WrapPanel>
</DockPanel>
</StackPanel>
</DockPanel>
</Border>
<controls:ProgressRing IsIndeterminate="True"
ToolTip.Tip="{ReflectionBinding Path=Res.Script_ImportLoading,Mode=OneWay,Source={x:Static resx:R.Current}}" HorizontalAlignment="Stretch" Height="30" Width="30"
IsVisible="{Binding IsLoading}" />
<Button Classes="Hyperlink"
Command="{ReflectionBinding #u.DataContext.DownloadScriptItemButton}"
CommandParameter="{Binding}"
Content="{Binding NewVersion,StringFormat={}v{0}}"
FontSize="{DynamicResource FontSizeH7}"
VerticalContentAlignment="Center"
VerticalAlignment="Center"
Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
<Ellipse VerticalAlignment="Center"
HorizontalAlignment="Center"
Height="6" Width="6" Margin="5 0"
Fill="{DynamicResource ValidationErrorColorKey}">
</Ellipse>
</WrapPanel>
</DockPanel>
</StackPanel>
</DockPanel>
</Border>
</DataTemplate>
</ItemsRepeater.ItemTemplate>
</ItemsRepeater>
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml
+5 -3
View File
@@ -20,7 +20,7 @@
VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
<ScrollViewer HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"
Padding="{StaticResource ScrollMargin}">
Padding="0 0 0 10">
<ItemsRepeater Items="{CompiledBinding SteamUsers}">
<ItemsRepeater.Layout>
<!--<UniformGridLayout ItemsJustification="SpaceEvenly" MinRowSpacing="20" Orientation="Horizontal"
@@ -29,8 +29,10 @@
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate>
<Border x:Name="card"
Classes="paper" Background="{DynamicResource ThemeBrushKey}">
<Border x:Name="card"
Margin="20 0"
Classes="paper"
Background="{DynamicResource ThemeBrushKey}">
<!--<Border.Background>
<SolidColorBrush Color="{DynamicResource ThemeColorKey}"
Opacity="{ReflectionBinding Value,Source={x:Static ms:UISettings.AcrylicOpacity},Mode=OneWay}"/>
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/EditAppInfoWindow.axaml.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using System.Application.UI.ViewModels;
namespace System.Application.UI.Views.Windows
{
public class EditAppInfoWindow : FluentWindow<ASF_AddBotWindowViewModel>
public class EditAppInfoWindow : FluentWindow<EditAppInfoWindowViewModel>
{
public EditAppInfoWindow() : base()
{
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/HideAppWindow.axaml
+7 -1
View File
@@ -58,7 +58,13 @@
VerticalAlignment="Center"
HorizontalAlignment="Right"
Foreground="{DynamicResource HighlightForegroundBrushKey}"></Button>-->
<Border DockPanel.Dock="Bottom" Grid.Column="1" Grid.Row="1" Classes="paper" Margin="10" Padding="20 0" Background="{DynamicResource ThemeBrushKey}">
<Border DockPanel.Dock="Bottom"
Grid.Column="1"
Grid.Row="1"
Classes="paper"
Margin="10"
Padding="20 0"
Background="{DynamicResource ThemeBrushKey}">
<!--<DockPanel Margin="0 10">
-->
<!--<CheckBox MinWidth="20"
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/IdleAppWindow.axaml
+23 -17
View File
@@ -22,8 +22,13 @@
x:CompileBindings="True">
<Panel>
<controls:TitleBar></controls:TitleBar>
<DockPanel Grid.Column="1" Grid.RowSpan="2" Margin="0 30 0 0">
<Border DockPanel.Dock="Top" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Classes="paper" Background="{DynamicResource ThemeBrushKey}" Padding="10" Margin="20 20 20 0">
<DockPanel Margin="0 30 0 0">
<Border
DockPanel.Dock="Top"
Classes="paper"
Background="{DynamicResource ThemeBrushKey}"
Padding="10"
Margin="10 10 10 0">
<DockPanel>
<StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Left">
<controls:ProgressRing IsIndeterminate="True"
@@ -62,25 +67,27 @@
</Button>
<TextBlock IsVisible="{CompiledBinding RunState}" VerticalAlignment="Center" Text="{Binding RuningCountTxt}" TextTrimming="CharacterEllipsis"/>
</StackPanel>
<ToggleSwitch Content="" OnContent="" OffContent=""
HorizontalAlignment="Right"
Margin="5 0 0 5"
IsChecked="{Binding Source={x:Static service:SteamConnectService.Current},Path=IsAutoAFKApps}"
ToolTip.Tip="{ReflectionBinding Path=Res.GameList_AutoAFK,Mode=OneWay,Source={x:Static resx:R.Current}}"
VerticalAlignment="Center">
<ToggleSwitch Content=""
OnContent=""
OffContent=""
HorizontalAlignment="Right"
Margin="5 0 0 5"
IsChecked="{Binding Source={x:Static service:SteamConnectService.Current},Path=IsAutoAFKApps}"
ToolTip.Tip="{ReflectionBinding Path=Res.GameList_AutoAFK,Mode=OneWay,Source={x:Static resx:R.Current}}"
VerticalAlignment="Center">
</ToggleSwitch>
</DockPanel>
</Border>
<ScrollViewer HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"
Padding="20">
<StackPanel>
VerticalScrollBarVisibility="Auto"
Padding="10">
<Panel>
<TextBlock IsVisible="{CompiledBinding IsIdleAppEmpty}"
Text="{ReflectionBinding Path=Res.GameList_AddIdeaAppEmpty,Mode=OneWay,Source={x:Static resx:R.Current}}"
TextWrapping="WrapWithOverflow"
VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
Text="{ReflectionBinding Path=Res.GameList_AddIdeaAppEmpty,Mode=OneWay,Source={x:Static resx:R.Current}}"
TextWrapping="WrapWithOverflow"
VerticalAlignment="Center"
HorizontalAlignment="Center"></TextBlock>
<ItemsRepeater Items="{Binding IdleGameList}">
<ItemsRepeater.Layout>
<UniformGridLayout ItemsJustification="SpaceEvenly" MinRowSpacing="10" MinColumnSpacing="20" MaximumRowsOrColumns="10" ItemsStretch="Fill" />
@@ -178,8 +185,7 @@
</DataTemplate>
</ItemsRepeater.ItemTemplate>
</ItemsRepeater>
</StackPanel>
</Panel>
</ScrollViewer>
</DockPanel>
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/SteamShutdownWindow.axaml
+36
View File
@@ -0,0 +1,36 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Width="600" Height="450"
x:Class="System.Application.UI.Views.Windows.SteamShutdownWindow"
xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop"
xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
xmlns:controls="clr-namespace:System.Application.UI.Views.Controls"
xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop"
FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}"
Background="Transparent"
ExtendClientAreaTitleBarHeightHint="30"
Title="{Binding Title}"
x:DataType="vm:SteamShutdownWindowViewModel"
x:CompileBindings="True">
<Panel>
<controls:TitleBar></controls:TitleBar>
<Border
Classes="paper"
Background="{DynamicResource ThemeBrushKey}"
Padding="10"
Margin="20 30 20 0">
<DockPanel>
<StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Left">
<Button
Background="Transparent"
Cursor="Hand">
<PathIcon Width="16" Height="16" Data="{DynamicResource PauseCircleDrawing}"/>
</Button>
</StackPanel>
</DockPanel>
</Border>
</Panel>
</Window>
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/SteamShutdownWindow.axaml.cs
+23
View File
@@ -0,0 +1,23 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using System.Application.UI.ViewModels;
namespace System.Application.UI.Views.Windows
{
public class SteamShutdownWindow : FluentWindow<SteamShutdownWindowViewModel>
{
public SteamShutdownWindow() : base()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
}
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
+2 -1
View File
@@ -10,7 +10,8 @@
xmlns:controls="clr-namespace:System.Application.UI.Views.Controls"
xmlns:ms="clr-namespace:System.Application.Models.Settings;assembly=System.Application.SteamTools.Client.Desktop"
FontFamily="{Binding Source={x:Static ms:UISettings.FontName},Path=Value, Mode=OneWay,Converter={StaticResource NameToFontFamilyConverter}}"
MinWidth="800" MinHeight="600"
MinWidth="600"
MinHeight="400"
WindowStartupLocation="CenterOwner"
ExtendClientAreaTitleBarHeightHint="30"
Background="Transparent"
src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
+6
View File
@@ -58,4 +58,10 @@
<ItemGroup Condition="'$(Configuration)'=='Debug'">
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0015092-beta" />
</ItemGroup>
<ItemGroup>
<Compile Update="Application\UI\Views\Windows\GameListPage\SteamShutdownWindow.axaml.cs">
<DependentUpon>SteamShutdownWindow.axaml</DependentUpon>
</Compile>
</ItemGroup>
</Project>
src/ST.Client.Desktop/CustomWindow.cs
+1
View File
@@ -29,6 +29,7 @@ namespace System.Application
WebView3,
BindPhoneNumber,
ASF_AddBot,
SteamShutdown,
#endif
}
}
src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
Generated
+9
View File
@@ -1376,6 +1376,15 @@ namespace System.Application.UI.Resx {
}
}
/// <summary>
/// 查找类似 Steam下载完成定时关机 的本地化字符串。
/// </summary>
public static string GameList_SteamShutdown {
get {
return ResourceManager.GetString("GameList_SteamShutdown", resourceCulture);
}
}
/// <summary>
/// 查找类似 全部暂停 的本地化字符串。
/// </summary>
src/ST.Client.Desktop/UI/Resx/AppResources.resx
+3
View File
@@ -1474,6 +1474,9 @@
</data>
<data name="RememberChooseNotToAskAgain" xml:space="preserve">
<value>记住我的选择下次不再询问</value>
</data>
<data name="GameList_SteamShutdown" xml:space="preserve">
<value>Steam下载完成定时关机</value>
</data>
<data name="Translators" xml:space="preserve">
<value>社区翻译</value>
src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
+2 -2
View File
@@ -107,8 +107,8 @@ namespace System.Application.UI.ViewModels
public void Initialize()
{
Threading.Thread.CurrentThread.IsBackground = true;
Task.Run(ProxyService.Current.Initialize).ForgetAndDispose();
Task.Run(SteamConnectService.Current.Initialize).ForgetAndDispose();
ProxyService.Current.Initialize();
SteamConnectService.Current.Initialize();
if (!IsInitialized)
{
src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs
+10
View File
@@ -115,6 +115,7 @@ namespace System.Application.UI.ViewModels
HideAppCommand = ReactiveCommand.Create(OpenHideAppWindow);
IdleAppCommand = ReactiveCommand.Create(OpenIdleAppWindow);
SteamShutdownCommand = ReactiveCommand.Create(OpenSteamShutdownAppWindow);
EnableAFKAutoUpdateCommand = ReactiveCommand.Create(() =>
{
@@ -130,6 +131,8 @@ namespace System.Application.UI.ViewModels
IconKey ="EyeHideDrawing", Command = HideAppCommand },
new MenuItemViewModel (nameof(AppResources.GameList_IdleGamesManger)){
IconKey ="TopSpeedDrawing", Command = IdleAppCommand },
new MenuItemViewModel (nameof(AppResources.GameList_SteamShutdown)){
IconKey ="ClockArrowDownloadDrawing", Command = SteamShutdownCommand },
};
AFKAutoUpdate?.CheckmarkChange(SteamConnectService.Current.IsAutoAFKApps);
@@ -137,6 +140,7 @@ namespace System.Application.UI.ViewModels
public ReactiveCommand<Unit, Unit> EnableAFKAutoUpdateCommand { get; }
public MenuItemViewModel? AFKAutoUpdate { get; }
public void OpenHideAppWindow()
{
IShowWindowService.Instance.Show(CustomWindow.HideApp, new HideAppWindowViewModel(), string.Empty, ResizeModeCompat.CanResize);
@@ -147,8 +151,14 @@ namespace System.Application.UI.ViewModels
IShowWindowService.Instance.Show(CustomWindow.IdleApp, new IdleAppWindowViewModel(), string.Empty, ResizeModeCompat.CanResize);
}
public void OpenSteamShutdownAppWindow()
{
IShowWindowService.Instance.Show(CustomWindow.SteamShutdown, new IdleAppWindowViewModel(), string.Empty, ResizeModeCompat.CanResize);
}
public ReactiveCommand<Unit, Unit> HideAppCommand { get; }
public ReactiveCommand<Unit, Unit> IdleAppCommand { get; }
public ReactiveCommand<Unit, Unit> SteamShutdownCommand { get; }
public override void Activation()
{
src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/SteamShutdownWindowViewModel.cs
+17
View File
@@ -0,0 +1,17 @@
using Newtonsoft.Json.Linq;
using System.Application.Models;
using System.Application.UI.Resx;
using System.Properties;
namespace System.Application.UI.ViewModels
{
public class SteamShutdownWindowViewModel : WindowViewModel
{
public SteamShutdownWindowViewModel() : base()
{
Title = ThisAssembly.AssemblyTrademark + " | " + AppResources.GameList_SteamShutdown;
}
}
}
src/ST.Client.Desktop/UI/ViewModels/Windows/ShareManagePage/ShareManageViewModel.cs → src/ST.Client.Desktop/UI/ViewModels/Windows/SteamAccountPage/ShareManageViewModel.cs
View File