Browse Source

主页面右下角添加标志

ltwork 1 year ago
parent
commit
0ed897ad1d
2 changed files with 16 additions and 8 deletions
  1. 2 2
      BlankApp1/BlankApp1/PLCTool.csproj
  2. 14 6
      BlankApp1/BlankApp1/Views/MainWindow.xaml

+ 2 - 2
BlankApp1/BlankApp1/PLCTool.csproj

@@ -5,8 +5,8 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>True</UseWindowsForms>
     <ApplicationIcon>bin\Debug\net6.0-windows\Images\TB0228.ico</ApplicationIcon>
-	<AssemblyVersion>2.0.0.3</AssemblyVersion>
-	<FileVersion>2.0.0.3</FileVersion>
+	<AssemblyVersion>2.0.0.4</AssemblyVersion>
+	<FileVersion>2.0.0.4</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\Fonts\iconfont.ttf" />

+ 14 - 6
BlankApp1/BlankApp1/Views/MainWindow.xaml

@@ -156,9 +156,12 @@
 
         </Grid>
 
-        <Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="#CBCBCB">
-
-            <StackPanel Orientation="Horizontal" >
+        <Grid Grid.Row="2" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Orientation="Horizontal" Grid.Column="0" >
                 <TextBlock Text="状态:" Style="{StaticResource txtHeadStyle}" Width="36" Margin="12,0,12,0"/>
                 <!--圆型-->
                 <Path  Stroke="Transparent"  Fill="#11D71B" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center" >
@@ -176,11 +179,16 @@
                         </EllipseGeometry>
                     </Path.Data>
                 </Path>
-                <TextBlock Text="{Binding Version}" Style="{StaticResource txtHeadStyle}" Width="auto" Margin="20,0,5,0"/>
+                
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Right" >
+                <TextBlock Text="Copyright  @2023  NAURA  北京七星华创集成电路装备有限公司 " Style="{StaticResource txtHeadStyle}" Width="auto" Margin="20,0,5,0" HorizontalAlignment="Right"/>
+                <TextBlock Text="{Binding Version}" Style="{StaticResource txtHeadStyle}" Width="auto" Margin="20,0,15,0"/>
                 <!--<Button Content="版本更新" Width="60" Height="22"    Command="{Binding VersisonCommand}" Style="{StaticResource NormalButtonStyle}" />-->
             </StackPanel>
-
-        </Border>
+           
+        </Grid>
+        <Border BorderThickness="0,1,0,0" BorderBrush="#CBCBCB"/>
         <!--蒙版-->
         <Grid Grid.RowSpan="3" Background="#20000000" Visibility="{Binding IsMaskVisible, Converter={StaticResource BoolToVis}}"/>