[Pkg-owncloud-commits] [owncloud-client] 341/484: gui: Fix some icons in highdpi

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit f618ed3dfbf6d17b5f98e6612c069930c22f4e7e
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Nov 17 10:48:45 2015 +0100

    gui: Fix some icons in highdpi
    
    QIcon does not need to use Theme::hidpiFileName because QIcon takes care
    of the @2x images
---
 src/gui/folderstatusdelegate.cpp            | 2 +-
 src/gui/sslbutton.cpp                       | 5 ++---
 src/gui/wizard/owncloudwizardresultpage.cpp | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index 875f531..8c88485 100644
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -29,7 +29,7 @@
 namespace OCC {
 
 FolderStatusDelegate::FolderStatusDelegate() : QStyledItemDelegate() {
-    m_moreIcon = QIcon(QPixmap(Theme::hidpiFileName(":/client/resources/more.png")));
+    m_moreIcon = QIcon(QLatin1String(":/client/resources/more.png"));
 }
 
 QString FolderStatusDelegate::addFolderText()
diff --git a/src/gui/sslbutton.cpp b/src/gui/sslbutton.cpp
index 9c5bad0..4a25865 100644
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -186,13 +186,12 @@ void SslButton::updateAccountState(AccountState *accountState)
 
     AccountPtr account = _accountState->account();
     if (account->url().scheme() == QLatin1String("https")) {
-        QPixmap pm(Theme::hidpiFileName(":/client/resources/lock-https.png"));
-        setIcon(QIcon(pm));
+        setIcon(QIcon(QLatin1String(":/client/resources/lock-https.png")));
         QSslCipher cipher = account->_sessionCipher;
         setToolTip(tr("This connection is encrypted using %1 bit %2.\n").arg(cipher.usedBits()).arg(cipher.name()));
         setMenu(_menu);
     } else {
-        setIcon(QIcon(QPixmap(Theme::hidpiFileName(":/client/resources/lock-http.png"))));
+        setIcon(QIcon(QLatin1String(":/client/resources/lock-http.png")));
         setToolTip(tr("This connection is NOT secure as it is not encrypted.\n"));
         setMenu(0);
     }
diff --git a/src/gui/wizard/owncloudwizardresultpage.cpp b/src/gui/wizard/owncloudwizardresultpage.cpp
index 55cbf32..bf9e146 100644
--- a/src/gui/wizard/owncloudwizardresultpage.cpp
+++ b/src/gui/wizard/owncloudwizardresultpage.cpp
@@ -40,7 +40,7 @@ OwncloudWizardResultPage::OwncloudWizardResultPage()
     setSubTitle( QLatin1String(" ") );
 
     _ui.pbOpenLocal->setText(tr("Open Local Folder"));
-    _ui.pbOpenLocal->setIcon(QIcon(Theme::hidpiFileName(":/client/resources/folder-sync.png")));
+    _ui.pbOpenLocal->setIcon(QIcon(QLatin1String(":/client/resources/folder-sync.png")));
     _ui.pbOpenLocal->setIconSize(QSize(48, 48));
     _ui.pbOpenLocal->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     connect(_ui.pbOpenLocal, SIGNAL(clicked()), SLOT(slotOpenLocal()));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git