Merge pull request bruderstein#84 from ClaudiaFrank/multiple_issues

Multiple issues

Author: chcg

PythonScript/res/PythonScript.rc

@@ -57,8 +57,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,143,168,50,14
     LTEXT           "Python Script",IDC_STATIC,146,7,49,8
-    LTEXT           "(C) 2010, 2011, 2014, 2018 Dave Brotherstone",IDC_STATIC,92,30,154,8
-    CONTROL         118,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,118,42,93,34
+    LTEXT           "(C) 2010, 2011, 2014, 2018 Dave Brotherstone",IDC_STATIC,105,30,133,8
+    CONTROL         IDB_PYTHONPOWERED,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,118,42,93,34
     EDITTEXT        IDC_COPYRIGHT,7,84,324,74,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
     CTEXT           "1.0",IDC_VERSION,156,19,26,8
 END
@@ -73,32 +73,39 @@ BEGIN
     LTEXT           ">>>",IDC_PROMPT,7,161,17,8
 END
 
-IDD_SCRIPTCONFIG DIALOGEX 0, 0, 376, 363
+IDD_SCRIPTCONFIG DIALOGEX 0, 0, 377, 404
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Python Script Shortcut Configuration"
+CAPTION "Python Script Configuration"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,265,342,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,319,342,50,14
+    DEFPUSHBUTTON   "OK",IDOK,265,383,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,320,382,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
+    GROUPBOX        "Scripts",IDC_STATIC,7,7,363,136
     CONTROL         "Machine Scripts",IDC_RADMACHINE,"Button",BS_AUTORADIOBUTTON,19,18,65,10
     CONTROL         "User Scripts",IDC_RADUSER,"Button",BS_AUTORADIOBUTTON,94,18,54,10
     PUSHBUTTON      "Add",IDC_MENUADD,21,146,50,14
     PUSHBUTTON      "Remove",IDC_MENUREMOVE,89,146,50,14
-    PUSHBUTTON      "Add",IDC_TOOLBARADD,187,146,50,14
+    PUSHBUTTON      "Add",IDC_TOOLBARADD,187,145,50,14
     PUSHBUTTON      "Remove",IDC_TOOLBARREMOVE,245,146,50,14
-    LTEXT           "Menu items",IDC_STATIC,10,161,37,8
+    LTEXT           "Menu items",IDC_STATIC,10,162,37,8
     LTEXT           "Toolbar icons",IDC_STATIC,186,161,43,8
-    CONTROL         "",IDC_TOOLBARITEMLIST2,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,185,172,184,104
-    PUSHBUTTON      "Set Icon",IDC_TOOLBARSETICON,304,146,50,14
-    CONTROL         "",IDC_MENUITEMLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,172,173,104
-    COMBOBOX        IDC_COMBOINITIALISATION,58,285,69,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_TOOLBARITEMLIST2,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,186,172,184,104
+    PUSHBUTTON      "Set Icon...",IDC_TOOLBARSETICON,304,146,50,14
+    CONTROL         "",IDC_MENUITEMLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,171,173,106
+    COMBOBOX        IDC_COMBOINITIALISATION,55,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
+    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,22,321,348,19
+    CONTROL         "Add an additional end of line character for run statements and error messages to the console",IDC_CHECKADDEXTRALINETOOUTPUT,
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,356,310,10
+    CONTROL         "Automatically open console on error (no restart required)",IDC_CHECKOPENCONSOLEONERROR,
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,342,197,10
+    CONTROL         "Color output from run statements differently",IDC_CHECKCOLORIZEOUTPUT,
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,370,157,10
+    PUSHBUTTON      "Chose a color...",IDC_COLORCHOOSER,169,367,62,14
 END
 
 IDD_PROMPTDIALOG DIALOGEX 0, 0, 313, 105
@@ -109,7 +116,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,205,84,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,256,84,50,14
     LTEXT           "Static",IDC_PROMPT,7,7,299,19
-    EDITTEXT        IDC_USERTEXT,7,29,299,46,ES_MULTILINE | ES_AUTOHSCROLL
+    EDITTEXT        IDC_USERTEXT,7,29,299,46,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL
 END
 
 
@@ -140,9 +147,9 @@ BEGIN
     IDD_SCRIPTCONFIG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 369
