improved user interface
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3343 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg
parent
d97cc95c6c
commit
898401b262
11 changed files with 161 additions and 181 deletions
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue