Skip to content

Commit 6bc5fdb

Browse files
MusyaV2MusyaV2
committed
ну дизайн чуть чуть изменил
1 parent 46b99b6 commit 6bc5fdb

File tree

4 files changed

+375
-191
lines changed

4 files changed

+375
-191
lines changed

‎SS14.Launcher/Assets/Locale/ru/text.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ launcher-proxy-loader-desc = Передает proxy через ALL_PROXY/HTTP_PR
790790
launcher-proxy-udp-relay = Пускать игровой UDP через локальный relay (экспериментально)
791791
launcher-proxy-udp-relay-desc = Запускает SS14.ProxyService и подменяет connect-address на localhost через SOCKS5 UDP ASSOCIATE.
792792
tab-proxy-title = Прокси
793-
tab-proxy-header = Профили Proxy 5
793+
tab-proxy-header = Профили Proxy
794794
tab-proxy-guard = Блокировать запуск игры при провале теста proxy
795795
tab-proxy-launcher = Проксировать лаунчер
796796
tab-proxy-game = Проксировать Игру (Нужен тест UDP, экспериментально)

‎SS14.Launcher/Views/MainWindowTabs/OptionsTabView.xaml‎

Lines changed: 112 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,118 @@
427427
</ScrollViewer>
428428
</TabItem>
429429