+        RIGHTMARGIN, 370
         TOPMARGIN, 7
-        BOTTOMMARGIN, 356
+        BOTTOMMARGIN, 397
     END
 
     IDD_PROMPTDIALOG, DIALOG
@@ -164,17 +171,39 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_FOLDERCLOSED        ICON                    "FolderClosed.ico"
+
 IDI_FOLDEROPEN          ICON                    "FolderOpen.ico"
+
 IDI_PYTHON              ICON                    "python.ico"
+
 IDI_PYTHON8             ICON                    "python2.ico"
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 
 IDB_PYTHON              BITMAP                  "python.bmp"
+
 IDB_PYTHONPOWERED       BITMAP                  "python-powered-w-140x56.bmp"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// AFX_DIALOG_LAYOUT
+//
+
+IDD_SCRIPTCONFIG AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+IDD_PROMPTDIALOG AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 #endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
 

PythonScript/res/PythonScriptVersion.rc

@@ -38,14 +38,18 @@
 #define IDC_COPYRIGHT                   1018
 #define IDC_VERSION                     1019
 #define IDC_CHECKPREFERINSTALLEDPYTHON  1020
+#define IDC_CHECKADDEXTRALINETOOUTPUT   1021
+#define IDC_CHECKOPENCONSOLEONERROR     1022
+#define IDC_CHECKCOLORIZEOUTPUT         1023
+#define IDC_COLORCHOOSER                1024
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        119
+#define _APS_NEXT_RESOURCE_VALUE        121
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1021
+#define _APS_NEXT_CONTROL_VALUE         1025
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

PythonScript/res/resource.h

@@ -26,6 +26,7 @@ ConfigFile::ConfigFile(const TCHAR *configDir, const TCHAR *pluginDir, HINSTANCE
 	m_machineScriptsDir.append(_T("\\PythonScript\\scripts"));
 	m_userScriptsDir.append(_T("\\PythonScript\\scripts"));
 
+	initSettings();
 	readConfig();
 }
 
@@ -39,6 +40,14 @@ ConfigFile::~ConfigFile()
 
 }
 
+void ConfigFile::initSettings()
+{
+	setSetting(_T("ADDEXTRALINETOOUTPUT"), _T("0"));
+	setSetting(_T("COLORIZEOUTPUT"), _T("-1"));
+	setSetting(_T("OPENCONSOLEONERROR"), _T("0"));
+	setSetting(_T("PREFERINSTALLEDPYTHON"), _T("0"));
+	setSetting(_T("STARTUP"), _T("LAZY"));
+}
 
 void ConfigFile::readConfig()
 {
@@ -89,7 +98,7 @@ void ConfigFile::readConfig()
 			{
 				element = strtok_s(NULL, "/", &context);
 				char *settingValue = strtok_s(NULL, "/", &context);
-				m_settings.insert(std::pair<tstring, tstring>(tstring(WcharMbcsConverter::char2tchar(element).get()), tstring(WcharMbcsConverter::char2tchar(settingValue).get())));
+				m_settings.insert_or_assign(tstring(WcharMbcsConverter::char2tchar(element).get()), tstring(WcharMbcsConverter::char2tchar(settingValue).get()));
 			}
 		}
 

PythonScript/src/ConfigFile.cpp

@@ -38,6 +38,7 @@ class ConfigFile
 
 protected:
 	void readConfig();
+	void initSettings();
 
 private:
 	ConfigFile(); // default constructor disabled

PythonScript/src/ConfigFile.h

@@ -10,6 +10,7 @@
 #include "WcharMbcsConverter.h"
 #include "MenuManager.h"
 #include "PythonScript.h"
+#include "ConfigFile.h"
 
 
 namespace NppPythonScript
@@ -27,7 +28,9 @@ ConsoleDialog::ConsoleDialog() :
 	m_currentHistory(0),
 	m_runButtonIsRun(true),
 	m_hContext(NULL),
-	m_nppData{0,0,0}
+	m_nppData{0,0,0},
+	m_colorOutput(false),
+	m_user_color(-1)
 {
     m_historyIter = m_history.end();
 }
