From 6fa16d791a980afcddf1d9e8f46690139a1b8308 Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Wed, 3 Jan 2018 23:24:26 +0300 Subject: [PATCH] [SYSSETUP] Add marquee progress bar to show setup is alive (#262) CORE-14163 #resolve --- dll/win32/syssetup/install.c | 8 +++++++- dll/win32/syssetup/lang/bg-BG.rc | 3 ++- dll/win32/syssetup/lang/cs-CZ.rc | 3 ++- dll/win32/syssetup/lang/da-DK.rc | 3 ++- dll/win32/syssetup/lang/de-DE.rc | 3 ++- dll/win32/syssetup/lang/el-GR.rc | 3 ++- dll/win32/syssetup/lang/en-US.rc | 3 ++- dll/win32/syssetup/lang/es-ES.rc | 3 ++- dll/win32/syssetup/lang/et-EE.rc | 3 ++- dll/win32/syssetup/lang/fi-FI.rc | 3 ++- dll/win32/syssetup/lang/fr-FR.rc | 3 ++- dll/win32/syssetup/lang/he-IL.rc | 3 ++- dll/win32/syssetup/lang/hu-HU.rc | 3 ++- dll/win32/syssetup/lang/id-ID.rc | 3 ++- dll/win32/syssetup/lang/it-IT.rc | 3 ++- dll/win32/syssetup/lang/ja-JP.rc | 3 ++- dll/win32/syssetup/lang/lt-LT.rc | 3 ++- dll/win32/syssetup/lang/nl-NL.rc | 3 ++- dll/win32/syssetup/lang/no-NO.rc | 3 ++- dll/win32/syssetup/lang/pl-PL.rc | 3 ++- dll/win32/syssetup/lang/pt-BR.rc | 3 ++- dll/win32/syssetup/lang/ro-RO.rc | 3 ++- dll/win32/syssetup/lang/ru-RU.rc | 3 ++- dll/win32/syssetup/lang/sk-SK.rc | 3 ++- dll/win32/syssetup/lang/sq-AL.rc | 3 ++- dll/win32/syssetup/lang/sv-SE.rc | 3 ++- dll/win32/syssetup/lang/th-TH.rc | 3 ++- dll/win32/syssetup/lang/tr-TR.rc | 3 ++- dll/win32/syssetup/lang/uk-UA.rc | 3 ++- dll/win32/syssetup/lang/zh-CN.rc | 3 ++- dll/win32/syssetup/lang/zh-TW.rc | 3 ++- dll/win32/syssetup/resource.h | 1 + 32 files changed, 68 insertions(+), 31 deletions(-) diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 8c4ab5e5913..e5b5530c431 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -553,7 +553,7 @@ ShowStatusMessageThread( IN LPVOID lpParameter) { HWND *phWnd = (HWND *)lpParameter; - HWND hWnd; + HWND hWnd, hItem; MSG Msg; hWnd = CreateDialogParam(hDllInstance, @@ -567,6 +567,12 @@ ShowStatusMessageThread( ShowWindow(hWnd, SW_SHOW); + hItem = GetDlgItem(hWnd, IDC_STATUSPROGRESS); + if (hItem) + { + PostMessage(hItem, PBM_SETMARQUEE, TRUE, 40); + } + /* Message loop for the Status window */ while (GetMessage(&Msg, NULL, 0, 0)) { diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index d4bc4611cc0..665bf8e6add 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "Добре", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Почакайте..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 6b0fe101737..e144877ce92 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -128,12 +128,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Prosím čekejte..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 3efb56e18ab..b31e5e0f037 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 79745847368..5102afa80c3 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "Schließen", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bitte warten..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 9000afafa22..25c89a7bccb 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Παρακαλώ περιμένετε..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index b1def1ab8d5..a2459de107b 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 3feb049b720..1820b59d2ba 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -123,12 +123,13 @@ BEGIN DEFPUSHBUTTON "Aceptar", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Espere un momento..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index c070d7f8fd0..8782113c6a1 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "Olgu", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Palun oota..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index eb83a8c7507..5fc3c8af136 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 58b4b146306..fbd3f763835 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Veuillez patienter..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index b70acb602db..ec7b1b5ea46 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "אישור", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "נא להמתין..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 5475121af4d..4e7d7b12f34 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 2a148a5b448..02cda34d176 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index acc6aba0417..5fb089f248d 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Attendere ..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index be6393c339e..33c5a1187e3 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "お待ち下さい..." FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 84d32f0c4d5..dc5b9cf893a 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index df52fcd0b6f..a5f15c97c7d 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index cd93cab73ae..2e83eb0ca9e 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vennligst vent..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index ecde8acc437..8f3cf50f2f1 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Proszę czekać..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 4592819aa1e..7749c2f9286 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Por favor aguarde..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index a79bf6761ac..ffe2b013db9 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -131,12 +131,13 @@ BEGIN DEFPUSHBUTTON "Î&nchide", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Așteptați…" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 34f9b01d3ce..2de6f3d1476 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -124,12 +124,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Пожалуйста подождите..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index a9ced2b38e6..f5563c56f8d 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -128,12 +128,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Počkajte, prosím ..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index e5639e4bf3c..e5e20ec84d3 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ju Lutem prisni..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 3466d1c586d..e583d35a33e 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 71ca7380e78..de15cf770f7 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -141,12 +141,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index c590a065186..fdf95ea91f6 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -124,12 +124,13 @@ BEGIN DEFPUSHBUTTON "Tamam", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Lütfen bekleyiniz..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index dfcc7384094..558b1ef63bd 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -130,12 +130,13 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Зачекайте..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 3d82805101c..51fa6289f43 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -122,12 +122,13 @@ BEGIN DEFPUSHBUTTON "确定", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "请等待..." FONT 9, "宋体", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 01d22d839bd..bfa21a5d7a2 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -124,12 +124,13 @@ BEGIN DEFPUSHBUTTON "確定", IDOK, 141, 209, 50, 14 END -IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "請等待..." FONT 9, "新細明體", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END STRINGTABLE diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 105a31b2220..90d931330e9 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -77,6 +77,7 @@ #define IDD_STATUSWINDOW_DLG 2200 #define IDC_STATUSLABEL 2201 +#define IDC_STATUSPROGRESS 2202 #define IDS_ACKTITLE 3010 #define IDS_ACKSUBTITLE 3011 -- 2.17.1