From 3a471ae651b228231bebb3a2d438baa1d4ac0261 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 21 十一月 2025 08:57:52 +0800
Subject: [PATCH] 优化
---
Plugin.TestResult/Scanner.xaml | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/Plugin.TestResult/Scanner.xaml b/Plugin.TestResult/Scanner.xaml
index d9daae5..6a9a3d0 100644
--- a/Plugin.TestResult/Scanner.xaml
+++ b/Plugin.TestResult/Scanner.xaml
@@ -6,19 +6,18 @@
xmlns:local="clr-namespace:Plugin.TestResult_WPF"
WindowStartupLocation="CenterScreen"
Closing="Window_Closing"
+ FontSize="20"
mc:Ignorable="d"
- Style="{StaticResource ModalWindow}"
-
- xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
- xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
- xmlns:pw="https://opensource.panuon.com/wpf"
- xmlns:pu="https://opensource.panuon.com/wpf-ui"
- xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
- xmlns:cc="clr-namespace:HMI.Core;assembly=HMI.Core"
- InteropOwnersMask="False"
- SizeToContent="Height"
-
- pu:WindowXModalDialog.Buttons="{x:Null}"
+ Style="{StaticResource ModalWindow}"
+ xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
+ xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
+ xmlns:pw="https://opensource.panuon.com/wpf"
+ xmlns:pu="https://opensource.panuon.com/wpf-ui"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
+ xmlns:cc="clr-namespace:HMI.Core;assembly=HMI.Core"
+ InteropOwnersMask="True"
+ SizeToContent="Height"
+ pu:WindowXModalDialog.Buttons="{x:Null}"
Title="{Binding title}" Width="600">
<Window.Resources>
<local:FontSizeConverter x:Key="FontSizeConverter"/>
@@ -59,21 +58,21 @@
Header="{DynamicResource Tr.PositionSnr}"
dp:FormGroupHelper.IsRequired="True"
Style="{StaticResource InputFormGroupStyle}">
- <TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="positionText" TextWrapping="NoWrap"/>
+ <TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="positionText" TextWrapping="NoWrap" KeyDown="TextBox_KeyDown"/>
</pu:FormGroup>
<pu:FormGroup
Header="{DynamicResource Tr.ProductSnr}"
dp:FormGroupHelper.IsRequired="True" Style="{StaticResource InputFormGroupStyle}">
- <TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="snrText" TextWrapping="NoWrap"/>
+ <TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="snrText" TextWrapping="NoWrap" KeyDown="TextBox_KeyDown"/>
</pu:FormGroup>
</StackPanel>
</GroupBox>
- <Button Grid.Row="2" Click="Con_Click" Style="{StaticResource PrimaryButton}"
- Content="{DynamicResource Tr.ContinueScan}"/>
- <Button Grid.Row="2" Grid.Column="1" Click="Ok_Click" Style="{StaticResource SuccessButton}"
+ <!--<Button Grid.Row="2" Click="Con_Click" Style="{StaticResource PrimaryButton}"
+ Content="{DynamicResource Tr.ContinueScan}"/>-->
+ <Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Click="Ok_Click" Style="{StaticResource SuccessButton}"
Content="{DynamicResource Tr.FinishScan}"/>
</Grid>
</pu:WindowX>
--
Gitblit v1.9.1