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

Merge pull request 'add-mod-warning-tooltip' (!27) from waffle.lord/Launcher:master into master

Browse Source 
Reviewed-on: SPT-AKI/Launcher#27
This commit is contained in:
IsWaffle 2023-10-11 13:49:52 +00:00
commit d6f3ad2112
14 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,6 +178,7 @@ namespace Aki.Launcher.Helpers
englishLocale.author = "Author"; englishLocale.author = "Author";
englishLocale.wipe_on_start = "Wipe profile on game start"; englishLocale.wipe_on_start = "Wipe profile on game start";
englishLocale.copy_live_settings_question = "Would you like to copy your live game settings to spt"; englishLocale.copy_live_settings_question = "Would you like to copy your live game settings to spt";
englishLocale.mod_not_in_server_warning = "This mod was found in your profile, but is not loaded on the server";
#endregion #endregion
Directory.CreateDirectory(LocalizationProvider.DefaultLocaleFolderPath); Directory.CreateDirectory(LocalizationProvider.DefaultLocaleFolderPath);
@ -1639,6 +1640,21 @@ namespace Aki.Launcher.Helpers
} }
#endregion #endregion
#region mod_not_in_server_warning
private string _mod_not_in_server_warning;
public string mod_not_in_server_warning
{
get => _mod_not_in_server_warning;
set
{
if (_mod_not_in_server_warning != value)
{
_mod_not_in_server_warning = value;
RaisePropertyChanged(nameof(mod_not_in_server_warning));
}
}
}
#endregion
#endregion #endregion
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Ustawienia gry skopiowane z EFT", "load_live_settings_succeeded": "Ustawienia gry skopiowane z EFT",
"load_live_settings_failed": "Nie udało się skopiować ustawień EFT", "load_live_settings_failed": "Nie udało się skopiować ustawień EFT",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Настройки игры скопированы из онлайн-версии", "load_live_settings_succeeded": "Настройки игры скопированы из онлайн-версии",
"load_live_settings_failed": "Не удалось скопировать настройки онлайн-версии", "load_live_settings_failed": "Не удалось скопировать настройки онлайн-версии",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

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

@ -87,5 +87,6 @@
"load_live_settings_succeeded": "Game settings copied from live", "load_live_settings_succeeded": "Game settings copied from live",
"load_live_settings_failed": "Failed to copy live settings", "load_live_settings_failed": "Failed to copy live settings",
"wipe_on_start": "Wipe profile on game start", "wipe_on_start": "Wipe profile on game start",
"copy_live_settings_question": "Would you like to copy your live game settings to spt" "copy_live_settings_question": "Would you like to copy your live game settings to spt",
"mod_not_in_server_warning":"This mod was found in your profile, but is not loaded on the server"
} }

9
project/Aki.Launcher/CustomControls/ModInfoCard.axaml
View File

@ -23,8 +23,12 @@
<Path Data="{StaticResource Profile}" Fill="{StaticResource AKI_Brush_DarkGrayBlue}" <Path Data="{StaticResource Profile}" Fill="{StaticResource AKI_Brush_DarkGrayBlue}"
IsVisible="{Binding IsInProfile, RelativeSource={RelativeSource AncestorType=UserControl}}" IsVisible="{Binding IsInProfile, RelativeSource={RelativeSource AncestorType=UserControl}}"
/> />
<Path Data="{StaticResource Alert}" Fill="{StaticResource AKI_Brush_Yellow}" Margin="0 2 0 0"
> <Canvas>
<Rectangle ToolTip.Tip="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=mod_not_in_server_warning}" Fill="Transparent" Height="20" Width="20"/>
<Path Data="{StaticResource Alert}" Fill="{StaticResource AKI_Brush_Yellow}"
Margin="0 2 0 0" ToolTip.Tip="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=mod_not_in_server_warning}"
>
<Path.IsVisible> <Path.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="IsInProfile" RelativeSource="{RelativeSource AncestorType=UserControl}"/> <Binding Path="IsInProfile" RelativeSource="{RelativeSource AncestorType=UserControl}"/>
@ -32,6 +36,7 @@
</MultiBinding> </MultiBinding>
</Path.IsVisible> </Path.IsVisible>
</Path> </Path>
</Canvas>
</StackPanel> </StackPanel>
<Label Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" <Label Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"

2
project/Aki.Launcher/Views/SettingsView.axaml
View File

@ -51,7 +51,7 @@
/> />
<!-- LocaleCollection reloads the locale from file when the selected loacle changes --> <!-- LocaleCollection reloads the locale from file when the selected loacle changes -->
<ComboBox Items="{Binding Locales.AvailableLocales}" MinWidth="200" <ComboBox Items="{Binding Locales.AvailableLocales}" MinWidth="200"
SelectedItem="{Binding Locales.SelectedLocale, Mode=TwoWay }" SelectedItem="{Binding Locales.SelectedLocale, Mode=TwoWay}"
/> />
</StackPanel> </StackPanel>