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
---
WPFProject/App.xaml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/WPFProject/App.xaml b/WPFProject/App.xaml
index bfd14e2..940c25c 100644
--- a/WPFProject/App.xaml
+++ b/WPFProject/App.xaml
@@ -2,9 +2,10 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WPFProject"
- xmlns:pw="https://opensource.panuon.com/wpf"
- xmlns:pu="https://opensource.panuon.com/wpf-ui"
+ xmlns:pw="https://opensource.panuon.com/wpf"
+ xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
+ xmlns:hc="clr-namespace:HMI.Core;assembly=HMI.Core"
Startup="Application_Startup">
<Application.Resources>
<ResourceDictionary>
@@ -16,10 +17,11 @@
<ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/MsgBoxStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
-
<Style TargetType="{x:Type pu:FormGroup}" BasedOn="{StaticResource InputFormGroupStyle}"></Style>
<uic:PathImageConverter x:Key="path2Image"/>
<uic:DataGridRowNumberConverter x:Key="rowNumber"/>
+ <uic:DataGridRowFlagConverter x:Key="rowFlag"/>
+ <hc:LangConverter x:Key="lc"/>
</ResourceDictionary>
</Application.Resources>
</Application>
--
Gitblit v1.9.1