Merge lp:~aacid/unity8/menutool into lp:unity8

[Albert Astals Cid]

Add tool to browse menus of a running app

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/menutool]

2838. By Albert Astals Cid on 2017-02-27

space--

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2838
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3218/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4222
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2496
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2496
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4250
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4085/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3218/rebuild

review: Approve (continuous-integration)

[lp:~aacid/unity8/menutool]

2839. By Albert Astals Cid on 2017-03-01

Add a rotating rectangle, useful to see when the menus are being "slow" rebuilding themselves

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2839
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3233/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4242
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2516
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2516
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4270
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4105
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4105/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4105
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4105/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4105
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4105/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4105
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4105/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4105
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4105/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4105
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4105/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3233/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2839
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3239/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4248
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2520
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2520
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4276
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4112
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4112/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4112
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4112/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4112
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4112/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4112
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4112/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4112
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4112/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4112
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4112/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3239/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/menutool]

2840. By Albert Astals Cid on 2017-03-03

Give you a hint that you did something wrong

[Lukáš Tinkl (lukas-kde)]

Yes, works nicely! https://imgur.com/a/XZYxn

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Unrelated flaky tests :/

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2840
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3276/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4313
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4341
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4175/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4175
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4175/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3276/rebuild

review: Approve (continuous-integration)

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-05-09 12:38:10 +0000
+++ tools/CMakeLists.txt	2017-03-03 12:17:19 +0000
@@ -1,14 +1,4 @@
-add_executable(${SCOPE_TOOL}
-    scopetool.cpp
-    registry-tracker.cpp
-    ../src/UnixSignalHandler.cpp
-    )
-
-qt5_use_modules(${SCOPE_TOOL} Qml Quick)
-
-# install binaries
-install(TARGETS ${SCOPE_TOOL}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    )
+add_subdirectory(menutool)
+add_subdirectory(scopetool)
 
 install(FILES unlock-device DESTINATION ${SHELL_APP_DIR})

=== added directory 'tools/menutool'
=== added file 'tools/menutool/CMakeLists.txt'
--- tools/menutool/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tools/menutool/CMakeLists.txt	2017-03-03 12:17:19 +0000
@@ -0,0 +1,5 @@
+add_executable(menutool
+    menutool.cpp
+    )
+
+qt5_use_modules(menutool Qml Quick)

=== added file 'tools/menutool/README'
--- tools/menutool/README	1970-01-01 00:00:00 +0000
+++ tools/menutool/README	2017-03-03 12:17:19 +0000
@@ -0,0 +1,11 @@
+This tool can be used to browse the menus of another application
+
+How to use:
+ * Start application that exports menus
+    e.g. QT_QPA_PLATFORMTHEME=ubuntuappmenu kate
+ * Figure out which is the dbus address
+   * This is a bit tricky, but using qdbusviewer to see the addresses
+     that appear when starting the app and looking for one that
+     contains com/Ubuntu/Menu/0 should be enough
+ * Start tool passing the dbus address
+    builddir/menutool/menutool :1.293

=== added file 'tools/menutool/menutool.cpp'
--- tools/menutool/menutool.cpp	1970-01-01 00:00:00 +0000
+++ tools/menutool/menutool.cpp	2017-03-03 12:17:19 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Qt
+#include <QDebug>
+#include <QCommandLineParser>
+#include <QGuiApplication>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickView>
+
+// local
+#include <paths.h>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication::setApplicationName("Menu Test Tool");
+    QGuiApplication *application = new QGuiApplication(argc, argv);
+
+    QCommandLineParser parser;
+    parser.parse(application->arguments());
+    const QStringList args = parser.positionalArguments();
+
+    if (args.count() != 1) {
+        qWarning() << "You need to pass the dbus address";
+        return 1;
+    }
+
+    QQuickView* view = new QQuickView();
+    view->setResizeMode(QQuickView::SizeRootObjectToView);
+    view->setTitle(QGuiApplication::applicationName());
+    view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
+    view->rootContext()->setContextProperty("contextBusName", args[0]);
+
+    QUrl source(::sourceDirectory() + "/tools/menutool/menutool.qml");
+    prependImportPaths(view->engine(), ::overrideImportPaths());
+    prependImportPaths(view->engine(), ::nonMirImportPaths());
+
+    view->setSource(source);
+
+    view->show();
+
+    int result = application->exec();
+
+    delete view;
+    delete application;
+
+    return result;
+}

