Merge lp:~nick-dedekind/unity8/rtm-1385331 into lp:unity8/rtm-14.09

[Michał Sawicz]

Unhook Lights interface from indicator widgets
Approved by: Albert Astals Cid

Led fix

[Michał Sawicz (saviq)]

Hey, this caused a FTBFS:

unity8-8.02+15.04.20150114~rtm/plugins/Unity/Indicators/plugin.cpp:34:29: fatal error: rootactionstate.h: No such file or directory
 #include "rootactionstate.h"
                             ^
compilation terminated.

review: Needs Fixing

[lp:~nick-dedekind/unity8/rtm-1385331]

1428. By Nick Dedekind on 2015-01-15

removed old file

1429. By Nick Dedekind on 2015-01-15

removed multiple new lines

[Michał Sawicz (saviq)]

:(

file:///usr/share/unity8/Shell.qml:685:9: Type Panel unavailable
             Panel {
             ^
file:///usr/share/unity8/Panel/Panel.qml:116:9: Type IndicatorsMenu unavailable
             IndicatorsMenu {
             ^
file:///usr/share/unity8/Panel/IndicatorsMenu.qml:63:5: IndicatorsLight is not a type
         IndicatorsLight {
         ^

review: Needs Fixing

[lp:~nick-dedekind/unity8/rtm-1385331]

1430. By Nick Dedekind on 2015-01-16

merged parent

1431. By Nick Dedekind on 2015-01-16

added import

[Nick Dedekind (nick-dedekind)]

> :(
>
> file:///usr/share/unity8/Shell.qml:685:9: Type Panel unavailable
> Panel {
> ^
> file:///usr/share/unity8/Panel/Panel.qml:116:9: Type IndicatorsMenu
> unavailable
> IndicatorsMenu {
> ^
> file:///usr/share/unity8/Panel/IndicatorsMenu.qml:63:5: IndicatorsLight is not
> a type
> IndicatorsLight {
> ^

Fixed.

[Michael Zanetti (mzanetti)]

This seems to break the panel: http://i.imgur.com/8ASuvJE.png?1

[lp:~nick-dedekind/unity8/rtm-1385331]

1432. By Nick Dedekind on 2015-01-19

fixes for indicators

[Michael Zanetti (mzanetti)]

seems to work fine now.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-01-08 12:51:33 +0000
+++ debian/control	2015-01-19 17:39:20 +0000
@@ -23,7 +23,7 @@
                libpam0g-dev,
                libpay2-dev,
                libpulse-dev,
-               libqmenumodel-dev (>= 0.2.8),
+               libqmenumodel-dev (>= 0.2.9),
                libqt5xmlpatterns5-dev,
                libunity-api-dev (>= 7.94~),
                libusermetricsoutput1-dev,
@@ -59,7 +59,7 @@
 
 Package: indicators-client
 Architecture: amd64 armhf i386
-Depends: qmenumodel-qml (>= 0.2.8),
+Depends: qmenumodel-qml (>= 0.2.9),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
          unity8 (= ${binary:Version}),
          ${misc:Depends},
@@ -83,7 +83,7 @@
 Depends: gsettings-desktop-schemas,
          libcap2-bin,
          libglib2.0-bin,
-         qmenumodel-qml (>= 0.2.8),
+         qmenumodel-qml (>= 0.2.9),
          qml-module-qtquick-xmllistmodel,
          qtdeclarative5-gsettings1.0,
          qtdeclarative5-qtmir-plugin (>= 0.4.4),
 
=== modified file 'plugins/Lights/Lights.cpp'
--- plugins/Lights/Lights.cpp	2014-09-08 15:07:24 +0000
+++ plugins/Lights/Lights.cpp	2015-01-19 17:39:20 +0000
@@ -44,12 +44,20 @@
 
 void Lights::setState(Lights::State newState)
 {
+    if (!init()) {
+        qWarning() << "No lights device";
+        return;
+    }
+
     if (m_state != newState) {
         if (newState == Lights::On) {
             turnOn();
         } else {
             turnOff();
         }
+
+        m_state = newState;
+        Q_EMIT stateChanged(m_state);
     }
 }
 
@@ -115,6 +123,7 @@
         err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
         if (err == 0) {
             m_lightDevice = (light_device_t*)device;
+            turnOff();
             return true;
         } else {
             qWarning() << "Failed to access notification lights";
@@ -127,15 +136,6 @@
 
 void Lights::turnOn()
 {
-    if (!init()) {
-        qWarning() << "No lights device";
-        return;
-    }
-
-    if (m_state == Lights::On) {
-        return;
-    }
-
     // pulse
     light_state_t state;
     memset(&state, 0, sizeof(light_state_t));
@@ -147,23 +147,11 @@
 
     if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
          qWarning() << "Failed to turn the light off";
-    } else {
-        m_state = Lights::On;
-        Q_EMIT stateChanged(m_state);
     }
 }
 
 void Lights::turnOff()
 {
-    if (!init()) {
-        qWarning() << "No lights device";
-        return;
-    }
-
-    if (m_state == Lights::Off) {
-        return;
-    }
-
     light_state_t state;
     memset(&state, 0, sizeof(light_state_t));
     state.color = 0x00000000;
@@ -174,8 +162,5 @@
 
     if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
         qWarning() << "Failed to turn the light off";
-    } else {
-        m_state = Lights::Off;
-        Q_EMIT stateChanged(m_state);
     }
 }
 
=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
--- plugins/Unity/Indicators/CMakeLists.txt	2014-10-03 10:53:02 +0000
+++ plugins/Unity/Indicators/CMakeLists.txt	2015-01-19 17:39:20 +0000
@@ -16,14 +16,16 @@
 )
 
 set(IndicatorsQML_SOURCES
+    actionrootstate.cpp
     indicator.cpp
     indicators.h
     indicatorsmanager.cpp
     indicatorsmodel.cpp
     menucontentactivator.cpp
+    modelactionrootstate.cpp
     modelprinter.cpp
     plugin.cpp
-    rootactionstate.cpp
+    rootstateparser.cpp
     sharedunitymenumodel.cpp
     unitymenumodelcache.cpp
     unitymenumodelstack.cpp
 
=== added file 'plugins/Unity/Indicators/actionrootstate.cpp'
--- plugins/Unity/Indicators/actionrootstate.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/actionrootstate.cpp	2015-01-19 17:39:20 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2014 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
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "actionrootstate.h"
+
+#include <qdbusactiongroup.h>
+#include <QDebug>
+
+ActionRootState::ActionRootState(QObject *parent)
+    : RootStateObject(parent)
+    , m_actionGroup(nullptr)
+{
+}
+
+QDBusActionGroup *ActionRootState::actionGroup() const
+{
+    return m_actionGroup;
+}
+
+void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)
+{
+    if (m_actionGroup != actionGroup) {
+        bool wasValid = valid();
+
+        if (m_actionGroup) {
+            disconnect(m_actionGroup, 0, this, 0);
+        }
+        m_actionGroup = actionGroup;
+
+        if (m_actionGroup) {
+            connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });
+            connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });
+            connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });
+            connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](QVariant) { updateActionState(); });
+
+            connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });
+        }
+        updateActionState();
+        Q_EMIT actionGroupChanged();
+
+        if (wasValid != valid()) Q_EMIT validChanged();
+    }
+}
+
+QString ActionRootState::actionName() const
+{
+    return m_actionName;
+}
+
+void ActionRootState::setActionName(const QString &actionName)
+{
+    if (m_actionName != actionName) {
+        bool wasValid = valid();
+
+        m_actionName = actionName;
+        updateActionState();
+
+        Q_EMIT actionNameChanged();
+
+        if (wasValid != valid()) Q_EMIT validChanged();
+    }
+}
+
+bool ActionRootState::valid() const
+{
+    return m_actionGroup && m_actionGroup->status() == DBusEnums::Connected &&
+           !m_actionName.isEmpty() && m_actionGroup->hasAction(m_actionName);
+}
+
+void ActionRootState::updateActionState()
+{
+    if (valid()) {
+        ActionStateParser* oldParser = m_actionGroup->actionStateParser();
+        m_actionGroup->setActionStateParser(&m_parser);
+
+        QVariantMap state = m_actionGroup->actionState(m_actionName).toMap();
+
+        m_actionGroup->setActionStateParser(oldParser);
+
+        setCurrentState(state);
+    } else {
+        setCurrentState(QVariantMap());
+    }
+}
 
