Merge lp:~macslow/ubuntu-ui-toolkit/add-search-path-to-giconprovider into lp:ubuntu-ui-toolkit

[Mirco Müller]

Extended GIconProvider to allow loading notification-specific icons. With this QML's Icon- and Image-elements can load and display the typical symbolic NotifyOSD-icons, if they are installed.

Extended GIconProvider to allow loading notification-specific icons. With this QML's Icon- and Image-elements can load and display the typical symbolic NotifyOSD-icons, if they are installed.

See the extended Icons-tab from the gallery... http://ubuntuone.com/3OVYWD5HRlFxLfWHQLS48d

[Michał Sawicz (saviq)]

A test for this would be useful. Either way, how do you expect to use it from QML?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:495
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~macslow/ubuntu-ui-toolkit/add-search-path-to-giconprovider/+merge/164197/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/64/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/64/console

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

review: Needs Fixing (continuous-integration)

[Mirco Müller (macslow)]

Doh! I forgot to set it to "Work in progress". More pieces are coming still.

[Mirco Müller (macslow)]

See for the extended Icons-example of the gallery... http://ubuntuone.com/3OVYWD5HRlFxLfWHQLS48d

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:497
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/132/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/132/console

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

review: Needs Fixing (continuous-integration)

[lp:~macslow/ubuntu-ui-toolkit/add-search-path-to-giconprovider]

498. By Mirco Müller on 2013-05-31

Add gtk+-3.0 build-dependency because of GtkIconTheme calls

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:497
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/136/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/136/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/136/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/137/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/137/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/137/console

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

review: Needs Fixing (continuous-integration)

[lp:~macslow/ubuntu-ui-toolkit/add-search-path-to-giconprovider]

499. By Mirco Müller on 2013-05-31

Re-merged with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/138
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/138/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/139
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/139/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

My 2¢ here - I'm not liking the fact that we just hardcode the path :/.

I wonder if supporting a "image://gicon/custom/path/to/icons/name" instead would give us more flexibility?

I'm also unsure about the complexity of the scaling code (and does FORCE_SVG mean it will only load SVG icons?). The original provider code does not seem to do as much?

review: Needs Information

[Cris Dywan (kalikiana)]

Why isn't the icon path in the theme? Hard-coding themed icon paths is an oxymoron in my book.

[Antti Kaijanmäki (kaijanmaki)]

guys, AFAIK giconprovider will be replaced by unity-theme-icon-provider:
https://code.launchpad.net/~larsu/ubuntu-ui-toolkit/add-unity-theme-icon-provider/+merge/179011

Let's figure this out some how. AFAIK the only thing we need to add to unity-theme-icon-provider is to add
/usr/share/notify-osd/icons to default search path. notify-OSD icons seem to follow xdg theming already.

[Antti Kaijanmäki (kaijanmaki)]

superseded the old MR. Here's the new one.
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/unity-theme-icon-provider/+merge/180805

[Michał Sawicz (saviq)]

I'm not even sure we need this anymore. Is there any reason why we should support a custom path for themed icons?

review: Disapprove

Unmerged revisions

499. By Mirco Müller on 2013-05-31

Re-merged with trunk

498. By Mirco Müller on 2013-05-31

Add gtk+-3.0 build-dependency because of GtkIconTheme calls

497. By Mirco Müller on 2013-05-29

Correctly load SVG-icon and scale it according to requested-size while preserving initial aspect-ratio of icon/image

496. By Mirco Müller on 2013-05-28

Trying a different approach to get notify-osd icons to load.

495. By Mirco Müller on 2013-05-16

Added support for extending the icon-theme search path of GIconProvider.

=== modified file 'debian/control'
--- debian/control	2013-05-23 07:43:46 +0000
+++ debian/control	2013-05-31 08:38:24 +0000
@@ -5,6 +5,7 @@
 Build-Depends: debhelper (>= 9.0.0),
                libgles2-mesa-dev,
                libglib2.0-dev,
