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)",

20
Contrib/Makensisw/resource.rc
View file

@ -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
@ -193,20 +193,20 @@ BEGIN
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
@ -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
@ -291,7 +291,7 @@ 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"