From ef4c7cf73a83abcd8f440b170e863cb1d9fcb30b Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Wed, 8 Jan 2020 16:58:37 +0100 Subject: [PATCH] [GUI] Limit about dialog image size to 1/4 of the screen Fixes: #7574 --- src/gui/owncloudgui.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 1a834ad3c2..7516c8ed88 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #if defined(Q_OS_X11) #include @@ -1152,8 +1153,7 @@ void ownCloudGui::slotRemoveDestroyedShareDialogs() void ownCloudGui::slotAbout() { - QString title = tr("About %1").arg(Theme::instance()->appNameGUI()); - QString about = Theme::instance()->about(); + const QString title = tr("About %1").arg(Theme::instance()->appNameGUI()); QMessageBox *msgBox = new QMessageBox(this->_settingsDialog); #ifdef Q_OS_MAC // From Qt doc: "On macOS, the window title is ignored (as required by the macOS Guidelines)." @@ -1164,20 +1164,9 @@ void ownCloudGui::slotAbout() msgBox->setAttribute(Qt::WA_DeleteOnClose, true); msgBox->setTextFormat(Qt::RichText); msgBox->setTextInteractionFlags(Qt::TextBrowserInteraction); - msgBox->setInformativeText(""+about+""); + msgBox->setInformativeText(QStringLiteral("%1").arg(Theme::instance()->about())); msgBox->setStandardButtons(QMessageBox::Ok); - QIcon appIcon = Theme::instance()->applicationIcon(); - const auto sizes = appIcon.availableSizes(); - QSize size; - for (auto it = sizes.crbegin(); it != sizes.crend(); ++it) { - if (it->width() > 600) - continue; - size = *it; - break; - } - QPixmap iconPixmap = appIcon.pixmap(size); - iconPixmap.setDevicePixelRatio(2); - msgBox->setIconPixmap(iconPixmap); + msgBox->setIconPixmap(Theme::instance()->applicationIcon().pixmap(qApp->primaryScreen()->availableSize().width() / 4)); msgBox->show(); }