Merge lp:~nick-dedekind/unity8/1398888.secondary-indicator-actions into lp:unity8

[Nick Dedekind]

Added support for secondary indicator actions

Added support for secondary indicator actions

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

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

 * Did you make sure that your branch does not contain spurious tags?
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:~nick-dedekind/unity8/1398888.secondary-indicator-actions]

2105. By Nick Dedekind on 2016-01-04

removed accidental readonly

[Lukáš Tinkl (lukas-kde)]

2 minor code issues spotted

review: Needs Fixing (code-review)

[Lukáš Tinkl (lukas-kde)]

Update the code copyright, we're 2016 now :)

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

In VolumeControl.qml:
property var indicators // passed from Shell.qml

The above isn't needed anymore after your fixes, should also be removed from Shell.qml

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

> In VolumeControl.qml:
> property var indicators // passed from Shell.qml
>
>
> The above isn't needed anymore after your fixes, should also be removed from
> Shell.qml

It's used for the GlobalSHortcut mute action.

[Lukáš Tinkl (lukas-kde)]

> > In VolumeControl.qml:
> > property var indicators // passed from Shell.qml
> >
> >
> > The above isn't needed anymore after your fixes, should also be removed from
> > Shell.qml
>
> It's used for the GlobalSHortcut mute action.

Hmm are you sure? I can't see that

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2105
http://jenkins.qa.ubuntu.com/job/unity8-ci/7005/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5911
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/420/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1710
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/411
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4562
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5922
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5922/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26381
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/176/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26382

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7005/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/1398888.secondary-indicator-actions]

2106. By Nick Dedekind on 2016-01-05

review comments

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2106
http://jenkins.qa.ubuntu.com/job/unity8-ci/7012/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5923
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/427/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1717
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/418
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5934
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5934/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26406
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/181/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/425
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/425/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26407

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7012/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> Update the code copyright, we're 2016 now :)

Fixed.

[Nick Dedekind (nick-dedekind)]

> 2 minor code issues spotted

Fixed.

[Lukáš Tinkl (lukas-kde)]

Works fine, thanks

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

Nope but no regressions in the indicator code

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

=== modified file 'plugins/Unity/Indicators/modelactionrootstate.cpp'
--- plugins/Unity/Indicators/modelactionrootstate.cpp	2015-08-19 13:56:21 +0000
+++ plugins/Unity/Indicators/modelactionrootstate.cpp	2016-01-05 06:10:29 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -32,6 +32,7 @@
 ModelActionRootState::ModelActionRootState(QObject *parent)
     : RootStateObject(parent),
       m_menu(nullptr)
+    , m_reentryGuard(false)
 {
 }
 
@@ -62,6 +63,7 @@
             connect(m_menu, &UnityMenuModel::destroyed, this, &ModelActionRootState::reset);
         }
         updateActionState();
+        updateOtherActions();
         Q_EMIT menuChanged();
 
         if (wasValid != valid())
@@ -69,6 +71,21 @@
     }
 }
 
+QString ModelActionRootState::secondaryAction() const
+{
+    return m_secondaryAction;
+}
+
+QString ModelActionRootState::scrollAction() const
+{
+    return m_scrollAction;
+}
+
+QString ModelActionRootState::submenuAction() const
+{
+    return m_submenuAction;
+}
+
 bool ModelActionRootState::valid() const
 {
     return !currentState().empty();
@@ -79,6 +96,7 @@
     Q_UNUSED(parent);
     if (start == 0 && end >= 0) {
         updateActionState();
+        updateOtherActions();
     }
 }
 
@@ -87,6 +105,7 @@
     Q_UNUSED(parent);
     if (start == 0 && end >= 0) {
         updateActionState();
+        updateOtherActions();
     }
 }
 
@@ -99,6 +118,7 @@
 
     if (topLeft.row() <= 0 && bottomRight.row() >= 0) {
         updateActionState();
+        updateOtherActions();
     }
 }
 
@@ -108,10 +128,15 @@
 
     Q_EMIT menuChanged();
     setCurrentState(QVariantMap());
