spt/launcher
spt/launcher
0
0
Fork 0
mirror of https://github.com/sp-tarkov/launcher.git synced 2025-02-13 03:30:43 -05:00
Code

Merge pull request '[Feature] add description text to registration dialog' (!5) from waffle.lord/Launcher:add-edition-description into master

Browse Source 
Reviewed-on: SPT-AKI/Launcher#5
This commit is contained in:
chomp 2023-04-22 16:27:31 +00:00
commit d9e624d83f
11 changed files with 89 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs
View File

@ -170,6 +170,7 @@ namespace Aki.Launcher.Helpers
englishLocale.profile_remove_question_format_1 = "Permanently remove profile '{0}'?"; englishLocale.profile_remove_question_format_1 = "Permanently remove profile '{0}'?";
englishLocale.i_understand = "I Understand"; 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.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 #endregion
Directory.CreateDirectory(LocalizationProvider.DefaultLocaleFolderPath); Directory.CreateDirectory(LocalizationProvider.DefaultLocaleFolderPath);
@ -1502,6 +1503,22 @@ namespace Aki.Launcher.Helpers
} }
#endregion #endregion
#region description
private string _description;
public string description
{
get => _description;
set
{
if(_description != value)
{
_description = value;
RaisePropertyChanged(nameof(description));
}
}
}
#endregion
#endregion #endregion
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "Failed to remove profile", "profile_removal_failed": "Failed to remove profile",
"profile_remove_question_format_1": "Permanently remove profile '{0}'?", "profile_remove_question_format_1": "Permanently remove profile '{0}'?",
"i_understand": "I Understand", "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"
} }

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "Failed to remove profile", "profile_removal_failed": "Failed to remove profile",
"profile_remove_question_format_1": "Permanently remove profile '{0}'?", "profile_remove_question_format_1": "Permanently remove profile '{0}'?",
"i_understand": "I Understand", "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"
} }

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "Failed to remove profile", "profile_removal_failed": "Failed to remove profile",
"profile_remove_question_format_1": "Permanently remove profile '{0}'?", "profile_remove_question_format_1": "Permanently remove profile '{0}'?",
"i_understand": "I Understand", "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"
} }

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "Failed to remove profile", "profile_removal_failed": "Failed to remove profile",
"profile_remove_question_format_1": "Permanently remove profile '{0}'?", "profile_remove_question_format_1": "Permanently remove profile '{0}'?",
"i_understand": "I Understand", "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"
} }

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "Failed to remove profile", "profile_removal_failed": "Failed to remove profile",
"profile_remove_question_format_1": "Permanently remove profile '{0}'?", "profile_remove_question_format_1": "Permanently remove profile '{0}'?",
"i_understand": "I Understand", "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"
} }

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "プロファイルを削除できませんでした", "profile_removal_failed": "プロファイルを削除できませんでした",
"profile_remove_question_format_1": "プロファイル '{0}' を完全に削除しますか?", "profile_remove_question_format_1": "プロファイル '{0}' を完全に削除しますか?",
"i_understand": "了解", "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"
} }

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "프로필 삭제에 실패하였습니다", "profile_removal_failed": "프로필 삭제에 실패하였습니다",
"profile_remove_question_format_1": "프로필 '{0}'을 영구적으로 삭제하시겠습니까?", "profile_remove_question_format_1": "프로필 '{0}'을 영구적으로 삭제하시겠습니까?",
"i_understand": "이해하였습니다", "i_understand": "이해하였습니다",
"game_version_mismatch_format_2": "당신의 게임 버전은 '{0}'이며 호환되는 버전은 '{1}' 입니다.\n\n게임 실행에 문제가 발생하거나 되지 않을 수 있습니다." "game_version_mismatch_format_2": "당신의 게임 버전은 '{0}'이며 호환되는 버전은 '{1}' 입니다.\n\n게임 실행에 문제가 발생하거나 되지 않을 수 있습니다.",
"description": "Description"
} }

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "Ошибка удаления профиля", "profile_removal_failed": "Ошибка удаления профиля",
"profile_remove_question_format_1": "Удалить профиль '{0}' безвозвратно?", "profile_remove_question_format_1": "Удалить профиль '{0}' безвозвратно?",
"i_understand": "Я понимаю", "i_understand": "Я понимаю",
"game_version_mismatch_format_2": "Ваша версия игры: '{0}' и совместимая версия: '{1}'.\n\nИгра может работать некорректно или не работать вообще." "game_version_mismatch_format_2": "Ваша версия игры: '{0}' и совместимая версия: '{1}'.\n\nИгра может работать некорректно или не работать вообще.",
"description": "Description"
} }