430+
<TabItem Header="{loc:Loc launcher-updates-tab-title}">
431+
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
432+
<StackPanel Margin="12" Spacing="12">
433+
<Border Classes="UpdatesHeroCard">
434+
<StackPanel Spacing="6">
435+
<TextBlock Text="{loc:Loc launcher-updates-header}" Classes="NanoHeadingMedium" FontWeight="SemiBold" />
436+
<TextBlock Text="{Binding LauncherVersionsStatus}" Opacity="0.82" FontSize="12" TextWrapping="Wrap" />
437+
</StackPanel>
438+
</Border>
439+
440+
<Border Classes="UpdatesSectionCard">
441+
<StackPanel Spacing="12">
442+
<StackPanel>
443+
<CheckBox IsChecked="{Binding LauncherAutoUpdate}" Content="{loc:Loc launcher-updates-auto}" />
444+
<TextBlock Text="{loc:Loc launcher-updates-auto-desc}" Margin="26,2,0,0" Opacity="0.6" FontSize="11" TextWrapping="Wrap"/>
445+
</StackPanel>
446+
447+
<StackPanel>
448+
<CheckBox IsChecked="{Binding LauncherUpdateNotify}" Content="{loc:Loc launcher-updates-notify}" />
449+
<TextBlock Text="{loc:Loc launcher-updates-notify-desc}" Margin="26,2,0,0" Opacity="0.6" FontSize="11" TextWrapping="Wrap"/>
450+
</StackPanel>
451+
452+
<StackPanel>
453+
<CheckBox IsChecked="{Binding LauncherUpdateAllowPreRelease}" Content="{loc:Loc launcher-updates-allow-prerelease}" />
454+
<TextBlock Text="{loc:Loc launcher-updates-allow-prerelease-desc}" Margin="26,2,0,0" Opacity="0.6" FontSize="11" TextWrapping="Wrap"/>
455+
</StackPanel>
456+
457+
<StackPanel Spacing="6">
458+
<TextBlock Text="{loc:Loc launcher-updates-repo}" Opacity="0.85" FontSize="12"/>
459+
<TextBox Classes="SettingsInput"
460+
Text="{Binding LauncherUpdateRepo, Mode=TwoWay}"
461+
Watermark="{loc:Loc launcher-updates-repo-placeholder}"/>
462+
<TextBlock Text="{loc:Loc launcher-updates-repo-desc}" Opacity="0.55" FontSize="11" TextWrapping="Wrap"/>
463+
</StackPanel>
464+
465+
</StackPanel>
466+
</Border>
467+
468+
<Border Classes="UpdatesSectionCard">
469+
<StackPanel Spacing="8">
470+
<DockPanel LastChildFill="False">
471+
<Button DockPanel.Dock="Right" Classes="SettingsButton Compact" Content="{loc:Loc launcher-updates-list-refresh}" Command="{Binding RefreshLauncherVersionsCommand}" />
472+
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="8" Margin="0,0,10,0" VerticalAlignment="Center">
473+
<TextBlock Text="{loc:Loc launcher-updates-filter-label}" Opacity="0.75" VerticalAlignment="Center" />
474+
<ComboBox Classes="SettingsCombo"
475+
MinWidth="170"
476+
ItemsSource="{Binding LauncherVersionFilters}"
477+
SelectedItem="{Binding SelectedLauncherVersionFilter}">
478+
<ComboBox.ItemTemplate>
479+
<DataTemplate>
480+
<TextBlock Text="{Binding Text}" />
481+
</DataTemplate>
482+
</ComboBox.ItemTemplate>
483+
</ComboBox>
484+
</StackPanel>
485+
<TextBlock DockPanel.Dock="Left" Text="{loc:Loc launcher-updates-list-title}" Classes="NanoHeadingSmall" FontWeight="SemiBold"/>
486+
</DockPanel>
487+
488+
<ProgressBar IsVisible="{Binding LauncherVersionsLoading}" IsIndeterminate="True" Height="4" />
489+
490+
<Border CornerRadius="8" ClipToBounds="True">
491+
<ListBox Classes="UpdatesVersionsList"
492+
ItemsSource="{Binding LauncherAvailableVersions}"
493+
SelectedItem="{Binding SelectedLauncherVersion, Mode=TwoWay}"
494+
MaxHeight="260">
495+
<ListBox.ItemTemplate>
496+
<DataTemplate>
497+
<Border Classes="update-version-card"
498+
ToolTip.Tip="{Binding Tooltip}">
499+
<Grid ColumnDefinitions="4,*,Auto" RowDefinitions="Auto,Auto,Auto">
500+
<Border Grid.RowSpan="3" Grid.Column="0" Classes="update-version-indicator" Background="#60575B7F" CornerRadius="4"/>
501+
502+
<TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Title}" FontWeight="SemiBold" Margin="10,0,10,0"/>
503+
<Border Grid.Row="0" Grid.Column="2"
504+
Classes="update-version-channel"
505+
Background="{Binding ChannelBadgeBackground}">
506+
<TextBlock Text="{Binding ChannelText}"
507+
FontSize="10"
508+
FontWeight="SemiBold"
509+
Foreground="{Binding ChannelBadgeForeground}" />
510+
</Border>
511+
<TextBlock Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Text="{Binding Subtitle}" FontSize="11" Opacity="0.65" Margin="10,2,0,0"/>
512+
<TextBlock Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Text="{Binding NotesPreview}" FontSize="11" Opacity="0.85" Margin="10,4,0,0" TextWrapping="Wrap"/>
513+
</Grid>
514+
</Border>
515+
</DataTemplate>
516+
</ListBox.ItemTemplate>
517+
</ListBox>
518+
</Border>
519+
520+
<DockPanel LastChildFill="False" Margin="0,2,0,0">
521+
<Button DockPanel.Dock="Left"
522+
Classes="SettingsButton Compact"
523+
Content="{loc:Loc launcher-updates-list-open}"
524+
IsEnabled="{Binding CanOpenSelectedLauncherVersion}"
525+
Command="{Binding OpenSelectedLauncherVersionCommand}" />
526+
<Button DockPanel.Dock="Right"
527+
Classes="SettingsButton"
528+
Content="{loc:Loc launcher-updates-list-install-selected}"
529+
IsEnabled="{Binding CanInstallSelectedLauncherVersion}"
530+
Command="{Binding InstallSelectedLauncherVersionCommand}" />
531+
</DockPanel>
532+
</StackPanel>
533+
</Border>
534+
</StackPanel>
535+
</ScrollViewer>
536+
</TabItem>
537+
538+
<TabItem Header="{loc:Loc tab-proxy-title}">
539+
<tabViews:ProxyTabView DataContext="{Binding ProxyTab}" />
540+
</TabItem>
541+
430542
<TabItem Header="{loc:Loc marsey-Header-Logging}">
431543
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
432544
<StackPanel Margin="12" Spacing="10">
@@ -592,118 +704,6 @@
592704

593705

594706

