Merge lp:~sil2100/appmenu-qt5/workaround_1306472_icontheme into lp:appmenu-qt5

[Łukasz Zemczak]

When working with a Gnome/GTK theme, do the same thing as the gtk2 platformtheme plugin does - fetch the SystemIconThemeName (and its fallback) from settings in the system

When working with a Gnome/GTK theme, do the same thing as the gtk2 platformtheme plugin does - fetch the SystemIconThemeName (and its fallback) from settings in the system

This is not a perfect solution, as appmenu should not bother with themeing and be only responsible for exporting the menu, delegating everything else to Qt itself.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/appmenu-qt5-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-qt5-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-qt5-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/appmenu-qt5-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/appmenu-qt5-ci/3/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Looks fine (the signals trick is needed), builds fine and I can't spot any regressions in my usual test cases of Qt Creator and Transmission. Nice!

I'm unsure though how to the test the actual bug, but nothing seems wrong.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Right... the appmenu-bug git branch. Seems functional now indeed.

review: Approve

[Dmitry Shachnev (mitya57)]

Hey Łukasz, any reason why you used Gtk+ 2.x here, and not Gtk+ 3.x? There are some reasons why Qt itself didn't yet move to Gtk+ 3, but none of them applies to appmenu-qt5.

=== modified file 'debian/control'
--- debian/control	2014-02-03 14:51:17 +0000
+++ debian/control	2014-04-14 15:06:36 +0000
@@ -14,6 +14,7 @@
                qtbase5-dev (>= 5.2.0),
                qtbase5-private-dev (>= 5.2.0),
                pkg-config,
+               libgtk2.0-dev,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/appmenu-qt5
 # if you don't have have commit access to this branch but would like to upload

=== modified file 'src/appmenuplatformmenubar.cpp'
--- src/appmenuplatformmenubar.cpp	2014-01-10 16:14:17 +0000
+++ src/appmenuplatformmenubar.cpp	2014-04-14 15:06:36 +0000
@@ -32,6 +32,12 @@
 #include <QMenu>
 #include <QDebug>
 #include <QList>
+#include <QVariant>
+
+#undef signals // Needed to make sure we can include gtk.h
+#include <gtk/gtk.h>
+#include <X11/Xlib.h>
+
 
 #define LOG qDebug() << "appmenu-qt:" << __FUNCTION__ << __LINE__
 #define LOG_VAR(x) qDebug() << "appmenu-qt:" << __FUNCTION__ << __LINE__ << #x ":" << x
@@ -210,6 +216,17 @@
 
 ///////////////////////////////////////////////////////////
 
+/* Helper function, as copy-pasted from Qt 5.2.1 gtk2 platformthemeplugin */
+static QString gtkSetting(const gchar *propertyName)
+{
+    GtkSettings *settings = gtk_settings_get_default();
+    gchararray value;
+    g_object_get(settings, propertyName, &value, NULL);
+    QString str = QString::fromUtf8(value);
+    g_free(value);
+    return str;
+}
+
 /*
  * The GnomeAppMenuPlatformTheme is a platform theme providing the platform
  * menubar functionality with the Qt5 QGnomeTheme look
@@ -217,12 +234,36 @@
 class GnomeAppMenuPlatformTheme : public QGnomeTheme
 {
 public:
+    GnomeAppMenuPlatformTheme();
     virtual QPlatformMenuItem* createPlatformMenuItem() const { return 0; }
     virtual QPlatformMenu* createPlatformMenu() const { return 0; }
     virtual QPlatformMenuBar* createPlatformMenuBar() const;
+
+    virtual QVariant themeHint(QPlatformTheme::ThemeHint hint) const;
 };
 
 
+GnomeAppMenuPlatformTheme::GnomeAppMenuPlatformTheme()
+    : QGnomeTheme()
+{
+    int (*oldErrorHandler)(Display *, XErrorEvent *) = XSetErrorHandler(NULL);
+    gtk_init(0, 0);
+    XSetErrorHandler(oldErrorHandler);
+}
+
+QVariant GnomeAppMenuPlatformTheme::themeHint(QPlatformTheme::ThemeHint hint) const
+{
+    switch (hint) {
+        case QPlatformTheme::SystemIconThemeName:
+            return QVariant(gtkSetting("gtk-icon-theme-name"));
+        case QPlatformTheme::SystemIconFallbackThemeName:
+            return QVariant(gtkSetting("gtk-fallback-icon-theme"));
+        default:
+            return QGnomeTheme::themeHint(hint);
+    }
+}
+
+
 QPlatformMenuBar *
 GnomeAppMenuPlatformTheme::createPlatformMenuBar() const
 {

=== modified file 'src/src.pro'
--- src/src.pro	2014-01-13 16:53:07 +0000
+++ src/src.pro	2014-04-14 15:06:36 +0000
@@ -8,7 +8,7 @@
 DBUS_INTERFACES += com.canonical.AppMenu.Registrar.xml
 
 CONFIG += X11 link_pkgconfig debug
-PKGCONFIG += dbusmenu-qt5
+PKGCONFIG += dbusmenu-qt5 gtk+-2.0
 DESTDIR = ./
 
 HEADERS += \