From a061384ba628a09bf4df91f50321ab22c03129aa Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 18 三月 2025 20:58:36 +0800
Subject: [PATCH] Winform支持遮罩层；
---
Plugin.TestResult/ViewControl.xaml | 90 +++++++++-----------------------------------
1 files changed, 19 insertions(+), 71 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml b/Plugin.TestResult/ViewControl.xaml
index 8ddfc37..7778d89 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">
@@ -39,10 +39,11 @@
</Grid.ColumnDefinitions>
<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>
+ <GroupBox Header="{DynamicResource Tr.ProductInfo}">
+ <ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}"
+ SelectionChanged="modelSelect_SelectionChanged"></ComboBox>
</GroupBox>
- <GroupBox Header="鐢熶骇缁熻">
+ <GroupBox Header="{DynamicResource Tr.Status}">
<StackPanel>
<Label HorizontalContentAlignment="Center" HorizontalAlignment="Stretch">
<Label.Style>
@@ -53,12 +54,12 @@
<Style.Triggers>
<DataTrigger Binding="{Binding mesStatus}" Value="true">
<Setter Property="Background" Value="Green"/>
- <Setter Property="Content" Value="MES寮�"/>
+ <Setter Property="Content" Value="{DynamicResource Tr.MES_OPEN}"/>
<Setter Property="Foreground" Value="White"/>
</DataTrigger>
<DataTrigger Binding="{Binding mesStatus}" Value="false">
<Setter Property="Background" Value="Red"/>
- <Setter Property="Content" Value="MES鍏�"/>
+ <Setter Property="Content" Value="{DynamicResource Tr.MES_CLOSE}"/>
<Setter Property="Foreground" Value="White"/>
</DataTrigger>
</Style.Triggers>
@@ -92,74 +93,21 @@
</StackPanel>
</GroupBox>
<GroupBox Header="鎿嶄綔">
- <StackPanel>
- <Button x:Name="btnStart" Click="Start_Click">
- <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>
+ <StackPanel dp:StackPanelHelper.ChildSpace="20">
+ <Button x:Name="btnStart" Click="Start_Click" Style="{StaticResource SuccessButton}"
+ Content="{DynamicResource App.Start}"/>
- <Button x:Name="btnStop" Click="Stop_Click">
- <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="btnStop" Click="Stop_Click" Style="{StaticResource DangerButton}"
+ Content="{DynamicResource App.Stop}"/>
- <Button x:Name="btnScan1" Click="Scan_Click_1">
- <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="btnClear" Click="BtnClear_Click" Style="{StaticResource PrimaryButton}"
+ Content="{DynamicResource Ts.BtnClearNum}"/>
- <Button x:Name="btnScan2" Click="Scan_Click_2">
- <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="鎵爜"/>
- <Button Content="涓�鍖烘墜鍔�"/>
- <Button Content="浜屽尯鎵嬪姩"/>-->
+ <Button x:Name="btnScan1" Click="Scan_Click_1" Style="{StaticResource PrimaryButton}"
+ Content="{DynamicResource Tr.Zone1Scan}"/>
+
+ <Button x:Name="btnScan2" Click="Scan_Click_2" Style="{StaticResource PrimaryButton}"
+ Content="{DynamicResource Tr.Zone2Scan}"/>
</StackPanel>
</GroupBox>
</StackPanel>
--
Gitblit v1.9.1