595-
<TabItem Header="{loc:Loc tab-proxy-title}">
596-
<tabViews:ProxyTabView DataContext="{Binding ProxyTab}" />
597-
</TabItem>
598-
599-
<TabItem Header="{loc:Loc launcher-updates-tab-title}">
600-
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
601-
<StackPanel Margin="12" Spacing="12">
602-
<Border Classes="UpdatesHeroCard">
603-
<StackPanel Spacing="6">
604-
<TextBlock Text="{loc:Loc launcher-updates-header}" Classes="NanoHeadingMedium" FontWeight="SemiBold" />
605-
<TextBlock Text="{Binding LauncherVersionsStatus}" Opacity="0.82" FontSize="12" TextWrapping="Wrap" />
606-
</StackPanel>
607-
</Border>
608-
609-
<Border Classes="UpdatesSectionCard">
610-
<StackPanel Spacing="12">
611-
<StackPanel>
612-
<CheckBox IsChecked="{Binding LauncherAutoUpdate}" Content="{loc:Loc launcher-updates-auto}" />
613-
<TextBlock Text="{loc:Loc launcher-updates-auto-desc}" Margin="26,2,0,0" Opacity="0.6" FontSize="11" TextWrapping="Wrap"/>
614-
</StackPanel>
615-
616-
<StackPanel>
617-
<CheckBox IsChecked="{Binding LauncherUpdateNotify}" Content="{loc:Loc launcher-updates-notify}" />
618-
<TextBlock Text="{loc:Loc launcher-updates-notify-desc}" Margin="26,2,0,0" Opacity="0.6" FontSize="11" TextWrapping="Wrap"/>
619-
</StackPanel>
620-
621-
<StackPanel>
622-
<CheckBox IsChecked="{Binding LauncherUpdateAllowPreRelease}" Content="{loc:Loc launcher-updates-allow-prerelease}" />
623-
<TextBlock Text="{loc:Loc launcher-updates-allow-prerelease-desc}" Margin="26,2,0,0" Opacity="0.6" FontSize="11" TextWrapping="Wrap"/>
624-
</StackPanel>
625-
626-
<StackPanel Spacing="6">
627-
<TextBlock Text="{loc:Loc launcher-updates-repo}" Opacity="0.85" FontSize="12"/>
628-
<TextBox Classes="SettingsInput"
629-
Text="{Binding LauncherUpdateRepo, Mode=TwoWay}"
630-
Watermark="{loc:Loc launcher-updates-repo-placeholder}"/>
631-
<TextBlock Text="{loc:Loc launcher-updates-repo-desc}" Opacity="0.55" FontSize="11" TextWrapping="Wrap"/>
632-
</StackPanel>
633-
634-
</StackPanel>
635-
</Border>
636-
637-
<Border Classes="UpdatesSectionCard">
638-
<StackPanel Spacing="8">
639-
<DockPanel LastChildFill="False">
640-
<Button DockPanel.Dock="Right" Classes="SettingsButton Compact" Content="{loc:Loc launcher-updates-list-refresh}" Command="{Binding RefreshLauncherVersionsCommand}" />
641-
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="8" Margin="0,0,10,0" VerticalAlignment="Center">
642-
<TextBlock Text="{loc:Loc launcher-updates-filter-label}" Opacity="0.75" VerticalAlignment="Center" />
643-
<ComboBox Classes="SettingsCombo"
644-
MinWidth="170"
645-
ItemsSource="{Binding LauncherVersionFilters}"
646-
SelectedItem="{Binding SelectedLauncherVersionFilter}">
647-
<ComboBox.ItemTemplate>
648-
<DataTemplate>
649-
<TextBlock Text="{Binding Text}" />
650-
</DataTemplate>
651-
</ComboBox.ItemTemplate>
652-
</ComboBox>
653-
</StackPanel>
654-
<TextBlock DockPanel.Dock="Left" Text="{loc:Loc launcher-updates-list-title}" Classes="NanoHeadingSmall" FontWeight="SemiBold"/>
655-
</DockPanel>
656-
657-
<ProgressBar IsVisible="{Binding LauncherVersionsLoading}" IsIndeterminate="True" Height="4" />
658-
659-
<Border CornerRadius="8" ClipToBounds="True">
660-
<ListBox Classes="UpdatesVersionsList"
661-
ItemsSource="{Binding LauncherAvailableVersions}"
662-
SelectedItem="{Binding SelectedLauncherVersion, Mode=TwoWay}"
663-
MaxHeight="260">
664-
<ListBox.ItemTemplate>
665-
<DataTemplate>
666-
<Border Classes="update-version-card"
667-
ToolTip.Tip="{Binding Tooltip}">
668-
<Grid ColumnDefinitions="4,*,Auto" RowDefinitions="Auto,Auto,Auto">
669-
<Border Grid.RowSpan="3" Grid.Column="0" Classes="update-version-indicator" Background="#60575B7F" CornerRadius="4"/>
670-
671-
<TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Title}" FontWeight="SemiBold" Margin="10,0,10,0"/>
672-
<Border Grid.Row="0" Grid.Column="2"
673-
Classes="update-version-channel"
674-
Background="{Binding ChannelBadgeBackground}">
675-
<TextBlock Text="{Binding ChannelText}"
676-
FontSize="10"
677-
FontWeight="SemiBold"
678-
Foreground="{Binding ChannelBadgeForeground}" />
679-
</Border>
680-
<TextBlock Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Text="{Binding Subtitle}" FontSize="11" Opacity="0.65" Margin="10,2,0,0"/>
681-
<TextBlock Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Text="{Binding NotesPreview}" FontSize="11" Opacity="0.85" Margin="10,4,0,0" TextWrapping="Wrap"/>
682-
</Grid>
683-
</Border>
684-
</DataTemplate>
685-
</ListBox.ItemTemplate>
686-
</ListBox>
687-
</Border>
688-
689-
<DockPanel LastChildFill="False" Margin="0,2,0,0">
690-
<Button DockPanel.Dock="Left"
691-
Classes="SettingsButton Compact"
692-
Content="{loc:Loc launcher-updates-list-open}"
693-
IsEnabled="{Binding CanOpenSelectedLauncherVersion}"
694-
Command="{Binding OpenSelectedLauncherVersionCommand}" />
695-
<Button DockPanel.Dock="Right"
696-
Classes="SettingsButton"
697-
Content="{loc:Loc launcher-updates-list-install-selected}"
698-
IsEnabled="{Binding CanInstallSelectedLauncherVersion}"
699-
Command="{Binding InstallSelectedLauncherVersionCommand}" />
700-
</DockPanel>
701-
</StackPanel>
702-
</Border>
703-
</StackPanel>
704-
</ScrollViewer>
705-
</TabItem>
706-
707707
<TabItem Header="{loc:Loc tab-development-title}">
708708
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
709709
<StackPanel Orientation="Vertical">

