From c401a2f2fd1a509cdeb33e850bb5c2827074af48 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 17 三月 2025 08:44:51 +0800
Subject: [PATCH] 完善框架，新增两个close方法；
---
HMI.SettingControl/SystemConfig.xaml | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/HMI.SettingControl/SystemConfig.xaml b/HMI.SettingControl/SystemConfig.xaml
index 28cc0e5..9a14cfc 100644
--- a/HMI.SettingControl/SystemConfig.xaml
+++ b/HMI.SettingControl/SystemConfig.xaml
@@ -9,6 +9,7 @@
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
mc:Ignorable="d"
Background="#FFF"
+ Loaded="UserControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<ResourceDictionary>
@@ -30,25 +31,42 @@
<RowDefinition/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <GroupBox Header="鍩虹璁剧疆" Padding="10">
+ <GroupBox Header="{DynamicResource Setting.BasicSetting}" Padding="10">
<StackPanel>
- <pu:FormGroup Header="Logo" GroupName="MyFormGroup">
- <TextBox Text="{Binding LogoPath}"/>
+ <pu:FormGroup x:Name="FgIcon" Style="{StaticResource InputFormGroupStyle}"
+ HeaderWidth="Auto"
+ Header="{DynamicResource Setting.Logo}" GroupName="MyFormGroup">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition />
+ <ColumnDefinition Width="30" />
+ </Grid.ColumnDefinitions>
+ <TextBox x:Name="TbIcon" IsReadOnly="True"
+ Text="{Binding LogoPath}"
+ FontFamily="{StaticResource iconfont}" Style="{StaticResource EditorTextBoxStyle}" />
+ <Button Grid.Column="1" BorderThickness="0,1,1,1" Style="{StaticResource SearchButton}"
+ x:Name="BtnIcon" Click="Button_Click"/>
+ </Grid>
</pu:FormGroup>
- <pu:FormGroup Header="鏍囬" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Setting.Title}" HeaderWidth="Auto" GroupName="MyFormGroup">
<TextBox Text="{Binding WindowTitle}"/>
+ </pu:FormGroup>
+
+ <pu:FormGroup Header="{DynamicResource Setting.Lang}" HeaderWidth="Auto" GroupName="MyFormGroup">
+ <ComboBox x:Name="CbLang" Style="{StaticResource FormComboxStyle}"
+ SelectedValue="{Binding CurrentLanguage}" SelectedValuePath="Code" DisplayMemberPath="Name"/>
</pu:FormGroup>
</StackPanel>
</GroupBox>
- <GroupBox Grid.Row="1" Header="PLC璁剧疆" Padding="10">
+ <GroupBox Grid.Row="1" Header="{DynamicResource Setting.PlcSetting}" Padding="10">
<StackPanel>
- <pu:FormGroup Header="PLC Ip" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Setting.PlcIp}" HeaderWidth="Auto" GroupName="MyFormGroup">
<TextBox Text="{Binding PlcIp}"/>
</pu:FormGroup>
- <pu:FormGroup Header="鏄惁鍚敤" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Setting.PlcEnabled}" HeaderWidth="Auto" GroupName="MyFormGroup">
<CheckBox IsChecked="{Binding PlcEnabled,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</pu:FormGroup>
</StackPanel>
--
Gitblit v1.9.1