From 99be9d64c60ac2580548404cea9e8f17ef35b99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=B2=D0=B8=D0=B4=20=D0=A7=D0=B5=D1=80=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D1=8F=D1=82=D0=BE=D0=B2?= Date: Sun, 22 Sep 2024 16:28:06 +0300 Subject: [PATCH] 1.5.3 pre-release - Added hyperlink to troubleshooting guide in Linking window - Minor localization and design updates --- NebulaAuth.sln | 1 + NebulaAuth/Core/LocalizationManager.cs | 4 + NebulaAuth/Model/MaClient.cs | 2 +- NebulaAuth/NebulaAuth.csproj | 2 +- .../View/Dialogs/ConfirmCancelDialog.xaml | 1 - NebulaAuth/View/Dialogs/LoginAgainDialog.xaml | 3 +- .../Dialogs/LoginAgainOnImportDialog.xaml | 3 +- .../View/Dialogs/SetCryptPasswordDialog.xaml | 2 +- NebulaAuth/View/LinkerView.xaml | 42 +++++----- NebulaAuth/View/ProxyManagerView.xaml | 2 +- NebulaAuth/View/UpdaterView.xaml | 2 - NebulaAuth/ViewModel/MainVM_Code.cs | 3 +- NebulaAuth/ViewModel/MainVM_File.cs | 1 - NebulaAuth/ViewModel/Other/LinkAccountVM.cs | 17 +++- NebulaAuth/localization.loc.json | 17 ++-- changelog/1.5.3.html | 79 +++++++++++++++++++ 16 files changed, 141 insertions(+), 40 deletions(-) create mode 100644 changelog/1.5.3.html diff --git a/NebulaAuth.sln b/NebulaAuth.sln index bb80a76..3b17041 100644 --- a/NebulaAuth.sln +++ b/NebulaAuth.sln @@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "changelog", "changelog", "{ changelog\1.5.0.html = changelog\1.5.0.html changelog\1.5.1.html = changelog\1.5.1.html changelog\1.5.2.html = changelog\1.5.2.html + changelog\1.5.3.html = changelog\1.5.3.html EndProjectSection EndProject Global diff --git a/NebulaAuth/Core/LocalizationManager.cs b/NebulaAuth/Core/LocalizationManager.cs index 7b30221..a111a09 100644 --- a/NebulaAuth/Core/LocalizationManager.cs +++ b/NebulaAuth/Core/LocalizationManager.cs @@ -18,6 +18,10 @@ public static class LocManager //Thread.CurrentThread.CurrentCulture= CultureInfo.GetCultureInfo(GetLanguageCode(language)); } + public static string GetCurrentLanguageCode() + { + return Loc.Instance.CurrentLanguage; + } public static string GetLanguageCode(LocalizationLanguage language) { diff --git a/NebulaAuth/Model/MaClient.cs b/NebulaAuth/Model/MaClient.cs index 15b08c7..81659f3 100644 --- a/NebulaAuth/Model/MaClient.cs +++ b/NebulaAuth/Model/MaClient.cs @@ -173,7 +173,7 @@ public static class MaClient } - public static async Task ConfirmLoginRequest(Mafile mafile) + public static async Task ConfirmLoginRequest(Mafile mafile) //TODO: move into library { ValidateMafile(mafile); SetProxy(mafile); diff --git a/NebulaAuth/NebulaAuth.csproj b/NebulaAuth/NebulaAuth.csproj index 337798c..79fc41b 100644 --- a/NebulaAuth/NebulaAuth.csproj +++ b/NebulaAuth/NebulaAuth.csproj @@ -10,7 +10,7 @@ en;ru;ua Theme\lock.ico 7.0 - 1.5.2 + 1.5.3 diff --git a/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml b/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml index 85b364b..560da51 100644 --- a/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml +++ b/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml @@ -6,7 +6,6 @@ xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:theme="clr-namespace:NebulaAuth.Theme" mc:Ignorable="d" - d:DesignHeight="100" d:DesignWidth="400" Height="Auto" Width="Auto" MaxWidth="500" Background="{DynamicResource WindowBackground}"> diff --git a/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml b/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml index f404fe5..a7a870a 100644 --- a/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml +++ b/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml @@ -9,9 +9,8 @@ xmlns:model="clr-namespace:NebulaAuth.Model" xmlns:entities="clr-namespace:NebulaAuth.Model.Entities" mc:Ignorable="d" - d:DesignHeight="250" d:DesignWidth="800" theme:FontScaleWindow.Scale="0.9" theme:FontScaleWindow.ResizeFont="True" - Foreground="WhiteSmoke" Cursor="Hand" + Foreground="WhiteSmoke" d:DataContext="{d:DesignInstance other:LoginAgainVM}" Background="{DynamicResource WindowBackground}"> diff --git a/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml b/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml index 0ce08a0..fba974b 100644 --- a/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml +++ b/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml @@ -9,9 +9,8 @@ xmlns:model="clr-namespace:NebulaAuth.Model" xmlns:entities="clr-namespace:NebulaAuth.Model.Entities" mc:Ignorable="d" - d:DesignHeight="250" d:DesignWidth="800" theme:FontScaleWindow.Scale="0.9" theme:FontScaleWindow.ResizeFont="True" - Foreground="WhiteSmoke" Cursor="Hand" + Foreground="WhiteSmoke" d:DataContext="{d:DesignInstance other:LoginAgainOnImportVM}" Background="{DynamicResource WindowBackground}"> diff --git a/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml b/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml index e5c8ab9..af40e3f 100644 --- a/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml +++ b/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml @@ -9,7 +9,7 @@ xmlns:model="clr-namespace:NebulaAuth.Model" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - Foreground="WhiteSmoke" Cursor="Hand" + Foreground="WhiteSmoke" d:DataContext="{d:DesignInstance other:LoginAgainVM}" Background="{DynamicResource WindowBackground}"> diff --git a/NebulaAuth/View/LinkerView.xaml b/NebulaAuth/View/LinkerView.xaml index c6954ba..f07df2d 100644 --- a/NebulaAuth/View/LinkerView.xaml +++ b/NebulaAuth/View/LinkerView.xaml @@ -7,7 +7,6 @@ xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:other="clr-namespace:NebulaAuth.ViewModel.Other" mc:Ignorable="d" - d:DesignHeight="450" d:DesignWidth="800" Foreground="WhiteSmoke" FontFamily="{materialDesign:MaterialDesignFont}" MinHeight="640" @@ -63,7 +62,14 @@ - + + + + + + + + @@ -86,38 +92,38 @@ diff --git a/NebulaAuth/View/UpdaterView.xaml b/NebulaAuth/View/UpdaterView.xaml index be17e6b..1a28438 100644 --- a/NebulaAuth/View/UpdaterView.xaml +++ b/NebulaAuth/View/UpdaterView.xaml @@ -8,8 +8,6 @@ xmlns:other="clr-namespace:NebulaAuth.ViewModel.Other" xmlns:wpf="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf" mc:Ignorable="d" - d:DesignHeight="700" - d:DesignWidth="500" Foreground="WhiteSmoke" FontFamily="{materialDesign:MaterialDesignFont}" d:DataContext="{d:DesignInstance other:UpdaterVM}" diff --git a/NebulaAuth/ViewModel/MainVM_Code.cs b/NebulaAuth/ViewModel/MainVM_Code.cs index 2e688db..1090104 100644 --- a/NebulaAuth/ViewModel/MainVM_Code.cs +++ b/NebulaAuth/ViewModel/MainVM_Code.cs @@ -1,5 +1,4 @@ -using System; -using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using SteamLib.SteamMobile; using System.Diagnostics.CodeAnalysis; using System.Threading; diff --git a/NebulaAuth/ViewModel/MainVM_File.cs b/NebulaAuth/ViewModel/MainVM_File.cs index 2d7a71c..b0c9746 100644 --- a/NebulaAuth/ViewModel/MainVM_File.cs +++ b/NebulaAuth/ViewModel/MainVM_File.cs @@ -17,7 +17,6 @@ using NebulaAuth.Model.Entities; using SteamLib.Exceptions; using NebulaAuth.Utility; using NebulaAuth.View.Dialogs; -using AutoUpdaterDotNET; namespace NebulaAuth.ViewModel; diff --git a/NebulaAuth/ViewModel/Other/LinkAccountVM.cs b/NebulaAuth/ViewModel/Other/LinkAccountVM.cs index 706e0b2..4c92a3b 100644 --- a/NebulaAuth/ViewModel/Other/LinkAccountVM.cs +++ b/NebulaAuth/ViewModel/Other/LinkAccountVM.cs @@ -3,6 +3,7 @@ using AchiesUtilities.Web.Proxy; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using MaterialDesignThemes.Wpf; +using NebulaAuth.Core; using NebulaAuth.Model; using NebulaAuth.Model.Entities; using NebulaAuth.Utility; @@ -19,12 +20,12 @@ using SteamLib.SteamMobile.AuthenticatorLinker; using SteamLib.Web; using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using System.Net.Http; using System.Threading.Tasks; using System.Windows; -using NebulaAuth.Core; namespace NebulaAuth.ViewModel.Other; @@ -194,7 +195,7 @@ public partial class LinkAccountVM : ObservableObject, IEmailProvider, IPhoneNum Storage.SaveMafile(mafile); File.Delete(Path.Combine("mafiles_backup", mafile.AccountName + ".mafile")); HintText = - string.Format(GetLocalizationOrDefault("MafileLinked"), + string.Format(GetLocalizationOrDefault("MafileLinked"), mafile.RevocationCode, mafile.SessionData?.SteamId.Steam64); @@ -401,6 +402,18 @@ public partial class LinkAccountVM : ObservableObject, IEmailProvider, IPhoneNum #endregion + [RelayCommand] + private void OpenTroubleshooting() + { + const string troubleshootingURI = + "https://achiez.github.io/NebulaAuth-Steam-Desktop-Authenticator-by-Achies/docs/{0}/LinkingTroubleshooting"; + + var localized = string.Format(troubleshootingURI, LocManager.GetCurrentLanguageCode()); + Process.Start(new ProcessStartInfo(new Uri(localized).ToString()) + { + UseShellExecute = true + }); + } private static string GetLocalizationOrDefault(string key) { diff --git a/NebulaAuth/localization.loc.json b/NebulaAuth/localization.loc.json index f1105e5..9e398c1 100644 --- a/NebulaAuth/localization.loc.json +++ b/NebulaAuth/localization.loc.json @@ -430,6 +430,11 @@ "ru": "Привязка", "ua": "Прив'язка" }, + "GotErrorHyperlinkText": { + "en": "(getting error?)", + "ru": "(возникает ошибка?)", + "ua": "(виникає помилка?)" + }, "Proxy": { "en": "Proxy", "ru": "Прокси", @@ -451,14 +456,14 @@ "ua": "Номер телефону" }, "EmailLink": { - "en": "Email link", - "ru": "Ссылка из письма", - "ua": "Посилання з листа" + "en": "EMail link", + "ru": "Ссылка из email", + "ua": "Посилання з email" }, "SmsOrCode": { - "en": "Sms or code", - "ru": "Смс или код", - "ua": "Смс або код" + "en": "SMS or code", + "ru": "СМС или код", + "ua": "СМС або код" }, "Completed": { "en": "Completed", diff --git a/changelog/1.5.3.html b/changelog/1.5.3.html new file mode 100644 index 0000000..3fe36d5 --- /dev/null +++ b/changelog/1.5.3.html @@ -0,0 +1,79 @@ + + + + + + Changelog + + + + +
+ +
+
Version 1.5.3
+
DATE
+
+ - UPDATE: Added hyperlink to troubleshooting guide in "Linking" window
+ - UI: Minor design and localization improvements +
+
+
+ + + \ No newline at end of file