+
+    updateOtherActions();
 }
 
 void ModelActionRootState::updateActionState()
 {
+    if (m_reentryGuard) return;
+    m_reentryGuard = true;
+
     if (m_menu && m_menu->rowCount() > 0) {
         ActionStateParser* oldParser = m_menu->actionStateParser();
         m_menu->setActionStateParser(&m_parser);
@@ -126,4 +151,54 @@
     }
     // else if m_menu->rowCount() == 0, let's leave existing cache in place
     // until the new menu comes in, to avoid flashing the UI empty for a moment
+
+    m_reentryGuard = false;
+}
+
+void ModelActionRootState::updateOtherActions()
+{
+    if (m_reentryGuard) return;
+    m_reentryGuard = true;
+
+    if (m_menu && m_menu->rowCount() > 0) {
+        QVariantMap map;
+        map[QStringLiteral("submenu-action")] = QStringLiteral("string");
+        map[QStringLiteral("x-canonical-scroll-action")] = QStringLiteral("string");
+        map[QStringLiteral("x-canonical-secondary-action")] = QStringLiteral("string");
+        m_menu->loadExtendedAttributes(0, map);
+        QVariantMap extMap = m_menu->get(0, "ext").toMap();
+
+        QString secondaryAction = extMap.value(QStringLiteral("xCanonicalSecondaryAction")).toString();
+        if (m_secondaryAction != secondaryAction) {
+            m_secondaryAction = secondaryAction;
+            Q_EMIT secondaryActionChanged();
+        }
+
+        QString scrollAction = extMap.value(QStringLiteral("xCanonicalScrollAction")).toString();
+        if (m_scrollAction != scrollAction) {
+            m_scrollAction = scrollAction;
+            Q_EMIT scrollActionChanged();
+        }
+
+        QString submenuAction = extMap.value(QStringLiteral("submenuAction")).toString();
+        if (m_submenuAction != submenuAction) {
+            m_submenuAction = submenuAction;
+            Q_EMIT submenuActionChanged();
+        }
+    } else {
+        if (!m_secondaryAction.isEmpty()) {
+            m_secondaryAction.clear();
+            Q_EMIT secondaryActionChanged();
+        }
+        if (!m_scrollAction.isEmpty()) {
+            m_scrollAction.clear();
+            Q_EMIT scrollActionChanged();
+        }
+        if (!m_submenuAction.isEmpty()) {
+            m_submenuAction.clear();
+            Q_EMIT submenuActionChanged();
+        }
+    }
+
+    m_reentryGuard = false;
 }

=== modified file 'plugins/Unity/Indicators/modelactionrootstate.h'
--- plugins/Unity/Indicators/modelactionrootstate.h	2014-11-11 10:45:41 +0000
+++ plugins/Unity/Indicators/modelactionrootstate.h	2016-01-05 06:10:29 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -30,6 +30,9 @@
 {
     Q_OBJECT
     Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
+    Q_PROPERTY(QString secondaryAction READ secondaryAction NOTIFY secondaryActionChanged)
+    Q_PROPERTY(QString scrollAction READ scrollAction NOTIFY scrollActionChanged)
+    Q_PROPERTY(QString submenuAction READ submenuAction NOTIFY submenuActionChanged)
 public:
     ModelActionRootState(QObject *parent = 0);
     virtual ~ModelActionRootState();
@@ -37,14 +40,17 @@
     UnityMenuModel* menu() const;
     void setMenu(UnityMenuModel* menu);
 
-    int index() const;
-    void setIndex(int index);
+    QString secondaryAction() const;
+    QString scrollAction() const;
+    QString submenuAction() const;
 
     bool valid() const override;
 
 Q_SIGNALS:
     void menuChanged();
-    void indexChanged();
+    void secondaryActionChanged();
+    void scrollActionChanged();
+    void submenuActionChanged();
 
 private Q_SLOTS:
     void onModelRowsAdded(const QModelIndex& parent, int start, int end);
@@ -54,8 +60,13 @@
 
 private:
     void updateActionState();
+    void updateOtherActions();
 
     UnityMenuModel* m_menu;
+    QString m_secondaryAction;
+    QString m_scrollAction;
+    QString m_submenuAction;
+    bool m_reentryGuard;
 };
 
 #endif // MODELACTIONROOTSTATE_H

