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.UI/HMI.UI.csproj | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/HMI.UI/HMI.UI.csproj b/HMI.UI/HMI.UI.csproj
index d2bcfdc..4f2be69 100644
--- a/HMI.UI/HMI.UI.csproj
+++ b/HMI.UI/HMI.UI.csproj
@@ -80,6 +80,7 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Converter\DataGridRowFlagConverter.cs" />
<Compile Include="Converter\DataGridRowNumberConverter.cs" />
<Compile Include="Converter\PathImageConverter.cs" />
<Compile Include="DpUtil\DataGridHelper.cs" />
@@ -87,18 +88,27 @@
<Compile Include="DpUtil\GridHelper.cs" />
<Compile Include="DpUtil\StackPanelHelper.cs" />
<Compile Include="DpUtil\TreeViewHelper.cs" />
+ <Compile Include="DpUtil\UniformGridHelper.cs" />
+ <Compile Include="MaskWindow.xaml.cs">
+ <DependentUpon>MaskWindow.xaml</DependentUpon>
+ </Compile>
<Compile Include="Style\BaseWindow.xaml.cs">
<DependentUpon>BaseWindow.xaml</DependentUpon>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="DpUtil\DpPlugin.cs" />
<Compile Include="Util\IValueValidator.cs" />
+ <Compile Include="Util\MaskHolder.cs" />
<Compile Include="Util\MsgBoxHelper.cs" />
<Compile Include="Util\ToastHelper.cs" />
<Resource Include="Resources\Font\Font.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
+ <Page Include="MaskWindow.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Style\MsgBoxStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -111,7 +121,6 @@
<Page Include="Style\BaseWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Style\Colors.xaml">
<Generator>MSBuild:Compile</Generator>
@@ -152,7 +161,10 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
- <Resource Include="Resources\Font\iconfont.ttf" />
+ <Resource Include="Resources\Font\iconfont.json" />
+ <Resource Include="Resources\Font\iconfont.ttf">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Resource>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icon\xinzeng_1.png" />
--
Gitblit v1.9.1