=== added file 'plugins/Unity/Indicators/actionrootstate.h'
--- plugins/Unity/Indicators/actionrootstate.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/actionrootstate.h	2015-01-19 17:39:20 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014 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
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ACTIONROOTSTATE_H
+#define ACTIONROOTSTATE_H
+
+#include "unityindicatorsglobal.h"
+
+#include "rootstateparser.h"
+
+class QDBusActionGroup;
+
+class UNITYINDICATORS_EXPORT ActionRootState : public RootStateObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDBusActionGroup* actionGroup READ actionGroup WRITE setActionGroup NOTIFY actionGroupChanged)
+    Q_PROPERTY(QString actionName READ actionName WRITE setActionName NOTIFY actionNameChanged)
+
+public:
+    ActionRootState(QObject *parent = 0);
+
+    QDBusActionGroup *actionGroup() const;
+    void setActionGroup(QDBusActionGroup *actionGroup);
+
+    QString actionName() const;
+    void setActionName(const QString& actionName);
+
+    bool valid() const override;
+
+Q_SIGNALS:
+    void actionGroupChanged();
+    void actionNameChanged();
+
+private Q_SLOTS:
+    void updateActionState();
+
+private:
+    QDBusActionGroup* m_actionGroup;
+    QString m_actionName;
+};
+
+#endif // ACTIONROOTSTATE_H
 
=== added file 'plugins/Unity/Indicators/modelactionrootstate.cpp'
--- plugins/Unity/Indicators/modelactionrootstate.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/modelactionrootstate.cpp	2015-01-19 17:39:20 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2013 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
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+#include "modelactionrootstate.h"
+#include "indicators.h"
+
+#include <unitymenumodel.h>
+#include <QVariant>
+#include <QIcon>
+
+extern "C" {
+#include <glib.h>
+#include <gio/gio.h>
+}
+
+ModelActionRootState::ModelActionRootState(QObject *parent)
+    : RootStateObject(parent),
+      m_menu(nullptr)
+{
+}
+
+ModelActionRootState::~ModelActionRootState()
+{
+}
+
+UnityMenuModel* ModelActionRootState::menu() const
+{
+    return m_menu;
+}
+
+void ModelActionRootState::setMenu(UnityMenuModel* menu)
+{
+    if (m_menu != menu) {
+        bool wasValid = valid();
+
+        if (m_menu) {
+            m_menu->disconnect(this);
+        }
+        m_menu = menu;
+
+        if (m_menu) {
+            connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));
+            connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));
+            connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+
+            connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));
+        }
+        updateActionState();
+        Q_EMIT menuChanged();
+
+        if (wasValid != valid())
+            Q_EMIT validChanged();
+    }
+}
+
+bool ModelActionRootState::valid() const
+{
+    return m_menu && m_menu->rowCount() > 0;
+}
+
+void ModelActionRootState::onModelRowsAdded(const QModelIndex& parent, int start, int end)
+{
+    Q_UNUSED(parent);
+    if (start == 0 && end >= 0) {
+        updateActionState();
+    }
+}
+
+void ModelActionRootState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)
+{
+    Q_UNUSED(parent);
+    if (start == 0 && end >= 0) {
+        updateActionState();
+    }
+}
+
+void ModelActionRootState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
+{
+    Q_UNUSED(roles);
+    if (!topLeft.isValid() || !bottomRight.isValid()) {
+        return;
+    }
+
+    if (topLeft.row() <= 0 && bottomRight.row() >= 0) {
+        updateActionState();
+    }
+}
+
+void ModelActionRootState::reset()
+{
+    m_menu = nullptr;
+
+    Q_EMIT menuChanged();
+    setCurrentState(QVariantMap());
+}
+
+void ModelActionRootState::updateActionState()
+{
+    if (m_menu && m_menu->rowCount() > 0) {
+        ActionStateParser* oldParser = m_menu->actionStateParser();
+        m_menu->setActionStateParser(&m_parser);
+
+        QVariantMap state = m_menu->get(0, "actionState").toMap();
+
+        m_menu->setActionStateParser(oldParser);
+
+        setCurrentState(state);
+    } else {
+        setCurrentState(QVariantMap());
+    }
+}
 