3
project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json
View File

@ -79,5 +79,6 @@
"profile_removal_failed": "Error al borrar el perfil", "profile_removal_failed": "Error al borrar el perfil",
"profile_remove_question_format_1": "Confirma si quieres borrar el perfil: '{0}'", "profile_remove_question_format_1": "Confirma si quieres borrar el perfil: '{0}'",
"i_understand": "Lo entiendo", "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"
} }

78
project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml
View File

@ -3,6 +3,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia" xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
xmlns:helpers="using:Aki.Launcher.Helpers"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Aki.Launcher.Views.Dialogs.RegisterDialogView" x:Class="Aki.Launcher.Views.Dialogs.RegisterDialogView"
Background="{StaticResource AKI_Background_Dark}" Background="{StaticResource AKI_Background_Dark}"
@ -10,41 +11,64 @@
MinHeight="100" MinHeight="100"
> >
<Grid RowDefinitions="*,AUTO,AUTO" ColumnDefinitions="*,AUTO" Margin="10"> <Grid RowDefinitions="*,AUTO,AUTO,AUTO" ColumnDefinitions="*,AUTO" Margin="10">
<TextBlock Text="{Binding Question}" Grid.ColumnSpan="2" FontSize="15"
Foreground="{StaticResource AKI_Foreground_Light}" <!-- Question Text -->
<TextBlock Text="{Binding Question}" Grid.ColumnSpan="2" FontSize="15"
Foreground="{StaticResource AKI_Foreground_Light}"
/> />
<ComboBox Items="{Binding Editions.AvailableEditions}" <!-- Editions Combo Selection -->
Margin="0 10" <ComboBox Items="{Binding Editions.AvailableEditions}"
Grid.Row="1" Grid.ColumnSpan="2" Margin="0 10"
HorizontalAlignment="Stretch" Grid.Row="1" Grid.ColumnSpan="2"
SelectedItem="{Binding Editions.SelectedEdition}" HorizontalAlignment="Stretch"
PlaceholderText="{Binding ComboBoxPlaceholderText}" SelectedItem="{Binding Editions.SelectedEdition}"
PlaceholderText="{Binding ComboBoxPlaceholderText}"
> >
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Label Background="Transparent" Content="{Binding Name}" ToolTip.Tip="{Binding Description}"/> <Label Background="Transparent" Content="{Binding Name}" ToolTip.Tip="{Binding Description}"/>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<StackPanel Grid.Row="2" Grid.Column="1" <!-- Description Area -->
Orientation="Horizontal" Spacing="10" <Border Grid.Row="2" Grid.ColumnSpan="3" Margin="0 10"
Background="{StaticResource AKI_Background_Light}" CornerRadius="10"
MaxWidth="500" MinHeight="50"
MinWidth="500"
HorizontalAlignment="Stretch"
>
<StackPanel Spacing="10" Margin="10">
<TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=description}"
FontSize="12"
Foreground="{StaticResource AKI_Foreground_Light}"
/>
<TextBlock Text="{Binding Editions.SelectedEdition.Description}"
TextWrapping="Wrap"
Foreground="{StaticResource AKI_Foreground_Light}"
/>
</StackPanel>
</Border>
<!-- Action Buttons -->
<StackPanel Grid.Row="3" Grid.Column="1"
Orientation="Horizontal" Spacing="10"
> >
<Button Content="{Binding RegisterButtonText}" <Button Content="{Binding RegisterButtonText}"
Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
CommandParameter="{Binding Editions.SelectedEdition}" CommandParameter="{Binding Editions.SelectedEdition}"
IsEnabled="{Binding Editions.HasSelection}" IsEnabled="{Binding Editions.HasSelection}"
IsDefault="True" IsDefault="True"
Classes="yellow" Classes="yellow"
/> />
<Button Content="{Binding CancelButtonText}" <Button Content="{Binding CancelButtonText}"
Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
/> />
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>