From d86dac9e1c204bd6de005ec715495c13989112e1 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Tue, 5 Dec 2023 12:14:50 +0200 Subject: [PATCH] [win-linux] updmanager: fix update dialog text --- win-linux/src/cupdatemanager.cpp | 8 ++++---- win-linux/src/defines.h | 1 + win-linux/src/platform_linux/updatedialog.cpp | 8 ++++---- win-linux/src/platform_win/updatedialog.cpp | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/win-linux/src/cupdatemanager.cpp b/win-linux/src/cupdatemanager.cpp index b61cd5433..9c671b3a7 100644 --- a/win-linux/src/cupdatemanager.cpp +++ b/win-linux/src/cupdatemanager.cpp @@ -818,7 +818,7 @@ void CUpdateManager::onCheckFinished(bool error, bool updateExist, const QString void CUpdateManager::showUpdateMessage(QWidget *parent) { int result = WinDlg::showDialog(parent, tr("Update is available"), QString("%1\n%2: %3\n%4: %5\n%6 (%7 MB)").arg(QString(WINDOW_NAME), tr("Current version"), - QString(VER_FILEVERSION_STR), tr("Update version"), getVersion(), + QString(VER_FILEVERSION_STR), tr("New version"), getVersion(), tr("Would you like to download update now?"), m_packageData->fileSize), WinDlg::DlgBtns::mbSkipRemindDownload); __UNLOCK @@ -840,9 +840,9 @@ void CUpdateManager::showUpdateMessage(QWidget *parent) { void CUpdateManager::showStartInstallMessage(QWidget *parent) { int result = WinDlg::showDialog(parent, tr("Update is ready to install"), - QString("%1\n%2: %3\n%4: %5\n%6").arg(QString(WINDOW_NAME), tr("Current version"), - QString(VER_FILEVERSION_STR), tr("Update version"), getVersion(), - tr("Would you like to restart app now?")), + QString("%1: %2\n%3: %4\n%5").arg(tr("Current version"), + QString(VER_FILEVERSION_STR), tr("New version"), getVersion(), + tr("To finish updating, restart the app")), WinDlg::DlgBtns::mbInslaterRestart); __UNLOCK switch (result) { diff --git a/win-linux/src/defines.h b/win-linux/src/defines.h index b7e5cbfdb..bf5f78617 100644 --- a/win-linux/src/defines.h +++ b/win-linux/src/defines.h @@ -55,6 +55,7 @@ #endif #define WINDOW_NAME "ONLYOFFICE Desktop Editors" +#define WINDOW_TITLE WINDOW_NAME #define WINDOW_CLASS_NAME L"DocEditorsWindowClass" #define WINDOW_EDITOR_CLASS_NAME L"SingleWindowClass" #define REG_APP_NAME "DesktopEditors" diff --git a/win-linux/src/platform_linux/updatedialog.cpp b/win-linux/src/platform_linux/updatedialog.cpp index d46226be6..36f5f6952 100644 --- a/win-linux/src/platform_linux/updatedialog.cpp +++ b/win-linux/src/platform_linux/updatedialog.cpp @@ -45,8 +45,8 @@ #define TEXT_SKIP toCharPtr(QObject::tr("Skip this version")) #define TEXT_REMIND toCharPtr(QObject::tr("Remind me later")) #define TEXT_INSTALL toCharPtr(QObject::tr("Install update")) -#define TEXT_INSLATER toCharPtr(QObject::tr("Install later")) -#define TEXT_RESTART toCharPtr(QObject::tr("Save and Restart Now")) +#define TEXT_INSLATER toCharPtr(QObject::tr("Later")) +#define TEXT_RESTART toCharPtr(QObject::tr("Restart Now")) #define TEXT_SAVEANDINS toCharPtr(QObject::tr("Save and Install Now")) #define TEXT_DOWNLOAD toCharPtr(QObject::tr("Download update")) #define AddButton(name, response) \ @@ -65,7 +65,7 @@ int WinDlg::showDialog(QWidget *parent, const QString &content, DlgBtns dlgBtns) { - QString title = QString(" %1").arg(QObject::tr("Software Update")); +// QString title = QString(" %1").arg(WINDOW_TITLE); QString primaryText = QTextDocumentFragment::fromHtml(msg).toPlainText(); QString linkText = !QString(RELEASE_NOTES).isEmpty() ? QString("\n%2").arg(QString(RELEASE_NOTES), QObject::tr("Release notes")) : ""; @@ -92,7 +92,7 @@ int WinDlg::showDialog(QWidget *parent, tag.dialog = dialog; tag.parent_xid = (ulong)parent_xid; g_signal_connect_swapped(G_OBJECT(dialog), "focus_out_event", G_CALLBACK(focus_out), (gpointer)&tag); - gtk_window_set_title(GTK_WINDOW(dialog), title.toLocal8Bit().data()); +// gtk_window_set_title(GTK_WINDOW(dialog), title.toLocal8Bit().data()); if (!content.isEmpty()) gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", content.toLocal8Bit().data()); diff --git a/win-linux/src/platform_win/updatedialog.cpp b/win-linux/src/platform_win/updatedialog.cpp index 95cb34770..167ed8067 100644 --- a/win-linux/src/platform_win/updatedialog.cpp +++ b/win-linux/src/platform_win/updatedialog.cpp @@ -48,8 +48,8 @@ #define TEXT_SKIP toWCharPtr(QObject::tr("Skip this version")) #define TEXT_REMIND toWCharPtr(QObject::tr("Remind me later")) #define TEXT_INSTALL toWCharPtr(QObject::tr("Install update")) -#define TEXT_INSLATER toWCharPtr(QObject::tr("Install later")) -#define TEXT_RESTART toWCharPtr(QObject::tr("Save and Restart Now")) +#define TEXT_INSLATER toWCharPtr(QObject::tr("Later")) +#define TEXT_RESTART toWCharPtr(QObject::tr("Restart Now")) #define TEXT_SAVEANDINS toWCharPtr(QObject::tr("Save and Install Now")) #define TEXT_DOWNLOAD toWCharPtr(QObject::tr("Download update")) @@ -96,7 +96,7 @@ int WinDlg::showDialog(QWidget *parent, const QString &content, DlgBtns dlgBtns) { - std::wstring lpCaption = QString(" %1").arg(QObject::tr("Software Update")).toStdWString(); + std::wstring lpCaption = QString(" %1").arg(WINDOW_TITLE).toStdWString(); std::wstring lpText = QTextDocumentFragment::fromHtml(msg).toPlainText().toStdWString(); QString linkText = !QString(RELEASE_NOTES).isEmpty() ? QString("\n%2").arg(QString(RELEASE_NOTES), QObject::tr("Release notes")) : "";