From 559890c482f5973f06aafdfec9550fee5ba3c7f2 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 09 十一月 2026 17:02:15 +0800
Subject: [PATCH] feat: CAN 模拟器 TCP 化 + 多设备并发调试 + 后台生命周期管理
---
HMI.SettingControl/SettingControl.xaml | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/HMI.SettingControl/SettingControl.xaml b/HMI.SettingControl/SettingControl.xaml
index facee9b..0f5ef74 100644
--- a/HMI.SettingControl/SettingControl.xaml
+++ b/HMI.SettingControl/SettingControl.xaml
@@ -11,13 +11,12 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
Loaded="UserControl_Loaded"
- Background="{StaticResource WorkspaceBackground}"
+ Background="{DynamicResource WorkspaceBackground}"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<pu:StyleDictionary Includes="TabControl" />
- <ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
</ResourceDictionary.MergedDictionaries>
@@ -34,23 +33,23 @@
<RowDefinition />
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <TextBlock VerticalAlignment="Center" Text="绯荤粺璁剧疆" FontSize="{StaticResource TitleFontSize}" />
+ <TextBlock VerticalAlignment="Center" Text="{DynamicResource Setting.SystemSetting}" FontSize="{StaticResource TitleFontSize}" />
<TabControl Grid.Row="1" x:Name="tabControl"
- pu:TabControlHelper.ItemsSelectedBackground="{StaticResource HoriBar}"
- pu:TabControlHelper.ItemsSelectedForeground="{StaticResource PrimaryColorContract}"
+ pu:TabControlHelper.ItemsSelectedBackground="{DynamicResource HoriBar}"
+ pu:TabControlHelper.ItemsSelectedForeground="{DynamicResource PrimaryColorContract}"
pu:TabControlHelper.ItemsFontSize="14"
pu:TabControlHelper.ItemsRibbonLineVisibility="Visible"
pu:TabControlHelper.ItemsRibbonLinePlacement="Right"
pu:TabControlHelper.HeaderPanelBorderThickness="0,0,1,0"
- pu:TabControlHelper.HeaderPanelBorderBrush="{StaticResource CommonBoarder}"
+ pu:TabControlHelper.HeaderPanelBorderBrush="{DynamicResource CommonBoarder}"
pu:TabControlHelper.ItemsRibbonLineBrush="Transparent"
- pu:TabControlHelper.ItemsSelectedRibbonLineBrush="{StaticResource PrimaryColorContract}"
+ pu:TabControlHelper.ItemsSelectedRibbonLineBrush="{DynamicResource PrimaryColorContract}"
pu:TabControlHelper.ItemsRibbonLineMargin="0,5,10,5"
pu:TabControlHelper.ItemsRibbonLineThickness="3"
Cursor="Hand"
pu:TabControlHelper.ItemsPadding="60,0"
TabStripPlacement="Left"
- BorderBrush="{StaticResource CommonBoarder}"
+ BorderBrush="{DynamicResource CommonBoarder}"
ItemsSource="{Binding TabItems}">
</TabControl>
<StackPanel Grid.Row="2" Style="{StaticResource ButtonGroup}">
--
Gitblit v1.9.1