diff -r d0774130e860 -r afed72b544f0 src/main.cpp --- a/src/main.cpp Tue Jun 28 11:19:33 2022 +0300 +++ b/src/main.cpp Tue Jun 28 11:51:17 2022 +0300 @@ -70,7 +70,7 @@ static void doQtRegistrations() { - QCoreApplication::setApplicationName(QStringLiteral(APPNAME)); + QCoreApplication::setApplicationName(QStringLiteral(CMAKE_PROJECT_NAME)); QCoreApplication::setOrganizationName("hecknology.net"); QCoreApplication::setOrganizationDomain("hecknology.net"); qRegisterMetaType(); @@ -218,12 +218,20 @@ { QMdiSubWindow* subWindow = ui->mdiArea->activeSubWindow(); QString titlestring; + const QString versionString = fullVersionString(QLocale::ShortFormat); if (subWindow != nullptr) { - return QObject::tr("%1 - %2").arg(subWindow->windowTitle(), fullVersionString()); + titlestring = QObject::tr("%1 - %2").arg(subWindow->windowTitle(), versionString); } else { - return fullVersionString(); + titlestring = versionString; } + if (/* DISABLES CODE */ (true) + and std::strcmp(CMAKE_BUILD_TYPE, "Release") != 0 + and std::strcmp(CMAKE_BUILD_TYPE, "MinSizeRel") != 0 + ) { + titlestring += QObject::tr(" [%1]").arg(CMAKE_BUILD_TYPE); + } + return titlestring; } static ColorTable loadColors(const LibrariesModel* libraries) @@ -373,19 +381,20 @@ for (QTextBrowser* browser : dialog.findChildren()) { browser->setHtml( browser->toHtml() - .replace("%APPNAME%", APPNAME) + .replace("%APPNAME%", CMAKE_PROJECT_NAME) .replace("%COPYRIGHT%", COPYRIGHT) .replace("%QTVERSION%", qVersion()) - .replace("%VERSION%", detailedVersionString()) - .replace("%REVDATE%", revisionDateString()) - .replace("%COMPILER_ID%", COMPILER_ID) - .replace("%COMPILER_VERSION%", COMPILER_VERSION) - .replace("%COMPILER_FLAGS%", COMPILER_FLAGS) - .replace("%COMPILER_CPU%", COMPILER_CPU) - .replace("%COMPILER_SYSTEM%", COMPILER_SYSTEM) + .replace("%VERSION%", detailedVersionString(QLocale::LongFormat)) + .replace("%REVDATE%", revisionDateString(QLocale::LongFormat)) + .replace("%BUILDTYPE%", CMAKE_BUILD_TYPE) + .replace("%COMPILER_ID%", CMAKE_CXX_COMPILER_ID) + .replace("%COMPILER_VERSION%", CMAKE_CXX_COMPILER_VERSION) + .replace("%COMPILER_FLAGS%", CMAKE_CXX_FLAGS) + .replace("%COMPILER_CPU%", CMAKE_SYSTEM_PROCESSOR) + .replace("%COMPILER_SYSTEM%", CMAKE_SYSTEM) ); } - dialog.setWindowTitle(QObject::tr("About %1").arg(APPNAME)); + dialog.setWindowTitle(QObject::tr("About %1").arg(CMAKE_PROJECT_NAME)); dialog.exec(); } @@ -755,7 +764,7 @@ } restoreSettings(); updateRenderPreferences(&ui, &renderPreferences, &documents); - ui.actionAbout->setText(ui.actionAbout->text().arg(APPNAME)); + ui.actionAbout->setText(ui.actionAbout->text().arg(CMAKE_PROJECT_NAME)); updateTitle(); mainWindow.show(); const int result = app.exec();