This commit is contained in:
19
Window4.xaml
19
Window4.xaml
@@ -1,7 +1,7 @@
|
||||
<Window x:Class="ShanghaiEnvironmentalTechnology.Window4"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Title="{DynamicResource setFlow2}" Height="768" Width="1024"
|
||||
Title="{DynamicResource setFlow2}" WindowState="Maximized" Height="768" Width="1024"
|
||||
Loaded="Window_Loaded"
|
||||
WindowStartupLocation="CenterScreen">
|
||||
<Window.Resources>
|
||||
@@ -287,20 +287,14 @@
|
||||
<Button Grid.Row="3" Grid.Column="2"
|
||||
Content="{DynamicResource setFlow10}"
|
||||
Style="{StaticResource MyButtonStyle}"
|
||||
Click="Button_Click_5"
|
||||
Click="Button_Click_6"
|
||||
Width="NaN"
|
||||
Margin="42,10,42,10"/>
|
||||
</Grid>
|
||||
|
||||
|
||||
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
|
||||
<!-- 减少边距(原20→10) -->
|
||||
<Button Content="{DynamicResource Deformation}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_2"/>
|
||||
<Button Name="TestStartButton" Content="{DynamicResource Maximumforcevaluetestresult(N)}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_4"/>
|
||||
<Button Content="{DynamicResource Deformation test results}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_3"/>
|
||||
<Button Content="{DynamicResource ViewReport}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7" Width="201"/>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
|
||||
<TextBlock Text="{DynamicResource setFlow112}" VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/>
|
||||
@@ -311,6 +305,13 @@
|
||||
<TextBlock Text="pa" VerticalAlignment="Center" Margin="10,0,0,0"/>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
|
||||
<!-- 减少边距(原20→10) -->
|
||||
<Button Content="{DynamicResource Deformation}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_2"/>
|
||||
<Button Name="TestStartButton" Content="{DynamicResource Maximumforcevaluetestresult(N)}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_4"/>
|
||||
<Button Content="{DynamicResource Deformation test results}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_3"/>
|
||||
<Button Content="{DynamicResource ViewReport}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7" Width="201"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,20">
|
||||
<!-- 增加底部边距,避免被窗口边缘遮挡 -->
|
||||
<!--<Button Content="记录呼气阻力" Style="{StaticResource MyButtonStyle}" Click="Button_Click_5"/>
|
||||
|
||||
Reference in New Issue
Block a user