From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
Plugin.TestResult/ViewControl.xaml | 63 ++++---------------------------
1 files changed, 8 insertions(+), 55 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml b/Plugin.TestResult/ViewControl.xaml
index 8ddfc37..3059599 100644
--- a/Plugin.TestResult/ViewControl.xaml
+++ b/Plugin.TestResult/ViewControl.xaml
@@ -17,7 +17,7 @@
<local:FontSizeConverter x:Key="FontSizeConverter"/>
<Style TargetType="GroupBox">
<Setter Property="FontSize" Value="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
-Converter={StaticResource FontSizeConverter}, ConverterParameter='30,1920'}" />
+Converter={StaticResource FontSizeConverter}, ConverterParameter='20,1920'}" />
</Style>
<Style TargetType="Button">
@@ -40,7 +40,8 @@
<local:TestResultView x:Name="testResultView" Grid.Column="0" Loaded="testResultView_Loaded" />
<StackPanel Grid.Column="1" Background="#FFF">
<GroupBox Header="浜у搧淇℃伅">
- <ComboBox x:Name="modelSelect" SelectionChanged="modelSelect_SelectionChanged"></ComboBox>
+ <ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}"
+ SelectionChanged="modelSelect_SelectionChanged"></ComboBox>
</GroupBox>
<GroupBox Header="鐢熶骇缁熻">
<StackPanel>
@@ -92,69 +93,21 @@
</StackPanel>
</GroupBox>
<GroupBox Header="鎿嶄綔">
- <StackPanel>
- <Button x:Name="btnStart" Click="Start_Click">
+ <StackPanel dp:StackPanelHelper.ChildSpace="20">
+ <Button x:Name="btnStart" Click="Start_Click" Style="{StaticResource SuccessButton}">
<Button.Content>鍚姩</Button.Content>
- <Button.Style>
- <Style TargetType="Button">
- <Setter Property="Background" Value="Green"/>
- <Setter Property="Foreground" Value="White"/>
- <Setter Property="Margin" Value="0,10"/>
- <Setter Property="Padding" Value="5"/>
- <Style.Triggers>
- <Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="Gray"/>
- </Trigger>
- </Style.Triggers>
- </Style>
- </Button.Style>
</Button>
- <Button x:Name="btnStop" Click="Stop_Click">
+ <Button x:Name="btnStop" Click="Stop_Click" Style="{StaticResource DangerButton}">
<Button.Content>鍋滄</Button.Content>
- <Button.Style>
- <Style TargetType="Button">
- <Setter Property="Background" Value="Red"/>
- <Setter Property="Foreground" Value="White"/>
- <Setter Property="Margin" Value="0,10"/>
- <Setter Property="Padding" Value="5"/>
- <Style.Triggers>
- <Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="Gray"/>
- </Trigger>
- </Style.Triggers>
- </Style>
- </Button.Style>
</Button>
- <Button x:Name="btnScan1" Click="Scan_Click_1">
+ <Button x:Name="btnScan1" Click="Scan_Click_1" Style="{StaticResource PrimaryButton}">
<Button.Content>涓�鍖烘壂鐮�</Button.Content>
- <Button.Style>
- <Style TargetType="Button">
- <Setter Property="Margin" Value="0,10"/>
- <Setter Property="Padding" Value="5"/>
- <Style.Triggers>
- <Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="Gray"/>
- </Trigger>
- </Style.Triggers>
- </Style>
- </Button.Style>
</Button>
- <Button x:Name="btnScan2" Click="Scan_Click_2">
+ <Button x:Name="btnScan2" Click="Scan_Click_2" Style="{StaticResource PrimaryButton}">
<Button.Content>浜屽尯鎵爜</Button.Content>
- <Button.Style>
- <Style TargetType="Button">
- <Setter Property="Margin" Value="0,10"/>
- <Setter Property="Padding" Value="5"/>
- <Style.Triggers>
- <Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="Gray"/>
- </Trigger>
- </Style.Triggers>
- </Style>
- </Button.Style>
</Button>
<!-- <Button Content="璁℃暟娓呴浂"/>
<Button Content="鎵爜"/>
--
Gitblit v1.9.1