‎SS14.Launcher/Views/MainWindowTabs/ProxyProfileDialog.xaml‎

Lines changed: 80 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,89 @@
1010
Icon="{DynamicResource WindowIcon}"
1111
Title="{loc:Loc tab-proxy-dialog-title}"
1212
WindowStartupLocation="CenterOwner">
13-
<StackPanel Margin="12" Spacing="10">
14-
<TextBlock Text="{loc:Loc tab-proxy-dialog-name}" />
15-
<TextBox Name="NameBox" />
13+
<Window.Styles>
14+
<Style Selector="Border.ProxyDialogHero">
15+
<Setter Property="Background" Value="#243E6C45" />
16+
<Setter Property="BorderBrush" Value="#7A8E94B8" />
17+
<Setter Property="BorderThickness" Value="1" />
18+
<Setter Property="CornerRadius" Value="10" />
19+
<Setter Property="Padding" Value="12,10" />
20+
</Style>
21+
22+
<Style Selector="Border.ProxyDialogCard">
23+
<Setter Property="Background" Value="#17000000" />
24+
<Setter Property="BorderBrush" Value="#366B6F8F" />
25+
<Setter Property="BorderThickness" Value="1" />
26+
<Setter Property="CornerRadius" Value="8" />
27+
<Setter Property="Padding" Value="12" />
28+
</Style>
29+
30+
<Style Selector="TextBox.ProxyInput">
31+
<Setter Property="MinHeight" Value="32" />
32+
<Setter Property="VerticalContentAlignment" Value="Center" />
33+
</Style>
1634

