diff --git a/src/blackmisc/applicationinfo.cpp b/src/blackmisc/applicationinfo.cpp index 99ddd19f5..723ff3ee6 100644 --- a/src/blackmisc/applicationinfo.cpp +++ b/src/blackmisc/applicationinfo.cpp @@ -27,4 +27,28 @@ namespace BlackMisc { return QString("{ %1, %2, %3, %4, %5 }").arg(QString::number(m_app), QString::number(m_mode), m_exePath, m_version, m_process.convertToQString(i18n)); } + + const QString &CApplicationInfo::swiftPilotClientGui() + { + static const QString s("swift pilot client GUI"); + return s; + } + + const QString &CApplicationInfo::swiftLauncher() + { + static const QString s("swift launcher"); + return s; + } + + const QString &CApplicationInfo::swiftMappingTool() + { + static const QString s("swift mapping tool"); + return s; + } + + const QString &CApplicationInfo::swiftCore() + { + static const QString s("swift core"); + return s; + } } diff --git a/src/blackmisc/applicationinfo.h b/src/blackmisc/applicationinfo.h index 0f58f35be..b486a72d7 100644 --- a/src/blackmisc/applicationinfo.h +++ b/src/blackmisc/applicationinfo.h @@ -83,6 +83,18 @@ namespace BlackMisc //! \copydoc BlackMisc::Mixin::String::toQString QString convertToQString(bool i18n = false) const; + //! Name of pilot client GUI + static const QString &swiftPilotClientGui(); + + //! Name of swift launcher + static const QString &swiftLauncher(); + + //! Name of swift mapping tool + static const QString &swiftMappingTool(); + + //! Name of swift core + static const QString &swiftCore(); + private: int m_app = static_cast(Unknown); int m_mode = 0; diff --git a/src/swiftcore/main.cpp b/src/swiftcore/main.cpp index 58259c6eb..95e232d04 100644 --- a/src/swiftcore/main.cpp +++ b/src/swiftcore/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) CGuiApplication::highDpiScreenSupport(); QApplication qa(argc, argv); Q_UNUSED(qa); // init of qa is required, but qa not used - CGuiApplication a("swift core", CApplicationInfo::PilotClientCore, CIcons::swiftCore24()); + CGuiApplication a(CApplicationInfo::swiftCore(), CApplicationInfo::PilotClientCore, CIcons::swiftCore24()); a.addWindowStateOption(); a.addDBusAddressOption(); a.addVatlibOptions(); diff --git a/src/swiftdata/main.cpp b/src/swiftdata/main.cpp index 09cece84c..97fb0c39b 100644 --- a/src/swiftdata/main.cpp +++ b/src/swiftdata/main.cpp @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) CGuiApplication::highDpiScreenSupport(); QApplication qa(argc, argv); Q_UNUSED(qa); - CGuiApplication a("swift mapping tool", CApplicationInfo::MappingTool, CIcons::swiftDatabase48()); + CGuiApplication a(CApplicationInfo::swiftMappingTool(), CApplicationInfo::MappingTool, CIcons::swiftDatabase48()); a.setSignalStartupAutomatically(false); // application will signal startup on its own a.splashScreen(CIcons::swiftDatabase256()); if (!a.parse()) { return EXIT_FAILURE; } diff --git a/src/swiftguistandard/swiftguistdapplication.cpp b/src/swiftguistandard/swiftguistdapplication.cpp index b8301da71..eb02e6e01 100644 --- a/src/swiftguistandard/swiftguistdapplication.cpp +++ b/src/swiftguistandard/swiftguistdapplication.cpp @@ -20,7 +20,7 @@ using namespace BlackMisc; using namespace BlackCore; CSwiftGuiStdApplication::CSwiftGuiStdApplication() : - CGuiApplication("swift pilot client GUI", CApplicationInfo::PilotClientGui, CIcons::swift1024()) + CGuiApplication(CApplicationInfo::swiftPilotClientGui(), CApplicationInfo::PilotClientGui, CIcons::swift1024()) { this->addParserOption(this->m_cmdFacadeMode); this->addWindowModeOption(); diff --git a/src/swiftlauncher/main.cpp b/src/swiftlauncher/main.cpp index b078040cc..c38b3fa99 100644 --- a/src/swiftlauncher/main.cpp +++ b/src/swiftlauncher/main.cpp @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) CGuiApplication::highDpiScreenSupport(); QApplication qa(argc, argv); // needed Q_UNUSED(qa); - CGuiApplication a("swift launcher", CApplicationInfo::Laucher, CIcons::swiftLauncher1024()); + CGuiApplication a(CApplicationInfo::swiftLauncher(), CApplicationInfo::Laucher, CIcons::swiftLauncher1024()); a.addParserOption({{"i", "installer"}, QCoreApplication::translate("main", "Installer setup.") }); if (!a.parse()) { return EXIT_FAILURE; } a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());