pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win] online installer: switch to TaskDialog

Browse Source
This commit is contained in:
SimplestStudio
2025-02-04 14:47:23 +02:00
parent 3b0e0aa87d
commit 9ed694d6eb
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win-linux/extras/online-installer/src/mainwindow.cpp
View File

@ -651,7 +651,7 @@ void MainWindow::createSelectionPage()
applyBtn->onClick([=]() {
wstring msg = m_uninsRadio->isChecked() ? _TR(MSG_REMOVE) : /*m_repRadio->isChecked() ? _TR(MSG_REPAIR) :*/ _TR(MSG_UPDATE);
NS_Utils::Replace(msg, L"%1", _T(WINDOW_NAME));
if (IDOK == MessageBox(nativeWindowHandle(), msg.c_str(), _TR(CAPTION), MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2)) {
if (IDOK == NS_Utils::ShowTaskDialog(nativeWindowHandle(), msg.c_str(), TD_WARNING_ICON)) {
if (!NS_Utils::checkAndWaitForAppClosure(nativeWindowHandle()))
return;
m_cenPanel->disconnect(m_resize_conn);

21
win-linux/extras/online-installer/src/utils.cpp
View File

@ -121,6 +121,21 @@ namespace NS_Utils
MessageBox(NULL, str.c_str(), caption.c_str(), MB_ICONERROR | MB_SERVICE_NOTIFICATION_NT3X | MB_SETFOREGROUND);
}
int ShowTaskDialog(HWND parent, const wstring &msg, PCWSTR icon)
{
int result = IDCANCEL;
wstring caption(_T(" "));
caption.append(_TR(CAPTION));
if (HMODULE lib = LoadLibrary(L"Comctl32")) {
HRESULT (WINAPI *_TaskDialog)(HWND, HINSTANCE, PCWSTR, PCWSTR, PCWSTR, TASKDIALOG_COMMON_BUTTON_FLAGS, PCWSTR, int*);
*(FARPROC*)&_TaskDialog = GetProcAddress(lib, "TaskDialog");
if (_TaskDialog)
_TaskDialog(parent, GetModuleHandle(NULL), caption.c_str(), msg.c_str(), NULL, TDCBF_OK_BUTTON | TDCBF_CANCEL_BUTTON, icon, &result);
FreeLibrary(lib);
}
return result;
}
bool IsRtlLanguage(unsigned long lcid)
{
if (Utils::getWinVersion() >= Utils::WinVer::Win7) {
@ -179,11 +194,9 @@ namespace NS_Utils
{
bool accept = true;
if (HWND app_hwnd = FindWindow(WINDOW_CLASS_NAME, NULL)) {
wstring caption(_T(" "));
caption.append(_TR(CAPTION));
wstring msg(_TR(MSG_ERR_TRY_CLOSE_APP));
NS_Utils::Replace(msg, L"%1", _T(WINDOW_NAME));
accept = (IDOK == MessageBox(parent, msg.c_str(), caption.c_str(), MB_ICONINFORMATION | MB_SERVICE_NOTIFICATION_NT3X | MB_APPLMODAL | MB_OKCANCEL | MB_DEFBUTTON1));
accept = (IDOK == NS_Utils::ShowTaskDialog(parent, msg.c_str(), TD_INFORMATION_ICON));
if (accept) {
PostMessage(app_hwnd, UM_INSTALL_UPDATE, 0, 0);
Sleep(1000);
@ -191,7 +204,7 @@ namespace NS_Utils
if ((app_hwnd = FindWindow(WINDOW_CLASS_NAME, NULL)) != nullptr) {
wstring msg(_TR(MSG_ERR_CLOSE_APP));
NS_Utils::Replace(msg, L"%1", _T(WINDOW_NAME));
int result = MessageBox(parent, msg.c_str(), caption.c_str(), MB_ICONWARNING | MB_SERVICE_NOTIFICATION_NT3X | MB_APPLMODAL | MB_OKCANCEL | MB_DEFBUTTON1);
int result = NS_Utils::ShowTaskDialog(parent, msg.c_str(), TD_WARNING_ICON);
if (result != IDOK) {
accept = false;
break;

1
win-linux/extras/online-installer/src/utils.h
View File

@ -54,6 +54,7 @@ bool cmdArgContains(const wstring &param);
wstring cmdArgValue(const wstring &param);
wstring GetLastErrorAsString(DWORD errID = 0);
void ShowMessage(wstring str, bool showError = false);
int ShowTaskDialog(HWND parent, const wstring &msg, PCWSTR icon);
bool IsRtlLanguage(unsigned long lcid);
bool IsWin64();
bool IsAppInstalled(wstring &path, wstring *arch = nullptr);