Option to allow appending N++ PythonLib paths, rather than inserting

bruderstein · bruderstein · commit 09a1c0f0b979 · 2014-03-17T23:11:44.000+01:00
This essentially allows using the old behaviour - it may be useful if someone
has a local python installation, and wishes to use their own Lib paths.
diff --git a/PythonScript/res/PythonScript.rc b/PythonScript/res/PythonScript.rc
@@ -73,13 +73,13 @@ BEGIN
     LTEXT           ">>>",IDC_PROMPT,7,161,17,8
 END
 
-IDD_SCRIPTCONFIG DIALOGEX 0, 0, 376, 325
+IDD_SCRIPTCONFIG DIALOGEX 0, 0, 376, 363
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Python Script Shortcut Configuration"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,265,304,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,319,304,50,14
+    DEFPUSHBUTTON   "OK",IDOK,265,342,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,319,342,50,14
     CONTROL         "",IDC_FILETREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,14,31,343,105
     GROUPBOX        "Scripts",IDC_STATIC,7,7,362,136
     CONTROL         "Machine Scripts",IDC_RADMACHINE,"Button",BS_AUTORADIOBUTTON,19,18,65,10
@@ -96,6 +96,9 @@ BEGIN
     COMBOBOX        IDC_COMBOINITIALISATION,58,285,69,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Initialisation:",IDC_STATIC,9,287,44,12
     LTEXT           "Lazy initialisation initialises Python when it is first used.  Use ATSTARTUP if you want your startup.py scripts to run as soon as Notepad++ starts.",IDC_STATIC,131,282,232,21
+    CONTROL         "Prefer installed Python libraries - use only if you have Python 2.7 installed, and you have copied the python27.dll from your Windows directory to the Notepad++ directory. ",IDC_CHECKPREFERINSTALLEDPYTHON,
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,303,352,19
+    LTEXT           "This has the effect that the directories under Notepad++ that contain Python libraries are searched AFTER the standard Python directories.  If in doubt, leave unchecked.",IDC_STATIC,21,321,348,19
 END
 
 IDD_PROMPTDIALOG DIALOGEX 0, 0, 313, 105
@@ -139,7 +142,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 369
         TOPMARGIN, 7
-        BOTTOMMARGIN, 318
+        BOTTOMMARGIN, 356
     END
 
     IDD_PROMPTDIALOG, DIALOG
diff --git a/PythonScript/res/resource.h b/PythonScript/res/resource.h
@@ -37,14 +37,15 @@
 #define IDC_USERTEXT                    1017
 #define IDC_COPYRIGHT                   1018
 #define IDC_VERSION                     1019
+#define IDC_CHECKPREFERINSTALLEDPYTHON  1020
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        119
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1020
+#define _APS_NEXT_CONTROL_VALUE         1021
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/PythonScript/src/PythonHandler.cpp b/PythonScript/src/PythonHandler.cpp
@@ -10,6 +10,7 @@
 #include "MenuManager.h"
 #include "WcharMbcsConverter.h"
 #include "GILManager.h"
+#include "ConfigFile.h"
 
 namespace NppPythonScript
 {
@@ -110,14 +111,26 @@ void PythonHandler::initPython()
 
 	// Init paths 
 	char initBuffer[1024];
+    char pathCommands[500];
+
+    // If the user wants to use their installed python version, append the paths.
+    // If not (and they want to use the bundled python install), the default, then prepend the paths
+    if (ConfigFile::getInstance()->getSetting(_T("PREFERINSTALLEDPYTHON")) == _T("1")) {
+        strcpy_s<500>(pathCommands, "import sys\n"
+            "sys.path.append(r'%slib'%s)\n"
+            "sys.path.append(r'%slib'%s)\n"
+            "sys.path.append(r'%sscripts'%s)\n"
+            "sys.path.append(r'%sscripts'%s)\n");
+	} else {
+        strcpy_s<500>(pathCommands, "import sys\n"
+            "sys.path.insert(0,r'%slib'%s)\n"
+            "sys.path.insert(1,r'%slib'%s)\n"
+            "sys.path.insert(2,r'%sscripts'%s)\n"
+            "sys.path.insert(3,r'%sscripts'%s)\n");
+	}
 
 	_snprintf_s(initBuffer, 1024, 1024, 
-		"import sys\n"
-		"sys.path.insert(0,r'%slib'%s)\n"
-		"sys.path.insert(1,r'%slib'%s)\n"
-		"sys.path.insert(2,r'%sscripts'%s)\n"
-		"sys.path.insert(3,r'%sscripts'%s)\n", 
-		
+        pathCommands,		
 		smachineDir.c_str(), 
 		machineIsUnicode ? ".decode('utf8')" : "",
 		
@@ -135,12 +148,6 @@ void PythonHandler::initPython()
 	// Init Notepad++/Scintilla modules
 	initModules();
 
-    /* Old manual version of PyEval_SaveThread() 
-	mp_mainThreadState = PyThreadState_Get();
-	PyThreadState_Swap(NULL);
-
-	PyEval_ReleaseLock();
-    */
     mp_mainThreadState = PyEval_SaveThread();
 	
 }
diff --git a/PythonScript/src/ShortcutDlg.cpp b/PythonScript/src/ShortcutDlg.cpp
@@ -500,6 +500,11 @@ void ShortcutDlg::populateCurrentItems()
 		ComboBox_SetCurSel(m_hComboInitialisation, 0);
 	}
 
+    if (configFile->getSetting(_T("PREFERINSTALLEDPYTHON")) == _T("1")) {
+        CheckDlgButton(_hSelf, IDC_CHECKPREFERINSTALLEDPYTHON, BST_CHECKED);
+	} else {
+        CheckDlgButton(_hSelf, IDC_CHECKPREFERINSTALLEDPYTHON, BST_UNCHECKED);
+	}
 }
 
 
@@ -524,9 +529,14 @@ void ShortcutDlg::saveConfig()
 	TCHAR startupBuffer[50];
 	ComboBox_GetText(m_hComboInitialisation, startupBuffer, 50);
 	configFile->setSetting(_T("STARTUP"), startupBuffer);
+    
+	if (BST_CHECKED == IsDlgButtonChecked(_hSelf, IDC_CHECKPREFERINSTALLEDPYTHON)) {
+        configFile->setSetting(_T("PREFERINSTALLEDPYTHON"), _T("1"));
+	} else {
+        configFile->setSetting(_T("PREFERINSTALLEDPYTHON"), _T("0"));
+	}
 
 	configFile->save();
-
 }
 
 
