diff --git a/Contrib/Makensisw/Readme.txt b/Contrib/Makensisw/Readme.txt index 97a2412d..c84f981f 100644 --- a/Contrib/Makensisw/Readme.txt +++ b/Contrib/Makensisw/Readme.txt @@ -32,7 +32,7 @@ For the options, please see the MakeNSIS documentation. Shortcut Keys ------------- Ctrl+A: Select All text -Ctrl+B: Browse Script +Ctrl+B: Open Script Folder Ctrl+C: Copy selected text Ctrl+D: Opens the Define Symbols dialog Ctrl+E: Edits the script @@ -40,7 +40,7 @@ Ctrl+F: Find text Ctrl+L: Load a script Ctrl+R: Recompiles the script Ctrl+T: Tests the installer -Ctrl+W: Clears Log Window +Ctrl+W: Clear Log Window Alt+X: Exits the application F1: View Documentation @@ -168,6 +168,7 @@ Version History - Define Symbols menu (Ctrl+D) 2.0 + - Improved user interface - Define Symbols is available even if a script is not loaded. - Defined Symbols are saved on exit and reloaded on start. - Added NSIS Update menu. @@ -181,7 +182,7 @@ Version History Copyright Information --------------------- Copyright (c) 2002 Robert Rainwater -Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, and Sunil Kamath +Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, Sunil Kamath, Joost Verburg This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index fe9f3576..4210516e 100644 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp @@ -1,6 +1,6 @@ /* Copyright (c) 2002 Robert Rainwater - Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, and Sunil Kamath + Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, Sunil Kamath, Joost Verburg This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -111,7 +111,6 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { SetBranding(g_sdata.hwnd); HFONT hFont = CreateFont(14,0,0,0,FW_NORMAL,0,0,0,DEFAULT_CHARSET,OUT_CHARACTER_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,FIXED_PITCH|FF_DONTCARE,"Courier New"); SendDlgItemMessage(hwndDlg,IDC_LOGWIN,WM_SETFONT,(WPARAM)hFont,0); - SendDlgItemMessage(hwndDlg,IDC_LOGWIN,EM_SETBKGNDCOLOR,0,GetSysColor(COLOR_BTNFACE)); RestoreWindowPos(g_sdata.hwnd); RestoreCompressor(); g_sdata.compressor = (NCOMPRESSOR)-1; @@ -1069,6 +1068,7 @@ BOOL CALLBACK CompressorProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara case IDCANCEL: { EndDialog(hwndDlg, 1); + LogMessage(g_sdata.hwnd,USAGE); break; } } diff --git a/Contrib/Makensisw/makensisw.dsp b/Contrib/Makensisw/makensisw.dsp index dce4b866..d6b1dddf 100644 --- a/Contrib/Makensisw/makensisw.dsp +++ b/Contrib/Makensisw/makensisw.dsp @@ -145,10 +145,6 @@ SOURCE=.\utils.h # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # Begin Source File -SOURCE="..\Icons\adni18-installer-B.ico" -# End Source File -# Begin Source File - SOURCE=.\logo.bmp # End Source File # Begin Source File @@ -157,10 +153,6 @@ SOURCE="..\Graphics\Icons\modern-install-blue-full.ico" # End Source File # Begin Source File -SOURCE="..\Icons\modern-install.ico" -# End Source File -# Begin Source File - SOURCE=.\resource.rc # End Source File # Begin Source File diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h index 782c2341..2e74df8d 100644 --- a/Contrib/Makensisw/makensisw.h +++ b/Contrib/Makensisw/makensisw.h @@ -1,6 +1,6 @@ /* Copyright (c) 2002 Robert Rainwater - Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, and Sunil Kamath + Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, Sunil Kamath, Joost Verburg This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -34,7 +34,7 @@ #define NSIS_UPDATE "\\Bin\\NSISUpdate.exe" #define USAGE "Usage:\r\n\r\n - File | Load Script...\r\n - Drag the .nsi file into this window\r\n - Right click the .nsi file and choose \"Compile NSI\"" #define COPYRIGHT "Copyright © 2002 Robert Rainwater" -#define CONTRIB "Fritz Elfert, Justin Frankel, Amir Szekely, Sunil Kamath" +#define CONTRIB "Fritz Elfert, Justin Frankel, Amir Szekely, Sunil Kamath, Joost Verburg" #define DOCPATH "http://nsis.sourceforge.net/Docs/" #define LOCALDOCS "\\NSIS.chm" #define NSISERROR "Unable to intialize MakeNSIS. Please verify that makensis.exe is in the same directory as makensisw.exe." @@ -54,10 +54,11 @@ #define MINHEIGHT 180 #define FILE_MENU_INDEX 0 #define EDIT_MENU_INDEX 1 -#define TOOLS_MENU_INDEX 2 +#define SCRIPT_MENU_INDEX 2 #define COMPRESSOR_MENU_INDEX 4 -#define COMPRESSOR_MESSAGE "\n\nThe %s compressor (%d bytes) created the smallest installer." -#define RESTORED_COMPRESSOR_MESSAGE "\n\nThe %s compressor (%d bytes) created the smallest installer which was restored." +#define TOOLS_MENU_INDEX 3 +#define COMPRESSOR_MESSAGE "\n\nThe %s compressor created the smallest installer (%d bytes)." +#define RESTORED_COMPRESSOR_MESSAGE "\n\nThe %s compressor created the smallest installer (%d bytes)." #define EXE_HEADER_COMPRESSOR_STAT "EXE header size:" #define TOTAL_SIZE_COMPRESSOR_STAT "Total size:" #define SYMBOL_SET_NAME_MAXLEN 40 @@ -96,7 +97,7 @@ char *compressor_names[] = {"", char *compressor_display_names[] = {"Defined in Script/Compiler Default", "ZLIB", "BZIP2", - "LZMA (7-Zip)", + "LZMA", "Best Compressor"}; WORD compressor_commands[] = {IDM_SCRIPT, IDM_ZLIB, @@ -119,6 +120,7 @@ int compressor_strings[] = {IDS_SCRIPT, #endif // Extern Variables + extern const char* NSISW_VERSION; int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmdShow); diff --git a/Contrib/Makensisw/resource.h b/Contrib/Makensisw/resource.h index 3395601f..f75a2d33 100644 --- a/Contrib/Makensisw/resource.h +++ b/Contrib/Makensisw/resource.h @@ -1,5 +1,5 @@ //{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. +// Microsoft Visual C++ generated include file. // Used by resource.rc // #define IDS_LOADSCRIPT 1 @@ -92,7 +92,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 126 #define _APS_NEXT_COMMAND_VALUE 40034 -#define _APS_NEXT_CONTROL_VALUE 1029 +#define _APS_NEXT_CONTROL_VALUE 1032 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc index 1147a151..0e8c6249 100644 --- a/Contrib/Makensisw/resource.rc +++ b/Contrib/Makensisw/resource.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -54,15 +54,15 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON ICON DISCARDABLE "..\\..\\contrib\\graphics\\icons\\modern-install-blue-full.ico" -IDI_SHELL ICON DISCARDABLE "shell.ico" +IDI_ICON ICON "..\\..\\contrib\\graphics\\icons\\modern-install-blue-full.ico" +IDI_SHELL ICON "shell.ico" ///////////////////////////////////////////////////////////////////////////// // // Menu // -IDM_MENU MENU DISCARDABLE +IDM_MENU MENU BEGIN POPUP "&File" BEGIN @@ -78,16 +78,16 @@ BEGIN MENUITEM "&Copy\tCtrl+C", IDM_COPYSELECTED MENUITEM "Copy &All", IDM_COPY MENUITEM SEPARATOR - MENUITEM "Find...\tCtrl+F", IDM_FIND + MENUITEM "&Find...\tCtrl+F", IDM_FIND MENUITEM SEPARATOR MENUITEM "&Select All\tCtrl+A", IDM_SELECTALL END - POPUP "&Tools" + POPUP "&Script" BEGIN - MENUITEM "&Settings..\tCtrl+S", IDM_SETTINGS MENUITEM "&Recompile\tCtrl+R", IDM_RECOMPILE MENUITEM "Test &Installer\tCtrl+T", IDM_TEST MENUITEM "Reco&mpile and Test\tCtrl+M", IDM_RECOMPILE_TEST + MENUITEM SEPARATOR POPUP "Set &Compressor" BEGIN MENUITEM "&Defined in Script/Compiler Default", IDM_SCRIPT @@ -96,18 +96,24 @@ BEGIN MENUITEM "&LZMA", IDM_LZMA MENUITEM "&Best Compressor", IDM_BEST END - MENUITEM "Edit Script\tCtrl+E", IDM_EDITSCRIPT - MENUITEM "Browse Script\tCtrl+B", IDM_BROWSESCR + MENUITEM SEPARATOR + MENUITEM "&Edit Script\tCtrl+E", IDM_EDITSCRIPT + MENUITEM "Open Script &Folder\tCtrl+B", IDM_BROWSESCR + END + POPUP "&Tools" + BEGIN + MENUITEM "&Settings..\tCtrl+S", IDM_SETTINGS + MENUITEM SEPARATOR MENUITEM "Clear &Log Window\tCtrl+W", IDM_CLEARLOG MENUITEM "Clear Recent &Files List", IDM_CLEAR_MRU_LIST END POPUP "&Help" BEGIN - MENUITEM "NSIS Homepage", IDM_NSISHOME - MENUITEM "NSIS Forum", IDM_FORUM - MENUITEM "NSIS Update", IDM_NSISUPDATE + MENUITEM "NSIS Users &Manual\tF1", IDM_DOCS MENUITEM SEPARATOR - MENUITEM "Documentation\tF1", IDM_DOCS + MENUITEM "NSIS &Homepage", IDM_NSISHOME + MENUITEM "NSIS &Forum", IDM_FORUM + MENUITEM "NSIS &Update", IDM_NSISUPDATE MENUITEM SEPARATOR MENUITEM "&About MakeNSISW", IDM_ABOUT END @@ -119,7 +125,7 @@ END // Accelerator // -IDK_ACCEL ACCELERATORS PRELOAD MOVEABLE PURE +IDK_ACCEL ACCELERATORS BEGIN "A", IDM_SELECTALL, VIRTKEY, CONTROL, NOINVERT "B", IDM_BROWSESCR, VIRTKEY, CONTROL, NOINVERT @@ -142,17 +148,17 @@ END // Dialog // -DLG_MAIN DIALOG DISCARDABLE 0, 0, 362, 246 -STYLE DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | - WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | - WS_THICKFRAME +DLG_MAIN DIALOG 0, 0, 362, 246 +STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "MakeNSIS" MENU IDM_MENU FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_LOGWIN,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL | - ES_NOHIDESEL | ES_READONLY | ES_NUMBER | WS_BORDER | - WS_VSCROLL,7,22,345,186 + CONTROL "",IDC_LOGWIN,"RICHEDIT",TCS_HOTTRACK | TCS_BUTTONS | + TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | TCS_MULTISELECT | + WS_BORDER | WS_VSCROLL,7,22,345,186 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1 LTEXT "",IDC_VERSION,7,230,200,12,WS_DISABLED DEFPUSHBUTTON "Clo&se",IDC_CLOSE,296,226,49,15 @@ -160,72 +166,74 @@ BEGIN END DLG_ABOUT DIALOGEX 0, 0, 233, 126 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | - WS_CAPTION +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | + WS_CAPTION | WS_SYSMENU CAPTION "About MakeNSISW" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "Clo&se",IDOK,180,104,43,15 + DEFPUSHBUTTON "OK",IDOK,174,104,49,15 + CONTROL 115,IDC_STATIC,"Static",SS_BITMAP,0,0,20,20 LTEXT "MakeNSISW",IDC_ABOUTVERSION,14,31,219,8 LTEXT "Copyright",IDC_ABOUTCOPY,14,43,220,8 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,15,97,208,1 LTEXT "Other Contributors:",IDC_ABOUTPORTIONS,14,56,220,10 - LTEXT "NSIS",IDC_NSISVER,15,107,135,8,WS_DISABLED LTEXT "",IDC_OTHERCONTRIB,27,68,206,22 - CONTROL 115,IDC_STATIC,"Static",SS_BITMAP,0,0,20,20 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,15,97,208,1 + LTEXT "NSIS",IDC_NSISVER,15,107,135,8,WS_DISABLED END -DLG_SETTINGS DIALOGEX 0, 0, 284, 214 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +DLG_SETTINGS DIALOGEX 0, 0, 292, 215 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU CAPTION "MakeNSISW Settings" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,177,193,48,14 - PUSHBUTTON "&Cancel",IDCANCEL,228,193,48,14 - EDITTEXT IDC_SYMBOL,13,117,74,12,ES_AUTOHSCROLL,WS_EX_CLIENTEDGE - EDITTEXT IDC_VALUE,13,143,74,12,ES_AUTOHSCROLL,WS_EX_CLIENTEDGE - PUSHBUTTON "Update >>",IDRIGHT,98,121,49,12 - PUSHBUTTON "Edit <<",IDLEFT,98,137,49,12 - LTEXT "Symbol",IDC_STATIC,13,108,24,8 - LTEXT "Value (optional)",IDC_STATIC,13,134,50,8 - LISTBOX IDC_SYMBOLS,154,98,121,79,LBS_NOINTEGRALHEIGHT | + DEFPUSHBUTTON "OK",IDOK,180,192,48,14 + PUSHBUTTON "Cancel",IDCANCEL,234,192,48,14 + GROUPBOX "Compressor Setting",IDC_STATIC,6,6,282,41 + LTEXT "Compressor:",IDC_STATIC,18,25,41,8 + COMBOBOX IDC_COMPRESSOR,72,24,204,94,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + GROUPBOX "Symbol Definitions",IDC_STATIC,6,54,282,132 + LTEXT "Symbol &Name",IDC_STATIC,18,84,44,8 + EDITTEXT IDC_SYMBOL,18,96,68,12,ES_AUTOHSCROLL,WS_EX_CLIENTEDGE + LTEXT "&Value (optional)",IDC_STATIC,18,120,50,8 + EDITTEXT IDC_VALUE,18,132,66,12,ES_AUTOHSCROLL,WS_EX_CLIENTEDGE + PUSHBUTTON "&Update >>",IDRIGHT,96,84,49,14 + PUSHBUTTON "&Edit <<",IDLEFT,96,108,49,14 + PUSHBUTTON "&Delete",IDDEL,96,132,49,14 + LTEXT "Symbol List",IDC_STATIC,156,66,118,9 + LISTBOX IDC_SYMBOLS,156,78,121,79,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_CLIENTEDGE - GROUPBOX "Symbol Definitions",IDC_STATIC,7,58,270,121 - LTEXT "Symbol List",IDC_STATIC,154,86,118,9 - GROUPBOX "Compressor Setting",IDC_STATIC,7,7,270,41 - LTEXT "Compressor:",IDC_STATIC,11,27,41,11 - COMBOBOX IDC_COMPRESSOR,55,26,184,94,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Delete",IDDEL,98,153,49,12 - PUSHBUTTON "&Load",IDLOAD,178,63,48,14 - PUSHBUTTON "&Save",IDSAVE,228,63,48,14 - PUSHBUTTON "Clea&r",IDCLEAR,128,63,48,14 + PUSHBUTTON "&Clear",IDCLEAR,156,162,36,14 + PUSHBUTTON "&Load",IDLOAD,198,162,36,14 + PUSHBUTTON "&Save",IDSAVE,240,162,36,14 END -DLG_COMPRESSOR DIALOG DISCARDABLE 0, 0, 250, 47 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +DLG_COMPRESSOR DIALOGEX 0, 0, 250, 53 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU CAPTION "Choose Compressor" -FONT 8, "MS Sans Serif" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "OK",IDOK,145,26,48,14 - PUSHBUTTON "Cancel",IDCANCEL,195,26,48,14 - LTEXT "Compressor:",IDC_STATIC,11,8,43,11 - COMBOBOX IDC_COMPRESSOR,55,7,184,94,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,138,30,48,14 + PUSHBUTTON "Cancel",IDCANCEL,192,30,48,14 + LTEXT "Compressor:",IDC_STATIC,6,14,43,8 + COMBOBOX IDC_COMPRESSOR,54,12,184,94,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP END -DLG_SYMBOLSET DIALOG DISCARDABLE 0, 0, 186, 124 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Dialog" -FONT 8, "MS Sans Serif" +DLG_SYMBOLSET DIALOGEX 0, 0, 190, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "OK",IDOK,76,103,50,14 - PUSHBUTTON "Cancel",IDCANCEL,129,103,50,14 - COMBOBOX IDC_NAMES,7,17,172,80,CBS_SIMPLE | CBS_AUTOHSCROLL | + DEFPUSHBUTTON "OK",IDOK,78,102,50,14 + PUSHBUTTON "Cancel",IDCANCEL,132,102,50,14 + LTEXT "Symbol Definitions Set Name:",IDC_STATIC,6,6,101,10 + COMBOBOX IDC_NAMES,6,17,174,85,CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Symbol Definitions Set Name:",IDC_STATIC,7,7,101,10 - PUSHBUTTON "&Delete",IDDEL,23,103,50,14 + PUSHBUTTON "&Delete",IDDEL,6,102,50,14 END @@ -235,7 +243,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO BEGIN DLG_MAIN, DIALOG BEGIN @@ -251,9 +259,9 @@ BEGIN DLG_SETTINGS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 277 + RIGHTMARGIN, 285 TOPMARGIN, 7 - BOTTOMMARGIN, 207 + BOTTOMMARGIN, 208 END DLG_COMPRESSOR, DIALOG @@ -261,15 +269,15 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 243 TOPMARGIN, 7 - BOTTOMMARGIN, 40 + BOTTOMMARGIN, 46 END DLG_SYMBOLSET, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 179 + RIGHTMARGIN, 183 TOPMARGIN, 7 - BOTTOMMARGIN, 117 + BOTTOMMARGIN, 118 END END #endif // APSTUDIO_INVOKED @@ -277,25 +285,25 @@ END ///////////////////////////////////////////////////////////////////////////// // -// 24 +// RT_MANIFEST // -1 24 MOVEABLE PURE "makensisw.xml" +1 RT_MANIFEST "makensisw.xml" ///////////////////////////////////////////////////////////////////////////// // // Bitmap // -IDB_LOGO BITMAP DISCARDABLE "logo.bmp" -IDB_TOOLBAR BITMAP DISCARDABLE "toolbar.bmp" +IDB_LOGO BITMAP "logo.bmp" +IDB_TOOLBAR BITMAP "toolbar.bmp" ///////////////////////////////////////////////////////////////////////////// // // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_LOADSCRIPT "Load Script..." IDS_SAVE "Save Output..." @@ -307,13 +315,13 @@ BEGIN IDS_COMPRESSOR "Set Compressor" IDS_TEST "Test Installer" IDS_EDITSCRIPT "Edit Script" - IDS_BROWSESCR "Browse Script" + IDS_BROWSESCR "Open Script Folder" IDS_CLEARLOG "Clear Log Window" IDS_NSISHOME "NSIS Homepage" IDS_FORUM "NSIS Forum" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_NSISUPDATE "NSIS Update" IDS_DOCS "Documentation" diff --git a/Contrib/Makensisw/toolbar.bmp b/Contrib/Makensisw/toolbar.bmp index e8a13723..5b3c990b 100644 Binary files a/Contrib/Makensisw/toolbar.bmp and b/Contrib/Makensisw/toolbar.bmp differ diff --git a/Contrib/Makensisw/toolbar.cpp b/Contrib/Makensisw/toolbar.cpp index 3daecc70..11bde4da 100644 --- a/Contrib/Makensisw/toolbar.cpp +++ b/Contrib/Makensisw/toolbar.cpp @@ -1,5 +1,6 @@ /* Copyright (c) 2003 Sunil Kamath + Modified by Joost Verburg This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,42 +49,42 @@ void CreateToolBar() static TBBUTTON tbButton[BUTTONCOUNT]; tbButton[TBB_LOADSCRIPT] = CreateToolBarButton(IDB_LOADSCRIPT, IDM_LOADSCRIPT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_SAVE] = CreateToolBarButton(IDB_SAVE, IDM_SAVE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_EXIT] = CreateToolBarButton(IDB_EXIT, IDM_EXIT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_SEP1] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); tbButton[TBB_COPY] = CreateToolBarButton(IDB_COPY, IDM_COPY, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_FIND] = CreateToolBarButton(IDB_FIND, IDM_FIND, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_SEP2] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); - tbButton[TBB_SETTINGS] = CreateToolBarButton(IDB_SETTINGS, IDM_SETTINGS, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_RECOMPILE] = CreateToolBarButton(IDB_RECOMPILE, IDM_RECOMPILE, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_COMPRESSOR] = CreateToolBarButton(IDB_COMPRESSOR, IDM_COMPRESSOR, TBSTATE_ENABLED, TBSTYLE_DROPDOWN, 0, 0); tbButton[TBB_TEST] = CreateToolBarButton(IDB_TEST, IDM_TEST, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); - // Added by Darren Owen (DrO) on 1/10/2003 - tbButton[TBB_RECOMPILE_TEST] = CreateToolBarButton(IDB_RECOMPILE_TEST, IDM_RECOMPILE_TEST, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_EDITSCRIPT] = CreateToolBarButton(IDB_EDITSCRIPT, IDM_EDITSCRIPT, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_BROWSESCR] = CreateToolBarButton(IDB_BROWSESCR, IDM_BROWSESCR, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_CLEARLOG] = CreateToolBarButton(IDB_CLEARLOG, IDM_CLEARLOG, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); tbButton[TBB_SEP3] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); tbButton[TBB_NSISHOME] = CreateToolBarButton(IDB_NSISHOME, IDM_NSISHOME, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_FORUM] = CreateToolBarButton(IDB_FORUM, IDM_FORUM, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_NSISUPDATE] = CreateToolBarButton(IDB_NSISUPDATE, IDM_NSISUPDATE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_SEP4] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); tbButton[TBB_DOCS] = CreateToolBarButton(IDB_DOCS, IDM_DOCS, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - g_toolbar.hwnd = CreateToolbarEx(g_sdata.hwnd, - WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT | TBSTYLE_FLAT, - TOOLBAR_ID, - NUMIMAGES, - g_sdata.hInstance, - IDB_TOOLBAR, - tbButton, - BUTTONCOUNT, - BUTTONWIDTH, - BUTTONHEIGHT, - IMAGEWIDTH, - IMAGEHEIGHT, - sizeof(TBBUTTON)); + g_toolbar.hwnd = CreateWindowEx ( + 0L, + TOOLBARCLASSNAME, + "", + WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT | TBSTYLE_FLAT, + 0, 0, 0, 30, + g_sdata.hwnd, + (HMENU) TOOLBAR_ID, + g_sdata.hInstance, + NULL ); + + TBADDBITMAP tbBitmap; + + tbBitmap.hInst = g_sdata.hInstance; + tbBitmap.nID = IDB_TOOLBAR; + + SendMessage(g_toolbar.hwnd, TB_BUTTONSTRUCTSIZE, sizeof(tbButton[0]), 0); + SendMessage(g_toolbar.hwnd, TB_ADDBITMAP, IMAGECOUNT, (LONG) &tbBitmap); + SendMessage(g_toolbar.hwnd, TB_ADDBUTTONS, BUTTONCOUNT, (LONG) &tbButton); SendMessage(g_toolbar.hwnd, TB_SETEXTENDEDSTYLE, 0, (LPARAM) (DWORD) TBSTYLE_EX_DRAWDDARROWS); - HMENU toolmenu = GetSubMenu(g_sdata.menu, TOOLS_MENU_INDEX); + + HMENU toolmenu = GetSubMenu(g_sdata.menu, SCRIPT_MENU_INDEX); g_toolbar.dropdownmenu = GetSubMenu(toolmenu, COMPRESSOR_MENU_INDEX); RECT rect; SendMessage(g_toolbar.hwnd, TB_GETITEMRECT, TBB_COMPRESSOR, (LPARAM) (LPRECT) &rect); @@ -167,21 +168,15 @@ void AddToolBarTooltips() { AddToolBarButtonTooltip(TBB_LOADSCRIPT, IDS_LOADSCRIPT); AddToolBarButtonTooltip(TBB_SAVE, IDS_SAVE); - AddToolBarButtonTooltip(TBB_EXIT, IDS_EXIT); AddToolBarButtonTooltip(TBB_COPY, IDS_COPY); AddToolBarButtonTooltip(TBB_FIND, IDS_FIND); - AddToolBarButtonTooltip(TBB_SETTINGS, IDS_SETTINGS); AddToolBarButtonTooltip(TBB_RECOMPILE, IDS_RECOMPILE); AddToolBarButtonTooltip(TBB_COMPRESSOR, IDS_COMPRESSOR); AddToolBarButtonTooltip(TBB_TEST, IDS_TEST); - // Added by Darren Owen (DrO) on 1/10/2003 - AddToolBarButtonTooltip(TBB_RECOMPILE_TEST, IDS_RECOMPILE_TEST); AddToolBarButtonTooltip(TBB_EDITSCRIPT, IDS_EDITSCRIPT); AddToolBarButtonTooltip(TBB_BROWSESCR, IDS_BROWSESCR); AddToolBarButtonTooltip(TBB_CLEARLOG, IDS_CLEARLOG); AddToolBarButtonTooltip(TBB_NSISHOME, IDS_NSISHOME); - AddToolBarButtonTooltip(TBB_FORUM, IDS_FORUM); - AddToolBarButtonTooltip(TBB_NSISUPDATE, IDS_NSISUPDATE); AddToolBarButtonTooltip(TBB_DOCS, IDS_DOCS); } diff --git a/Contrib/Makensisw/toolbar.h b/Contrib/Makensisw/toolbar.h index 1bc8fb25..77a0464b 100644 --- a/Contrib/Makensisw/toolbar.h +++ b/Contrib/Makensisw/toolbar.h @@ -1,5 +1,6 @@ /* Copyright (c) 2003 Sunil Kamath + Modified by Joost Verburg This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -24,61 +25,42 @@ #define TOOLBAR_ID 10001 -#define NUMIMAGES 22 -#define IMAGEWIDTH 16 -#define IMAGEHEIGHT 16 -#define BUTTONWIDTH 0 -#define BUTTONHEIGHT 0 - -// Altered by Darren Owen (DrO) on 1/10/2003 -#define BUTTONCOUNT 21 // was 20 +#define IMAGECOUNT 16 +#define BUTTONCOUNT 15 #define TBB_LOADSCRIPT 0 #define TBB_SAVE 1 -#define TBB_EXIT 2 -#define TBB_SEP1 3 -#define TBB_COPY 4 -#define TBB_FIND 5 -#define TBB_SEP2 6 -#define TBB_SETTINGS 7 -#define TBB_RECOMPILE 8 -#define TBB_TEST 9 -// Added by Darren Owen (DrO) on 1/10/2003 and altered following ids -#define TBB_RECOMPILE_TEST 10 -#define TBB_COMPRESSOR 11 -#define TBB_EDITSCRIPT 12 -#define TBB_BROWSESCR 13 -#define TBB_CLEARLOG 14 -#define TBB_SEP3 15 -#define TBB_NSISHOME 16 -#define TBB_FORUM 17 -#define TBB_NSISUPDATE 18 -#define TBB_SEP4 19 -#define TBB_DOCS 20 +#define TBB_SEP1 2 +#define TBB_COPY 3 +#define TBB_FIND 4 +#define TBB_SEP2 5 +#define TBB_RECOMPILE 6 +#define TBB_TEST 7 +#define TBB_COMPRESSOR 8 +#define TBB_EDITSCRIPT 9 +#define TBB_BROWSESCR 10 +#define TBB_CLEARLOG 11 +#define TBB_SEP3 12 +#define TBB_NSISHOME 13 +#define TBB_DOCS 14 #define IDB_LOADSCRIPT 0 #define IDB_SAVE 1 -#define IDB_EXIT 2 -#define IDB_COPY 3 -#define IDB_FIND 4 -#define IDB_RECOMPILE 5 -#define IDB_SETTINGS 6 -#define IDB_COMPRESSOR 7 -#define IDB_COMPRESSOR_SCRIPT 7 -#define IDB_TEST 8 -#define IDB_EDITSCRIPT 9 -#define IDB_BROWSESCR 10 -#define IDB_CLEARLOG 11 -#define IDB_NSISHOME 12 -#define IDB_FORUM 14 -#define IDB_NSISUPDATE 15 -#define IDB_DOCS 16 -#define IDB_COMPRESSOR_BZIP2 17 -#define IDB_COMPRESSOR_ZLIB 18 -// Added by Darren Owen (DrO) on 1/10/2003 -#define IDB_RECOMPILE_TEST 19 -#define IDB_COMPRESSOR_BEST 20 -#define IDB_COMPRESSOR_LZMA 21 +#define IDB_COPY 2 +#define IDB_FIND 3 +#define IDB_RECOMPILE 4 +#define IDB_TEST 5 +#define IDB_EDITSCRIPT 6 +#define IDB_BROWSESCR 7 +#define IDB_CLEARLOG 8 +#define IDB_NSISHOME 9 +#define IDB_DOCS 10 +#define IDB_COMPRESSOR 11 +#define IDB_COMPRESSOR_SCRIPT 11 +#define IDB_COMPRESSOR_BZIP2 12 +#define IDB_COMPRESSOR_ZLIB 13 +#define IDB_COMPRESSOR_BEST 14 +#define IDB_COMPRESSOR_LZMA 15 typedef struct ToolBarStruct { HWND hwnd; diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp index 1eec989c..b63fbb7b 100644 --- a/Contrib/Makensisw/utils.cpp +++ b/Contrib/Makensisw/utils.cpp @@ -1,6 +1,6 @@ /* Copyright (c) 2002 Robert Rainwater - Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, and Sunil Kamath + Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, Sunil Kamath, Joost Verburg This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/Contrib/Makensisw/version.cpp b/Contrib/Makensisw/version.cpp index 3a069784..6e5bfbfa 100644 --- a/Contrib/Makensisw/version.cpp +++ b/Contrib/Makensisw/version.cpp @@ -23,7 +23,7 @@ #define STR(x) REALSTR(x) #ifdef RELEASE -const char *NSISW_VERSION = "MakeNSISW " STR(RELEASE); +const char *NSISW_VERSION = "MakeNSISW " STR(RELEASE) " (NSIS Compiler Interface)"; #else const char *NSISW_VERSION = "MakeNSISW " __DATE__; #endif \ No newline at end of file