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 'ui-tweaks' (!22) from waffle.lord/Launcher:ui-tweaks into master

Browse Source 
Reviewed-on: SPT-AKI/Launcher#22
This commit is contained in:
IsWaffle 2023-09-10 17:49:21 +00:00
commit 38bacf9991
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -355,3 +355,4 @@ MigrationBackup/
# Jetbrains IDEs database # Jetbrains IDEs database
.idea/ .idea/
project/user/launcher

39
project/Aki.Launcher/Views/LoginView.axaml
View File

@ -24,7 +24,8 @@
Command="{Binding $parent[ItemsControl].DataContext.LoginProfileCommand}" Command="{Binding $parent[ItemsControl].DataContext.LoginProfileCommand}"
CommandParameter="{Binding Username}" CommandParameter="{Binding Username}"
> >
<Grid RowDefinitions="5,AUTO,AUTO,5" ColumnDefinitions="5,AUTO,AUTO,AUTO,*,AUTO,5"> <!-- profile info item grid -->
<Grid RowDefinitions="5,AUTO,AUTO,12,5" ColumnDefinitions="5,AUTO,AUTO,AUTO,*,5">
<Image Source="{Binding SideImage, Converter={StaticResource imageSourceCvt}}" Height="35" <Image Source="{Binding SideImage, Converter={StaticResource imageSourceCvt}}" Height="35"
Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" Margin="0 0 5 0" Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" Margin="0 0 5 0"
/> />
@ -66,17 +67,19 @@
Foreground="{StaticResource AKI_Brush_DarkGrayBlue}" Foreground="{StaticResource AKI_Brush_DarkGrayBlue}"
/> />
<!-- next leve in text -->
<Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=next_level_in}"
Grid.Row="1" Grid.Column="4"
HorizontalAlignment="Right"
IsVisible="{Binding HasData}"
/>
<!-- remaining exp --> <!-- remaining exp -->
<Label Content="{Binding RemainingExp, StringFormat={}{0} xp}" Grid.Row="1" Grid.Column="5" <Label Grid.Row="2" Grid.RowSpan="2" Grid.Column="4"
VerticalAlignment="Bottom" HorizontalAlignment="Center"
FontSize="12"
IsVisible="{Binding HasData}" IsVisible="{Binding HasData}"
/> >
<Label.Content>
<MultiBinding StringFormat="{}{0} {1} xp">
<Binding Source="{x:Static helpers:LocalizationProvider.Instance}" Path="next_level_in"/>
<Binding Path="RemainingExp"/>
</MultiBinding>
</Label.Content>
</Label>
<!-- level text--> <!-- level text-->
<Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=level}" <Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=level}"
@ -119,14 +122,20 @@
/> />
<!-- Login button --> <!-- Login button -->
<Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=login_or_register}" <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
Command="{Binding LoginCommand}" Command="{Binding LoginCommand}"
IsEnabled="{Binding !IsLoggingIn}" IsEnabled="{Binding !IsLoggingIn}"
IsDefault="True" IsDefault="True"
/> >
<CheckBox Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=login_automatically}" <TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=login_or_register}"
IsChecked="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=UseAutoLogin}"/> TextWrapping="Wrap"
/>
</Button>
<CheckBox IsChecked="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=UseAutoLogin}">
<TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=login_automatically}"
TextWrapping="Wrap"
/>
</CheckBox>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

3
project/Aki.Launcher/Views/MainWindow.axaml
View File

@ -12,7 +12,8 @@
x:Class="Aki.Launcher.Views.MainWindow" x:Class="Aki.Launcher.Views.MainWindow"
Icon="/Assets/icon.ico" Icon="/Assets/icon.ico"
Title="Aki.Launcher" Title="Aki.Launcher"
Height="450" Width="750" MinHeight="450" MinWidth="800"
Height="450" Width="800"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
ExtendClientAreaToDecorationsHint="True" ExtendClientAreaToDecorationsHint="True"
ExtendClientAreaChromeHints="NoChrome" ExtendClientAreaChromeHints="NoChrome"