Merge lp:~unity-team/unity8/indicators-client into lp:unity8

[Michał Sawicz]

Moved indicators-client code into unity8.

Moved indicator-client code into unityNext.
indicator-client uses .indicator files to source indicator model.

[Michał Sawicz (saviq)]

Yeah, and the hit to our code coverage with this is bad :/ We need to improve that soon after this is merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity8-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/568
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/331
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/59/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/570
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/570/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/513

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity8-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/588
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/340
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/67/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/590
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/590/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/529

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity8-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/631
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/631/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/568

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/unity8-ci/105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/666/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/395/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/668/console

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

    5652 + \qmltype MenuItemActionValue
    5653 + \inqmlmodule Indicators 0.1
    5654 + \brief Helper class to connect dbus action state with qml components property

    5656 + Exampiles:

    5672 +Item {

    It's "MenuItemAction" here, should be "MenuAction", even? And the \brief is copied from MenuItemActionValue, should say something different?

    Exampiles ← typo.

    Could it be a QtObject instead?

    =====

    5695 + // internal
    5696 + property QtObject __actionObject: null

    5707 + Item {
    5708 + id: priv
    5709 + property var actionObject: null
    5710 +
    5711 + Connections {

    Seems like priv.actionObject was supposed to replace __actionObject? Please complete that, and use "id: d" for the private object. There should be no need for the wrapping Item, either. Please use the Connections object as the private one.

    Now I see it's used in MenuItemActionValue, so I wonder if just exposing actionObject as public API of MenuItemAction wouldn't be cleaner...

Made a public property.

    =====

    5750 + \qmltype MenuItemActionValue

    Should this maybe be "MenuActionBinding"?

Renamed

    =====

    5783 + property string property: propertyBinding.property

    Couldn't this be an alias, too?

I has some issues with this. Apparently you dont get notifications for changes to binding properties, so I needed to make them root properties in order to update the connections. I've updated the target to be a property rather than an alias for the same reason.

    =====

    5795 + Item {
    5796 + id: priv
    5797 + property alias actionObject : dbusActionState.__actionObject
    5798 +
    5799 + property var currentTarget: undefined
    5800 + property string currentSignal
    5801 +
    5802 +
    5803 + Binding {

    Could be flattened to just Binding { }.

Removed the actionObject. The currentTarget/Signal is used to disconnect old property updates in connectViewChanges. Will be removed one we fix up the on%1Changed part.

    =====

    5821 + var signal = "on%1Changed".arg(property.charAt(0).toUpperCase() + property.slice(1));

    I wonder if this could be cleaner - I'd maybe even move this to C++ to mimic Binding { } more. Please add a TODO to re-evaluate at some point.

It's a bit of a mess. Added TODO

    =====

    5867 + id: __menuFactory

    5914 + id: __loader

    5980 + id: _progressMenu

    6047 + id: __backgroundItem

    6052 + id: __backgroundText

    6115 + id: __sectionMenu

    No need to prefix those with _.

    =====

    5995 + color: "#00000000"

    color: "transparent"

    =====

    6069 + anchors.rightMargin: __backgroundText.slidingMargin
    6070 + anchors.leftMargin: 0

    6079 + anchors.rightMargin: 0
    6080 + anchors.leftMargin: __backgroundText.slidingMargin

    These could just be static margins, no?

yep.

    =====

    6122 + anchors {
    6123 + left: parent ? parent.left : undefined
    6124 + right: parent ? parent.right : undefined
    6125 + }

    Didn't you say that no menu items have that? ;)

I may have said that :). removed.

    =====

    Do we have a use for SectionMenuItem yet?

It's used by the WifiSection. Shows the spinner while waiting f...

[Nick Dedekind (nick-dedekind)]

 6304 + id: _textMenu

 6334 + id: _showPassword

 Remove prefixes.

removed

 =====

 6307 + property alias password: _showPassword.visible

 I wonder if we should instead have a separate password entry MenuItem... Right now you couldn't use it as a password entry from the MenuItemFactory. OTOH not sure it's meant to be supported, either.

I've changed it to just an Item and moved it into Network/PasswordTextField, and wrapped in a parent MenuItem in the Password page.

 =====

 6309 + implicitHeight: password ? units.gu(10) : units.gu(7)

 Should probably use contentColumn.height?

Yep. +units.gu(1) on the menu border.

 =====

 6488 + }
 6489 + else {

 Single line please.

Done.

 =====

 6572 + qmlRegisterType<ApplicationPaths>(uri, 0, 1, "ApplicationPaths");

 This should probably be a singleton instead.

Yep. Done.

 =====

 Hmm something weird, po/is.po got added as a new file?

Icelandic? Dont know why it isnt in try but was added in mine.
Should i remove?

 =====

 7046 +# copy indicators file into build directory for shadow builds
 7047 +file(COPY ${INDICATOR_FILES}
 7048 + DESTINATION ${CMAKE_BINARY_DIR}/share/unity/indicators
 7049 +)

 Same as before - use a custom command to make sure new versions are copied.

Done.

 =====

 7932 + wait(1000)

 Could we get rid of that?

Removed.

 =====

 8131 + ${GOBJECT_LDFLAGS}
 8132 + ${QMENUMODEL_LDFLAGS}

 Shouldn't the test also pkg_check_modules for those, if it's requiring them?

Links not needed.
Removed and fixed up some other cmake deps.

 =====

 DONE!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/unity8-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/672
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/672/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/600

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Hey, I installed the packages from above, and I only get the date/time indicator content. Is that expected?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

> Hey, I installed the packages from above, and I only get the date/time
> indicator content. Is that expected?

Shouldn't do, but confirmed.
Was missing the install target for the Network indicators, causing the MenuFactory to fail to load.
Should be fixed now. Will confirm when jenkins pops arm build out.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/unity8-ci/119/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/704/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/413/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/706/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/unity8-ci/121/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/712/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/415/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/714/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/unity8-ci/124/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/724
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/724/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/647

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/unity8-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/750
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/673

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

W dniu 03.07.2013 19:36, Nick Dedekind pisze:
> 5783 + property string property: propertyBinding.property
>
> Couldn't this be an alias, too?
>
> I has some issues with this. Apparently you dont get notifications for changes to binding properties, so I needed to make them root properties in order to update the connections. I've updated the target to be a property rather than an alias for the same reason.

Can you confirm that's the case and find / file a bug with Qt?

> 5795 + Item {
> 5796 + id: priv
> 5797 + property alias actionObject : dbusActionState.__actionObject
> 5798 +
> 5799 + property var currentTarget: undefined
> 5800 + property string currentSignal
> 5801 +
> 5802 +
> 5803 + Binding {
>
> Could be flattened to just Binding { }.
>
> Removed the actionObject. The currentTarget/Signal is used to disconnect old property updates in connectViewChanges. Will be removed one we fix up the on%1Changed part.

Yeah, but we can move the currentTarget/Signal props to the Binding, or
is it the same issue as above?

> Do we have a use for SectionMenuItem yet?
>
> It's used by the WifiSection. Shows the spinner while waiting for wifi access points.

Not sure I like the spinner there, let's revisit.

> 6191 + width: _sliderMenu.text ? units.gu(20) : _sliderMenu.width - units.gu(4)
>
> Is that desired? I.e. do we want only 20GU-wide slider in that case? Do we have a usecase?
>
> It's used by the volume menu in the sound indicator. Possibly should be using the width of text, but we don't have access to that.
> May have to speak with SDK. This control will may be replaced with the ubuntu-settings-components control.

Right, we could arguably add a ListItem.Slider to the SDK.

> 6307 + property alias password: _showPassword.visible
>
> I wonder if we should instead have a separate password entry MenuItem... Right now you couldn't use it as a password entry from the MenuItemFactory. OTOH not sure it's meant to be supported, either.
>
> I've changed it to just an Item and moved it into Network/PasswordTextField, and wrapped in a parent MenuItem in the Password page.

Cool, this whole thing with the custom Network page... We'll have to see
if we can make it more generic.

> Icelandic? Dont know why it isnt in try but was added in mine.
> Should i remove?

It might've resulted from the lp:unity/8.0 → lp:unity8 move. Yes, please
remove, Launchpad will take care of it.

--
Michał (Saviq) Sawicz <email address hidden>
Canonical Services Ltd.

[Michał Sawicz (saviq)]

Last functional issue: "Show password" logic is reversed.

review: Needs Fixing

[Nicolas d'Offay (nicolas-doffay)]

Tried for a while to break something in the indicators to no avail.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/unity8-ci/137/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/137
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/778
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/778/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/698

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

The indicators_client AP tests failed with:

file:///usr/share/unity8/Panel/Indicators/client/IndicatorsList.qml:23 module "Unity.Indicators" is not installed

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/unity8-ci/140/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/140
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/787
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/787/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/705

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/unity8-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/794
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/794/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/710

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/unity8-ci/144/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/793
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/442/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/144
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/795
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/795/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/711

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Two tests in the indicators_client AP suite failed with:

  File "/usr/lib/python2.7/dist-packages/indicators_client/tests/test_power.py", line 30, in setUp
    self.assertThat(page_loader.progress, Eventually(Equals(1.0)))
AttributeError: 'NoneType' object has no attribute 'progress'

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/unity8-ci/148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/804
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/448/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/806
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/720

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/unity8-ci/151/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/808/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/452/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/810/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/unity8-ci/153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/153
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/812
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/812/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/722

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/unity8-ci/155/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/813
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/456/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/155
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/815
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/815/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/724

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/unity8-ci/156/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/815
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/817
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/817/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/726

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/unity8-ci/162/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/824/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/unity8-ci/184/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/861/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/488
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/184/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/184
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/864/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/unity8-ci/185/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/863
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/185
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/867
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/867/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/751

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

1145 + libnm-glib-dev \
1146 + libnm-util-dev \
1147 + libqmenumodel-dev \

These shouldn't be here, mk-build-deps handles build deps.

review: Needs Fixing

[Michał Sawicz (saviq)]

qmenumodel-qml should be added to ./build, though, as we can't install runtime deps otherwise

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/unity8-ci/212/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/930
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/212
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/934
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/934/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/801

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:108
http://jenkins.qa.ubuntu.com/job/unity8-ci/217/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/940
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/217
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/944
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/944/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/810

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

I wonder if we should move indicators_client under the unity8 suite - even if they're not run with "autopilot run unity8", I think referencing them with "autopilot run unity8.indicators_client" would be better. What do you think?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

> I wonder if we should move indicators_client under the unity8 suite - even if
> they're not run with "autopilot run unity8", I think referencing them with
> "autopilot run unity8.indicators_client" would be better. What do you think?

While it would be cool to have them under the unity8 folder, mzanetti says no :) We want multiple suites, and putting indicators_client in the unity8 folder will import all the tests.
Perhaps we can move to unity8/shell & unity8/indicators_client

I've added split autopilot build targets. we now have:
autopilot - runs all tests
autopilot-unity8 - just the shell tests
autopilot-inidcators_client - just the indicators_client tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:109
http://jenkins.qa.ubuntu.com/job/unity8-ci/221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/949
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/548
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/221
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/221/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/953
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/953/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/817

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/unity8-ci/225/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/959/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/552/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/225/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/225/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/963/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/unity8-ci/227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/970
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/227
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/227/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/974
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/974/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/831

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

We don't need the imports in the new __init__.py file, do we?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/unity8-ci/229/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/560
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/229
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/987
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/987/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/841

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

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> We don't need the imports in the new __init__.py file, do we?

Apparently not.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/unity8-ci/231/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/991/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/995/console

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Fixed debian/control conflict

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/unity8-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/993
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/997
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/997/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/850

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/unity8-ci/236/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1000
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/236
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1004
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1004/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/856

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/unity8-ci/239/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1009/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/572/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/239
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/239/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/239/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1013/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/unity8-ci/240/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1011/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/240/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/240/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1015/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/unity8-ci/241/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/241
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1016
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1016/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/867

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/75/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/575
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/75/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1017/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/868

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/76/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/786
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1018
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/577
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/76
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1022
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1022/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/873

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/77/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/579
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/77/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1026
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1026/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/876

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-10 17:13:28 +0000
+++ CMakeLists.txt	2013-07-11 14:53:26 +0000
@@ -91,7 +91,8 @@
 
 # Autopilot tests
 include(autopilot)
-declare_autopilot_test(unity8 ${CMAKE_SOURCE_DIR}/tests/autopilot/)
+declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
+declare_autopilot_test(indicators_client unity8.indicators_client ${CMAKE_SOURCE_DIR}/tests/autopilot/)
 
 set(SHELL_APP unity8)
 
@@ -132,6 +133,7 @@
 # add subdirectories to build
 add_subdirectory(tests)
 add_subdirectory(plugins)
+add_subdirectory(src)
 
 # install subdirectories
 set(QML_DIRS

=== modified file 'Panel/IndicatorItem.qml'
--- Panel/IndicatorItem.qml	2013-06-05 22:03:08 +0000
+++ Panel/IndicatorItem.qml	2013-07-11 14:53:26 +0000
@@ -16,55 +16,42 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
 
 Item {
     id: indicatorItem
 
-    property alias iconSource: itemImage.source
-    property alias label: itemLabel.text
+    property alias widgetSource: loader.source
     property bool highlighted: false
     property bool dimmed: false
+    property var indicatorProperties: undefined
+
+    opacity: dimmed ? 0.4 : 1
 
     // only visible when non-empty
-    visible: label != "" || iconSource != ""
-    width: itemRow.width + units.gu(1)
+    visible: loader.item != undefined && loader.status == Loader.Ready ? loader.item.enabled : false
+    width: visible ? loader.item.width : 0
+
+    Loader {
+        id: loader
+
+        onLoaded: {
+            item.height = Qt.binding(function() { return indicatorItem.height; });
+
+            for(var pName in indicatorProperties) {
+                if (item.hasOwnProperty(pName)) {
+                    item[pName] = indicatorProperties[pName];
+                }
+            }
+        }
+    }
 
     Rectangle {
         color: "#dd4814"
+        objectName: "highlight"
         height: units.dp(2)
         width: parent.width
         anchors.top: parent.bottom
         visible: highlighted
     }
-
-    Row {
-        id: itemRow
-        objectName: "itemRow"
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            horizontalCenter: parent.horizontalCenter
-        }
-        spacing: units.gu(0.5)
-        opacity: dimmed ? 0.4 : 1
-
-        Image {
-            id: itemImage
-            objectName: "itemImage"
-            visible: source != ""
-            height: units.gu(2.5)
-            width: units.gu(2.5)
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        Label {
-            id: itemLabel
-            objectName: "itemLabel"
-            color: "#f3f3e7"
-            opacity: 0.8
-            font.family: "Ubuntu"
-            fontSize: "medium"
-            anchors.verticalCenter: parent.verticalCenter
-        }
-    }
 }

=== modified file 'Panel/IndicatorRow.qml'
--- Panel/IndicatorRow.qml	2013-06-05 22:03:08 +0000
+++ Panel/IndicatorRow.qml	2013-07-11 14:53:26 +0000
@@ -21,7 +21,7 @@
     id: indicatorRow
 
     property QtObject currentItem : null
-    property int currentItemIndex: currentItem ? currentItem.ownIndex : -1
+    readonly property int currentItemIndex: currentItem ? currentItem.ownIndex : -1
     property alias row: row
     property QtObject indicatorsModel: null
     property bool overviewActive: false // "state of the menu"
@@ -54,13 +54,15 @@
             id: rowRepeater
             objectName: "rowRepeater"
             model: indicatorsModel ? indicatorsModel : undefined
+
             IndicatorItem {
                id: indicatorItem
 
                property int ownIndex: index
 
-               label: model.label
-               iconSource: model.iconSource
+               widgetSource: model.widgetSource
+
+               indicatorProperties : model.indicatorProperties
                highlighted: indicatorRow.state == "reveal" || indicatorRow.state == "locked" || indicatorRow.state == "commit" ? ownIndex == indicatorRow.currentItemIndex : false
                dimmed: { //See FIXME in Indicators regarding the "states" change
                    if (indicatorRow.state == "initial" || indicatorRow.state == "") {

=== added directory 'Panel/Indicators'
=== modified file 'Panel/Indicators.qml'
--- Panel/Indicators.qml	2013-07-02 21:22:50 +0000
+++ Panel/Indicators.qml	2013-07-11 14:53:26 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Gestures 0.1
-import Ubuntu.ChewieUI 0.1 as ChewieUI
 
 import "../Components"
 import "../Components/ListItems"
@@ -70,8 +69,7 @@
                 // we dont want to switch to a indicator menu until we hit reveal state.
                 if (menuContent.overviewActive) {
                     menuContent.showOverview()
-                }
-                else {
+                } else {
                     menuContent.showMenu()
                 }
                 indicators.state = "locked"
@@ -272,9 +270,8 @@
 
     }
 
-    ChewieUI.PluginModel {
+    IndicatorsDataModel {
         id: indicatorsModel
-        Component.onCompleted: load()
     }
 
     Connections {
@@ -294,8 +291,7 @@
             if (showAnimation.running) {
                 if (indicators.state == "initial") {
                     openOverview()
-                }
-                else {
+                } else {
                     indicators.calculateCurrentItem(dragHandle.touchX, false)
                     menuContent.showMenu()
                 }

=== added file 'Panel/Indicators/DatetimeIndicatorPage.qml'
--- Panel/Indicators/DatetimeIndicatorPage.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/DatetimeIndicatorPage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,97 @@
+/*
+ * 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 <[e-mail]>
+ *      Ubo Riboni <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Flickable {
+    id: page
+
+    contentHeight: image.height
+
+    Image {
+        id: image
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        source: "../graphics/[e-mail]"
+        fillMode: Image.PreserveAspectFit
+    }
+
+    Item {
+        anchors {
+            top: parent.top
+            topMargin: units.gu(5)
+            left: parent.left
+            right: parent.right
+        }
+
+        height: units.gu(30)
+
+        Label {
+            id: timeLabel
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                verticalCenter: parent.verticalCenter
+            }
+
+            text: ""
+            color: "#f3f3e7"
+            font.weight: Font.Light
+            font.pixelSize: units.gu(6)
+        }
+
+        Label {
+            id: dateLabel
+
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                bottom: parent.bottom
+                bottomMargin: units.gu(1.5)
+            }
+            text: ""
+            color: "#f3f3e7"
+            fontSize: "small"
+        }
+    }
+
+    Timer {
+        interval: 1000 * 10 // 10 seconds
+        running: true
+        repeat: true
+        triggeredOnStart: true
+        onTriggered: updateTime();
+    }
+
+    function updateTime() {
+        var dt = new Date();
+        var time = Qt.formatTime(dt);
+        var space = time.indexOf(" ");
+        timeLabel.text = time.substr(0, space > 0 ? space : 5);
+        dateLabel.text = Qt.formatDateTime(dt, "dddd,\ndd MMMM");
+    }
+
+    // Make it compatible with the PluginItem interface
+    function start() {}
+    function stop() {}
+    function reset() {}
+}

=== added file 'Panel/Indicators/DatetimeIndicatorWidget.qml'
--- Panel/Indicators/DatetimeIndicatorWidget.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/DatetimeIndicatorWidget.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.IndicatorWidget {
+    id: indicatorWidget
+
+    width: timeLabel.width + units.gu(1)
+
+    property alias label: timeLabel.text
+
+    Label {
+        id: timeLabel
+        objectName: "timeLabel"
+        color: "#f3f3e7"
+        opacity: 0.8
+        font.family: "Ubuntu"
+        fontSize: "medium"
+        anchors.centerIn: parent
+        text: Qt.formatTime(timer.dateNow)
+    }
+
+    Timer {
+        id: timer
+        interval: 1000 * 10
+        running: indicatorWidget.visible
+        repeat: true
+        triggeredOnStart: true
+        property date dateNow
+
+        onTriggered: dateNow = new Date
+    }
+
+    onActionStateChanged: {
+        if (action == undefined || !action.valid) {
+            return;
+        }
+
+        if (action.state == undefined) {
+            visible = false;
+            return;
+        }
+
+        indicatorWidget.visible = action.state[3];
+    }
+}

=== added file 'Panel/Indicators/DefaultIndicatorPage.qml'
--- Panel/Indicators/DefaultIndicatorPage.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/DefaultIndicatorPage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.IndicatorPage {
+      anchors.fill: parent
+}

=== added file 'Panel/Indicators/DefaultIndicatorWidget.qml'
--- Panel/Indicators/DefaultIndicatorWidget.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/DefaultIndicatorWidget.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.IndicatorWidget {
+    id: indicatorWidget
+
+    width: itemRow.width + units.gu(1)
+
+    property alias label: itemLabel.text
+    property alias iconSource: itemImage.source
+
+    Row {
+        id: itemRow
+        objectName: "itemRow"
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+        }
+        spacing: units.gu(0.5)
+
+        // FIXME : Should us Ubuntu.Icon . results in low res images
+        Image {
+            id: itemImage
+            objectName: "itemImage"
+            visible: source != ""
+            height: indicatorWidget.iconSize
+            width: indicatorWidget.iconSize
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        Label {
+            id: itemLabel
+            objectName: "itemLabel"
+            color: "#f3f3e7"
+            opacity: 0.8
+            font.family: "Ubuntu"
+            fontSize: "medium"
+            anchors.verticalCenter: parent.verticalCenter
+            visible: text != ""
+        }
+    }
+
+    onActionStateChanged: {
+        if (action == undefined || !action.valid) {
+            return;
+        }
+
+        if (action.state == undefined) {
+            label = "";
+            iconSource = "";
+            enabled = false;
+            return;
+        }
+
+        label = action.state[Indicators.ActionState.Label];
+        iconSource = "image://gicon/" + action.state[Indicators.ActionState.IconSource];
+        enabled = action.state[Indicators.ActionState.Visible];
+    }
+}

=== added file 'Panel/Indicators/MessagingIndicatorPage.qml'
--- Panel/Indicators/MessagingIndicatorPage.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/MessagingIndicatorPage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.IndicatorPage {
+    anchors.fill: parent
+
+    highlightFollowsCurrentItem: false
+    emptyText: "You have no more outstanding messages."
+
+    function stop() {
+        // never stops the service
+        // this will keep all objects in memory, consume more memory
+        // but will optimize the menu contruction on the screen
+    }
+}

=== added file 'Panel/Indicators/MessagingIndicatorWidget.qml'
--- Panel/Indicators/MessagingIndicatorWidget.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/MessagingIndicatorWidget.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+
+DefaultIndicatorWidget {
+    // default the icon so we have something to show when we don't have the bus.
+    iconSource: "image://gicon/indicator-messages"
+}

=== added file 'Panel/Indicators/NetworkIndicatorPage.qml'
--- Panel/Indicators/NetworkIndicatorPage.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/NetworkIndicatorPage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Unity.Indicators 0.1 as Indicators
+import Unity.Indicators.Network 0.1 as ICNetwork
+import Ubuntu.Components 0.1
+
+PageStack {
+    id: _network
+
+    property alias title: _mainPage.title
+    property alias emptyText: _pluginItem.emptyText
+    property alias busType: _pluginItem.busType
+    property alias busName: _pluginItem.busName
+    property alias actionsObjectPath : _pluginItem.actionsObjectPath
+    property alias menuObjectPaths : _pluginItem.menuObjectPaths
+
+    __showHeader: false
+    anchors.fill: parent
+
+    Page {
+        id: _mainPage
+
+        Indicators.IndicatorPage {
+            id: _pluginItem
+            anchors.fill: parent
+        }
+    }
+
+    Component {
+        id: passwordPageComponent
+
+        ICNetwork.PasswordPage {
+            agent: networkAgent
+            token: token
+        }
+    }
+
+    ICNetwork.NetworkAgent {
+        id: networkAgent
+
+        onSecretRequested: {
+            _network.push(passwordPageComponent);
+        }
+    }
+
+    function start()
+    {
+        push(_mainPage);
+        _pluginItem.start();
+    }
+
+    function stop()
+    {
+        clear();
+        _pluginItem.stop();
+    }
+
+    function reset()
+    {
+        _pluginItem.reset();
+    }
+}

=== added file 'Panel/Indicators/NetworkIndicatorWidget.qml'
--- Panel/Indicators/NetworkIndicatorWidget.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/NetworkIndicatorWidget.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.IndicatorWidget {
+    id: indicatorWidget
+
+    width: networkIcon.width + units.gu(1)
+
+    property int signalStrength: 0
+    property int connectionState: Indicators.NetworkConnection.Initial
+    rootMenuType: "com.canonical.indicator.root.network"
+
+    // FIXME : Should us Ubuntu.Icon . results in low res images
+    Image {
+        id: networkIcon
+        objectName: "itemImage"
+        source: get_icon_for_signal(connectionState, signalStrength)
+        visible: source != ""
+        height: indicatorWidget.iconSize
+        width: indicatorWidget.iconSize
+        anchors.centerIn: parent
+    }
+
+    onActionStateChanged: {
+        if (action == undefined || !action.valid) {
+            return;
+        }
+
+        if (action.state == undefined) {
+            connectionState = 0;
+            return;
+        }
+
+        connectionState = action.state[Indicators.NetworkActionState.Connection];
+        if (connectionState == Indicators.NetworkConnection.Activated) {
+            signalStrength = action.state[Indicators.NetworkActionState.SignalStrength];
+        }
+    }
+
+    NumberAnimation {
+        id: activation_animation
+        target: indicatorWidget
+        property: "signalStrength"
+        from: 0
+        to: 100
+        duration: 2500  // 5 states in 2.5 seconds
+        loops: Animation.Infinite
+    }
+
+    states: [
+        State {
+            name: "unknown"
+            when: connectionState < Indicators.NetworkConnection.Activating || connectionState > Indicators.NetworkConnection.Deactivating
+            PropertyChanges { target: activation_animation; running: false }
+        },
+        State {
+            name: "activating"
+            when: connectionState == Indicators.NetworkConnection.Activating
+            PropertyChanges { target: activation_animation; running: true }
+        },
+        State {
+            name: "activated"
+            when: connectionState == Indicators.NetworkConnection.Activated
+            PropertyChanges { target: activation_animation; running: false }
+        },
+        State {
+            name: "deactivating"
+            when: connectionState == Indicators.NetworkConnection.Deactivating
+            PropertyChanges { target: activation_animation; running: true }
+        }
+    ]
+
+
+    function get_icon_for_signal(con_state, value) {
+        if (con_state >= Indicators.NetworkConnection.Activating && con_state <= Indicators.NetworkConnection.Deactivating) {
+            if (value == 0) {
+                return "image://gicon/nm-signal-00";
+            } else if (value <= 25) {
+                return "image://gicon/nm-signal-25";
+            } else if (value <= 50) {
+                return "image://gicon/nm-signal-50";
+            } else if (value <= 75) {
+                return "image://gicon/nm-signal-75";
+            }
+            return "image://gicon/nm-signal-100";
+        }
+        return "image://gicon/wifi-none";
+    }
+}

=== added file 'Panel/Indicators/SoundIndicatorWidget.qml'
--- Panel/Indicators/SoundIndicatorWidget.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/SoundIndicatorWidget.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+import QtQuick 2.0
+
+DefaultIndicatorWidget {
+    // default the icon so we have something to show when we don't have the bus.
+    iconSource: "image://gicon/audio-volume-high"
+}

=== added directory 'Panel/Indicators/client'
=== added file 'Panel/Indicators/client/IndicatorsClient.qml'
--- Panel/Indicators/client/IndicatorsClient.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/client/IndicatorsClient.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,42 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Rectangle {
+    color: "black"
+    id: root
+
+    PageStack {
+        id: pages
+
+        anchors.fill: parent
+        Component.onCompleted: root.reset()
+    }
+
+    function reset() {
+        pages.clear();
+        var component = Qt.createComponent("IndicatorsList.qml");
+        var page = component.createObject(pages);
+        console.log(component.errorString());
+        pages.push(page);
+    }
+}

=== added file 'Panel/Indicators/client/IndicatorsList.qml'
--- Panel/Indicators/client/IndicatorsList.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/client/IndicatorsList.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Unity.Indicators 0.1 as Indicators
+import "../.."
+
+Page {
+    id: page
+    anchors.fill: parent
+    title: "Plugin list"
+
+    IndicatorsDataModel {
+        id: indicatorsModel
+    }
+
+    ListView {
+        id: mainMenu
+        objectName: "mainMenu"
+        anchors.fill: parent
+        model: indicatorsModel
+
+        delegate: Indicators.MenuItem {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            progression: isValid
+            objectName: identifier
+
+            Label {
+                anchors.left: parent.left
+                anchors.leftMargin: units.gu(0.5)
+                anchors.verticalCenter: parent.verticalCenter
+                text: title
+            }
+
+            onClicked: {
+                if (progression) {
+                    var new_page = Qt.createComponent("IndicatorsPage.qml");
+                    page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});
+                }
+            }
+        }
+    }
+}

=== added file 'Panel/Indicators/client/IndicatorsPage.qml'
--- Panel/Indicators/client/IndicatorsPage.qml	1970-01-01 00:00:00 +0000
+++ Panel/Indicators/client/IndicatorsPage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,49 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    id: _page
+
+    title: indicatorProperties && indicatorProperties.title ?  indicatorProperties.title : ""
+    property variant indicatorProperties
+    property alias pageSource : page_loader.source
+
+    anchors.fill: parent
+
+    Loader {
+        id: page_loader
+        objectName: "page_loader"
+
+        anchors.fill: parent
+
+        onStatusChanged: {
+            if (status == Loader.Ready) {
+                for(var pName in indicatorProperties) {
+                    if (item.hasOwnProperty(pName)) {
+                        item[pName] = indicatorProperties[pName];
+                    }
+                }
+                item.start();
+            }
+        }
+    }
+}

=== added file 'Panel/IndicatorsDataModel.qml'
--- Panel/IndicatorsDataModel.qml	1970-01-01 00:00:00 +0000
+++ Panel/IndicatorsDataModel.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Unity.Indicators 0.1 as Indicators
+import Utils 0.1
+
+Indicators.IndicatorsModel {
+    id: ic_model
+
+    Component.onCompleted: load()
+
+    indicatorData : {
+        'indicator-messaging' : {
+            'title': 'Messaging',
+            'description' : '',
+            'priority': 10,
+            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorWidget.qml',
+            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/MessagingIndicatorPage.qml'
+        },
+        'indicator-sound' : {
+            'title': 'Sound',
+            'description' : '',
+            'priority': 20,
+            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/SoundIndicatorWidget.qml',
+            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'
+        },
+        'indicator-network' : {
+            'title': 'Networks',
+            'description' : '',
+            'priority': 30,
+            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorWidget.qml',
+            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'
+        },
+        'indicator-battery' : {
+            'title': 'Battery',
+            'description' : '',
+            'priority': 40,
+            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget.qml',
+            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage.qml'
+        },
+        'indicator-time' : {
+            'title': 'Date and Time',
+            'description' : '',
+            'priority': 100,
+            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorWidget.qml',
+            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DatetimeIndicatorPage.qml'
+        }
+    }
+}

=== modified file 'Panel/MenuContent.qml'
--- Panel/MenuContent.qml	2013-07-02 20:33:09 +0000
+++ Panel/MenuContent.qml	2013-07-11 14:53:26 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
 import "Menus"
 import "../Components"
 
@@ -29,7 +30,7 @@
     property bool __contentActive: false
     property alias currentIndex : menus.currentIndex
     property color backgroundColor: "#221e1c"
-    property int contentReleaseInterval: 5000
+    property int contentReleaseInterval: 20000
 
     width: units.gu(40)
     height: units.gu(42)
@@ -94,7 +95,7 @@
 
             width: menus.width
             height: menus.height
-            sourceComponent: component
+            source: pageSource
             visible: content.__shown
             onVisibleChanged: {
                 // Reset the indicator states
@@ -104,25 +105,15 @@
             }
             asynchronous: true
 
-            onStatusChanged: {
-                if (status == Loader.Ready) {
-                    if (indicatorsModel.widgetsMap && item.hasOwnProperty("widgetsMap")) {
-                        item["widgetsMap"] = indicatorsModel.widgetsMap
-                    }
-                    for(var pName in initialProperties) {
-                        if (item.hasOwnProperty(pName)) {
-                            item[pName] = initialProperties[pName]
-                        }
-                    }
-                    if (contentActive && menus.visible) {
-                        item.start()
-                    }
-                }
-            }
-
-            // FIXME: QTBUG-30632 - asynchronous loader crashes when changing index quickly.
-            Component.onDestruction: {
-                active = false;
+            onLoaded: {
+                for(var pName in indicatorProperties) {
+                    if (item.hasOwnProperty(pName)) {
+                        item[pName] = indicatorProperties[pName]
+                    }
+                }
+                if (contentActive && menus.visible) {
+                    item.start()
+                }
             }
 
             // Need to use a binding because the handle height changes.
@@ -189,7 +180,13 @@
                 left: parent.left
                 right: parent.right
             }
-            text: content.overviewActive ? i18n.tr("Device") : (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count) ?  indicatorsModel.get(menus.currentIndex).title : ""
+            text: {
+                if (content.overviewActive)
+                    return i18n.tr("Device");
+                if (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count)
+                    return indicatorsModel.data(menus.currentIndex, Indicators.IndicatorsModelRole.Title);
+                return "";
+            }
             opacity: __shown ? 1 : 0
             Behavior on opacity {NumberAnimation{duration: 100}}
         }

=== modified file 'Panel/Menus/Overview/OverviewGrid.qml'
--- Panel/Menus/Overview/OverviewGrid.qml	2013-06-05 22:03:08 +0000
+++ Panel/Menus/Overview/OverviewGrid.qml	2013-07-11 14:53:26 +0000
@@ -59,31 +59,22 @@
                 objectName: "overviewGridButton" + index
                 width: grid.cellWidth
                 height: grid.cellHeight
-                Image {
-                    id: imageIcon
-                    objectName: "overviewGridButtonImage"
-                    source: iconSource
-                    width: units.gu(4)
-                    height: units.gu(4)
-                    anchors {
-                        centerIn: parent
-                        verticalCenterOffset: -units.gu(1)
-                    }
-                    sourceSize.width: width
-                    sourceSize.height: height
-                    visible: labelIcon.text === ""
-                }
-
-                Label {
-                    id: labelIcon
-                    text: label
-                    color: "#f3f3e7"
-                    opacity: 0.8
-                    font.family: "Ubuntu"
-                    fontSize: "large"
-                    anchors {
-                        centerIn: parent
-                        verticalCenterOffset: -units.gu(1)
+
+                Loader {
+                    id: loader
+                    source: widgetSource
+
+                    width: units.gu(5)
+                    height: units.gu(5)
+                    anchors.centerIn: parent
+                    anchors.verticalCenterOffset: -units.gu(1)
+
+                    onLoaded: {
+                        for(var pName in indicatorProperties) {
+                            if (item.hasOwnProperty(pName)) {
+                                item[pName] = indicatorProperties[pName]
+                            }
+                        }
                     }
                 }
 

=== added file 'Panel/graphics/[e-mail]'
Binary files Panel/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and Panel/graphics/[e-mail]	2013-07-11 14:53:26 +0000 differ
=== modified file 'build'
--- build	2013-07-03 10:33:48 +0000
+++ build	2013-07-11 14:53:26 +0000
@@ -43,10 +43,9 @@
     echo "Installing Unity 8 dependencies.."
     sudo apt-get install devscripts \
                          equivs \
+                         qmenumodel-qml \
                          qtdeclarative5-ubuntu-ui-toolkit-plugin \
                          qtdeclarative5-dee-plugin \
-                         indicators-client \
-                         indicators-client-plugin-* \
                          ubuntu-mobile-icons \
                          unity-notifications-impl-1 \
                          unity-scope-home \

=== modified file 'cmake/modules/autopilot.cmake'
--- cmake/modules/autopilot.cmake	2013-06-05 22:03:08 +0000
+++ cmake/modules/autopilot.cmake	2013-07-11 14:53:26 +0000
@@ -1,7 +1,10 @@
 add_custom_target(autopilot)
 
-function(declare_autopilot_test TEST_NAME WORKING_DIR)
-  add_custom_command(TARGET autopilot
-  COMMAND autopilot run ${TEST_NAME}
-  WORKING_DIRECTORY ${WORKING_DIR})
+function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
+    add_custom_target(autopilot-${TEST_NAME}
+        COMMAND autopilot run ${TEST_SUITE}
+        WORKING_DIRECTORY ${WORKING_DIR}
+    )
+
+    add_dependencies(autopilot autopilot-${TEST_NAME})
 endfunction()

=== modified file 'debian/control'
--- debian/control	2013-07-11 13:49:23 +0000
+++ debian/control	2013-07-11 14:53:26 +0000
@@ -10,7 +10,10 @@
                libgles2-mesa-dev[armhf],
                libhud-client2-dev,
                libjson-perl,
+               libnm-glib-dev,
+               libnm-util-dev,
                libpulse-dev,
+               libqmenumodel-dev,
                libqt5v8-5-private-dev,
                libunity-api-dev (>= 7.80.3),
                libunity-core-6.0-dev (<< 7.80),
@@ -41,9 +44,19 @@
 Vcs-Bzr: https://code.launchpad.net/unity8
 Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
 
+Package: indicators-client
+Architecture: amd64 armhf i386
+Depends: qmenumodel-qml,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
+         unity8 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Indicators client test application
+ This package contains the client application for indicators used by autopilot
+
 Package: unity8
 Architecture: any
-Depends: indicators-client (>= 0.6.1),
+Depends: qmenumodel-qml,
          qtdeclarative5-dee-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
@@ -55,18 +68,19 @@
          unity8-private | unity-launcher-impl,
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: indicators-client-plugin-datetime (>= 0.6.1),
-            indicators-client-plugin-messaging (>= 0.6.1),
-            indicators-client-plugin-network (>= 0.6.1),
-            indicators-client-plugin-power (>= 0.6.1),
-            indicators-client-plugin-sound (>= 0.6.1),
+Recommends: indicator-battery,
+            indicator-messages,
+            indicator-network,
+            indicator-sound,
+            indicator-time,
             ${unity-default-masterscopes},
 Description: Unity 8 shell
  The Unity 8 shell is the primary user interface for Ubuntu devices.
 
 Package: unity8-autopilot
 Architecture: all
-Depends: libautopilot-qt,
+Depends: indicators-client (>= ${source:Version}),
+         libautopilot-qt,
          libqt5test5,
          libqt5widgets5,
          python-evdev,

=== added file 'debian/indicators-client.install'
--- debian/indicators-client.install	1970-01-01 00:00:00 +0000
+++ debian/indicators-client.install	2013-07-11 14:53:26 +0000
@@ -0,0 +1,1 @@
+/usr/bin/indicators-client

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2013-07-02 14:44:34 +0000
+++ debian/unity8.install	2013-07-11 14:53:26 +0000
@@ -13,3 +13,4 @@
 usr/share/unity8/Shell.qml
 usr/share/unity8/SideStage
 usr/share/unity8/graphics
+usr/share/unity8/unity/indicators/*

=== modified file 'main.cpp'
--- main.cpp	2013-07-03 09:23:56 +0000
+++ main.cpp	2013-07-11 14:53:26 +0000
@@ -22,6 +22,7 @@
 #include <QtGui/QIcon>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlEngine>
+#include <QtQml/QQmlContext>
 #include <qpa/qplatformnativeinterface.h>
 #include <QLibrary>
 #include <libintl.h>
@@ -131,8 +132,6 @@
     nativeInterface->setProperty("ubuntuSessionType", 1);
     view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
 
-    QObject::connect(view->engine(), SIGNAL(quit()), qApp, SLOT(quit()));
-
     QUrl source("Shell.qml");
     prependImportPaths(view->engine(), ::overrideImportPaths());
     appendImportPaths(view->engine(), ::fallbackImportPaths());

=== modified file 'paths.h.in'
--- paths.h.in	2013-06-28 13:14:29 +0000
+++ paths.h.in	2013-07-11 14:53:26 +0000
@@ -23,6 +23,7 @@
 // Qt
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
+#include <QStandardPaths>
 
 inline bool isRunningInstalled() {
     static bool installed = (QCoreApplication::applicationDirPath() ==
@@ -65,6 +66,20 @@
     return paths;
 }
 
+inline QStringList shellDataDirs() {
+    QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+    if (!isRunningInstalled()) {
+        if (getenv("UNITY_TEST_ENV")==NULL) {
+            dirs.prepend("@CMAKE_BINARY_DIR@/share");
+        }
+    }
+    else {
+        // append so by default we use xdg files.
+        dirs.append(shellAppDirectory());
+    }
+    return dirs;
+}
+
 inline QString sourceDirectory() {
     return QString("@CMAKE_SOURCE_DIR@/");
 }

=== modified file 'plugins/Unity/CMakeLists.txt'
--- plugins/Unity/CMakeLists.txt	2013-07-11 08:19:10 +0000
+++ plugins/Unity/CMakeLists.txt	2013-07-11 14:53:26 +0000
@@ -1,6 +1,8 @@
 # export_qmlplugin macro
 include(Plugins)
 
+add_subdirectory(Indicators)
+
 # Dependencies
 include(FindPkgConfig)
 pkg_check_modules(QTDEE REQUIRED libdee-qt5)

=== added directory 'plugins/Unity/Indicators'
=== added file 'plugins/Unity/Indicators/CMakeLists.txt'
--- plugins/Unity/Indicators/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/CMakeLists.txt	2013-07-11 14:53:26 +0000
@@ -0,0 +1,52 @@
+project(IndicatorsQml)
+
+pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Quick REQUIRED)
+
+add_subdirectory(qml)
+add_subdirectory(Messaging)
+add_subdirectory(Network)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${QMENUMODEL_INCLUDE_DIRS}
+)
+
+set(IndicatorsQML_SOURCES
+    flatmenuproxymodel.cpp
+    indicator.cpp
+    indicators.h
+    indicatorsmanager.cpp
+    indicatorsmodel.cpp
+    plugin.cpp
+)
+
+set(IndicatorsQML_RESOURCES
+    resources/indicators.qrc
+)
+
+qt5_add_resources(IndicatorsQML_RESOURCES_RCC
+    ${IndicatorsQML_RESOURCES}
+)
+
+add_library(IndicatorsQml SHARED
+    ${IndicatorsQML_RESOURCES_RCC}
+    ${IndicatorsQML_SOURCES}
+)
+# Because this is an internal support library, we want
+# to expose all symbols in it. Consider changing this
+# either to a static library or just using the
+# files directly in targets.
+set_target_properties(IndicatorsQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
+
+target_link_libraries(IndicatorsQml
+    ${QMENUMODEL_LDFLAGS}
+)
+
+qt5_use_modules(IndicatorsQml Core Qml Quick)
+
+install(TARGETS IndicatorsQml
+    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators
+    )

=== added directory 'plugins/Unity/Indicators/Messaging'
=== added file 'plugins/Unity/Indicators/Messaging/CMakeLists.txt'
--- plugins/Unity/Indicators/Messaging/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/CMakeLists.txt	2013-07-11 14:53:26 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(qml)

=== added directory 'plugins/Unity/Indicators/Messaging/qml'
=== added file 'plugins/Unity/Indicators/Messaging/qml/ActionButton.qml'
--- plugins/Unity/Indicators/Messaging/qml/ActionButton.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/ActionButton.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Button {
+    id: button
+    property QtObject actionGroup: null
+    property string action
+
+    property var actionParameter: null
+
+    Indicators.MenuAction {
+        id: menuAction
+        actionGroup: button.actionGroup
+        action: button.action
+    }
+
+    onClicked: {
+        if (menuAction.valid) {
+            menuAction.activate(actionParameter);
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml'
--- plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/ActionTextField.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    property alias actionGroup: sendButton.actionGroup
+    property alias action: sendButton.action
+
+    property alias text: replyField.text
+    property alias buttonText: sendButton.text
+
+    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;
+            }
+        }
+    }
+
+    ActionButton {
+        id: sendButton
+
+        actionParameter: replyField.text
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: parent.right
+        }
+        width: units.gu(9)
+        enabled: replyField.text !== ""
+        color: enabled ? "#c94212" : "#bababa"
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt'
--- plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/CMakeLists.txt	2013-07-11 14:53:26 +0000
@@ -0,0 +1,15 @@
+file(GLOB IndicatorsMessaging_QMLFILES
+    *.qml
+    *.js
+    qmldir
+)
+
+# copy qml & qmldir files into build directory for shadow builds
+add_custom_target(UnityIndicatorsMessagingQmlFiles ALL
+    COMMAND cp ${IndicatorsMessaging_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators/Messaging
+    DEPENDS ${IndicatorsMessaging_QMLFILES}
+)
+
+install(FILES ${IndicatorsMessaging_QMLFILES}
+        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Messaging
+)

=== added file 'plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml'
--- plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/GroupedMessage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,96 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.BasicMenuItem {
+    id: groupedMessage
+    property alias count: label.text
+
+    color: "#221e1b"
+    implicitHeight: units.gu(10)
+
+    Indicators.MenuAction {
+        id: menuAction
+        actionGroup: groupedMessage.actionGroup
+        action: menu ? menu.action : ""
+    }
+
+    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: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_app.svg"
+                fillMode: Image.PreserveAspectFit
+            }
+        }
+
+        Label {
+            anchors.verticalCenter: parent.verticalCenter
+            color: "#e8e1d0"
+            font.weight: Font.DemiBold
+            fontSize: "medium"
+            text: menu && menu.label ? menu.label : ""
+        }
+
+        Label {
+            id: label
+            anchors.verticalCenter: parent.verticalCenter
+            width: parent.width - x
+            horizontalAlignment: Text.AlignRight
+            color: "#e8e1d0"
+            font.weight: Font.DemiBold
+            fontSize: "medium"
+            text: menuAction.valid ? menuAction.state[0] : "0"
+        }
+    }
+
+    Indicators.HLine {
+        anchors.top: parent.top
+        color: "#403b37"
+    }
+
+    Indicators.HLine {
+        anchors.bottom: parent.bottom
+        color: "#060606"
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            if (menuAction.valid) {
+                menuAction.activate(true);
+            }
+        }
+    }
+
+    onItemRemoved: {
+        if (menuAction.valid) {
+            menuAction.activate(false);
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml'
--- plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/HeroMessage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,120 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.BasicMenuItem {
+    id: heroMessage
+
+    property variant actionsDescription: null
+    property alias heroMessageHeader: __heroMessageHeader
+    property real collapsedHeight: heroMessageHeader.y + heroMessageHeader.bodyBottom + units.gu(2)
+    property real expandedHeight: collapsedHeight
+
+    color: "#221e1c"
+
+    removable: state !== "expanded"
+    implicitHeight: collapsedHeight
+
+    Indicators.MenuAction {
+        id: menuAction
+        actionGroup: heroMessage.actionGroup
+        action: menu ? menu.action : ""
+    }
+
+    HeroMessageHeader {
+        id: __heroMessageHeader
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        avatar: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_contact.png"
+        icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_app_icon) : ""
+        appIcon: icon
+
+        state: heroMessage.state
+
+        onAppIconClicked:  {
+            if (menuAction.valid) {
+                deactivateMenu();
+                action.activate(true);
+            }
+        }
+    }
+
+    onClicked: {
+        if (menuActivated) {
+            deactivateMenu();
+        } else {
+            activateMenu();
+        }
+    }
+
+    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: menuActivated
+
+        PropertyChanges {
+            target: heroMessage
+            color: "#333130"
+            implicitHeight: heroMessage.expandedHeight
+        }
+        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: {
+        if (menuAction.valid) {
+            menuAction.activate(false);
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml'
--- plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,161 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+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
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/MessageMenuItem.qml'
--- plugins/Unity/Indicators/Messaging/qml/MessageMenuItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/MessageMenuItem.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,96 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.BasicMenuItem {
+    property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
+
+    onActionGroupChanged: loadItem()
+    onActionsDescriptionChanged: loadItem()
+    implicitHeight: contents.status == Loader.Ready ? contents.item.implicitHeight : 0
+
+    Loader {
+        id: contents
+
+        anchors.fill: parent
+        // Binding all properties for the item, to make sure that any change in the
+        // property will be propagated to the contents.item at any time
+        Binding {
+            target: contents.item
+            property: "menuActivated"
+            value: menuActivated
+            when: (contents.status == Loader.Ready)
+        }
+
+        Binding {
+            target: contents.item
+            property: "actionGroup"
+            value: actionGroup
+            when: (contents.status == Loader.Ready)
+        }
+
+        Binding {
+            target: contents.item
+            property: "menu"
+            value: menu
+            when: (contents.status == Loader.Ready)
+        }
+
+        Binding {
+            target: contents.item
+            property: "actionsDescription"
+            value: actionsDescription
+            when: (contents.status == Loader.Ready)
+        }
+
+        Connections {
+            target: contents.item ? contents.item : null
+            onActivateMenu: activateMenu()
+            onDeactivateMenu: deactivateMenu()
+        }
+    }
+
+
+    function loadItem()
+    {
+        var parameterType = ""
+        for (var actIndex in actionsDescription) {
+            var desc = actionsDescription[actIndex];
+            if (desc["parameter-type"] !== undefined) {
+                parameterType += desc["parameter-type"];
+            } else {
+                parameterType += "_";
+            }
+        }
+
+        if (parameterType === "") {
+            contents.source = "SimpleTextMessage.qml";
+        } else if (parameterType === "s") {
+            contents.source = "TextMessage.qml";
+        } else if (parameterType === "_s") {
+            contents.source = "SnapDecision.qml";
+        } else {
+            console.debug("Unknown paramater type: " + parameterType);
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/QuickReply.qml'
--- plugins/Unity/Indicators/Messaging/qml/QuickReply.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/QuickReply.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,160 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Item {
+    property alias actionGroup: actionTextField.actionGroup
+    property alias action: actionTextField.action
+
+    property alias buttonText: actionTextField.buttonText
+    property real expandedHeight: childrenRect.height
+    property alias messages : messagelistRepeater.model
+
+    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
+
+            Rectangle {
+                width: messagelist.width
+                height: units.gu(5)
+                color: "#333230"
+
+                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)
+        }
+
+        Indicators.HLine {
+            anchors.top: parent.top
+            color: "#464543"
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml'
--- plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,97 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "utils.js" as Utils
+
+HeroMessage {
+    id: __heroMessage
+
+    property alias footer: footerLoader.sourceComponent
+
+    expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)
+    heroMessageHeader.titleText.text: menu ? menu.label : ""
+    heroMessageHeader.subtitleText.text: menu ? Utils.formatDate(menu.extra.canonical_time) : ""
+    heroMessageHeader.bodyText.text: menu ? menu.extra.canonical_text : ""
+
+    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
+
+        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
+            }
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml'
--- plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,142 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+import "utils.js" as Utils
+
+HeroMessage {
+    id: snapDecision
+
+    expandedHeight: buttons.y + buttons.height + quickreply.height + units.gu(2)
+    heroMessageHeader.titleText.text:  menu ? menu.label : ""
+    heroMessageHeader.subtitleText.text: menu ? menu.extra.canonical_text : ""
+    heroMessageHeader.subtitleText.color: "#e8e1d0"
+    heroMessageHeader.bodyText.text: menu ? Utils.formatDate(menu.extra.canonical_time) : ""
+    heroMessageHeader.bodyText.color: "#8f8f88"
+
+    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
+
+        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 = "";
+                }
+            }
+        }
+
+        ActionButton {
+            actionGroup: snapDecision.actionGroup
+            action: actionsDescription[0].name
+
+            text: actionsDescription ?  actionsDescription[0].label : "Call back"
+            color: "#c94212"
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            width: (parent.width - units.gu(1)) / 2
+        }
+
+        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
+
+        actionGroup: snapDecision.actionGroup
+        action: actionsDescription[1].name
+
+        messages: actionsDescription ? actionsDescription[1]["parameter-hint"] : ""
+        buttonText: actionsDescription ? actionsDescription[1].label : "send"
+        anchors {
+            top: buttons.bottom
+            topMargin: units.gu(2)
+            left: parent.left
+            right: parent.right
+        }
+        height: 0
+        opacity: 0.0
+        enabled: false
+
+        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 = "";
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/TextMessage.qml'
--- plugins/Unity/Indicators/Messaging/qml/TextMessage.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/TextMessage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+SimpleTextMessage {
+    id: simpleMessage
+
+    footer: ActionTextField {
+        anchors.fill:  parent
+        actionGroup: simpleMessage.actionGroup
+        action: actionsDescription[0].name
+
+        buttonText: actionsDescription ? actionsDescription[0].label : "Send"
+    }
+}

=== added file 'plugins/Unity/Indicators/Messaging/qml/qmldir'
--- plugins/Unity/Indicators/Messaging/qml/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/qmldir	2013-07-11 14:53:26 +0000
@@ -0,0 +1,12 @@
+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
+MessageMenuItem 0.1 MessageMenuItem.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

=== added file 'plugins/Unity/Indicators/Messaging/qml/utils.js'
--- plugins/Unity/Indicators/Messaging/qml/utils.js	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Messaging/qml/utils.js	2013-07-11 14:53:26 +0000
@@ -0,0 +1,27 @@
+/*
+ * 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 <[e-mail]>
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+.pragma library
+
+function formatDate(timestamp) {
+    // timestamp is in microseconds since epoch
+    var date = new Date(timestamp / 1000);
+    return Qt.formatDateTime(date, "hh:mm - MMM dd");
+}

=== added directory 'plugins/Unity/Indicators/Network'
=== added file 'plugins/Unity/Indicators/Network/CMakeLists.txt'
--- plugins/Unity/Indicators/Network/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/CMakeLists.txt	2013-07-11 14:53:26 +0000
@@ -0,0 +1,42 @@
+project(IndicatorsNetworkQml)
+
+pkg_check_modules(GLIB glib-2.0>=2.32)
+pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
+pkg_check_modules(LIBNM_UTIL libnm-util>=0.9.6)
+
+if(LIBNM_GLIB_FOUND AND LIBNM_UTIL_FOUND AND GLIB_FOUND)
+    set(INDICATORS_NETWORK_SRC
+        networkagent.cpp
+        plugin.cpp
+        secret-agent.c
+    )
+
+    add_library(IndicatorsNetworkQml MODULE
+        ${INDICATORS_NETWORK_SRC}
+    )
+
+    qt5_use_modules(IndicatorsNetworkQml Core Qml Widgets)
+
+    set_target_properties(IndicatorsNetworkQml PROPERTIES COMPILE_FLAGS -fPIC)
+
+    include_directories(
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${GLIB_INCLUDE_DIRS}
+        ${LIBNM_GLIB_INCLUDE_DIRS}
+        ${LIBNM_UTIL_INCLUDE_DIRS}
+    )
+
+    target_link_libraries(IndicatorsNetworkQml
+        ${GLIB_LIBRARIES}
+        ${LIBNM_GLIB_LIBRARIES}
+        ${LIBNM_UTIL_LIBRARIES}
+    )
+
+    install(TARGETS IndicatorsNetworkQml
+        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Network
+    )
+else()
+    message(WARNING "Missing glib or libnm dependency for the network plugin, not building")
+endif()
+
+add_subdirectory(qml)

=== added file 'plugins/Unity/Indicators/Network/networkagent.cpp'
--- plugins/Unity/Indicators/Network/networkagent.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/networkagent.cpp	2013-07-11 14:53:26 +0000
@@ -0,0 +1,146 @@
+/*
+ * 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:
+ *     Alberto Ruiz <[e-mail]>
+ *     Renato Araujo Oliveira Filho <[e-mail]>
+ */
+
+#include "networkagent.h"
+
+#include <QVariant>
+#include <QApplication>
+#include <QDebug>
+
+class NetworkAgentToken
+{
+public:
+    NMConnection *connection;
+    NMSettingWirelessSecurity *wisec;
+    guint id;
+    QByteArray keyMgmt;
+
+    NetworkAgentToken(NMConnection *connection,
+                      NMSettingWirelessSecurity *wisec,
+                      guint id,
+                      QByteArray keyMgmt)
+        : connection(connection),
+          wisec(wisec),
+          id(id),
+          keyMgmt(keyMgmt)
+    {
+        if (connection) {
+            g_object_ref(connection);
+        } else {
+            qWarning() << "invalid connection object";
+        }
+    }
+
+    ~NetworkAgentToken()
+    {
+        if (connection) {
+            g_object_unref(connection);
+        }
+    }
+};
+
+NetworkAgent::NetworkAgent(QObject *parent)
+    : QObject(parent)
+{
+    m_agent = unity_settings_secret_agent_new();
+    g_signal_connect(G_OBJECT(m_agent),
+                     UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
+                     G_CALLBACK(onSecretRequested),
+                     this);
+
+    g_signal_connect(G_OBJECT(m_agent),
+                     UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
+                     G_CALLBACK(onSecretRequestCancelled),
+                     this);
+}
+
+NetworkAgent::~NetworkAgent()
+{
+    nm_secret_agent_unregister(NM_SECRET_AGENT(m_agent));
+    g_object_unref(m_agent);
+}
+
+void NetworkAgent::authenticate(const QVariant &token, const QString &key)
+{
+    NetworkAgentToken *pToken = (NetworkAgentToken *) token.value<void *>();
+    if (pToken == NULL) {
+        return;
+    }
+
+    if ((pToken->keyMgmt == "wpa-none") || (pToken->keyMgmt == "wpa-psk")) {
+        g_object_set(G_OBJECT(pToken->wisec),
+                     NM_SETTING_WIRELESS_SECURITY_PSK, qPrintable(key),
+                     NULL);
+    } else if (pToken->keyMgmt == "none") {
+        g_object_set(G_OBJECT(pToken->wisec),
+                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, qPrintable(key),
+                     NULL);
+    }
+
+    GHashTable *settings = nm_connection_to_hash(pToken->connection,
+                                                 NM_SETTING_HASH_FLAG_ALL);
+
+    unity_settings_secret_agent_provide_secret(m_agent,
+                                               pToken->id, settings);
+    g_hash_table_unref(settings);
+    delete pToken;
+}
+
+void NetworkAgent::cancel(const QVariant &token)
+{
+    NetworkAgentToken *pToken = (NetworkAgentToken *) token.value<void *>();
+    if (pToken != NULL) {
+        unity_settings_secret_agent_cancel_request(m_agent, pToken->id);
+        delete pToken;
+    }
+}
+
+void NetworkAgent::onSecretRequested(UnitySettingsSecretAgent* /*agent*/,
+                                     guint         id,
+                                     NMConnection* connection,
+                                     const char* /*setting_name*/,
+                                     const char** /*hints*/,
+                                     NMSecretAgentGetSecretsFlags /*flags*/,
+                                     NetworkAgent* self)
+{
+    NetworkAgentToken *token = new NetworkAgentToken(connection,
+                                                     NULL,
+                                                     id,
+                                                     NULL);
+
+    token->wisec = nm_connection_get_setting_wireless_security(connection);
+    if (token->wisec) {
+        token->keyMgmt = nm_setting_wireless_security_get_key_mgmt(token->wisec);
+    }
+
+    QVariant varToken = qVariantFromValue((void *) token);
+    Q_EMIT self->secretRequested(varToken);
+}
+
+void NetworkAgent::onSecretRequestCancelled(UnitySettingsSecretAgent* /*agent*/,
+                                            guint         /*id*/,
+                                            NMConnection* /*connection*/,
+                                            const char* /*setting_name*/,
+                                            const char** /*hints*/,
+                                            NMSecretAgentGetSecretsFlags /*flags*/,
+                                            NetworkAgent* /*self*/)
+{
+    //Do nothing for now
+}

=== added file 'plugins/Unity/Indicators/Network/networkagent.h'
--- plugins/Unity/Indicators/Network/networkagent.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/networkagent.h	2013-07-11 14:53:26 +0000
@@ -0,0 +1,65 @@
+/*
+ * 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:
+ *     Alberto Ruiz <[e-mail]>
+ *     Renato Araujo Oliveira Filho <[e-mail]>
+ */
+
+#ifndef NETWORKAGENT_H
+#define NETWORKAGENT_H
+
+#include "secret-agent.h"
+
+#include <QObject>
+
+class NetworkAgentToken;
+
+class NetworkAgent : public QObject
+{
+    Q_OBJECT
+public:
+    NetworkAgent(QObject *parent=0);
+    ~NetworkAgent();
+
+    Q_INVOKABLE void authenticate(const QVariant &token, const QString &key);
+    Q_INVOKABLE void cancel(const QVariant &token);
+
+Q_SIGNALS:
+    void secretRequested(const QVariant &token);
+    void secretRequestCancelled();
+
+private:
+    UnitySettingsSecretAgent *m_agent;
+
+    static void onSecretRequested(UnitySettingsSecretAgent *agent,
+                                  guint   id,
+                                  NMConnection *connection,
+                                  const char *setting_name,
+                                  const char **hints,
+                                  NMSecretAgentGetSecretsFlags flags,
+                                  NetworkAgent *self);
+
+    static void onSecretRequestCancelled(UnitySettingsSecretAgent *agent,
+                                         guint          id,
+                                         NMConnection *connection,
+                                         const char *setting_name,
+                                         const char **hints,
+                                         NMSecretAgentGetSecretsFlags flags,
+                                         NetworkAgent *self);
+
+};
+
+#endif

=== added file 'plugins/Unity/Indicators/Network/plugin.cpp'
--- plugins/Unity/Indicators/Network/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/plugin.cpp	2013-07-11 14:53:26 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+// Qt
+#include <QtQml>
+
+// self
+#include "plugin.h"
+
+// local
+#include "networkagent.h"
+
+void IndicatorsNetworkPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<NetworkAgent>(uri, 0, 1, "NetworkAgent");
+}

=== added file 'plugins/Unity/Indicators/Network/plugin.h'
--- plugins/Unity/Indicators/Network/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/plugin.h	2013-07-11 14:53:26 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef INDICATORS_NETWORK_PLUGIN_H
+#define INDICATORS_NETWORK_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class IndicatorsNetworkPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // INDICATORS_NETWORK_PLUGIN_H

=== added directory 'plugins/Unity/Indicators/Network/qml'
=== added file 'plugins/Unity/Indicators/Network/qml/AccessPoint.qml'
--- plugins/Unity/Indicators/Network/qml/AccessPoint.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/qml/AccessPoint.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+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.MenuItem {
+    id: accessPoint
+    property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
+    property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
+
+    function getNetworkIcon(data) {
+        var imageName = "nm-signal-100"
+        var signalStrength = parseInt(wifiApStrength)
+
+        if (data.extra.canonical_wifi_ap_is_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";
+        }
+
+        if (data.extra.canonical_wifi_ap_is_secure) {
+            imageName += "-secure";
+        }
+
+        return "image://gicon/" + imageName;
+    }
+
+    icon: menu && wifiApStrength ? getNetworkIcon(menu) : "image://gicon/wifi-none"
+    iconFrame: false
+    control: CheckBox {
+        id: checkBoxActive
+        height: units.gu(4)
+        width: units.gu(4)
+        anchors.centerIn: parent
+    }
+
+    Indicators.MenuActionBinding {
+        actionGroup: accessPoint.actionGroup
+        action: menu ? menu.action : ""
+        target: checkBoxActive
+        property: "checked"
+    }
+}

=== added file 'plugins/Unity/Indicators/Network/qml/CMakeLists.txt'
--- plugins/Unity/Indicators/Network/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/qml/CMakeLists.txt	2013-07-11 14:53:26 +0000
@@ -0,0 +1,15 @@
+file(GLOB IndicatorsNetwork_QMLFILES
+    *.qml
+    *.js
+    qmldir
+)
+
+# copy qml & qmldir files into build directory for shadow builds
+add_custom_target(UnityIndicatorsNetworkQmlFiles ALL
+    COMMAND cp ${IndicatorsNetwork_QMLFILES} ${CMAKE_BINARY_DIR}/plugins/Unity/Indicators/Network
+    DEPENDS ${IndicatorsNetwork_QMLFILES}
+)
+
+install(FILES ${IndicatorsNetwork_QMLFILES}
+        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity/Indicators/Network
+)

=== added file 'plugins/Unity/Indicators/Network/qml/PasswordPage.qml'
--- plugins/Unity/Indicators/Network/qml/PasswordPage.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/qml/PasswordPage.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Unity.Indicators 0.1 as Indicators
+
+Page {
+    id: pagePassword
+
+    property variant agent
+    property variant token
+
+    anchors.fill: parent
+    title: "Network Authentication"
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Indicators.SectionMenuItem {
+            label: "Authentication"
+        }
+
+        Indicators.MenuItem {
+            implicitHeight: password.height + units.gu(1)
+
+            PasswordTextField {
+                id: password
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(3)
+                    verticalCenter: parent.verticalCenter
+                }
+            }
+        }
+
+        Indicators.MenuItem {
+            Row {
+                anchors {
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                    margins: units.gu(3)
+                }
+
+                spacing: units.gu(1)
+
+                Button {
+                    text: "Cancel"
+                    width: units.gu(10)
+                    onClicked: {
+                        agent.cancel(token);
+                        pageStack.pop();
+                    }
+                }
+
+                Button {
+                    text: "Ok"
+                    width: units.gu(10)
+                    onClicked: {
+                        agent.authenticate(token, password.text);
+                        pageStack.pop();
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Network/qml/PasswordTextField.qml'
--- plugins/Unity/Indicators/Network/qml/PasswordTextField.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/qml/PasswordTextField.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    id: textMenu
+
+    property alias text: textField.text
+
+    height: contentColumn.height
+
+    Column {
+        id: contentColumn
+        spacing: units.gu(0.5)
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        TextField {
+            id: textField
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            placeholderText: "Password"
+            echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
+        }
+
+        Row {
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            spacing: units.gu(1)
+
+            CheckBox {
+                id: showPassword
+            }
+
+            Label {
+                text: "Show password"
+                anchors.verticalCenter: showPassword.verticalCenter
+            }
+        }
+    }
+}

=== added file 'plugins/Unity/Indicators/Network/qml/WifiSection.qml'
--- plugins/Unity/Indicators/Network/qml/WifiSection.qml	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/qml/WifiSection.qml	2013-07-11 14:53:26 +0000
@@ -0,0 +1,34 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
+
+Indicators.SectionMenuItem {
+    id: wifiSectionMenu
+
+    Indicators.MenuAction {
+        id: busyAction
+        actionGroup: wifiSectionMenu.actionGroup
+        action: menu ? menu.extra.canonical_busy_action : ""
+    }
+
+    busy: busyAction.valid ? busyAction.state : false
+}

=== added file 'plugins/Unity/Indicators/Network/qml/qmldir'
--- plugins/Unity/Indicators/Network/qml/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/qml/qmldir	2013-07-11 14:53:26 +0000
@@ -0,0 +1,8 @@
+module Unity.Indicators.Network
+plugin IndicatorsNetworkQml
+
+NetworkPage 0.1 NetworkPage.qml
+AccessPoint 0.1 AccessPoint.qml
+PasswordPage 0.1 PasswordPage.qml
+PasswordTextField 0.1 PasswordTextField.qml
+WifiSection 0.1 WifiSection.qml
\ No newline at end of file

=== added file 'plugins/Unity/Indicators/Network/secret-agent.c'
--- plugins/Unity/Indicators/Network/secret-agent.c	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/secret-agent.c	2013-07-11 14:53:26 +0000
@@ -0,0 +1,382 @@
+/*
+ * 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:
+ *     Alberto Ruiz <[e-mail]>
+ *     Renato Araujo Oliveira Filho <[e-mail]>
+ */
+
+
+#include <glib.h>
+#include <glib-object.h>
+#include <nm-secret-agent.h>
+#include "secret-agent.h"
+
+#define UNITY_SETTINGS_TYPE_SECRET_AGENT (unity_settings_secret_agent_get_type ())
+#define UNITY_SETTINGS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgent))
+#define UNITY_SETTINGS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
+#define UNITY_SETTINGS_IS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT))
+#define UNITY_SETTINGS_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT))
+#define UNITY_SETTINGS_SECRET_AGENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
+#define UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentPrivate))
+
+#define AGENT_ID "com.canonical.settings.network.nm-agent"
+
+static gpointer unity_settings_secret_agent_parent_class = NULL;
+
+typedef struct _UnitySettingsSecretAgentPrivate UnitySettingsSecretAgentPrivate;
+
+struct _UnitySettingsSecretAgentPrivate {
+  GQueue  *requests;
+};
+
+typedef struct _SecretRequest {
+  gint                           id;
+  NMSecretAgent                 *agent;
+  NMConnection                  *connection;
+  const char                    *connection_path;
+  const char                    *setting_name;
+  const char                   **hints;
+  NMSecretAgentGetSecretsFlags   flags;
+  NMSecretAgentGetSecretsFunc    callback;
+  gpointer                       callback_data;
+} SecretRequest;
+
+GType unity_settings_secret_agent_get_type (void) G_GNUC_CONST;
+enum  {
+    UNITY_SETTINGS_SECRET_AGENT_DUMMY_PROPERTY
+};
+
+enum {
+  SECRET_REQUESTED,
+  REQUEST_CANCELLED,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+UnitySettingsSecretAgent* unity_settings_secret_agent_new       (void);
+UnitySettingsSecretAgent* unity_settings_secret_agent_construct (GType object_type);
+
+int
+secret_request_find (SecretRequest  *req,
+                     guint          *id)
+{
+  if (req->id > *id)
+      return -1;
+
+  if (req->id < *id)
+      return 1;
+
+  return 0;
+}
+
+void
+unity_settings_secret_agent_provide_secret (UnitySettingsSecretAgent *agent,
+                                            guint                     request,
+                                            GHashTable               *secrets)
+{
+  GList                           *iter;
+  SecretRequest                   *req;
+  UnitySettingsSecretAgentPrivate *priv = agent->priv;
+
+  iter = g_queue_find_custom (priv->requests,
+                              &request,
+                              (GCompareFunc)secret_request_find);
+
+  if (iter == NULL || iter->data == NULL)
+    {
+      g_warning ("Secret request with id <%d> was not found", (int)request);
+      return;
+    }
+
+  req = iter->data;
+
+  req->callback (NM_SECRET_AGENT (agent),
+                 req->connection,
+                 secrets,
+                 NULL,
+                 req->callback_data);
+
+  g_queue_remove_all (priv->requests, req);
+  g_free (req);
+  return;
+}
+
+void
+free_request (SecretRequest *req)
+{
+  g_object_unref (req->connection);
+  g_free (req);
+}
+
+void
+unity_settings_secret_agent_cancel_request (UnitySettingsSecretAgent *agent,
+                                            guint                     request)
+{
+  GList                           *iter;
+  SecretRequest                   *req;
+  UnitySettingsSecretAgentPrivate *priv = agent->priv;
+  GError *error;
+
+  iter = g_queue_find_custom (priv->requests,
+                              &request,
+                              (GCompareFunc)secret_request_find);
+
+  if (iter == NULL || iter->data == NULL)
+    {
+      g_warning ("Secret request with id <%d> was not found", (int)request);
+      return;
+    }
+
+  req = iter->data;
+  error = g_error_new (NM_SECRET_AGENT_ERROR,
+                       NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
+                       "This secret request was canceled by the user.");
+
+  req->callback (NM_SECRET_AGENT (agent),
+                 req->connection,
+                 NULL,
+                 error,
+                 req->callback_data);
+
+  g_queue_remove_all (priv->requests, req);
+  free_request (req);
+  return;
+}
+
+static void
+delete_secrets (NMSecretAgent *agent,
+                NMConnection *connection,
+                const char *connection_path,
+                NMSecretAgentDeleteSecretsFunc callback,
+                gpointer callback_data)
+{
+  g_debug ("delete secrets");
+}
+
+/* If it returns G_MAXUINT it's considered an error */
+static guint
+find_available_id (UnitySettingsSecretAgentPrivate *priv)
+{
+  guint i         = 0;
+  guint candidate = 0;
+
+  if (g_queue_get_length (priv->requests) == G_MAXUINT)
+    return G_MAXUINT;
+
+  while (i < g_queue_get_length (priv->requests))
+    {
+      SecretRequest *req = (SecretRequest*)g_queue_peek_nth (priv->requests, i);
+
+      if (req->id == candidate)
+      {
+        candidate++;
+        i = 0;
+      }
+      else
+      {
+        i++;
+      }
+    }
+
+  return i;
+}
+
+static void
+get_secrets (NMSecretAgent                 *agent,
+             NMConnection                  *connection,
+             const char                    *connection_path,
+             const char                    *setting_name,
+             const char                   **hints,
+             NMSecretAgentGetSecretsFlags   flags,
+             NMSecretAgentGetSecretsFunc    callback,
+             gpointer                       callback_data)
+{
+  guint   id;
+  UnitySettingsSecretAgentPrivate *priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (agent);
+  SecretRequest *req = NULL;
+
+  if (flags == NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE)
+    {
+      GError *error = g_error_new (NM_SECRET_AGENT_ERROR,
+                                   NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
+                                   "No password found for this connection.");
+      callback (agent, connection, NULL, error, callback_data);
+      g_error_free (error);
+      return;
+    }
+
+  id = find_available_id (priv);
+  if (id == G_MAXUINT)
+    {
+      GError *error = g_error_new (NM_SECRET_AGENT_ERROR,
+                                   NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
+                                   "Reached maximum number of requests.");
+      callback (agent, connection, NULL, error, callback_data);
+      g_error_free (error);
+      return;
+    }
+
+  /* Adding a request */
+  req = (SecretRequest*) g_malloc0 (sizeof (SecretRequest));
+  *req = ((SecretRequest)
+          { id,
+            agent,
+            connection,
+            connection_path,
+            setting_name,
+            hints,
+            flags,
+            callback,
+            callback_data });
+
+  g_object_ref (connection);
+
+  g_queue_push_tail (priv->requests, req);
+
+  g_signal_emit_by_name (agent,
+                         UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
+                         id,
+                         connection,
+                         setting_name,
+                         hints,
+                         flags);
+}
+
+static void
+save_secrets (NMSecretAgent                *agent,
+              NMConnection                 *connection,
+              const char                   *connection_path,
+              NMSecretAgentSaveSecretsFunc  callback,
+              gpointer                      callback_data)
+{
+  g_debug ("save secrets");
+}
+
+static void
+cancel_get_secrets (NMSecretAgent *agent,
+                    const char *connection_path,
+                    const char *setting_name)
+{
+  g_debug ("cancel get secrets");
+}
+
+UnitySettingsSecretAgent*
+unity_settings_secret_agent_construct (GType object_type)
+{
+  UnitySettingsSecretAgent * self = NULL;
+  self = (UnitySettingsSecretAgent*) g_object_new (object_type,
+                                                   NM_SECRET_AGENT_IDENTIFIER, AGENT_ID,
+                                                   NULL);
+  return self;
+}
+
+
+UnitySettingsSecretAgent*
+unity_settings_secret_agent_new (void)
+{
+  return unity_settings_secret_agent_construct (UNITY_SETTINGS_TYPE_SECRET_AGENT);
+}
+
+static void
+destroy_pending_request (gpointer data)
+{
+  SecretRequest* req = (SecretRequest*)data;
+  /* Reporting the cancellation of all pending requests */
+  g_signal_emit_by_name (req->agent,
+                         UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
+                         req->id);
+
+  free_request (req);
+}
+
+static void
+unity_settings_secret_agent_finalize (GObject *agent)
+{
+  UnitySettingsSecretAgentPrivate *priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (agent);
+
+  g_queue_free_full (priv->requests, destroy_pending_request);
+}
+
+static void
+unity_settings_secret_agent_class_init (UnitySettingsSecretAgentClass *klass)
+{
+  unity_settings_secret_agent_parent_class = g_type_class_peek_parent (klass);
+  NMSecretAgentClass         *parent_class = NM_SECRET_AGENT_CLASS (klass);
+  parent_class->get_secrets = get_secrets;
+  parent_class->save_secrets = save_secrets;
+  parent_class->delete_secrets = delete_secrets;
+  parent_class->cancel_get_secrets = cancel_get_secrets;
+
+  g_type_class_add_private (klass, sizeof(UnitySettingsSecretAgentPrivate));
+  G_OBJECT_CLASS (klass)->finalize = unity_settings_secret_agent_finalize;
+
+
+  signals[SECRET_REQUESTED] = g_signal_new (UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED,
+                                            G_OBJECT_CLASS_TYPE (G_OBJECT_CLASS (klass)),
+                                            G_SIGNAL_RUN_FIRST,
+                                            G_STRUCT_OFFSET (UnitySettingsSecretAgentClass, secret_requested),
+                                            NULL, NULL, NULL,
+                                            G_TYPE_NONE, 5,
+                                            G_TYPE_UINT, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_UINT);
+
+  signals[REQUEST_CANCELLED] = g_signal_new (UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED,
+                                             G_OBJECT_CLASS_TYPE (G_OBJECT_CLASS (klass)),
+                                             G_SIGNAL_RUN_FIRST,
+                                             G_STRUCT_OFFSET (UnitySettingsSecretAgentClass, request_cancelled),
+                                             NULL, NULL, NULL,
+                                             G_TYPE_NONE, 1,
+                                             G_TYPE_UINT);
+}
+
+
+static void
+unity_settings_secret_agent_instance_init (UnitySettingsSecretAgent *self)
+{
+  self->priv = UNITY_SETTINGS_SECRET_AGENT_GET_PRIVATE (self);
+  self->priv->requests = g_queue_new ();
+}
+
+GType
+unity_settings_secret_agent_get_type (void)
+{
+  static volatile gsize unity_settings_secret_agent_type_id__volatile = 0;
+  if (g_once_init_enter (&unity_settings_secret_agent_type_id__volatile))
+    {
+      static const GTypeInfo g_define_type_info =
+        {
+          sizeof (UnitySettingsSecretAgentClass),
+          (GBaseInitFunc) NULL,
+          (GBaseFinalizeFunc) NULL,
+          (GClassInitFunc) unity_settings_secret_agent_class_init,
+          (GClassFinalizeFunc) NULL,
+          NULL,
+          sizeof (UnitySettingsSecretAgent),
+          0,
+          (GInstanceInitFunc) unity_settings_secret_agent_instance_init,
+          NULL
+        };
+      GType unity_settings_secret_agent_type_id;
+      unity_settings_secret_agent_type_id = g_type_register_static (NM_TYPE_SECRET_AGENT,
+                                                                    "UnitySettingsSecretAgent",
+                                                                    &g_define_type_info,
+                                                                    0);
+      g_once_init_leave (&unity_settings_secret_agent_type_id__volatile,
+                         unity_settings_secret_agent_type_id);
+    }
+
+  return unity_settings_secret_agent_type_id__volatile;
+}

=== added file 'plugins/Unity/Indicators/Network/secret-agent.h'
--- plugins/Unity/Indicators/Network/secret-agent.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/Network/secret-agent.h	2013-07-11 14:53:26 +0000
@@ -0,0 +1,102 @@
+/*
+ * 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:
+ *     Alberto Ruiz <[e-mail]>
+ *     Renato Araujo Oliveira Filho <[e-mail]>
+ */
+
+#ifndef __SECRET_AGENT_H__
+#define __SECRET_AGENT_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <nm-secret-agent.h>
+
+/*
+ * This class is a basic implementation of the NetworkManager SecretAgent base class.
+ *
+ * The purpose of this class is to handle credential requests from the network,
+ * for example, from a WiFi hotspot or a VPN network.
+ *
+ * It queues requests objects (SecretRequest) on a GQueue in the private struct
+ * of the class. And notifies the consumer of the class through the "secret-request"
+ * and the "request-cancelled" signals with the following callback prototypes:
+ *
+ * void  (*secret_requested) (UnitySettingsSecretAgent      *self,
+ *                            guint                        id,
+ *                            NMConnection                  *connection,
+ *                            const char                    *setting_name,
+ *                            const char                   **hints,
+ *                            NMSecretAgentGetSecretsFlags   flags,
+ *                            gpointer                       user_data);
+ *
+ * void  (*request_cancelled) (UnitySettingsSecretAgent      *self,
+ *                             guint                        id,
+ *                             gpointer                       user_data);
+ *
+ */
+
+
+G_BEGIN_DECLS
+
+
+#define UNITY_SETTINGS_TYPE_SECRET_AGENT (unity_settings_secret_agent_get_type ())
+#define UNITY_SETTINGS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgent))
+#define UNITY_SETTINGS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
+#define UNITY_SETTINGS_IS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT))
+#define UNITY_SETTINGS_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_SETTINGS_TYPE_SECRET_AGENT))
+#define UNITY_SETTINGS_SECRET_AGENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_SETTINGS_TYPE_SECRET_AGENT, UnitySettingsSecretAgentClass))
+
+#define UNITY_SETTINGS_SECRET_AGENT_SECRET_REQUESTED  "secret-requested"
+#define UNITY_SETTINGS_SECRET_AGENT_REQUEST_CANCELLED "request-cancelled"
+
+typedef struct _UnitySettingsSecretAgent UnitySettingsSecretAgent;
+typedef struct _UnitySettingsSecretAgentClass UnitySettingsSecretAgentClass;
+typedef struct _UnitySettingsSecretAgentPrivate UnitySettingsSecretAgentPrivate;
+
+struct _UnitySettingsSecretAgent {
+  NMSecretAgent parent_instance;
+  UnitySettingsSecretAgentPrivate * priv;
+};
+
+struct _UnitySettingsSecretAgentClass {
+  NMSecretAgentClass parent_class;
+
+  void  (*secret_requested) (UnitySettingsSecretAgent      *self,
+                             guint                          id,
+                             NMConnection                  *connection,
+                             const char                    *setting_name,
+                             const char                   **hints,
+                             NMSecretAgentGetSecretsFlags   flags);
+
+  void  (*request_cancelled) (UnitySettingsSecretAgent      *self,
+                              guint                          id);
+};
+
+
+GType                     unity_settings_secret_agent_get_type  (void) G_GNUC_CONST;
+UnitySettingsSecretAgent* unity_settings_secret_agent_new       (void);
+UnitySettingsSecretAgent* unity_settings_secret_agent_construct (GType object_type);
+
+void unity_settings_secret_agent_provide_secret (UnitySettingsSecretAgent *agent,
+                                                 guint                     request,
+                                                 GHashTable               *secrets);
+void unity_settings_secret_agent_cancel_request (UnitySettingsSecretAgent *agent,
+                                                 guint                     request);
+
+G_END_DECLS
+
+#endif

=== added file 'plugins/Unity/Indicators/flatmenuproxymodel.cpp'
--- plugins/Unity/Indicators/flatmenuproxymodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/flatmenuproxymodel.cpp	2013-07-11 14:53:26 +0000
@@ -0,0 +1,272 @@
+/*
+ * Copyright 2012 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 <[e-mail]>
+ */
+
+extern "C" {
+#include <gio/gio.h>
+}
+
+#include "flatmenuproxymodel.h"
+#include <QString>
+#include <QStringList>
+
+FlatMenuProxyModel::FlatMenuProxyModel(QAbstractItemModel *source)
+    : QAbstractProxyModel(source),
+      m_rowCount(0)
+{
+    m_model = new QDBusMenuModel;
+    setSourceModel(m_model);
+}
+
+/*! \internal */
+FlatMenuProxyModel::~FlatMenuProxyModel()
+{
+    delete m_model;
+}
+
+void FlatMenuProxyModel::setSourceModel(QAbstractItemModel *source)
+{
+    if (sourceModel()) {
+        QAbstractItemModel *oldSource = sourceModel();
+        if (oldSource == source) {
+            return;
+        }
+
+        oldSource->disconnect(this);
+    }
+
+    QAbstractProxyModel::setSourceModel(source);
+
+    if (source) {
+
+        // FIXME - not working correctly with dynamic inserts/removes
+
+        connect(source,
+                SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+                SLOT(onModelAboutToBeReset()));
+        connect(source,
+                SIGNAL(rowsInserted(QModelIndex,int,int)),
+                SLOT(onModelReset()));
+
+        connect(source,
+                SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+                SLOT(onModelAboutToBeReset()));
+        connect(source,
+                SIGNAL(rowsRemoved(QModelIndex,int,int)),
+                SLOT(onModelReset()));
+
+        connect(source,
+                SIGNAL(modelAboutToBeReset()),
+                SLOT(onModelAboutToBeReset()));
+        connect(source,
+                SIGNAL(modelReset()),
+                SLOT(onModelReset()));
+
+        connect(source,
+                SIGNAL(statusChanged(DBusEnums::ConnectionStatus)),
+                SIGNAL(statusChanged()));
+
+        // initiliaze rowCount
+        QModelIndex lastItem = source->index(source->rowCount() - 1, 0);
+        m_rowCount = recursiveRowCount(lastItem);
+    } else {
+        m_rowCount = 0;
+    }
+
+    Q_EMIT countChanged();
+}
+
+void FlatMenuProxyModel::setBusName(const QString &busName)
+{
+    m_model->setBusName(busName);
+}
+
+QString FlatMenuProxyModel::busName() const
+{
+    return m_model->busName();
+}
+
+void FlatMenuProxyModel::setObjectPath(const QString &busPath)
+{
+    m_model->setObjectPath(busPath);
+}
+
+QString FlatMenuProxyModel::objectPath() const
+{
+    return m_model->objectPath();
+}
+
+int FlatMenuProxyModel::status() const
+{
+    return m_model->status();
+}
+
+DBusEnums::BusType FlatMenuProxyModel::busType() const
+{
+    return m_model->busType();
+}
+
+void FlatMenuProxyModel::setIntBusType(int type)
+{
+    m_model->setBusType((DBusEnums::BusType) type);
+}
+
+void FlatMenuProxyModel::start()
+{
+    m_model->start();
+}
+
+void FlatMenuProxyModel::stop()
+{
+    m_model->stop();
+}
+
+QModelIndex FlatMenuProxyModel::mapFromSource(const QModelIndex &index) const
+{
+    if (!index.isValid()) {
+        return QModelIndex();
+    }
+
+    QModelIndex result = createIndex(rowOffsetOf(index, index.row()), 0);
+    return result;
+}
+
+QModelIndex FlatMenuProxyModel::mapToSource(const QModelIndex &index) const
+{
+    if (sourceModel() && m_indexCache.contains(index.row())) {
+        QString key = m_indexCache.value(index.row());
+        QStringList sections = key.split('.', QString::SkipEmptyParts);
+        QModelIndex sourceIndex = QModelIndex();
+        for(int i=0; i < sections.size(); i++) {
+            sourceIndex = sourceModel()->index(sections.at(i).toInt(), 9, sourceIndex);
+        }
+        return sourceIndex;
+    } else {
+        return QModelIndex();
+    }
+}
+
+QModelIndex FlatMenuProxyModel::index(int row, int sectionRow, const QModelIndex &parent, const QString &key) const
+{
+    for (int i = 0, count = 0; i < sourceModel()->rowCount(parent); i++) {
+        QModelIndex sourceIndex = sourceModel()->index(i, 0, parent);
+        int indexCount = recursiveRowCount(sourceIndex);
+
+        if (count == sectionRow) {
+            QString sectionKey = key + "." + QString::number(i);
+            m_indexCache.insert(row, sectionKey);
+            return createIndex(row, 0);
+        } else if ((count + indexCount) >= sectionRow) {
+            count++;
+            return index(row, sectionRow - count, sourceIndex, key + "." + QString::number(i));
+        }
+
+        count += indexCount + 1;
+    }
+    return QModelIndex();
+}
+
+QModelIndex FlatMenuProxyModel::index(int row, int, const QModelIndex &) const
+{
+    return index(row, row, QModelIndex(), "");
+}
+
+QModelIndex FlatMenuProxyModel::parent(const QModelIndex &) const
+{
+    return QModelIndex();
+}
+
+int FlatMenuProxyModel::columnCount(const QModelIndex &) const
+{
+    return 1;
+}
+
+int FlatMenuProxyModel::rowCount(const QModelIndex &) const
+{
+    return m_rowCount;
+}
+
+int FlatMenuProxyModel::count() const
+{
+    return rowCount(QModelIndex());
+}
+
+void FlatMenuProxyModel::onModelAboutToBeReset()
+{
+   beginResetModel();
+}
+
+void FlatMenuProxyModel::onModelReset()
+{
+    // initiliaze rowCount
+    m_rowCount = 0;
+    for (int i = 0, iMax = sourceModel()->rowCount(); i < iMax; i++) {
+        QModelIndex index = sourceModel()->index(i, 0);
+        m_rowCount += recursiveRowCount(index) + 1;
+    }
+    m_indexCache.clear();
+    endResetModel();
+    Q_EMIT countChanged();
+}
+
+int FlatMenuProxyModel::recursiveRowCount(const QModelIndex &index) const
+{
+    int size = sourceModel()->rowCount(index);
+    for (int i=0, iMax=size; i < iMax; i++) {
+        QModelIndex currentIndex = sourceModel()->index(i, 0, index);
+        size += recursiveRowCount(currentIndex);
+    }
+
+    return size;
+}
+
+int FlatMenuProxyModel::rowOffsetOf(const QModelIndex &index, int row, bool inclusive) const
+{
+    int offset = 0;
+
+    QModelIndex parent = index.parent();
+
+    // Check row 0 offset
+    while(parent.isValid()) {
+        offset += 1;
+        for (int i = 0; i < parent.row(); i++) {
+            QModelIndex currentIndex = sourceModel()->index(i, 0, parent);
+            offset += recursiveRowCount(currentIndex) + 1;
+        }
+        parent = parent.parent();
+    }
+
+    // Check index.row() offset
+    for(int i = 0; i < row; i++) {
+        QModelIndex currentIndex = sourceModel()->index(i, 0, index.parent());
+        offset += recursiveRowCount(currentIndex) + 1;
+    }
+
+    if (inclusive) {
+        // itself
+        QModelIndex currentIndex = sourceModel()->index(row, 0, index.parent());
+        offset += recursiveRowCount(currentIndex);
+    }
+
+    return offset;
+}
+
+QVariant FlatMenuProxyModel::data(int row, int role) const
+{
+    return QAbstractProxyModel::data(index(row, 0), role);
+}
\ No newline at end of file

=== added file 'plugins/Unity/Indicators/flatmenuproxymodel.h'
--- plugins/Unity/Indicators/flatmenuproxymodel.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/flatmenuproxymodel.h	2013-07-11 14:53:26 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2012 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 <[e-mail]>
+ */
+
+#ifndef FLATMENUPROXYMODEL_H
+#define FLATMENUPROXYMODEL_H
+
+#include <QAbstractProxyModel>
+#include <qdbusmenumodel.h>
+
+class SectionInfo;
+
+class FlatMenuProxyModel : public QAbstractProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(int busType READ busType WRITE setIntBusType NOTIFY busTypeChanged)
+    Q_PROPERTY(QString busName READ busName WRITE setBusName NOTIFY busNameChanged)
+    Q_PROPERTY(QString objectPath READ objectPath WRITE setObjectPath NOTIFY objectPathChanged)
+    Q_PROPERTY(int status READ status NOTIFY statusChanged)
+
+    Q_ENUMS(Roles)
+public:
+    FlatMenuProxyModel(QAbstractItemModel *source=0);
+    ~FlatMenuProxyModel();
+
+    void setSourceModel(QAbstractItemModel * sourceModel);
+
+    Q_INVOKABLE QVariant data(int row, int role = Qt::DisplayRole) const;
+
+    QModelIndex mapFromSource(const QModelIndex &index) const;
+    QModelIndex mapToSource(const QModelIndex &index) const;
+
+    QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex parent(const QModelIndex &index) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int count() const;
+    int columnCount(const QModelIndex &parent) const;
+
+    void setBusName(const QString &busName);
+    QString busName() const;
+
+    void setObjectPath(const QString &busName);
+    QString objectPath() const;
+
+    DBusEnums::BusType busType() const;
+    void setIntBusType(int type);
+
+    int status() const;
+
+public Q_SLOTS:
+    void onModelAboutToBeReset();
+    void onModelReset();
+
+    void start();
+    void stop();
+
+Q_SIGNALS:
+    void countChanged();
+
+    void busTypeChanged();
+    void busNameChanged();
+    void objectPathChanged();
+    void statusChanged();
+
+private:
+    QDBusMenuModel *m_model;
+    mutable QMap<int, QString> m_indexCache;
+    int m_rowCount;
+
+    int rowOffsetOf(const QModelIndex &index, int row, bool inclusive = false) const;
+    int recursiveRowCount(const QModelIndex &index) const;
+    QModelIndex index(int row, int rowCount, const QModelIndex &parent, const QString &key) const;
+};
+
+#endif

=== added file 'plugins/Unity/Indicators/indicator.cpp'
--- plugins/Unity/Indicators/indicator.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/indicator.cpp	2013-07-11 14:53:26 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#include "indicator.h"
+
+#include <QStringList>
+
+Indicator::Indicator(QObject *parent)
+    : QObject(parent)
+{
+}
+
+Indicator::~Indicator()
+{
+}
+
+void Indicator::init(const QString& busName, const QSettings& settings)
+{
+    setId(settings.value("Indicator Service/Name").toString());
+
+    QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();
+
+    QVariantMap mapMenuObjectPaths;
+    Q_FOREACH(const QString& childGroup, settings.childGroups())
+    {
+        if (childGroup == "Indicator Service")
+            continue;
+
+        QString menuPath = childGroup+"/ObjectPath";
+        if (settings.contains(menuPath))
+        {
+            mapMenuObjectPaths[childGroup] = settings.value(menuPath).toString();
+        }
+    }
+
+
+    QVariantMap properties;
+    properties.clear();
+    properties.insert("busType", 1);
+    properties.insert("busName", busName);
+    properties.insert("actionsObjectPath", actionObjectPath);
+    properties.insert("menuObjectPaths", mapMenuObjectPaths);
+    setIndicatorProperties(properties);
+}
+
+QString Indicator::identifier() const
+{
+    return m_identifier;
+}
+
+void Indicator::setId(const QString &identifier)
+{
+    if (identifier != m_identifier) {
+        m_identifier = identifier;
+        Q_EMIT identifierChanged(m_identifier);
+    }
+}
+
+
+QVariant Indicator::indicatorProperties() const
+{
+    return m_properties;
+}
+
+void Indicator::setIndicatorProperties(const QVariant &properties)
+{
+    if (m_properties != properties)
+    {
+        m_properties = properties;
+        Q_EMIT indicatorPropertiesChanged(m_properties);
+    }
+}

=== added file 'plugins/Unity/Indicators/indicator.h'
--- plugins/Unity/Indicators/indicator.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/indicator.h	2013-07-11 14:53:26 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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 <[e-mail]>
+ *      Nick Dedekind <[e-mail]>
+ */
+
+#ifndef INDICATOR_H
+#define INDICATOR_H
+
+#include <QObject>
+#include <QSettings>
+
+class Indicator : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString identifier READ identifier NOTIFY identifierChanged)
+    Q_PROPERTY(QVariant indicatorProperties READ indicatorProperties NOTIFY indicatorPropertiesChanged)
+
+public:
+    typedef QSharedPointer<Indicator> Ptr;
+
+    Indicator(QObject *parent = 0);
+    virtual ~Indicator();
+
+    void init(const QString& busName, const QSettings& settings);
+
+    QString identifier() const;
+    QVariant indicatorProperties() const;
+
+Q_SIGNALS:
+    void identifierChanged(const QString &identifier);
+    void indicatorPropertiesChanged(const QVariant &properties);
+
+protected:
+    void setId(const QString &id);
+    void setIndicatorProperties(const QVariant &properties);
+
+private:
+    QString m_identifier;
+    QVariant m_properties;
+};
+
+#endif // INDICATOR_H

=== added file 'plugins/Unity/Indicators/indicators.h'
--- plugins/Unity/Indicators/indicators.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/indicators.h	2013-07-11 14:53:26 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef INDICATORS_H
+#define INDICATORS_H
+
+#include <QObject>
+
+class ActionState : public QObject
+{
+    Q_OBJECT
+public:
+    Q_ENUMS(ActionStates)
+    enum ActionStates {
+      Label           = 0x00,
+      IconSource      = 0x01,
+      AccessableName  = 0x02,
+      Visible         = 0x03,
+    };
+
+    ActionState(QObject*parent=0):QObject(parent) {}
+};
+
+class NetworkActionState : public QObject
+{
+    Q_OBJECT
+public:
+    Q_ENUMS(NetworkActionStates)
+    enum NetworkActionStates {
+      Connection      = 0x01,
+      SignalStrength  = 0x02,
+    };
+
+    NetworkActionState(QObject*parent=0):QObject(parent) {}
+};
+
+class NetworkConnection : public QObject
+{
+    Q_OBJECT
+public:
+    Q_ENUMS(NetworkConnectionStates)
+    enum NetworkConnectionStates {
+      Initial         = 0x00,
+      Activating      = 0x01,
+      Activated       = 0x02,
+      Deactivating    = 0x03,
+    };
+
+    NetworkConnection(QObject*parent=0):QObject(parent) {}
+};
+
+class IndicatorsModelRole : public QObject
+{
+    Q_OBJECT
+public:
+    Q_ENUMS(Roles)
+    enum Roles {
+        Identifier = 0,
+        Priority,
+        Title,
+        Description,
+        WidgetSource,
+        PageSource,
+        IndicatorProperties,
+        IsValid
+    };
+
+    IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
+};
+
+class FlatMenuProxyModelRole : public QObject
+{
+    Q_OBJECT
+public:
+    Q_ENUMS(Roles)
+    enum Roles {
+        Action  = Qt::DisplayRole + 1,
+        Label,
+        Extra,
+        Depth,
+        hasSection,
+        hasSubMenu
+    };
+
+    FlatMenuProxyModelRole(QObject*parent=0):QObject(parent) {}
+};
+
+#endif // INDICATORS_H

=== added file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2013-07-11 14:53:26 +0000
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+#include "indicatorsmanager.h"
+
+#include <QSettings>
+#include <QDebug>
+
+#include "paths.h"
+
+
+class IndicatorsManager::IndicatorData
+{
+public:
+    IndicatorData(const QString& name, const QFileInfo& fileInfo)
+        : m_name(name)
+        , m_fileInfo(fileInfo)
+        , m_verified (true)
+    {}
+
+    QString m_name;
+    QFileInfo m_fileInfo;
+
+    bool m_verified;
+    Indicator::Ptr m_indicator;
+};
+
+IndicatorsManager::IndicatorsManager(QObject* parent)
+    : QObject(parent)
+    , m_loaded(false)
+{
+}
+
+IndicatorsManager::~IndicatorsManager()
+{
+    unload();
+}
+
+void IndicatorsManager::load()
+{
+    unload();
+    QStringList xdgLocations = shellDataDirs();//QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+
+    m_fsWatcher.reset(new QFileSystemWatcher(this));
+
+    Q_FOREACH(const QString& xdgLocation, xdgLocations)
+    {
+        QString indicator_path = QDir::cleanPath(xdgLocation + "/unity/indicators");
+        QDir indicator_dir(indicator_path);
+        if (indicator_dir.exists())
+        {
+            // watch folder for changes.
+            m_fsWatcher->addPath(indicator_path);
+
+            loadDir(indicator_dir);
+        }
+    }
+
+    QObject::connect(m_fsWatcher.data(), SIGNAL(directoryChanged(const QString&)), this, SLOT(onDirectoryChanged(const QString&)));
+    QObject::connect(m_fsWatcher.data(), SIGNAL(fileChanged(const QString&)), this, SLOT(onFileChanged(const QString&)));
+    setLoaded(true);
+}
+
+void IndicatorsManager::onDirectoryChanged(const QString& directory)
+{
+    loadDir(QDir(directory));
+}
+
+void IndicatorsManager::onFileChanged(const QString& file)
+{
+    QFileInfo file_info(file);
+    if (!file_info.exists())
+    {
+        unloadFile(file_info);
+        return;
+    }
+    else
+    {
+        loadFile(QFileInfo(file));
+    }
+}
+
+void IndicatorsManager::loadDir(const QDir& dir)
+{
+    startVerify(dir.canonicalPath());
+
+    QFileInfoList indicator_files = dir.entryInfoList(QStringList(), QDir::Files|QDir::NoDotAndDotDot);
+    Q_FOREACH(const QFileInfo& indicator_file, indicator_files)
+    {
+        loadFile(indicator_file);
+    }
+
+    endVerify(dir.canonicalPath());
+}
+
+void IndicatorsManager::loadFile(const QFileInfo& file_info)
+{
+    QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
+    QString name = indicator_settings.value("Indicator Service/Name").toString();
+
+    auto iter = m_indicatorsData.find(name);
+    if (iter != m_indicatorsData.end())
+    {
+        QString newFileInfoDir = QDir::cleanPath(file_info.canonicalPath());
+        IndicatorData* currentData = (*iter);
+        currentData->m_verified = true;
+
+        int file_info_location = -1;
+        int current_data_location = -1;
+
+        QString currentDataDir = QDir::cleanPath(currentData->m_fileInfo.canonicalPath());
+
+        // if we've already got this indicator, we need to make sure we're not overwriting data which is
+        // from a lower priority standard path
+        QStringList xdgLocations = shellDataDirs();
+        for (int i = 0; i < xdgLocations.size(); i++)
+        {
+            QString indicatorDir = QDir::cleanPath(xdgLocations[i] + "/unity/indicators");
+
+            if (newFileInfoDir == indicatorDir)
+            {
+                file_info_location = i;
+            }
+            if (currentDataDir == indicatorDir)
+            {
+                current_data_location = i;
+            }
+
+            if (file_info_location != -1 && current_data_location != -1)
+            {
+                break;
+            }
+        }
+
+        // file location is higher (or of equal) priority. overwrite.
+        if (file_info_location <= current_data_location &&
+            file_info != currentData->m_fileInfo)
+        {
+            currentData->m_fileInfo = file_info;
+            Q_EMIT indicatorLoaded(name);
+        }
+    }
+    else
+    {
+        IndicatorData* data = new IndicatorData(name, file_info);
+        data->m_verified = true;
+        m_indicatorsData[name]= data;
+        Q_EMIT indicatorLoaded(name);
+    }
+}
+
+void IndicatorsManager::unload()
+{
+    QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
+    while(iter.hasNext())
+    {
+        iter.next();
+        Q_EMIT indicatorAboutToBeUnloaded(iter.key());
+    }
+
+    qDeleteAll(m_indicatorsData);
+    m_indicatorsData.clear();
+
+    setLoaded(false);
+}
+
+void IndicatorsManager::unloadFile(const QFileInfo& file)
+{
+    QMutableHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
+    while(iter.hasNext())
+    {
+        iter.next();
+        IndicatorData* data = iter.value();
+        if (data->m_fileInfo.absoluteFilePath() == file.absoluteFilePath())
+        {
+            if (!data->m_verified)
+            {
+                QString name = data->m_name;
+                Q_EMIT indicatorAboutToBeUnloaded(name);
+
+                delete data;
+                iter.remove();
+            }
+        }
+    }
+
+    setLoaded(m_indicatorsData.size() > 0);
+}
+
+void IndicatorsManager::setLoaded(bool loaded)
+{
+    if (loaded != m_loaded)
+    {
+        m_loaded = loaded;
+        Q_EMIT loadedChanged(m_loaded);
+    }
+}
+
+void IndicatorsManager::startVerify(const QString& path)
+{
+    QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
+    while(iter.hasNext())
+    {
+        iter.next();
+        IndicatorData* data = iter.value();
+        if (data->m_fileInfo.canonicalPath() == path)
+        {
+           data->m_verified = false;
+        }
+    }
+}
+
+void IndicatorsManager::endVerify(const QString& path)
+{
+    QMutableHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
+    while(iter.hasNext())
+    {
+        iter.next();
+        IndicatorData* data = iter.value();
+        if (data->m_fileInfo.canonicalPath() == path)
+        {
+            if (!data->m_verified)
+            {
+                QString name = data->m_name;
+                Q_EMIT indicatorAboutToBeUnloaded(name);
+
+                delete data;
+                iter.remove();
+            }
+        }
+    }
+}
+
+Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
+{
+    if (!m_indicatorsData.contains(indicator_name))
+    {
+        qWarning() << Q_FUNC_INFO << "Invalid indicator name: " <<  indicator_name;
+        return Indicator::Ptr();
+    }
+
+    IndicatorData *data = m_indicatorsData[indicator_name];
+    if (data->m_indicator)
+    {
+        return data->m_indicator;
+    }
+
+    Indicator::Ptr new_indicator(new Indicator(this));
+    data->m_indicator = new_indicator;
+    QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);
+    new_indicator->init(data->m_fileInfo.fileName(), settings);
+    return new_indicator;
+}
+
+QList<Indicator::Ptr> IndicatorsManager::indicators()
+{
+    QList<Indicator::Ptr> list;
+    Q_FOREACH(IndicatorData* data, m_indicatorsData)
+    {
+        Indicator::Ptr ret = indicator(data->m_name);
+        if (ret)
+            list.append(ret);
+    }
+    return list;
+}
+
+bool IndicatorsManager::isLoaded() const
+{
+    return m_loaded;
+}

=== added file 'plugins/Unity/Indicators/indicatorsmanager.h'
--- plugins/Unity/Indicators/indicatorsmanager.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.h	2013-07-11 14:53:26 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Nick Dedekind <[e-mail]>
+ */
+
+#ifndef INDICATORS_MANAGER_H
+#define INDICATORS_MANAGER_H
+
+#include <QObject>
+#include <QFileSystemWatcher>
+#include <QDir>
+#include <QHash>
+#include <QSharedPointer>
+
+#include "indicator.h"
+
+class IndicatorsManager : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)
+public:
+    explicit IndicatorsManager(QObject* parent = 0);
+    ~IndicatorsManager();
+
+    Q_INVOKABLE void load();
+    Q_INVOKABLE void unload();
+
+    Indicator::Ptr indicator(const QString& indicator_name);
+
+    QList<Indicator::Ptr> indicators();
+
+    bool isLoaded() const;
+
+Q_SIGNALS:
+    void loadedChanged(bool);
+
+    void indicatorLoaded(const QString& indicator_name);
+    void indicatorAboutToBeUnloaded(const QString& indicator_name);
+
+private Q_SLOTS:
+    void onDirectoryChanged(const QString& directory);
+    void onFileChanged(const QString& file);
+
+private:
+    void loadDir(const QDir& dir);
+    void loadFile(const QFileInfo& file);
+    void unloadFile(const QFileInfo& dir);
+
+    void startVerify(const QString& path);
+    void endVerify(const QString& path);
+
+    void setLoaded(bool);
+
+    class IndicatorData;
+    QHash<QString, IndicatorData*> m_indicatorsData;
+    QSharedPointer<QFileSystemWatcher> m_fsWatcher;
+    bool m_loaded;
+};
+
+#endif // INDICATORS_MANAGER_H

=== added file 'plugins/Unity/Indicators/indicatorsmodel.cpp'
--- plugins/Unity/Indicators/indicatorsmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Indicators/indicatorsmodel.cpp	2013-07-11 14:53:26 +0000
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2012 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 <[e-mail]>
+ */
+
+#include "indicatorsmodel.h"
+#include "indicatorsmanager.h"
+#include "indicator.h"
+#include "indicators.h"
+#include "paths.h"
+
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QDebug>
+
+/*!
+    \qmltype IndicatorsModel
+    \inherits QAbstractListModel
+
+    \brief The IndicatorsModel class defines the list model for indicators
+
+    \b {This component is under heavy development.}
+
+    This class expose the available indicators.
+
+    \code
+    IndicatorsModel {
+        id: menuModel
+    }
+
+    ListView {
+        id: view
+        model: menuModel
+        Component.onCompleted: menuModel.load()
+    }
+    \endcode
+*/
+IndicatorsModel::IndicatorsModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+    m_manager = new IndicatorsManager(this);
+    QObject::connect(m_manager, SIGNAL(indicatorLoaded(const QString&)), this, SLOT(onIndicatorLoaded(const QString&)));
+    QObject::connect(m_manager, SIGNAL(indicatorAboutToBeUnloaded(const QString&)), this, SLOT(onIndicatorAboutToBeUnloaded(const QString&)));
+
+    QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
+    QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
+    QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));
+}
+
+/*! \internal */
+IndicatorsModel::~IndicatorsModel()
+{
+    disconnect(m_manager, 0, 0, 0);
+    m_manager->deleteLater();
+}
+
+/*!
+    \qmlproperty IndicatorsModel::count
+    The number of data entries in the model.
+
+    \b Note: methods should only be called after the Component has completed.
+*/
+int IndicatorsModel::count() const
+{
+    return rowCount();
+}
+
+/*!
+    \qmlmethod IndicatorsModel::unload()
+
+    Load all indicators.
+*/
+void IndicatorsModel::load()
+{
+    m_indicators.clear();
+    m_manager->load();
+}
+
+/*!
+    \qmlmethod IndicatorsModel::unload()
+
+    Unload all indicators.
+*/
+void IndicatorsModel::unload()
+{
+    m_manager->unload();
+}
+
+/*! \internal */
+void IndicatorsModel::onIndicatorLoaded(const QString& indicator_name)
+{
+    Indicator::Ptr indicator = m_manager->indicator(indicator_name);
+    if (!indicator)
+    {
+        return;
+    }
+
+    if (m_indicators.indexOf(indicator) >= 0)
+    {
+        return;
+    }
+
+    // find the insert position
+    int pos = 0;
+    while (pos < count())
+    {
+        // keep going while the existing priority is less.
+        if (indicatorData(indicator, IndicatorsModelRole::Priority).toInt() < data(index(pos), IndicatorsModelRole::Priority).toInt())
+            break;
+        pos++;
+    }
+
+    QObject::connect(indicator.data(), SIGNAL(identifierChanged(const QString&)), this, SLOT(onIdentifierChanged()));
+    QObject::connect(indicator.data(), SIGNAL(indicatorPropertiesChanged(const QVariant&)), this, SLOT(onIndicatorPropertiesChanged()));
+
+    beginInsertRows(QModelIndex(), pos, pos);
+
+    m_indicators.insert(pos, indicator);
+    endInsertRows();
+}
+
+/*! \internal */
+void IndicatorsModel::onIndicatorAboutToBeUnloaded(const QString& indicator_name)
+{
+    Indicator::Ptr indicator = m_manager->indicator(indicator_name);
+    if (!indicator)
+    {
+        return;
+    }
+
+    int i = 0;
+    QMutableListIterator<Indicator::Ptr> iter(m_indicators);
+    while(iter.hasNext())
+    {
+        if (indicator == iter.next())
+        {
+            beginRemoveRows(QModelIndex(), i, i);
+            iter.remove();
+            endRemoveRows();
+            break;
+        }
+        i++;
+    }
+
+}
+
+/*! \internal */
+void IndicatorsModel::onIdentifierChanged()
+{
+    notifyDataChanged(QObject::sender(), IndicatorsModelRole::Identifier);
+}
+
+/*! \internal */
+void IndicatorsModel::onIndicatorPropertiesChanged()
+{
+    notifyDataChanged(QObject::sender(), IndicatorsModelRole::IndicatorProperties);
+}
+
+/*! \internal */
+void IndicatorsModel::notifyDataChanged(QObject *sender, int role)
+{
+    Indicator* indicator = qobject_cast<Indicator*>(sender);
+    if (!indicator)
+    {
+        return;
+    }
+
+    int index = 0;
+    QMutableListIterator<Indicator::Ptr> iter(m_indicators);
+    while(iter.hasNext())
+    {
+        if (indicator == iter.next())
+        {
+            QModelIndex changedIndex = this->index(index);
+            dataChanged(changedIndex, changedIndex, QVector<int>() << role);
+            break;
+        }
+        index++;
+    }
+}
+
+/*! \internal */
+QHash<int, QByteArray> IndicatorsModel::roleNames() const
+{
+    static QHash<int, QByteArray> roles;
+    if (roles.isEmpty())
+    {
+        roles[IndicatorsModelRole::Identifier] = "identifier";
+        roles[IndicatorsModelRole::Priority] = "priority";
+        roles[IndicatorsModelRole::Title] = "title";
+        roles[IndicatorsModelRole::Description] = "description";
+        roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
+        roles[IndicatorsModelRole::PageSource] = "pageSource";
+        roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
+        roles[IndicatorsModelRole::IsValid] = "isValid";
+    }
+    return roles;
+}
+
+/*! \internal */
+int IndicatorsModel::columnCount(const QModelIndex &) const
+{
+    return 1;
+}
+
+/*! \internal */
+QVariant IndicatorsModel::defaultData(Indicator::Ptr indicator, int role)
+{
+    switch (role)
+    {
+        case IndicatorsModelRole::Priority:
+            return 0;
+        case IndicatorsModelRole::Title:
+            return indicator ? indicator->identifier() : "Unknown";
+        case IndicatorsModelRole::Description:
+            return "";
+        case IndicatorsModelRole::WidgetSource:
+            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
+        case IndicatorsModelRole::PageSource:
+            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";
+    }
+    return QVariant();
+}
+
+Q_INVOKABLE QVariant IndicatorsModel::data(int row, int role) const
+{
+    return data(index(row, 0), role);
+}
+
+/*! \internal */
+QVariant IndicatorsModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() >= m_indicators.size())
+        return QVariant();
+
+    Indicator::Ptr indicator = m_indicators[index.row()];
+
+    switch (role)
+    {
+        case IndicatorsModelRole::Identifier:
+            if (indicator)
+            {
+                return QVariant(indicator->identifier());
+            }
+            break;
+        case IndicatorsModelRole::IndicatorProperties:
+            if (indicator)
+            {
+                return QVariant(indicator->indicatorProperties());
+            }
+            break;
+        case IndicatorsModelRole::IsValid:
+            return (indicator ? true : false);
+        case IndicatorsModelRole::Priority:
+        case IndicatorsModelRole::Title:
+        case IndicatorsModelRole::Description:
+        case IndicatorsModelRole::WidgetSource:
+        case IndicatorsModelRole::PageSource:
+            return indicatorData(indicator, role);
+        default:
+            break;
+    }
+    return QVariant();
+}
+
+QVariant IndicatorsModel::indicatorData(const Indicator::Ptr& indicator, int role) const
+{
+    if (indicator && m_parsed_indicator_data.contains(indicator->identifier()))
+    {
+        QVariantMap data = m_parsed_indicator_data[indicator->identifier()];
+        return data.value(roleNames()[role], QVariant());
+    }
+    return defaultData(indicator, role);
+}
+
+/*! \internal */
+QModelIndex IndicatorsModel::parent(const QModelIndex&) const
+{
+    return QModelIndex();
+}
+
+/*! \internal */
+int IndicatorsModel::rowCount(const QModelIndex&) const
+{
+    return m_indicators.count();
+}
+
+void IndicatorsModel::setIndicatorData(const QVariant& data)
+{
+    m_indicator_data = data;
+
+    m_parsed_indicator_data.clear();
+    QMap<QString, QVariant> map = data.toMap();
+    QMapIterator<QString, QVariant> iter(map);
+    while(iter.hasNext())
+    {
+        iter.next();
+        m_parsed_indicator_data[iter.key()] = iter.value().toMap();
+    }
+
+    Q_EMIT indicatorDataChanged(m_indicator_data);
+}
+
+QVariant IndicatorsModel::indicatorData() const
+{
+    return m_indicator_data;
+}