From f9d29319a6e172752e16379f29de619a1d303aa9 Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Sat, 23 Feb 2019 23:34:22 +0300 Subject: [PATCH] [MSGINA] Implement rotation bar animation Based on initial work by Bisoc George. Rotation bar image by Zcooger. CORE-15215 --- dll/win32/msgina/gui.c | 84 +++++++++++++++++++ dll/win32/msgina/lang/bg-BG.rc | 5 +- dll/win32/msgina/lang/cs-CZ.rc | 5 +- dll/win32/msgina/lang/de-DE.rc | 5 +- dll/win32/msgina/lang/en-US.rc | 5 +- dll/win32/msgina/lang/es-ES.rc | 5 +- dll/win32/msgina/lang/fr-FR.rc | 5 +- dll/win32/msgina/lang/he-IL.rc | 5 +- dll/win32/msgina/lang/id-ID.rc | 5 +- dll/win32/msgina/lang/it-IT.rc | 5 +- dll/win32/msgina/lang/ja-JP.rc | 5 +- dll/win32/msgina/lang/no-NO.rc | 5 +- dll/win32/msgina/lang/pl-PL.rc | 5 +- dll/win32/msgina/lang/ro-RO.rc | 5 +- dll/win32/msgina/lang/ru-RU.rc | 5 +- dll/win32/msgina/lang/sk-SK.rc | 5 +- dll/win32/msgina/lang/sq-AL.rc | 5 +- dll/win32/msgina/lang/tr-TR.rc | 5 +- dll/win32/msgina/lang/uk-UA.rc | 5 +- dll/win32/msgina/lang/zh-CN.rc | 5 +- dll/win32/msgina/lang/zh-TW.rc | 5 +- dll/win32/msgina/msgina.rc | 1 + dll/win32/msgina/resource.h | 2 + dll/win32/msgina/resources/line.bmp | Bin 0 -> 6254 bytes dll/win32/msgina/resources/line.svg | 123 ++++++++++++++++++++++++++++ 25 files changed, 270 insertions(+), 40 deletions(-) create mode 100644 dll/win32/msgina/resources/line.bmp create mode 100644 dll/win32/msgina/resources/line.svg diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index cafced9aa22..bf0a16057e4 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -31,6 +31,11 @@ typedef struct _DLG_DATA { PGINA_CONTEXT pgContext; HBITMAP hBitmap; + HBITMAP hBarBitmap; + UINT_PTR TimerID; + DWORD BarCounter; + DWORD BarWidth; + DWORD BarHeight; } DLG_DATA, *PDLG_DATA; static BOOL @@ -111,8 +116,11 @@ StatusDialogProc( IN WPARAM wParam, IN LPARAM lParam) { + PDLG_DATA pDlgData; UNREFERENCED_PARAMETER(wParam); + pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); + switch (uMsg) { case WM_INITDIALOG: @@ -127,6 +135,82 @@ StatusDialogProc( SetWindowTextW(hwndDlg, msg->pTitle); SetDlgItemTextW(hwndDlg, IDC_STATUS_MESSAGE, msg->pMessage); SetEvent(msg->StartupEvent); + + pDlgData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DLG_DATA)); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pDlgData); + + if (pDlgData == NULL) + return FALSE; + + /* Load the bar bitmap */ + pDlgData->hBarBitmap = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDI_BAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (pDlgData->hBarBitmap) + { + BITMAP bm; + + GetObject(pDlgData->hBarBitmap, sizeof(BITMAP), &bm); + pDlgData->BarWidth = bm.bmWidth; + pDlgData->BarHeight = bm.bmHeight; + pDlgData->TimerID = SetTimer(hwndDlg, -1, 20, NULL); + } + return TRUE; + } + + case WM_TIMER: + { + if (pDlgData) + { + /* + * Default rotation bar image width is 413 (same as logo) + * We can divide 413 by 7 without remainder + */ + pDlgData->BarCounter = (pDlgData->BarCounter + 7) % pDlgData->BarWidth; + InvalidateRect(hwndDlg, NULL, FALSE); + UpdateWindow(hwndDlg); + } + return TRUE; + } + + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDis = (LPDRAWITEMSTRUCT)lParam; + + if (lpDis->CtlID != IDC_BAR) + { + return FALSE; + } + + if (pDlgData && pDlgData->hBarBitmap) + { + HDC hdcMem; + HGDIOBJ hOld; + DWORD off = pDlgData->BarCounter; + DWORD iw = pDlgData->BarWidth; + DWORD ih = pDlgData->BarHeight; + + hdcMem = CreateCompatibleDC(lpDis->hDC); + hOld = SelectObject(hdcMem, pDlgData->hBarBitmap); + BitBlt(lpDis->hDC, off, 0, iw - off, ih, hdcMem, 0, 0, SRCCOPY); + BitBlt(lpDis->hDC, 0, 0, off, ih, hdcMem, iw - off, 0, SRCCOPY); + SelectObject(hdcMem, hOld); + DeleteDC(hdcMem); + + return TRUE; + } + return FALSE; + } + + case WM_DESTROY: + { + if (pDlgData) + { + if (pDlgData->hBarBitmap) + { + KillTimer(hwndDlg, pDlgData->TimerID); + DeleteObject(pDlgData->hBarBitmap); + } + HeapFree(GetProcessHeap(), 0, pDlgData); + } return TRUE; } } diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index 97da77a5938..e0895a300b7 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index e80492613bb..76f25dc5079 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -5,13 +5,14 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index 5308a8e4689..cd14ffc66ec 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index b7c5e92260c..ba8979fd70d 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index 02c1e2cb4f0..f3f1061afef 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -8,13 +8,14 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 98c99168756..07eab457a0f 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index 23c24f99857..dfcadc3b92c 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index 02660b5dd2e..686ac7bb850 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Harap menunggu..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index 866f037547f..ad93ddef159 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -9,13 +9,14 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index 38de8b4abb4..df22e8453bb 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index f3b6bf96707..b7fb47250bc 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vent litt..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index 93d86eca86d..11e484a9ab9 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -10,13 +10,14 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index ff9a0af2d64..a777f4a45ce 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -9,13 +9,14 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 7891fa040f8..e8763100173 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -2,13 +2,14 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 789443de473..331b00c29be 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -5,13 +5,14 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index b4474db1b71..7f3d9ff26a7 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -4,13 +4,14 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index de1b088d46d..92218040ffd 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -2,13 +2,14 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index af2cb61762c..7647b7aad6d 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -8,13 +8,14 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index dfc9e1b946a..22fa0f61f87 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -3,13 +3,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index 0ee86535ce6..1198a48e759 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -2,13 +2,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 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 CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/msgina.rc b/dll/win32/msgina/msgina.rc index 9d455ab8cf0..739b98071d9 100644 --- a/dll/win32/msgina/msgina.rc +++ b/dll/win32/msgina/msgina.rc @@ -19,6 +19,7 @@ IDI_LOCKICON ICON "resources/115.ico" /* Bitmaps */ IDI_ROSLOGO BITMAP "resources/reactos.bmp" +IDI_BAR BITMAP "resources/line.bmp" /* UTF-8 */ #pragma code_page(65001) diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index cdba2c0b662..e23da858785 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -55,9 +55,11 @@ #define IDC_LEGALNOTICE_TEXT 2101 #define IDC_ROSLOGO 1007 +#define IDC_BAR 1008 #define IDI_ROSLOGO 20000 +#define IDI_BAR 20001 #define IDI_NOT_CONNECTED 13 #define IDI_LOGOFF 21 diff --git a/dll/win32/msgina/resources/line.bmp b/dll/win32/msgina/resources/line.bmp new file mode 100644 index 0000000000000000000000000000000000000000..08717d3cbe7738f9fba2ed8d5a3c8e8fd4fd2ec2 GIT binary patch literal 6254 zcmeHLS65nD7&Q;`I?wYH=5cDqnIz7PDN{|;i8QgyEGU zPU0``zPC5x@X_>}PiEh`n1AQ`@_W};Ke)aA(cR*{$D5x#EDcF-fA+Ncg>3bJZ2gd8 z^T^BA$lK1y``xcT?|<{P|DEb!Om%$h=k$c;{M6t1ng54B0zUp3`01}8m%oEt{|R>c zH^kk9?qNbFJrDJK5$0(cPBsgtm`8ZMjP!mLBV`8XNQuv4Dh)*ezE~!y&Y0>U!F{JcZaz-2_Gu}HZ!6!S3nw?C`N%3c- z1~SuvSs5X$%use#7$-Y|n-j%jM)O%Qe0FRuCtko!%;P8J=cW`0QVa6Z3-dFJ3bTrf za!P>WoYG=OSuvx$$_WPJDaN*-nK%n+E`MqFJjmjJW5b3 z%M|h%6ot~(7NjT>#iC>sj`BeQr~o0L1>}Gt5CyvCB|V@H1kR3jfK1tN8;AwHAQ@Ck z`x`(z$VUs%i18jFnj-10l5|y~O`{#Q9zmUckMg?OMMXbFI*pe|?(fY_iqXb*r6p+;yD%7i|lQfL*5g>IqV zI~kXiFraE^8w!Wcq4vUp%)-3%0zn#FkjGCJ@Dc^w_*`}zJi=ps<}#wVIgy;~aCT-G zD}&BV4`HSSF;W9yuIwbgtVAm82GhZMFd%FQGs2QEChQ55CWSe}un8d!FmGJYySPBx z*Z}JoniZ@KgGc*X!0fO*j341;9!@a}Bby=+=%g2PkLQR81O?&(p@HZ?fFMR_&d+F0 zPyHO9P#qro+8ZNk5IBe(FFPZO?IViKL$dV)8ZloZ=4-@!jhL?y^EF}}N~}YPbtth8CDx(D{u;5rM(nQ<`)mJWf9*fW CF4*b- literal 0 HcmV?d00001 diff --git a/dll/win32/msgina/resources/line.svg b/dll/win32/msgina/resources/line.svg new file mode 100644 index 00000000000..82be5cdcde6 --- /dev/null +++ b/dll/win32/msgina/resources/line.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + +