Added the support to debug the file in PDB, bumped the version

Author: Nada Al Tayan

PluginDefinition.cpp

@@ -48,31 +48,35 @@ void pluginCleanUp()
 
 void commandMenuInit()
 {
+	int idx = 0;
 	ShortcutKey* key = new ShortcutKey();
 	key->_isAlt = true;
 	key->_isCtrl = true;
 	key->_isShift = false;
 	key->_key = 0x74; //F5
-	setCommand(0, TEXT("Run file in Python"), runFile, key, false);
+	setCommand(idx++, TEXT("Run file in Python"), runFile, key, false);
 
 	key = new ShortcutKey();
 	key->_isAlt = true;
 	key->_isCtrl = false;
 	key->_isShift = true;
 	key->_key = 0x74;
-	setCommand(1, TEXT("Run file in Python Interactive"), runFileInteractive, key, false);
+	setCommand(idx++, TEXT("Run file in Python Interactive"), runFileInteractive, key, false);
 
 	key = new ShortcutKey();
 	key->_isAlt = true;
 	key->_isCtrl = true;
 	key->_isShift = true;
 	key->_key = 0x74;
-	setCommand(2, TEXT("Run file in PythonW"), runFileW, key, false);
+	setCommand(idx++, TEXT("Run file in PythonW"), runFileW, key, false);
 
-	lstrcpy(funcItem[3]._itemName, TEXT("-SEPARATOR-"));
+	key = new ShortcutKey();
+	setCommand(idx++, TEXT("Debug the file (PDB)"), runFilePDB, key, false);
+
+	lstrcpy(funcItem[idx++]._itemName, TEXT("-SEPARATOR-"));
 
-	setCommand(4, TEXT("Options"), showOptionsDlg, 0, false);
-	setCommand(5, TEXT("About PyNPP"), showAboutDlg, 0, false);
+	setCommand(idx++, TEXT("Options"), showOptionsDlg, 0, false);
+	setCommand(idx++, TEXT("About PyNPP"), showAboutDlg, 0, false);
 }
 
 void commandMenuCleanUp()
@@ -137,7 +141,7 @@ std::wstring getCurrentFile(bool &ok)
 	return wPath;
 }
 
-std::wstring buildRunCommand(std::wstring &filePath, std::wstring &pypath, bool isW = false, bool isI = false)
+std::wstring buildRunCommand(std::wstring &filePath, std::wstring &pypath, bool isW = false, bool isI = false, bool isPDB = false)
 {
 	std::wstring command = pypath;
 	if (command[command.length() - 1] != '\\')
@@ -148,6 +152,8 @@ std::wstring buildRunCommand(std::wstring &filePath, std::wstring &pypath, bool
 	command += TEXT(".exe ");
 	if (isI)
 		command += TEXT("-i ");
+	if (isPDB)
+		command += TEXT("-m pdb ");
 	command += TEXT("\"");
 	command += filePath;
 	command += TEXT("\"");
@@ -190,7 +196,7 @@ bool launchPython(std::wstring &command, std::wstring &path)
 	return result;
 }
 
-void run(bool isW, bool isI) {
+void run(bool isW, bool isI, bool isPDB) {
 	std::wstring pythonLoc = pythonPath;
 
 	if(pythonPath == L"")
@@ -210,7 +216,7 @@ void run(bool isW, bool isI) {
 				break;
 			}
 		}
-		std::wstring command = buildRunCommand(file, pythonLoc, isW, isI);
+		std::wstring command = buildRunCommand(file, pythonLoc, isW, isI, isPDB);
 
 		if(!launchPython(command, path)) {
 			int errorCode = GetLastError();
@@ -233,13 +239,17 @@ void run(bool isW, bool isI) {
 }
 
 void runFile() {
-	run(false, false);
+	run(false, false, false);
 }
 
 void runFileInteractive() {
-	run(false, true);
+	run(false, true, false);
 }
 
 void runFileW() {
-	run(true, false);
-}
+	run(true, false, false);
+}
+
+void runFilePDB() {
+	run(false, false, true);
+}

PluginDefinition.h

@@ -22,7 +22,7 @@
 
 const TCHAR NPP_PLUGIN_NAME[] = TEXT("PyNPP");
 
-const int nbFunc = 6;
+const int nbFunc = 7;
 
 
 //
@@ -57,8 +57,10 @@ bool setCommand(size_t index, TCHAR *cmdName, PFUNCPLUGINCMD pFunc, ShortcutKey
 // Your plugin command functions
 //
 void runFile();
+void runFilePDB();
 void runFileInteractive();
 void runFileW();
+void runFileWPDB();
 void run(bool isW);
 void showOptionsDlg();
 void showAboutDlg();

PyNPP_RES.rc

@@ -7,7 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "WinResrc.h"
+#define IDC_STATIC  -1
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -70,7 +71,7 @@ CAPTION "About PyNPP"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,51,82,50,14
-    CTEXT           "PyNPP\nA Notepad++ plugin to run Python scripts from inside Notepad++.\n\nCreated by\nAbd Allah Diab\[email protected]\nhttp://mpcabd.igeex.biz",IDC_STATIC,7,7,136,72
+    CTEXT           "PyNPP\nA Notepad++ plugin to run Python scripts from inside Notepad++.\n\nCreated by\nAbdullah Diab\[email protected]\nhttp://mpcabd.igeex.biz",IDC_STATIC,7,7,135,72
 END
 
 

versionRC.rc

@@ -1,10 +1,10 @@
 #include <windows.h>
 
-#define VER_FILEVERSION             1,1,0,0
-#define VER_FILEVERSION_STR         "1.1\0"
+#define VER_FILEVERSION             1,2,0,0
+#define VER_FILEVERSION_STR         "1.2\0"
 
-#define VER_PRODUCTVERSION          1,1,0,0
-#define VER_PRODUCTVERSION_STR      "1.1\0"
+#define VER_PRODUCTVERSION          1,2,0,0
+#define VER_PRODUCTVERSION_STR      "1.2\0"
 
 #ifndef DEBUG
 #define VER_DEBUG                   0
@@ -25,7 +25,7 @@ BEGIN
     BEGIN
         BLOCK "040904E4"
         BEGIN
-            VALUE "CompanyName",      "Abd Allah Diab\0"
+            VALUE "CompanyName",      "Abdullah Diab\0"
             VALUE "FileDescription",  "PyNPP Notepad++ Plugin\0"
             VALUE "FileVersion",      VER_FILEVERSION_STR
             VALUE "InternalName",     "PyNPP\0"