diff --git a/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj b/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj index a3e4017ab..af51800a1 100644 --- a/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj +++ b/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj @@ -1,109 +1,109 @@ - - WinExe - - net6.0 - false - - System.Application.UI - Steam++ - + + WinExe + + net6.0 + false + + System.Application.UI + Steam++ + - - Exe - + + Exe + - - - - - WINDOWS;$(DefineConstants) - ..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico - Properties\app.manifest - - AnyCPU;x86 - x86 - - win7-x86 - - - + AnyCPU;x86 + x86 + + win7-x86 + + + - - MAC;$(DefineConstants) - + + MAC;$(DefineConstants) + - - true - false - - false - link - true - - false - false - false - false - false - false - true - none - false - + + true + false + + false + link + true + + false + false + false + false + false + false + true + none + false + - - - - - Properties\AssemblyInfo.cs - - - Properties\AssemblyInfo.Version.cs - - + + + + Properties\AssemblyInfo.cs + + + Properties\AssemblyInfo.Version.cs + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - - - - %(Filename) - - - Designer - - - + + + %(Filename) + + + Designer + + + - - - - Steam++.VisualElementsManifest.xml - PreserveNewest - - - Assets\VisualElements_150.png - PreserveNewest - - - Assets\VisualElements_70.png - PreserveNewest - - + + + + Steam++.VisualElementsManifest.xml + PreserveNewest + + + Assets\VisualElements_150.png + PreserveNewest + + + Assets\VisualElements_70.png + PreserveNewest + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + \ No newline at end of file diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml index f396b3124..c4d4228ad 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml @@ -7,6 +7,11 @@ + + + @@ -86,4 +91,6 @@ + + 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 4aa0f661e..3e9cc8ae2 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/DrawingSvg.xaml @@ -38,7 +38,7 @@ - M2.03232 10.8235C3.30375 7.4536 6.11499 5.00001 10 5C10 5 10 5 10 5C10.9903 5 11.9108 5.15942 12.7539 5.4528C12.6897 5.51683 12.6305 5.5875 12.5775 5.66454L12.1362 6.30501C11.6203 6.15035 11.0742 6.05182 10.5 6.01562V8.5C10.5 8.77614 10.2761 9 10 9C9.72386 9 9.5 8.77614 9.5 8.5V6.01562C7.26102 6.15679 5.44841 7.2458 4.19563 8.91472C4.23196 8.93019 4.26703 8.95025 4.30003 8.975L5.80003 10.1C6.02094 10.2657 6.06571 10.5791 5.90003 10.8C5.73434 11.0209 5.42094 11.0657 5.20003 10.9L3.70003 9.775C3.68303 9.76225 3.66707 9.74862 3.65216 9.73422C3.38855 10.1854 3.15982 10.6679 2.96795 11.1765C2.87047 11.4349 2.582 11.5653 2.32363 11.4678C2.06527 11.3703 1.93485 11.0819 2.03232 10.8235ZM15.2274 7.01399C15.2418 6.9731 15.2544 6.93196 15.265 6.89068C16.4641 7.90487 17.3805 9.26636 17.9679 10.8235C18.0654 11.0819 17.935 11.3703 17.6766 11.4678C17.4183 11.5653 17.1298 11.4349 17.0323 11.1765C16.8404 10.6679 16.6117 10.1853 16.348 9.7341C16.3331 9.74854 16.3171 9.76221 16.3 9.775L14.8 10.9C14.5791 11.0657 14.2657 11.0209 14.1 10.8C13.9343 10.5791 13.9791 10.2657 14.2 10.1L15.7 8.975C15.7331 8.95022 15.7682 8.93015 15.8046 8.91467C15.5325 8.5523 15.2341 8.21726 14.9106 7.91334L15.2274 7.01399ZM14.0228 6.06969C14.2463 6.18305 14.3514 6.44438 14.2685 6.68091L11.6305 14.2119C11.5067 14.5653 11.324 14.8951 11.0901 15.1874C9.9994 16.5509 7.8528 15.3598 8.39971 13.7191C8.49783 13.4247 8.63686 13.1453 8.81259 12.8894L13.3845 6.23255C13.5264 6.02596 13.7993 5.95633 14.0228 6.06969Z + M12 5C16.6944 5 20.5 8.80558 20.5 13.5C20.5 18.1944 16.6944 22 12 22C7.30558 22 3.5 18.1944 3.5 13.5C3.5 8.80558 7.30558 5 12 5ZM12 6.5C8.13401 6.5 5 9.63401 5 13.5C5 17.366 8.13401 20.5 12 20.5C15.866 20.5 19 17.366 19 13.5C19 9.63401 15.866 6.5 12 6.5ZM12 8C12.3797 8 12.6935 8.28215 12.7432 8.64823L12.75 8.75V13.25C12.75 13.6642 12.4142 14 12 14C11.6203 14 11.3065 13.7178 11.2568 13.3518L11.25 13.25V8.75C11.25 8.33579 11.5858 8 12 8ZM19.1472 5.11371L19.2298 5.17355L20.3882 6.13773C20.7066 6.40272 20.7498 6.87562 20.4849 7.19398C20.2419 7.48581 19.8243 7.54649 19.5112 7.35047L19.4286 7.29063L18.2702 6.32645C17.9518 6.06146 17.9086 5.58856 18.1735 5.2702C18.4165 4.97837 18.8341 4.91769 19.1472 5.11371ZM14.25 2.5C14.6642 2.5 15 2.83579 15 3.25C15 3.6297 14.7178 3.94349 14.3518 3.99315L14.25 4H9.75C9.33579 4 9 3.66421 9 3.25C9 2.8703 9.28215 2.55651 9.64823 2.50685L9.75 2.5H14.25Z @@ -248,7 +248,7 @@ - M832 245.76h-153.6v-51.2c0-28.16-23.04-51.2-51.2-51.2h-204.8c-28.16 0-51.2 23.04-51.2 51.2v51.2h-153.6c-56.32 0-102.4 46.08-102.4 102.4v460.8c0 56.32 46.08 102.4 102.4 102.4h614.4c56.32 0 102.4-46.08 102.4-102.4v-460.8c0-56.32-46.08-102.4-102.4-102.4z m-409.6-25.6c0-15.36 10.24-25.6 25.6-25.6h153.6c15.36 0 25.6 10.24 25.6 25.6v25.6h-204.8v-25.6z m460.8 588.8c0 28.16-23.04 51.2-51.2 51.2h-614.4c-28.16 0-51.2-23.04-51.2-51.2v-281.6h258.56c-2.56 7.68-2.56 17.92-2.56 25.6 0 56.32 46.08 102.4 102.4 102.4s102.4-46.08 102.4-102.4c0-7.68-2.56-17.92-2.56-25.6h258.56v281.6z m-409.6-256c0-10.24 2.56-17.92 7.68-25.6h87.04c5.12 7.68 7.68 15.36 7.68 25.6 0 28.16-23.04 51.2-51.2 51.2s-51.2-23.04-51.2-51.2z m409.6-76.8h-716.8v-128c0-28.16 23.04-51.2 51.2-51.2h614.4c28.16 0 51.2 23.04 51.2 51.2v128z +M140.08,152.85H59.92A15.85,15.85,0,0,1,44.08,137V79.63A15.86,15.86,0,0,1,59.92,63.79H77.85V56.42a9.28,9.28,0,0,1,9.27-9.27h25.76a9.28,9.28,0,0,1,9.27,9.27v7.37h17.93a15.86,15.86,0,0,1,15.84,15.84V137A15.85,15.85,0,0,1,140.08,152.85Zm-90.6-50V137a10.44,10.44,0,0,0,10.44,10.43h80.16A10.44,10.44,0,0,0,150.52,137V102.82H113.41a14.3,14.3,0,1,1-26.77,0Zm43.21,0a8.9,8.9,0,1,0,14.67,0ZM49.48,97.41h101V79.63A10.45,10.45,0,0,0,140.08,69.2H59.92A10.45,10.45,0,0,0,49.48,79.63ZM83.26,63.79h33.48V56.42a3.86,3.86,0,0,0-3.86-3.86H87.12a3.86,3.86,0,0,0-3.86,3.86Z diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/AboutPage.axaml similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/AboutPage.axaml diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/AboutPage.axaml.cs similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/AboutPage.axaml.cs diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelatedPage.axaml similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelatedPage.axaml diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelatedPage.axaml.cs similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelatedPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelatedPage.axaml.cs diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelated_BorderlessPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelated_BorderlessPage.axaml index fa143d075..0ed9cb5a6 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelated_BorderlessPage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameRelated/GameRelated_BorderlessPage.axaml @@ -14,7 +14,7 @@ x:Class="System.Application.UI.Views.Pages.GameRelated_BorderlessPage"> - + diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml index 7c6de7a16..57713a5b8 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml @@ -45,7 +45,11 @@ Command="{ReflectionBinding #u.DataContext.UpMoveOrderById}" CommandParameter="{Binding}"> - + + + + + - + + diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/SettingsPage.axaml similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/SettingsPage.axaml diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/SettingsPage.axaml.cs similarity index 100% rename from src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/SettingsPage.axaml.cs diff --git a/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs b/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs index 88831f855..1bee5e6ff 100644 --- a/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs +++ b/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs @@ -615,7 +615,7 @@ namespace System.Application.Services var auths = Authenticators.Items.Where(x => x.Name != x.OriginName); foreach (var auth in auths) - repository.RenameAsync(auth.Id, auth.Name, true, password); + repository.RenameAsync(auth.Id, auth.Name, isLocal, password); } public async void SwitchEncryptionAuthenticators(bool isLocal, string? password)