implement colorchooser

Author: CFrank

PythonScript/res/PythonScript.rc

@@ -100,11 +100,12 @@ BEGIN
                     "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,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,342,352,11
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,342,312,10
     CONTROL         "Automatically open console on error",IDC_CHECKOPENCONSOLEONERROR,
-                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,355,352,11
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,355,131,9
     CONTROL         "Color output from run statements differently",IDC_CHECKCOLORIZEOUTPUT,
-                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,368,157,11
+                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,368,157,11
+    PUSHBUTTON      "Chose a color...",IDC_COLORCHOOSER,169,365,62,14
 END
 
 IDD_PROMPTDIALOG DIALOGEX 0, 0, 313, 105

PythonScript/res/resource.h

@@ -41,14 +41,16 @@
 #define IDC_CHECKADDEXTRALINETOOUTPUT   1021
 #define IDC_CHECKOPENCONSOLEONERROR     1022
 #define IDC_CHECKCOLORIZEOUTPUT         1023
+#define IDC_COLORCHOOSER                1024
+#define IDC_PICTUREBOX                  1028
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        120
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1021
+#define _APS_NEXT_CONTROL_VALUE         1029
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

PythonScript/src/ShortcutDlg.cpp

@@ -12,6 +12,7 @@ ShortcutDlg::ShortcutDlg(HINSTANCE hInst, NppData& nppData, const TCHAR *scriptD
 	  m_hListMenuItems(NULL),
 	  m_hListToolbarItems(NULL),
 	  m_hComboInitialisation(NULL),
+	  m_hButtonColor(NULL),
 	  m_hImageList(NULL),
 	  m_hDefaultImageIndex(0),
 	  m_hIcons(NULL),
@@ -74,6 +75,19 @@ INT_PTR CALLBACK ShortcutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
 			return TRUE;
 
 		case WM_COMMAND:
+			switch (LOWORD(wParam))
+			{
+				case IDC_COLORCHOOSER:
+					ctrlOnClick();
+					break;
+				case IDC_CHECKCOLORIZEOUTPUT:
+					if (HIWORD(wParam) == BN_CLICKED)
+					{
+						size_t result = SendMessage(reinterpret_cast<HWND>(lParam), BM_GETCHECK, 0, 0);
+						EnableWindow(m_hButtonColor, (result == BST_CHECKED) ? true : false);
+					}
+					break;
+			}
 			switch(wParam)
 			{
 				case IDOK:
@@ -208,6 +222,7 @@ void ShortcutDlg::onInitDialog()
 	m_hListMenuItems = ::GetDlgItem(_hSelf, IDC_MENUITEMLIST);
 	m_hListToolbarItems = ::GetDlgItem(_hSelf, IDC_TOOLBARITEMLIST2);
 	m_hComboInitialisation = ::GetDlgItem(_hSelf, IDC_COMBOINITIALISATION);
+	m_hButtonColor = ::GetDlgItem(_hSelf, IDC_COLORCHOOSER);
 	InitCommonControls();
 	HICON hIcon;           // handle to icon
 
@@ -507,7 +522,8 @@ void ShortcutDlg::populateCurrentItems()
 	CheckDlgButton(_hSelf, IDC_CHECKADDEXTRALINETOOUTPUT, addExtraLine ? BST_CHECKED : BST_UNCHECKED); 
 
 	bool colorOutput = (configFile->getSetting(_T("COLORIZEOUTPUT")) >= _T("0"));
-	CheckDlgButton(_hSelf, IDC_CHECKCOLORIZEOUTPUT, colorOutput ? BST_CHECKED : BST_UNCHECKED); 
+	CheckDlgButton(_hSelf, IDC_CHECKCOLORIZEOUTPUT, colorOutput ? BST_CHECKED : BST_UNCHECKED);
+	EnableWindow(m_hButtonColor, colorOutput);
 
 	bool openOnError = (configFile->getSetting(_T("OPENCONSOLEONERROR")) == _T("1"));
 	CheckDlgButton(_hSelf, IDC_CHECKOPENCONSOLEONERROR, openOnError ? BST_CHECKED : BST_UNCHECKED);
@@ -544,7 +560,7 @@ void ShortcutDlg::saveConfig()
 	configFile->setSetting(_T("ADDEXTRALINETOOUTPUT"), addExtraLine ? _T("1"): _T("0"));
 
 	bool colorOutput = (BST_CHECKED == IsDlgButtonChecked(_hSelf, IDC_CHECKCOLORIZEOUTPUT));
-	configFile->setSetting(_T("COLORIZEOUTPUT"), colorOutput ? _T("1234567") : _T("-1"));
+	configFile->setSetting(_T("COLORIZEOUTPUT"), colorOutput ? ConfigFile::getInstance()->getSetting(_T("COLORIZEOUTPUT")) : _T("-1"));
 
 	bool openOnError = (BST_CHECKED == IsDlgButtonChecked(_hSelf, IDC_CHECKOPENCONSOLEONERROR));
 	configFile->setSetting(_T("OPENCONSOLEONERROR"), openOnError ? _T("1") : _T("0"));
@@ -595,3 +611,29 @@ void ShortcutDlg::toolbarSetIcon()
 		}
 	}
 }
+
+void ShortcutDlg::ctrlOnClick()
+{
+	CHOOSECOLOR cc;
+	static COLORREF acrCustClr[16];
+	for (int i = 0; i < 16; i++)
+	{
+		acrCustClr[i] = RGB(255,255,255);
+	}
+	const tstring strRGBCurrent = ConfigFile::getInstance()->getSetting(_T("COLORIZEOUTPUT"));
+	static DWORD rgbCurrent = (strRGBCurrent == _T("-1")) ? RGB(135,214,18) : stoi(strRGBCurrent);
+	
+	ZeroMemory(&cc, sizeof(cc));
+	cc.lStructSize = sizeof(cc);
+	cc.hwndOwner = _hSelf;
+	cc.lpCustColors = (LPDWORD)acrCustClr;
+	cc.rgbResult = rgbCurrent;
+	cc.Flags = CC_FULLOPEN | CC_RGBINIT;
+
+	if (ChooseColor(&cc) == TRUE)
+	{
+		rgbCurrent = cc.rgbResult;
+		ConfigFile::getInstance()->setSetting(_T("COLORIZEOUTPUT"), std::to_wstring(rgbCurrent));
+	}
+
+}

PythonScript/src/ShortcutDlg.h

@@ -45,6 +45,8 @@ class ShortcutDlg : public StaticDialog
 
 	void saveConfig();
 
+	void ctrlOnClick();
+
 	HTREEITEM addTreeItem(HTREEITEM parent, HTREEITEM lastItem, TCHAR *fullPath, TCHAR *text, bool isDirectory);
 
 	tstring m_userScriptDir;
@@ -53,6 +55,7 @@ class ShortcutDlg : public StaticDialog
 	HWND m_hListMenuItems;
 	HWND m_hListToolbarItems;
 	HWND m_hComboInitialisation;
+	HWND m_hButtonColor;
 
 	HIMAGELIST m_hImageList;
 	int m_hDefaultImageIndex;