mirror of
https://github.com/sp-tarkov/launcher.git
synced 2025-02-12 17:10:44 -05:00
Merge pull request 'add-mod-warning-tooltip' (!27) from waffle.lord/Launcher:master into master
Reviewed-on: SPT-AKI/Launcher#27
This commit is contained in:
commit
d6f3ad2112
@ -178,6 +178,7 @@ namespace Aki.Launcher.Helpers
|
||||
englishLocale.author = "Author";
|
||||
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.mod_not_in_server_warning = "This mod was found in your profile, but is not loaded on the server";
|
||||
#endregion
|
||||
|
||||
Directory.CreateDirectory(LocalizationProvider.DefaultLocaleFolderPath);
|
||||
@ -1638,7 +1639,22 @@ namespace Aki.Launcher.Helpers
|
||||
}
|
||||
}
|
||||
#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
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
||||
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Ustawienia gry skopiowane z EFT",
|
||||
"load_live_settings_failed": "Nie udało się skopiować ustawień EFT",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Настройки игры скопированы из онлайн-версии",
|
||||
"load_live_settings_failed": "Не удалось скопировать настройки онлайн-версии",
|
||||
"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"
|
||||
}
|
@ -87,5 +87,6 @@
|
||||
"load_live_settings_succeeded": "Game settings copied from live",
|
||||
"load_live_settings_failed": "Failed to copy live settings",
|
||||
"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"
|
||||
}
|
@ -23,8 +23,12 @@
|
||||
<Path Data="{StaticResource Profile}" Fill="{StaticResource AKI_Brush_DarkGrayBlue}"
|
||||
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>
|
||||
<MultiBinding Converter="{x:Static BoolConverters.And}">
|
||||
<Binding Path="IsInProfile" RelativeSource="{RelativeSource AncestorType=UserControl}"/>
|
||||
@ -32,6 +36,7 @@
|
||||
</MultiBinding>
|
||||
</Path.IsVisible>
|
||||
</Path>
|
||||
</Canvas>
|
||||
</StackPanel>
|
||||
|
||||
<Label Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"
|
||||
|
@ -51,7 +51,7 @@
|
||||
/>
|
||||
<!-- LocaleCollection reloads the locale from file when the selected loacle changes -->
|
||||
<ComboBox Items="{Binding Locales.AvailableLocales}" MinWidth="200"
|
||||
SelectedItem="{Binding Locales.SelectedLocale, Mode=TwoWay }"
|
||||
SelectedItem="{Binding Locales.SelectedLocale, Mode=TwoWay}"
|
||||
/>
|
||||
</StackPanel>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user