Skip to content

Add a label to the Progress Bar which will show READY or Downloading XX% #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pryrt merged 2 commits into from
Jun 5, 2025
Merged

Add a label to the Progress Bar which will show READY or Downloading XX% #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3a7082
Update ABOUT box to include hyperlinks library copyright
pryrt Jun 5, 2025
5f1033f
Add a label to the Progress Bar which will show READY or Downloading …
pryrt Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Dialogs/AboutDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions src/Dialogs/AboutDialog.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 11 additions & 0 deletions src/Dialogs/CollectionInterfaceDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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:
Expand All @@ -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!!";
Expand Down Expand Up @@ -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<std::wstring> xtra = { L"AC", L"FL" };
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/Dialogs/CollectionInterfaceDialog.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 8 additions & 6 deletions src/Dialogs/Version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

#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 <pryrtcode@pryrt.com>"
#define VERSION_AUTHOR_WS TEXT(VERSION_AUTHOR)
#define VERSION_URL "https://github.com/pryrt/NppPlugin-CollectionInterface/"
1 change: 1 addition & 0 deletions src/Dialogs/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down