Unity 8

Merge lp:~nick-dedekind/unity8/indicator.ubuntu-settings-components into lp:unity8

indicator.ubuntu-settings-components
Merge into trunk

Proposed by Nick Dedekind on 2013-12-17

Status:	Merged
Approved by:	Albert Astals Cid on 2014-01-29
Approved revision:	614
Merged at revision:	670
Proposed branch:	lp:~nick-dedekind/unity8/indicator.ubuntu-settings-components
Merge into:	lp:unity8
Prerequisite:	lp:~nick-dedekind/unity8/indicator-page-factory-tests
Diff against target:	3035 lines (+537/-1779) 37 files modified debian/control (+2/-0) plugins/Unity/Indicators/CMakeLists.txt (+0/-2) plugins/Unity/Indicators/Messaging/CMakeLists.txt (+0/-1) plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml (+0/-69) plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt (+0/-5) plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml (+0/-91) plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml (+0/-123) plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml (+0/-161) plugins/Unity/Indicators/Messaging/qml/QuickReply.qml (+0/-165) plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml (+0/-108) plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml (+0/-167) plugins/Unity/Indicators/Messaging/qml/TextMessage.qml (+0/-43) plugins/Unity/Indicators/Messaging/qml/qmldir (+0/-12) plugins/Unity/Indicators/Network/CMakeLists.txt (+0/-1) plugins/Unity/Indicators/Network/qml/AccessPoint.qml (+0/-117) plugins/Unity/Indicators/Network/qml/CMakeLists.txt (+0/-5) plugins/Unity/Indicators/Network/qml/qmldir (+0/-3) plugins/Unity/Indicators/qml/BaseMenuItem.qml (+0/-38) plugins/Unity/Indicators/qml/ButtonMenuItem.qml (+0/-44) plugins/Unity/Indicators/qml/DivMenuItem.qml (+0/-26) plugins/Unity/Indicators/qml/FramedMenuItem.qml (+0/-39) plugins/Unity/Indicators/qml/HLine.qml (+0/-29) plugins/Unity/Indicators/qml/MenuItemFactory.qml (+232/-48) plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml (+69/-28) plugins/Unity/Indicators/qml/ProgressMenuItem.qml (+0/-38) plugins/Unity/Indicators/qml/SectionMenuItem.qml (+0/-54) plugins/Unity/Indicators/qml/SliderMenuItem.qml (+0/-106) plugins/Unity/Indicators/qml/StandardMenuItem.qml (+0/-71) plugins/Unity/Indicators/qml/SwitchMenuItem.qml (+0/-53) plugins/Unity/Indicators/qml/qmldir (+1/-12) plugins/Unity/Indicators/resources/artwork/network/secure.svg (+0/-71) plugins/Unity/Indicators/resources/indicators.qrc (+0/-2) qml/Panel/Indicators/DefaultIndicatorPage.qml (+9/-5) qml/Panel/Indicators/client/IndicatorsList.qml (+17/-16) tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml (+0/-4) tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml (+194/-18) tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml (+13/-4)
To merge this branch:	bzr merge lp:~nick-dedekind/unity8/indicator.ubuntu-settings-components
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Sebastien Bacher	changes to the packaging		Approve on 2014-01-29
Albert Astals Cid (community)			Approve on 2014-01-29
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-01-29
Michał Sawicz		2013-12-17	Needs Fixing on 2013-12-17
Ubuntu Unity PS integration team	packaging	2014-01-29	Pending
Review via email: mp+199311@code.launchpad.net

Commit message

Ported indicators to using ubuntu-settings-components

Description of the change

Ported indicators to using ubuntu-settings-components

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

If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
yes

If you changed the UI, has there been a design review?
n/a

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-17:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-12-17:

MessageMenuItemFactory.qml: bad whitespace in line 92

review: Needs Fixing

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-12-17:

> MessageMenuItemFactory.qml: bad whitespace in line 92

Fixed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-17:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-12-17:

MenuItemFactory.qml:232:13: Cannot assign to non-existent property "time"
time: timeFormatter.timeString

tst_MessageMenuItemFactory.qml:21:1: module "Unity.Indicators.Messaging" is not installed
import Unity.Indicators.Messaging 0.1 as Indicators
^

review: Needs Fixing

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-12-18:

> MenuItemFactory.qml:232:13: Cannot assign to non-existent property "time"
> time: timeFormatter.timeString
>
>
> tst_MessageMenuItemFactory.qml:21:1: module "Unity.Indicators.Messaging" is
> not installed
> import Unity.Indicators.Messaging 0.1 as Indicators
> ^

Weird, I was sure I fixed this. Must have been fixing build folder files...
Anyway, fixed now!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-18:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-19:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-12-20:

Fixed incorrect paths due to trunk qml location changes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-20:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-20:

FAILED: Continuous integration, rev:607
http://jenkins.qa.ubuntu.com/job/unity8-ci/1944/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1908/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/468/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1908/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-20:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-02:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-06:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-13:

Why the commented lines in some tests?

// compare(loader.item.enabled, data.enabled, "Enabled does not match data");

review: Needs Information

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2014-01-15:

> Why the commented lines in some tests?
>
> // compare(loader.item.enabled, data.enabled, "Enabled does not match data");

The comments are because of an issue with indicator-messaging. Enable is controlled by a sensitivity flag in the menu items, which is broken in indicator-messaging. I'll check if it's been fixed yet.

1927 +// enabled: menuData && menuData.sensitive || false
1979 +// enabled: menuData && menuData.sensitive || false
2034 +// enabled: menuData && menuData.sensitive || false

lp:~nick-dedekind/unity8/indicator.ubuntu-settings-components updated on 2014-01-15

611. By Nick Dedekind on 2014-01-15: Fixed tests

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-15:

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