@@ -72,6 +75,17 @@ void ConsoleDialog::initDialog(HINSTANCE hInst, NppData& nppData, ConsoleInterfa
 {
     DockingDlgInterface::init(hInst, nppData._nppHandle);
 
+	try
+	{
+		m_user_color = stoi(ConfigFile::getInstance()->getSetting(_T("COLORIZEOUTPUT")));
+		m_colorOutput = m_user_color > -1;
+	}
+	catch (const std::exception&)
+	{
+		m_colorOutput = false;
+	}
+	m_prompt = ConfigFile::getInstance()->getSetting(_T("ADDEXTRALINETOOUTPUT")) == _T("1") ? m_prompt.insert(0, "\n") : m_prompt;
+
     //Window::init(hInst, nppData._nppHandle);
     createOutputWindow(nppData._nppHandle);
 
@@ -419,9 +433,9 @@ void ConsoleDialog::runStatement()
 		std::shared_ptr<char> charBuffer = WcharMbcsConverter::tchar2char(buffer);
 		delete [] buffer;
 
-		writeText(m_prompt.size(), m_prompt.c_str());
-		writeText(strlen(charBuffer.get()), charBuffer.get());
-		writeText(1, "\n");
+		writeCmdText(m_prompt.size(), m_prompt.c_str());
+		writeCmdText(strlen(charBuffer.get()), charBuffer.get());
+		writeCmdText(1, "\n");
 		SetWindowText(hText, _T(""));
 		m_console->runStatement(charBuffer.get());
 	}
@@ -441,9 +455,13 @@ void ConsoleDialog::stopStatement()
 void ConsoleDialog::setPrompt(const char *prompt)
 {
     m_prompt = prompt;
-    ::SetWindowTextA(::GetDlgItem(_hSelf, IDC_PROMPT), prompt);
+	::SetWindowTextA(::GetDlgItem(_hSelf, IDC_PROMPT), (m_prompt.rfind('\n', 0) == 0) ? m_prompt.substr(1, m_prompt.size() - 1).c_str() : m_prompt.c_str());
 }
 
+const char * ConsoleDialog::getPrompt()
+{
+	return m_prompt.c_str();
+}
 
 void ConsoleDialog::createOutputWindow(HWND hParentWindow)
 {
@@ -504,6 +522,10 @@ void ConsoleDialog::createOutputWindow(HWND hParentWindow)
     callScintilla(SCI_STYLESETFORE, 7, RGB(255, 128, 64));  // orange
     callScintilla(SCI_STYLESETUNDERLINE, 7 /* = style number */, 1 /* = underline */);   
 	callScintilla(SCI_STYLESETHOTSPOT, 7, 1);
+	
+	// 8 is colored stdout
+	callScintilla(SCI_STYLESETSIZE, 8 /* = style number */, 8 /* = size in points */);
+	callScintilla(SCI_STYLESETFORE, 8, m_colorOutput ? m_user_color : 0);  // green
 
 	callScintilla(SCI_USEPOPUP, 0);
     callScintilla(SCI_SETLEXER, SCLEX_CONTAINER);
@@ -529,6 +551,31 @@ LRESULT ConsoleDialog::scintillaWndProc(HWND hWnd, UINT message, WPARAM wParam,
 	return CallWindowProc(s_originalScintillaWndProc, hWnd, message, wParam, lParam);
 }
 
+void ConsoleDialog::writeCmdText(size_t length, const char *text)
+{
+	::SendMessage(m_scintilla, SCI_SETREADONLY, 0, 0);
+	for (idx_t i = 0; i < length; ++i)
+	{
+		if (text[i] == '\r')
+		{
+			::SendMessage(m_scintilla, SCI_APPENDTEXT, i, reinterpret_cast<LPARAM>(text));
+			text += i + 1;
+			length -= i + 1;
+			i = 0;
+		}
+	}
+
+	if (length > 0)
+	{
+		::SendMessage(m_scintilla, SCI_APPENDTEXT, length, reinterpret_cast<LPARAM>(text));
+	}
+
+	::SendMessage(m_scintilla, SCI_SETREADONLY, 1, 0);
+
+	::SendMessage(m_scintilla, SCI_GOTOPOS, ::SendMessage(m_scintilla, SCI_GETLENGTH, 0, 0), 0);
+
+}
+
 void ConsoleDialog::writeText(size_t length, const char *text)
 {
 	::SendMessage(m_scintilla, SCI_SETREADONLY, 0, 0);
@@ -554,6 +601,39 @@ void ConsoleDialog::writeText(size_t length, const char *text)
 
 }
 
+void ConsoleDialog::writeColoredText(size_t length, const char *text)
+{
+	size_t docLength = (size_t)callScintilla(SCI_GETLENGTH);
+	size_t realLength = length;
+	callScintilla(SCI_SETREADONLY, 0);
+	for (idx_t i = 0; i < length; ++i)
+	{
+		if (text[i] == '\r')
+		{
+			if (i)
+			{
+				callScintilla(SCI_APPENDTEXT, i, reinterpret_cast<LPARAM>(text));
+			}
+			text += i + 1;
+			length -= i + 1;
+			realLength--;
+			i = 0;
+		}
+	}
+
+	if (length > 0)
+	{
+		callScintilla(SCI_APPENDTEXT, length, reinterpret_cast<LPARAM>(text));
+	}
+
+	callScintilla(SCI_SETREADONLY, 1);
+	callScintilla(SCI_STARTSTYLING, docLength, 0x01);
+	callScintilla(SCI_SETSTYLING, realLength, m_colorOutput ? 8 : 0);
+
+
+	callScintilla(SCI_COLOURISE, docLength, -1);
+	callScintilla(SCI_GOTOPOS, docLength + realLength);
+}
 
 void ConsoleDialog::writeError(size_t length, const char *text)
 {

PythonScript/src/ConsoleDialog.cpp

@@ -27,10 +27,13 @@ class ConsoleDialog : public DockingDlgInterface
     void doDialog();
 	void hide();
 
+	void writeCmdText(size_t length, const char *text);
 	void writeText(size_t length, const char *text);
+	void writeColoredText(size_t length, const char *text);
 	void writeError(size_t length, const char *text);
 	void clearText();
 	void setPrompt(const char *prompt);
+	const char * getPrompt();
 	HWND getScintillaHwnd() { return m_scintilla; }
 
 	void giveInputFocus() { SetFocus(m_hInput); }
@@ -91,6 +94,8 @@ class ConsoleDialog : public DockingDlgInterface
 	bool m_runButtonIsRun;
 
 	HMENU m_hContext;
+	bool m_colorOutput;
+	int m_user_color;
 
 };
 

PythonScript/src/ConsoleDialog.h

@@ -1085,13 +1085,13 @@ bool NotepadPlusWrapper::isSingleView()
 	return !IsWindowVisible(splitter_hwnd);
 }
 
-void NotepadPlusWrapper::flashWindow(UINT count, DWORD timeout)
+void NotepadPlusWrapper::flashWindow(UINT count, DWORD milliseconds)
 {
 	FLASHWINFO flashinfo;
 	flashinfo.cbSize = sizeof(flashinfo);
 	flashinfo.hwnd = m_nppHandle;
 	flashinfo.dwFlags = FLASHW_ALL;
-	flashinfo.dwTimeout = timeout;
+	flashinfo.dwTimeout = milliseconds;
 	flashinfo.uCount = count;
 
 	FlashWindowEx(&flashinfo);

PythonScript/src/NotepadPlusWrapper.cpp

@@ -121,7 +121,7 @@ void export_notepad()
 		.def("triggerTabbarContextMenu", &NotepadPlusWrapper::triggerTabbarContextMenu, boost::python::args("view, index2Activate"), "Activates the context menu for provided view and tab index")
 		.def("disableAutoUpdate", &NotepadPlusWrapper::disableAutoUpdate, "Disables notepad++ auto update functionality")
 		.def("isSingleView", &NotepadPlusWrapper::isSingleView, "True if only one view is used, False otherwise")
-		.def("flashWindow", &NotepadPlusWrapper::flashWindow, boost::python::args("count", "timeout"), "Flashes notepad++ for the given count and timeout");
+		.def("flashWindow", &NotepadPlusWrapper::flashWindow, boost::python::args("count", "milliseconds"), "Flashes notepad++ for the given count and timeout");
 	boost::python::enum_<LangType>("LANGTYPE")
 			.value("TXT", L_TEXT)
 			.value("PHP", L_PHP)