Skip to content

Commit 4df9480

Browse files
authored
Align & improve updater wordings (winsiderss#692)
1 parent 1bbb7bf commit 4df9480

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

plugins/Updater/page1.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
static TASKDIALOG_BUTTON TaskDialogButtonArray[] =
2626
{
27-
{ IDOK, L"Check for updates" }
27+
{ IDOK, L"Check" }
2828
};
2929

3030
HRESULT CALLBACK CheckForUpdatesCallbackProc(
@@ -74,9 +74,9 @@ VOID ShowCheckForUpdatesDialog(
7474
config.lpCallbackData = (LONG_PTR)Context;
7575

7676
config.pszWindowTitle = L"Process Hacker - Updater";
77-
config.pszMainInstruction = L"Check for new Process Hacker releases?";
78-
//config.pszContent = L"The updater will check for new Process Hacker releases and optionally download and install the update.\r\n\r\nClick the check for updates button to continue.";
79-
config.pszContent = L"Select \"check for updates\" to continue.\r\n";
77+
config.pszMainInstruction = L"Check for an updated Process Hacker release?";
78+
//config.pszContent = L"The updater will check for an updated Process Hacker release which then can be optionally downloaded and installed.\r\n\r\nClick Check to continue.";
79+
config.pszContent = L"Click Check to continue.\r\n";
8080

8181
TaskDialogNavigatePage(Context->DialogHandle, &config);
8282
}

plugins/Updater/page2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ VOID ShowCheckingForUpdatesDialog(
6464
config.lpCallbackData = (LONG_PTR)Context;
6565

6666
config.pszWindowTitle = L"Process Hacker - Updater";
67-
config.pszMainInstruction = L"Checking for new releases...";
67+
config.pszMainInstruction = L"Checking for an updated release...";
6868

6969
TaskDialogNavigatePage(Context->DialogHandle, &config);
7070
}

plugins/Updater/updater.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ NTSTATUS UpdateDownloadThread(
697697
IO_STATUS_BLOCK isb;
698698
BYTE buffer[PAGE_SIZE];
699699

700-
status = PhFormatString(L"Downloading update %s...", PhGetStringOrEmpty(context->Version));
700+
status = PhFormatString(L"Downloading release %s...", PhGetStringOrEmpty(context->Version));
701701

702702
SendMessage(context->DialogHandle, TDM_SET_MARQUEE_PROGRESS_BAR, FALSE, 0);
703703
SendMessage(context->DialogHandle, TDM_UPDATE_ELEMENT_TEXT, TDE_MAIN_INSTRUCTION, (LPARAM)status->Buffer);
@@ -772,15 +772,15 @@ NTSTATUS UpdateDownloadThread(
772772
PH_FORMAT format[9];
773773
WCHAR string[MAX_PATH];
774774

775-
// L"Downloaded: %s of %s (%.0f%%)\r\nSpeed: %s/s"
775+
// L"Downloaded: %s / %s (%.0f%%)\r\nSpeed: %s/s"
776776
PhInitFormatS(&format[0], L"Downloaded: ");
777-
PhInitFormatSize(&format[1], downloadedBytes);
778-
PhInitFormatS(&format[2], L" of ");
779-
PhInitFormatSize(&format[3], contentLength);
777+
PhInitFormatSize(&format[1], downloadedBytes / 1024);
778+
PhInitFormatS(&format[2], L" / ");
779+
PhInitFormatSize(&format[3], contentLength / 1024);
780780
PhInitFormatS(&format[4], L" (");
781781
PhInitFormatF(&format[5], percent, 1);
782782
PhInitFormatS(&format[6], L"%)\r\nSpeed: ");
783-
PhInitFormatSize(&format[7], timeBitsPerSecond);
783+
PhInitFormatSize(&format[7], timeBitsPerSecond / 1024);
784784
PhInitFormatS(&format[8], L"/s");
785785

786786
if (PhFormatToBuffer(format, RTL_NUMBER_OF(format), string, sizeof(string), NULL))

0 commit comments

Comments
 (0)