Merge lp:~larsu/ubuntu-ui-toolkit/support-usr-share-pixmaps into lp:ubuntu-ui-toolkit/staging

[Lars Karlitski]

unitythemeiconprovider: support icons in /usr/share/pixmaps and .xpm

unitythemeiconprovider: support icons in /usr/share/pixmaps and .xpm

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1241
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1005/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4596
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/837
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/837/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/837
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5848
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12865

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1005/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Could we get a unit test for this? Thank you.

review: Needs Fixing

Unmerged revisions

1241. By Lars Karlitski on 2014-09-08

unitythemeiconprovider: support icons in /usr/share/pixmaps and .xpm

=== modified file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp'
--- modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-09-02 09:39:09 +0000
+++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-09-08 10:21:23 +0000
@@ -125,7 +125,7 @@
     {
         QPixmap pixmap;
 
-        if (filename.endsWith(".png")) {
+        if (filename.endsWith(".png") || filename.endsWith(".xpm")) {
             pixmap = QPixmap(filename);
             if (!pixmap.isNull() && size > 0 && (pixmap.width() != size || pixmap.height() != size))
                 pixmap = pixmap.scaled(size, size, Qt::KeepAspectRatioByExpanding);
@@ -144,15 +144,21 @@
 
     QString lookupIconFile(const QString &dir, const QString &name)
     {
-        QString png = QString("%1/%2.png").arg(dir).arg(name);
-        QString svg = QString("%1/%2.svg").arg(dir).arg(name);
+        static QStringList extensions = QStringList() << "png" << "xpm" << "svg";
 
         Q_FOREACH(const QString &baseDir, baseDirs) {
-            QString filename = baseDir + "/" + png;
-            if (QFileInfo::exists(filename))
-                return filename;
+            Q_FOREACH(const QString &ext, extensions) {
+                QString filename = QString("%1/%2/%3.%4").arg(baseDir).arg(dir).arg(name).arg(ext);
+                if (QFileInfo::exists(filename))
+                    return filename;
+            }
+        }
 
-            filename = baseDir + "/" + svg;
+        // Fall back to looking in /usr/share/pixmaps. That directory isn't a
+        // real theme (it lacks an index.theme), but has icon files in the top
+        // level.
+        Q_FOREACH(const QString &ext, extensions) {
+            QString filename = QString("/usr/share/pixmaps/%3.%4").arg(name).arg(ext);
             if (QFileInfo::exists(filename))
                 return filename;
         }