Add Qt's standard "About Qt" dialog, remove the Qt version from "About Dolphin"

This commit is contained in:
Silent 2024-08-02 18:41:12 +02:00
parent 8a50676b83
commit c6d99ad87e
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
2 changed files with 6 additions and 7 deletions

View File

@ -35,8 +35,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
<p style='font-size: small;'> <p style='font-size: small;'>
%BRANCH%<br> %BRANCH%<br>
%REVISION%<br><br> %REVISION%
%QT_VERSION%
</p> </p>
<p> <p>
@ -57,14 +56,12 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
<a href='https://forums.dolphin-emu.org/'>%SUPPORT%</a> <a href='https://forums.dolphin-emu.org/'>%SUPPORT%</a>
)") )")
.replace(QStringLiteral("%VERSION_STRING%"), .replace(QStringLiteral("%VERSION_STRING%"),
QString::fromUtf8(Common::GetScmDescStr().c_str())) QString::fromStdString(Common::GetScmDescStr()))
.replace(QStringLiteral("%BRANCH%"), .replace(QStringLiteral("%BRANCH%"),
// i18n: "Branch" means the version control term, not a literal tree branch. // i18n: "Branch" means the version control term, not a literal tree branch.
tr("Branch: %1").arg(branch_str)) tr("Branch: %1").arg(branch_str))
.replace(QStringLiteral("%REVISION%"), .replace(QStringLiteral("%REVISION%"),
tr("Revision: %1").arg(QString::fromUtf8(Common::GetScmRevGitStr().c_str()))) tr("Revision: %1").arg(QString::fromStdString(Common::GetScmRevGitStr())))
.replace(QStringLiteral("%QT_VERSION%"),
tr("Using Qt %1").arg(QStringLiteral(QT_VERSION_STR)))
.replace(QStringLiteral("%CHECK_FOR_UPDATES%"), tr("Check for updates")) .replace(QStringLiteral("%CHECK_FOR_UPDATES%"), tr("Check for updates"))
.replace(QStringLiteral("%ABOUT_DOLPHIN%"), .replace(QStringLiteral("%ABOUT_DOLPHIN%"),
// i18n: The word "free" in the standard phrase "free and open source" // i18n: The word "free" in the standard phrase "free and open source"

View File

@ -8,6 +8,7 @@
#include <QAction> #include <QAction>
#include <QActionGroup> #include <QActionGroup>
#include <QApplication>
#include <QDesktopServices> #include <QDesktopServices>
#include <QFileDialog> #include <QFileDialog>
#include <QFontDialog> #include <QFontDialog>
@ -640,7 +641,8 @@ void MenuBar::AddHelpMenu()
help_menu->addSeparator(); help_menu->addSeparator();
#endif #endif
help_menu->addAction(tr("&About"), this, &MenuBar::ShowAboutDialog); help_menu->addAction(tr("About &Qt"), &QApplication::aboutQt);
help_menu->addAction(tr("&About Dolphin"), this, &MenuBar::ShowAboutDialog);
} }
void MenuBar::AddGameListTypeSection(QMenu* view_menu) void MenuBar::AddGameListTypeSection(QMenu* view_menu)