From ef52fd6fd07508883dce4eb002acda59f0169e59 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 23 四月 2026 10:19:33 +0800
Subject: [PATCH] 优化；
---
Plugin.TestResult/DataTable.xaml | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/Plugin.TestResult/DataTable.xaml b/Plugin.TestResult/DataTable.xaml
index 1b28592..12a6b61 100644
--- a/Plugin.TestResult/DataTable.xaml
+++ b/Plugin.TestResult/DataTable.xaml
@@ -35,12 +35,12 @@
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
-
+
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
-
+
<TextBlock FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
Converter={StaticResource FontSizeConverter}, ConverterParameter='20,940'}"
FontWeight="Bold"
@@ -75,7 +75,7 @@
<!--<local:Chart Grid.Row="2" x:Name="chart" BorderThickness="0,1,0,1" BorderBrush="Black"
MouseDoubleClick="chart_MouseDoubleClick"/>-->
- <StatusBar FontSize="18" Grid.Row="3">
+ <StatusBar FontSize="14" Grid.Row="3">
<StatusBar.ItemsPanel>
<ItemsPanelTemplate>
<DockPanel/>
@@ -123,23 +123,29 @@
</StatusBarItem>
<StatusBarItem >
- <TextBox IsReadOnly="True" Background="Transparent" BorderThickness="0" Text="{Binding statusText}"/>
+ <TextBox IsReadOnly="True" FontSize="16" Background="Transparent" BorderThickness="0" Text="{Binding statusText}"/>
</StatusBarItem>
</StatusBar>
- <Grid Grid.Row="4">
- <Grid.ColumnDefinitions>
+ <UniformGrid Grid.Row="4" Rows="1">
+ <!--<UniformGrid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
+ <ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
- </Grid.ColumnDefinitions>
+ </UniformGrid.ColumnDefinitions>-->
<Button Click="ScanWindow_Click" Style="{StaticResource PrimaryButton}"
Content="{DynamicResource Tr.Scan}"/>
<Button Grid.Column="1" Click="ClearAllSnr_Click" Style="{StaticResource DangerButton}"
+ IsEnabled="{Binding IsTesting,Converter={StaticResource reverseBool}}"
Content="{DynamicResource Tr.ClearAllSNR}"/>
<!--<Button Grid.Column="2" Click="SetStationGlobal_Click" Style="{StaticResource SuccessButton}"
- Content="{DynamicResource App.Start}"/>-->
- <Button Grid.Column="2" Click="StartSingleClick">
+ Content="{DynamicResource App.Start}"/> Background="#1296db"-->
+
+ <Button Grid.Column="2" Click="Abort_Click" x:Name="abortBtn"
+ Style="{DynamicResource DangerButton}" Background="#1296db" Content="Abort"/>
+
+ <Button Grid.Column="3" Click="StartSingleClick">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource SuccessButton}">
<Setter Property="Content" Value="{DynamicResource App.Start}"/>
@@ -152,7 +158,6 @@
</Style>
</Button.Style>
</Button>
- </Grid>
-
+ </UniformGrid>
</Grid>
</UserControl>
\ No newline at end of file
--
Gitblit v1.9.1