From 3c29d315934c7546cfad8e61b42feff84063a6ba Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 25 May 2003 17:10:14 +0000 Subject: [PATCH] - NSISdl will now take the installer's style - Little typo in script.cpp git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2569 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSISdl/Script1.rc | 6 ++++-- Contrib/NSISdl/nsisdl.cpp | 37 +++++++++++++++++++++++++++++-------- Contrib/NSISdl/resource.h | 9 +++++---- Plugins/nsisdl.dll | Bin 13312 -> 13312 bytes Source/script.cpp | 2 +- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/Contrib/NSISdl/Script1.rc b/Contrib/NSISdl/Script1.rc index 1d43d167..0f6a3283 100644 --- a/Contrib/NSISdl/Script1.rc +++ b/Contrib/NSISdl/Script1.rc @@ -30,9 +30,11 @@ IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 265, 104 STYLE DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif" BEGIN - CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",WS_BORDER, - 0,36,265,11 + CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",NOT + WS_VISIBLE | WS_BORDER,0,36,265,11 CTEXT "",IDC_STATIC2,0,25,263,8 + CONTROL "Progress1",IDC_PROGRESS2,"msctls_progress32",PBS_SMOOTH | + NOT WS_VISIBLE | WS_BORDER,0,37,265,11 END diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 1feb1eff..51c7af03 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -195,32 +195,54 @@ __declspec(dllexport) void download (HWND parent, DownloadDialogProc); if (dlg) { + int pbid = IDC_PROGRESS1; + HWND hwPb = GetDlgItem(childwnd, 1004); + + // Set progress bar style + if (GetWindowLong(hwPb, GWL_STYLE) & PBS_SMOOTH) + pbid = IDC_PROGRESS2; + + HWND pb = g_hwndProgressBar = GetDlgItem(dlg, pbid); + + long c; + + if (hwPb) + { + c = SendMessage(hwPb, PBM_SETBARCOLOR, 0, 0); + SendMessage(hwPb, PBM_SETBARCOLOR, 0, c); + SendMessage(pb, PBM_SETBARCOLOR, 0, c); + + c = SendMessage(hwPb, PBM_SETBKCOLOR, 0, 0); + SendMessage(hwPb, PBM_SETBKCOLOR, 0, c); + SendMessage(pb, PBM_SETBKCOLOR, 0, c); + } + + ShowWindow(pb, SW_SHOW); + GetWindowRect(dlg,&cr); ScreenToClient(dlg,(LPPOINT)&cr); ScreenToClient(dlg,((LPPOINT)&cr)+1); - GetWindowRect(GetDlgItem(childwnd,1016),&r); + GetWindowRect(hwndL,&r); ScreenToClient(childwnd,(LPPOINT)&r); ScreenToClient(childwnd,((LPPOINT)&r)+1); SetWindowPos(dlg,0,r.left,r.top,r.right-r.left,cr.bottom-cr.top,SWP_NOACTIVATE|SWP_NOZORDER); AdjustSize(IDC_STATIC2); - AdjustSize(IDC_PROGRESS1); + AdjustSize(pbid); ShowWindow(dlg,SW_SHOWNA); char *p=filename; while (*p) p++; while (*p != '\\' && p != filename) p=CharPrev(filename,p); wsprintf(buf,szDownloading, p!=filename?p+1:p); SetDlgItemText(childwnd,1006,buf); - SetDlgItemText (dlg, IDC_STATIC2, szConnecting); + SetDlgItemText(dlg, IDC_STATIC2, szConnecting); // set font long hFont = SendMessage(parent, WM_GETFONT, 0, 0); - SendDlgItemMessage(dlg, IDC_PROGRESS1, WM_SETFONT, hFont, 0); + SendDlgItemMessage(dlg, pbid, WM_SETFONT, hFont, 0); SendDlgItemMessage(dlg, IDC_STATIC2, WM_SETFONT, hFont, 0); } } - g_hwndProgressBar = GetDlgItem (dlg, IDC_PROGRESS1); - JNL_HTTPGet *get = 0; { @@ -427,5 +449,4 @@ __declspec(dllexport) void download_quiet(HWND parent, download(NULL,stringsize,variables,stacktop); } -} //extern "C" - +} //extern "C" \ No newline at end of file diff --git a/Contrib/NSISdl/resource.h b/Contrib/NSISdl/resource.h index a4e827f2..1446f54d 100644 --- a/Contrib/NSISdl/resource.h +++ b/Contrib/NSISdl/resource.h @@ -4,16 +4,17 @@ // #define IDD_DIALOG1 101 #define IDC_PROGRESS1 1001 -#define IDC_STATIC1 1002 -#define IDC_STATIC2 1003 +#define IDC_PROGRESS2 1002 +#define IDC_STATIC1 1003 +#define IDC_STATIC2 1004 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 103 +#define _APS_NEXT_RESOURCE_VALUE 102 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1004 +#define _APS_NEXT_CONTROL_VALUE 1005 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll index f222a520ae092125c6117c5065daef270829bfec..2e61b1bc553f31f2c3bed619031ee2583ca874af 100644 GIT binary patch delta 3361 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