From 15bbd62b0b24b72c717ae91ab45348a2083ad04e Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 10 十月 2025 08:58:18 +0800
Subject: [PATCH] 优化bug；
---
Plugin.JarUI/JarUI.xaml | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/Plugin.JarUI/JarUI.xaml b/Plugin.JarUI/JarUI.xaml
index c160e66..74be2e1 100644
--- a/Plugin.JarUI/JarUI.xaml
+++ b/Plugin.JarUI/JarUI.xaml
@@ -11,7 +11,7 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
Background="#FFF"
- Loaded="PluginControl_Loaded"
+ Loaded="PluginControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
<Border Style="{StaticResource CardBoarder}" Padding="0">
<Grid dp:GridHelper.Space="5">
@@ -21,23 +21,38 @@
</Grid.RowDefinitions>
<WindowsFormsHost x:Name="host" Visibility="Collapsed"/>
<DockPanel>
+ <DockPanel.Resources>
+ <Style TargetType="CheckBox">
+ <Setter Property="FontSize" Value="20"/>
+ <Setter Property="VerticalContentAlignment" Value="Center"/>
+ </Style>
+ </DockPanel.Resources>
+
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" dp:StackPanelHelper.ChildSpace="20">
<Button Style="{StaticResource SuccessButton}" x:Name="startBtn" Click="Button_Click"
- Content="{DynamicResource App.StopSequence}"/>
- <Button Style="{StaticResource DangerButton}" x:Name="stopBtn" Click="Button_Click"
Content="{DynamicResource App.StartSequence}"/>
+ <Button Style="{StaticResource DangerButton}" x:Name="stopBtn" Click="Button_Click"
+ Content="{DynamicResource App.StopSequence}"/>
<Button Style="{StaticResource PrimaryButton}" x:Name="scannerSettingBtn" Click="Button_Click"
Content="{DynamicResource App.ScannerSetting}"/>
</StackPanel>
- <pu:FormGroup HeaderHeight="Auto" HeaderPadding="0" HorizontalContentAlignment="Left">
- <pu:FormGroup.Header>
- <TextBlock FontSize="20" Foreground="#000" Text="{DynamicResource Ts.SelectProductModel}"/>
- </pu:FormGroup.Header>
- <ComboBox Style="{StaticResource FormComboxStyle}" MinWidth="180" ItemsSource="{Binding Products}"
+
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" dp:StackPanelHelper.ChildSpace="20">
+ <pu:FormGroup HeaderHeight="Auto" HeaderPadding="0" HorizontalContentAlignment="Left">
+ <pu:FormGroup.Header>
+ <TextBlock FontSize="20" Foreground="#000" Text="{DynamicResource Ts.SelectProductModel}"/>
+ </pu:FormGroup.Header>
+ <ComboBox Style="{StaticResource FormComboxStyle}" MinWidth="180" ItemsSource="{Binding Products}"
DisplayMemberPath="Name" SelectedValuePath="Name"
MaxWidth="200"
SelectedItem="{Binding SelectedProduct}" x:Name="CbProduct"/>
- </pu:FormGroup>
+ </pu:FormGroup>
+
+ <CheckBox Grid.Column="1"
+IsChecked="{Binding EnableMes,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+Content="{DynamicResource Ts.EnableMes}"
+/>
+ </StackPanel>
</DockPanel>
<UniformGrid Grid.Row="1" x:Name="uGrid" dp:UniformGridHelper.InnerBorder="1" Columns="6">
--
Gitblit v1.9.1