fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

 MTerm1/MTerm1.vcxproj.filters

@@ -15,9 +15,6 @@
    </Filter>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="MTerm1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="framework.h">

      <Filter>头文件</Filter>

    </ClInclude>

@@ -30,42 +27,297 @@
    <ClInclude Include="ChildFrm.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="Resource.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="pch.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="KLinkDefine.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MyFormLog.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MyPaneLog.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MyDialogLog.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogSetCoil.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogSetData.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogIoComment.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="KDefine.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="KMachine.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="NavView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="ViewTree.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="AnsiParser.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DataParser1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogCoilMon.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogCommSet1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogDataMon.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogDateTime.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogEventLog.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogForceIO.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogInfoDisplay.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogProgress.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogStatusShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogSysRegSet.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropSysReg1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropMemCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropModeCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropCommCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropInputCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropOutputCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="DialogFactCfg.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="CMyFuncKeyToolBar.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MyDlgBarFuncKey.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MyDlgBarInputShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1CommDevView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1CommTestView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1ProgTxt.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1BldView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1BnlView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1CoilView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1CtrlView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1DataView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1LdsView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1TestView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1Doc.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="MTerm1View.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="Resource.h">

    <ClInclude Include="CMyPropPage.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="FileView.h">

    <ClInclude Include="CMyPaneInputShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="ClassView.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="ViewTree.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="OutputWnd.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="PropertiesWnd.h">

      <Filter>头文件</Filter>

    </ClInclude>

    <ClInclude Include="pch.h">

    <ClInclude Include="MyFormInputShow.h">

      <Filter>头文件</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <ClCompile Include="MTerm1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MainFrm.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="ChildFrm.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="pch.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MyFormLog.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MyPaneLog.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MyDialogLog.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="..\MyLib\StaticEx.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogSetCoil.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogSetData.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogIoComment.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="KMachine.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="NavView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="ViewTree.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogSysRegSet.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogStatusShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogProgress.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogInfoDisplay.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogForceIO.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogEventLog.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogDateTime.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogDataMon.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogCommSet1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogCoilMon.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DataParser1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="AnsiParser.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropSysReg1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropMemCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropModeCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropCommCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropInputCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropOutputCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="DialogFactCfg.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="CMyFuncKeyToolBar.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MyDlgBarFuncKey.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MyDlgBarInputShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1CommDevView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1CommTestView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1ProgTxt.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1BldView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1BnlView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1CoilView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1CtrlView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1DataView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1LdsView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1TestView.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="MTerm1Doc.cpp">

@@ -74,22 +326,13 @@
    <ClCompile Include="MTerm1View.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="FileView.cpp">

    <ClCompile Include="CMyPropPage.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="ClassView.cpp">

    <ClCompile Include="CMyPaneInputShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="ViewTree.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="OutputWnd.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="PropertiesWnd.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

    <ClCompile Include="pch.cpp">

    <ClCompile Include="MyFormInputShow.cpp">

      <Filter>源文件</Filter>

    </ClCompile>

  </ItemGroup>

@@ -99,10 +342,43 @@
    </ResourceCompile>

  </ItemGroup>

  <ItemGroup>

    <Image Include="res\file_view.ico">

    <None Include="devices.cfg" />

    <None Include="res\MTerm1.rc2">

      <Filter>资源文件</Filter>

    </None>

    <None Include="Readme.md">

      <Filter>源文件</Filter>

    </None>

  </ItemGroup>

  <ItemGroup>

    <Image Include="res\Toolbar.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\file_view_hc.ico">

    <Image Include="res\toolbar1.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\bmp00001.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\idr_mult.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\ico00001.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\ico00002.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\mainfram.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\bmp00002.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\bmp00003.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\toolbar2.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\class_view.ico">

@@ -111,10 +387,7 @@
    <Image Include="res\class_view_hc.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\fileview.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\fileview_hc.bmp">

    <Image Include="res\sort.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\classview.bmp">

@@ -123,61 +396,30 @@
    <Image Include="res\classview_hc.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\explorer.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\explorer_hc.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\sort.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\sort_hc.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\menuimages.bmp">

    <Image Include="res\bitmap1.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\menuimages_hc.bmp">

    <Image Include="res\toolbar_.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\output_wnd.ico">

    <Image Include="res\toolbar_func_key.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\output_wnd_hc.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\properties_wnd.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\properties_wnd_hc.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\properties.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\properties_hc.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\userimages.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\MTerm1Doc.ico">

    <Image Include="res\bmp00004.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\MTerm1.ico">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\Toolbar.bmp">

      <Filter>资源文件</Filter>

    </Image>

    <Image Include="res\Toolbar256.bmp">

    <Image Include="res\MTerm1Doc.ico">

      <Filter>资源文件</Filter>

    </Image>

  </ItemGroup>

  <ItemGroup>

    <None Include="res\MTerm1.rc2">

      <Filter>资源文件</Filter>

    </None>

    <Text Include="design1.txt" />

    <Text Include="FP0Ext.cfg" />

  </ItemGroup>

</Project>