From 863f21995955fb3e9aa471430218967d4e642c27 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 29 五月 2025 16:11:24 +0800
Subject: [PATCH] Merge branch 'liuyang'

---
 SourceCode/Bond/Servo/Servo.vcxproj.filters |   88 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 68273f0..1a8bb3f 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -112,6 +112,44 @@
     <ClCompile Include="MsgDlg.cpp" />
     <ClCompile Include="CPagePortStatus.cpp" />
     <ClCompile Include="JobSlotGrid.cpp" />
+    <ClCompile Include="GridControl\GridCell.cpp">
+      <Filter>GridControl</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\GridCellBase.cpp">
+      <Filter>GridControl</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\GridCellButton.cpp">
+      <Filter>GridControl</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\GridCtrl.cpp">
+      <Filter>GridControl</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\GridDropTarget.cpp">
+      <Filter>GridControl</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\GridInPlaceEdit.cpp">
+      <Filter>GridControl</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\TitleTip.cpp">
+      <Filter>GridControl</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\NewCellTypes\GridCellCheck.cpp">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\NewCellTypes\GridCellCombo.cpp">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\NewCellTypes\GridCellDateTime.cpp">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\NewCellTypes\GridCellNumeric.cpp">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClCompile>
+    <ClCompile Include="GridControl\NewCellTypes\GridURLCell.cpp">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClCompile>
+    <ClCompile Include="PortConfigurationDlg.cpp" />
+    <ClCompile Include="TransferManager.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AlarmManager.h" />
@@ -223,6 +261,50 @@
     <ClInclude Include="CPagePortStatus.h" />
     <ClInclude Include="ServoCommo.h" />
     <ClInclude Include="JobSlotGrid.h" />
+    <ClInclude Include="GridControl\CellRange.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\GridCell.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\GridCellBase.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\GridCellButton.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\GridCtrl.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\GridDropTarget.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\GridInPlaceEdit.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\GridMemDC.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\TitleTip.h">
+      <Filter>GridControl</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\NewCellTypes\GridCellCheck.h">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\NewCellTypes\GridCellCombo.h">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\NewCellTypes\GridCellDateTime.h">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\NewCellTypes\GridCellNumeric.h">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClInclude>
+    <ClInclude Include="GridControl\NewCellTypes\GridURLCell.h">
+      <Filter>GridControl\NewCellTypes</Filter>
+    </ClInclude>
+    <ClInclude Include="PortConfigurationDlg.h" />
+    <ClInclude Include="TransferManager.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Servo.rc" />
@@ -241,5 +323,11 @@
     <Filter Include="CCLinkPerformance">
       <UniqueIdentifier>{77338295-9841-4706-8816-a958b1b5c465}</UniqueIdentifier>
     </Filter>
+    <Filter Include="GridControl">
+      <UniqueIdentifier>{1206b229-6054-40f2-8d8a-5848582a3896}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GridControl\NewCellTypes">
+      <UniqueIdentifier>{52ebd40d-fb71-4a53-93ab-5b93670c706d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.3