From 405bd36e812c3645e8d9d84700777e2eaeb036ec Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 30 五月 2025 16:18:17 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/Servo.vcxproj.filters | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 368a060..f81b1d2 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -112,10 +112,49 @@
<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" />
<ClCompile Include="TopToolbar.cpp" />
<ClCompile Include="HorizontalLine.cpp" />
<ClCompile Include="CMyStatusbar.cpp" />
<ClCompile Include="CRobotTask.cpp" />
+ <ClCompile Include="CSlot.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -227,10 +266,55 @@
<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" />
<ClInclude Include="TopToolbar.h" />
<ClInclude Include="HorizontalLine.h" />
<ClInclude Include="CMyStatusbar.h" />
<ClInclude Include="CRobotTask.h" />
+ <ClInclude Include="CSlot.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
@@ -249,5 +333,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