diff --git a/PythonScript/project/PythonScript.vcxproj.filters b/PythonScript/project/PythonScript.vcxproj.filters index 4287cdc7..31499198 100644 --- a/PythonScript/project/PythonScript.vcxproj.filters +++ b/PythonScript/project/PythonScript.vcxproj.filters @@ -1,396 +1,402 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {7e396fa8-3272-4fba-8b7d-dffbe553882b} - - - {115908ee-33ec-46b0-885a-a4f9c37e203e} - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - - PythonTests\Tests - - - PythonTests - - - PythonTests\Tests - - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - PythonTests - - - PythonTests\Tests - - - PythonTests\Tests - - - Header Files - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - Header Files - - - PythonTests\Tests - - - Header Files - - - PythonTests\Tests - - - Header Files - - - PythonTests\Tests - - - PythonTests\Tests - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {7e396fa8-3272-4fba-8b7d-dffbe553882b} + + + {115908ee-33ec-46b0-885a-a4f9c37e203e} + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + PythonTests\Tests + + + PythonTests + + + PythonTests\Tests + + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + PythonTests + + + PythonTests\Tests + + + PythonTests\Tests + + + Header Files + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + Header Files + + + PythonTests\Tests + + + Header Files + + + PythonTests\Tests + + + Header Files + + + PythonTests\Tests + + + PythonTests\Tests + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/PythonScript/res/PythonScript.rc b/PythonScript/res/PythonScript.rc index f1af5753..0e4f9836 100644 --- a/PythonScript/res/PythonScript.rc +++ b/PythonScript/res/PythonScript.rc @@ -25,18 +25,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -70,16 +70,16 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN PUSHBUTTON "Run",IDC_RUN,152,156,40,13 LTEXT ">>>",IDC_PROMPT,7,158,17,11 - COMBOBOX IDC_COMBO1,25,156,125,50,CBS_DROPDOWN | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO1,25,156,125,50,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP END -IDD_SCRIPTCONFIG DIALOGEX 0, 0, 377, 404 +IDD_SCRIPTCONFIG DIALOGEX 0, 0, 377, 412 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Python Script Configuration" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,265,383,50,14 - PUSHBUTTON "Cancel",IDCANCEL,320,383,50,14 + DEFPUSHBUTTON "OK",IDOK,265,391,50,14 + PUSHBUTTON "Cancel",IDCANCEL,320,391,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,363,136 CONTROL "Machine Scripts",IDC_RADMACHINE,"Button",BS_AUTORADIOBUTTON,19,18,65,10 @@ -106,6 +106,8 @@ BEGIN 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 "Choose a color...",IDC_COLORCHOOSER,169,367,65,14 + CONTROL "DISABLE another script is running popup warning",IDC_DISABLEPOPUPWARNING, + "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,384,170,10 END IDD_PROMPTDIALOG DIALOGEX 0, 0, 313, 105 @@ -149,7 +151,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 370 TOPMARGIN, 7 - BOTTOMMARGIN, 397 + BOTTOMMARGIN, 405 END IDD_PROMPTDIALOG, DIALOG diff --git a/PythonScript/res/resource.h b/PythonScript/res/resource.h index cb3f7857..12cb131e 100644 --- a/PythonScript/res/resource.h +++ b/PythonScript/res/resource.h @@ -16,7 +16,7 @@ #define IDI_ICON1 114 #define IDD_PROMPTDIALOG 116 #define IDB_PYTHONPOWERED 118 -#define IDC_COMBO1 1001 +#define IDC_COMBO1 1001 #define IDC_RUN 1002 #define IDC_PROMPT 1003 #define IDC_FILETREE 1004 @@ -42,7 +42,7 @@ #define IDC_CHECKOPENCONSOLEONERROR 1022 #define IDC_CHECKCOLORIZEOUTPUT 1023 #define IDC_COLORCHOOSER 1024 - +#define IDC_DISABLEPOPUPWARNING 1025 // Next default values for new objects // diff --git a/PythonScript/src/ConfigFile.cpp b/PythonScript/src/ConfigFile.cpp index 45c32446..d14f8ec0 100644 --- a/PythonScript/src/ConfigFile.cpp +++ b/PythonScript/src/ConfigFile.cpp @@ -46,6 +46,7 @@ void ConfigFile::initSettings() setSetting(_T("ADDEXTRALINETOOUTPUT"), _T("0")); setSetting(_T("COLORIZEOUTPUT"), _T("-1")); setSetting(_T("OPENCONSOLEONERROR"), _T("1")); + setSetting(_T("DISABLEPOPUPWARNING"), _T("0")); setSetting(_T("PREFERINSTALLEDPYTHON"), _T("0")); setSetting(_T("STARTUP"), _T("LAZY")); } diff --git a/PythonScript/src/PythonScript.cpp b/PythonScript/src/PythonScript.cpp index 8daa0c07..60de4a9a 100644 --- a/PythonScript/src/PythonScript.cpp +++ b/PythonScript/src/PythonScript.cpp @@ -506,7 +506,10 @@ static void runStatement(const TCHAR *statement, bool synchronous, HANDLE comple MenuManager::getInstance()->stopScriptEnabled(true); if (!pythonHandler->runScript(statement, synchronous, allowQueuing, completedEvent, true)) { - MessageBox(NULL, _T("Another script is currently running. Running two scripts at the same time could produce unpredicable results, and is therefore disabled."), PLUGIN_NAME, 0); + if (ConfigFile::getInstance()->getSetting(_T("DISABLEPOPUPWARNING")) == _T("0")) + { + MessageBox(NULL, _T("Another script is currently running. Running two scripts at the same time could produce unpredicable results, and is therefore disabled."), PLUGIN_NAME, 0); + } } } @@ -559,7 +562,10 @@ static void runScript(const TCHAR *filename, bool synchronous, HANDLE completedE if (!pythonHandler->runScript(filename, synchronous, allowQueuing, completedEvent)) { - MessageBox(NULL, _T("Another script is currently running. Running two scripts at the same time could produce unpredicable results, and is therefore disabled."), PLUGIN_NAME, 0); + if (ConfigFile::getInstance()->getSetting(_T("DISABLEPOPUPWARNING")) == _T("0")) + { + MessageBox(NULL, _T("Another script is currently running. Running two scripts at the same time could produce unpredicable results, and is therefore disabled."), PLUGIN_NAME, 0); + } } } diff --git a/PythonScript/src/ShortcutDlg.cpp b/PythonScript/src/ShortcutDlg.cpp index 89474416..7bc12a38 100644 --- a/PythonScript/src/ShortcutDlg.cpp +++ b/PythonScript/src/ShortcutDlg.cpp @@ -529,6 +529,9 @@ void ShortcutDlg::populateCurrentItems() bool openOnError = (configFile->getSetting(_T("OPENCONSOLEONERROR")) == _T("1")); CheckDlgButton(_hSelf, IDC_CHECKOPENCONSOLEONERROR, openOnError ? BST_CHECKED : BST_UNCHECKED); + + bool disablePopupWarning = (configFile->getSetting(_T("DISABLEPOPUPWARNING")) == _T("1")); + CheckDlgButton(_hSelf, IDC_DISABLEPOPUPWARNING, disablePopupWarning ? BST_CHECKED : BST_UNCHECKED); } @@ -566,6 +569,9 @@ void ShortcutDlg::saveConfig() bool openOnError = (BST_CHECKED == IsDlgButtonChecked(_hSelf, IDC_CHECKOPENCONSOLEONERROR)); configFile->setSetting(_T("OPENCONSOLEONERROR"), openOnError ? _T("1") : _T("0")); + + bool disablePopupWarning = (BST_CHECKED == IsDlgButtonChecked(_hSelf, IDC_DISABLEPOPUPWARNING)); + configFile->setSetting(_T("DISABLEPOPUPWARNING"), disablePopupWarning ? _T("1") : _T("0")); configFile->save(); }