Merge lp:~larsu/ubuntu-ui-toolkit/add-unity-theme-icon-provider into lp:ubuntu-ui-toolkit

[Lars Karlitski]

Add UnityThemeIconProvider

A QQuickImageProvider that loads icons from the current icon theme, following the xdg icon spec. It can be used like this:

  image://theme/icon-name,fallback-icon-name,another-fallback-icon-name

Add UnityThemeIconProvider

A QQuickImageProvider that loads icons from the current icon theme, following the xdg icon spec. It can be used like this:

  image://theme/icon-name,fallback-icon-name,another-fallback-icon-name

This is supposed to replace the gicon provider. I left that one in for now because it's still used by some components.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:680
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/480/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/337
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/337
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/337/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1994
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1994/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1698

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/480/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

Looks valid! I need this for the Launcher. Somebody, please, top approve.

review: Approve

[Zsombor Egri (zsombi)]

Unit tests testing API and component functionality is missing. The MR cannot be approved without that.
Code wise looks good.

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

Getting fuzzy icons.
Please use available sizes if not provided.

QIcon themedIcon = QIcon::fromTheme(id);
if (requestedSize.isValid()) {
    return themedIcon.pixmap(requestedSize);
} else {
    return themedIcon.pixmap(themedIcon.availableSizes().last());
}

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

Actually a more robust solution:
I've proposed these changes to qmenumodel where this provider currently resides.

    if (!icon.isNull()) {
        if (requestedSize.isValid()) {
            return themedIcon.pixmap(requestedSize);
        } else {
            QList<QSize> sizes = icon.availableSizes();
            if (sizes.count() > 0 && sizes.last().isValid()) {
                return icon.pixmap(sizes.last());
            } else {
                return icon.pixmap(QSize(32,32));
            }
        }
    }
    return QPixmap();

[Antti Kaijanmäki (kaijanmaki)]

superseding this one with a public branch MR.

Unmerged revisions

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2013-07-29 11:38:38 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2013-08-07 16:20:41 +0000
@@ -42,6 +42,7 @@
 #include "ucfontutils.h"
 #include "ucarguments.h"
 #include "ucargument.h"
+#include "unitythemeiconprovider.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -180,8 +181,9 @@
 
     engine->addImageProvider(QLatin1String("scaling"), new UCScalingImageProvider);
 
-    // register gicon provider
+    // register icon providers
     engine->addImageProvider(QLatin1String("gicon"), new GIconProvider);
+    engine->addImageProvider(QLatin1String("theme"), new UnityThemeIconProvider);
 
     // Necessary for Screen.orientation (from import QtQuick.Window 2.0) to work
     QGuiApplication::primaryScreen()->setOrientationUpdateMask(

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2013-07-09 22:14:33 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2013-08-07 16:20:41 +0000
@@ -41,7 +41,8 @@
     ucubuntuanimation.h \
     ucfontutils.h \
     ucarguments.h \
-    ucargument.h
+    ucargument.h \
+    unitythemeiconprovider.h
 
 SOURCES += plugin.cpp \
     uctheme.cpp \
@@ -61,7 +62,8 @@
     ucubuntuanimation.cpp \
     ucfontutils.cpp \
     ucarguments.cpp \
-    ucargument.cpp
+    ucargument.cpp \
+    unitythemeiconprovider.cpp
 
 # deployment rules for the plugin
 installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)

=== added file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp'
--- modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2013-08-07 16:20:41 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Lars Uebernickel <[e-mail]>
+ */
+
+#include "unitythemeiconprovider.h"
+
+#include <QIcon>
+
+UnityThemeIconProvider::UnityThemeIconProvider():
+  QQuickImageProvider(QQuickImageProvider::Pixmap)
+{
+}
+
+QPixmap UnityThemeIconProvider::requestPixmap(const QString &id, QSize *realSize, const QSize &requestedSize)
+{
+    QIcon icon;
+
+    Q_FOREACH (QString name, id.split(",", QString::SkipEmptyParts)) {
+        icon = QIcon::fromTheme(name);
+        if (!icon.isNull())
+            break;
+    }
+
+    QPixmap pixmap = icon.pixmap(requestedSize.isValid() ? requestedSize : QSize(64, 64));
+    *realSize = pixmap.size();
+    return pixmap;
+}

=== added file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.h'
--- modules/Ubuntu/Components/plugin/unitythemeiconprovider.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.h	2013-08-07 16:20:41 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Lars Uebernickel <[e-mail]>
+ */
+
+#ifndef UNITY_THEME_ICON_PROVIDER_H
+#define UNITY_THEME_ICON_PROVIDER_H
+
+#include <QQuickImageProvider>
+
+class UnityThemeIconProvider: public QQuickImageProvider
+{
+public:
+    UnityThemeIconProvider();
+    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
+};
+
+#endif