From bc25996f85aad52c266d21113aa48a4064bbd806 Mon Sep 17 00:00:00 2001 From: rmbgame Date: Fri, 30 Jul 2021 12:11:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93UI=E6=94=B9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Application/UI/Styles/DrawingSvg.xaml | 7 +- .../ArchiSteamFarmPlus/ASF_BotPage.axaml | 6 +- .../UI/Views/Pages/GameListPage.axaml | 14 +- .../UI/Views/Pages/LocalAuthPage.axaml | 15 +- .../Views/Pages/ProxyScriptManagePage.axaml | 205 ++++++++++-------- .../UI/Views/Pages/SteamAccountPage.axaml | 8 +- .../GameListPage/EditAppInfoWindow.axaml.cs | 2 +- .../Windows/GameListPage/HideAppWindow.axaml | 8 +- .../Windows/GameListPage/IdleAppWindow.axaml | 40 ++-- .../GameListPage/SteamShutdownWindow.axaml | 36 +++ .../GameListPage/SteamShutdownWindow.axaml.cs | 23 ++ .../Windows/LocalAuthPage/AddAuthWindow.axaml | 3 +- .../ST.Client.Desktop.Avalonia.csproj | 6 + src/ST.Client.Desktop/CustomWindow.cs | 1 + .../UI/Resx/AppResources.Designer.cs | 9 + .../UI/Resx/AppResources.resx | 3 + .../UI/ViewModels/MainWindowViewModel.cs | 4 +- .../ViewModels/Pages/GameListPageViewModel.cs | 10 + .../SteamShutdownWindowViewModel.cs | 17 ++ .../ShareManageViewModel.cs | 0 20 files changed, 285 insertions(+), 132 deletions(-) create mode 100644 src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/SteamShutdownWindow.axaml create mode 100644 src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/GameListPage/SteamShutdownWindow.axaml.cs create mode 100644 src/ST.Client.Desktop/UI/ViewModels/Windows/GameListPage/SteamShutdownWindowViewModel.cs rename src/ST.Client.Desktop/UI/ViewModels/Windows/{ShareManagePage => SteamAccountPage}/ShareManageViewModel.cs (100%) diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml index 292e91de1..208267b68 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml @@ -163,7 +163,7 @@ - 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 @@ -234,7 +234,10 @@ 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 - + + + 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 + diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml index 67535327a..00a57c94a 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_BotPage.axaml @@ -19,7 +19,7 @@ x:Class="System.Application.UI.Views.Pages.ASF_BotPage"> + Padding="0 0 0 10"> - + + MinRowSpacing="20" + MaximumRowsOrColumns="8"/> - + + ToolTip.Tip="{ReflectionBinding Path=Res.LocalAuth_ExportAuth_ToQRCode,Mode=OneWay,Source={x:Static resx:R.Current}}" > diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml index 36072acf6..d6b61008b 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml @@ -17,7 +17,11 @@ x:CompileBindings="True" x:Class="System.Application.UI.Views.Pages.ProxyScriptManagePage"> - + - - + @@ -61,11 +71,13 @@ + Text="{ReflectionBinding Path=Res.ScriptConfig_ScriptEmptyTip,Mode=OneWay,Source={x:Static resx:R.Current}}" + TextWrapping="WrapWithOverflow" + VerticalAlignment="Center" + HorizontalAlignment="Center"> - + @@ -73,111 +85,114 @@ - - - - - - + + + + + + + + - - + + + + - - - - + - - - + - - - - - + + + + + - + - + - + - + - - - -