Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-metrics-module into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Wrapped libUbuntuMetrics to QML.

Generic event logging and loggers API haven't been wrapped yet.

Wrapped libUbuntuMetrics to QML.

Generic event logging and loggers API haven't been wrapped yet.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2057
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1170/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4946/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1170/rebuild

review: Needs Fixing (continuous-integration)

[lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-metrics-module]

2058. By Loïc Molinari on 2016-08-09

Added Ubuntu.MEtrics to components.api.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2057
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/925/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4948/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/925/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2057
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1154/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4949/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1154/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2057
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/954/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4951/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/954/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2057
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/620/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1154
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1170/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/954
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/925/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4952/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4949
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4946
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4951
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4948

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/620/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'debian/bileto_convert_to_gles'
--- debian/bileto_convert_to_gles	2016-08-09 03:12:01 +0000
+++ debian/bileto_convert_to_gles	2016-08-09 03:12:01 +0000
@@ -14,6 +14,6 @@
 
 patch -p1 < debian/gles-disable-documentation.patch
 
-for gles in libubuntugestures5-gles.install libubuntugestures5-gles-dev.install libubuntumetrics5-gles.install libubuntumetrics5-gles-dev.install libubuntutoolkit5-gles.install libubuntutoolkit5-gles-dev.install qml-module-ubuntu-components-gles.install qml-module-ubuntu-components-gles.lintian-overrides qml-module-ubuntu-performancemetrics-gles.install ; do
+for gles in libubuntugestures5-gles.install libubuntugestures5-gles-dev.install libubuntumetrics5-gles.install libubuntumetrics5-gles-dev.install libubuntutoolkit5-gles.install libubuntutoolkit5-gles-dev.install qml-module-ubuntu-components-gles.install qml-module-ubuntu-components-gles.lintian-overrides qml-module-ubuntu-performancemetrics-gles.install qml-module-ubuntu-metrics-gles.install ; do
     mv --verbose debian/"$(echo $gles | sed 's/-gles//')" debian/$gles
 done

=== modified file 'debian/control'
--- debian/control	2016-08-09 03:12:01 +0000
+++ debian/control	2016-08-09 03:12:01 +0000
@@ -176,6 +176,22 @@
  .
  This package contains the Ubuntu PerformanceMetrics QML plugin.
 
+Package: qml-module-ubuntu-metrics
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+        unity8 (<< 8.14),
+Replaces: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
+Description: Qt Components for Ubuntu - Metrics QML plugin
+ Qt Components for Ubuntu offers a set of reusable user interface
+ components for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu Metrics QML plugin.
+
 Package: qtdeclarative5-ubuntu-ui-toolkit-plugin
 Architecture: any
 Section: oldlibs

