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

Reduce confusion by hiding MakeNSISW version.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7030 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-10-30 23:22:00 +00:00
parent 81a5f785c7
commit 1293da6d1e
5 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Contrib/Makensisw/Readme.txt
View file

@ -199,6 +199,9 @@ Version History
- Update check switched from JNetLib to WinInet - Update check switched from JNetLib to WinInet
- New file type icons - New file type icons
2.3.4
- Added Window Info/Spy feature
Copyright Information Copyright Information
--------------------- ---------------------

2
Contrib/Makensisw/SConscript
View file

@ -51,7 +51,7 @@ BuildUtil(
res = res, res = res,
resources = resources, resources = resources,
entry = None, entry = None,
defines = ['RELEASE=2.3.3'], defines = ['RELEASE=2.3.4'],
docs = docs, docs = docs,
root_util = True root_util = True
) )

12
Contrib/Makensisw/makensisw.cpp
View file

@ -851,13 +851,14 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
SendDlgItemMessage(hwndDlg, IDC_ABOUTPORTIONS, WM_SETFONT, (WPARAM)fontnorm, FALSE); SendDlgItemMessage(hwndDlg, IDC_ABOUTPORTIONS, WM_SETFONT, (WPARAM)fontnorm, FALSE);
SendDlgItemMessage(hwndDlg, IDC_NSISVER, WM_SETFONT, (WPARAM)fontnorm, FALSE); SendDlgItemMessage(hwndDlg, IDC_NSISVER, WM_SETFONT, (WPARAM)fontnorm, FALSE);
SendDlgItemMessage(hwndDlg, IDC_OTHERCONTRIB, WM_SETFONT, (WPARAM)fontnorm, FALSE); SendDlgItemMessage(hwndDlg, IDC_OTHERCONTRIB, WM_SETFONT, (WPARAM)fontnorm, FALSE);
SetDlgItemText(hwndDlg, IDC_NSISVER, g_sdata.branding); SendMessage(hwndDlg, WM_APP, 0, 0); // Set IDC_ABOUTVERSION
SetDlgItemText(hwndDlg, IDC_ABOUTVERSION, NSISW_VERSION);
SetDlgItemText(hwndDlg, IDC_ABOUTCOPY, COPYRIGHT); SetDlgItemText(hwndDlg, IDC_ABOUTCOPY, COPYRIGHT);
SetDlgItemText(hwndDlg, IDC_OTHERCONTRIB, CONTRIB); SetDlgItemText(hwndDlg, IDC_OTHERCONTRIB, CONTRIB);
SetDlgItemText(hwndDlg, IDC_NSISVER, g_sdata.branding);
break; break;
} }
case WM_COMMAND: case WM_COMMAND:
if (wParam == MAKELONG(IDC_ABOUTVERSION, STN_DBLCLK)) goto showversion;
if (IDOK != LOWORD(wParam)) break; if (IDOK != LOWORD(wParam)) break;
// fall through // fall through
case WM_CLOSE: case WM_CLOSE:
@ -866,6 +867,13 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTVERSION, WM_GETFONT, 0, 0)); DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTVERSION, WM_GETFONT, 0, 0));
DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTCOPY, WM_GETFONT, 0, 0)); DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTCOPY, WM_GETFONT, 0, 0));
break; break;
case WM_APP: showversion:
{
TCHAR buf[200], showver = wParam != 0;
wsprintf(buf, _T("MakeNSISW %s%s(NSIS Compiler Interface)"), showver ? NSISW_VERSION : _T(""), showver ? _T(" ") : _T(""));
SetDlgItemText(hwndDlg, IDC_ABOUTVERSION, buf);
}
break;
} }
return FALSE; return FALSE;
} }

2
Contrib/Makensisw/resource.rc
View file

@ -181,7 +181,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,174,104,49,15 DEFPUSHBUTTON "OK",IDOK,174,104,49,15
CONTROL 115,IDC_STATIC,"Static",SS_BITMAP,0,0,233,25 CONTROL 115,IDC_STATIC,"Static",SS_BITMAP,0,0,233,25
LTEXT "MakeNSISW",IDC_ABOUTVERSION,14,31,219,8 LTEXT "MakeNSISW",IDC_ABOUTVERSION,14,31,219,8,SS_NOTIFY
LTEXT "Copyright",IDC_ABOUTCOPY,14,43,220,8 LTEXT "Copyright",IDC_ABOUTCOPY,14,43,220,8
LTEXT "Other Contributors:",IDC_ABOUTPORTIONS,14,56,220,10 LTEXT "Other Contributors:",IDC_ABOUTPORTIONS,14,56,220,10
LTEXT "",IDC_OTHERCONTRIB,27,68,206,22 LTEXT "",IDC_OTHERCONTRIB,27,68,206,22

4
Contrib/Makensisw/version.cpp
View file

@ -26,7 +26,7 @@
#define TSTRINGIFY(x) TSTRINGIFY_(x) #define TSTRINGIFY(x) TSTRINGIFY_(x)
#ifdef RELEASE #ifdef RELEASE
const TCHAR *NSISW_VERSION = _T("MakeNSISW ") TSTRINGIFY(RELEASE) _T(" (NSIS Compiler Interface)"); const TCHAR *NSISW_VERSION = TSTRINGIFY(RELEASE);
#else #else
const TCHAR *NSISW_VERSION = _T("MakeNSISW ") __TDATE__; const TCHAR *NSISW_VERSION = __TDATE__;
#endif #endif