merge from dev2

QuakeGod

2022-07-22 dd67df95a7303aee3bed65ffa935465f20ee8b32

 MTerm2/MTerm2.vcxproj.filters

@@ -168,6 +168,15 @@
    <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>

  </ItemGroup>

  <ItemGroup>

    <ClCompile Include="MainFrm.cpp">

@@ -311,6 +320,15 @@
    <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>

  </ItemGroup>

  <ItemGroup>

    <ResourceCompile Include="MTerm2.rc">

@@ -381,6 +399,15 @@
    <Image Include="res\bitmap1.bmp">

      <Filter>资源文件</Filter>

    </Image>

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

      <Filter>资源文件</Filter>

    </Image>

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

      <Filter>资源文件</Filter>

    </Image>

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

      <Filter>资源文件</Filter>

    </Image>

  </ItemGroup>

  <ItemGroup>

    <Text Include="design1.txt" />