Merge lp:~zeller-benjamin/messaging-app/applauncherd into lp:messaging-app

[Benjamin Zeller]

Prepare messaging-app for mapplauncherd

Prepare messaging-app for mapplauncherd

[lp:~zeller-benjamin/messaging-app/applauncherd]

524. By Benjamin Zeller on 2016-03-03

Prepare messaging-app for mapplauncherd

525. By Benjamin Zeller on 2016-03-14

Merge trunk

Unmerged revisions

525. By Benjamin Zeller on 2016-03-14

Merge trunk

524. By Benjamin Zeller on 2016-03-03

Prepare messaging-app for mapplauncherd

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-19 17:44:27 +0000
+++ CMakeLists.txt	2016-03-14 10:25:25 +0000
@@ -2,6 +2,8 @@
 cmake_minimum_required(VERSION 2.8)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
+option(MAPPLAUNCHERD_ENABLED "Build with mapplauncherd support" ON)
+
 # Standard install paths
 include(GNUInstallDirs)
 
@@ -46,6 +48,10 @@
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(NOTIFY REQUIRED libnotify)
 
+if (MAPPLAUNCHERD_ENABLED)
+  pkg_check_modules(MAPPLAUNCH REQUIRED qdeclarative5-boostable)
+endif()
+
 #find unity8 qml libraries
 set(UNITY8_QML_PATH /usr/lib/${CMAKE_C_LIBRARY_ARCHITECTURE}/unity8/qml/)
 find_path(LIB_UNITY_QML_EXISTS  NAMES libUnity-qml.so
 
=== modified file 'debian/control'
--- debian/control	2016-01-28 12:42:01 +0000
+++ debian/control	2016-03-14 10:25:25 +0000
@@ -33,6 +33,7 @@
                qml-module-qtmultimedia,
                qtpim5-dev,
                xvfb,
+               libmdeclarativecache5-dev (>= 1.1.13),
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/messaging-app
 # If you aren't a member of ~phablet-team but need to upload packaging changes,
@@ -55,6 +56,8 @@
          qtdeclarative5-gsettings1.0,
          qml-module-qt-labs-settings,
          ttf-ancient-fonts-symbola,
+         libmdeclarativecache5-0,
+         mapplauncherd-booster-ubuntu-components,
 Recommends: unity8 (>= 7.81.0~),
 Description: messaging application for Ubuntu
  An application to send and receive messages.
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-11-26 20:32:50 +0000
+++ src/CMakeLists.txt	2016-03-14 10:25:25 +0000
@@ -20,6 +20,13 @@
     )
 qt5_use_modules(${MESSAGING_APP} Core DBus Gui Multimedia Qml Quick Sql Versit)
 
+if (MAPPLAUNCHERD_ENABLED)
+  set(MAPPLAUNCHERD_COMMAND_PREFIX "/usr/bin/invoker --type=ubuntu-components ")
+  add_definitions(-DMAPPLAUNCHERD_ENABLED)
+  target_link_libraries (${MESSAGING_APP} ${MAPPLAUNCH_LDFLAGS})
+  target_compile_options(${MESSAGING_APP} PRIVATE ${MAPPLAUNCH_CFLAGS})
+endif()
+
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
 
=== modified file 'src/main.cpp'
--- src/main.cpp	2014-08-26 19:07:12 +0000
+++ src/main.cpp	2016-03-14 10:25:25 +0000
@@ -24,6 +24,8 @@
 #include <QString>
 #include <QTemporaryFile>
 #include <QTextStream>
+#include <QGuiApplication>
+#include <QScopedPointer>
 
 // libc
 #include <cerrno>
@@ -34,23 +36,30 @@
 #include "messagingapplication.h"
 #include "config.h"
 
+#ifdef MAPPLAUNCHERD_ENABLED
+#include <mdeclarativecache5/MDeclarativeCache>
+#endif
+
 // WORKAROUND: to make easy to debug apps
 #include <QtQml/QQmlDebuggingEnabler>
 static QQmlDebuggingEnabler debuggingEnabler(false);
 
 // Temporarily disable the telepathy folks backend
 // as it doesn’t play well with QtFolks.
