Browse Source

3434

样式分支
fyf 2 years ago
parent
commit
6cbd292c74
2 changed files with 10 additions and 9 deletions
  1. +3
    -3
      BPASmartClient/Control/AdminstratorsView.xaml
  2. +7
    -6
      BPASmartClient/MainWindow.xaml

+ 3
- 3
BPASmartClient/Control/AdminstratorsView.xaml View File

@@ -37,17 +37,17 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="账号:" <TextBlock Text="账号:"
VerticalAlignment="Bottom" HorizontalAlignment="Right" VerticalAlignment="Bottom" HorizontalAlignment="Right"
Margin="20"
Margin="20" Foreground="#feffff"
Style="{StaticResource TxLogin}" Style="{StaticResource TxLogin}"
/> />
<TextBlock Text="密码:" Grid.Row="1" <TextBlock Text="密码:" Grid.Row="1"
VerticalAlignment="Top" HorizontalAlignment="Right" VerticalAlignment="Top" HorizontalAlignment="Right"
Margin="20"
Margin="20" Foreground="#feffff"
Style="{StaticResource TxLogin}"/> Style="{StaticResource TxLogin}"/>
<TextBox x:Name="tbx_admin" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" <TextBox x:Name="tbx_admin" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
Text="{Binding Admin, Mode=TwoWay}" Text="{Binding Admin, Mode=TwoWay}"
Foreground="#F8F8FF" FontSize="20" Foreground="#F8F8FF" FontSize="20"
Width="180" Height="28"
Width="180" Height="28"
VerticalAlignment="Bottom" HorizontalAlignment="Center" VerticalAlignment="Bottom" HorizontalAlignment="Center"
VerticalContentAlignment="Top" HorizontalContentAlignment="Center" VerticalContentAlignment="Top" HorizontalContentAlignment="Center"
Margin="20" Margin="20"


+ 7
- 6
BPASmartClient/MainWindow.xaml View File

@@ -26,7 +26,6 @@
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>



<Border x:Name="br" Style="{DynamicResource border主窗体背景}"> <Border x:Name="br" Style="{DynamicResource border主窗体背景}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -214,20 +213,25 @@
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Style="{DynamicResource border右下}" /> Style="{DynamicResource border右下}" />
<Border <Border
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Style="{DynamicResource border左下}" /> Style="{DynamicResource border左下}" />
<Border <Border
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Style="{DynamicResource border右上}" /> Style="{DynamicResource border右上}" />
<Border <Border
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Style="{DynamicResource border左上}" /> Style="{DynamicResource border左上}" />
<Grid Margin="10"> <Grid Margin="10">
<Border Width="600" Style="{DynamicResource borderFromTitle}" /> <Border Width="600" Style="{DynamicResource borderFromTitle}" />
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Horizontal" >
<CheckBox <CheckBox
Content="开机启动" Margin="5,0,5,0" Content="开机启动" Margin="5,0,5,0"
@@ -250,7 +254,6 @@
Cursor="Hand" /> Cursor="Hand" />
</StackPanel> </StackPanel>



<TextBlock <TextBlock
x:Name="Title" x:Name="Title"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -258,6 +261,7 @@
Foreground="#feffff"> Foreground="#feffff">
日志监控界面 日志监控界面
</TextBlock> </TextBlock>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<Button <Button
Name="login" Margin="5,0,5,0" Name="login" Margin="5,0,5,0"
@@ -282,13 +286,10 @@
Style="{DynamicResource CommonBtn_返回}" /> Style="{DynamicResource CommonBtn_返回}" />
</StackPanel> </StackPanel>
</Grid> </Grid>
<!--#region 底部窗体栏--> <!--#region 底部窗体栏-->

<ContentControl x:Name="contentRegion" Grid.Row="1" /> <ContentControl x:Name="contentRegion" Grid.Row="1" />
<!--#endregion--> <!--#endregion-->
<!--<Button Grid.Row="2" Content="返回" Style="{DynamicResource CommonBtn_返回}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="Button_Click"/>

<Button Grid.Row="2" Visibility="Collapsed" Content="测试" HorizontalAlignment="Left" Margin="153,123,0,0" VerticalAlignment="Top" Click="Button_Click"/>-->
</Grid> </Grid>






Loading…
Cancel
Save