=== added file 'plugins/Unity/Indicators/modelactionrootstate.h'
--- plugins/Unity/Indicators/modelactionrootstate.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/modelactionrootstate.h	2015-01-19 17:39:20 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013 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
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+#ifndef MODELACTIONROOTSTATE_H
+#define MODELACTIONROOTSTATE_H
+
+#include "unityindicatorsglobal.h"
+
+#include "rootstateparser.h"
+
+class UnityMenuModel;
+
+class UNITYINDICATORS_EXPORT ModelActionRootState : public RootStateObject
+{
+    Q_OBJECT
+    Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
+public:
+    ModelActionRootState(QObject *parent = 0);
+    virtual ~ModelActionRootState();
+
+    UnityMenuModel* menu() const;
+    void setMenu(UnityMenuModel* menu);
+
+    int index() const;
+    void setIndex(int index);
+
+    bool valid() const override;
+
+Q_SIGNALS:
+    void menuChanged();
+    void indexChanged();
+
+private Q_SLOTS:
+    void onModelRowsAdded(const QModelIndex& parent, int start, int end);
+    void onModelRowsRemoved(const QModelIndex& parent, int start, int end);
+    void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);
+    void reset();
+
+private:
+    void updateActionState();
+
+    UnityMenuModel* m_menu;
+};
+
+#endif // MODELACTIONROOTSTATE_H
 
=== modified file 'plugins/Unity/Indicators/plugin.cpp'
--- plugins/Unity/Indicators/plugin.cpp	2014-10-07 10:28:59 +0000
+++ plugins/Unity/Indicators/plugin.cpp	2015-01-19 17:39:20 +0000
@@ -24,12 +24,13 @@
 #include "plugin.h"
 
 // local
+#include "actionrootstate.h"
 #include "indicators.h"
 #include "indicatorsmanager.h"
 #include "indicatorsmodel.h"
 #include "menucontentactivator.h"
+#include "modelactionrootstate.h"
 #include "modelprinter.h"
-#include "rootactionstate.h"
 #include "sharedunitymenumodel.h"
 #include "unitymenumodelcache.h"
 #include "unitymenumodelstack.h"
@@ -51,7 +52,8 @@
     qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
     qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
     qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
-    qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");
+    qmlRegisterType<ModelActionRootState>(uri, 0, 1, "ModelActionRootState");
+    qmlRegisterType<ActionRootState>(uri, 0, 1, "ActionRootState");
     qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
     qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
     qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");
 
=== renamed file 'plugins/Unity/Indicators/rootactionstate.cpp' => 'plugins/Unity/Indicators/rootstateparser.cpp'
--- plugins/Unity/Indicators/rootactionstate.cpp	2014-10-20 12:38:16 +0000
+++ plugins/Unity/Indicators/rootstateparser.cpp	2015-01-19 17:39:20 +0000
@@ -12,155 +12,18 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Nick Dedekind <[e-mail]>
  */
 
-#include "rootactionstate.h"
-#include "indicators.h"
-
-#include <unitymenumodel.h>
-#include <QVariant>
-#include <QIcon>
+#include "rootstateparser.h"
 
 extern "C" {
 #include <glib.h>
 #include <gio/gio.h>
 }
 
-RootActionState::RootActionState(QObject *parent)
-    : ActionStateParser(parent),
-      m_menu(nullptr)
-{
-}
-
-RootActionState::~RootActionState()
-{
-}
-
-UnityMenuModel* RootActionState::menu() const
-{
-    return m_menu;
-}
-
-void RootActionState::setMenu(UnityMenuModel* menu)
-{
-    if (m_menu != menu) {
-        if (m_menu) {
-            m_menu->disconnect(this);
-        }
-        m_menu = menu;
-
-        if (m_menu) {
-            connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));
-            connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));
-            connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
-
-            connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));
-        }
-        updateActionState();
-        Q_EMIT menuChanged();
-    }
-}
-
-void RootActionState::onModelRowsAdded(const QModelIndex& parent, int start, int end)
-{
-    Q_UNUSED(parent);
-    if (start == 0 && end >= 0) {
-        updateActionState();
-    }
-}
-
-void RootActionState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)
-{
-    Q_UNUSED(parent);
-    if (start == 0 && end >= 0) {
-        updateActionState();
-    }
-}
-
-void RootActionState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
-{
-    Q_UNUSED(roles);
-    if (!topLeft.isValid() || !bottomRight.isValid()) {
-        return;
-    }
-
-    if (topLeft.row() <= 0 && bottomRight.row() >= 0) {
-        updateActionState();
-    }
-}
-
-void RootActionState::reset()
-{
-    m_cachedState.clear();
-    m_menu = nullptr;
-
-    Q_EMIT menuChanged();
-    Q_EMIT updated();
-}
-
-void RootActionState::updateActionState()
-{
-    if (m_menu && m_menu->rowCount() > 0) {
-        ActionStateParser* oldParser = m_menu->actionStateParser();
-        m_menu->setActionStateParser(this);
-
-        m_cachedState = m_menu->get(0, "actionState").toMap();
-
-        m_menu->setActionStateParser(oldParser);
-    } else {
-        m_cachedState.clear();
-    }
-    Q_EMIT updated();
-}
-
-bool RootActionState::isValid() const
-{
-    return m_menu && m_menu->rowCount() > 0;
-}
-
-QString RootActionState::title() const
-{
-    if (!isValid()) return QString();
-
-    return m_cachedState.value("title", QVariant::fromValue(QString())).toString();
-}
-
-QString RootActionState::leftLabel() const
-{
-    if (!isValid()) return QString();
-
-    return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();
-}
-
-QString RootActionState::rightLabel() const
-{
-    if (!isValid()) return QString();
-
-    return m_cachedState.value("label", QVariant::fromValue(QString())).toString();
-}
-
-QStringList RootActionState::icons() const
-{
-    if (!isValid()) return QStringList();
-
-    return m_cachedState.value("icons", QVariant::fromValue(QStringList())).toStringList();
-}
-
-QString RootActionState::accessibleName() const
-{
-    if (!isValid()) return QString();
-
-    return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();
-}
-
-bool RootActionState::indicatorVisible() const
-{
-    if (!isValid()) return false;
-
-    return m_cachedState.value("visible", QVariant::fromValue(true)).toBool();
+RootStateParser::RootStateParser(QObject* parent)
+    : ActionStateParser(parent)
+{
 }
 
 static QString iconUri(GIcon *icon)
@@ -209,7 +72,7 @@
     return uri;
 }
 