-int main(int argc, char** argv)
+int Q_DECL_EXPORT main(int argc, char** argv)
 {
     QGuiApplication::setApplicationName("Messaging App");
     QGuiApplication::setOrganizationName("com.ubuntu.messaging-app");
-
-    MessagingApplication application(argc, argv);
+    #ifdef MAPPLAUNCHERD_ENABLED
+        QScopedPointer<QGuiApplication> app(MDeclarativeCache::qApplication(argc, argv));
+    #else
+        QScopedPointer<QGuiApplication> app(new QGuiApplication(argc,argv));
+    #endif
+    MessagingApplication application;
 
     if (!application.setup()) {
         return 0;
     }
 
-    return application.exec();
+    return app->exec();
 }
-
 
=== modified file 'src/messaging-app.desktop.in.in'
--- src/messaging-app.desktop.in.in	2016-02-10 16:50:36 +0000
+++ src/messaging-app.desktop.in.in	2016-03-14 10:25:25 +0000
@@ -4,7 +4,7 @@
 _GenericName=Messaging App
 _Comment=Messaging application
 _Keywords=Messages;SMS;MMS;Text Messages;Text
-Exec=messaging-app %u
+Exec=@MAPPLAUNCHERD_COMMAND_PREFIX@messaging-app %u
 Terminal=false
 Icon=@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/assets/messaging-app.png
 MimeType=x-scheme-handler/contact;x-scheme-handler/call
 
=== modified file 'src/messagingapplication.cpp'
--- src/messagingapplication.cpp	2016-02-10 17:01:02 +0000
+++ src/messagingapplication.cpp	2016-03-14 10:25:25 +0000
@@ -42,6 +42,11 @@
 #include <QMimeDatabase>
 #include <QStandardPaths>
 #include <QVersitReader>
+#include <QGuiApplication>
+
+#ifdef MAPPLAUNCHERD_ENABLED
+#include <mdeclarativecache5/MDeclarativeCache>
+#endif
 
 using namespace QtVersit;
 #define Pair QPair<QString,QString>
@@ -84,10 +89,10 @@
     return new StickersHistoryModel();
 }
 
-MessagingApplication::MessagingApplication(int &argc, char **argv)
-    : QGuiApplication(argc, argv), m_view(0), m_applicationIsReady(false)
+MessagingApplication::MessagingApplication()
+    : QObject(0), m_view(0), m_applicationIsReady(false)
 {
-    setApplicationName("MessagingApp");
+    qApp->setApplicationName("MessagingApp");
 }
 
 bool MessagingApplication::fullscreen() const
@@ -105,7 +110,7 @@
         validSchemes << "message";
     }
 
-    QStringList arguments = this->arguments();
+    QStringList arguments = qApp->arguments();
 
     if (arguments.contains("--help")) {
         printUsage(arguments);
@@ -157,7 +162,11 @@
         }
     }
 
-    m_view = new QQuickView();
+    #ifdef MAPPLAUNCHERD_ENABLED
+        m_view = MDeclarativeCache::qQuickView();
+    #else
+        m_view = new QQuickView();
+    #endif
     QObject::connect(m_view, SIGNAL(statusChanged(QQuickView::Status)), this, SLOT(onViewStatusChanged(QQuickView::Status)));
     QObject::connect(m_view->engine(), SIGNAL(quit()), SLOT(quit()));
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
 
=== modified file 'src/messagingapplication.h'
--- src/messagingapplication.h	2015-11-24 18:09:55 +0000
+++ src/messagingapplication.h	2016-03-14 10:25:25 +0000
@@ -21,15 +21,14 @@
 
 #include <QObject>
 #include <QQuickView>
-#include <QGuiApplication>
 
-class MessagingApplication : public QGuiApplication
+class MessagingApplication : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
 
 public:
-    MessagingApplication(int &argc, char **argv);
+    MessagingApplication();
     virtual ~MessagingApplication();
 
     bool fullscreen() const;