From f3f1767464817ee1ecad536f9f0b64fbb07442b6 Mon Sep 17 00:00:00 2001 From: "waffle.lord" Date: Sat, 22 Apr 2023 12:09:44 -0400 Subject: [PATCH] add description text to registration dialog --- .../Helpers/LocalizationProvider.cs | 17 ++++ .../Locales/Chinese (Simplified).json | 3 +- .../Locales/Chinese (Traditional).json | 3 +- .../Aki_Data/Launcher/Locales/English.json | 3 +- .../Aki_Data/Launcher/Locales/French.json | 3 +- .../Aki_Data/Launcher/Locales/German.json | 3 +- .../Aki_Data/Launcher/Locales/Japanese.json | 3 +- .../Aki_Data/Launcher/Locales/Korean.json | 3 +- .../Aki_Data/Launcher/Locales/Russian.json | 3 +- .../Aki_Data/Launcher/Locales/Spanish.json | 3 +- .../Views/Dialogs/RegisterDialogView.axaml | 84 ++++++++++++------- 11 files changed, 89 insertions(+), 39 deletions(-) diff --git a/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs b/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs index 97e3f2e..c2a1ace 100644 --- a/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs +++ b/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs @@ -170,6 +170,7 @@ namespace Aki.Launcher.Helpers englishLocale.profile_remove_question_format_1 = "Permanently remove profile '{0}'?"; englishLocale.i_understand = "I Understand"; englishLocale.game_version_mismatch_format_2 = "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from"; + englishLocale.description = "Description"; #endregion Directory.CreateDirectory(LocalizationProvider.DefaultLocaleFolderPath); @@ -1502,6 +1503,22 @@ namespace Aki.Launcher.Helpers } #endregion + #region description + private string _description; + public string description + { + get => _description; + set + { + if(_description != value) + { + _description = value; + RaisePropertyChanged(nameof(description)); + } + } + } + #endregion + #endregion public event PropertyChangedEventHandler PropertyChanged; diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json index 21bc6dd..125d9a5 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json @@ -79,5 +79,6 @@ "profile_removal_failed": "Failed to remove profile", "profile_remove_question_format_1": "Permanently remove profile '{0}'?", "i_understand": "I Understand", - "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from" + "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json index 4ef2cea..747cc30 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json @@ -79,5 +79,6 @@ "profile_removal_failed": "Failed to remove profile", "profile_remove_question_format_1": "Permanently remove profile '{0}'?", "i_understand": "I Understand", - "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from" + "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json index d967441..004da11 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json @@ -79,5 +79,6 @@ "profile_removal_failed": "Failed to remove profile", "profile_remove_question_format_1": "Permanently remove profile '{0}'?", "i_understand": "I Understand", - "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from" + "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json index e0f66fa..29b20c7 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json @@ -79,5 +79,6 @@ "profile_removal_failed": "Failed to remove profile", "profile_remove_question_format_1": "Permanently remove profile '{0}'?", "i_understand": "I Understand", - "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from" + "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json index 2e11e2e..6846440 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json @@ -79,5 +79,6 @@ "profile_removal_failed": "Failed to remove profile", "profile_remove_question_format_1": "Permanently remove profile '{0}'?", "i_understand": "I Understand", - "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from" + "game_version_mismatch_format_2": "SPT is unable to run, this is because SPT expected to find EFT version '{1}',\nbut instead found version '{0}'\n\nEnsure you've downgraded your EFT as described in the install guide\non the page you downloaded SPT from", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json index ed9df79..eeab602 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json @@ -79,5 +79,6 @@ "profile_removal_failed": "プロファイルを削除できませんでした", "profile_remove_question_format_1": "プロファイル '{0}' を完全に削除しますか?", "i_understand": "了解", - "game_version_mismatch_format_2": "SPT を実行できません。これは、SPT が EFT バージョン '{1}' を検出することを期待していたためです\n代わりにバージョン '{0}' を検出しました\n\nインストール ガイドの説明に従って EFT をダウングレードしたことを確認してください\n SPT をダウンロードしたページ" + "game_version_mismatch_format_2": "SPT を実行できません。これは、SPT が EFT バージョン '{1}' を検出することを期待していたためです\n代わりにバージョン '{0}' を検出しました\n\nインストール ガイドの説明に従って EFT をダウングレードしたことを確認してください\n SPT をダウンロードしたページ", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json index 2fa133e..1c074a7 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json @@ -79,5 +79,6 @@ "profile_removal_failed": "프로필 삭제에 실패하였습니다", "profile_remove_question_format_1": "프로필 '{0}'을 영구적으로 삭제하시겠습니까?", "i_understand": "이해하였습니다", - "game_version_mismatch_format_2": "당신의 게임 버전은 '{0}'이며 호환되는 버전은 '{1}' 입니다.\n\n게임 실행에 문제가 발생하거나 되지 않을 수 있습니다." + "game_version_mismatch_format_2": "당신의 게임 버전은 '{0}'이며 호환되는 버전은 '{1}' 입니다.\n\n게임 실행에 문제가 발생하거나 되지 않을 수 있습니다.", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json index 1e85fa4..a9d5566 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json @@ -79,5 +79,6 @@ "profile_removal_failed": "Ошибка удаления профиля", "profile_remove_question_format_1": "Удалить профиль '{0}' безвозвратно?", "i_understand": "Я понимаю", - "game_version_mismatch_format_2": "Ваша версия игры: '{0}' и совместимая версия: '{1}'.\n\nИгра может работать некорректно или не работать вообще." + "game_version_mismatch_format_2": "Ваша версия игры: '{0}' и совместимая версия: '{1}'.\n\nИгра может работать некорректно или не работать вообще.", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json index 7812ff7..8dffc8c 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json @@ -79,5 +79,6 @@ "profile_removal_failed": "Error al borrar el perfil", "profile_remove_question_format_1": "Confirma si quieres borrar el perfil: '{0}'", "i_understand": "Lo entiendo", - "game_version_mismatch_format_2": "SPT no puede iniciar, esto es debido a que la versión de EFT esperada es '{1}',\npero la versión encontrada es '{0}'\n\nAsegurate de haber realizado el downgrade de tu versión de EFT, tal como se indica en la guía de instalación\nen la página en la que has descargado SPT" + "game_version_mismatch_format_2": "SPT no puede iniciar, esto es debido a que la versión de EFT esperada es '{1}',\npero la versión encontrada es '{0}'\n\nAsegurate de haber realizado el downgrade de tu versión de EFT, tal como se indica en la guía de instalación\nen la página en la que has descargado SPT", + "description": "Description" } \ No newline at end of file diff --git a/project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml b/project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml index 8d36ea2..e2b7000 100644 --- a/project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml +++ b/project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml @@ -3,6 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia" + xmlns:helpers="using:Aki.Launcher.Helpers" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aki.Launcher.Views.Dialogs.RegisterDialogView" Background="{StaticResource AKI_Background_Dark}" @@ -10,41 +11,64 @@ MinHeight="100" > - - + + + - + - - - - - - - - + + + + + + + + + + + + + + + + -