From f3a7082e18b78ef30a7b90c1bdf86d5b21f97a27 Mon Sep 17 00:00:00 2001 From: PeterCJ Date: Thu, 5 Jun 2025 13:14:31 -0700 Subject: [PATCH 1/2] Update ABOUT box to include hyperlinks library copyright --- src/Dialogs/AboutDialog.cpp | 2 +- src/Dialogs/AboutDialog.rc | 2 ++ src/Dialogs/Version.h | 14 ++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Dialogs/AboutDialog.cpp b/src/Dialogs/AboutDialog.cpp index 28023c1..6efabf1 100644 --- a/src/Dialogs/AboutDialog.cpp +++ b/src/Dialogs/AboutDialog.cpp @@ -38,7 +38,7 @@ INT_PTR CALLBACK abtDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara //ConvertStaticToHyperlink(hwndDlg, IDC_README); //Edit_SetText(GetDlgItem(hwndDlg, IDC_VERSION), TEXT("DoxyIt v") VERSION_TEXT TEXT(" ") VERSION_STAGE TEXT(" ") BITNESS); wchar_t title[256]; - swprintf_s(title, L"%s v%s%s %s", L"CollectionInterface", VERSION_TEXT, VERSION_STAGE_WS, BITNESS); + swprintf_s(title, L"%s v%s%s %s", VERSION_NAME_WS, VERSION_TEXT, VERSION_STAGE_WS, BITNESS); Edit_SetText(GetDlgItem(hwndDlg, IDC_VERSION), title); if (1) { diff --git a/src/Dialogs/AboutDialog.rc b/src/Dialogs/AboutDialog.rc index b22572c..dd25ca1 100644 --- a/src/Dialogs/AboutDialog.rc +++ b/src/Dialogs/AboutDialog.rc @@ -37,4 +37,6 @@ BEGIN LTEXT VERSION_URL, IDC_GITHUB, 60, 43, 200, 8, SS_LEFT | SS_NOTIFY, WS_EX_LEFT LTEXT "Licence: ", IDC_STATIC, 20, 60, 37, 8, SS_LEFT, WS_EX_LEFT LTEXT "This code is licensed under GPLv3", IDC_STATIC, 60, 60, 200, 8, SS_LEFT + LTEXT "Libraries:", IDC_STATIC, 20, 77, 37, 8, SS_LEFT, WS_EX_LEFT + LTEXT "Hyperlinks = Copyright 2002 Neal Stublen", IDC_STATIC, 60, 77, 200, 8, SS_LEFT END diff --git a/src/Dialogs/Version.h b/src/Dialogs/Version.h index 5917ab7..85339b7 100644 --- a/src/Dialogs/Version.h +++ b/src/Dialogs/Version.h @@ -17,15 +17,17 @@ along with this program. If not, see . */ -#define VERSION_NUM 1,0,0 +#define VERSION_NUM 1,1,0 #define VERSION_LINEAR 100 #define VERSION_LINEAR_TEXT TEXT(VERSION_LINEAR) -#define VERSION_STRING "1.0.0" +#define VERSION_STRING "1.1.0" // // VERSION_TEXT This must match the tag pushed on the server minus the "v" #define VERSION_TEXT TEXT(VERSION_STRING) -#define VERSION_STAGE_WS L"" -// // VERSION_STAGE // "-alpha", "-beta", "" -#define VERSION_STAGE TEXT("") -#define VERSION_FULLNAME "CollectionInterface v1.0.0" +// // VERSION_STAGE // "-alpha", "-beta", "-dev", "" +#define VERSION_STAGE "-dev" +#define VERSION_STAGE_WS TEXT(VERSION_STAGE) +#define VERSION_NAME "CollectionInterface" +#define VERSION_NAME_WS TEXT(VERSION_NAME) #define VERSION_AUTHOR "Peter Jones " +#define VERSION_AUTHOR_WS TEXT(VERSION_AUTHOR) #define VERSION_URL "https://github.com/pryrt/NppPlugin-CollectionInterface/" From 5f1033f2de01f6b2c15fe9e1dfc82f918a9434ce Mon Sep 17 00:00:00 2001 From: PeterCJ Date: Thu, 5 Jun 2025 13:44:58 -0700 Subject: [PATCH 2/2] Add a label to the Progress Bar which will show READY or Downloading ###% to make progress more clear fixes #9 --- src/Dialogs/CollectionInterfaceDialog.cpp | 11 +++++++++++ src/Dialogs/CollectionInterfaceDialog.rc | 3 ++- src/Dialogs/resource.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Dialogs/CollectionInterfaceDialog.cpp b/src/Dialogs/CollectionInterfaceDialog.cpp index c70d82f..daf3f16 100644 --- a/src/Dialogs/CollectionInterfaceDialog.cpp +++ b/src/Dialogs/CollectionInterfaceDialog.cpp @@ -82,6 +82,7 @@ INT_PTR CALLBACK ciDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam // set progress bar ::SendDlgItemMessage(hwndDlg, IDC_CI_PROGRESSBAR, PBM_SETPOS, 0, 0); + Edit_SetText(GetDlgItem(hwndDlg, IDC_CI_PROGRESSLBL), L"READY"); pobjCI = new CollectionInterface(hParent); //pobjCI->getListsFromJson(); @@ -176,6 +177,7 @@ INT_PTR CALLBACK ciDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam } // reset progress bar ::SendDlgItemMessage(hwndDlg, IDC_CI_PROGRESSBAR, PBM_SETPOS, 0, 0); + Edit_SetText(GetDlgItem(hwndDlg, IDC_CI_PROGRESSLBL), L"READY"); } return true; case IDC_CI_BTN_DOWNLOAD: @@ -194,6 +196,7 @@ INT_PTR CALLBACK ciDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam // update progress bar ::SendDlgItemMessage(hwndDlg, IDC_CI_PROGRESSBAR, PBM_SETPOS, 0, 0); + Edit_SetText(GetDlgItem(hwndDlg, IDC_CI_PROGRESSLBL), L"Downloading... 0%"); int total = 1; std::wstring ws_id_name = (pobjCI->revDISPLAY.count(wsFilename)) ? pobjCI->revDISPLAY[wsFilename] : L"!!DoesNotExist!!"; @@ -297,6 +300,9 @@ INT_PTR CALLBACK ciDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam // update progress bar ::SendDlgItemMessage(hwndDlg, IDC_CI_PROGRESSBAR, PBM_SETPOS, 100 * count / total, 0); + wchar_t wcDLPCT[256]; + swprintf_s(wcDLPCT, L"Downloading %d%%", 100 * count / total); + Edit_SetText(GetDlgItem(hwndDlg, IDC_CI_PROGRESSLBL), wcDLPCT); // also download AC and FL, if applicable std::vector xtra = { L"AC", L"FL" }; @@ -335,10 +341,14 @@ INT_PTR CALLBACK ciDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam } // update progress bar ::SendDlgItemMessage(hwndDlg, IDC_CI_PROGRESSBAR, PBM_SETPOS, 100 * count / total, 0); + swprintf_s(wcDLPCT, L"Downloading %d%%", 100 * count / total); + Edit_SetText(GetDlgItem(hwndDlg, IDC_CI_PROGRESSLBL), wcDLPCT); } // Final update of progress bar: 100% ::SendDlgItemMessage(hwndDlg, IDC_CI_PROGRESSBAR, PBM_SETPOS, 100, 0); + swprintf_s(wcDLPCT, L"Downloading %d%% [DONE]", 100); + Edit_SetText(GetDlgItem(hwndDlg, IDC_CI_PROGRESSLBL), wcDLPCT); } return true; case IDC_CI_HELPBTN: @@ -389,6 +399,7 @@ INT_PTR CALLBACK ciDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam } // reset progress bar ::SendDlgItemMessage(hwndDlg, IDC_CI_PROGRESSBAR, PBM_SETPOS, 0, 0); + Edit_SetText(GetDlgItem(hwndDlg, IDC_CI_PROGRESSLBL), L"READY"); // done with SELCHANGE return true; diff --git a/src/Dialogs/CollectionInterfaceDialog.rc b/src/Dialogs/CollectionInterfaceDialog.rc index 0d7feba..c73d1f3 100644 --- a/src/Dialogs/CollectionInterfaceDialog.rc +++ b/src/Dialogs/CollectionInterfaceDialog.rc @@ -41,7 +41,8 @@ BEGIN //PUSHBUTTON "&Download", IDC_CI_BTN_DOWNLOAD, 13, 140, 60, 22 //CHECKBOX "Also AutoCompletion", IDC_CI_CHK_ALSO_AC, 75, 140, 100, 11, WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX //CHECKBOX "Also FunctionList", IDC_CI_CHK_ALSO_FL, 75, 151, 100, 11, WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX - CONTROL "", IDC_CI_PROGRESSBAR, "msctls_progress32", WS_BORDER, 10, 166, 280, 11 + CONTROL "PREPARING", IDC_CI_PROGRESSBAR, "msctls_progress32", WS_BORDER, 10, 166, 280, 11 + LTEXT "OrigText", IDC_CI_PROGRESSLBL, 10, 179, 200, 9, SS_LEFT, WS_EX_LEFT PUSHBUTTON "&Close", IDC_CI_BTN_DONE, 230, 179, 60, 14 END diff --git a/src/Dialogs/resource.h b/src/Dialogs/resource.h index ba4bb0c..0b9fc84 100644 --- a/src/Dialogs/resource.h +++ b/src/Dialogs/resource.h @@ -37,6 +37,7 @@ #define IDC_CI_CHK_ALSO_FL 1008 #define IDC_CI_CHK_ALSO_AC 1009 #define IDC_CI_HELPBTN 1010 +#define IDC_CI_PROGRESSLBL 1011 // CollectionInterface Download HELP #define IDD_CI_DOWNLOADHELPDLG 103