=== added file 'tools/menutool/menutool.qml'
--- tools/menutool/menutool.qml	1970-01-01 00:00:00 +0000
+++ tools/menutool/menutool.qml	2017-03-03 12:17:19 +0000
@@ -0,0 +1,118 @@
+/*
+* Copyright (C) 2017 Canonical, Ltd.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; version 3.
+*
+* This program 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 General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+import "../../qml/ApplicationMenus"
+import "../../qml/Panel"
+import "../../qml/Components/PanelState"
+
+import QMenuModel 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Item {
+    width: units.gu(180)
+    height: units.gu(120)
+
+    UnityMenuModel {
+        id: menuModel
+        busName: contextBusName
+        menuObjectPath: "/com/ubuntu/Menu/0"
+        actions: { "unity": "/com/ubuntu/Menu/0" }
+    }
+
+    readonly property bool hasMenus: repeater.count > 0
+    Repeater {
+        id: repeater
+        model: menuModel
+        delegate: Item {}
+    }
+
+    Panel {
+        id: panel
+
+        height: parent.height
+        width: parent.width / 2
+        minimizedPanelHeight: units.gu(6)
+        visible: hasMenus
+
+        mode: "windowed"
+
+        applicationMenus {
+            model: menuModel
+        }
+
+        Rectangle {
+            width: 50
+            height: 50
+            anchors.centerIn: parent
+            color: "gray"
+            rotation: 45
+            Timer {
+                interval: 20
+                running: true
+                repeat: true
+                onTriggered: parent.rotation = parent.rotation+1
+            }
+        }
+
+        Rectangle {
+            color: "green"
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
+            Label {
+                id: label
+                anchors.centerIn: parent
+                text: "Click here to open touch menu manually"
+            }
+            width: label.width + units.gu(2)
+            height: label.height + units.gu(2)
+            MouseArea {
+                anchors.fill: parent
+                onClicked: panel.applicationMenus.show();
+            }
+            visible: !panel.applicationMenus.shown
+        }
+    }
+
+    Rectangle {
+        color: "blue"
+        height: parent.height
+        width: parent.width / 2
+        x: width
+        visible: hasMenus
+
+        MenuBar {
+            id: menuBar
+            height: units.gu(3)
+            width: parent.width
+            enableKeyFilter: true
+            unityMenuModel: menuModel
+        }
+    }
+
+    Component.onCompleted: {
+        theme.name = "Ubuntu.Components.Themes.SuruDark";
+        PanelState.title = "Drag here to open touch menu";
+    }
+
+    Text {
+        anchors.centerIn: parent
+        text: "The dbus address you gave has no menus. Make sure you read the README file."
+        visible: !hasMenus
+    }
+}

=== added directory 'tools/scopetool'
=== added file 'tools/scopetool/CMakeLists.txt'
--- tools/scopetool/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tools/scopetool/CMakeLists.txt	2017-03-03 12:17:19 +0000
@@ -0,0 +1,12 @@
+add_executable(${SCOPE_TOOL}
+    scopetool.cpp
+    registry-tracker.cpp
+    ../../src/UnixSignalHandler.cpp
+    )
+
+qt5_use_modules(${SCOPE_TOOL} Qml Quick)
+
+# install binaries
+install(TARGETS ${SCOPE_TOOL}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )

=== renamed file 'tools/registry-tracker.cpp' => 'tools/scopetool/registry-tracker.cpp'
=== renamed file 'tools/registry-tracker.h' => 'tools/scopetool/registry-tracker.h'
=== renamed file 'tools/scopetool.cpp' => 'tools/scopetool/scopetool.cpp'