review: Approve (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-15:

Personally i think we should wait until lp:~larsu/indicator-messages/set-targets gets merged at least

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-20:

Since lp:~larsu/indicator-messages/set-targets seems to be part of the released indicator-messages 13.10.1+14.04.20140116-0ubuntu1 can you uncomment the tests?

review: Needs Fixing

lp:~nick-dedekind/unity8/indicator.ubuntu-settings-components updated on 2014-01-27

612. By Nick Dedekind on 2014-01-27: Merged with trunk
613. By Nick Dedekind on 2014-01-27: Removed Message menu enable comment

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2014-01-27:

> Since lp:~larsu/indicator-messages/set-targets seems to be part of the
> released indicator-messages 13.10.1+14.04.20140116-0ubuntu1 can you uncomment
> the tests?

Removed comments for enable and tests.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-27:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-29:

There's at least still two
// FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
that seem that should be removed?

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-29:

On the phone:
* Go to the netowrk indicator
* Change to the location indicator (i think changing to any other indicator has the same issue)

and i get on the console lots of
ShaderEffect: Property 'source' is not assigned a valid texture provider (QQuickImage*).

This is not happening with plain unity8

review: Needs Fixing

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2014-01-29:

> On the phone:
> * Go to the netowrk indicator
> * Change to the location indicator (i think changing to any other indicator
> has the same issue)
>
> and i get on the console lots of
> ShaderEffect: Property 'source' is not assigned a valid texture provider
> (QQuickImage*).
>
> This is not happening with plain unity8

It's a issue with the sdk Icon
https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1260793

lp:~nick-dedekind/unity8/indicator.ubuntu-settings-components updated on 2014-01-29

614. By Nick Dedekind on 2014-01-29: removed FIXME

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2014-01-29:

> There's at least still two
> // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
> that seem that should be removed?

Removed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-29:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-29:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, indicators still work

* Did CI run pass? If not, please explain why.
No, notifications still broken.

review: Approve

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-01-29:

the packaging changes looks fine, +1 on thpse

review: Approve (changes to the packaging)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Nick Dedekind

Unity Team

 === modified file 'debian/control'
 --- debian/control	2014-01-21 16:28:16 +0000
 +++ debian/control	2014-01-29 14:36:17 +0000
@@ -37,6 +37,7 @@
                 qtdeclarative5-private-dev,
                 qtdeclarative5-qtquick2-plugin,
                 qtdeclarative5-test-plugin,
++               qtdeclarative5-ubuntu-settings-components,
                 qtdeclarative5-ubuntu-ui-toolkit-plugin,
                 qtdeclarative5-xmllistmodel-plugin,
                 libqt5xmlpatterns5-dev,
@@ -76,6 +77,7 @@
           qmenumodel-qml (>= 0.2.7),
           qtdeclarative5-dee-plugin,
           qtdeclarative5-gsettings1.0,
++         qtdeclarative5-ubuntu-settings-components,
           qtdeclarative5-ubuntu-ui-toolkit-plugin,
           qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
           qtdeclarative5-xmllistmodel-plugin,
 === modified file 'plugins/Unity/Indicators/CMakeLists.txt'
 --- plugins/Unity/Indicators/CMakeLists.txt	2013-10-23 14:22:27 +0000
 +++ plugins/Unity/Indicators/CMakeLists.txt	2014-01-29 14:36:17 +0000
@@ -12,8 +12,6 @@
  find_package(Qt5Quick REQUIRED)
  add_subdirectory(qml)
--add_subdirectory(Messaging)
--add_subdirectory(Network)
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
 === removed directory 'plugins/Unity/Indicators/Messaging'
 === removed file 'plugins/Unity/Indicators/Messaging/CMakeLists.txt'
 --- plugins/Unity/Indicators/Messaging/CMakeLists.txt	2013-06-28 10:54:46 +0000
 +++ plugins/Unity/Indicators/Messaging/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
--add_subdirectory(qml)
 === removed directory 'plugins/Unity/Indicators/Messaging/qml'
 === removed file 'plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml'
 --- plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml	2013-08-30 18:21:21 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--
--Item {
--    id: textField
--    property alias text: replyField.text
--    property alias buttonText: sendButton.text
--    property bool activateEnabled: false
--
--    signal activate(var value)
--
--    TextField {
--        id: replyField
--
--        anchors {
--            top: parent.top
--            bottom: parent.bottom
--            left: parent.left
--            right: sendButton.left
--            rightMargin: units.gu(1)
--        }
--        placeholderText: "Reply"
--        hasClearButton: false
--
--        onEnabledChanged: {
--            //Make sure that the component lost focus when enabled = false,
--            //otherwise it will get focus again when enable = true
--            if (!enabled) {
--                focus = false;
--            }
--        }
--    }
--
--    Button {
--        id: sendButton
--        anchors {
--            top: parent.top
--            bottom: parent.bottom
--            right: parent.right
--        }
--        width: units.gu(9)
--        enabled: replyField.text !== "" && textField.activateEnabled
--        color: enabled ? "#c94212" : "#bababa"
--
--        onClicked: {
--            textField.activate(replyField.text);
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt'
 --- plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt	2013-08-22 13:05:57 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
--# export_qmlfiles macro
--include(Plugins)
--
--# export the qmldir, *.qml files.
--export_qmlfiles(Unity.Indicators.Messaging Unity/Indicators/Messaging)
 === removed file 'plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml'
 --- plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml	2013-09-16 07:37:30 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1 as Indicators
--
--Indicators.BaseMenuItem {
--    id: groupedMessage
--
--    property alias title: __title.text
--    property alias count: label.text
--    property string appIcon: "qrc:/indicators/artwork/messaging/default_app.svg"
--
--    signal activateApp()
--    signal dismiss()
--
--    implicitHeight: units.gu(10)
--
--    Row {
--        anchors.fill: parent
--        anchors.margins: units.gu(2)
--        spacing: units.gu(4)
--
--        UbuntuShape {
--            height: units.gu(6)
--            width: units.gu(6)
--            image: Image {
--                source: groupedMessage.appIcon
--                fillMode: Image.PreserveAspectFit
--            }
--        }
--
--        Label {
--            id: __title
--            anchors.verticalCenter: parent.verticalCenter
--            color: "#e8e1d0"
--            font.weight: Font.DemiBold
--            fontSize: "medium"
--        }
--
--        Label {
--            id: label
--            anchors.verticalCenter: parent.verticalCenter
--            width: parent.width - x
--            horizontalAlignment: Text.AlignRight
--            color: "#e8e1d0"
--            font.weight: Font.DemiBold
--            fontSize: "medium"
--            text: "0"
--        }
--    }
--
--    Indicators.HLine {
--        anchors.top: parent.top
--        color: "#403b37"
--    }
--
--    Indicators.HLine {
--        anchors.bottom: parent.bottom
--        color: "#060606"
--    }
--
--    MouseArea {
--        anchors.fill: parent
--        onClicked: {
--            groupedMessage.activateApp();
--        }
--    }
--
--    onItemRemoved: {
--        groupedMessage.dismiss();
--    }
--}
 === removed file 'plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml'
 --- plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml	2013-09-26 11:00:33 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1 as Indicators
--
--Indicators.BaseMenuItem {
--    id: heroMessage
--
--    property alias heroMessageHeader: __heroMessageHeader
--    property real collapsedHeight: heroMessageHeader.y + heroMessageHeader.bodyBottom + units.gu(2)
--    property real expandedHeight: collapsedHeight
--
--    property alias avatar: __heroMessageHeader.avatar
--    property alias appIcon: __heroMessageHeader.icon
--
--    signal activateApp
--    signal dismiss
--
--    removable: state !== "expanded"
--    implicitHeight: collapsedHeight
--
--    Rectangle {
--        id: background
--        property real alpha: 0.0
--        anchors.fill: parent
--        color: Qt.rgba(1.0, 1.0, 1.0, alpha)
--        z: -1
--    }
--
--    HeroMessageHeader {
--        id: __heroMessageHeader
--
--        anchors.top: parent.top
--        anchors.left: parent.left
--        anchors.right: parent.right
--
--        avatar: "qrc:/indicators/artwork/messaging/default_contact.png"
--        appIcon: icon
--
--        state: heroMessage.state
--
--        onAppIconClicked:  {
--            deselectMenu();
--            heroMessage.activateApp();
--        }
--    }
--
--    onClicked: {
--        if (menuSelected) {
--            deselectMenu();
--        } else {
--            selectMenu();
--        }
--    }
--
--    Indicators.HLine {
--        id: __topHLine
--        anchors.top: parent.top
--        color: "#403b37"
--    }
--
--    Indicators.HLine {
--        id: __bottomHLine
--        anchors.bottom: parent.bottom
--        color: "#060606"
--    }
--
--    states: State {
--        name: "expanded"
--        when: menuSelected
--
--        PropertyChanges {
--            target: heroMessage
--            implicitHeight: heroMessage.expandedHeight
--        }
--        PropertyChanges {
--            target: background
--            alpha: 0.05
--        }
--        PropertyChanges {
--            target: __topHLine
--            opacity: 0.0
--        }
--        PropertyChanges {
--            target: __bottomHLine
--            opacity: 0.0
--        }
--    }
--
--    transitions: Transition {
--        ParallelAnimation {
--            NumberAnimation {
--                properties: "opacity,implicitHeight"
--                duration: 200
--                easing.type: Easing.OutQuad
--            }
--            ColorAnimation {}
--        }
--    }
--
--    onItemRemoved: {
--        heroMessage.dismiss();
--    }
--}
 === removed file 'plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml'
 --- plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml	2013-07-03 10:39:22 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--
--Item {
--    id: heroMessageHeader
--
--    property alias avatar: avatarImage.source
--    property alias icon: iconImage.source
--    property alias appIcon: appIconImage.source
--    property alias titleText: __titleText
--    property alias subtitleText: __subtitleText
--    property alias bodyText: __bodyText
--    property real bodyBottom: bodyText.y + bodyText.height
--
--    signal appIconClicked()
--
--    height: units.gu(9)
--
--    UbuntuShape {
--        id: avatarImageContainer
--        anchors {
--            top: parent.top
--            topMargin: units.gu(2)
--            left: parent.left
--            leftMargin: units.gu(2)
--        }
--        height: units.gu(6)
--        width: units.gu(6)
--        image: Image {
--            id: avatarImage
--            fillMode: Image.PreserveAspectFit
--        }
--    }
--
--    Image {
--        id: iconImage
--        anchors {
--            top: parent.top
--            topMargin: units.gu(2)
--            left: avatarImageContainer.right
--            leftMargin: units.gu(1)
--        }
--        height: units.gu(1.5)
--        width: units.gu(2)
--        horizontalAlignment: Image.AlignHCenter
--        verticalAlignment: Image.AlignBottom
--        fillMode: Image.PreserveAspectFit
--    }
--
--    Label {
--        id: __titleText
--        anchors {
--            baseline: iconImage.bottom
--            left: iconImage.right
--            leftMargin: units.gu(1)
--            right: __appIcon.left
--            rightMargin: units.gu(2)
--        }
--        elide: Text.ElideRight
--        color: "#e8e1d0"
--        font.weight: Font.DemiBold
--        fontSize: "medium"
--    }
--
--    Label {
--        id: __subtitleText
--        anchors {
--            baseline: __titleText.baseline
--            baselineOffset: units.gu(2.5)
--            left: __titleText.left
--            right: __titleText.right
--        }
--        elide: Text.ElideRight
--        color: "#8f8f88"
--        fontSize: "small"
--    }
--
--    Label {
--        id: __bodyText
--        anchors {
--            baseline: __subtitleText.baseline
--            baselineOffset: units.gu(2.5)
--            left: __titleText.left
--            right: parent.right
--            rightMargin: units.gu(2)
--        }
--        maximumLineCount: 2
--        wrapMode: Text.WordWrap
--        elide: Text.ElideRight
--        color: "#e8e1d0"
--        fontSize: "small"
--    }
--
--    Item {
--        id: __appIcon
--        width: units.gu(7)
--        height: units.gu(7)
--        anchors {
--            top: parent.top
--            right: parent.right
--        }
--        opacity: 0.0
--        enabled: heroMessageHeader.state === "expanded"
--
--        Image {
--            id: appIconImage
--            height: width
--            anchors {
--                left: parent.left
--                leftMargin: units.gu(2)
--                right: parent.right
--                rightMargin: units.gu(2)
--                topMargin: units.gu(1)
--                verticalCenter: parent.verticalCenter
--            }
--            fillMode: Image.PreserveAspectFit
--        }
--
--        MouseArea {
--            anchors.fill: parent
--            onClicked: heroMessageHeader.appIconClicked()
--        }
--    }
--
--    states: State {
--        name: "expanded"
--
--        PropertyChanges {
--            target: __appIcon
--            opacity: 1.0
--        }
--    }
--
--    transitions: Transition {
--        NumberAnimation {
--            property: "opacity"
--            duration: 200
--            easing.type: Easing.OutQuad
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/Messaging/qml/QuickReply.qml'
 --- plugins/Unity/Indicators/Messaging/qml/QuickReply.qml	2013-10-01 19:26:10 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/QuickReply.qml	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1 as Indicators
--
--Item {
--    id: quickReply
--    property alias buttonText: actionTextField.buttonText
--    property real expandedHeight: childrenRect.height
--    property alias messages : messagelistRepeater.model
--    property alias replyEnabled: actionTextField.activateEnabled
--
--    signal reply(var value)
--
--    Item {
--        id: header
--        anchors.top: parent.top
--        anchors.left: parent.left
--        anchors.right: parent.right
--        height: units.gu(4)
--
--        Row {
--            anchors {
--                fill: parent
--                leftMargin: units.gu(2)
--                rightMargin: units.gu(2)
--                topMargin: units.gu(1)
--                bottomMargin: units.gu(1)
--            }
--            spacing: units.gu(1)
--
--            Image {
--                width: units.gu(2)
--                height: width
--                fillMode: Image.PreserveAspectFit
--                source: "qrc:/indicators/artwork/messaging/message_sms01_54px.png"
--            }
--
--            Label {
--                height: parent.height
--                verticalAlignment: Text.AlignVCenter
--                fontSize: "small"
--                color: "#8f8f88"
--                text: "Quick reply with:"
--            }
--        }
--
--        Indicators.HLine {
--            anchors.bottom: parent.bottom
--            color: "#20201F"
--        }
--    }
--
--    Column {
--        id: messagelist
--        anchors {
--            left: parent.left
--            right: parent.right
--            top: header.bottom
--        }
--        height: childrenRect.height
--
--        Repeater {
--            id: messagelistRepeater
--
--            height: childrenRect.height
--
--            Item {
--                width: messagelist.width
--                height: units.gu(5)
--
--                Label {
--                    id: __label
--
--                    anchors {
--                        fill: parent
--                        leftMargin: units.gu(2)
--                        rightMargin: units.gu(2)
--                    }
--                    verticalAlignment: Text.AlignVCenter
--                    fontSize: "medium"
--                    color: "#e8e1d0"
--                    text: modelData
--                }
--
--                Indicators.HLine {
--                    anchors.top: parent.top
--                    color: "#464543"
--                }
--
--                Indicators.HLine {
--                    anchors.bottom: parent.bottom
--                    color: "#20201F"
--                }
--
--                MouseArea {
--                    id: __mouseArea
--
--                    anchors.fill: parent
--                    onClicked: {
--                        actionTextField.text = modelData;
--                    }
--                }
--
--                Rectangle {
--                    id: __mask
--
--                    anchors.fill: parent
--                    color: "black"
--                    opacity: __mouseArea.pressed ? 0.3 : 0.0
--                    Behavior on opacity {
--                        NumberAnimation {
--                            duration: 200
--                            easing.type: Easing.OutQuad
--                        }
--                    }
--                }
--            }
--
--        }
--    }
--
--    Item {
--        anchors.top: messagelist.bottom
--        anchors.left: parent.left
--        anchors.right: parent.right
--        height: units.gu(6)
--
--        ActionTextField {
--            id: actionTextField
--
--            anchors.fill: parent
--            anchors.margins: units.gu(1)
--            activateEnabled: replyEnabled
--
--            onActivate: {
--                quickReply.reply(value)
--            }
--        }
--
--        Indicators.HLine {
--            anchors.top: parent.top
--            color: "#464543"
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml'
 --- plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml	2013-10-23 14:26:51 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1
--import Utils 0.1 as Utils
--
--HeroMessage {
--    id: __heroMessage
--
--    property string title: ""
--    property var time
--    property string message: ""
--
--    property alias footer: footerLoader.sourceComponent
--
--    expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)
--    heroMessageHeader.titleText.text: title
--    heroMessageHeader.subtitleText.text: timeFormatter.timeString
--    heroMessageHeader.bodyText.text: message
--
--    Item {
--        id: fullMessage
--
--        anchors {
--            left: parent.left
--            leftMargin: units.gu(2)
--            right: parent.right
--            rightMargin: units.gu(2)
--            top: heroMessageHeader.bottom
--        }
--        height: childrenRect.height
--        opacity: 0.0
--        enabled: false
--
--        Utils.TimeFormatter {
--            id: timeFormatter
--            time: __heroMessage.time
--            format: "hh:mm - MMM dd"
--        }
--
--        Label {
--            id: bodyText
--            anchors {
--                top: parent.top
--                left: parent.left
--                right: parent.right
--            }
--            wrapMode: Text.WordWrap
--            elide: Text.ElideRight
--            color: "#e8e1d0"
--            fontSize: "medium"
--            text: heroMessageHeader.bodyText.text
--        }
--
--        Loader {
--            id: footerLoader
--
--            anchors {
--                top: bodyText.bottom
--                topMargin: units.gu(2)
--                left: parent.left
--                right: parent.right
--            }
--            height: item != undefined ? units.gu(4) : 0
--        }
--
--        states: State {
--            name: "expanded"
--            when: __heroMessage.state === "expanded"
--
--            PropertyChanges {
--                target: heroMessageHeader.bodyText
--                opacity: 0.0
--            }
--
--            PropertyChanges {
--                target: fullMessage
--                opacity: 1.0
--                enabled: true
--            }
--        }
--        transitions: Transition {
--            NumberAnimation {
--                property: "opacity"
--                duration: 200
--            }
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml'
 --- plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml	2013-10-23 14:26:51 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml	1970-01-01 00:00:00 +0000
@@ -1,167 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1
--import Utils 0.1 as Utils
--
--HeroMessage {
--    id: snapDecision
--
--    property string title: ""
--    property var time
--    property string message: ""
--
--    property bool activateEnabled: true
--    property alias actionButtonText: actionButton.text
--
--    property bool replyEnabled: true
--    property alias replyMessages: quickreply.messages
--    property alias replyButtonText: quickreply.buttonText
--
--    expandedHeight: buttons.y + buttons.height + quickreply.height + units.gu(2)
--    heroMessageHeader.titleText.text:  title
--    heroMessageHeader.subtitleText.text: message
--    heroMessageHeader.subtitleText.color: "#e8e1d0"
--    heroMessageHeader.bodyText.text: timeFormatter.timeString
--    heroMessageHeader.bodyText.color: "#8f8f88"
--
--    signal activate
--    signal reply(string value)
--
--    Item {
--        id: buttons
--
--        anchors.left: parent.left
--        anchors.leftMargin: units.gu(2)
--        anchors.right: parent.right
--        anchors.rightMargin: units.gu(2)
--        anchors.top: heroMessageHeader.bottom
--        anchors.topMargin: units.gu(1)
--        height: units.gu(4)
--        opacity: 0.0
--
--        Utils.TimeFormatter {
--            id: timeFormatter
--            time: snapDecision.time
--            format: "hh:mm - MMM dd"
--        }
--
--        Button {
--            text: "Message"
--            color: "#bababa"
--            anchors.left: parent.left
--            anchors.top: parent.top
--            anchors.bottom: parent.bottom
--            width: (parent.width - units.gu(1)) / 2
--
--            onClicked: {
--                if (quickreply.state === "") {
--                    quickreply.state = "expanded";
--                } else {
--                    quickreply.state = "";
--                }
--            }
--        }
--
--        Button {
--            id: actionButton
--            text: "Call back"
--            color: enabled ? "#c94212" : "#bababa"
--            anchors.right: parent.right
--            anchors.top: parent.top
--            anchors.bottom: parent.bottom
--            width: (parent.width - units.gu(1)) / 2
--            enabled: snapDecision.activateEnabled
--
--            onClicked: {
--                snapDecision.activate();
--            }
--        }
--
--        states: State {
--            name: "expanded"
--            when: snapDecision.state === "expanded"
--
--            PropertyChanges {
--                target: buttons
--                opacity: 1.0
--            }
--        }
--        transitions: Transition {
--            NumberAnimation {
--                property: "opacity"
--                duration: 200
--                easing.type: Easing.OutQuad
--            }
--        }
--    }
--
--    QuickReply {
--        id: quickreply
--
--        onReply: {
--            snapDecision.reply(value);
--        }
--
--        messages: ""
--        buttonText: "Send"
--        anchors {
--            top: buttons.bottom
--            topMargin: units.gu(2)
--            left: parent.left
--            right: parent.right
--        }
--        height: 0
--        opacity: 0.0
--        enabled: false
--        replyEnabled: snapDecision.replyEnabled
--
--        states: State {
--            name: "expanded"
--
--            PropertyChanges {
--                target: quickreply
--                height: expandedHeight
--                opacity: 1.0
--            }
--
--            PropertyChanges {
--                target: quickreply
--                enabled: true
--            }
--        }
--
--        transitions: Transition {
--            NumberAnimation {
--                properties: "opacity,height"
--                duration: 200
--                easing.type: Easing.OutQuad
--            }
--        }
--    }
--
--    onStateChanged: {
--        if (state === "") {
--            quickreply.state = "";
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/Messaging/qml/TextMessage.qml'
 --- plugins/Unity/Indicators/Messaging/qml/TextMessage.qml	2013-08-30 18:21:21 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/TextMessage.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1 as Indicators
--
--SimpleTextMessage {
--    id: simpleMessage
--
--    property bool replyEnabled: false
--    property string replyButtonText: "Send"
--
--    signal reply(string value)
--
--    footer: ActionTextField {
--        anchors.fill:  parent
--
--        activateEnabled: simpleMessage.replyEnabled
--        buttonText: simpleMessage.replyButtonText
--
--        onActivate: {
--            simpleMessage.reply(value);
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/Messaging/qml/qmldir'
 --- plugins/Unity/Indicators/Messaging/qml/qmldir	2013-08-22 13:05:57 +0000
 +++ plugins/Unity/Indicators/Messaging/qml/qmldir	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
--module Unity.Indicators.Messaging
--
--ActionButton 0.1 ActionButton.qml
--ActionTextField 0.1 ActionTextField.qml
--GroupedMessage 0.1 GroupedMessage.qml
--HeroMessage 0.1 HeroMessage.qml
--HeroMessageHeader 0.1 HeroMessageHeader.qml
--MessageMenuItemFactory 0.1 MessageMenuItemFactory.qml
--QuickReply 0.1 QuickReply.qml
--SimpleTextMessage 0.1 SimpleTextMessage.qml
--SnapDecision 0.1 SnapDecision.qml
--TextMessage 0.1 TextMessage.qml
 \ No newline at end of file
 === removed directory 'plugins/Unity/Indicators/Network'
 === removed file 'plugins/Unity/Indicators/Network/CMakeLists.txt'
 --- plugins/Unity/Indicators/Network/CMakeLists.txt	2013-09-30 20:22:18 +0000
 +++ plugins/Unity/Indicators/Network/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
--add_subdirectory(qml)
 === removed directory 'plugins/Unity/Indicators/Network/qml'
 === removed file 'plugins/Unity/Indicators/Network/qml/AccessPoint.qml'
 --- plugins/Unity/Indicators/Network/qml/AccessPoint.qml	2013-12-12 16:32:20 +0000
 +++ plugins/Unity/Indicators/Network/qml/AccessPoint.qml	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Ubuntu.Components.ListItems 0.1 as ListItem
--import Unity.Indicators 0.1 as Indicators
--
--Indicators.BaseMenuItem {
--    id: menuItem
--    implicitHeight: units.gu(5.5)
--
--    property bool checked: false
--    property bool secure: false
--    property bool adHoc: false
--    property int signalStrength: 0
--    property alias label: _label.text
--
--    signal activate()
--
--    onCheckedChanged: {
--        // Can't rely on binding. Checked is assigned on click.
--        checkBoxActive.checked = checked;
--    }
--
--    onClicked: {
--        checkBoxActive.clicked();
--    }
--
--    CheckBox {
--        id: checkBoxActive
--        height: units.gu(3)
--        width: units.gu(3)
--
--        anchors {
--            left: parent.left
--            leftMargin: menuItem.__contentsMargins
--            verticalCenter: parent.verticalCenter
--        }
--
--        onClicked: {
--            menuItem.activate();
--        }
--    }
--
--    Image {
--        id: iconSignal
--
--        width: height
--        height: Math.min(units.gu(5), parent.height - units.gu(1))
--        anchors {
--            left: checkBoxActive.right
--            leftMargin: units.gu(1)
--            verticalCenter: parent.verticalCenter
--        }
--
--        source: {
--            var imageName = "nm-signal-100"
--
--            if (adHoc) {
--                imageName = "nm-adhoc";
--            } else if (signalStrength == 0) {
--                imageName = "nm-signal-00";
--            } else if (signalStrength <= 25) {
--                imageName = "nm-signal-25";
--            } else if (signalStrength <= 50) {
--                imageName = "nm-signal-50";
--            } else if (signalStrength <= 75) {
--                imageName = "nm-signal-75";
--            }
--            return "image://theme/" + imageName;
--        }
--    }
--
--    Label {
--        id: _label
--        anchors {
--            left: iconSignal.right
--            leftMargin: units.gu(1)
--            verticalCenter: parent.verticalCenter
--            right: iconSecure.visible ? iconSecure.left : parent.right
--            rightMargin: menuItem.__contentsMargins
--        }
--        elide: Text.ElideRight
--        opacity: label.enabled ? 1.0 : 0.5
--    }
--
--    Image {
--        id: iconSecure
--        visible: secure
--        source: "qrc:/indicators/artwork/network/secure.svg"
--
--        width: height
--        height: Math.min(units.gu(4), parent.height - units.gu(1))
--        anchors {
--            right: parent.right
--            rightMargin: units.gu(1)
--            verticalCenter: parent.verticalCenter
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/Network/qml/CMakeLists.txt'
 --- plugins/Unity/Indicators/Network/qml/CMakeLists.txt	2013-08-20 19:50:07 +0000
 +++ plugins/Unity/Indicators/Network/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
--# export_qmlplugin macro
--include(Plugins)
--
--# export the qmldir, *.qml files.
--export_qmlfiles(Unity.Indicators.Network Unity/Indicators/Network)
 === removed file 'plugins/Unity/Indicators/Network/qml/qmldir'
 --- plugins/Unity/Indicators/Network/qml/qmldir	2013-10-03 10:59:32 +0000
 +++ plugins/Unity/Indicators/Network/qml/qmldir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
--module Unity.Indicators.Network
--
--AccessPoint 0.1 AccessPoint.qml
 === removed file 'plugins/Unity/Indicators/qml/BaseMenuItem.qml'
 --- plugins/Unity/Indicators/qml/BaseMenuItem.qml	2013-08-22 13:05:57 +0000
 +++ plugins/Unity/Indicators/qml/BaseMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Nick Dedekind <nick.dedekind@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components.ListItems 0.1 as ListItem
--
--ListItem.Standard {
--    id: baseMenu
--
--    property bool menuSelected: false
--
--    signal selectMenu()
--    signal deselectMenu()
--
--    showDivider: false
--    __foregroundColor: "#e8e1d0" // FIXME not in palette yet
--
--    backgroundIndicator: RemoveBackground {
--        state: baseMenu.swipingState
--    }
--}
 === removed file 'plugins/Unity/Indicators/qml/ButtonMenuItem.qml'
 --- plugins/Unity/Indicators/qml/ButtonMenuItem.qml	2013-12-12 16:32:20 +0000
 +++ plugins/Unity/Indicators/qml/ButtonMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Nick Dedekind <nick.dedekind@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1 as Indicators
--
--BaseMenuItem {
--    id: menuItem
--    implicitHeight: units.gu(7)
--
--    property alias buttonText: button.text
--
--    signal activate()
--
--    Button {
--        id: button
--        anchors.centerIn: parent
--        height: units.gu(4)
--        width: units.gu(16)
--        color: "#1b1817"
--
--        onClicked: {
--            menuItem.activate();
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/qml/DivMenuItem.qml'
 --- plugins/Unity/Indicators/qml/DivMenuItem.qml	2013-08-14 09:07:45 +0000
 +++ plugins/Unity/Indicators/qml/DivMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
--/*
-- * 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:
-- *      Olivier Tilloy <olivier.tilloy@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--
--Rectangle {
--    color: "#181514" // FIXME not in palette yet
--    implicitHeight: units.gu(1)
--}
 === removed file 'plugins/Unity/Indicators/qml/FramedMenuItem.qml'
 --- plugins/Unity/Indicators/qml/FramedMenuItem.qml	2013-08-23 11:17:06 +0000
 +++ plugins/Unity/Indicators/qml/FramedMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Nick Dedekind <nick.dedekind@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Ubuntu.Components.ListItems 0.1 as ListItem
--
--BaseMenuItem {
--    implicitHeight: units.gu(7)
--
--    iconFrame: false
--
--    HLine {
--        anchors.top: parent.top
--        color: "#403b37" // FIXME not in palette yet
--    }
--
--    HLine {
--        anchors.bottom: parent.bottom
--        color: "#060606" // FIXME not in palette yet
--    }
--}
 === removed file 'plugins/Unity/Indicators/qml/HLine.qml'
 --- plugins/Unity/Indicators/qml/HLine.qml	2013-07-01 10:14:46 +0000
 +++ plugins/Unity/Indicators/qml/HLine.qml	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--
--Rectangle {
--    height: units.dp(1)
--    anchors {
--        left: parent.left
--        right: parent.right
--    }
--}
 === modified file 'plugins/Unity/Indicators/qml/MenuItemFactory.qml'
 --- plugins/Unity/Indicators/qml/MenuItemFactory.qml	2013-12-12 16:32:20 +0000
 +++ plugins/Unity/Indicators/qml/MenuItemFactory.qml	2014-01-29 14:36:17 +0000
@@ -18,11 +18,10 @@
   */
  import QtQuick 2.0
--import Unity.Indicators 0.1 as Indicators
--import Unity.Indicators.Network 0.1 as ICNetwork
--import Unity.Indicators.Messaging 0.1 as ICMessaging
++import Ubuntu.Settings.Menus 0.1 as Menus
  import QMenuModel 0.1 as QMenuModel
--import Ubuntu.Components 0.1
++import Utils 0.1 as Utils
++import Ubuntu.Components.ListItems 0.1 as ListItems
  Item {
      id: menuFactory
@@ -33,12 +32,14 @@
          "unity.widgets.systemsettings.tablet.volumecontrol" : sliderMenu,
          "unity.widgets.systemsettings.tablet.switch"        : switchMenu,
--        "com.canonical.indicator.button"    : buttonMenu,
--        "com.canonical.indicator.div"       : divMenu,
--        "com.canonical.indicator.section"   : sectionMenu,
--        "com.canonical.indicator.progress"  : progressMenu,
--        "com.canonical.indicator.slider"    : sliderMenu,
--        "com.canonical.indicator.switch"    : switchMenu,
++        "com.canonical.indicator.button"        : buttonMenu,
++        "com.canonical.indicator.div"           : separatorMenu,
++        "com.canonical.indicator.section"       : sectionMenu,
++        "com.canonical.indicator.progress"      : progressMenu,
++        "com.canonical.indicator.slider"        : sliderMenu,
++        "com.canonical.indicator.switch"        : switchMenu,
++        "com.canonical.indicator.alarm"         : alarmMenu,
++        "com.canonical.indicator.appointment"   : appointmentMenu,
          "com.canonical.indicator.messages.messageitem"  : messageItem,
          "com.canonical.indicator.messages.sourceitem"   : groupedMessage,
@@ -46,6 +47,9 @@
          "com.canonical.unity.slider"    : sliderMenu,
          "com.canonical.unity.switch"    : switchMenu,
++        "com.canonical.unity.media-player"    : mediaPayerMenu,
++        "com.canonical.unity.playback-item"   : playbackItemMenu,
++
          "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,
          "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
+     }
@@ -58,15 +62,15 @@
+     }
      Component {
--        id: divMenu;
--        Indicators.DivMenuItem {
--            objectName: "divMenu"
++        id: separatorMenu;
++        Menus.SeparatorMenu {
++            objectName: "separatorMenu"
+         }
+     }
      Component {
          id: sliderMenu;
--        Indicators.SliderMenuItem {
++        Menus.SliderMenu {
              objectName: "sliderMenu"
              property QtObject menuData: null
              property var menuModel: menuFactory.menuModel
@@ -95,12 +99,12 @@
              onMenuIndexChanged: {
                  loadAttributes();
+             }
--            onChangeState: {
++            onUpdated: {
                  menuModel.changeState(menuIndex, value);
+             }
              function loadAttributes() {
--                if (!menuModel || menuIndex == undefined) return;
++                if (!menuModel || menuIndex == -1) return;
                  menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
                                                               'max-value': 'double',
                                                               'min-icon': 'icon',
@@ -111,7 +115,7 @@
      Component {
          id: buttonMenu;
--        Indicators.ButtonMenuItem {
++        Menus.ButtonMenu {
              objectName: "buttonMenu"
              property QtObject menuData: null
              property var menuModel: menuFactory.menuModel
@@ -120,7 +124,7 @@
              buttonText: menuData && menuData.label || ""
              enabled: menuData && menuData.sensitive || false
--            onActivate: {
++            onTriggered: {
                  menuModel.activate(menuIndex);
                  shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
+             }
@@ -128,18 +132,19 @@
+     }
      Component {
          id: sectionMenu;
--        Indicators.SectionMenuItem {
++        Menus.SectionMenu {
              objectName: "sectionMenu"
              property QtObject menuData: null
              property var menuIndex: undefined
              text: menuData && menuData.label || ""
++            busy: false
+         }
+     }
      Component {
          id: progressMenu;
--        Indicators.ProgressMenuItem {
++        Menus.ProgressValueMenu {
              objectName: "progressMenu"
              property QtObject menuData: null
              property int menuIndex: -1
@@ -153,7 +158,7 @@
      Component {
          id: standardMenu;
--        Indicators.StandardMenuItem {
++        ListItems.Standard {
              objectName: "standardMenu"
              property QtObject menuData: null
              property int menuIndex: -1
@@ -161,19 +166,36 @@
              text: menuData && menuData.label || ""
              iconSource: menuData && menuData.icon || ""
              enabled: menuData && menuData.sensitive || false
--            checkable: menuData ? (menuData.isCheck || menuData.isRadio) : false
--            checked: checkable ? menuData.isToggled : false
--
--            onActivate: {
--                menuModel.activate(menuIndex);
--                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
--            }
--        }
--    }
++
++            onTriggered: {
++                menuModel.activate(menuIndex);
++                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
++            }
++        }
++    }
++
++    Component {
++        id: checkableMenu;
++        Menus.CheckableMenu {
++            objectName: "checkableMenu"
++            property QtObject menuData: null
++            property int menuIndex: -1
++
++            text: menuData && menuData.label || ""
++            enabled: menuData && menuData.sensitive || false
++            checked: menuData && menuData.isToggled || false
++
++            onTriggered: {
++                menuModel.activate(menuIndex);
++                shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
++            }
++        }
++    }
++
      Component {
          id: switchMenu;
--        Indicators.SwitchMenuItem {
++        Menus.SwitchMenu {
              objectName: "switchMenu"
              property QtObject menuData: null
              property int menuIndex: -1
@@ -181,9 +203,9 @@
              text: menuData && menuData.label || ""
              iconSource: menuData && menuData.icon || ""
              enabled: menuData && menuData.sensitive || false
--            checked: menuData ? menuData.isToggled : false
++            checked: menuData && menuData.isToggled || false
--            onActivate: {
++            onTriggered: {
                  menuModel.activate(menuIndex);
                  shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
+             }
@@ -191,8 +213,84 @@
+     }
      Component {
++        id: alarmMenu;
++        Menus.EventMenu {
++            objectName: "alarmMenu"
++            property QtObject menuData: null
++            property var menuModel: menuFactory.menuModel
++            property int menuIndex: -1
++            property var extendedData: menuData && menuData.ext || undefined
++            // TODO - bug #1260728
++            property var timeFormatter: Utils.GDateTimeFormatter {
++                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
++                format: getExtendedProperty(extendedData, "xCanonicalTimeFormat", "")
++            }
++
++            text: menuData && menuData.label || ""
++            iconSource: menuData && menuData.icon || "image://theme/alarm-clock"
++            time: timeFormatter.timeString
++            enabled: menuData && menuData.sensitive || false
++
++            onMenuModelChanged: {
++                loadAttributes();
++            }
++            onMenuIndexChanged: {
++                loadAttributes();
++            }
++            onTriggered: {
++                menuModel.activate(menuIndex);
++            }
++
++            function loadAttributes() {
++                if (!menuModel || menuIndex == -1) return;
++                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
++                                                             'x-canonical-time-format': 'string'});
++            }
++        }
++    }
++
++    Component {
++        id: appointmentMenu;
++        Menus.EventMenu {
++            objectName: "appointmentMenu"
++            property QtObject menuData: null
++            property var menuModel: menuFactory.menuModel
++            property int menuIndex: -1
++            property var extendedData: menuData && menuData.ext || undefined
++            // TODO - bug #1260728
++            property var timeFormatter: Utils.GDateTimeFormatter {
++                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
++                format: getExtendedProperty(extendedData, "xCanonicalTimeFormat", "")
++            }
++
++            text: menuData && menuData.label || ""
++            iconSource: menuData && menuData.icon || "image://theme/calendar"
++            time: timeFormatter.timeString
++            eventColor: menu && menu.ext.hasOwnProperty("xCanonicalColor") ? menu.ext.xCanonicalColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
++            enabled: menuData && menuData.sensitive || false
++
++            onMenuModelChanged: {
++                loadAttributes();
++            }
++            onMenuIndexChanged: {
++                loadAttributes();
++            }
++            onTriggered: {
++                menuModel.activate(menuIndex);
++            }
++
++            function loadAttributes() {
++                if (!menuModel || menuIndex == -1) return;
++                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-color': 'string',
++                                                             'x-canonical-time': 'int64',
++                                                             'x-canonical-time-format': 'string'});
++            }
++        }
++    }
++
++    Component {
          id: wifiSection;
--        Indicators.SectionMenuItem {
++        Menus.SectionMenu {
              objectName: "wifiSection"
              property QtObject menuData: null
              property var menuModel: menuFactory.menuModel
@@ -210,7 +308,7 @@
+             }
              function loadAttributes() {
--                if (!menuModel || menuIndex == undefined) return;
++                if (!menuModel || menuIndex == -1) return;
                  menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-busy-action': 'bool'})
+             }
+         }
@@ -218,7 +316,7 @@
      Component {
          id: accessPoint;
--        ICNetwork.AccessPoint {
++        Menus.AccessPointMenu {
              objectName: "accessPoint"
              property QtObject menuData: null
              property var menuModel: menuFactory.menuModel
@@ -231,11 +329,11 @@
                  name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
+             }
--            label: menuData && menuData.label || ""
++            text: menuData && menuData.label || ""
              enabled: menuData && menuData.sensitive || false
++            checked: menuData && menuData.isToggled || false
              secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
              adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
--            checked: menuData ? menuData.isToggled : false
              signalStrength: strengthAction.valid ? strengthAction.state : 0
              onMenuModelChanged: {
@@ -244,13 +342,13 @@
              onMenuIndexChanged: {
                  loadAttributes();
+             }
--            onActivate: {
++            onTriggered: {
                  menuModel.activate(menuIndex);
                  shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
+             }
              function loadAttributes() {
--                if (!menuModel || menuIndex == undefined) return;
++                if (!menuModel || menuIndex == -1) return;
                  menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
                                                               'x-canonical-wifi-ap-is-secure': 'bool',
                                                               'x-canonical-wifi-ap-strength-action': 'string'});
@@ -260,7 +358,7 @@
      Component {
          id: messageItem
--        ICMessaging.MessageMenuItemFactory {
++        MessageMenuItemFactory {
              objectName: "messageItem"
              menuModel: menuFactory.menuModel
+         }
@@ -268,17 +366,18 @@
      Component {
          id: groupedMessage
--        ICMessaging.GroupedMessage {
++        Menus.GroupedMessageMenu {
              objectName: "groupedMessage"
              property QtObject menuData: null
              property var menuModel: menuFactory.menuModel
              property int menuIndex: -1
              property var extendedData: menuData && menuData.ext || undefined
--            title: menuData && menuData.label || ""
--            appIcon: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
++            text: menuData && menuData.label || ""
++            iconSource: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
              count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
              enabled: menuData && menuData.sensitive || false
++            removable: true
              onMenuModelChanged: {
                  loadAttributes();
@@ -286,21 +385,103 @@
              onMenuIndexChanged: {
                  loadAttributes();
+             }
--            onActivateApp: {
++            onClicked: {
                  menuModel.activate(menuIndex, true);
                  shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
+             }
--            onDismiss: {
++            onDismissed: {
                  menuModel.activate(menuIndex, false);
+             }
              function loadAttributes() {
--                if (!menuModel || menuIndex == undefined) return;
++                if (!menuModel || menuIndex == -1) return;
                  menuModel.loadExtendedAttributes(modelIndex, {'icon': 'icon'});
+             }
+         }
+     }
++    Component {
++        id: mediaPayerMenu;
++        Menus.MediaPlayerMenu {
++            objectName: "mediaPayerMenu"
++            property QtObject menuData: null
++            property var menuModel: menuFactory.menuModel
++            property int menuIndex: -1
++            property var actionState: menuData && menuData.actionState || undefined
++
++            playerIcon: menuData && menuData.icon || ""
++            playerName: menuData && menuData.label || ""
++
++            albumArt: getExtendedProperty(actionState, "art-url", "")
++            song: getExtendedProperty(actionState, "title", "unknown")
++            artist: getExtendedProperty(actionState, "artist", "unknown")
++            album: getExtendedProperty(actionState, "album", "unknown")
++            running: getExtendedProperty(actionState, "running", false)
++            state: getExtendedProperty(actionState, "state", "")
++            enabled: menuData && menuData.sensitive || false
++
++            onTriggered: {
++                model.activate(modelIndex);
++            }
++        }
++    }
++
++    Component {
++        id: playbackItemMenu;
++        Menus.PlaybackItemMenu {
++            objectName: "playbackItemMenu"
++            property QtObject menuData: null
++            property var menuModel: menuFactory.menuModel
++            property int menuIndex: -1
++            property var extendedData: menuData && menuData.ext || undefined
++
++            property var playAction: QMenuModel.UnityMenuAction {
++                model: menuModel
++                index: menuIndex
++                name: getExtendedProperty(extendedData, "xCanonicalPlayAction", "")
++            }
++            property var nextAction: QMenuModel.UnityMenuAction {
++                model: menuModel
++                index: menuIndex
++                name: getExtendedProperty(extendedData, "xCanonicalNextAction", "")
++            }
++            property var previousAction: QMenuModel.UnityMenuAction {
++                model: menuModel
++                index: menuIndex
++                name: getExtendedProperty(extendedData, "xCanonicalPreviousAction", "")
++            }
++
++            playing: playAction.state === "Playing"
++            canPlay: playAction.valid
++            canGoNext: nextAction.valid
++            canGoPrevious: previousAction.valid
++            enabled: menuData && menuData.sensitive || false
++
++            onPlay: {
++                playAction.activate();
++            }
++            onNext: {
++                nextAction.activate();
++            }
++            onPrevious: {
++                previousAction.activate();
++            }
++            onMenuModelChanged: {
++                loadAttributes();
++            }
++            onMenuIndexChanged: {
++                loadAttributes();
++            }
++
++            function loadAttributes() {
++                if (!menuModel || menuIndex == -1) return;
++                menuModel.loadExtendedAttributes(modelIndex, {'x-canonical-play-action': 'string',
++                                                              'x-canonical-next-action': 'string',
++                                                              'x-canonical-previous-action': 'string'});
++            }
++        }
++    }
++
      function load(modelData) {
          if (modelData.type !== undefined) {
              var component = _map[modelData.type];
@@ -308,8 +489,11 @@
                  return component;
+             }
+         }
++        if (modelData.isCheck || modelData.isRadio) {
++            return checkableMenu;
++        }
          if (modelData.isSeparator) {
--            return divMenu;
++            return separatorMenu;
+         }
          return standardMenu;
+     }
 === renamed file 'plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml' => 'plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml'
 --- plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml	2013-12-12 16:36:10 +0000
 +++ plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml	2014-01-29 14:36:17 +0000
@@ -20,18 +20,29 @@
  import QtQuick 2.0
  import Ubuntu.Components 0.1
--import Unity.Indicators 0.1 as Indicators
++import Ubuntu.Settings.Menus 0.1 as Menus
  import QMenuModel 0.1 as QMenuModel
++import Utils 0.1 as Utils
--Indicators.BaseMenuItem {
++Item {
      id: messageFactoryItem
      property var menuModel: null
      property QtObject menuData: null
      property int menuIndex: -1
++    property bool selected: false
++    signal menuSelected
++    signal menuDeselected
++
      property var extendedData: menuData && menuData.ext || undefined
      property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
++    // TODO - bug #1260728
++    property var timeFormatter: Utils.TimeFormatter {
++        time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
++        format: "hh:mm - MMM dd"
++    }
++
      onMenuModelChanged: {
          loadAttributes();
+     }
@@ -40,8 +51,7 @@
+     }
      function loadAttributes() {
--        if (!menuModel || menuIndex == undefined) return;
--
++        if (!menuModel || menuIndex == -1) return;
          menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
                                                       'x-canonical-text': 'string',
                                                       'x-canonical-message-actions': 'variant',
@@ -67,34 +77,46 @@
          Component {
              id: simpleTextMessage
--            SimpleTextMessage {
++            Menus.SimpleTextMessageMenu {
++                id: message
                  objectName: "simpleTextMessage"
                  // text
                  title: menuData && menuData.label || ""
--                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
++                time: timeFormatter.timeString
                  message: getExtendedProperty(extendedData, "xCanonicalText", "")
                  // icons
                  avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
                  appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
                  // actions
                  enabled: menuData && menuData.sensitive || false
++                removable: !selected
++                selected: messageFactoryItem.selected
--                onActivateApp: {
++                onAppActivated: {
                      menuModel.activate(menuIndex, true);
                      shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
+                 }
--                onDismiss: {
++                onDismissed: {
                      menuModel.activate(menuIndex, false);
+                 }
++                onClicked: {
++                    if (selected) {
++                        menuDeselected();
++                    } else {
++                        menuSelected();
++                    }
++                }
--                menuSelected: messageFactoryItem.menuSelected
--                onSelectMenu: messageFactoryItem.selectMenu()
--                onDeselectMenu: messageFactoryItem.deselectMenu()
++                backgroundIndicator: RemoveBackground {
++                    state: message.swipingState
++                }
+             }
+         }
++
          Component {
              id: textMessage
--            TextMessage {
++            Menus.TextMessageMenu {
++                id: message
                  objectName: "textMessage"
                  property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
@@ -106,7 +128,7 @@
                  // text
                  title: menuData && menuData.label || ""
--                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
++                time: timeFormatter.timeString
                  message: getExtendedProperty(extendedData, "xCanonicalText", "")
                  replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
                  // icons
@@ -115,26 +137,36 @@
                  // actions
                  replyEnabled: replyAction.valid && replyAction.enabled
                  enabled: menuData && menuData.sensitive || false
++                removable: !selected
++                selected: messageFactoryItem.selected
--                onActivateApp: {
++                onAppActivated: {
                      menuModel.activate(menuIndex, true);
                      shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
+                 }
--                onDismiss: {
++                onDismissed: {
                      menuModel.activate(menuIndex, false);
+                 }
--                onReply: {
++                onReplied: {
                      replyAction.activate(value);
+                 }
++                onClicked: {
++                    if (selected) {
++                        menuDeselected();
++                    } else {
++                        menuSelected();
++                    }
++                }
--                menuSelected: messageFactoryItem.menuSelected
--                onSelectMenu: messageFactoryItem.selectMenu()
--                onDeselectMenu: messageFactoryItem.deselectMenu()
++                backgroundIndicator: RemoveBackground {
++                    state: message.swipingState
++                }
+             }
+         }
          Component {
              id: snapDecision
--            SnapDecision {
++            Menus.SnapDecisionMenu {
++                id: message
                  objectName: "snapDecision"
                  property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
                  property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined
@@ -152,7 +184,7 @@
                  // text
                  title: menuData && menuData.label || ""
--                time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
++                time: timeFormatter.timeString
                  message: getExtendedProperty(extendedData, "xCanonicalText", "")
                  actionButtonText: getExtendedProperty(activateActionDescription, "label", "Call back")
                  replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
@@ -164,24 +196,33 @@
                  activateEnabled: activateAction.valid && activateAction.enabled
                  replyEnabled: replyAction.valid && replyAction.enabled
                  enabled: menuData && menuData.sensitive || false
++                removable: !selected
++                selected: messageFactoryItem.selected
--                onActivateApp: {
++                onAppActivated: {
                      menuModel.activate(menuIndex, true);
                      shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
+                 }
--                onDismiss: {
++                onDismissed: {
                      menuModel.activate(menuIndex, false);
+                 }
--                onActivate: {
++                onActivated: {
                      activateAction.activate();
+                 }
--                onReply: {
++                onReplied: {
                      replyAction.activate(value);
+                 }
++                onClicked: {
++                    if (selected) {
++                        menuDeselected();
++                    } else {
++                        menuSelected();
++                    }
++                }
--                menuSelected: messageFactoryItem.menuSelected
--                onSelectMenu: messageFactoryItem.selectMenu()
--                onDeselectMenu: messageFactoryItem.deselectMenu()
++                backgroundIndicator: RemoveBackground {
++                    state: message.swipingState
++                }
+             }
+         }
+     }
 === removed file 'plugins/Unity/Indicators/qml/ProgressMenuItem.qml'
 --- plugins/Unity/Indicators/qml/ProgressMenuItem.qml	2013-08-21 21:00:17 +0000
 +++ plugins/Unity/Indicators/qml/ProgressMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
--/*
-- * 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:
-- *      Michael Zanetti <michael.zanetti@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1 as Indicators
--
--FramedMenuItem {
--    id: menuItem
--
--    property int value : 0.0
--
--    control: Label {
--        id: progress
--        anchors.verticalCenter: parent.verticalCenter
--        anchors.right: parent.right
--
--        text: menuItem.value + " %"
--        fontSize: "medium"
--        color: "#e8e1d0"
--    }
--}
 === removed file 'plugins/Unity/Indicators/qml/SectionMenuItem.qml'
 --- plugins/Unity/Indicators/qml/SectionMenuItem.qml	2013-08-21 21:00:17 +0000
 +++ plugins/Unity/Indicators/qml/SectionMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Ubuntu.Components.ListItems 0.1 as ListItem
--
--BaseMenuItem {
--    id: menuItem
--    property alias text: header.text
--    property bool busy: false
--
--    implicitHeight: text !== "" ? header.height : 0
--
--    ListItem.Header {
--        id: header
--
--        height: units.gu(4)
--        anchors {
--            left: parent.left
--            right: parent.right
--            top: parent.top
--        }
--        visible: text != ""
--
--        ActivityIndicator {
--            id: indicator
--            running: busy
--            anchors {
--                margins: units.gu(0.5)
--                right: parent.right
--            }
--            height: parent.height - (anchors.margins * 2)
--            width: height
--            anchors.verticalCenter: parent.verticalCenter
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/qml/SliderMenuItem.qml'
 --- plugins/Unity/Indicators/qml/SliderMenuItem.qml	2013-10-29 19:01:15 +0000
 +++ plugins/Unity/Indicators/qml/SliderMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Nick Dedekind <nick.dedekind@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1 as Components
--import Unity.Indicators 0.1 as Indicators
--
--FramedMenuItem {
--    id: menuItem
--
--    property alias minimumValue: slider.minimumValue
--    property alias maximumValue: slider.maximumValue
--    property double value: 0.0
--
--    property alias minIcon: leftImage.source
--    property alias maxIcon: rightImage.source
--
--    property QtObject d: QtObject {
--        property bool enableValueConnection: true
--    }
--
--    signal changeState(real value)
--
--    onValueChanged: {
--        // TODO: look into adding a component to manage bi-directional bindings.
--        var oldEnable = d.enableValueConnection
--        d.enableValueConnection = false;
--
--        // Can't rely on binding. Slider value is assigned by user slide.
--        slider.value = value;
--
--        d.enableValueConnection = oldEnable;
--    }
--
--    control: Item {
--        id: row
--        width: menuItem.text ? units.gu(20) : menuItem.width - (2 * menuItem.__contentsMargins)
--        height: slider.height
--
--        Image {
--            id: leftImage
--            visible: status === Image.Ready
--            anchors.left: row.left
--            anchors.verticalCenter: row.verticalCenter
--            height: units.gu(4)
--            width: height
--        }
--
--        Components.Slider {
--            id: slider
--            anchors {
--                left: leftImage.visible ? leftImage.right : row.left
--                right: rightImage.visible ? rightImage.left : row.right
--                leftMargin: leftImage.visible ? units.gu(0.5) : 0
--                rightMargin: rightImage.visible ? units.gu(0.5) : 0
--            }
--            live: true
--
--            Component.onCompleted: {
--                value = menuItem.value
--            }
--
--            minimumValue: 0.0
--            maximumValue: 0.1
--
--            // FIXME - to be deprecated in Ubuntu.Components.
--            // Use this to disable the label, since there is not way to do it on the component.
--            function formatValue(v) {
--                return "";
--            }
--
--            Connections {
--                target: d.enableValueConnection ? slider : null
--                onValueChanged: {
--                    menuItem.changeState(slider.value);
--                }
--            }
--        }
--
--        Image {
--            id: rightImage
--            visible: status === Image.Ready
--            anchors.right: row.right
--            anchors.verticalCenter: row.verticalCenter
--            height: units.gu(4)
--            width: height
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/qml/StandardMenuItem.qml'
 --- plugins/Unity/Indicators/qml/StandardMenuItem.qml	2013-08-21 21:00:17 +0000
 +++ plugins/Unity/Indicators/qml/StandardMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
--/*
-- * 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 <nick.dedekind@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1 as Components
--import Unity.Indicators 0.1 as Indicators
--
--FramedMenuItem {
--    id: menuItem
--
--    property bool checkable: false
--    property bool checked: false
--
--    signal activate()
--
--    // FIXME : need a radio button from sdk
--    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211866
--    onCheckableChanged: {
--        if (checkable) {
--            icon = checkComponent.createObject(menuItem);
--        }
--    }
--
--    onCheckedChanged: {
--        // Can't rely on binding. Checked is assigned on click.
--        if (icon) {
--            icon.checked = checked;
--        }
--    }
--
--    onClicked: {
--        if (checkable && icon) {
--            icon.clicked();
--        } else {
--            menuItem.activate();
--        }
--    }
--
--    property var checkComponent: Component {
--        Components.CheckBox {
--            anchors.verticalCenter: parent.verticalCenter
--            anchors.left: parent.left
--
--            Component.onCompleted: {
--                checked = menuItem.checked;
--            }
--
--            // FIXME : should use Checkbox.toggled signal
--            // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
--            onClicked: {
--                menuItem.activate();
--            }
--        }
--    }
--}
 === removed file 'plugins/Unity/Indicators/qml/SwitchMenuItem.qml'
 --- plugins/Unity/Indicators/qml/SwitchMenuItem.qml	2013-08-21 21:00:17 +0000
 +++ plugins/Unity/Indicators/qml/SwitchMenuItem.qml	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
--/*
-- * 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:
-- *      Renato Araujo Oliveira Filho <renato@canonical.com>
-- *      Nick Dedekind <nick.dedekind@canonical.com>
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Unity.Indicators 0.1 as Indicators
--
--FramedMenuItem {
--    id: menuItem
--
--    property bool checked: false
--
--    signal activate()
--
--    onCheckedChanged: {
--        // Can't rely on binding. Checked is assigned on click.
--        switcher.checked = checked;
--    }
--
--    control: Switch {
--        id: switcher
--
--        Component.onCompleted: {
--            checked = menuItem.checked;
--        }
--
--        anchors.verticalCenter: parent.verticalCenter
--        anchors.right: parent.right
--
--        // FIXME : should use Checkbox.toggled signal
--        // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
--        onClicked: {
--            menuItem.activate();
--        }
--    }
--}
 === modified file 'plugins/Unity/Indicators/qml/qmldir'
 --- plugins/Unity/Indicators/qml/qmldir	2013-12-12 09:55:17 +0000
 +++ plugins/Unity/Indicators/qml/qmldir	2014-01-29 14:36:17 +0000
@@ -2,20 +2,9 @@
  plugin IndicatorsQml
  typeinfo plugin.qmltypes
--BaseMenuItem 0.1 BaseMenuItem.qml
--ButtonMenuItem 0.1 ButtonMenuItem.qml
  CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
--DivMenuItem 0.1 DivMenuItem.qml
--FramedMenuItem 0.1 FramedMenuItem.qml
--HLine 0.1 HLine.qml
  IndicatorBase 0.1 IndicatorBase.qml
--MenuActionBinding 0.1 MenuActionBinding.qml
  MenuItemFactory 0.1 MenuItemFactory.qml
--ProgressMenuItem 0.1 ProgressMenuItem.qml
--SectionMenuItem 0.1 SectionMenuItem.qml
--SliderMenuItem 0.1 SliderMenuItem.qml
--StandardMenuItem 0.1 StandardMenuItem.qml
--SwitchMenuItem 0.1 SwitchMenuItem.qml
--
++MessageMenuItemFactory 0.1 MessageMenuItemFactory.qml
  internal RemoveBackground RemoveBackground.qml
 === removed file 'plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.png'
 Binary files plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.png	2013-06-07 12:51:15 +0000 and plugins/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.png	1970-01-01 00:00:00 +0000 differ
 === removed directory 'plugins/Unity/Indicators/resources/artwork/network'
 === removed file 'plugins/Unity/Indicators/resources/artwork/network/secure.svg'
 --- plugins/Unity/Indicators/resources/artwork/network/secure.svg	2013-09-02 10:59:11 +0000
 +++ plugins/Unity/Indicators/resources/artwork/network/secure.svg	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--
--<svg
--   xmlns:dc="http://purl.org/dc/elements/1.1/"
--   xmlns:cc="http://creativecommons.org/ns#"
--   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--   xmlns:svg="http://www.w3.org/2000/svg"
--   xmlns="http://www.w3.org/2000/svg"
--   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
--   width="64"
--   height="64"
--   id="svg2986"
--   version="1.1"
--   inkscape:version="0.48.4 r9939"
--   sodipodi:docname="secure.svg">
--  <defs
--     id="defs2988" />
--  <sodipodi:namedview
--     id="base"
--     pagecolor="#ffffff"
--     bordercolor="#666666"
--     borderopacity="1.0"
--     inkscape:pageopacity="0.0"
--     inkscape:pageshadow="2"
--     inkscape:zoom="7.9180415"
--     inkscape:cx="7.5048745"
--     inkscape:cy="29.401628"
--     inkscape:current-layer="layer1"
--     showgrid="true"
--     inkscape:grid-bbox="true"
--     inkscape:document-units="px"
--     inkscape:snap-grids="false"
--     inkscape:window-width="1549"
--     inkscape:window-height="876"
--     inkscape:window-x="51"
--     inkscape:window-y="24"
--     inkscape:window-maximized="1">
--    <inkscape:grid
--       type="xygrid"
--       id="grid3012"
--       empspacing="5"
--       visible="true"
--       enabled="true"
--       snapvisiblegridlinesonly="true" />
--  </sodipodi:namedview>
--  <metadata
--     id="metadata2991">
--    <rdf:RDF>
--      <cc:Work
--         rdf:about="">
--        <dc:format>image/svg+xml</dc:format>
--        <dc:type
--           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
--        <dc:title />
--      </cc:Work>
--    </rdf:RDF>
--  </metadata>
--  <g
--     id="layer1"
--     inkscape:label="Layer 1"
--     inkscape:groupmode="layer"
--     transform="translate(0,32)">
--    <path
--       inkscape:connector-curvature="0"
--       d="M 29.999999,-18 C 25.568001,-18 22,-14.432 22,-10 v 6 h -2 c -1.107999,0 -2,0.892 -2,2 v 18 c 0,1.108 0.892001,2 2,2 h 24 c 1.108,0 2,-0.892 2,-2 V -2 c 0,-1.108 -0.892,-2 -2,-2 h -2 v -6 c 0,-4.432 -3.568001,-8 -8.000001,-8 h -4 z m 0,4 h 4 c 2.216,0 4,1.784 4,4 v 6 H 26.000001 v -6 c 0,-2.216 1.784,-4 3.999998,-4 z"
--       style="fill:#dfdbd2;fill-rule:evenodd"
--       id="path8" />
--  </g>
--</svg>
 === modified file 'plugins/Unity/Indicators/resources/indicators.qrc'
 --- plugins/Unity/Indicators/resources/indicators.qrc	2013-09-09 09:23:15 +0000
 +++ plugins/Unity/Indicators/resources/indicators.qrc	2014-01-29 14:36:17 +0000
@@ -1,8 +1,6 @@
  <RCC>
      <qresource prefix="/indicators">
--        <file>artwork/network/secure.svg</file>
          <file>artwork/messaging/default_contact.png</file>
          <file>artwork/messaging/default_app.svg</file>
--        <file>artwork/messaging/message_sms01_54px.png</file>
      </qresource>
  </RCC>
 === modified file 'qml/Panel/Indicators/DefaultIndicatorPage.qml'
 --- qml/Panel/Indicators/DefaultIndicatorPage.qml	2013-12-13 11:18:25 +0000
 +++ qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-01-29 14:36:17 +0000
@@ -138,10 +138,14 @@
              sourceComponent: factory.load(model)
              onLoaded: {
++                if (item.hasOwnProperty("selected")) {
++                    item.selected = mainMenu.selectedIndex == index;
++                }
                  if (item.hasOwnProperty("menuSelected")) {
--                    item.menuSelected = mainMenu.selectedIndex == index;
--                    item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });
--                    item.deselectMenu.connect(function() { mainMenu.selectedIndex = -1; });
++                    item.menuSelected.connect(function() { mainMenu.selectedIndex = index; });
++                }
++                if (item.hasOwnProperty("menuDeselected")) {
++                    item.menuDeselected.connect(function() { mainMenu.selectedIndex = -1; });
+                 }
                  if (item.hasOwnProperty("menuData")) {
                      item.menuData = Qt.binding(function() { return model; });
@@ -162,8 +166,8 @@
              Connections {
                  target: mainMenu
                  onSelectedIndexChanged: {
--                    if (loader.item && loader.item.hasOwnProperty("menuSelected")) {
--                        loader.item.menuSelected = mainMenu.selectedIndex == index;
++                    if (loader.item && loader.item.hasOwnProperty("selected")) {
++                        loader.item.selected = mainMenu.selectedIndex == index;
+                     }
+                 }
+             }
 === modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
 --- qml/Panel/Indicators/client/IndicatorsList.qml	2013-10-11 08:21:59 +0000
 +++ qml/Panel/Indicators/client/IndicatorsList.qml	2014-01-29 14:36:17 +0000
@@ -40,24 +40,25 @@
          anchors.fill: parent
          model: indicatorsModel
--        delegate: Indicators.FramedMenuItem {
++        delegate: Rectangle {
++            color: "#221e1c"
++
              anchors.left: parent.left
              anchors.right: parent.right
--            objectName: identifier
--
--            text: identifier
--
--            onClicked: {
--                var new_page = Qt.createComponent("IndicatorsPage.qml");
--                page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});
--            }
--
--            Rectangle {
--                id: background
--
--                anchors.fill: parent
--                color: "#221e1c"
--                z: -1
++            height: menuItem.height
++
++            ListItem.Standard {
++                id: menuItem
++                anchors.left: parent.left
++                anchors.right: parent.right
++                objectName: identifier
++
++                text: identifier
++
++                onClicked: {
++                    var new_page = Qt.createComponent("IndicatorsPage.qml");
++                    page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});
++                }
+             }
+         }
+     }
 === modified file 'tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml'
 --- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-01-06 16:18:08 +0000
 +++ tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-01-29 14:36:17 +0000
@@ -129,14 +129,10 @@
          function test_reloadData() {
              var mainMenu = findChild(page, "mainMenu");
--            console.log("setting empty data");
              page.menuModel.modelData = [];
              tryCompare(mainMenu, "count", 0);
--            console.log("set empty data");
--            console.log("setting full data");
              page.menuModel.modelData = fullMenuData;
--            console.log("set full data");
              tryCompare(mainMenu, "count", 3);
              page.menuModel.modelData = [];
 === modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
 --- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-01-06 10:41:54 +0000
 +++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-01-29 14:36:17 +0000
@@ -84,11 +84,13 @@
                  { tag: 'switch1', type: "unity.widgets.systemsettings.tablet.switch", objectName: "switchMenu" },
                  { tag: 'button', type: "com.canonical.indicator.button", objectName: "buttonMenu" },
--                { tag: 'separator', type: "com.canonical.indicator.div", objectName: "divMenu" },
++                { tag: 'separator', type: "com.canonical.indicator.div", objectName: "separatorMenu" },
                  { tag: 'section', type: "com.canonical.indicator.section", objectName: "sectionMenu" },
                  { tag: 'progress', type: "com.canonical.indicator.progress", objectName: "progressMenu" },
                  { tag: 'slider1', type: "com.canonical.indicator.slider", objectName: "sliderMenu" },
                  { tag: 'switch2', type: "com.canonical.indicator.switch", objectName: "switchMenu" },
++                { tag: 'alarm', type: "com.canonical.indicator.alarm", objectName: "alarmMenu" },
++                { tag: 'appointment', type: "com.canonical.indicator.appointment", objectName: "appointmentMenu" },
                  { tag: 'messageItem', type: "com.canonical.indicator.messages.messageitem", objectName: "messageItem" },
                  { tag: 'sourceItem', type: "com.canonical.indicator.messages.sourceitem", objectName: "groupedMessage" },
@@ -96,8 +98,8 @@
                  { tag: 'slider2', type: "com.canonical.unity.slider", objectName: "sliderMenu" },
                  { tag: 'switch3', type: "com.canonical.unity.switch", objectName: "switchMenu" },
--                { tag: 'mediaplayer', type: "com.canonical.unity.media-player", objectName: "standardMenu" },
--                { tag: 'playbackitem', type: "com.canonical.unity.playback-item", objectName: "standardMenu" },
++                { tag: 'mediaplayer', type: "com.canonical.unity.media-player", objectName: "mediaPayerMenu" },
++                { tag: 'playbackitem', type: "com.canonical.unity.playback-item", objectName: "playbackItemMenu" },
                  { tag: 'wifisection', type: "unity.widgets.systemsettings.tablet.wifisection", objectName: "wifiSection" },
                  { tag: 'accesspoint', type: "unity.widgets.systemsettings.tablet.accesspoint", objectName: "accessPoint" },
@@ -115,6 +117,16 @@
              compare(loader.item.objectName, data.objectName, "Created object name does not match intended object (" + loader.item.objectName + " != " + data.objectName + ")");
+         }
++        function test_create_checkable() {
++            var tmpData = menuData;
++            tmpData.isCheck = true;
++
++            loader.data = tmpData;
++            loader.sourceComponent = factory.load(tmpData);
++            tryCompareFunction(function() { return loader.item != undefined; }, true);
++            compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
++        }
++
          function test_create_radio() {
              skip("No radio component");
              menuData.isRadio = true;
@@ -131,7 +143,7 @@
              loader.data = menuData;
              loader.sourceComponent = factory.load(menuData);
              tryCompareFunction(function() { return loader.item != undefined; }, true);
--            compare(loader.item.objectName, "divMenu", "Should have created a separator menu");
++            compare(loader.item.objectName, "separatorMenu", "Should have created a separator menu");
+         }
          function test_create_sliderMenu_data() {
@@ -145,13 +157,13 @@
              menuData.type = "com.canonical.indicator.slider"
              menuData.label = data.label;
              menuData.sensitive = data.enabled;
--            menuData.actionState = data.value;
              menuData.ext = {
                  'minIcon': "file:///testMinIcon",
                  'maxIcon': "file:///testMaxIcon",
                  'minValue': data.minValue,
                  'maxValue': data.maxValue
              };
++            menuData.actionState = data.value;
              loader.data = menuData;
              loader.sourceComponent = factory.load(menuData);
@@ -163,7 +175,7 @@
              compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
              compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
              compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");
--            compare(loader.item.value, data.value, "Calue does not match data");
++            compare(loader.item.value, data.value, "Value does not match data");
              compare(loader.item.enabled, data.enabled, "Enabled does not match data");
+         }
@@ -232,7 +244,7 @@
          function test_create_standardMenu_data() {
              return [
--                {label: "testLabel1", enabled: true, icon: "file:///testIcon" },
++                {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
                  {label: "testLabel2", enabled: false, icon: "file:///testIcon2"},
              ];
+         }
@@ -253,31 +265,101 @@
              compare(loader.item.enabled, data.enabled, "Enabled does not match data");
+         }
--        function test_create_switchMenu_data() {
++        function test_create_checkableMenu_data() {
              return [
                  {label: "testLabel1", enabled: true, checked: false },
                  {label: "testLabel2", enabled: false, checked: true },
              ];
+         }
++        function test_create_checkableMenu(data) {
++            menuData.type = "";
++            menuData.label = data.label;
++            menuData.sensitive = data.enabled;
++            menuData.isCheck = true;
++            menuData.isToggled = data.checked;
++
++            loader.data = menuData;
++            loader.sourceComponent = factory.load(menuData);
++            tryCompareFunction(function() { return loader.item != undefined; }, true);
++            compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
++
++            compare(loader.item.text, data.label, "Label does not match data");
++            compare(loader.item.checked, data.checked, "Checked does not match data");
++            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
++        }
++
++        function test_create_switchMenu_data() {
++            return [
++                {label: "testLabel1", enabled: true, checked: false, icon: "file:///testIcon1" },
++                {label: "testLabel2", enabled: false, checked: true, icon: "file:///testIcon2" },
++            ];
++        }
++
          function test_create_switchMenu(data) {
              menuData.type = "com.canonical.indicator.switch";
              menuData.label = data.label;
              menuData.sensitive = data.enabled;
--            menuData.icon = "file:///testIcon";
++            menuData.icon = data.icon;
              menuData.isToggled = data.checked;
              loader.data = menuData;
              loader.sourceComponent = factory.load(menuData);
              tryCompareFunction(function() { return loader.item != undefined; }, true);
--            compare(loader.item.objectName, "switchMenu", "Should have created a standard menu");
++            compare(loader.item.objectName, "switchMenu", "Should have created a switch menu");
              compare(loader.item.text, data.label, "Label does not match data");
--            compare(loader.item.icon, "file:///testIcon", "MaxIcon does not match data");
++            compare(loader.item.iconSource, data.icon, "Icon does not match data");
              compare(loader.item.checked, data.checked, "Checked does not match data");
              compare(loader.item.enabled, data.enabled, "Enabled does not match data");
+         }
++        function test_create_alarmMenu_data() {
++            return [
++                {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
++                {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },
++            ];
++        }
++
++        function test_create_alarmMenu(data) {
++            menuData.type = "com.canonical.indicator.alarm";
++            menuData.label = data.label;
++            menuData.sensitive = data.enabled;
++            menuData.icon = data.icon;
++
++            loader.data = menuData;
++            loader.sourceComponent = factory.load(menuData);
++            tryCompareFunction(function() { return loader.item != undefined; }, true);
++            compare(loader.item.objectName, "alarmMenu", "Should have created a alarm menu");
++
++            compare(loader.item.text, data.label, "Label does not match data");
++            compare(loader.item.iconSource, data.icon, "Icon does not match data");
++            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
++        }
++
++        function test_create_appointmentMenu_data() {
++            return [
++                {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
++                {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },
++            ];
++        }
++
++        function test_create_appointmentMenu(data) {
++            menuData.type = "com.canonical.indicator.appointment";
++            menuData.label = data.label;
++            menuData.sensitive = data.enabled;
++            menuData.icon = data.icon;
++
++            loader.data = menuData;
++            loader.sourceComponent = factory.load(menuData);
++            tryCompareFunction(function() { return loader.item != undefined; }, true);
++            compare(loader.item.objectName, "appointmentMenu", "Should have created a appointment menu");
++
++            compare(loader.item.text, data.label, "Label does not match data");
++            compare(loader.item.iconSource, data.icon, "Icon does not match data");
++            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
++        }
++
          function test_create_wifiSection_data() {
              return [
                  {label: "testLabel1", busy: false },
@@ -322,7 +404,7 @@
              tryCompareFunction(function() { return loader.item != undefined; }, true);
              compare(loader.item.objectName, "accessPoint", "Should have created a access point menu");
--            compare(loader.item.label, data.label, "Label does not match data");
++            compare(loader.item.text, data.label, "Label does not match data");
              compare(loader.item.strengthAction.name, "action::strength", "Strength action incorrect");
              compare(loader.item.secure, data.secure, "Secure does not match data");
              compare(loader.item.adHoc, data.adHoc, "AdHoc does not match data");
@@ -341,8 +423,8 @@
          function test_create_groupedMessage_data() {
              return [
--                {label: "testLabel1", enabled: true, count: "5", appIcon: "file:///testIcon" },
--                {label: "testLabel2", enabled: false, count: "10", appIcon: "file:///testIcon2" },
++                {label: "testLabel1", enabled: true, count: "5", icon: "file:///testIcon" },
++                {label: "testLabel2", enabled: false, count: "10", icon: "file:///testIcon2" },
              ];
+         }
@@ -350,8 +432,8 @@
              menuData.type = "com.canonical.indicator.messages.sourceitem";
              menuData.label = data.label;
              menuData.sensitive = data.enabled;
--            menuData.icon = data.appIcon;
--            menuData.ext = { 'icon': data.appIcon };
++            menuData.icon = data.icon;
++            menuData.ext = { 'icon': data.icon };
              menuData.actionState = [data.count];
              menuData.isToggled = true;
@@ -360,9 +442,103 @@
              tryCompareFunction(function() { return loader.item != undefined; }, true);
              compare(loader.item.objectName, "groupedMessage", "Should have created a group message menu");
--            compare(loader.item.title, data.label, "Label does not match data");
++            compare(loader.item.text, data.label, "Label does not match data");
              compare(loader.item.count, data.count, "Count does not match data");
--            compare(loader.item.appIcon, data.appIcon, "App Icon does not match data");
++            compare(loader.item.iconSource, data.icon, "Icon does not match data");
++            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
++        }
++
++        function test_create_mediaPayerMenu_data() {
++            return [{
++                    label: "player1",
++                    icon: "file:://icon1",
++                    albumArt: "file:://art1",
++                    song: "song1",
++                    artist: "artist1",
++                    album: "album1",
++                    running: true,
++                    state: "Playing",
++                    enabled: true
++                },{
++                    label: "player2",
++                    icon: "file:://icon2",
++                    albumArt: "file:://art2",
++                    song: "song2",
++                    artist: "artist2",
++                    album: "album2",
++                    running: false,
++                    state: "Paused",
++                    enabled: false
++                }
++            ];
++        }
++
++        function test_create_mediaPayerMenu(data) {
++            menuData.type = "com.canonical.unity.media-player";
++            menuData.label = data.label;
++            menuData.sensitive = data.enabled;
++            menuData.icon = data.icon;
++            menuData.actionState = {
++                'art-url': data.albumArt,
++                'title': data.song,
++                'artist': data.artist,
++                'album': data.album,
++                'running': data.running,
++                'state': data.state,
++            };
++
++            loader.data = menuData;
++            loader.sourceComponent = factory.load(menuData);
++            tryCompareFunction(function() { return loader.item != undefined; }, true);
++            compare(loader.item.objectName, "mediaPayerMenu", "Should have created a media player menu");
++
++            compare(loader.item.playerIcon, data.icon, "Album art does not match data");
++            compare(loader.item.playerName, data.label, "Album art does not match data");
++            compare(loader.item.albumArt, data.albumArt, "Album art does not match data");
++            compare(loader.item.song, data.song, "Song does not match data");
++            compare(loader.item.artist, data.artist, "Artist does not match data");
++            compare(loader.item.album, data.album, "Album does not match data");
++            compare(loader.item.running, data.running, "Running does not match data");
++            compare(loader.item.state, data.state, "State does not match data");
++            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
++        }
++
++        function test_create_playbackItemMenu_data() {
++            return [{
++                    playAction: "action::play",
++                    nextAction: "action::next",
++                    previousAction: "action::previous",
++                    enabled: true
++                },{
++                    playAction: "action::play2",
++                    nextAction: "action::next2",
++                    previousAction: "action::previous2",
++                    enabled: false
++                }
++            ];
++        }
++
++        function test_create_playbackItemMenu(data) {
++            menuData.type = "com.canonical.unity.playback-item";
++            menuData.sensitive = data.enabled;
++            menuData.ext = {
++                'xCanonicalPlayAction': data.playAction,
++                'xCanonicalNextAction': data.nextAction,
++                'xCanonicalPreviousAction': data.previousAction
++            };
++
++            loader.data = menuData;
++            loader.sourceComponent = factory.load(menuData);
++            tryCompareFunction(function() { return loader.item != undefined; }, true);
++            compare(loader.item.objectName, "playbackItemMenu", "Should have created a playback menu");
++
++            compare(loader.item.playing, false, "Playing does not match data");
++            compare(loader.item.playAction.name, data.playAction, "Play action incorrect");
++            compare(loader.item.nextAction.name, data.nextAction, "Next action incorrect");
++            compare(loader.item.previousAction.name, data.previousAction, "Previous action incorrect");
++            compare(loader.item.canPlay, false, "CanPlay should be false");
++            compare(loader.item.canGoNext, false, "CanGoNext should be false");
++            compare(loader.item.canGoPrevious, false, "CanGoPrevious should be false");
              compare(loader.item.enabled, data.enabled, "Enabled does not match data");
+         }
+     }
 === modified file 'tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml'
 --- tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2013-12-12 16:32:20 +0000
 +++ tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-01-29 14:36:17 +0000
@@ -18,7 +18,8 @@
  import QtTest 1.0
  import Unity.Test 0.1 as UT
  import QMenuModel 0.1
--import Unity.Indicators.Messaging 0.1 as Indicators
++import Unity.Indicators 0.1 as Indicators
++import Utils 0.1 as Utils
  Item {
      id: testView
@@ -31,6 +32,11 @@
          menuIndex: 0
+     }
++    Utils.TimeFormatter {
++        id: timeFormatter
++        format: "hh:mm - MMM dd"
++    }
++
      UT.UnityTestCase {
          name: "MessageMenuItemFactory"
@@ -82,13 +88,14 @@
                  'xCanonicalAppIcon': data.appIcon,
              };
              factory.menuData = menuData;
++            timeFormatter.time = data.time;
              var loader = findChild(factory, "loader");
              verify(loader !== undefined);
              tryCompare(loader.item, "objectName", "simpleTextMessage");
              compare(loader.item.title, data.title, "Title does not match data");
--            compare(loader.item.time, data.time, "Time does not match data");
++            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
              compare(loader.item.message, data.message, "Message does not match data");
              compare(loader.item.avatar, data.avatar, "Avatar does not match data");
              compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
@@ -119,13 +126,14 @@
+                 ]
              };
              factory.menuData = menuData;
++            timeFormatter.time = data.time;
              var loader = findChild(factory, "loader");
              verify(loader !== undefined);
              tryCompare(loader.item, "objectName", "textMessage");
              compare(loader.item.title, data.title, "Title does not match data");
--            compare(loader.item.time, data.time, "Time does not match data");
++            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
              compare(loader.item.message, data.message, "Message does not match data");
              compare(loader.item.avatar, data.avatar, "Avatar does not match data");
              compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
@@ -160,13 +168,14 @@
+                 ]
              };
              factory.menuData = menuData;
++            timeFormatter.time = data.time;
              var loader = findChild(factory, "loader");
              verify(loader !== undefined);
              tryCompare(loader.item, "objectName", "snapDecision");
              compare(loader.item.title, data.title, "Title does not match data");
--            compare(loader.item.time, data.time, "Time does not match data");
++            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
              compare(loader.item.message, data.message, "Message does not match data");
              compare(loader.item.avatar, data.avatar, "Avatar does not match data");
              compare(loader.item.appIcon, data.appIcon, "App icon does not match data");