=== added file 'debian/qml-module-ubuntu-metrics.install'
--- debian/qml-module-ubuntu-metrics.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-metrics.install	2016-08-09 03:12:01 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/qt5/qml/Ubuntu/Metrics/libUbuntuMetrics.so
+usr/lib/*/qt5/qml/Ubuntu/Metrics/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/Metrics/qmldir

=== added directory 'src/Ubuntu/Metrics'
=== added file 'src/Ubuntu/Metrics/Metrics.pro'
--- src/Ubuntu/Metrics/Metrics.pro	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Metrics/Metrics.pro	2016-08-09 03:12:01 +0000
@@ -0,0 +1,7 @@
+CXX_MODULE = qml
+TARGET  = UbuntuMetrics
+TARGETPATH = Ubuntu/Metrics
+IMPORT_VERSION = 1.0
+QT += qml UbuntuMetrics
+SOURCES += plugin.cpp
+load(ubuntu_qml_plugin)

=== added file 'src/Ubuntu/Metrics/MetricsModule.pro'
--- src/Ubuntu/Metrics/MetricsModule.pro	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Metrics/MetricsModule.pro	2016-08-09 03:12:01 +0000
@@ -0,0 +1,19 @@
+TEMPLATE = aux
+CONFIG += ubuntu_qml_module
+
+uri = Ubuntu.Metrics
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+QMLDIR_FILE = qmldir
+
+qmldir_file.installPath = $$installPath
+qmldir_file.files = $$QMLDIR_FILE
+UBUNTU_QML_MODULE_FILES += qmldir_file
+
+plugins_qmltypes.path = $$installPath
+plugins_qmltypes.files = plugins.qmltypes
+# Silence spam on stderr due to fonts.
+# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
+# https://bugreports.qt-project.org/browse/QTBUG-36243
+plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable $$uri 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
+
+INSTALLS += plugins_qmltypes

=== added file 'src/Ubuntu/Metrics/plugin.cpp'
--- src/Ubuntu/Metrics/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Metrics/plugin.cpp	2016-08-09 03:12:01 +0000
@@ -0,0 +1,127 @@
+// Copyright © 2016 Canonical Ltd.
+//
+// This file is part of Ubuntu UI Toolkit.
+//
+// Ubuntu UI Toolkit 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.
+//
+// Ubuntu UI Toolkit 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 Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
+
+#include <QtQml/QtQml>
+#include <UbuntuMetrics/applicationmonitor.h>
+
+// FIXME(loicm)
+//   - Not sure how to add support for the loggers API?
+//   - Add support for the generic logging API.
+
+class ApplicationMonitorWrapper : public QObject
+{
+    Q_OBJECT
+
+    Q_FLAGS(LoggingFilters);
+    Q_ENUMS(Event);
+    Q_PROPERTY(bool overlay READ overlay WRITE setOverlay NOTIFY overlayChanged)
+    Q_PROPERTY(bool logging READ logging WRITE setLogging NOTIFY loggingChanged)
+    Q_PROPERTY(LoggingFilters loggingFilter READ loggingFilter WRITE setLoggingFilter
+               NOTIFY loggingFilterChanged)
+    Q_PROPERTY(int processUpdateInterval READ processUpdateInterval
+               WRITE setProcessUpdateInterval NOTIFY processUpdateIntervalChanged)
+
+public:
+    ApplicationMonitorWrapper(QObject* parent = 0)
+        : QObject(parent)
+        , m_applicationMonitor(UMApplicationMonitor::instance())
+    {
+        QObject::connect(m_applicationMonitor, SIGNAL(overlayChanged()),
+                         this, SIGNAL(overlayChanged()));
+        QObject::connect(m_applicationMonitor, SIGNAL(loggingChanged()),
+                         this, SIGNAL(loggingChanged()));
+        QObject::connect(m_applicationMonitor, SIGNAL(loggingFilterChanged()),
+                         this, SIGNAL(loggingFilterChanged()));
+        QObject::connect(m_applicationMonitor, SIGNAL(updateIntervalChanged(UMEvent::Type)),
+                         this, SLOT(updateIntervalChanged(UMEvent::Type)));
+    }
+    ~ApplicationMonitorWrapper() {}
+
+    enum LoggingFilter {
+        ProcessEvent = UMApplicationMonitor::ProcessEvent,
+        WindowEvent  = UMApplicationMonitor::WindowEvent,
+        FrameEvent   = UMApplicationMonitor::FrameEvent,
+        GenericEvent = UMApplicationMonitor::GenericEvent,
+        AllEvents    = UMApplicationMonitor::AllEvents
+    };
+    Q_DECLARE_FLAGS(LoggingFilters, LoggingFilter)
+
+    enum Event {
+        UserInterfaceReady = UMApplicationMonitor::UserInterfaceReady
+    };
+
+    bool overlay() const { return m_applicationMonitor->overlay(); }
+    void setOverlay(bool overlay) { m_applicationMonitor->setOverlay(overlay); }
+    bool logging() const { return m_applicationMonitor->logging(); }
+    void setLogging(bool logging) { m_applicationMonitor->setLogging(logging); }
+    LoggingFilters loggingFilter() const {
+        return QFlags<LoggingFilters>::enum_type(
+            QFlags<UMApplicationMonitor::LoggingFilters>::Int(
+                m_applicationMonitor->loggingFilter())); }
+    void setLoggingFilter(LoggingFilters filter) {
+        m_applicationMonitor->setLoggingFilter(
+            QFlags<UMApplicationMonitor::LoggingFilters>::enum_type(
+                QFlags<LoggingFilters>::Int(filter))); }
+    int processUpdateInterval() const {
+        return m_applicationMonitor->updateInterval(UMEvent::Process); }
+    void setProcessUpdateInterval(int interval) {
+        m_applicationMonitor->setUpdateInterval(UMEvent::Process, interval); }
+
+    Q_INVOKABLE bool logEvent(Event event) {
+        return m_applicationMonitor->logEvent(static_cast<UMApplicationMonitor::Event>(event)); }
+
+Q_SIGNALS:
+    void overlayChanged();
+    void loggingChanged();
+    void loggingFilterChanged();
+    void processUpdateIntervalChanged();
+
+private Q_SLOTS:
+    void updateIntervalChanged(UMEvent::Type type)
+    {
+        if (type == UMEvent::Process) {
+            Q_EMIT processUpdateIntervalChanged();
+        }
+    }
+
+private:
+    UMApplicationMonitor* m_applicationMonitor;
+};
+
+static QObject* applicationMonitorSingletonProvider(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new ApplicationMonitorWrapper();
+}
+
+class UbuntuMetricsPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+
+public:
+    ~UbuntuMetricsPlugin() {}
+
+    virtual void registerTypes(const char* uri) override
+    {
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("Ubuntu.Metrics"));
+        qmlRegisterSingletonType<ApplicationMonitorWrapper>(
+            uri, 1, 0, "ApplicationMonitor", applicationMonitorSingletonProvider);
+    }
+};
+
+#include "plugin.moc"

=== added file 'src/Ubuntu/Metrics/qmldir'
--- src/Ubuntu/Metrics/qmldir	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Metrics/qmldir	2016-08-09 03:12:01 +0000
@@ -0,0 +1,4 @@
+module Ubuntu.Metrics
+plugin UbuntuMetrics
+classname UbuntuMetricsPlugin
+typeinfo plugins.qmltypes

=== modified file 'src/src.pro'
--- src/src.pro	2016-08-09 03:12:01 +0000
+++ src/src.pro	2016-08-09 03:12:01 +0000
@@ -1,38 +1,49 @@
 TEMPLATE = subdirs
 
-src_gestures.subdir = Ubuntu/UbuntuGestures
-src_gestures.target = sub-gestures
-
-src_metrics.subdir = Ubuntu/UbuntuMetrics
-src_metrics.target = sub-metrics
-
-src_metrics_lttng.subdir = Ubuntu/UbuntuMetrics/lttng
-src_metrics_lttng.target = sub-metrics-lttng
-
-src_toolkitlib.subdir = Ubuntu/UbuntuToolkit
-src_toolkitlib.target = sub-libtoolkit
-src_toolkitlib.depends = sub-gestures sub-metrics
-
-src_components.subdir = Ubuntu/Components
-src_components.target = sub-components
-src_components.depends = sub-libtoolkit 
-
-src_layouts.subdir = Ubuntu/Layouts
-src_layouts.target = sub-layouts
-
-src_performance_metrics.subdir = Ubuntu/PerformanceMetrics
-src_performance_metrics.target = sub-performance-metrics
-
-src_test.subdir = Ubuntu/Test
-src_test.target = sub-test
-src_test.depends = sub-components 
+# Libraries
+
+src_gestures_lib.subdir = Ubuntu/UbuntuGestures
+src_gestures_lib.target = sub-gestures-lib
+
+src_metrics_lib.subdir = Ubuntu/UbuntuMetrics
+src_metrics_lib.target = sub-metrics-lib
+
+src_toolkit_lib.subdir = Ubuntu/UbuntuToolkit
+src_toolkit_lib.target = sub-toolkit-lib
+src_toolkit_lib.depends = sub-gestures-lib sub-metrics-lib
+
+# Plugins
+
+src_metrics_lttng_plugin.subdir = Ubuntu/UbuntuMetrics/lttng
+src_metrics_lttng_plugin.target = sub-metrics-lttng-plugin
+
+# QML modules
+
+src_metrics_module.subdir = Ubuntu/Metrics
+src_metrics_module.target = sub-metrics-module
+src_metrics_module.depends = sub-metrics-lib
+
+src_components_module.subdir = Ubuntu/Components
+src_components_module.target = sub-components-module
+src_components_module.depends = sub-toolkit-lib
+
+src_layouts_module.subdir = Ubuntu/Layouts
+src_layouts_module.target = sub-layouts-module
+
+src_performance_metrics_module.subdir = Ubuntu/PerformanceMetrics
+src_performance_metrics_module.target = sub-performance-metrics-module
+
+src_test_module.subdir = Ubuntu/Test
+src_test_module.target = sub-test-module
+src_test_module.depends = sub-toolkit-lib
 
 SUBDIRS += \
-    src_gestures \
-    src_metrics \
-    src_metrics_lttng \
-    src_toolkitlib \
-    src_components \
-    src_layouts \
-    src_performance_metrics \
-    src_test
+    src_gestures_lib \
+    src_metrics_lib \
+    src_toolkit_lib \
+    src_metrics_lttng_plugin \
+    src_metrics_module \
+    src_components_module \
+    src_layouts_module \
+    src_performance_metrics_module \
+    src_test_module