mirror of
https://github.com/BeyondDimension/SteamTools.git
synced 2026-10-26 03:59:34 +08:00
Update Avalonia Package
Update UI
This commit is contained in:
rmbgame
@@ -15,9 +15,9 @@
|
||||
<Setter Property="FontSize" Value="16"></Setter>
|
||||
<Setter Property="MinHeight" Value="36"></Setter>
|
||||
</Style>
|
||||
<Style Selector="TabControl.flat /template/ DockPanel">
|
||||
<!--<Style Selector="TabControl.flat /template/ DockPanel">
|
||||
<Setter Property="Margin" Value="0 -10 0 0"></Setter>
|
||||
</Style>
|
||||
</Style>-->
|
||||
<Style Selector="TabControl.flat /template/ ItemsPresenter">
|
||||
<Setter Property="Margin" Value="{StaticResource PageMargin}"></Setter>
|
||||
</Style>
|
||||
|
||||
+1
-1
@@ -100,7 +100,7 @@
|
||||
</TextBox.InnerLeftContent>
|
||||
</TextBox>
|
||||
|
||||
<TabControl Classes="flat" ZIndex="1">
|
||||
<TabControl Classes="flat" Margin="0 30 0 0" ZIndex="1">
|
||||
<TabItem Header="{ReflectionBinding Path=Res.Achievement_Unlock,Mode=OneWay,Source={x:Static resx:R.Current}}">
|
||||
<DataGrid Items="{Binding Achievements}" IsReadOnly="True">
|
||||
<DataGrid.Columns>
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@
|
||||
</ExperimentalAcrylicBorder.Material>
|
||||
</ExperimentalAcrylicBorder>
|
||||
</DockPanel>-->
|
||||
<TabControl Margin="0 10 0 0">
|
||||
<TabControl Margin="0 20 0 0">
|
||||
<TabItem Header="{ReflectionBinding Path=Res.LocalAuth_SteamUserImport,Mode=OneWay,Source={x:Static resx:R.Current}}">
|
||||
<Panel>
|
||||
<Grid IsVisible="{Binding RequiresLogin}" RowDefinitions="Auto,*,Auto" Margin="10">
|
||||
|
||||
+262
-264
@@ -62,88 +62,87 @@
|
||||
</Style>
|
||||
</Panel.Styles>
|
||||
<controls:TitleBar/>
|
||||
<Panel>
|
||||
<controls:ProgressRing IsIndeterminate="True" HorizontalAlignment="Stretch" Height="100" Width="100" IsVisible="{Binding IsLoading}"/>
|
||||
<TabControl Margin="0 14 0 0" Padding="0" IsVisible="{Binding !IsLoading}">
|
||||
<TabControl.Styles>
|
||||
<Style Selector="TabItem">
|
||||
<Setter Property="FontSize" Value="16"></Setter>
|
||||
</Style>
|
||||
</TabControl.Styles>
|
||||
<TabItem Header="{ReflectionBinding Path=Res.User_BasicInfo,Mode=OneWay,Source={x:Static resx:R.Current}}">
|
||||
<Panel Margin="{StaticResource ContentMargin}">
|
||||
<StackPanel Margin="0 -38 0 0" VerticalAlignment="Center">
|
||||
<DockPanel>
|
||||
<Image Source="{ReflectionBinding Path=AvaterPath, Source={x:Static service:UserService.Current},Mode=OneWay,Converter={StaticResource BitmapAssetValueConverter},ConverterParameter=184}" Width="184" Height="184"/>
|
||||
<StackPanel Orientation="Vertical" Margin="16,0,0,0">
|
||||
<Button Content="{ReflectionBinding Path=Res.RefreshSteamAvatar,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Opacity="0"
|
||||
IsEnabled="False"
|
||||
Classes="SecondaryMin MariginButton WidthUnify"/>
|
||||
<TextBlock TextWrapping="Wrap"
|
||||
Margin="0,0,0,32"
|
||||
Opacity="0"
|
||||
FontSize="12"
|
||||
Text="{ReflectionBinding Path=Res.RefreshSteamAvatarDesc,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
<Button Classes="SecondaryMin MariginButton"
|
||||
IsEnabled="False"
|
||||
Content="{ReflectionBinding Path=Res.UploadYourAvatar,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
<TextBlock FontSize="12"
|
||||
TextWrapping="Wrap"
|
||||
Text="{ReflectionBinding Path=Res.UploadYourAvatarDesc,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
</StackPanel>
|
||||
</DockPanel>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="8"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="6"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="80"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="12"/>
|
||||
<ColumnDefinition Width="70"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.NickName,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="1"/>
|
||||
<TextBox Watermark="{ReflectionBinding Path=Res.PleaseEnterNickName,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Text="{Binding NickName}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="3"
|
||||
MaxLength="{ReflectionBinding Path=NickName,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}"/>
|
||||
<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.User_Phone,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="3"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=PhoneNumber,Mode=OneWay,Source={x:Static service:UserService.Current}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
MaxLength="{ReflectionBinding Path=PhoneNumber,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Modify,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Command="{Binding OnBtnChangeBindPhoneNumberClick}"
|
||||
IsVisible="{ReflectionBinding Path=HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Bind,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Command="{Binding OnBtnBindPhoneNumberClick}"
|
||||
IsVisible="{ReflectionBinding Path=!HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"/>
|
||||
<!--<TextBlock Classes="FormItemLabel"
|
||||
<controls:ProgressRing IsIndeterminate="True" HorizontalAlignment="Stretch" Height="100" Width="100" IsVisible="{Binding IsLoading}"/>
|
||||
<TabControl Margin="0 20 0 0" Padding="0" IsVisible="{Binding !IsLoading}">
|
||||
<TabControl.Styles>
|
||||
<Style Selector="TabItem">
|
||||
<Setter Property="FontSize" Value="16"></Setter>
|
||||
</Style>
|
||||
</TabControl.Styles>
|
||||
<TabItem Header="{ReflectionBinding Path=Res.User_BasicInfo,Mode=OneWay,Source={x:Static resx:R.Current}}">
|
||||
<Panel Margin="{StaticResource ContentMargin}">
|
||||
<StackPanel Margin="0 -38 0 0" VerticalAlignment="Center">
|
||||
<DockPanel>
|
||||
<Image Source="{ReflectionBinding Path=AvaterPath, Source={x:Static service:UserService.Current},Mode=OneWay,Converter={StaticResource BitmapAssetValueConverter},ConverterParameter=184}" Width="184" Height="184"/>
|
||||
<StackPanel Orientation="Vertical" Margin="16,0,0,0">
|
||||
<Button Content="{ReflectionBinding Path=Res.RefreshSteamAvatar,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Opacity="0"
|
||||
IsEnabled="False"
|
||||
Classes="SecondaryMin MariginButton WidthUnify"/>
|
||||
<TextBlock TextWrapping="Wrap"
|
||||
Margin="0,0,0,32"
|
||||
Opacity="0"
|
||||
FontSize="12"
|
||||
Text="{ReflectionBinding Path=Res.RefreshSteamAvatarDesc,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
<Button Classes="SecondaryMin MariginButton"
|
||||
IsEnabled="False"
|
||||
Content="{ReflectionBinding Path=Res.UploadYourAvatar,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
<TextBlock FontSize="12"
|
||||
TextWrapping="Wrap"
|
||||
Text="{ReflectionBinding Path=Res.UploadYourAvatarDesc,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
</StackPanel>
|
||||
</DockPanel>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="8"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="6"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="80"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="12"/>
|
||||
<ColumnDefinition Width="70"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.NickName,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="1"/>
|
||||
<TextBox Watermark="{ReflectionBinding Path=Res.PleaseEnterNickName,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Text="{Binding NickName}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Grid.ColumnSpan="3"
|
||||
MaxLength="{ReflectionBinding Path=NickName,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}"/>
|
||||
<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.User_Phone,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="3"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=PhoneNumber,Mode=OneWay,Source={x:Static service:UserService.Current}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
MaxLength="{ReflectionBinding Path=PhoneNumber,Mode=OneTime,Source={x:Static ccl_services:InputLengthConstants.Current}}"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Modify,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Command="{Binding OnBtnChangeBindPhoneNumberClick}"
|
||||
IsVisible="{ReflectionBinding Path=HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Bind,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Command="{Binding OnBtnBindPhoneNumberClick}"
|
||||
IsVisible="{ReflectionBinding Path=!HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"/>
|
||||
<!--<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.Email,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="5"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
@@ -157,199 +156,198 @@
|
||||
Grid.Row="5"
|
||||
Grid.Column="3"
|
||||
IsEnabled="False"/>-->
|
||||
<TextBlock
|
||||
Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.UserProfile_Location,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="5"/>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3">
|
||||
<ComboBox Classes="Area AreaShort"
|
||||
Items="{Binding AreaItems2}"
|
||||
SelectedItem="{Binding AreaSelectItem2}"/>
|
||||
<ComboBox Classes="MarginLeft Area AreaShort"
|
||||
IsVisible="{Binding !AreaNotVisible3}"
|
||||
Items="{Binding AreaItems3}"
|
||||
SelectedItem="{Binding AreaSelectItem3}"/>
|
||||
<ComboBox Classes="MarginLeft Area AreaLong"
|
||||
IsVisible="{Binding !AreaNotVisible4}"
|
||||
Items="{Binding AreaItems4}"
|
||||
SelectedItem="{Binding AreaSelectItem4}"/>
|
||||
</WrapPanel>
|
||||
<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.Gender,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="7"/>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3">
|
||||
<RadioButton Content="{ReflectionBinding Path=Res.Gender_Unknown,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
IsChecked="{Binding Gender, Converter={StaticResource GenderEnumValueConverter}, ConverterParameter=Unknown}"/>
|
||||
<RadioButton Classes="MarginLeft"
|
||||
Content="{ReflectionBinding Path=Res.Gender_Male,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
IsChecked="{Binding Gender, Converter={StaticResource GenderEnumValueConverter}, ConverterParameter=Male}"/>
|
||||
<RadioButton Classes="MarginLeft"
|
||||
Content="{ReflectionBinding Path=Res.Gender_Female,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
IsChecked="{Binding Gender, Converter={StaticResource GenderEnumValueConverter}, ConverterParameter=Female}"/>
|
||||
</WrapPanel>
|
||||
<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.UserProfile_BirthDate,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="9"/>
|
||||
<DatePicker Height="36"
|
||||
SelectedDate="{Binding BirthDate, Mode=TwoWay}"
|
||||
Grid.Row="9" Grid.Column="1" Grid.ColumnSpan="3"/>
|
||||
|
||||
</Grid>
|
||||
<Button Classes="action WidthUnify"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0 0 0 16"
|
||||
Command="{ReflectionBinding Submit}"
|
||||
IsEnabled="{Binding IsModify}"
|
||||
Content="{ReflectionBinding Path=Res.SaveChanges,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
</StackPanel>
|
||||
</Panel>
|
||||
</TabItem>
|
||||
<TabItem Header="{ReflectionBinding Path=Res.User_AccountBind,Mode=OneWay,Source={x:Static resx:R.Current}}">
|
||||
<DockPanel>
|
||||
<TextBlock Margin="20"
|
||||
DockPanel.Dock="Bottom"
|
||||
Text="{ReflectionBinding Path=Res.User_AccountBindTip,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
VerticalAlignment="Bottom"
|
||||
TextWrapping="Wrap"
|
||||
TextAlignment="Center"
|
||||
IsVisible="{Binding CurrentSelectChannel,Converter={StaticResource IsNullConverter}}"/>
|
||||
|
||||
<StackPanel Spacing="8"
|
||||
VerticalAlignment="Center"
|
||||
Margin="40 0"
|
||||
IsVisible="{Binding CurrentSelectChannel,Converter={StaticResource IsNullConverter},ConverterParameter=invert}">
|
||||
<TextBlock TextWrapping="WrapWithOverflow"
|
||||
Text="{ReflectionBinding Path=Res.User_WaitFastLoginTip,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
<controls:ProgressRing IsIndeterminate="True"
|
||||
Margin="0 40 0 40"
|
||||
Width="100"
|
||||
Height="100">
|
||||
</controls:ProgressRing>
|
||||
|
||||
<WrapPanel HorizontalAlignment="Center" Margin="0 0 0 50">
|
||||
<Button Classes="plain"
|
||||
Margin="0 0 25 0"
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{ReflectionBinding Path=Res.Cancel,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Command="{ReflectionBinding ChangeLoginState}"
|
||||
CommandParameter="2"/>
|
||||
<Button Classes="plain"
|
||||
Margin="25 0 0 0"
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{ReflectionBinding Path=Res.Retry,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Command="{Binding OnBindFastLoginClick}"
|
||||
CommandParameter="{Binding CurrentSelectChannel}"/>
|
||||
<TextBlock
|
||||
Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.UserProfile_Location,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="5"/>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3">
|
||||
<ComboBox Classes="Area AreaShort"
|
||||
Items="{Binding AreaItems2}"
|
||||
SelectedItem="{Binding AreaSelectItem2}"/>
|
||||
<ComboBox Classes="MarginLeft Area AreaShort"
|
||||
IsVisible="{Binding !AreaNotVisible3}"
|
||||
Items="{Binding AreaItems3}"
|
||||
SelectedItem="{Binding AreaSelectItem3}"/>
|
||||
<ComboBox Classes="MarginLeft Area AreaLong"
|
||||
IsVisible="{Binding !AreaNotVisible4}"
|
||||
Items="{Binding AreaItems4}"
|
||||
SelectedItem="{Binding AreaSelectItem4}"/>
|
||||
</WrapPanel>
|
||||
</StackPanel>
|
||||
<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.Gender,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="7"/>
|
||||
<WrapPanel Orientation="Horizontal" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3">
|
||||
<RadioButton Content="{ReflectionBinding Path=Res.Gender_Unknown,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
IsChecked="{Binding Gender, Converter={StaticResource GenderEnumValueConverter}, ConverterParameter=Unknown}"/>
|
||||
<RadioButton Classes="MarginLeft"
|
||||
Content="{ReflectionBinding Path=Res.Gender_Male,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
IsChecked="{Binding Gender, Converter={StaticResource GenderEnumValueConverter}, ConverterParameter=Male}"/>
|
||||
<RadioButton Classes="MarginLeft"
|
||||
Content="{ReflectionBinding Path=Res.Gender_Female,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
IsChecked="{Binding Gender, Converter={StaticResource GenderEnumValueConverter}, ConverterParameter=Female}"/>
|
||||
</WrapPanel>
|
||||
<TextBlock Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.UserProfile_BirthDate,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="9"/>
|
||||
<DatePicker Height="36"
|
||||
SelectedDate="{Binding BirthDate, Mode=TwoWay}"
|
||||
Grid.Row="9" Grid.Column="1" Grid.ColumnSpan="3"/>
|
||||
|
||||
<Grid Margin="{StaticResource ContentMargin}"
|
||||
VerticalAlignment="Center"
|
||||
DockPanel.Dock="Top"
|
||||
IsVisible="{Binding CurrentSelectChannel,Converter={StaticResource IsNullConverter}}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="80"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="12"/>
|
||||
<ColumnDefinition Width="70"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
</Grid>
|
||||
<Button Classes="action WidthUnify"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0 0 0 16"
|
||||
Command="{ReflectionBinding Submit}"
|
||||
IsEnabled="{Binding IsModify}"
|
||||
Content="{ReflectionBinding Path=Res.SaveChanges,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
</StackPanel>
|
||||
</Panel>
|
||||
</TabItem>
|
||||
<TabItem Header="{ReflectionBinding Path=Res.User_AccountBind,Mode=OneWay,Source={x:Static resx:R.Current}}">
|
||||
<DockPanel>
|
||||
<TextBlock Margin="20"
|
||||
DockPanel.Dock="Bottom"
|
||||
Text="{ReflectionBinding Path=Res.User_AccountBindTip,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
VerticalAlignment="Bottom"
|
||||
TextWrapping="Wrap"
|
||||
TextAlignment="Center"
|
||||
IsVisible="{Binding CurrentSelectChannel,Converter={StaticResource IsNullConverter}}"/>
|
||||
|
||||
<PathIcon Classes="FormItemLabel" Data="{StaticResource SteamDrawing}" Grid.Row="1"/>
|
||||
<!--<TextBlock
|
||||
<StackPanel Spacing="8"
|
||||
VerticalAlignment="Center"
|
||||
Margin="40 0"
|
||||
IsVisible="{Binding CurrentSelectChannel,Converter={StaticResource IsNullConverter},ConverterParameter=invert}">
|
||||
<TextBlock TextWrapping="WrapWithOverflow"
|
||||
Text="{ReflectionBinding Path=Res.User_WaitFastLoginTip,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
|
||||
<controls:ProgressRing IsIndeterminate="True"
|
||||
Margin="0 40 0 40"
|
||||
Width="100"
|
||||
Height="100">
|
||||
</controls:ProgressRing>
|
||||
|
||||
<WrapPanel HorizontalAlignment="Center" Margin="0 0 0 50">
|
||||
<Button Classes="plain"
|
||||
Margin="0 0 25 0"
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{ReflectionBinding Path=Res.Cancel,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Command="{ReflectionBinding ChangeLoginState}"
|
||||
CommandParameter="2"/>
|
||||
<Button Classes="plain"
|
||||
Margin="25 0 0 0"
|
||||
HorizontalContentAlignment="Center"
|
||||
Content="{ReflectionBinding Path=Res.Retry,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Command="{Binding OnBindFastLoginClick}"
|
||||
CommandParameter="{Binding CurrentSelectChannel}"/>
|
||||
</WrapPanel>
|
||||
</StackPanel>
|
||||
|
||||
<Grid Margin="{StaticResource ContentMargin}"
|
||||
VerticalAlignment="Center"
|
||||
DockPanel.Dock="Top"
|
||||
IsVisible="{Binding CurrentSelectChannel,Converter={StaticResource IsNullConverter}}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="16"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="80"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="12"/>
|
||||
<ColumnDefinition Width="70"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<PathIcon Classes="FormItemLabel" Data="{StaticResource SteamDrawing}" Grid.Row="1"/>
|
||||
<!--<TextBlock
|
||||
Classes="FormItemLabel"
|
||||
Text="{ReflectionBinding Path=Res.SteamAccount,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="11"/>-->
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=Res.Unbound,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Text="{ReflectionBinding Path=User.SteamAccountId,Mode=OneWay,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Bind,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnBindFastLoginClick}"
|
||||
CommandParameter="Steam"
|
||||
IsVisible="{ReflectionBinding Path=User.SteamAccountId,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNull}}"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Unbundling,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnUnbundleFastLoginClick}"
|
||||
CommandParameter="Steam"
|
||||
IsEnabled="{ReflectionBinding Path=HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
IsVisible="{ReflectionBinding Path=User.SteamAccountId,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNotNull}}"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=Res.Unbound,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Text="{ReflectionBinding Path=User.SteamAccountId,Mode=OneWay,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Bind,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnBindFastLoginClick}"
|
||||
CommandParameter="Steam"
|
||||
IsVisible="{ReflectionBinding Path=User.SteamAccountId,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNull}}"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Unbundling,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnUnbundleFastLoginClick}"
|
||||
CommandParameter="Steam"
|
||||
IsEnabled="{ReflectionBinding Path=HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
IsVisible="{ReflectionBinding Path=User.SteamAccountId,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNotNull}}"/>
|
||||
|
||||
<PathIcon Classes="FormItemLabel" Data="{StaticResource Xbox}" Grid.Row="3"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=Res.Unbound,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Text="{ReflectionBinding Path=User.MicrosoftAccountEmail,Mode=OneWay,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Bind,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnBindFastLoginClick}"
|
||||
CommandParameter="Microsoft"
|
||||
IsVisible="{ReflectionBinding Path=User.MicrosoftAccountEmail,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNull}}"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Unbundling,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnUnbundleFastLoginClick}"
|
||||
CommandParameter="Microsoft"
|
||||
IsEnabled="{ReflectionBinding Path=HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
IsVisible="{ReflectionBinding Path=User.MicrosoftAccountEmail,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNotNull}}"/>
|
||||
<PathIcon Classes="FormItemLabel" Data="{StaticResource Xbox}" Grid.Row="3"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=Res.Unbound,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Text="{ReflectionBinding Path=User.MicrosoftAccountEmail,Mode=OneWay,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Bind,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnBindFastLoginClick}"
|
||||
CommandParameter="Microsoft"
|
||||
IsVisible="{ReflectionBinding Path=User.MicrosoftAccountEmail,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNull}}"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Unbundling,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnUnbundleFastLoginClick}"
|
||||
CommandParameter="Microsoft"
|
||||
IsEnabled="{ReflectionBinding Path=HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
IsVisible="{ReflectionBinding Path=User.MicrosoftAccountEmail,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNotNull}}"/>
|
||||
|
||||
<PathIcon Classes="FormItemLabel" Data="{StaticResource QQ}" Grid.Row="5"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=Res.Unbound,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Text="{ReflectionBinding Path=User.QQAccountNumber,Mode=OneWay,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="5"
|
||||
Grid.Column="1"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Bind,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="5"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnBindFastLoginClick}"
|
||||
CommandParameter="QQ"
|
||||
IsVisible="{ReflectionBinding Path=User.QQAccountNumber,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNull}}"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Unbundling,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="5"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnUnbundleFastLoginClick}"
|
||||
CommandParameter="QQ"
|
||||
IsEnabled="{ReflectionBinding Path=HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
IsVisible="{ReflectionBinding Path=User.QQAccountNumber,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNotNull}}"/>
|
||||
<PathIcon Classes="FormItemLabel" Data="{StaticResource QQ}" Grid.Row="5"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=Res.Unbound,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Text="{ReflectionBinding Path=User.QQAccountNumber,Mode=OneWay,Source={x:Static service:UserService.Current}}}"
|
||||
Grid.Row="5"
|
||||
Grid.Column="1"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Bind,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="5"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnBindFastLoginClick}"
|
||||
CommandParameter="QQ"
|
||||
IsVisible="{ReflectionBinding Path=User.QQAccountNumber,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNull}}"/>
|
||||
<Button Classes="Secondary"
|
||||
Content="{ReflectionBinding Path=Res.Unbundling,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="5"
|
||||
Grid.Column="3"
|
||||
Command="{Binding OnUnbundleFastLoginClick}"
|
||||
CommandParameter="QQ"
|
||||
IsEnabled="{ReflectionBinding Path=HasPhoneNumber,Source={x:Static service:UserService.Current}}}"
|
||||
IsVisible="{ReflectionBinding Path=User.QQAccountNumber,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={x:Static ObjectConverters.IsNotNull}}"/>
|
||||
|
||||
<PathIcon Classes="FormItemLabel" Data="{StaticResource Apple}" Grid.Row="7"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=Res.UnderConstruction,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="7"
|
||||
Grid.Column="1"/>
|
||||
<PathIcon Classes="FormItemLabel" Data="{StaticResource Apple}" Grid.Row="7"/>
|
||||
<TextBox IsReadOnly="True"
|
||||
Focusable="False"
|
||||
Watermark="{ReflectionBinding Path=Res.UnderConstruction,Mode=OneWay,Source={x:Static resx:R.Current}}"
|
||||
Grid.Row="7"
|
||||
Grid.Column="1"/>
|
||||
|
||||
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</Panel>
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<!--Toast-->
|
||||
<controls:ToastMessage />
|
||||
</Panel>
|
||||
|
||||
@@ -73,11 +73,11 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia" Version="0.10.999-cibuild0015275-beta" />
|
||||
<PackageReference Include="Avalonia" Version="0.10.999-cibuild0015286-beta" />
|
||||
<!--<PackageReference Include="Avalonia.AvaloniaEdit" Version="0.10.4" />-->
|
||||
<PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0015275-beta" />
|
||||
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.999-cibuild0015275-beta" />
|
||||
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0015275-beta" />
|
||||
<PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0015286-beta" />
|
||||
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.999-cibuild0015286-beta" />
|
||||
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0015286-beta" />
|
||||
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.6.10" />
|
||||
<!--<PackageReference Include="CefNet.Avalonia" Version="90.6.21124.1851" />-->
|
||||
<!--<PackageReference Include="LibVLCSharp.Avalonia" Version="3.5.1" />-->
|
||||
@@ -85,7 +85,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(Configuration)'=='Debug'">
|
||||
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0015275-beta" />
|
||||
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0015286-beta" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
Reference in New Issue
Block a user