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

[Albert Astals Cid]

menutool: Use the ApplicationMenuRegistry

... instead of asking people to figure out the dbus service manually

 * 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/menuToolBrowser]

2893. By Albert Astals Cid on 2017-03-27

hook up the unregistered signal too

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

FAILED: Continuous integration, rev:2892
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3552/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4712
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2866
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2866/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4740
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4563
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4563/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4563
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4563/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4563
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4563/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4563
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4563/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4563
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4563/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4563
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4563/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2893
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3557/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4717/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4745
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4568/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4568/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4568/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4568/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4568/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4568/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2893
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3560/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4720
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2873
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2873/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4748
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4571
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4571/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4571
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4571/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4571
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4571/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4571
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4571/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4571
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4571/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4571
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4571/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2893
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3566/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4727
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2876
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2876
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4755
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4576
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4576/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4576
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4576/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4576
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4576/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4576
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4576/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4576
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4576/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4576
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4576/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2893
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3574/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Nice improvement, I like it

* 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.

Waiting

review: Approve

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

PASSED: Continuous integration, rev:2893
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3567/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4728
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2880
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2880
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4756
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4580
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4580/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4580
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4580/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4580
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4580/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4580
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4580/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4580
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4580/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4580
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4580/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2893
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3572/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4734
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2886
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2886
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4762
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4585
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4585/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4585
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4585/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4585
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4585/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4585
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4585/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4585
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4585/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4585
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4585/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Unmerged revisions

2893. By Albert Astals Cid on 2017-03-27

hook up the unregistered signal too

2892. By Albert Astals Cid on 2017-03-27

menutool: Use the ApplicationMenuRegistry instead of asking people to figure out the dbus service manually

=== modified file 'plugins/Unity/ApplicationMenu/applicationmenuregistry.cpp'
--- plugins/Unity/ApplicationMenu/applicationmenuregistry.cpp	2016-12-15 14:50:05 +0000
+++ plugins/Unity/ApplicationMenu/applicationmenuregistry.cpp	2017-03-27 14:19:37 +0000
@@ -139,3 +139,12 @@
     }
     return list;
 }
+
+QVariantMap ApplicationMenuRegistry::appMenus() const
+{
+    QVariantMap result;
+    for (auto it = m_appMenus.begin(); it != m_appMenus.end(); ++it) {
+        result.insert(QString::number(it.key()), QVariant::fromValue(it.value()));
+    }
+    return result;
+}

=== modified file 'plugins/Unity/ApplicationMenu/applicationmenuregistry.h'
--- plugins/Unity/ApplicationMenu/applicationmenuregistry.h	2016-12-15 14:50:05 +0000
+++ plugins/Unity/ApplicationMenu/applicationmenuregistry.h	2017-03-27 14:19:37 +0000
@@ -66,6 +66,9 @@
                              const QString &service);
     void UnregisterSurfaceMenu(const QString &surfaceId, const QDBusObjectPath &menuObjectPath);
 
+    // for menutool
+    Q_INVOKABLE QVariantMap appMenus() const;
+
 Q_SIGNALS:
     void appMenuRegistered(uint processId);
     void appMenuUnregistered(uint processId);

=== modified file 'tools/menutool/README'
--- tools/menutool/README	2017-02-27 14:43:00 +0000
+++ tools/menutool/README	2017-03-27 14:19:37 +0000
@@ -3,9 +3,5 @@
 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
+ * Start tool and choose the pid you want in the list
+    builddir/tools/menutool/menutool

=== modified file 'tools/menutool/menutool.cpp'
--- tools/menutool/menutool.cpp	2017-02-27 14:43:00 +0000
+++ tools/menutool/menutool.cpp	2017-03-27 14:19:37 +0000
@@ -30,20 +30,10 @@
     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());

=== modified file 'tools/menutool/menutool.qml'
--- tools/menutool/menutool.qml	2017-03-03 12:16:51 +0000
+++ tools/menutool/menutool.qml	2017-03-27 14:19:37 +0000
@@ -23,24 +23,35 @@
 
 import QMenuModel 0.1
 import Unity.Indicators 0.1 as Indicators
+import Unity.ApplicationMenu 0.1
 
 Item {
     width: units.gu(180)
     height: units.gu(120)
 
+    Connections {
+        target: ApplicationMenuRegistry
+        onAppMenuRegistered: rebuildAppList();
+        onAppMenuUnregistered: rebuildAppList();
+    }
+
+    function rebuildAppList() {
+        appsModel.clear();
+        var theMenus = ApplicationMenuRegistry.appMenus();
+        for (var i in theMenus) {
+            appsModel.append({"pid": i, "menuData": theMenus[i]});
+        }
+    }
+
+    ListModel {
+        id: appsModel
+    }
+
     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 {}
-    }
+    property bool showingMenus: false
 
     Panel {
         id: panel
@@ -48,7 +59,7 @@
         height: parent.height
         width: parent.width / 2
         minimizedPanelHeight: units.gu(6)
-        visible: hasMenus
+        visible: showingMenus
 
         mode: "windowed"
 
@@ -94,7 +105,7 @@
         height: parent.height
         width: parent.width / 2
         x: width
-        visible: hasMenus
+        visible: showingMenus
 
         MenuBar {
             id: menuBar
@@ -110,9 +121,29 @@
         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
+    Item {
+        anchors.fill: parent
+        visible: !showingMenus
+
+        Column {
+            anchors.centerIn: parent
+            Text {
+                text: appsModel.count > 0 ? "Please select a menu to show:" : "You are not running any application that exports menus. See the README"
+            }
+
+            Repeater {
+                model: appsModel
+
+                Button {
+                    text: "PID: " + pid + "\tmenuPath: " + menuData.menuPath
+                    onClicked: {
+                        menuModel.busName = menuData.service;
+                        menuModel.menuObjectPath = menuData.menuPath;
+                        menuModel.actions = { "unity": menuData.actionPath };
+                        showingMenus = true;
+                    }
+                }
+            }
+        }
     }
 }