-QVariant RootActionState::toQVariant(GVariant* state) const
+QVariant RootStateParser::toQVariant(GVariant* state) const
 {
     if (!state) {
         return QVariant();
@@ -296,3 +159,73 @@
     }
     return ActionStateParser::toQVariant(state);
 }
+
+
+RootStateObject::RootStateObject(QObject* parent)
+    : QObject(parent)
+{
+}
+
+QString RootStateObject::title() const
+{
+    if (!valid()) return QString();
+
+    return m_currentState.value("title", QVariant::fromValue(QString())).toString();
+}
+
+QString RootStateObject::leftLabel() const
+{
+    if (!valid()) return QString();
+
+    return m_currentState.value("pre-label", QVariant::fromValue(QString())).toString();
+}
+
+QString RootStateObject::rightLabel() const
+{
+    if (!valid()) return QString();
+
+    return m_currentState.value("label", QVariant::fromValue(QString())).toString();
+}
+
+QStringList RootStateObject::icons() const
+{
+    if (!valid()) return QStringList();
+
+    return m_currentState.value("icons", QVariant::fromValue(QStringList())).toStringList();
+}
+
+QString RootStateObject::accessibleName() const
+{
+    if (!valid()) return QString();
+
+    return m_currentState.value("accessible-desc", QVariant::fromValue(QString())).toString();
+}
+
+bool RootStateObject::indicatorVisible() const
+{
+    if (!valid()) return false;
+
+    return m_currentState.value("visible", QVariant::fromValue(true)).toBool();
+}
+
+void RootStateObject::setCurrentState(const QVariantMap& newState)
+{
+    QString oldTitle = title();
+    QString oldLeftLabel = leftLabel();
+    QString oldRightLabel = rightLabel();
+    QStringList oldIcons = icons();
+    QString oldAccessibleName = accessibleName();
+    bool oldIndicatorVisible = indicatorVisible();
+
+    if (m_currentState != newState) {
+        m_currentState = newState;
+        Q_EMIT updated();
+
+        if (oldTitle != title()) Q_EMIT titleChanged();
+        if (oldLeftLabel != leftLabel()) Q_EMIT leftLabelChanged();
+        if (oldRightLabel != rightLabel()) Q_EMIT rightLabelChanged();
+        if (oldIcons != icons()) Q_EMIT iconsChanged();
+        if (oldAccessibleName != accessibleName()) Q_EMIT accessibleNameChanged();
+        if (oldIndicatorVisible != indicatorVisible()) Q_EMIT indicatorVisibleChanged();
+    }
+}
 
=== renamed file 'plugins/Unity/Indicators/rootactionstate.h' => 'plugins/Unity/Indicators/rootstateparser.h'
--- plugins/Unity/Indicators/rootactionstate.h	2014-10-20 12:38:16 +0000
+++ plugins/Unity/Indicators/rootstateparser.h	2015-01-19 17:39:20 +0000
@@ -12,26 +12,27 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Nick Dedekind <[e-mail]>
  */
 
-#ifndef ROOTACTIONSTATE_H
-#define ROOTACTIONSTATE_H
+#ifndef ROOTSTATEPARSER_H
+#define ROOTSTATEPARSER_H
 
 #include "unityindicatorsglobal.h"
 
 #include <actionstateparser.h>
 
-class UnityMenuModel;
+class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser
+{
+public:
+    RootStateParser(QObject* parent = nullptr);
+    virtual QVariant toQVariant(GVariant* state) const override;
+};
 
-class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser
+class UNITYINDICATORS_EXPORT RootStateObject : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
 
-    Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
+    Q_PROPERTY(bool valid READ valid NOTIFY validChanged)
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)
     Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)
@@ -39,16 +40,10 @@
     Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)
     Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)
 public:
-    RootActionState(QObject *parent = 0);
-    virtual ~RootActionState();
-
-    UnityMenuModel* menu() const;
-    void setMenu(UnityMenuModel* menu);
-
-    int index() const;
-    void setIndex(int index);
-
-    bool isValid() const;
+    RootStateObject(QObject* parent = 0);
+
+    virtual bool valid() const = 0;
+
     QString title() const;
     QString leftLabel() const;
     QString rightLabel() const;
@@ -56,15 +51,12 @@
     QString accessibleName() const;
     bool indicatorVisible() const;
 
-    // from ActionStateParser
-    virtual QVariant toQVariant(GVariant* state) const override;
+    QVariantMap currentState() const { return m_currentState; }
+    void setCurrentState(const QVariantMap& currentState);
 
 Q_SIGNALS:
     void updated();
 
-    void menuChanged();
-    void indexChanged();
-
     void validChanged();
     void titleChanged();
     void leftLabelChanged();
@@ -73,17 +65,9 @@
     void accessibleNameChanged();
     void indicatorVisibleChanged();
 
-private Q_SLOTS:
-    void onModelRowsAdded(const QModelIndex& parent, int start, int end);
-    void onModelRowsRemoved(const QModelIndex& parent, int start, int end);
-    void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);
-    void reset();
-
-private:
-    void updateActionState();
-
-    UnityMenuModel* m_menu;
-    QVariantMap m_cachedState;
+protected:
+    RootStateParser m_parser;
+    QVariantMap m_currentState;
 };
 
-#endif // ROOTACTIONSTATE_H
+#endif // ROOTSTATEPARSER_H
 
=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2014-10-07 10:28:59 +0000
+++ qml/Greeter/Clock.qml	2015-01-19 17:39:20 +0000
@@ -43,7 +43,7 @@
         menuObjectPath: clock.visible ? "/com/canonical/indicator/datetime/phone" : ""
     }
 
