Added new About dialog

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1358 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-10-09 17:11:01 +00:00
parent 72336429b6
commit 8b94e4124e
9 changed files with 50 additions and 42 deletions

BIN
Contrib/Makensisw/logo.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View file

@ -0,0 +1 @@
Paint Shop Pro Image File

View file

@ -465,13 +465,6 @@ BOOL CALLBACK DialogResize(HWND hWnd, LPARAM /* unused */)
return TRUE;
}
#define CONTRIBCOUNT 3
char * ContribUsers[] = {
"Fritz Elfert",
"Justin Frankel",
"Amir Szekely"
};
extern char *g_branding;
BOOL CALLBACK AboutProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
@ -479,32 +472,36 @@ BOOL CALLBACK AboutProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
switch(msg) {
case WM_INITDIALOG:
{
HFONT bfont = CreateFont(14,0,0,0,FW_BOLD,FALSE,FALSE,FALSE,DEFAULT_CHARSET,
HFONT bfont = CreateFont(13,0,0,0,FW_NORMAL,FALSE,FALSE,FALSE,DEFAULT_CHARSET,
OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
FIXED_PITCH|FF_DONTCARE, "MS Shell Dlg");
FIXED_PITCH|FF_DONTCARE, "Tahoma");
HFONT bfontb = CreateFont(13,0,0,0,FW_BOLD,FALSE,FALSE,FALSE,DEFAULT_CHARSET,
OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
FIXED_PITCH|FF_DONTCARE, "Tahoma");
HFONT rfont = CreateFont(12,0,0,0,FW_NORMAL,FALSE,FALSE,FALSE,DEFAULT_CHARSET,
OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
FIXED_PITCH|FF_DONTCARE, "MS Shell Dlg");
HFONT sfont = CreateFont(11,0,0,0,FW_NORMAL,FALSE,FALSE,FALSE,DEFAULT_CHARSET,
HFONT rfontb = CreateFont(12,0,0,0,FW_BOLD,FALSE,FALSE,FALSE,DEFAULT_CHARSET,
OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
FIXED_PITCH|FF_DONTCARE, "MS Shell Dlg");
if (bfont) SendDlgItemMessage(hwndDlg, IDC_ABOUTVERSION, WM_SETFONT, (WPARAM)bfont, FALSE);
if (rfont) {
if (bfont&&bfontb) {
SendDlgItemMessage(hwndDlg, IDC_ABOUTVERSION, WM_SETFONT, (WPARAM)bfontb, FALSE);
SendDlgItemMessage(hwndDlg, IDC_ABOUTCOPY, WM_SETFONT, (WPARAM)bfont, FALSE);
SendDlgItemMessage(hwndDlg, IDC_ABOUTPORTIONS, WM_SETFONT, (WPARAM)bfont, FALSE);
SendDlgItemMessage(hwndDlg, IDC_NSISVER, WM_SETFONT, (WPARAM)bfont, FALSE);
SendDlgItemMessage(hwndDlg, IDC_OTHERCONTRIB, WM_SETFONT, (WPARAM)bfont, FALSE);
}
else if (rfont&&rfontb) {
SendDlgItemMessage(hwndDlg, IDC_ABOUTVERSION, WM_SETFONT, (WPARAM)rfontb, FALSE);
SendDlgItemMessage(hwndDlg, IDC_ABOUTCOPY, WM_SETFONT, (WPARAM)rfont, FALSE);
SendDlgItemMessage(hwndDlg, IDC_ABOUTPORTIONS, WM_SETFONT, (WPARAM)rfont, FALSE);
}
if (sfont) SendDlgItemMessage(hwndDlg, IDC_NSISVER, WM_SETFONT, (WPARAM)rfont, FALSE);
SendDlgItemMessage(hwndDlg, IDC_NSISVER, WM_SETFONT, (WPARAM)rfont, FALSE);
SendDlgItemMessage(hwndDlg, IDC_OTHERCONTRIB, WM_SETFONT, (WPARAM)rfont, FALSE);
}
SetDlgItemText(hwndDlg,IDC_NSISVER,g_branding);
SetDlgItemText(hwndDlg,IDC_ABOUTVERSION,NSISW_VERSION);
SetDlgItemText(hwndDlg,IDC_ABOUTCOPY,COPYRIGHT);
HWND ilist = GetDlgItem(hwndDlg,IDC_CONTRIB);
int i;
if (ilist) {
for (i = 0; i < CONTRIBCOUNT; i++) {
SendMessage(ilist, LB_ADDSTRING, 0, (LPARAM) ContribUsers[i]);
SendMessage(ilist, LB_SETITEMDATA, i, (LPARAM) i);
}
}
SetDlgItemText(hwndDlg,IDC_OTHERCONTRIB,CONTRIB);
break;
}
case WM_CTLCOLORDLG:

View file

@ -149,6 +149,10 @@ SOURCE=..\Icons\lama3.ico
# End Source File
# Begin Source File
SOURCE=.\logo.bmp
# End Source File
# Begin Source File
SOURCE=..\Icons\new_nsis.ico
# End Source File
# Begin Source File

View file

@ -33,6 +33,7 @@
#define NSIS_URL "http://nsis.sourceforge.net/"
#define USAGE "Usage:\r\n\r\n - File | Load Script...\r\n - Drag the .nsi file into this window\r\n - Right click the .nsi file and choose \"Compile NSI\""
#define COPYRIGHT "Copyright © 2002 Robert Rainwater"
#define CONTRIB "Fritz Elfert, Justin Frankel, Amir Szekely"
#define DOCPATH "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/nsis/NSIS/docs/index.html?rev=HEAD"
#define LOCALDOCS "\\docs\\index.html"
#define NSISERROR "Unable to intialize MakeNSIS. Please verify that makensis.exe is in the same directory as makensisw.exe."

View file

@ -8,6 +8,7 @@
#define IDM_MENU 104
#define IDK_ACCEL 105
#define IDI_SHELL 112
#define IDB_LOGO 115
#define IDC_LOGWIN 402
#define IDC_VERSION 405
#define IDC_CLOSE 406
@ -24,6 +25,7 @@
#define IDC_ABOUTPORTIONS 1005
#define IDC_CONTRIB 1009
#define IDC_NSISVER 1010
#define IDC_OTHERCONTRIB 1016
#define IDM_TEST 40002
#define IDM_EDITSCRIPT 40003
#define IDM_DOCS 40004
@ -37,9 +39,9 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 115
#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 40014
#define _APS_NEXT_CONTROL_VALUE 1016
#define _APS_NEXT_CONTROL_VALUE 1017
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View file

@ -85,7 +85,7 @@ BEGIN
MENUITEM "&Recompile\tCtrl+R", IDM_RECOMPILE
MENUITEM "&Test Installer\tCtrl+T", IDM_TEST
MENUITEM "Edit Script\tCtrl+E", IDM_EDITSCRIPT
MENUITEM "Browse Script\tCtrl+B", IDM_BROWSESCR
MENUITEM "Browse Script\tCtrl+B", IDM_BROWSESCR
MENUITEM SEPARATOR
MENUITEM "Clear &Log Window\tCtrl+W", IDM_CLEARLOG
END
@ -141,21 +141,19 @@ BEGIN
PUSHBUTTON "&Test Installer",IDC_TEST,230,208,60,15,WS_DISABLED
END
DLG_ABOUT DIALOGEX 0, 0, 235, 108
DLG_ABOUT DIALOG DISCARDABLE 0, 0, 233, 126
STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION
CAPTION "About MakeNSISW"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_ICON,IDC_STATIC,7,4,21,20
DEFPUSHBUTTON "Clo&se",IDOK,185,86,43,15
LTEXT "MakeNSISW",IDC_ABOUTVERSION,40,4,184,8
LTEXT "Copyright",IDC_ABOUTCOPY,40,21,184,8
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,40,80,189,1
LTEXT "Other Contributors:",IDC_ABOUTPORTIONS,40,32,184,10
LISTBOX IDC_CONTRIB,45,42,179,33,LBS_SORT | LBS_NOINTEGRALHEIGHT |
LBS_NOSEL | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,
WS_EX_TRANSPARENT
LTEXT "NSIS",IDC_NSISVER,44,89,135,8,WS_DISABLED
DEFPUSHBUTTON "Clo&se",IDOK,180,104,43,15
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
END
@ -169,10 +167,7 @@ GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
DLG_ABOUT, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 228
TOPMARGIN, 4
BOTTOMMARGIN, 103
BOTTOMMARGIN, 121
END
END
#endif // APSTUDIO_INVOKED
@ -184,6 +179,13 @@ END
//
1 24 MOVEABLE PURE "makensisw.xml"
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
IDB_LOGO BITMAP DISCARDABLE "logo.bmp"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

View file

@ -23,7 +23,7 @@
#define STR(x) REALSTR(x)
#ifdef RELEASE
const char *NSISW_VERSION = "MakeNSISW " STR(RELEASE);
const char *NSISW_VERSION = "MakeNSISW Version " STR(RELEASE);
#else
const char *NSISW_VERSION = "MakeNSISW Build: " __DATE__;
#endif

View file

@ -293,6 +293,7 @@ Section "MakeNSISW Source" SecSrcMNW
File ..\contrib\makensisw\*.ds?
File ..\contrib\makensisw\*.rc
File ..\contrib\makensisw\*.txt
File ..\contrib\makensisw\*.bmp
#File ..\contrib\makensisw\Makefile
SectionEnd