From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件；
---
HMI.SettingControl/SystemConfig.xaml | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/HMI.SettingControl/SystemConfig.xaml b/HMI.SettingControl/SystemConfig.xaml
index 27114f5..4ad1199 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>
@@ -25,22 +26,55 @@
<Grid>
<Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
<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>
+
+ <pu:FormGroup Header="{DynamicResource Setting.LogExpiredDays}" HeaderWidth="Auto" GroupName="MyFormGroup">
+ <pu:NumberInput Interval="1" x:Name="NiLogExpiredDays" Style="{StaticResource FormNumberInput}"
+ Value="{Binding LogExpiredDays}"/>
</pu:FormGroup>
</StackPanel>
</GroupBox>
- <DockPanel Grid.Row="1" LastChildFill="False">
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}" Click="Button_Click">淇濆瓨</Button>
- </DockPanel>
+
+ <GroupBox Grid.Row="1" Header="{DynamicResource Setting.PlcSetting}" Padding="10">
+ <StackPanel>
+ <pu:FormGroup Header="{DynamicResource Setting.PlcIp}" HeaderWidth="Auto" GroupName="MyFormGroup">
+ <TextBox Text="{Binding PlcIp}"/>
+ </pu:FormGroup>
+
+ <pu:FormGroup Header="{DynamicResource Setting.PlcEnabled}" HeaderWidth="Auto" GroupName="MyFormGroup">
+ <CheckBox IsChecked="{Binding PlcEnabled,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+ </pu:FormGroup>
+ </StackPanel>
+ </GroupBox>
</Grid>
</UserControl>
--
Gitblit v1.9.1