Preliminary support for notch in indicator bar

qml/Panel/Indicators/IndicatorItem.qml

@@ -30,6 +30,8 @@ IndicatorDelegate {
     property bool expanded: false
     property bool selected: false
     property real iconHeight: units.gu(2)
+    property bool notch: identifier === "notch"
+    property real notchW: units.gu(3)
     readonly property color color: {
         if (!expanded) return theme.palette.normal.backgroundText;
         if (!selected) return theme.palette.disabled.backgroundText;
@@ -65,7 +67,7 @@ IndicatorDelegate {
         id: mainItems
         anchors.centerIn: parent
 
-        width: leftLabelItem.width + iconsItem.width + rightLabelItem.width
+        width: notch ? notchW : leftLabelItem.width + iconsItem.width + rightLabelItem.width
         implicitHeight: units.gu(2)
 
         Label {
@@ -106,6 +108,7 @@ IndicatorDelegate {
                     id: iconRepeater
                     objectName: "iconRepeater"
 
+                    // model: notch ? [] : d.useFallbackIcon ? [ "image://theme/settings" ] : root.icons
                     model: d.useFallbackIcon ? [ "image://theme/settings" ] : root.icons
 
                     Icon {
@@ -117,6 +120,7 @@ IndicatorDelegate {
                         source: modelData
                         color: root.color
                         Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
+                        visible: !notch
 
                         // Workaround indicators getting stretched/squished when (un)plugging external/virtual monitor
                         onHeightChanged: {

qml/Panel/Panel.qml

@@ -52,6 +52,11 @@ Item {
     // Whether our expanded menus should take up the full width of the panel
     property bool partialWidth: width >= units.gu(60)
 
+    property alias expanded: __indicators.expanded
+    property alias listView: __indicators.listView
+    property real notchW: units.gu(3)
+    // onNotchWChanged: console.log(notchW)
+
     property string mode: "staged"
 
     MouseArea {
@@ -422,6 +427,8 @@ Item {
                 height: parent.height
                 expanded: indicators.expanded
                 selected: ListView.isCurrentItem
+                notchW: root.notchW
+                // onNotchWChanged: console.log(notchW)
 
                 identifier: model.identifier
                 busName: indicatorProperties.busName
@@ -437,27 +444,30 @@ Item {
             }
 
             pageDelegate: PanelMenuPage {
-                objectName: modelData.identifier + "-page"
+                objectName: modelData ? modelData.identifier + "-page" : ""
                 submenuIndex: 0
 
                 menuModel: delegate.menuModel
 
                 factory: IndicatorMenuItemFactory {
                     indicator: {
-                        var context = modelData.identifier;
+                        var context = modelData ? modelData.identifier : "";
                         if (context && context.indexOf("fake-") === 0) {
                             context = context.substring("fake-".length)
                         }
+                        // if (context && context === "notch") {
+                        //     return undefined
+                        // }
                         return context;
                     }
                     rootModel: delegate.menuModel
                 }
 
                 IndicatorDelegate {
                     id: delegate
-                    busName: modelData.indicatorProperties.busName
-                    actionsObjectPath: modelData.indicatorProperties.actionsObjectPath
-                    menuObjectPath: modelData.indicatorProperties.menuObjectPath
+                    busName: modelData ? modelData.indicatorProperties.busName : ""
+                    actionsObjectPath: modelData ? modelData.indicatorProperties.actionsObjectPath : ""
+                    menuObjectPath: modelData ? modelData.indicatorProperties.menuObjectPath : ""
                 }
             }
 

qml/Panel/PanelBar.qml

@@ -34,9 +34,16 @@ Item {
 
     property alias hideRow: row.hideRow
     property alias rowItemDelegate: row.delegate
+    property alias listView: row.listView
 
     implicitWidth: flickable.contentWidth
 
+    function indicatorAt(x, y) {
+        return row.indicatorAt(x, y)
+    }
+    function getCurrentItemX() {
+        return row.getCurrentItemX()
+    }
     function selectItemAt(lateralPosition) {
         if (!expanded) {
             row.resetCurrentItem();

qml/Panel/PanelItemRow.qml

@@ -30,6 +30,7 @@ Item {
     property bool expanded: false
     readonly property alias currentItem: row.currentItem
     readonly property alias currentItemIndex: row.currentIndex
+    property alias listView: row
 
     property real unitProgress: 0.0
     property real selectionChangeBuffer: units.gu(2)
@@ -128,6 +129,10 @@ Item {
         return false;
     }
 
+    function getCurrentItemX() {
+        return row.currentItem.x
+    }
+
     function selectItemAt(lateralPosition) {
         var item = indicatorAt(lateralPosition, 0);
         if (item && item.opacity > 0 && item.enabled) {

qml/Panel/PanelMenu.qml

@@ -89,6 +89,23 @@ Showable {
 
     onUnitProgressChanged: d.updateState()
 
+    property alias listView: bar.listView
+    function indicatorAt(x, y) {
+        return bar.indicatorAt(x, y)
+    }
+    function selectNextItem() {
+        return bar.selectNextItem()
+    }
+    function selectPreviousItem() {
+        return bar.selectPreviousItem()
+    }
+    function setCurrentItemIndex(i) {
+        return bar.setCurrentItemIndex(i)
+    }
+    function getCurrentItemX() {
+        return bar.getCurrentItemX()
+    }
+
     Item {
         anchors {
             left: parent.left

qml/Panel/PanelMenuPage.qml

@@ -60,6 +60,7 @@ PageStack {
         if (clearModel) {
             clear();
             var model = root.submenuIndex == undefined ? menuModel : menuModel.submenu(root.submenuIndex)
+            // console.log(JSON.stringify(model))
             if (model) {
                 push(pageComponent, { "menuModel": model });
             }

tests/mocks/Unity/Indicators/IndicatorsModel.qml

@@ -82,6 +82,15 @@ Indicators.FakeIndicatorsModel {
                 "actionsObjectPath": "/com/canonical/indicators/fake5"
             }
         },
+        {
+            "identifier": "notch",
+            "indicatorProperties": {
+                "enabled": true,
+                "busName": "com.canonical.indicators.fake-notch",
+                "menuObjectPath": "/com/canonical/indicators/fake-notch",
+                "actionsObjectPath": "/com/canonical/indicators/fake-notch"
+            }
+        },
         {
             "identifier": "fake-indicator-power",
             "indicatorProperties": {

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp

@@ -19,6 +19,7 @@
 
 #include "fakeindicatorsmodel.h"
 #include "indicators.h"
+#include <QDebug>
 
 FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)
     : QAbstractListModel(parent),
@@ -104,6 +105,19 @@ void FakeIndicatorsModel::remove(int row)
 
     endRemoveRows();
 }
+void FakeIndicatorsModel::moveNotchToIndex(const int notchIndex, const int index)
+{
+    QList<QVariant> allData = m_modelData.toList();
+    // qDebug() << allData;
+    beginResetModel();
+    allData.move(notchIndex, index);
+    // qDebug() << allData;
+    m_modelData = allData;
+    Q_EMIT modelDataChanged();
+
+    endResetModel();
+    // qDebug() << m_modelData;
+}
 
 void FakeIndicatorsModel::setModelData(const QVariant& modelData)
 {

tests/mocks/Unity/Indicators/fakeindicatorsmodel.h

@@ -55,6 +55,9 @@ class FakeIndicatorsModel : public QAbstractListModel
     QModelIndex parent (const QModelIndex &index) const override;
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
+    // Notch
+    Q_INVOKABLE void moveNotchToIndex(const int notchIndex, const int index);
+
 Q_SIGNALS:
     void countChanged();
     void profileChanged();

tests/qmltests/Panel/PanelTest.qml

@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Unity.Indicators 0.1 as Indicators
 
+// this file
 Rectangle {
     id: root
     color: theme.palette.normal.background
@@ -59,6 +60,30 @@ Rectangle {
         }
     }
 
+    // get actual indicator index from original model index
+    function getIndicatorIndex(index) {
+        var i;
+        for (i = 0; i < __indicatorsModel.modelData.length; i++) {
+            if (__indicatorsModel.modelData[i]["identifier"] === __indicatorsModel.originalModelData[index]["identifier"]) {
+                console.log(__indicatorsModel.modelData[i]["identifier"])
+                return i;
+            }
+        }
+    }
+
+    function getIndicatorIndexFromIdentifier(identifier) {
+        var i;
+        for (i = 0; i < __indicatorsModel.modelData.length; i++) {
+            if (__indicatorsModel.modelData[i]["identifier"] === identifier) {
+                return i;
+            }
+        }
+    }
+
+    function moveNotch(index) {
+        __indicatorsModel.moveNotchToIndex(getIndicatorIndex(6), index)
+    }
+
     function setIndicatorVisible(index, visible) {
         var identifier = __indicatorsModel.originalModelData[index]["identifier"];
         __indicatorsModel.setIndicatorVisible(identifier, visible);