+               libgtk-3-dev,
                python,
                libqt5qml-graphicaleffects | libqt5graphicaleffects5,
                qt5-default,

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Icons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Icons.qml	2013-04-24 17:09:29 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Icons.qml	2013-05-31 08:38:24 +0000
@@ -22,6 +22,32 @@
         className: "Icon"
 
         TemplateRow {
+            title: i18n.tr("NotifyOSD")
+            spacing: units.gu(2)
+
+            Icon {
+                name: "notification-message-im"
+                width: 32
+                height: 32
+                anchors.verticalCenter: parent.verticalCenter
+            }
+
+            Icon {
+                name: "notification-message-email"
+                width: 96
+                height: 96
+                anchors.verticalCenter: parent.verticalCenter
+            }
+
+            Icon {
+                name: "notification-audio-play"
+                width: 48
+                height: 48
+                anchors.verticalCenter: parent.verticalCenter
+            }
+        }
+
+        TemplateRow {
             title: i18n.tr("Scaling")
             spacing: units.gu(2)
 

=== modified file 'modules/Ubuntu/Components/plugin/giconprovider.cpp'
--- modules/Ubuntu/Components/plugin/giconprovider.cpp	2012-11-28 13:21:48 +0000
+++ modules/Ubuntu/Components/plugin/giconprovider.cpp	2013-05-31 08:38:24 +0000
@@ -21,9 +21,11 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtGui/QIcon>
+#include <QPainter>
 
 extern "C" {
 #include <gio/gio.h>
+#include <gtk/gtk.h>
 }
 
 /*
@@ -55,6 +57,8 @@
     : QQuickImageProvider(QQuickImageProvider::Image)
 {
     g_type_init();
+    gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
+                                      "/usr/share/notify-osd/icons");    
 }
 
 QImage GIconProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
@@ -63,6 +67,7 @@
     QByteArray utf8Name = QUrl::fromPercentEncoding(id.toUtf8()).toUtf8();
     GError *error = NULL;
     GIcon *icon = g_icon_new_for_string(utf8Name.data(), &error);
+
     if (error) {
         qWarning() << "Fail to load icon: " << id << error->message;
         g_error_free(error);
@@ -78,7 +83,47 @@
                 result = themedIcon.pixmap(themedIcon.availableSizes().last());
             }
         } else {
-            qDebug() << "Fail to load themed icon for:" << id;
+            GtkIconInfo* info = NULL;
+            info = gtk_icon_theme_lookup_by_gicon(gtk_icon_theme_get_default(),
+                                                  icon,
+                                                  requestedSize.width(),
+                                                  GTK_ICON_LOOKUP_FORCE_SVG);
+            if (info) {
+                // obtain filename and clean-up GObject/gtk+ pieces
+                const gchar* iconName = NULL;
+                iconName = gtk_icon_info_get_filename(info); // not ref'ed
+                QImage image = QImage(iconName);
+                gtk_icon_info_free(info);
+                g_object_unref(icon);
+
+                // create paint-device
+                QPixmap target = QPixmap(requestedSize);
+                target.fill(Qt::transparent);
+                QPainter painter(&target);
+
+                // scale original image preserving aspect-ratio
+                int width = image.width();
+                int height = image.height();
+                QImage scaledImage;
+                if (width > height) {
+                    scaledImage = image.scaledToWidth(requestedSize.width(),
+                                                      Qt::SmoothTransformation);
+                } else {
+                    scaledImage = image.scaledToHeight(requestedSize.height(),
+                                                       Qt::SmoothTransformation);
+                }
+
+                // determine offset and render scaled image
+                width = scaledImage.width();
+                height = scaledImage.height();
+                QPoint offset(abs(width - requestedSize.width()) / 2,
+                              abs(height - requestedSize.height()) / 2);
+                painter.drawImage(offset, scaledImage);
+
+                return target.toImage();
+            } else {
+                qDebug() << "Fail to load themed icon for:" << id;                
+            }
         }
     } else if (G_IS_FILE_ICON(icon)) {
         gchar *iconName = g_icon_to_string(icon);
@@ -100,3 +145,4 @@
     *size = result.size();
     return result.toImage();
 }
+

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2013-05-21 11:06:55 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2013-05-31 08:38:24 +0000
@@ -2,7 +2,7 @@
 
 unix {
     CONFIG += link_pkgconfig
-    PKGCONFIG += gio-2.0
+    PKGCONFIG += gio-2.0 gtk+-3.0
 }
 
 TEMPLATE = lib