From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject

---
 HMI.AlermInfoManage/AlarmSettingList.xaml |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/HMI.AlermInfoManage/AlarmSettingList.xaml b/HMI.AlermInfoManage/AlarmSettingList.xaml
index fcc2bf0..8bcf7c9 100644
--- a/HMI.AlermInfoManage/AlarmSettingList.xaml
+++ b/HMI.AlermInfoManage/AlarmSettingList.xaml
@@ -11,19 +11,11 @@
             mc:Ignorable="d"
             Title="{Binding SelectedValue,Mode=OneWay}"
             SizeToContent="Height"
+            pu:WindowXModalDialog.Buttons="OK"
+            pu:WindowXModalDialog.OKButtonContent="{Binding Converter={StaticResource lc},ConverterParameter='App.Close'}"
             Width="800"
             Height="600"
-            BorderBrush="#3E3E45"
-            BorderThickness="1"
-            Foreground="Black"
-            pu:WindowXCaption.Background="{StaticResource PrimaryColor}"
-            pu:WindowXModalDialog.ButtonStyle="{StaticResource ModalButton}"
-            pu:WindowXCaption.Foreground="#FFF"
-            pu:WindowXModalDialog.Buttons="OK"
-            pu:WindowXModalDialog.OKButtonContent="鍏抽棴"
-            Loaded="WindowX_Loaded"
-            WindowStartupLocation="CenterScreen"
-            pu:WindowXModalDialog.ButtonPanelMargin="0,30,10,10">
+            Style="{StaticResource ModalWindow}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -81,9 +73,9 @@
                 <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" 
                             Margin="0,0,0,10"
                                     dp:StackPanelHelper.ChildSpace="10">
-                    <Button Style="{StaticResource PrimaryButton}" pu:ButtonHelper.Icon="&#xe631;" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
-                    <Button Style="{StaticResource PrimaryButton}" pu:ButtonHelper.Icon="&#xe631;" x:Name="addBtn" Click="Button_Click">鏂板</Button>
-                    <Button Style="{StaticResource DangerButton}" pu:ButtonHelper.Icon="&#xe631;" x:Name="delBatchBtn" Click="Button_Click">鍒犻櫎</Button>
+                    <Button Style="{StaticResource AddBtn}" x:Name="addBtn" Click="Button_Click"/>
+                    <Button Style="{StaticResource RfhBtn}" x:Name="refreshBtn" Click="Button_Click"/>
+                    <Button Style="{StaticResource DelBtn}" x:Name="delBatchBtn" Click="Button_Click"/>
                 </StackPanel>
 
                 <DataGrid x:Name="table" Grid.Row="2"

--
Gitblit v1.9.1