From 8b94e4124e209bf9adab7b960c193967e3673b79 Mon Sep 17 00:00:00 2001
From: rainwater <rainwater@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 9 Oct 2002 17:11:01 +0000
Subject: [PATCH] Added new About dialog

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1358 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/logo.bmp      | Bin 0 -> 15510 bytes
 Contrib/Makensisw/logo.psp      |   1 +
 Contrib/Makensisw/makensisw.cpp |  41 +++++++++++++++-----------------
 Contrib/Makensisw/makensisw.dsp |   4 ++++
 Contrib/Makensisw/makensisw.h   |   1 +
 Contrib/Makensisw/resource.h    |   6 +++--
 Contrib/Makensisw/resource.rc   |  36 +++++++++++++++-------------
 Contrib/Makensisw/version.cpp   |   2 +-
 Examples/makensis.nsi           |   1 +
 9 files changed, 50 insertions(+), 42 deletions(-)
 create mode 100644 Contrib/Makensisw/logo.bmp
 create mode 100644 Contrib/Makensisw/logo.psp

diff --git a/Contrib/Makensisw/logo.bmp b/Contrib/Makensisw/logo.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..afc5d309a08e13bd9a4f9b42e8604f71aa433bd0
GIT binary patch
literal 15510
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

literal 0
HcmV?d00001

diff --git a/Contrib/Makensisw/logo.psp b/Contrib/Makensisw/logo.psp
new file mode 100644
index 00000000..3ad05dce
--- /dev/null
+++ b/Contrib/Makensisw/logo.psp
@@ -0,0 +1 @@
+Paint Shop Pro Image File
diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index e08b8d9d..7cc6b427 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -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:
diff --git a/Contrib/Makensisw/makensisw.dsp b/Contrib/Makensisw/makensisw.dsp
index 9b7ab946..e80e8a77 100644
--- a/Contrib/Makensisw/makensisw.dsp
+++ b/Contrib/Makensisw/makensisw.dsp
@@ -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
diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index fec9087c..6c90a845 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -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."
diff --git a/Contrib/Makensisw/resource.h b/Contrib/Makensisw/resource.h
index 9536ac65..53d14f52 100644
--- a/Contrib/Makensisw/resource.h
+++ b/Contrib/Makensisw/resource.h
@@ -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
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index dc73d451..b8f7b9d8 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -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
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Contrib/Makensisw/version.cpp b/Contrib/Makensisw/version.cpp
index b0cdd60b..2b614144 100644
--- a/Contrib/Makensisw/version.cpp
+++ b/Contrib/Makensisw/version.cpp
@@ -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
\ No newline at end of file
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index ce1d6ab0..9f63e5b5 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -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