17-
<Grid ColumnDefinitions="*,120">
18-
<StackPanel Grid.Column="0" Spacing="4" Margin="0,0,8,0">
19-
<TextBlock Text="{loc:Loc tab-proxy-dialog-host}" />
20-
<TextBox Name="HostBox" />
35+
<Style Selector="Button.ProxyDialogButton">
36+
<Setter Property="MinWidth" Value="110" />
37+
<Setter Property="MinHeight" Value="32" />
38+
<Setter Property="Padding" Value="12,6" />
39+
</Style>
40+
</Window.Styles>
41+
42+
<StackPanel Margin="12" Spacing="10">
43+
<Border Classes="ProxyDialogHero">
44+
<StackPanel Spacing="4">
45+
<TextBlock Text="{loc:Loc tab-proxy-dialog-title}" Classes="NanoHeadingSmall" FontWeight="SemiBold" />
46+
<TextBlock Text="SOCKS5" Opacity="0.72" FontSize="11" />
2147
</StackPanel>
22-
<StackPanel Grid.Column="1" Spacing="4">
23-
<TextBlock Text="{loc:Loc tab-proxy-dialog-port}" />
24-
<TextBox Name="PortBox" />
48+
</Border>
49+
50+
<Border Classes="ProxyDialogCard">
51+
<StackPanel Spacing="10">
52+
<StackPanel Spacing="4">
53+
<TextBlock Text="{loc:Loc tab-proxy-dialog-name}" />
54+
<TextBox Name="NameBox" Classes="ProxyInput" />
55+
</StackPanel>
56+
57+
<Grid ColumnDefinitions="*,120">
58+
<StackPanel Grid.Column="0" Spacing="4" Margin="0,0,8,0">
59+
<TextBlock Text="{loc:Loc tab-proxy-dialog-host}" />
60+
<TextBox Name="HostBox" Classes="ProxyInput" />
61+
</StackPanel>
62+
<StackPanel Grid.Column="1" Spacing="4">
63+
<TextBlock Text="{loc:Loc tab-proxy-dialog-port}" />
64+
<TextBox Name="PortBox" Classes="ProxyInput" />
65+
</StackPanel>
66+
</Grid>
67+
68+
<Grid ColumnDefinitions="*,*" RowDefinitions="Auto,Auto">
69+
<StackPanel Grid.Column="0" Grid.Row="0" Spacing="4" Margin="0,0,8,0">
70+
<TextBlock Text="{loc:Loc tab-proxy-dialog-user}" />
71+
<TextBox Name="UserBox" Classes="ProxyInput" />
72+
</StackPanel>
73+
<StackPanel Grid.Column="1" Grid.Row="0" Spacing="4">
74+
<TextBlock Text="{loc:Loc tab-proxy-dialog-pass}" />
75+
<Grid>
76+
<TextBox Name="PassHiddenBox" Classes="ProxyInput" PasswordChar="*" />
77+
<TextBox Name="PassVisibleBox" Classes="ProxyInput" IsVisible="False" />
78+
</Grid>
79+
</StackPanel>
80+
<CheckBox Grid.Column="1"
81+
Grid.Row="1"
82+
Name="ShowPasswordBox"
83+
Content="{loc:Loc tab-proxy-dialog-show-pass}"
84+
Margin="0,6,0,0"
85+
Checked="ShowPasswordChanged"
86+
Unchecked="ShowPasswordChanged" />
87+
</Grid>
88+
89+
<TextBlock Name="ErrorText" Foreground="#E67676" TextWrapping="Wrap" />
2590
</StackPanel>
26-
</Grid>
27-
28-
<Grid ColumnDefinitions="*,*,Auto" RowDefinitions="Auto,Auto">
29-
<TextBlock Grid.Column="0" Grid.Row="0" Text="{loc:Loc tab-proxy-dialog-user}" />
30-
<TextBlock Grid.Column="1" Grid.Row="0" Text="{loc:Loc tab-proxy-dialog-pass}" Margin="8,0,0,0" />
31-
<TextBox Grid.Column="0" Grid.Row="1" Name="UserBox" />
32-
<TextBox Grid.Column="1" Grid.Row="1" Name="PassHiddenBox" PasswordChar="*" Margin="8,0,0,0" />
33-
<TextBox Grid.Column="1" Grid.Row="1" Name="PassVisibleBox" IsVisible="False" Margin="8,0,0,0" />
34-
<CheckBox Grid.Column="2" Grid.Row="1" Name="ShowPasswordBox" Content="{loc:Loc tab-proxy-dialog-show-pass}" VerticalAlignment="Center" Margin="8,0,0,0" Checked="ShowPasswordChanged" Unchecked="ShowPasswordChanged" />
35-
</Grid>
36-
37-
<TextBlock Name="ErrorText" Foreground="#E67676" TextWrapping="Wrap" />
38-
39-
<DockPanel LastChildFill="False" Margin="0,8,0,0">
40-
<Button DockPanel.Dock="Right" Name="SaveButton" Content="{loc:Loc tab-proxy-dialog-save}" Click="SaveClicked" />
41-
<Button DockPanel.Dock="Right" Content="{loc:Loc tab-proxy-dialog-cancel}" Click="CancelClicked" Margin="0,0,8,0" />
91+
</Border>
92+
93+
<DockPanel LastChildFill="False">
94+
<Button DockPanel.Dock="Right" Classes="ProxyDialogButton" Name="SaveButton" Content="{loc:Loc tab-proxy-dialog-save}" Click="SaveClicked" />
95+
<Button DockPanel.Dock="Right" Classes="ProxyDialogButton" Content="{loc:Loc tab-proxy-dialog-cancel}" Click="CancelClicked" Margin="0,0,8,0" />
4296
</DockPanel>
4397
</StackPanel>
4498
</Window>

0 commit comments

Comments
 (0)