Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't abuse organization domain for website in AboutDialog

This commit is contained in:
Martchus 2019-07-20 20:15:40 +02:00
parent 7cf1a57368
commit 4e30e7c45c
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
aboutdialog/aboutdialog.cpp
View File

@ -33,8 +33,7 @@ namespace QtUtilities {
* \param dependencyVersions Specifies the dependency versions which were present at link-time. If empty,
* ApplicationUtilities::applicationInfo.dependencyVersions will be used.
* \param description Specifies a short description about the application.
* \param website Specifies the URL to the website of the application. If empty,
* QApplication::organizationDomain() will be used.
* \param website Specifies the URL to the website of the application.
* \param image Specifies the application icon. If the image is null, the
* standard information icon will be used.
*/
@ -72,10 +71,14 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const
m_ui->versionLabel->setToolTip(QStringLiteral("<p>") % tr("Linked against:") % QStringLiteral("</p><ul><li>")
% linkedAgainst.join(QStringLiteral("</li><li>")) % QStringLiteral("</li></ul>"));
}
m_ui->websiteLabel->setText(tr("For updates and bug reports visit the <a href=\"%1\" "
"style=\"text-decoration: underline; color: palette(link);\">project "
"website</a>.")
.arg(website.isEmpty() ? QApplication::organizationDomain() : website));
if (!website.isEmpty()) {
m_ui->websiteLabel->setText(tr("For updates and bug reports visit the <a href=\"%1\" "
"style=\"text-decoration: underline; color: palette(link);\">project "
"website</a>.")
.arg(website));
} else {
m_ui->websiteLabel->hide();
}
m_ui->descLabel->setText(description.isEmpty() && CppUtilities::applicationInfo.description
? QString::fromUtf8(CppUtilities::applicationInfo.description)
: description);
@ -101,8 +104,8 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const
* \brief Constructs an about dialog with the specified \a parent, \a
* description and \a image.
*/
AboutDialog::AboutDialog(QWidget *parent, const QString &description, const QImage &image)
: AboutDialog(parent, QString(), QString(), QString(), QString(), description, image)
AboutDialog::AboutDialog(QWidget *parent, const QString &website, const QString &description, const QImage &image)
: AboutDialog(parent, QString(), QString(), QString(), website, description, image)
{
}

2
aboutdialog/aboutdialog.h
View File

@ -24,7 +24,7 @@ public:
explicit AboutDialog(QWidget *parent, const QString &applicationName, const QString &creator, const QString &version,
const std::vector<const char *> &dependencyVersions, const QString &website = QString(), const QString &description = QString(),
const QImage &image = QImage());
explicit AboutDialog(QWidget *parent, const QString &description = QString(), const QImage &image = QImage());
explicit AboutDialog(QWidget *parent, const QString &website = QString(), const QString &description = QString(), const QImage &image = QImage());
~AboutDialog() override;
private: