diff options
| author | Ezekiel Smith <ezekielsmith@protonmail.com> | 2022-06-27 01:13:58 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 01:13:58 +1000 |
| commit | 9cc235cde0624e7797d6a37ebc3171b9f69ac926 (patch) | |
| tree | 72500d8020bdad0574180af89cffebdc85b8274d | |
| parent | 91375e4c6d2a5767495e8af0845ebe28ed969c48 (diff) | |
| parent | 5335540c333c392019e89bd8fba9ff56250cecdd (diff) | |
| download | PrismLauncher-9cc235cde0624e7797d6a37ebc3171b9f69ac926.tar.gz PrismLauncher-9cc235cde0624e7797d6a37ebc3171b9f69ac926.tar.bz2 PrismLauncher-9cc235cde0624e7797d6a37ebc3171b9f69ac926.zip | |
Merge pull request #811 from jn64/fix/window-title
Fix duplicate name in window title
| -rw-r--r-- | launcher/Application.cpp | 2 | ||||
| -rw-r--r-- | launcher/ui/MainWindow.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 85b0d788..bafb928b 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -226,7 +226,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) setOrganizationName(BuildConfig.LAUNCHER_NAME); setOrganizationDomain(BuildConfig.LAUNCHER_DOMAIN); setApplicationName(BuildConfig.LAUNCHER_NAME); - setApplicationDisplayName(BuildConfig.LAUNCHER_DISPLAYNAME); + setApplicationDisplayName(QString("%1 %2").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString())); setApplicationVersion(BuildConfig.printableVersionString()); setDesktopFileName(BuildConfig.LAUNCHER_DESKTOPFILENAME); startTime = QDateTime::currentDateTime(); diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index 210442df..8c70cd49 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -822,7 +822,7 @@ public: } MainWindow->resize(800, 600); MainWindow->setWindowIcon(APPLICATION->getThemedIcon("logo")); - MainWindow->setWindowTitle(BuildConfig.LAUNCHER_DISPLAYNAME); + MainWindow->setWindowTitle(APPLICATION->applicationDisplayName()); #ifndef QT_NO_ACCESSIBILITY MainWindow->setAccessibleName(BuildConfig.LAUNCHER_NAME); #endif @@ -857,8 +857,6 @@ public: void retranslateUi(MainWindow *MainWindow) { - QString winTitle = tr("%1 - Version %2", "Launcher - Version X").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString()); - MainWindow->setWindowTitle(winTitle); // all the actions for(auto * item: all_actions) { |