-    Indicators.RootActionState {
+    Indicators.ModelActionRootState {
         menu: timeModel.model
         onUpdated: {
             if (timeLabel.text != rightLabel) {
 
=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2014-10-17 14:55:35 +0000
+++ qml/Panel/IndicatorItem.qml	2015-01-19 17:39:20 +0000
@@ -45,14 +45,6 @@
         onClicked: parent.clicked()
     }
 
-    // FIXME: For now we will enable led indicator support only for messaging indicator
-    // in the future we should export a led API insted of doing that,
-    Loader {
-        id: indicatorLed
-        // only load source Component if the icons contains the new message icon
-        source: (root.icons && (String(root.icons).indexOf("indicator-messages-new") != -1)) ? Qt.resolvedUrl("Indicators/IndicatorsLight.qml") : ""
-    }
-
     Item {
         id: mainItems
         anchors.centerIn: parent
 
=== modified file 'qml/Panel/Indicators/IndicatorBase.qml'
--- qml/Panel/Indicators/IndicatorBase.qml	2014-10-17 14:55:35 +0000
+++ qml/Panel/Indicators/IndicatorBase.qml	2015-01-19 17:39:20 +0000
@@ -40,7 +40,7 @@
         menuObjectPath: indicatorItem.menuObjectPath
     }
 
-    RootActionState {
+    ModelActionRootState {
         id: rootAction
         menu: menuModel ? menuModel : null
         onUpdated: indicatorItem.rootActionStateChanged()
 
=== modified file 'qml/Panel/Indicators/IndicatorsLight.qml'
--- qml/Panel/Indicators/IndicatorsLight.qml	2014-08-05 14:31:12 +0000
+++ qml/Panel/Indicators/IndicatorsLight.qml	2015-01-19 17:39:20 +0000
@@ -20,16 +20,34 @@
 import QtQuick 2.0
 import Powerd 0.1
 import Lights 0.1
+import QMenuModel 0.1 as QMenuModel
+import Unity.Indicators 0.1 as Indicators
 
 QtObject {
     id: root
 
+    property var _actionGroup: QMenuModel.QDBusActionGroup {
+        busType: 1
+        busName: "com.canonical.indicator.messages"
+        objectPath: "/com/canonical/indicator/messages"
+    }
+
+    property var _rootState: Indicators.ActionRootState {
+        actionGroup: _actionGroup
+        actionName: "messages"
+        Component.onCompleted: actionGroup.start()
+
+        property bool hasMessages: valid && (String(icons).indexOf("indicator-messages-new") != -1)
+    }
+
     Component.onDestruction: Lights.state = Lights.Off
 
     // QtObject does not have children
     property var _binding: Binding {
         target: Lights
         property: "state"
-        value: (Powerd.status === Powerd.Off) ? Lights.On : Lights.Off
+        value: {
+            return (Powerd.status === Powerd.Off && _rootState.hasMessages) ? Lights.On : Lights.Off
+        }
     }
 }
 
=== modified file 'qml/Panel/IndicatorsBar.qml'
--- qml/Panel/IndicatorsBar.qml	2014-10-20 20:35:50 +0000
+++ qml/Panel/IndicatorsBar.qml	2015-01-19 17:39:20 +0000
@@ -46,13 +46,14 @@
 
     function addScrollOffset(scrollAmmout) {
         if (scrollAmmout < 0) { // left scroll
-            if (flickable.contentX < 0) return; // already off the left.
-            if (flickable.contentX + scrollAmmout < 0) scrollAmmout = -flickable.contentX; // going to be off the left
+            if (flickable.contentX + flickable.width > row.width) return; // already off the left.
+
+            if (flickable.contentX + flickable.width - scrollAmmout > row.width) { // going to be off the right
+                scrollAmmout = (flickable.contentX + flickable.width) - row.width;
+            }
         } else { // right scroll
-            if (flickable.contentX + flickable.width > row.width) return; // already off the right.
-            if (flickable.contentX + flickable.width + scrollAmmout > row.width) { // going to be off the right
-                scrollAmmout = row.width - (flickable.contentX + flickable.width);
-            }
+            if (flickable.contentX < 0) return; // already off the right.
+            if (flickable.contentX - scrollAmmout < 0) scrollAmmout = flickable.contentX; // going to be off the right
         }
         d.scrollOffset = d.scrollOffset + scrollAmmout;
     }
@@ -91,24 +92,26 @@
             flickable.resetContentXComponents();
 
             if (expanded && !flickable.moving) {
-
                 // gap between left and row?
-                if (flickable.contentX < 0) {
-                    d.alignmentAdjustment += flickable.contentX;
-                // gap between right and row?
-                } else if (flickable.contentX + flickable.width > row.width) {
+                if (flickable.contentX + flickable.width > row.width) {
                     // row width is less than flickable
                     if (row.width < flickable.width) {
-                        d.alignmentAdjustment += flickable.contentX;
+                        d.alignmentAdjustment -= flickable.contentX;
                     } else {
-                        d.alignmentAdjustment += ((flickable.contentX + flickable.width) - row.width);
+                        d.alignmentAdjustment -= ((flickable.contentX + flickable.width) - row.width);
                     }
+
+                    // gap between right and row?
+                } else if (flickable.contentX < 0) {
+                    d.alignmentAdjustment -= flickable.contentX;
+
                 // current item overlap on left
-                } else if (row.currentItem && row.currentItem.x < flickable.contentX) {
-                    d.alignmentAdjustment -= (row.currentItem.x - flickable.contentX);
+                } else if (row.currentItem && (flickable.contentX + flickable.width) < (row.width - row.currentItem.x)) {
+                    d.alignmentAdjustment += ((row.width - row.currentItem.x) - (flickable.contentX + flickable.width));
+
                 // current item overlap on right
-                } else if (row.currentItem && row.currentItem.x + row.currentItem.width > flickable.contentX + flickable.width) {
-                    d.alignmentAdjustment -= ((row.currentItem.x + row.currentItem.width) - (flickable.contentX + flickable.width));
+                } else if (row.currentItem && flickable.contentX > (row.width - row.currentItem.x - row.currentItem.width)) {
+                    d.alignmentAdjustment -= flickable.contentX - (row.width - row.currentItem.x - row.currentItem.width);
                 }
             }
         }
@@ -134,16 +137,19 @@
             id: flickable
             objectName: "flickable"
 
+            // we rotate it because we want the Flickable to align its content item
+            // on the right instead of on the left
+            rotation: 180
+
             anchors.fill: parent
             contentWidth: row.width
+            contentX: d.combinedOffset
             interactive: false
-            // align right + offset from row selection + scrolling
-            contentX: row.width - flickable.width - d.combinedOffset
 
             // contentX can change by user interaction as well as user offset changes
             // This function re-aligns the offsets so that the offsets match the contentX
             function resetContentXComponents() {
-                d.scrollOffset += (flickable.contentX - (row.width - flickable.width - d.combinedOffset));
+                d.scrollOffset += d.combinedOffset - flickable.contentX;
             }
 
             rebound: Transition {
@@ -162,6 +168,9 @@
                     bottom: parent.bottom
                 }
 
+                // Compensate for the Flickable rotation (ie, counter-rotate)
+                rotation: 180
+
                 lateralPosition: {
                     if (root.lateralPosition == -1) return -1;
 
 
=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2014-10-21 19:32:03 +0000
+++ qml/Panel/IndicatorsMenu.qml	2015-01-19 17:39:20 +0000
@@ -18,6 +18,7 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Gestures 0.1
 import "../Components"
+import "Indicators"
 
 Showable {
     id: root
@@ -60,6 +61,10 @@
     onUnitProgressChanged: d.updateState()
     clip: root.partiallyOpened
 
+    IndicatorsLight {
+        id: indicatorLights
+    }
+
     // eater
     MouseArea {
         anchors.fill: parent
 
=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ tests/mocks/CMakeLists.txt	2015-01-19 17:39:20 +0000
@@ -33,6 +33,7 @@
 add_subdirectory(HudClient)
 add_subdirectory(libusermetrics)
 add_subdirectory(LightDM)
+add_subdirectory(Lights)
 add_subdirectory(Powerd)
 add_subdirectory(QMenuModel)
 add_subdirectory(Ubuntu)
 
=== added directory 'tests/mocks/Lights'
=== added file 'tests/mocks/Lights/CMakeLists.txt'
--- tests/mocks/Lights/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Lights/CMakeLists.txt	2015-01-19 17:39:20 +0000
@@ -0,0 +1,8 @@
+add_library(MockLights-qml MODULE
+    plugin.cpp
+    Lights.cpp
+    )
+
+qt5_use_modules(MockLights-qml Qml Gui)
+
+add_unity8_mock(Lights 0.1 Lights TARGETS MockLights-qml)
 
=== added file 'tests/mocks/Lights/Lights.cpp'
--- tests/mocks/Lights/Lights.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Lights/Lights.cpp	2015-01-19 17:39:20 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+#include "Lights.h"
+
+#include <QDebug>
+
+Lights::Lights(QObject* parent)
+  : QObject(parent),
+    m_color("blue"),
+    m_state(Lights::Off),
+    m_onMs(1000),
+    m_offMs(3000)
+{
+}
+
+Lights::~Lights()
+{
+}
+
+void Lights::setState(Lights::State newState)
+{
+    if (m_state != newState) {
+        m_state = newState;
+        Q_EMIT stateChanged(m_state);
+    }
+}
+
+Lights::State Lights::state() const
+{
+    return m_state;
+}
+
+void Lights::setColor(const QColor &color)
+{
+    if (m_color != color) {
+        m_color = color;
+        Q_EMIT colorChanged(m_color);
+    }
+}
+
+QColor Lights::color() const
+{
+    return m_color;
+}
+
+int Lights::onMillisec() const
+{
+    return m_onMs;
+}
+
+void Lights::setOnMillisec(int onMs)
+{
+    if (m_onMs != onMs) {
+        m_onMs = onMs;
+        Q_EMIT onMillisecChanged(m_onMs);
+    }
+}
+
+int Lights::offMillisec() const
+{
+    return m_offMs;
+}
+
+void Lights::setOffMillisec(int offMs)
+{
+    if (m_offMs != offMs) {
+        m_offMs = offMs;
+        Q_EMIT offMillisecChanged(m_offMs);
+    }
+}
 
=== added file 'tests/mocks/Lights/Lights.h'
--- tests/mocks/Lights/Lights.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Lights/Lights.h	2015-01-19 17:39:20 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+#ifndef UNITY_MOCK_LIGHTS_H
+#define UNITY_MOCK_LIGHTS_H
+
+#include <QtCore/QObject>
+#include <QtGui/QColor>
+
+class Lights: public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(State)
+    Q_PROPERTY(State state READ state  WRITE setState NOTIFY stateChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+    Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
+    Q_PROPERTY(int offMillisec READ offMillisec WRITE setOffMillisec NOTIFY offMillisecChanged)
+
+public:
+    enum State {
+        Off,
+        On,
+    };
+
+    explicit Lights(QObject *parent = 0);
+    ~Lights();
+
+    void setState(State newState);
+    State state() const;
+
+    void setColor(const QColor &color);
+    QColor color() const;
+
+    int onMillisec() const;
+    void setOnMillisec(int onMs);
+
+    int offMillisec() const;
+    void setOffMillisec(int offMs);
+
+Q_SIGNALS:
+    void stateChanged(State newState);
+    void colorChanged(const QColor &color);
+    void onMillisecChanged(int onMs);
+    void offMillisecChanged(int offMs);
+
+private:
+    QColor m_color;
+    State m_state;
+    int m_onMs;
+    int m_offMs;
+};
+
+#endif
 
=== added file 'tests/mocks/Lights/plugin.cpp'
--- tests/mocks/Lights/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Lights/plugin.cpp	2015-01-19 17:39:20 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2012,2013 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/>.
+ */
+
+#include "plugin.h"
+#include "Lights.h"
+
+#include <QtQml/qqml.h>
+
+static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new Lights();
+}
+
+void PowerdPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Lights"));
+    qmlRegisterSingletonType<Lights>(uri, 0, 1, "Lights", lights_provider);
+}
 
=== added file 'tests/mocks/Lights/plugin.h'
--- tests/mocks/Lights/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Lights/plugin.h	2015-01-19 17:39:20 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2012,2013 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/>.
+ */
+
+#ifndef MOCK_POWER_PLUGIN_H
+#define MOCK_POWER_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class PowerdPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif
 
=== added file 'tests/mocks/Lights/qmldir'
--- tests/mocks/Lights/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Lights/qmldir	2015-01-19 17:39:20 +0000
@@ -0,0 +1,3 @@
+module Lights
+plugin MockLights-qml
+typeinfo Lights.qmltypes
 
=== modified file 'tests/mocks/QMenuModel/CMakeLists.txt'
--- tests/mocks/QMenuModel/CMakeLists.txt	2014-05-02 22:57:21 +0000
+++ tests/mocks/QMenuModel/CMakeLists.txt	2015-01-19 17:39:20 +0000
@@ -4,6 +4,7 @@
 )
 
 set(QMenuModelQml_SOURCES
+  actiondata.h
   actionstateparser.cpp
   plugin.cpp
   unitymenumodel.cpp
 
=== modified file 'tests/mocks/QMenuModel/QDBusActionGroup.qml'
--- tests/mocks/QMenuModel/QDBusActionGroup.qml	2014-07-04 17:53:52 +0000
+++ tests/mocks/QMenuModel/QDBusActionGroup.qml	2015-01-19 17:39:20 +0000
@@ -19,69 +19,19 @@
 
 import QtQuick 2.0
 import Ubuntu.Settings.Menus 0.1 as Menus
+import QMenuModel 0.1
 
 QtObject {
     property int busType
     property string busName
     property string objectPath
+    property var actions: ActionData ? ActionData.data : undefined
+
+    signal dataChanged
+
     function start() {}
+
     function action(actionName) {
-        switch (actionName) {
-            case "transfer-state.queued":
-                return {
-                    'valid': true,
-                    'state': {
-                        'state': Menus.TransferState.Queued,
-                        'percent': 0.0
-                    }
-            }
-            case "transfer-state.running":
-                return {
-                    'valid': true,
-                    'state': {
-                        'state': Menus.TransferState.Running,
-                        'seconds-left': 100,
-                        'percent': 0.1
-                    }
-            }
-            case "transfer-state.paused":
-                return {
-                    'valid': true,
-                    'state': {
-                        'state': Menus.TransferState.Paused,
-                        'seconds-left': 100,
-                        'percent': 0.5
-                    }
-            }
-            case "transfer-state.cancelled":
-                return {
-                    'valid': true,
-                    'state': {
-                        'state': Menus.TransferState.Canceled,
-                        'percent': 0.4
-                    }
-            }
-            case "transfer-state.finished": return {
-                    'valid': true,
-                    'state': {
-                        'state': Menus.TransferState.Finished,
-                        'seconds-left': 0,
-                        'percent': 1.0
-                    }
-            }
-            case "transfer-state.error":
-                return {
-                    'valid': true,
-                    'state': {
-                        'state': Menus.TransferState.Error,
-                        'seconds-left': 100,
-                        'percent': 0.0
-                    }
-            }
-            default:
-                break;
-        }
-
-        return null;
+        return actions[actionName];
     }
 }
 
=== added file 'tests/mocks/QMenuModel/actiondata.h'
--- tests/mocks/QMenuModel/actiondata.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/QMenuModel/actiondata.h	2015-01-19 17:39:20 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2013 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/>.
+ *
+ * Authors: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef ACTIONDATA_H
+#define ACTIONDATA_H
+
+#include <QObject>
+#include <QVariant>
+
+typedef struct _GVariant GVariant;
+
+class Q_DECL_EXPORT ActionData : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QVariant data READ data WRITE setData NOTIFY dataChanged)
+public:
+    ActionData(QObject* parent = 0)
+        : QObject(parent)
+    {}
+
+    QVariant data() const { return m_data; }
+    void setData(const QVariant& data)
+    {
+        if (m_data != data) {
+            m_data = data;
+            Q_EMIT dataChanged();
+        }
+    }
+
+Q_SIGNALS:
+    void dataChanged();
+
+private:
+    QVariant m_data;
+};
+
+#endif // ACTIONDATA_H
 
=== modified file 'tests/mocks/QMenuModel/plugin.cpp'
--- tests/mocks/QMenuModel/plugin.cpp	2013-11-19 17:01:25 +0000
+++ tests/mocks/QMenuModel/plugin.cpp	2015-01-19 17:39:20 +0000
@@ -18,13 +18,23 @@
 
 #include "plugin.h"
 #include "unitymenumodel.h"
+#include "actiondata.h"
 #include "actionstateparser.h"
 
 #include <QtQml/qqml.h>
 
+static QObject* actionDataSingleton(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+  Q_UNUSED(engine);
+  Q_UNUSED(scriptEngine);
+  return new ActionData;
+}
+
 void QMenuModelPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("QMenuModel"));
     qmlRegisterType<UnityMenuModel>(uri, 0, 1, "UnityMenuModel");
     qmlRegisterType<ActionStateParser>(uri, 0, 1, "ActionStateParser");
+
+    qmlRegisterSingletonType<ActionData>(uri, 0, 1, "ActionData", actionDataSingleton);
 }
 
=== added file 'tests/mocks/Unity/Indicators/ActionRootState.qml'
--- tests/mocks/Unity/Indicators/ActionRootState.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Indicators/ActionRootState.qml	2015-01-19 17:39:20 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 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
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+
+QtObject {
+    property var actionGroup
+    property var actionName
+
+    property var action: actionGroup ? actionGroup.actions[actionName] : undefined
+    property var state: action && action.hasOwnProperty("state") ? action.state : undefined
+
+    property bool valid: action && action.hasOwnProperty("valid") ? action.valid : false
+    property string title: state && state.hasOwnProperty("title") ? state["title"] : ""
+    property string leftLabel: state && state.hasOwnProperty("pre-label") ? state["pre-label"] :     ""
+    property string rightLabel: state && state.hasOwnProperty("label") ? state["label"] : ""
+    property var icons: state && state.hasOwnProperty("icons") ? state["icons"] : []
+    property string accessibleName: state && state.hasOwnProperty("accessible-desc") ? state["accessible-desc"] : ""
+    property bool visible: state && state.hasOwnProperty("visible") ? state["visible"] : true
+
+    signal updated
+
+    onValidChanged: updated()
+    onTitleChanged: updated()
+    onLeftLabelChanged: updated()
+    onRightLabelChanged: updated()
+    onIconsChanged: updated()
+    onAccessibleNameChanged: updated()
+    onVisibleChanged: updated()
+}
 
=== renamed file 'tests/mocks/Unity/Indicators/RootActionState.qml' => 'tests/mocks/Unity/Indicators/ModelActionRootState.qml'
=== modified file 'tests/mocks/Unity/Indicators/qmldir'
--- tests/mocks/Unity/Indicators/qmldir	2014-10-07 10:28:59 +0000
+++ tests/mocks/Unity/Indicators/qmldir	2015-01-19 17:39:20 +0000
@@ -2,5 +2,6 @@
 plugin IndicatorsFakeQml
 typeinfo Indicators.qmltypes
 
+ActionRootState 0.1 ActionRootState.qml
 IndicatorsModel 0.1 IndicatorsModel.qml
-RootActionState 0.1 RootActionState.qml
+ModelActionRootState 0.1 ModelActionRootState.qml
 
=== modified file 'tests/plugins/Unity/Indicators/rootactionstatetest.cpp'
--- tests/plugins/Unity/Indicators/rootactionstatetest.cpp	2014-08-26 08:14:44 +0000
+++ tests/plugins/Unity/Indicators/rootactionstatetest.cpp	2015-01-19 17:39:20 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-#include "rootactionstate.h"
+#include "modelactionrootstate.h"
 
 #include <unitymenumodel.h>
 #include <QtTest>
@@ -32,7 +32,7 @@
     {
         UnityMenuModel* menuModel = new UnityMenuModel();
         ActionStateParser* originalParser = menuModel->actionStateParser();
-        RootActionState* rootState = new RootActionState();
+        ModelActionRootState* rootState = new ModelActionRootState();
 
         rootState->setMenu(menuModel);
 
@@ -44,7 +44,7 @@
     void testDeleteUnityMenuModel()
     {
         UnityMenuModel* menuModel = new UnityMenuModel();
-        RootActionState* rootState = new RootActionState();
+        ModelActionRootState* rootState = new ModelActionRootState();
 
         rootState->setMenu(menuModel);
 
@@ -77,7 +77,7 @@
 
         GVariant* params = g_variant_builder_end (&builderParams);
 
-        RootActionState rootState;
+        RootStateParser rootState;
         QVariant result = rootState.toQVariant(params);
         g_variant_unref(params);
 
 
=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-11-10 09:14:30 +0000
+++ tests/qmltests/CMakeLists.txt	2015-01-19 17:39:20 +0000
@@ -81,6 +81,7 @@
 add_qml_test(Panel MenuContent ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 add_qml_test(Panel Panel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 add_qml_test(Panel SearchIndicator)
+add_qml_test(Panel/Indicators IndicatorsLight ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 # These MenuItemFactory tests need the test/mocks/ to come before plugins/
 add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
 
=== added file 'tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml'
--- tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml	2015-01-19 17:39:20 +0000
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2014 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.0
+import QtQuick.Layouts 1.1
+import Unity.Test 0.1 as UT
+import Unity.Indicators 0.1 as Indicators
+import Ubuntu.Components 1.1
+import Powerd 0.1
+import Lights 0.1
+import QMenuModel 0.1
+import "../../../../qml/Panel/Indicators"
+
+Item {
+    id: root
+    width: units.gu(30)
+    height: units.gu(30)
+
+    property var newMessage:  {
+        "messages" : {
+            'valid': true,
+            'state': {
+                'icons': [ 'indicator-messages-new' ]
+            }
+        }
+    };
+    property var noNewMessage:  {
+        "messages" : {
+            'valid': true,
+            'state': {
+                'icons': [ 'indicator-messages' ]
+            }
+        }
+    };
+
+    Component {
+        id: light
+        IndicatorsLight {}
+    }
+
+    Loader {
+        id: loader
+        sourceComponent: light
+    }
+
+    Component.onCompleted: {
+        ActionData.data = newMessage;
+        Powerd.status = Powerd.On
+    }
+
+    RowLayout {
+        anchors.fill: parent
+        anchors.margins: units.gu(1)
+
+        Item {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            Rectangle {
+                width: units.gu(4)
+                height: width
+                radius: width / 2
+                anchors.centerIn: parent
+
+                color: Lights.state === Lights.On ? Lights.color : "transparent"
+
+                border.color: "black"
+                border.width: 1
+            }
+        }
+
+        ColumnLayout {
+            Layout.alignment: Qt.AlignTop
+            Layout.fillWidth: false
+            Layout.preferredWidth: units.gu(15)
+
+            Button {
+                Layout.fillWidth: true
+                text: Powerd.status === Powerd.On ? "Power Off" : "Power On"
+                onClicked: {
+                    if (Powerd.status === Powerd.On) Powerd.status = Powerd.Off;
+                    else Powerd.status = Powerd.On;
+                }
+            }
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "IndicatorsLight"
+        when: windowShown
+
+        function init() {
+            // reload
+            ActionData.data = noNewMessage;
+            loader.sourceComponent = undefined;
+            loader.sourceComponent = light;
+            Powerd.status = Powerd.On
+        }
+
+        function test_LightsStatus_data() {
+            return [
+                { tag: "Powerd.On with No Message", powerd: Powerd.On, actionData: noNewMessage, expected: Lights.Off },
+                { tag: "Powerd.Off with No Message", powerd: Powerd.Off, actionData: noNewMessage, expected: Lights.Off },
+                { tag: "Powerd.On with New Message", powerd: Powerd.On, actionData: newMessage, expected: Lights.Off },
+                { tag: "Powerd.Off with New Message", powerd: Powerd.Off, actionData: newMessage, expected: Lights.On },
+            ]
+        }
+
+        function test_LightsStatus(data) {
+            Powerd.status = data.powerd;
+            ActionData.data = data.actionData;
+
+            compare(Lights.state, data.expected, "Light does not match expected value");
+        }
+    }
+}
 
=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-11-05 00:20:05 +0000
+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2015-01-19 17:39:20 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Unity.Test 0.1 as UT
+import Ubuntu.Settings.Menus 0.1 as Menus
 import QMenuModel 0.1
 import Utils 0.1 as Utils
 import "../../../../qml/Panel/Indicators"
@@ -448,6 +449,55 @@
         }
 
         function test_create_transferMenu(data) {
+            ActionData.data = {
+                "transfer-state.queued": {
+                    'valid': true,
+                    'state': {
+                        'state': Menus.TransferState.Queued,
+                        'percent': 0.0
+                    }
+                },
+                "transfer-state.running": {
+                    'valid': true,
+                    'state': {
+                        'state': Menus.TransferState.Running,
+                        'seconds-left': 100,
+                        'percent': 0.1
+                    }
+                },
+                "transfer-state.paused": {
+                    'valid': true,
+                    'state': {
+                        'state': Menus.TransferState.Paused,
+                        'seconds-left': 100,
+                        'percent': 0.5
+                    }
+                },
+                "transfer-state.cancelled": {
+                    'valid': true,
+                    'state': {
+                        'state': Menus.TransferState.Canceled,
+                        'percent': 0.4
+                    }
+                },
+                "transfer-state.finished": {
+                    'valid': true,
+                    'state': {
+                        'state': Menus.TransferState.Finished,
+                        'seconds-left': 0,
+                        'percent': 1.0
+                    }
+                },
+                "transfer-state.error": {
+                    'valid': true,
+                    'state': {
+                        'state': Menus.TransferState.Error,
+                        'seconds-left': 100,
+                        'percent': 0.0
+                    }
+                }
+            };
+
             menuData.type = "com.canonical.indicator.transfer";
             menuData.label = data.label;
             menuData.sensitive = data.enabled;