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

Fixed compressor selection.

Browse source 
Added context menu method for choosing compressor.
Changed Defines dialog to Settings dialog


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3211 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
icemank 2003-11-25 21:06:37 +00:00
parent 888fcfec48
commit 3773299cb2
8 changed files with 213 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

113
Contrib/Makensisw/resource.rc
View file

@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
@ -62,7 +62,7 @@ IDI_SHELL ICON DISCARDABLE "shell.ico"
// Menu
//
IDM_MENU MENU DISCARDABLE
IDM_MENU MENU DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
@ -84,17 +84,17 @@ BEGIN
END
POPUP "&Tools"
BEGIN
MENUITEM "&Settings..\tCtrl+S", IDM_SETTINGS
MENUITEM "&Recompile\tCtrl+R", IDM_RECOMPILE
MENUITEM "&Define Symbols...\tCtrl+D", IDM_DEFINES
MENUITEM "Test &Installer\tCtrl+T", IDM_TEST
MENUITEM "Recompile and Run\tCtrl+M", IDM_RECOMPILE_TEST
POPUP "&Set Compressor"
MENUITEM "Reco&mpile and Test\tCtrl+M", IDM_RECOMPILE_TEST
POPUP "Set &Compressor"
BEGIN
MENUITEM "Defa&ult", IDM_DEFAULT
MENUITEM "&zlib", IDM_ZLIB
MENUITEM "bzi&p2", IDM_BZIP2
MENUITEM "&lzma", IDM_LZMA
MENUITEM "&Best", IDM_BEST
MENUITEM "&Set in Script/MakeNSIS Default", IDM_SCRIPT
MENUITEM "&ZLIB", IDM_ZLIB
MENUITEM "BZI&P2", IDM_BZIP2
MENUITEM "&LZMA", IDM_LZMA
MENUITEM "&Best Compressor", IDM_BEST
END
MENUITEM "Edit Script\tCtrl+E", IDM_EDITSCRIPT
MENUITEM "Browse Script\tCtrl+B", IDM_BROWSESCR
@ -119,17 +119,17 @@ END
// Accelerator
//
IDK_ACCEL ACCELERATORS PRELOAD MOVEABLE PURE
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
"D", IDM_DEFINES, VIRTKEY, CONTROL, NOINVERT
"E", IDM_EDITSCRIPT, VIRTKEY, CONTROL, NOINVERT
"F", IDM_FIND, VIRTKEY, CONTROL, NOINVERT
"L", IDM_LOADSCRIPT, VIRTKEY, CONTROL, NOINVERT
"M", IDM_RECOMPILE_TEST, VIRTKEY, CONTROL, NOINVERT
"R", IDM_RECOMPILE, VIRTKEY, CONTROL, NOINVERT
"S", IDM_SETTINGS, VIRTKEY, CONTROL, NOINVERT
"T", IDM_TEST, VIRTKEY, CONTROL, NOINVERT
VK_F1, IDM_DOCS, VIRTKEY, NOINVERT
"W", IDM_CLEARLOG, VIRTKEY, CONTROL, NOINVERT
@ -143,15 +143,15 @@ END
//
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 |
STYLE 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 |
CONTROL "",IDC_LOGWIN,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL |
ES_NOHIDESEL | ES_READONLY | ES_NUMBER | 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
@ -160,7 +160,7 @@ BEGIN
END
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
CAPTION "About MakeNSISW"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@ -175,22 +175,39 @@ BEGIN
CONTROL 115,IDC_STATIC,"Static",SS_BITMAP,0,0,20,20
END
DLG_DEFINES DIALOGEX 0, 0, 250, 127
DLG_SETTINGS DIALOGEX 0, 0, 250, 190
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Define Symbols"
FONT 8, "MS Sans Serif", 0, 0, 0x1
CAPTION "MakeNSISW Settings"
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "&OK",IDOK,145,106,48,14
PUSHBUTTON "&Cancel",IDCANCEL,195,106,48,14
EDITTEXT IDC_SYMBOL,7,37,74,12,ES_AUTOHSCROLL,WS_EX_CLIENTEDGE
EDITTEXT IDC_VALUE,7,63,74,12,ES_AUTOHSCROLL,WS_EX_CLIENTEDGE
PUSHBUTTON ">",IDRIGHT,91,41,14,14
PUSHBUTTON "<",IDLEFT,91,56,14,14
LTEXT "Symbol",IDC_STATIC,7,28,24,8
LTEXT "Value (optional)",IDC_STATIC,7,54,50,8
LISTBOX IDC_DEFINES,117,16,121,79,LBS_NOINTEGRALHEIGHT |
DEFPUSHBUTTON "&OK",IDOK,145,168,48,14
PUSHBUTTON "&Cancel",IDCANCEL,195,168,48,14
EDITTEXT IDC_SYMBOL,11,98,74,12,ES_AUTOHSCROLL,WS_EX_CLIENTEDGE
EDITTEXT IDC_VALUE,11,124,74,12,ES_AUTOHSCROLL,WS_EX_CLIENTEDGE
PUSHBUTTON ">",IDRIGHT,95,102,14,14
PUSHBUTTON "<",IDLEFT,95,117,14,14
LTEXT "Symbol",IDC_STATIC,11,89,24,8
LTEXT "Value (optional)",IDC_STATIC,11,115,50,8
LISTBOX IDC_DEFINES,117,77,121,79,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE
GROUPBOX "Defined Symbols List",IDC_STATIC,112,7,131,93
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 |
WS_VSCROLL | WS_TABSTOP
END
DLG_COMPRESSOR DIALOG DISCARDABLE 0, 0, 223, 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 |
WS_TABSTOP
END
@ -200,7 +217,7 @@ END
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
DLG_MAIN, DIALOG
BEGIN
@ -213,12 +230,20 @@ BEGIN
BOTTOMMARGIN, 121
END
DLG_DEFINES, DIALOG
DLG_SETTINGS, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 243
TOPMARGIN, 7
BOTTOMMARGIN, 120
BOTTOMMARGIN, 183
END
DLG_COMPRESSOR, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 216
TOPMARGIN, 7
BOTTOMMARGIN, 40
END
END
#endif // APSTUDIO_INVOKED
@ -244,7 +269,7 @@ IDB_TOOLBAR BITMAP DISCARDABLE "toolbar.bmp"
// String Table
//
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
BEGIN
IDS_LOADSCRIPT "Load Script..."
IDS_SAVE "Save Output..."
@ -252,7 +277,7 @@ BEGIN
IDS_COPY "Copy"
IDS_FIND "Find..."
IDS_RECOMPILE "Recompile"
IDS_DEFINES "Define Symbols..."
IDS_SETTINGS "Settings..."
IDS_COMPRESSOR "Set Compressor"
IDS_TEST "Test Installer"
IDS_EDITSCRIPT "Edit Script"
@ -262,16 +287,16 @@ BEGIN
IDS_FORUM "NSIS Forum"
END
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
BEGIN
IDS_NSISUPDATE "NSIS Update"
IDS_DOCS "Documentation"
IDS_DEFAULT "Default"
IDS_ZLIB "zlib"
IDS_BZIP2 "bzip2"
IDS_RECOMPILE_TEST "Recompile and run"
IDS_BEST "Best"
IDS_LZMA "lzma"
IDS_SCRIPT "Set in Script/MakeNSIS default"
IDS_ZLIB "ZLIB"
IDS_BZIP2 "BZIP2"
IDS_RECOMPILE_TEST "Recompile and Test"
IDS_BEST "Best Compressor"
IDS_LZMA "LZMA"
END
#endif // English (U.S.) resources