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.UI/Style/MsgBoxStyle.xaml | 55 +++++++++++++++++++++++++++----------------------------
1 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/HMI.UI/Style/MsgBoxStyle.xaml b/HMI.UI/Style/MsgBoxStyle.xaml
index 1f577a1..39c0a68 100644
--- a/HMI.UI/Style/MsgBoxStyle.xaml
+++ b/HMI.UI/Style/MsgBoxStyle.xaml
@@ -3,11 +3,10 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:puconfig="clr-namespace:Panuon.WPF.UI.Configurations;assembly=Panuon.WPF.UI">
-
- <pu:MessageBoxXSettings x:Key="MsgBoxWarn"
- InteropOwnersMask="False"
- InverseButtonsSequence="False">
- <pu:MessageBoxXSettings.WindowXStyle>
+ <pu:MessageBoxXSetting x:Key="MsgBoxWarn"
+ InteropOwnersMask="False"
+ InverseButtonsSequence="False">
+ <pu:MessageBoxXSetting.WindowXStyle>
<Style TargetType="pu:WindowX" BasedOn="{StaticResource {x:Static pu:MessageBoxX.WindowXStyleKey}}">
<Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource WarningColor}" />
<Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource WarningColorContract}" />
@@ -15,9 +14,9 @@
<Setter Property="Height" Value="200" />
<Setter Property="SizeToContent" Value="Manual" />
</Style>
- </pu:MessageBoxXSettings.WindowXStyle>
+ </pu:MessageBoxXSetting.WindowXStyle>
- <pu:MessageBoxXSettings.ButtonStyle>
+ <pu:MessageBoxXSetting.ButtonStyle>
<Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:MessageBoxX.ButtonStyleKey}}">
<Style.Triggers>
@@ -33,20 +32,20 @@
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
- <TextBlock Text="{Binding}" TextDecorations="Underline" />
+ <TextBlock Text="{DynamicResource App.Cancel}" TextDecorations="Underline" />
</DataTemplate>
</Setter.Value>
</Setter>
</Trigger>
</Style.Triggers>
</Style>
- </pu:MessageBoxXSettings.ButtonStyle>
- </pu:MessageBoxXSettings>
+ </pu:MessageBoxXSetting.ButtonStyle>
+ </pu:MessageBoxXSetting>
- <pu:MessageBoxXSettings x:Key="MsgBoxError"
- InteropOwnersMask="False"
- InverseButtonsSequence="False">
- <pu:MessageBoxXSettings.WindowXStyle>
+ <pu:MessageBoxXSetting x:Key="MsgBoxError"
+ InteropOwnersMask="False"
+ InverseButtonsSequence="False">
+ <pu:MessageBoxXSetting.WindowXStyle>
<Style TargetType="pu:WindowX" BasedOn="{StaticResource {x:Static pu:MessageBoxX.WindowXStyleKey}}">
<Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DangerColor}" />
<Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DangerColorContrast}" />
@@ -54,9 +53,9 @@
<Setter Property="Height" Value="200" />
<Setter Property="SizeToContent" Value="Manual" />
</Style>
- </pu:MessageBoxXSettings.WindowXStyle>
+ </pu:MessageBoxXSetting.WindowXStyle>
- <pu:MessageBoxXSettings.ButtonStyle>
+ <pu:MessageBoxXSetting.ButtonStyle>
<Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:MessageBoxX.ButtonStyleKey}}">
<Style.Triggers>
@@ -72,20 +71,20 @@
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
- <TextBlock Text="{Binding}" TextDecorations="Underline" />
+ <TextBlock Text="{DynamicResource App.Cancel}" TextDecorations="Underline" />
</DataTemplate>
</Setter.Value>
</Setter>
</Trigger>
</Style.Triggers>
</Style>
- </pu:MessageBoxXSettings.ButtonStyle>
- </pu:MessageBoxXSettings>
+ </pu:MessageBoxXSetting.ButtonStyle>
+ </pu:MessageBoxXSetting>
- <pu:MessageBoxXSettings x:Key="MsgBoxInfo"
- InteropOwnersMask="False"
- InverseButtonsSequence="False">
- <pu:MessageBoxXSettings.WindowXStyle>
+ <pu:MessageBoxXSetting x:Key="MsgBoxInfo"
+ InteropOwnersMask="False"
+ InverseButtonsSequence="False">
+ <pu:MessageBoxXSetting.WindowXStyle>
<Style TargetType="pu:WindowX" BasedOn="{StaticResource {x:Static pu:MessageBoxX.WindowXStyleKey}}">
<Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource PrimaryColor}" />
<Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource PrimaryColorContract}" />
@@ -93,9 +92,9 @@
<Setter Property="Height" Value="200" />
<Setter Property="SizeToContent" Value="Manual" />
</Style>
- </pu:MessageBoxXSettings.WindowXStyle>
+ </pu:MessageBoxXSetting.WindowXStyle>
- <pu:MessageBoxXSettings.ButtonStyle>
+ <pu:MessageBoxXSetting.ButtonStyle>
<Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:MessageBoxX.ButtonStyleKey}}">
<Style.Triggers>
@@ -111,15 +110,15 @@
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
- <TextBlock Text="{Binding}" TextDecorations="Underline" />
+ <TextBlock Text="{DynamicResource App.Cancel}" TextDecorations="Underline" />
</DataTemplate>
</Setter.Value>
</Setter>
</Trigger>
</Style.Triggers>
</Style>
- </pu:MessageBoxXSettings.ButtonStyle>
- </pu:MessageBoxXSettings>
+ </pu:MessageBoxXSetting.ButtonStyle>
+ </pu:MessageBoxXSetting>
<pu:ToastSetting x:Key="toastSuccess" Spacing="25">
<pu:ToastSetting.LabelStyle>
--
Gitblit v1.9.1