dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3224 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
icemank 2003-11-28 05:16:05 +00:00
parent b5a430dfa6
commit 69e2d02cc7
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Makensisw/makensisw.cpp
View file

@ -843,8 +843,8 @@ BOOL CALLBACK SettingsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
else { else {
g_sdata.default_compressor = COMPRESSOR_SCRIPT; g_sdata.default_compressor = COMPRESSOR_SCRIPT;
} }
EndDialog(hwndDlg, TRUE); EndDialog(hwndDlg, TRUE);
SetCompressor(g_sdata.default_compressor);
} }
break; break;
case IDCANCEL: case IDCANCEL:

2
Contrib/Makensisw/makensisw.h
View file

@ -85,7 +85,7 @@ char *compressor_names[] = {"",
"bzip2", "bzip2",
"lzma", "lzma",
"Best"}; "Best"};
char *compressor_display_names[] = {"Defined in Script/MakeNSIS Default", char *compressor_display_names[] = {"Defined in Script/Compiler Default",
"ZLIB", "ZLIB",
"BZIP2", "BZIP2",
"LZMA (7-Zip)", "LZMA (7-Zip)",

48
Contrib/Makensisw/resource.rc
View file

@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE // TEXTINCLUDE
// //
1 TEXTINCLUDE DISCARDABLE 1 TEXTINCLUDE DISCARDABLE
BEGIN BEGIN
"resource.h\0" "resource.h\0"
END END
2 TEXTINCLUDE DISCARDABLE 2 TEXTINCLUDE DISCARDABLE
BEGIN BEGIN
"#include ""afxres.h""\r\n" "#include ""afxres.h""\r\n"
"\0" "\0"
END END
3 TEXTINCLUDE DISCARDABLE 3 TEXTINCLUDE DISCARDABLE
BEGIN BEGIN
"\r\n" "\r\n"
"\0" "\0"
@ -62,7 +62,7 @@ IDI_SHELL ICON DISCARDABLE "shell.ico"
// Menu // Menu
// //
IDM_MENU MENU DISCARDABLE IDM_MENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&File" POPUP "&File"
BEGIN BEGIN
@ -90,7 +90,7 @@ BEGIN
MENUITEM "Reco&mpile and Test\tCtrl+M", IDM_RECOMPILE_TEST MENUITEM "Reco&mpile and Test\tCtrl+M", IDM_RECOMPILE_TEST
POPUP "Set &Compressor" POPUP "Set &Compressor"
BEGIN BEGIN
MENUITEM "&Set in Script/MakeNSIS Default", IDM_SCRIPT MENUITEM "&Defined in Script/Compiler Default", IDM_SCRIPT
MENUITEM "&ZLIB", IDM_ZLIB MENUITEM "&ZLIB", IDM_ZLIB
MENUITEM "BZI&P2", IDM_BZIP2 MENUITEM "BZI&P2", IDM_BZIP2
MENUITEM "&LZMA", IDM_LZMA MENUITEM "&LZMA", IDM_LZMA
@ -119,7 +119,7 @@ END
// Accelerator // Accelerator
// //
IDK_ACCEL ACCELERATORS PRELOAD MOVEABLE PURE IDK_ACCEL ACCELERATORS PRELOAD MOVEABLE PURE
BEGIN BEGIN
"A", IDM_SELECTALL, VIRTKEY, CONTROL, NOINVERT "A", IDM_SELECTALL, VIRTKEY, CONTROL, NOINVERT
"B", IDM_BROWSESCR, VIRTKEY, CONTROL, NOINVERT "B", IDM_BROWSESCR, VIRTKEY, CONTROL, NOINVERT
@ -143,15 +143,15 @@ END
// //
DLG_MAIN DIALOG DISCARDABLE 0, 0, 362, 246 DLG_MAIN DIALOG DISCARDABLE 0, 0, 362, 246
STYLE DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | STYLE DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX |
WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME WS_THICKFRAME
CAPTION "MakeNSIS" CAPTION "MakeNSIS"
MENU IDM_MENU MENU IDM_MENU
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
CONTROL "",IDC_LOGWIN,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL | CONTROL "",IDC_LOGWIN,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL |
ES_NOHIDESEL | ES_READONLY | ES_NUMBER | WS_BORDER | ES_NOHIDESEL | ES_READONLY | ES_NUMBER | WS_BORDER |
WS_VSCROLL,7,22,345,186 WS_VSCROLL,7,22,345,186
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1
LTEXT "",IDC_VERSION,7,230,200,12,WS_DISABLED LTEXT "",IDC_VERSION,7,230,200,12,WS_DISABLED
@ -160,7 +160,7 @@ BEGIN
END END
DLG_ABOUT DIALOGEX 0, 0, 233, 126 DLG_ABOUT DIALOGEX 0, 0, 233, 126
STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
WS_CAPTION WS_CAPTION
CAPTION "About MakeNSISW" CAPTION "About MakeNSISW"
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@ -188,25 +188,25 @@ BEGIN
PUSHBUTTON "<",IDLEFT,95,117,14,14 PUSHBUTTON "<",IDLEFT,95,117,14,14
LTEXT "Symbol",IDC_STATIC,11,89,24,8 LTEXT "Symbol",IDC_STATIC,11,89,24,8
LTEXT "Value (optional)",IDC_STATIC,11,115,50,8 LTEXT "Value (optional)",IDC_STATIC,11,115,50,8
LISTBOX IDC_DEFINES,117,77,121,79,LBS_NOINTEGRALHEIGHT | LISTBOX IDC_DEFINES,117,77,121,79,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE
GROUPBOX "Symbol Definitions",IDC_STATIC,7,58,236,103 GROUPBOX "Symbol Definitions",IDC_STATIC,7,58,236,103
LTEXT "Symbol List",IDC_STATIC,117,67,118,9 LTEXT "Symbol List",IDC_STATIC,117,67,118,9
GROUPBOX "Compressor Setting",IDC_STATIC,7,7,236,41 GROUPBOX "Compressor Setting",IDC_STATIC,7,7,236,41
LTEXT "Default Compressor:",IDC_STATIC,11,27,68,11 LTEXT "Compressor:",IDC_STATIC,11,27,41,11
COMBOBOX IDC_COMPRESSOR,77,26,162,94,CBS_DROPDOWNLIST | COMBOBOX IDC_COMPRESSOR,55,26,184,94,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
END END
DLG_COMPRESSOR DIALOG DISCARDABLE 0, 0, 223, 47 DLG_COMPRESSOR DIALOG DISCARDABLE 0, 0, 250, 47
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Choose Compressor" CAPTION "Choose Compressor"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,112,27,50,14 DEFPUSHBUTTON "OK",IDOK,145,26,48,14
PUSHBUTTON "Cancel",IDCANCEL,165,27,50,14 PUSHBUTTON "Cancel",IDCANCEL,195,26,48,14
LTEXT "Compressor:",IDC_STATIC,7,8,43,11 LTEXT "Compressor:",IDC_STATIC,11,8,43,11
COMBOBOX IDC_COMPRESSOR,54,7,162,94,CBS_DROPDOWNLIST | WS_VSCROLL | COMBOBOX IDC_COMPRESSOR,55,7,184,94,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP WS_TABSTOP
END END
@ -217,7 +217,7 @@ END
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE GUIDELINES DESIGNINFO DISCARDABLE
BEGIN BEGIN
DLG_MAIN, DIALOG DLG_MAIN, DIALOG
BEGIN BEGIN
@ -241,7 +241,7 @@ BEGIN
DLG_COMPRESSOR, DIALOG DLG_COMPRESSOR, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 216 RIGHTMARGIN, 243
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 40 BOTTOMMARGIN, 40
END END
@ -269,7 +269,7 @@ IDB_TOOLBAR BITMAP DISCARDABLE "toolbar.bmp"
// String Table // String Table
// //
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_LOADSCRIPT "Load Script..." IDS_LOADSCRIPT "Load Script..."
IDS_SAVE "Save Output..." IDS_SAVE "Save Output..."
@ -287,11 +287,11 @@ BEGIN
IDS_FORUM "NSIS Forum" IDS_FORUM "NSIS Forum"
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_NSISUPDATE "NSIS Update" IDS_NSISUPDATE "NSIS Update"
IDS_DOCS "Documentation" IDS_DOCS "Documentation"
IDS_SCRIPT "Set in Script/MakeNSIS default" IDS_SCRIPT "Defined in Script/Compiler Default"
IDS_ZLIB "ZLIB" IDS_ZLIB "ZLIB"
IDS_BZIP2 "BZIP2" IDS_BZIP2 "BZIP2"
IDS_RECOMPILE_TEST "Recompile and Test" IDS_RECOMPILE_TEST "Recompile and Test"