Merge lp:~xnox/appmenu-qt5/correct-suggests into lp:appmenu-qt5

[Dimitri John Ledkov]

Make all shlib depends become suggests, to avoid pulling in every generation of every toolkit on to all images.

Make all shlib depends become suggests, to avoid pulling in every generation of every toolkit on to all images.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

It seems like there's two different branches here?

review: Needs Information

[Dimitri John Ledkov (xnox)]

On 18 April 2014 03:16, Ted Gould <email address hidden> wrote:
> Review: Needs Information
>
> It seems like there's two different branches here?

No, this is one commit on top of ci-train branch which is/was in -proposed.

--
Regards,

Dimitri.

Unmerged revisions

19. By Dimitri John Ledkov on 2014-04-16

Make all shlib depends become suggests, to avoid pulling in every generation of every toolkit on to all images.

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-14 15:04:01 +0000
+++ debian/changelog	2014-04-16 10:44:22 +0000
@@ -1,3 +1,12 @@
+appmenu-qt5 (0.3.0+14.04.20140415-0ubuntu1) trusty; urgency=low
+
+  [ Łukasz 'sil2100' 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 (LP: #1306472)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 15 Apr 2014 10:27:05 +0000
+
 appmenu-qt5 (0.3.0+14.04.20140314-0ubuntu1) trusty; urgency=low
 
   [ Łukasz 'sil2100' Zemczak ]

=== modified file 'debian/control'
--- debian/control	2014-02-03 14:51:17 +0000
+++ debian/control	2014-04-16 10:44:22 +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
@@ -23,12 +24,8 @@
 
 Package: appmenu-qt5
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Suggests: libqt5core5,
-          libqt5dbus5,
-          libqt5gui5,
-          libqt5widgets5,
+Depends: ${misc:Depends}
+Suggests: ${shlibs:Suggests},
 Description: application menu for Qt5
  appmenu provides you with an integrated application menu in your global
  menu bar. It functions as a QPA platformtheme plugin.

=== modified file 'debian/rules'
--- debian/rules	2014-03-14 09:00:30 +0000
+++ debian/rules	2014-04-16 10:44:22 +0000
@@ -9,3 +9,6 @@
 
 override_dh_auto_configure:
 	qmake CONFIG+=enable-by-default
+
+override_dh_shlibdeps:
+	dh_shlibdeps -- -dSuggests

=== modified file 'src/appmenuplatformmenubar.cpp'
--- src/appmenuplatformmenubar.cpp	2014-01-10 16:14:17 +0000
+++ src/appmenuplatformmenubar.cpp	2014-04-16 10:44:22 +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-16 10:44:22 +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 += \