=== modified file 'qml/Components/VolumeControl.qml'
--- qml/Components/VolumeControl.qml	2015-11-18 15:07:35 +0000
+++ qml/Components/VolumeControl.qml	2016-01-05 06:10:29 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical, Ltd.
+ * Copyright (C) 2013-2016 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
@@ -28,10 +28,6 @@
     readonly property int stepDown: -1
 
     property var indicators // passed from Shell.qml
-    readonly property bool showNotification: indicators && indicators.fullyOpened && indicators.currentIndicator === "indicator-sound"
-    onShowNotificationChanged: { // disallow the volume notification when using the slider, lpbug#1484126
-        actionGroup.indicatorsAction.updateState(root.showNotification);
-    }
 
     GlobalShortcut {
         id: muteShortcut
@@ -47,7 +43,6 @@
 
         property variant actionObject: action("volume")
         property variant muteActionObject: indicators.indicatorsModel.profile === "desktop" ? action("mute") : action("silent-mode")
-        property variant indicatorsAction: action("indicator-shown")
     }
 
     function volumeUp() {

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2015-11-25 16:12:05 +0000
+++ qml/Panel/IndicatorItem.qml	2016-01-05 06:10:29 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
+import QMenuModel 0.1
 import "Indicators"
 
 IndicatorDelegate {
@@ -36,13 +37,24 @@
         return "#ffffff";
     }
 
-    signal clicked()
-
     implicitWidth: mainItems.width
 
     MouseArea {
+        readonly property int stepUp: 1
+        readonly property int stepDown: -1
+
         anchors.fill: parent
-        onClicked: parent.clicked()
+        acceptedButtons: Qt.MiddleButton
+        onClicked: {
+            if ((!expanded || selected) && secondaryAction.valid) {
+                secondaryAction.activate();
+            }
+        }
+        onWheel: {
+            if ((!expanded || selected) && scrollAction.valid) {
+                scrollAction.activate(wheel.angleDelta.y > 0 ? stepUp : stepDown);
+            }
+        }
     }
 
     Item {
@@ -152,9 +164,6 @@
     }
 
     StateGroup {
-        id: d
-        property bool useFallbackIcon: false
-
         states: [
             State {
                 name: "minimised"
@@ -251,4 +260,45 @@
         rightLabel = rootActionState.rightLabel ? rootActionState.rightLabel : "";
         icons = rootActionState.icons;
     }
+
+    QtObject {
+        id: d
+
+        property bool useFallbackIcon: false
+        property var shouldIndicatorBeShown: undefined
+
+        onShouldIndicatorBeShownChanged: {
+            if (shouldIndicatorBeShown !== undefined) {
+                submenuAction.changeState(shouldIndicatorBeShown);
+            }
+        }
+    }
+
+    UnityMenuAction {
+        id: secondaryAction
+        model: menuModel
+        index: 0
+        name: rootActionState.secondaryAction
+    }
+
+    UnityMenuAction {
+        id: scrollAction
+        model: menuModel
+        index: 0
+        name: rootActionState.scrollAction
+    }
+
+    UnityMenuAction {
+        id: submenuAction
+        model: menuModel
+        index: 0
+        name: rootActionState.submenuAction
+    }
+
+    Binding {
+        target: d
+        property: "shouldIndicatorBeShown"
+        when: submenuAction.valid
+        value: root.selected && root.expanded
+    }
 }

=== modified file 'tests/mocks/Unity/Indicators/ModelActionRootState.qml'
--- tests/mocks/Unity/Indicators/ModelActionRootState.qml	2015-07-15 15:07:19 +0000
+++ tests/mocks/Unity/Indicators/ModelActionRootState.qml	2016-01-05 06:10:29 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -30,10 +30,20 @@
     property bool indicatorVisible: cachedState && cachedState.hasOwnProperty("visible") ? cachedState["visible"] : true
 
     property var cachedState: menu ? menu.get(0, "actionState") : undefined
+    property string submenuAction: {
+        if (!menu) return "";
+        var ext = menu.get(0, "ext");
+        var submenuVar = ext ? ext["submenu-action"] : undefined;
+        return submenuVar ? submenuVar : ""
+    }
     Connections {
         target: menu
         onModelDataChanged: {
             cachedState = menu.get(0, "actionState");
+
+            var ext = menu.get(0, "ext");
+            var submenuVar = ext ? ext["submenu-action"] : undefined;
+            submenuAction = submenuVar ? submenuVar : ""
         }
     }