Skip to content

Commit cb00861

Browse files
rmbadminrmbadmin
committed
Fix Epic 19.0.1 Switch
1 parent 64f6044 commit cb00861

File tree

2 files changed

+65
-65
lines changed

2 files changed

+65
-65
lines changed

‎src/BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"PlatformIds": [ "e", "epg", "epic", "epicgames" ],
1010
"ExesToEnd": [ "EpicGamesLauncher.exe" ],
1111
"LoginFiles": {
12-
"%LocalAppData%\\EpicGamesLauncher\\Saved\\Config\\Windows\\GameUserSettings.ini": "GameUserSettings.ini",
12+
"%LocalAppData%\\EpicGamesLauncher\\Saved\\Config\\WindowsEditor\\GameUserSettings.ini": "GameUserSettings.ini",
1313
"REG:HKCU\\Software\\Epic Games\\Unreal Engine\\Identifiers:AccountId": "UNIQUE_ID"
1414
},
1515
"ClearPaths": [ "SAME_AS_LOGIN_FILES" ],

‎src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/GameAccountPage.axaml‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<spp:PageBase
2+
Description="{Binding Description, Source={x:Static s:Plugin.Instance}, Mode=OneWay}"
3+
Subtitle="{Binding Author, Source={x:Static s:Plugin.Instance}, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter=Plugin_Author}"
4+
Title="{Binding Name, Source={x:Static s:Plugin.Instance}, Mode=OneWay}"
5+
d:DesignHeight="450"
6+
d:DesignWidth="800"
7+
mc:Ignorable="d"
28
x:Class="BD.WTTS.UI.Views.Pages.GameAccountPage"
9+
x:CompileBindings="True"
10+
x:DataType="spp:GameAccountPageViewModel"
311
xmlns="https://github.com/avaloniaui"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
512
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
613
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
714
xmlns:ms="https://steampp.net/settings"
815
xmlns:s="https://steampp.net/services"
916
xmlns:spp="https://steampp.net/ui"
1017
xmlns:ui="using:FluentAvalonia.UI.Controls"
11-
Title="{Binding Name, Source={x:Static s:Plugin.Instance}, Mode=OneWay}"
12-
d:DesignHeight="450"
13-
d:DesignWidth="800"
14-
x:CompileBindings="True"
15-
x:DataType="spp:GameAccountPageViewModel"
16-
Description="{Binding Description, Source={x:Static s:Plugin.Instance}, Mode=OneWay}"
17-
Subtitle="{Binding Author, Source={x:Static s:Plugin.Instance}, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter=Plugin_Author}"
18-
mc:Ignorable="d">
18+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
1919
<spp:PageBase.PreviewImage>
2020
<ui:ImageIconSource Source="{Binding Icon, Source={x:Static s:Plugin.Instance}, Mode=OneWay, Converter={StaticResource BitmapAssetValueConverter}}" />
2121
</spp:PageBase.PreviewImage>
@@ -34,97 +34,97 @@
3434
<spp:PageBase.ActionContent>
3535
<StackPanel Orientation="Horizontal" Spacing="2">
3636
<Button
37-
Padding="8,4"
3837
Command="{Binding LoginNewCommand}"
3938
DockPanel.Dock="Right"
39+
Padding="8,4"
4040
Theme="{StaticResource TransparentButton}">
4141
<Panel>
4242
<Viewbox
43-
Width="16"
4443
Height="16"
45-
HorizontalAlignment="Left">
44+
HorizontalAlignment="Left"
45+
Width="16">
4646
<ui:SymbolIcon Symbol="Add" />
4747
</Viewbox>
4848
<TextBlock
49-
Margin="28,4,0,4"
5049
HorizontalAlignment="Left"
51-
VerticalAlignment="Center"
52-
Text="{Binding Path=Res.UserChange_LoginNewAccount, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
50+
Margin="28,4,0,4"
51+
Text="{Binding Path=Res.UserChange_LoginNewAccount, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
52+
VerticalAlignment="Center" />
5353
</Panel>
5454
</Button>
5555
<Button
56-
Padding="8,4"
5756
Command="{Binding SaveCurrentUserCommand}"
5857
DockPanel.Dock="Right"
5958
IsVisible="{Binding !IsSelectedSteam}"
59+
Padding="8,4"
6060
Theme="{StaticResource TransparentButton}">
6161
<Panel>
6262
<Viewbox
63-
Width="16"
6463
Height="16"
65-
HorizontalAlignment="Left">
64+
HorizontalAlignment="Left"
65+
Width="16">
6666
<ui:SymbolIcon Symbol="Save" />
6767
</Viewbox>
6868
<TextBlock
69-
Margin="28,4,0,4"
7069
HorizontalAlignment="Left"
71-
VerticalAlignment="Center"
72-
Text="{Binding Path=Res.GameAccount_SaveCurrentAccount, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
73-
</Panel>
74-
</Button>
75-
<Button
76-
Padding="8,4"
77-
Command="{Binding ShareManageCommand}"
78-
DockPanel.Dock="Right"
79-
IsVisible="{Binding IsSelectedSteam}"
80-
Theme="{StaticResource TransparentButton}">
81-
<Panel>
82-
<Viewbox
83-
Width="16"
84-
Height="16"
85-
HorizontalAlignment="Left">
86-
<ui:SymbolIcon Symbol="ShareAndroid" />
87-
</Viewbox>
88-
<TextBlock
8970
Margin="28,4,0,4"
90-
HorizontalAlignment="Left"
91-
VerticalAlignment="Center"
92-
Text="{Binding Path=Res.AccountChange_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
71+
Text="{Binding Path=Res.GameAccount_SaveCurrentAccount, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
72+
VerticalAlignment="Center" />
9373
</Panel>
9474
</Button>
75+
<!-- <Button -->
76+
<!-- Command="{Binding ShareManageCommand}" -->
77+
<!-- DockPanel.Dock="Right" -->
78+
<!-- IsVisible="{Binding IsSelectedSteam}" -->
79+
<!-- Padding="8,4" -->
80+
<!-- Theme="{StaticResource TransparentButton}"> -->
81+
<!-- <Panel> -->
82+
<!-- <Viewbox -->
83+
<!-- Height="16" -->
84+
<!-- HorizontalAlignment="Left" -->
85+
<!-- Width="16"> -->
86+
<!-- <ui:SymbolIcon Symbol="ShareAndroid" /> -->
87+
<!-- </Viewbox> -->
88+
<!-- <TextBlock -->
89+
<!-- HorizontalAlignment="Left" -->
90+
<!-- Margin="28,4,0,4" -->
91+
<!-- Text="{Binding Path=Res.AccountChange_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" -->
92+
<!-- VerticalAlignment="Center" /> -->
93+
<!-- </Panel> -->
94+
<!-- </Button> -->
9595
<Button
96-
Padding="8,4"
9796
Command="{Binding RefreshCommand}"
9897
DockPanel.Dock="Right"
98+
Padding="8,4"
9999
Theme="{StaticResource TransparentButton}">
100100
<Panel>
101101
<Viewbox
102-
Width="16"
103102
Height="16"
104-
HorizontalAlignment="Left">
103+
HorizontalAlignment="Left"
104+
Width="16">
105105
<ui:SymbolIcon Symbol="Refresh" />
106106
</Viewbox>
107107
<TextBlock
108-
Margin="28,4,0,4"
109108
HorizontalAlignment="Left"
110-
VerticalAlignment="Center"
111-
Text="{Binding Path=Res.Refresh, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
109+
Margin="28,4,0,4"
110+
Text="{Binding Path=Res.Refresh, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
111+
VerticalAlignment="Center" />
112112
</Panel>
113113
</Button>
114114
<DropDownButton
115-
Padding="8"
116-
HorizontalContentAlignment="Center"
117-
VerticalContentAlignment="Center"
118115
Content="{StaticResource More}"
119116
FontFamily="{StaticResource SymbolThemeFontFamily}"
120117
FontSize="20"
121-
Theme="{StaticResource TransparentButton}">
118+
HorizontalContentAlignment="Center"
119+
Padding="8"
120+
Theme="{StaticResource TransparentButton}"
121+
VerticalContentAlignment="Center">
122122
<DropDownButton.Flyout>
123123
<ui:FAMenuFlyout Placement="BottomEdgeAlignedRight">
124124
<ui:MenuFlyoutItem
125-
x:Name="PlatformSettingButton"
126125
IsVisible="{Binding !IsSelectedSteam}"
127-
Text="平台设置" />
126+
Text="平台设置"
127+
x:Name="PlatformSettingButton" />
128128
<!--<ui:MenuFlyoutItem x:Name="PluginSettingButton" Text="{Binding Path=Res.Settings_Plugin, Mode=OneWay,Source={x:Static s:ResourceService.Current}}" />-->
129129
<ui:ToggleMenuFlyoutItem
130130
IsChecked="{Binding Source={x:Static ms:GameAccountSettings.IsShowAccountName}, Path=Value, Mode=TwoWay}"
@@ -154,31 +154,31 @@
154154
</StackPanel>
155155
</spp:PageBase.ActionContent>
156156
<ui:TabView
157-
Padding="0"
158-
VerticalAlignment="Stretch"
159157
Background="Transparent"
160158
CloseButtonOverlayMode="OnPointerOver"
161159
IsAddTabButtonVisible="False"
160+
Padding="0"
162161
SelectedItem="{Binding SelectedPlatform}"
163162
SelectionChanged="TabView_SelectedItemChanged"
164163
TabCloseRequested="TabView_TabCloseRequested"
165164
TabItems="{Binding GamePlatforms}"
166-
TabWidthMode="Equal">
165+
TabWidthMode="Equal"
166+
VerticalAlignment="Stretch">
167167
<ui:TabView.TabStripFooter>
168168
<Button
169-
HorizontalAlignment="Left"
170-
VerticalAlignment="Center"
171169
Content="&#xE710;"
172170
FontFamily="{StaticResource SymbolThemeFontFamily}"
173-
Theme="{StaticResource TabViewButtonStyle}">
171+
HorizontalAlignment="Left"
172+
Theme="{StaticResource TabViewButtonStyle}"
173+
VerticalAlignment="Center">
174174
<Button.Flyout>
175175
<MenuFlyout Placement="BottomEdgeAlignedLeft">
176176
<MenuItem
177177
Header="{Binding Path=Res.AddPlatform, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
178178
IsVisible="{Binding !!AddGamePlatforms.Count}"
179179
ItemsSource="{Binding AddGamePlatforms}">
180180
<MenuItem.Styles>
181-
<Style x:DataType="spp:PlatformAccount" Selector="MenuItem">
181+
<Style Selector="MenuItem" x:DataType="spp:PlatformAccount">
182182
<Setter Property="Header" Value="{Binding FullName}" />
183183
<Setter Property="Icon">
184184
<Setter.Value>
@@ -239,7 +239,7 @@
239239
</Button>
240240
</ui:TabView.TabStripFooter>
241241
<ui:TabView.Styles>
242-
<Style x:DataType="spp:PlatformAccount" Selector="ui|TabViewItem">
242+
<Style Selector="ui|TabViewItem" x:DataType="spp:PlatformAccount">
243243
<!--<Setter Property="IconSource">
244244
<ui:FontIconSource Glyph="{Binding Icon}" />
245245
</Setter>-->
@@ -255,14 +255,14 @@
255255
<DataTemplate DataType="spp:PlatformAccount">
256256
<DockPanel>
257257
<PathIcon
258-
Width="16"
258+
Data="{Binding Icon, Converter={StaticResource ResourceKeyValueConverter}}"
259+
DockPanel.Dock="Left"
259260
Height="16"
260261
Margin="0,0,8,0"
261-
Data="{Binding Icon, Converter={StaticResource ResourceKeyValueConverter}}"
262-
DockPanel.Dock="Left" />
262+
Width="16" />
263263
<TextBlock DockPanel.Dock="Right" Text="{Binding FullName}" />
264264
</DockPanel>
265265
</DataTemplate>
266266
</ui:TabView.TabItemTemplate>
267267
</ui:TabView>
268-
</spp:PageBase>
268+
</spp:PageBase>

0 commit comments

Comments
 (0)