Minor fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3224 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
b5a430dfa6
commit
69e2d02cc7
3 changed files with 26 additions and 26 deletions
|
@ -843,8 +843,8 @@ BOOL CALLBACK SettingsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||
else {
|
||||
g_sdata.default_compressor = COMPRESSOR_SCRIPT;
|
||||
}
|
||||
|
||||
EndDialog(hwndDlg, TRUE);
|
||||
SetCompressor(g_sdata.default_compressor);
|
||||
}
|
||||
break;
|
||||
case IDCANCEL:
|
||||
|
|
|
@ -85,7 +85,7 @@ char *compressor_names[] = {"",
|
|||
"bzip2",
|
||||
"lzma",
|
||||
"Best"};
|
||||
char *compressor_display_names[] = {"Defined in Script/MakeNSIS Default",
|
||||
char *compressor_display_names[] = {"Defined in Script/Compiler Default",
|
||||
"ZLIB",
|
||||
"BZIP2",
|
||||
"LZMA (7-Zip)",
|
||||
|
|
|
@ -90,7 +90,7 @@ BEGIN
|
|||
MENUITEM "Reco&mpile and Test\tCtrl+M", IDM_RECOMPILE_TEST
|
||||
POPUP "Set &Compressor"
|
||||
BEGIN
|
||||
MENUITEM "&Set in Script/MakeNSIS Default", IDM_SCRIPT
|
||||
MENUITEM "&Defined in Script/Compiler Default", IDM_SCRIPT
|
||||
MENUITEM "&ZLIB", IDM_ZLIB
|
||||
MENUITEM "BZI&P2", IDM_BZIP2
|
||||
MENUITEM "&LZMA", IDM_LZMA
|
||||
|
@ -193,20 +193,20 @@ BEGIN
|
|||
GROUPBOX "Symbol Definitions",IDC_STATIC,7,58,236,103
|
||||
LTEXT "Symbol List",IDC_STATIC,117,67,118,9
|
||||
GROUPBOX "Compressor Setting",IDC_STATIC,7,7,236,41
|
||||
LTEXT "Default Compressor:",IDC_STATIC,11,27,68,11
|
||||
COMBOBOX IDC_COMPRESSOR,77,26,162,94,CBS_DROPDOWNLIST |
|
||||
LTEXT "Compressor:",IDC_STATIC,11,27,41,11
|
||||
COMBOBOX IDC_COMPRESSOR,55,26,184,94,CBS_DROPDOWNLIST |
|
||||
WS_VSCROLL | WS_TABSTOP
|
||||
END
|
||||
|
||||
DLG_COMPRESSOR DIALOG DISCARDABLE 0, 0, 223, 47
|
||||
DLG_COMPRESSOR DIALOG DISCARDABLE 0, 0, 250, 47
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
|
||||
CAPTION "Choose Compressor"
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,112,27,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,165,27,50,14
|
||||
LTEXT "Compressor:",IDC_STATIC,7,8,43,11
|
||||
COMBOBOX IDC_COMPRESSOR,54,7,162,94,CBS_DROPDOWNLIST | WS_VSCROLL |
|
||||
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
|
||||
END
|
||||
|
||||
|
@ -241,7 +241,7 @@ BEGIN
|
|||
DLG_COMPRESSOR, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 216
|
||||
RIGHTMARGIN, 243
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 40
|
||||
END
|
||||
|
@ -291,7 +291,7 @@ STRINGTABLE DISCARDABLE
|
|||
BEGIN
|
||||
IDS_NSISUPDATE "NSIS Update"
|
||||
IDS_DOCS "Documentation"
|
||||
IDS_SCRIPT "Set in Script/MakeNSIS default"
|
||||
IDS_SCRIPT "Defined in Script/Compiler Default"
|
||||
IDS_ZLIB "ZLIB"
|
||||
IDS_BZIP2 "BZIP2"
|
||||
IDS_RECOMPILE_TEST "Recompile and Test"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue