diff --git a/Contrib/Makensisw/Readme.txt b/Contrib/Makensisw/Readme.txt index 3751b637..0bf71e09 100644 --- a/Contrib/Makensisw/Readme.txt +++ b/Contrib/Makensisw/Readme.txt @@ -32,6 +32,7 @@ For the options, please see the MakeNSIS documentation. Shortcut Keys ------------- Ctrl+A: Select All text +Ctrl+B: Browse Script Ctrl+C: Copy selected text Ctrl+E: Edits the script Ctrl+F: Find text @@ -160,6 +161,7 @@ Version History - Added resize gripper - Ctrl+L loads a script - Added Clear Log (Ctrl+W) + - Browse Script (Ctrl+B) launches explorer in script directory - Bunch of other stuff not worth mentioning diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index 0fd37c15..e08b8d9d 100644 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp @@ -210,6 +210,16 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { case WM_COMMAND: { switch (LOWORD(wParam)) { + case IDM_BROWSESCR: { + if (g_input_script) { + char str[MAX_PATH],*str2; + lstrcpy(str,g_input_script); + str2=strrchr(str,'\\'); + if(str2!=NULL) *str2=0; + ShellExecute(g_hwnd,"open",str,NULL,NULL,SW_SHOWNORMAL); + } + return TRUE; + } case IDM_ABOUT: { DialogBox(g_hInstance,MAKEINTRESOURCE(DLG_ABOUT),g_hwnd,(DLGPROC)AboutProc); diff --git a/Contrib/Makensisw/resource.h b/Contrib/Makensisw/resource.h index 830d40b1..9536ac65 100644 --- a/Contrib/Makensisw/resource.h +++ b/Contrib/Makensisw/resource.h @@ -31,14 +31,15 @@ #define IDM_FIND 40006 #define IDM_SELECTALL 40007 #define IDM_CLEARLOG 40009 +#define IDM_BROWSESCR 40013 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 114 -#define _APS_NEXT_COMMAND_VALUE 40011 -#define _APS_NEXT_CONTROL_VALUE 1013 +#define _APS_NEXT_RESOURCE_VALUE 115 +#define _APS_NEXT_COMMAND_VALUE 40014 +#define _APS_NEXT_CONTROL_VALUE 1016 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc index 768e7c10..dc73d451 100644 --- a/Contrib/Makensisw/resource.rc +++ b/Contrib/Makensisw/resource.rc @@ -85,8 +85,9 @@ BEGIN MENUITEM "&Recompile\tCtrl+R", IDM_RECOMPILE MENUITEM "&Test Installer\tCtrl+T", IDM_TEST MENUITEM "Edit Script\tCtrl+E", IDM_EDITSCRIPT + MENUITEM "Browse Script\tCtrl+B", IDM_BROWSESCR MENUITEM SEPARATOR - MENUITEM "Clear &Log\tCtrl+W", IDM_CLEARLOG + MENUITEM "Clear &Log Window\tCtrl+W", IDM_CLEARLOG END POPUP "&Help" BEGIN @@ -106,6 +107,7 @@ END IDK_ACCEL ACCELERATORS PRELOAD MOVEABLE PURE BEGIN "A", IDM_SELECTALL, VIRTKEY, CONTROL, NOINVERT + "B", IDM_BROWSESCR, VIRTKEY, CONTROL, NOINVERT "C", IDM_COPYSELECTED, VIRTKEY, CONTROL, NOINVERT "E", IDM_EDITSCRIPT, VIRTKEY, CONTROL, NOINVERT "F", IDM_FIND, VIRTKEY, CONTROL, NOINVERT diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp index 43701d18..037bcc35 100644 --- a/Contrib/Makensisw/utils.cpp +++ b/Contrib/Makensisw/utils.cpp @@ -95,7 +95,8 @@ void DisableItems(HWND hwnd) { EnableMenuItem(g_mnu,IDM_COPY,MF_GRAYED); EnableMenuItem(g_mnu,IDM_COPYSELECTED,MF_GRAYED); EnableMenuItem(g_mnu,IDM_EDITSCRIPT,MF_GRAYED); - EnableMenuItem(g_mnu,IDM_CLEARLOG,MF_ENABLED); + EnableMenuItem(g_mnu,IDM_CLEARLOG,MF_GRAYED); + EnableMenuItem(g_mnu,IDM_BROWSESCR,MF_GRAYED); } void EnableItems(HWND hwnd) { @@ -155,6 +156,7 @@ void EnableItems(HWND hwnd) { EnableMenuItem(g_mnu,IDM_COPYSELECTED,MF_ENABLED); EnableMenuItem(g_mnu,IDM_EDITSCRIPT,MF_ENABLED); EnableMenuItem(g_mnu,IDM_CLEARLOG,MF_ENABLED); + EnableMenuItem(g_mnu,IDM_BROWSESCR,MF_ENABLED); } void CompileNSISScript() { @@ -167,6 +169,7 @@ void CompileNSISScript() { EnableMenuItem(g_mnu,IDM_RECOMPILE,MF_GRAYED); EnableMenuItem(g_mnu,IDM_EDITSCRIPT,MF_GRAYED); EnableMenuItem(g_mnu,IDM_TEST,MF_GRAYED); + EnableMenuItem(g_mnu,IDM_BROWSESCR,MF_GRAYED); EnableWindow(GetDlgItem(g_hwnd,IDC_TEST),0); DragAcceptFiles(g_hwnd,TRUE); return;