[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/base/PolicyKit-kde/manager
From:       Daniel Nicoletti <dantti85-kde () yahoo ! com ! br>
Date:       2009-01-26 15:04:16
Message-ID: 1232982256.474578.9408.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 916957 by dantti:

Fixed action icon size

 M  +23 -13    AuthDialog.cpp  


--- trunk/extragear/base/PolicyKit-kde/manager/AuthDialog.cpp #916956:916957
@@ -24,6 +24,7 @@
 #include "AuthDialog.h"
 
 #include <QProcess>
+#include <QPainter>
 
 #include <KDebug>
 
@@ -49,21 +50,30 @@
         setCaption(actionMessage);
     }
 
-    QString actionIconName(polkit_policy_file_entry_get_action_icon_name(entry));
-    QPixmap icon = KIconLoader::global()->loadIcon(actionIconName,
-                   KIconLoader::NoGroup, KIconLoader::SizeHuge, \
                KIconLoader::DefaultState, QStringList(), NULL, true);
-    KIcon kicon;
-    if (icon.isNull()) {
-        icon = KIconLoader::global()->loadIcon("dialog-password",
-                                               KIconLoader::NoGroup, \
                KIconLoader::SizeHuge);
-        
-    } else {
-            icon = KIconLoader::global()->loadIcon("dialog-password",
-                                               KIconLoader::NoGroup, \
KIconLoader::SizeHuge, KIconLoader::DefaultState , QStringList() << "" \
                <<actionIconName);
-//         kicon = KIcon("dialog-password", KIconLoader::global(), QStringList() << \
polkit_policy_file_entry_get_action_icon_name(entry)); +    QPixmap icon = \
KIconLoader::global()->loadIcon("dialog-password", +                                  \
KIconLoader::NoGroup, +                                                   \
KIconLoader::SizeHuge, +                                                   \
KIconLoader::DefaultState); +
+    QPainter painter(&icon);
+    const int iconSize = icon.size().width();
+
+    int overlaySize = 32;
+    const QPixmap pixmap = \
KIconLoader::global()->loadIcon(polkit_policy_file_entry_get_action_icon_name(entry), \
+                                                           KIconLoader::NoGroup, +   \
overlaySize, +                                                           \
KIconLoader::DefaultState, +                                                          \
QStringList(), +                                                           0,
+                                                           true);
+    if (!pixmap.isNull()) {
+        QPoint startPoint;
+        // bottom right corner
+        startPoint = QPoint(iconSize - overlaySize - 2,
+                            iconSize - overlaySize - 2);
+        painter.drawPixmap(startPoint, pixmap);
     }
 
-    
     setWindowIcon(icon);
     lblPixmap->setPixmap(icon);
 


[prev in list] [next in list] [prev in thread] [next in thread]