Merge cc085fb into 74a0675

sakura-editor · Jun 27, 2020 · 3858512 · 3858512
2 parents 74a0675 + cc085fb
commit 3858512
Show file tree

Hide file tree

Showing 9 changed files with 444 additions and 2 deletions.
diff --git a/sakura/python.props b/sakura/python.props
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <PYTHON_DIR>C:\Python38</PYTHON_DIR>
+  </PropertyGroup>
+  <PropertyGroup>
+    <IncludePath>$(PYTHON_DIR)\include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(PYTHON_DIR)\libs;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link />
+    <Link>
+      <DelayLoadDLLs>python38.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="PYTHON_DIR">
+      <Value>$(PYTHON_DIR)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj
@@ -52,15 +52,19 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="python.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="python.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="python.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="python.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -440,6 +444,7 @@
     <ClInclude Include="..\sakura_core\macro\CMacroManagerBase.h" />
     <ClInclude Include="..\sakura_core\macro\CPPA.h" />
     <ClInclude Include="..\sakura_core\macro\CPPAMacroMgr.h" />
+    <ClInclude Include="..\sakura_core\macro\CPythonMacroManager.h" />
     <ClInclude Include="..\sakura_core\macro\CSMacroMgr.h" />
     <ClInclude Include="..\sakura_core\macro\CWSH.h" />
     <ClInclude Include="..\sakura_core\macro\CWSHIfObj.h" />
@@ -805,6 +810,7 @@
     <ClCompile Include="..\sakura_core\macro\CMacroManagerBase.cpp" />
     <ClCompile Include="..\sakura_core\macro\CPPA.cpp" />
     <ClCompile Include="..\sakura_core\macro\CPPAMacroMgr.cpp" />
+    <ClCompile Include="..\sakura_core\macro\CPythonMacroManager.cpp" />
     <ClCompile Include="..\sakura_core\macro\CSMacroMgr.cpp" />
     <ClCompile Include="..\sakura_core\macro\CWSH.cpp" />
     <ClCompile Include="..\sakura_core\macro\CWSHIfObj.cpp" />

diff --git a/sakura/sakura.vcxproj.filters b/sakura/sakura.vcxproj.filters
@@ -1097,6 +1097,9 @@
     <ClInclude Include="..\sakura_core\GrepInfo.h">
       <Filter>Cpp Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\sakura_core\macro\CPythonMacroManager.h">
+      <Filter>Cpp Source Files\macro</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resource\auto_scroll_center.cur">
@@ -2276,6 +2279,9 @@
     <ClCompile Include="..\sakura_core\GrepInfo.cpp">
       <Filter>Cpp Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\sakura_core\macro\CPythonMacroManager.cpp">
+      <Filter>Cpp Source Files\macro</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\resource\auto_scroll_center.bmp">

diff --git a/sakura_core/Makefile b/sakura_core/Makefile
@@ -254,6 +254,7 @@ macro/CMacroFactory.o \
 macro/CMacroManagerBase.o \
 macro/CPPA.o \
 macro/CPPAMacroMgr.o \
+macro/CPythonMacroManager.o \
 macro/CSMacroMgr.o \
 macro/CWSH.o \
 macro/CWSHIfObj.o \

diff --git a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
@@ -735,10 +735,11 @@ bool CDlgOpenFile_CommonFileDialog::DoModal_GetOpenFileName( WCHAR* pszPath, EFi
 		cFileExt.AppendExtRaw( LS(STR_DLGOPNFL_EXTNAME2), L"*.txt" );
 		break;
 	case EFITER_MACRO:
-		cFileExt.AppendExtRaw( L"Macros", L"*.js;*.vbs;*.ppa;*.mac" );
+		cFileExt.AppendExtRaw( L"Macros", L"*.js;*.vbs;*.ppa;*.py;*.mac" );
 		cFileExt.AppendExtRaw( L"JScript", L"*.js" );
 		cFileExt.AppendExtRaw( L"VBScript", L"*.vbs" );
 		cFileExt.AppendExtRaw( L"Pascal", L"*.ppa" );
+		cFileExt.AppendExtRaw( L"Python", L"*.py" );
 		cFileExt.AppendExtRaw( L"Key Macro", L"*.mac" );
 		break;
 	case EFITER_NONE:

diff --git a/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp b/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp
@@ -472,10 +472,11 @@ bool CDlgOpenFile_CommonItemDialog::DoModal_GetOpenFileName( WCHAR* pszPath, EFi
 		specs.push_back(COMDLG_FILTERSPEC{strs.back().c_str(), L"*.txt"});
 		break;
 	case EFITER_MACRO:
-		specs.push_back(COMDLG_FILTERSPEC{L"Macros", L"*.js;*.vbs;*.ppa;*.mac"});
+		specs.push_back(COMDLG_FILTERSPEC{L"Macros", L"*.js;*.vbs;*.ppa;*.py;*.mac"});
 		specs.push_back(COMDLG_FILTERSPEC{L"JScript", L"*.js"});
 		specs.push_back(COMDLG_FILTERSPEC{L"VBScript", L"*.vbs"});
 		specs.push_back(COMDLG_FILTERSPEC{L"Pascal", L"*.ppa"});
+		specs.push_back(COMDLG_FILTERSPEC{L"Python", L"*.py"});
 		specs.push_back(COMDLG_FILTERSPEC{L"Key Macro", L"*.mac"});
 		break;
 	case EFITER_NONE: