Merge lp:~nick-dedekind/unity8/indicator-polishing into lp:unity8

[Nick Dedekind]

Visual changes for indicator RTM polishing

Visual changes for indicator RTM polishing sprint

https://docs.google.com/a/canonical.com/document/d/1KC40suUs13gajIlE1Ms6PJYoIPx_AjlF4ae6bvtNjNc/edit

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~nick-dedekind/ubuntu-settings-components/indicator-polishing/+merge/229083

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

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

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

 * If you changed the UI, has there been a design review?
Yes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1074
http://jenkins.qa.ubuntu.com/job/unity8-ci/3665/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2672/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/667/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/759/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/759/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/759/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3915/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Panel/Indicators.qml
1 conflicts encountered.

review: Needs Fixing

[lp:~nick-dedekind/unity8/indicator-polishing]

1079. By Nick Dedekind on 2014-07-31

added copywrite

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1079
http://jenkins.qa.ubuntu.com/job/unity8-ci/3712/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2849/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/714/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/806/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/806/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/806/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4092/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Panel/Indicators/DefaultIndicatorPage.qml
1 conflicts encountered.

review: Needs Fixing

[lp:~nick-dedekind/unity8/indicator-polishing]

1080. By Nick Dedekind on 2014-08-01

Added default Header Components. Used in indicators.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1080
http://jenkins.qa.ubuntu.com/job/unity8-ci/3738/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2921/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/740/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/832/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/832/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/832/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4164/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Panel/Indicators/DefaultIndicatorPage.qml
1 conflicts encountered.

review: Needs Fixing

[Michał Sawicz (saviq)]

Add i18n.tr to the "Clear" button in RemoveBackground.qml please.

review: Needs Fixing

[Michał Sawicz (saviq)]

Please delete tag 7.85+14.10.20140428.2-0ubuntu1 in this branch and any local checkouts you might have.

Also:
 Text conflict in qml/Panel/Indicators/DefaultIndicatorPage.qml

review: Needs Fixing

[lp:~nick-dedekind/unity8/indicator-polishing]

1081. By Nick Dedekind on 2014-08-12

merged with trunk

[Nick Dedekind (nick-dedekind)]

> Please delete tag 7.85+14.10.20140428.2-0ubuntu1 in this branch and any local
> checkouts you might have.
>
> Also:
> Text conflict in qml/Panel/Indicators/DefaultIndicatorPage.qml

Done.

[lp:~nick-dedekind/unity8/indicator-polishing]

1082. By Nick Dedekind on 2014-08-12

removed RemoveBackground

[Nick Dedekind (nick-dedekind)]

> Add i18n.tr to the "Clear" button in RemoveBackground.qml please.

No longer used.
Removed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1082
http://jenkins.qa.ubuntu.com/job/unity8-ci/3874/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/874/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/968/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/968/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/968/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4672/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

[lp:~nick-dedekind/unity8/indicator-polishing]

1083. By Nick Dedekind on 2014-08-19

rebased

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1083
http://jenkins.qa.ubuntu.com/job/unity8-ci/4018/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3750/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1019/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4997/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Merges fine

review: Abstain

[Albert Astals Cid (aacid)]

relativetimeformatter.cpp looks like copied from somewhere else :/

The pot needs updating

Also the comments for translators in relativetimeformatter.cpp don't make it to the .po file.

Since it seems relativetimeformatter.cpp is copied from indicator-datetime, maybe we want to use dgettext instead of gettext? This way we don't need to update the .pot and we get exactly the same translation as indicator-datetime has. (As long as the copied code is in sync)

Maybe you want to add a // TODO make sure we keep this in sync with indicator-datetime code?

review: Needs Fixing

[Michał Sawicz (saviq)]

> Since it seems relativetimeformatter.cpp is copied from indicator-datetime,
> maybe we want to use dgettext instead of gettext? This way we don't need to
> update the .pot and we get exactly the same translation as indicator-datetime
> has. (As long as the copied code is in sync)
>
> Maybe you want to add a // TODO make sure we keep this in sync with indicator-
> datetime code?

Yeah agreed we should just use indicator's domain here. And then there's:
https://blueprints.launchpad.net/ubuntu-ui-toolkit/+spec/time-formatter

But obviously dead for over half a year now.

[lp:~nick-dedekind/unity8/indicator-polishing]

1084. By Nick Dedekind on 2014-09-02

merged with trunk

1085. By Nick Dedekind on 2014-09-03

Fixed up relative time formatting & tests

1086. By Nick Dedekind on 2014-09-03

updated pot

1087. By Nick Dedekind on 2014-09-03

fixed/added comment

1088. By Nick Dedekind on 2014-09-03

fixed/added comment

[Nick Dedekind (nick-dedekind)]

> relativetimeformatter.cpp looks like copied from somewhere else :/

Yeah, from indicator-datetime.
Shouldn't really be there anyway. We should get the raw time and format it how we want in the shell. These time components should probably be in the sdk.

>
> The pot needs updating

Done.

>
> Also the comments for translators in relativetimeformatter.cpp don't make it
> to the .po file.

No idea how to do this.

>
> Since it seems relativetimeformatter.cpp is copied from indicator-datetime,
> maybe we want to use dgettext instead of gettext? This way we don't need to
> update the .pot and we get exactly the same translation as indicator-datetime
> has. (As long as the copied code is in sync)

Done.

>
> Maybe you want to add a // TODO make sure we keep this in sync with indicator-
> datetime code?

Done.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1085
http://jenkins.qa.ubuntu.com/job/unity8-ci/4216/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4386/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1217/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1310/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1310/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5638/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Something is weird, if we're using dgettext("indicator-datetime", ); we should not have the messages in our .pot file since the whole intent of that is to reuse the translations in indicator-datetime and not make our translators do the work twice (with the potential for mismatches).

Seems that the way to trick gettexxt into not extracting those strings is adding an intermediate function? http://stackoverflow.com/questions/3341829/can-xgettext-be-used-to-extract-specific-domain-strings-only/5354360#5354360

review: Needs Fixing

[Albert Astals Cid (aacid)]

I've been told to abstain

review: Abstain

[lp:~nick-dedekind/unity8/indicator-polishing]

1089. By Nick Dedekind on 2014-09-03

use dgettext

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1085
http://jenkins.qa.ubuntu.com/job/unity8-ci/4217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4390/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1218/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1311/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1311/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5642/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1089
http://jenkins.qa.ubuntu.com/job/unity8-ci/4221/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4401/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5653/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

review: Abstain

[Andrea Cimitan (cimi)]

I see some delay in the notification center...
you receive a message, open the notification center immediately -> empty -> 1 second wait -> message appears.

[Nick Dedekind (nick-dedekind)]

> I see some delay in the notification center...
> you receive a message, open the notification center immediately -> empty -> 1
> second wait -> message appears.

That's because the model takes a bit of time to connect and populate. It's always been like that as far as I know.

[Nick Dedekind (nick-dedekind)]

> > I see some delay in the notification center...
> > you receive a message, open the notification center immediately -> empty ->
> 1
> > second wait -> message appears.
>
> That's because the model takes a bit of time to connect and populate. It's
> always been like that as far as I know.

Actually, it's because the model is now asynchronous.
We stop registering for changes to the indicators after a while of them being closed, and when we re-open, all the menus get added. And since they're now async, the model takes it's time...

[lp:~nick-dedekind/unity8/indicator-polishing]

1090. By Nick Dedekind on 2014-09-09

Simplified MessageMenuItemFactory

1091. By Nick Dedekind on 2014-09-09

updated for changes to ListItem.Empty

1092. By Nick Dedekind on 2014-09-09

removed content activator

1093. By Nick Dedekind on 2014-09-09

test fixes for removal of content activator

1094. By Nick Dedekind on 2014-09-09

confirm removal for message items

1095. By Nick Dedekind on 2014-09-09

tweak delegate caching

1096. By Nick Dedekind on 2014-09-11

added fix for current indicator item

1097. By Nick Dedekind on 2014-09-11

removed USC.IconVisual

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1097
http://jenkins.qa.ubuntu.com/job/unity8-ci/4280/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4732/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1281/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5984/console

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

I've changed it so that the indicators are always in sync. But there are only x number of delegates loaded at a time. This should restrict the indicators memory consumption if the notifications/transfers get "out of hand".

[lp:~nick-dedekind/unity8/indicator-polishing]

1098. By Nick Dedekind on 2014-09-12

fixed test for dd day in LC_ALL=C

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1098
http://jenkins.qa.ubuntu.com/job/unity8-ci/4289/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4764/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1290/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6016/console

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

review: Needs Fixing (continuous-integration)

[Omer Akram (om26er)]

Can you merge trunk, perhaps ?

[Nick Dedekind (nick-dedekind)]

> Can you merge trunk, perhaps ?

It's failing due to dependence o a pre-requisite branch.

[kevin gunn (kgunn72)]

what's the pre-req ?

[Albert Astals Cid (aacid)]

@Kevin: It's listed in the description

[Andrea Cimitan (cimi)]

More to come (changing computer)

[Andrea Cimitan (cimi)]

Shall we update pot files again?

More maybe to come tomorrow, comments in diff

Also, shall we put the highlightWhenPressed: false as default at this point? (is everywhere)

I have to dig into the clip: true we have on some listViews, not sure they are always required

review: Needs Fixing

[Albert Astals Cid (aacid)]

Text conflict in po/unity8.pot
Text conflict in tests/plugins/Utils/CMakeLists.txt
2 conflicts encountered.

[lp:~nick-dedekind/unity8/indicator-polishing]

1099. By Nick Dedekind on 2014-09-15

merged with trunk

1100. By Nick Dedekind on 2014-09-19

more review comments

1101. By Nick Dedekind on 2014-09-19

merged with trunk

1102. By Nick Dedekind on 2014-09-19

update pot

[Nick Dedekind (nick-dedekind)]

Fixed all review coments

> Shall we update pot files again?

Done

>
> More maybe to come tomorrow, comments in diff
>
> Also, shall we put the highlightWhenPressed: false as default at this point?
> (is everywhere)

It's from SDK, dont want to default in USC because it's used by settings now so may break.

>
> I have to dig into the clip: true we have on some listViews, not sure they are
> always required

We have to clip the indicators. Tablet mode requires it since it's in the sidebar.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1102
http://jenkins.qa.ubuntu.com/job/unity8-ci/4357/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5005/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6257/console

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

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/indicator-polishing]

1103. By Nick Dedekind on 2014-09-22

merged with LC_ALL fix

1104. By Nick Dedekind on 2014-09-22

LC_ALL=C.UTF-8 again

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1104
http://jenkins.qa.ubuntu.com/job/unity8-ci/4363/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5043/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1457
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4793/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6295
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6295/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13530

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

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/indicator-polishing]

1105. By Nick Dedekind on 2014-09-22

fixed up defaults for media player menu

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1105
http://jenkins.qa.ubuntu.com/job/unity8-ci/4369/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5064/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1463
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4812/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6316
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6316/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13553

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

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/indicator-polishing]

1106. By Nick Dedekind on 2014-09-24

MediaPlayerMenu.running -> showTrack

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1106
http://jenkins.qa.ubuntu.com/job/unity8-ci/4390/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5132/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1484
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4876/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6384
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6384/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13653

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
No, but silo did

review: Approve

[lp:~nick-dedekind/unity8/indicator-polishing]

1107. By Nick Dedekind on 2014-09-25

merged with trunk

=== modified file 'debian/control'
--- debian/control	2014-09-18 19:33:04 +0000
+++ debian/control	2014-09-25 12:44:25 +0000
@@ -44,7 +44,7 @@
                qtdeclarative5-dev-tools,
                qtdeclarative5-private-dev (>= 5.2.1),
                qtdeclarative5-qtmultimedia-plugin,
-               qtdeclarative5-ubuntu-settings-components (>= 0.3),
+               qtdeclarative5-ubuntu-settings-components (>= 0.4),
                qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
                ttf-ubuntu-font-family,
 Standards-Version: 3.9.4
@@ -107,7 +107,7 @@
 Package: unity8-common
 Architecture: all
 Depends: qml-module-qtquick-layouts,
-         qtdeclarative5-ubuntu-settings-components (>= 0.3),
+         qtdeclarative5-ubuntu-settings-components (>= 0.4),
          qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
--- plugins/Unity/Indicators/CMakeLists.txt	2014-06-26 10:00:41 +0000
+++ plugins/Unity/Indicators/CMakeLists.txt	2014-09-25 12:44:25 +0000
@@ -30,16 +30,7 @@
 )
 add_definitions(-DUNITYINDICATORS_LIBRARY)
 
-set(IndicatorsQML_RESOURCES
-    resources/indicators.qrc
-)
-
-qt5_add_resources(IndicatorsQML_RESOURCES_RCC
-    ${IndicatorsQML_RESOURCES}
-)
-
 add_library(IndicatorsQml SHARED
-    ${IndicatorsQML_RESOURCES_RCC}
     ${IndicatorsQML_SOURCES}
 )
 

=== modified file 'plugins/Unity/Indicators/plugin.cpp'
--- plugins/Unity/Indicators/plugin.cpp	2013-10-23 14:22:27 +0000
+++ plugins/Unity/Indicators/plugin.cpp	2014-09-25 12:44:25 +0000
@@ -42,8 +42,6 @@
 
 void Indicators2Plugin::registerTypes(const char *uri)
 {
-    Q_INIT_RESOURCE(indicators);
-
     qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
     qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
     qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

=== removed directory 'plugins/Unity/Indicators/resources'
=== removed directory 'plugins/Unity/Indicators/resources/artwork'
=== removed directory 'plugins/Unity/Indicators/resources/artwork/messaging'
=== removed file 'plugins/Unity/Indicators/resources/artwork/messaging/default_app.svg'
--- plugins/Unity/Indicators/resources/artwork/messaging/default_app.svg	2013-06-07 12:51:15 +0000
+++ plugins/Unity/Indicators/resources/artwork/messaging/default_app.svg	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg15137" xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs id="defs15139">
-  <radialGradient id="radialGradient2612" gradientUnits="userSpaceOnUse" cy="4.625" cx="62.625" gradientTransform="matrix(1 0 0 .34118 0 3.0471)" r="10.625">
-   <stop id="stop8840" offset="0"/>
-   <stop id="stop8842" style="stop-opacity:0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="linearGradient15133" y2=".24326" gradientUnits="userSpaceOnUse" x2="62.2" gradientTransform="matrix(2.1499 0 0 2.1499 -110.12 31.935)" y1="-12.489" x1="62.2">
-   <stop id="stop4875" style="stop-color:#fff" offset="0"/>
-   <stop id="stop4877" style="stop-color:#fff;stop-opacity:0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="radialGradient15127" gradientUnits="userSpaceOnUse" cy="-8.7256" cx="62.2" gradientTransform="matrix(2.4129 0 0 2.413 -126.48 34.231)" r="9.7553">
-   <stop id="stop8649" style="stop-color:#8fb1dc" offset="0"/>
-   <stop id="stop8651" style="stop-color:#3465a4" offset="1"/>
-  </radialGradient>
-  <radialGradient id="radialGradient2418" gradientUnits="userSpaceOnUse" cy="24.149" cx="17.814" gradientTransform="matrix(-2.644 0 2.9365e-8 2.5344 78.725 -37.986)" r="9.125">
-   <stop id="stop4847" style="stop-color:#fff" offset="0"/>
-   <stop id="stop4849" style="stop-color:#b6b6b6" offset="1"/>
-  </radialGradient>
-  <radialGradient id="radialGradient5145" gradientUnits="userSpaceOnUse" cy="13.067" cx="23.86" gradientTransform="matrix(-1.5425 0 0 -.84553 60.718 23.829)" r="18.098">
-   <stop id="stop14112" style="stop-color:#557695" offset="0"/>
-   <stop id="stop14114" style="stop-color:#15395c" offset="1"/>
-  </radialGradient>
-  <radialGradient id="radialGradient5147" gradientUnits="userSpaceOnUse" cy="-3.442" cx="62.225" gradientTransform="matrix(1.1035 0 0 1.0265 -4.1555 -1.8158)" r="10.081">
-   <stop id="stop14118" style="stop-color:#9e9e9e" offset="0"/>
-   <stop id="stop14120" style="stop-color:#9e9e9e;stop-opacity:0" offset="1"/>
-  </radialGradient>
- </defs>
- <g id="layer1">
-  <path id="path8836" style="opacity:.4;fill-rule:evenodd;fill:url(#radialGradient2612)" d="m73.25 4.625a10.625 3.625 0 1 1 -21.25 0 10.625 3.625 0 1 1 21.25 0z" transform="matrix(2.1647 0 0 2.5637 -111.56 26.85)"/>
-  <g id="g15122" transform="translate(.79042 -.78563)">
-   <path id="path6495" style="stroke:#204a87;fill:url(#radialGradient15127)" d="m43.505 24.387c0 10.99-8.9091 19.899-19.897 19.899-10.989 0-19.898-8.9091-19.898-19.899 0-10.989 8.9086-19.897 19.898-19.897 10.988 0 19.897 8.9081 19.897 19.897z"/>
-   <path id="path6534" style="stroke:url(#radialGradient5147);stroke-width:1.1035;fill:url(#radialGradient5145)" d="m23.726 5.3141c-1.5283 0.12067-3.0328 0.36544-4.4919 0.84567-1.23 0.48843 0.88689-0.42988-0.37486-0.60468-0.75942-0.12994-1.0776 0.65251-1.7561 0.67046-0.7741 0.023841-1.3048 0.71572-2.0319 0.79898-0.26187 1.4432-0.59924-0.56894-0.83949 0.13173 0.19047 0.7212-0.07796 1.1928-0.63582 1.6119-0.60156 0.68249-0.03584 1.2934 0.54212 0.69395 0.2775-0.83446 1.1825-1.7618 2.0655-1.2049 0.8837 0.48448 1.7582 1.6525 2.4938 0.40935-0.75488-0.090735-1.0462-0.73637-1.4079-1.2096-0.40023 0.031761-2.0794-0.32019-1.0059-0.24024 0.5284-0.17249 1.549-0.68558 1.9239-0.66537-0.94013 0.49026 0.35015 0.81268 0.73202 1.2035 0.68671 0.20357 0.99776 1.0757 0.37414 1.527-0.80181 0.4162 0.05573 1.1017 0.221 1.6748 0.12828 0.99827 0.99623 0.43282 1.2716-0.18046 0.39803-1.1153 1.6733-1.0767 2.5958-1.5522 1.008-0.51754 1.0248-0.53575 1.5034 0.20195 0.36764 0.21151 1.5947-0.55825 0.78901-0.929-0.68957 0.03713-1.142 0.46029-0.56364-0.60801 0.13915-0.57404 0.6791-1.3235 0.58092-1.7937-0.662-0.2603-1.324-0.5207-1.986-0.7811zm-9.3732 3.6945c0.35612 0.3643 1.5564 1.0234 1.4368 0.11255-0.14419-0.61744-1.0418-0.62308-1.4368-0.11255zm18.165-0.44471c-0.82412 0.16922-1.6412 0.35467-2.292 0.92363 0.19457 0.7853-0.8341 0.89786-1.2851 1.3281-0.12036 0.25242-0.02467 1.8403 0.51105 1.1573 0.58162-0.77246 0.83368 0.40868 1.4478 0.52687 0.4451-0.14324 0.5002-1.1438 0.33275-1.6043 0.28525-0.46984 0.75058-1.1195 1.3539-1.0659-0.37419 0.57099-0.80163 2.0315 0.3911 1.4345 0.34518-0.006-0.93958 0.75452-1.0166 1.273-0.48258 0.51284-0.9934 0.90587-1.6905 0.50847-0.33355-0.28162-0.50305-1.0992-0.71414-0.17566 0.43341 0.73252-1.089 0.04718-1.0514 1.0356-0.31972 0.61514-0.89623 0.8671-1.563 0.91149 0.24198 0.19141 1.1924 1.3314 0.24953 1.1701-0.60352 0.06628-1.4857 0.40701-1.2414 1.1653-0.27486 0.9444 0.4249 0.70654 0.85522 1.2977 0.70116-0.19916 1.1488-0.62908 1.2634-1.3621 0.65618-0.19273 0.73557-0.93195 1.456-0.91702 0.7182-0.40381 0.88559 0.73738 1.5587 0.82181 0.07058 0.4087-0.33464 1.281 0.45659 0.4693 0.76441-0.55387-0.79512-1.2716-0.30963-1.4066 0.69099 0.22071 0.94006 0.87671 1.051 1.519 0.56306 0.9634 0.70185 0.44404 0.74672-0.40362 0.87723-0.39439 1.1473 1.641 2.3881 1.1397 0.92678 0.19174 0.59949 0.8304-0.01904 1.2203-0.50066 0.47112-1.3382 0.17338-1.9265-0.01558-0.56472-0.27756-1.3196-0.24813-1.6214 0.38347-0.46529-0.21764-0.94642-0.91135-1.4178-1.3118-1.1647-0.5139-2.4314-0.07571-3.5919 0.23946-0.99563 1.1632-2.1949 2.219-2.6236 3.7359-0.62778 0.63853 0.54336 1.0082-0.24392 1.556-0.6428 0.51279 0.10805 1.1629 0.2458 1.7527 0.60445 0.74395 1.6306 3.0723 2.5708 2.1452 0.52705-0.80245 0.81963 0.61582 1.4399-0.30194 0.4952-0.39949 0.9695 0.45802 1.6897 0.14331 0.69372 0.4284 0.56095 1.0433 0.27484 1.6928 0.15583 0.54087 0.93098 0.9344 0.62978 1.6677-0.27366 0.68309 0.58312 1.201 0.41038 1.7987-0.5748 1.1512-0.43928 2.5747 0.09386 3.7157 0.42668 1.0325 0.67699 2.1484 0.64366 3.2692 0.74277 0.2222 1.1367-0.72912 1.8776-0.51313 0.72333 0.09324 0.99191-0.82974 1.5008-1.2158 0.56704-0.46747-0.07223-1.1873 0.82794-1.5185 0.87331-0.42523-1.106-1.0213 0.0152-1.4024 0.46515-0.51761 1.4132-0.69776 1.6008-1.3735-0.33834-1.0398-0.21797-2.1801-0.16738-3.2436 0.32552-0.84167 0.72975-1.6312 1.4262-2.2272 0.28082-0.92669 0.94924-1.7777 0.88942-2.7709-1.6476 0.50399-1.1482-0.21491-0.22962-0.87318 0.63508-0.42199 1.4051-0.84564 1.7006-1.5617 0.14435-0.81048-0.45227-2.1297-1.0079-0.90496-0.24511-0.4707-1.1542-0.71744-1.113-1.3307-0.17659-1.2625 0.34462-0.14427 0.86051 0.10789 1.1146-0.60521 1.6818 1.7766 2.3893 0.35503-0.618-4.471-3.052-8.528-6.34-11.567-0.571-1.0949-0.921 0.75-1.501 0.68-0.464-0.485-1.33-1.1394-0.122-0.914 1.034-0.3028 0.333-0.7027-0.425-0.6842-0.574-0.0697-1.101-0.2706-1.635-0.4789zm-20.56 0.4447c-0.275 1.3534-2.0109 1.1954-2.6162 2.5304-2.9783 3.153-4.8166 7.302-5.32 11.598 0.26584 1.0071 1.1105 1.4908 1.9601 1.9373 0.72184 0.41932 1.7801 0.2342 2.1848 1.1124 0.45187 0.36983 0.93948 1.0997 1.5856 0.87722 0.93664-0.09099 0.36019 0.85823 0.19973 1.3392-0.059277 0.607-0.80778 0.99372-0.52016 1.5778-0.24136 0.66166-0.43304 1.3177 0.10262 1.8906 0.45551 0.83988 0.82632 1.7478 1.6708 2.2751 0.59217 0.49728 1.2625 1.1553 1.0304 1.9974-0.12338 0.68167 0.04306 1.3099 0.3725 1.908-0.11816 0.67146-0.36073 1.3584-0.4105 2.0183 0.87949 0.62206 2.6705 2.0606 2.8031 0.49489 0.50176-0.45161 0.5321-1.1784 1.3743-1.1804 0.3909-0.47777 0.52549-1.2283 0.81706-1.8117-0.42572-0.5384 0.16631-1.3697 0.8046-1.3477 0.81594 0.06128 0.78593-0.89448 1.1111-1.4232-0.0073-0.77224-0.38892-1.6471 0.30542-2.227 0.52242-0.47344 0.46827-1.1675 0.5498-1.8097-1.171-0.7244-2.712-1.0911-3.6386-2.0687-0.18364-0.76504-0.7598-1.0229-1.4925-1.0784-0.30936-0.43256-0.25697-1.4628-0.79753-1.5131-0.69628 0.13369-1.3857 0.24089-1.8917-0.3644-0.573-0.776-1.069 0.2-1.593 0.546-0.492 0.856-1.8683-0.043-1.7038-1.007 0.4839-1.334-1.6425 0.148-0.7699-1.425 0.4151-1.715-0.7067-0.396-1.2952-0.011-0.71822 0.0081-0.98953-0.70747-0.86146-1.3625-0.091117-0.78733 0.48283-1.1877 1.0669-1.5822 0.78161 0.12038 0.97989-0.56085 1.5654-0.4722 0.73603-0.03767 1.0049 0.66782 1.4232 1.1357 0.17514-0.66797-0.18345-1.6152 0.55606-1.9879 0.56414-0.42781 1.137-0.84927 1.2721-1.5904 0.13304-0.77598 1.2893-0.46761 1.4837-1.2526 0.26877-0.8206 1.5114-0.15823 1.7899-0.96804 0.8733-0.82086-0.27242-0.57178-0.89854-0.59806-1.2353 0.12695 0.1228-0.32763 0.58598-0.58155 0.68608 0.09073 1.3195-0.13384 1.9499-0.37629 0.08445 0.85843 0.24597 1.3112 0.68417 0.30788-0.85421-0.20211-0.11618-1.0402-0.95973-1.2614-0.66764 0.04697 0.0066-1.4189-0.81571-1.2577-1.0697 0.70782-0.11401-0.50251-0.9854-0.66347-0.68736-0.74222-0.85436 0.47657-1.2276 0.9183 0.24207 0.84702-0.79095 0.66525-0.97976 1.3606-0.41814 1.2534-0.24143-0.08931-0.74055-0.41035-0.61653-0.24732-1.3592-0.3784-1.3637-1.1899 0.82658-0.60512 2.0667-0.96189 2.5994-1.9148 0.3095-0.74008-0.26215-1.1445-0.96618-1.0889l-0.000005-2e-7zm14.675 1.642c-0.12491 0.65746 0.5475 1.009 0.30788 1.7104-0.21487 0.76842-0.27728 1.3789 0.68289 0.93046 0.99668-0.51183 0.36052-0.90148-0.03867-1.5728-0.27187-0.44613-0.24574-1.275-0.9521-1.0681zm-0.75259 1.0947c-0.79414-0.24012-0.61745 1.4493-0.12164 1.0118 0.7276-0.17916 0.23703-0.5252 0.12164-1.0118zm10.023 8.9969c0.95184 0.84444 1.277 2.0946 1.8858 3.1596 0.90428 0.39972 0.0415 1.0795 0.44521 1.5712 0.84897 0.92228-1.1752 0.24516-0.90606-0.67899-0.1971-1.2139-1.0559-2.044-1.4678-3.1045-0.04294-0.3526-0.38552-0.71788 0.04284-0.94732z"/>
-   <path id="path8655" style="opacity:.4;stroke:url(#linearGradient15133);fill:none" d="m42.409 24.387c0 10.384-8.4184 18.803-18.801 18.803-10.384 0-18.802-8.4184-18.802-18.803 0-10.384 8.418-18.801 18.802-18.801 10.383 0 18.801 8.4175 18.801 18.801z"/>
-  </g>
-  <g id="g2414" transform="matrix(.99991 -.013701 .013701 .99991 -.28870 .53585)">
-   <path id="path3970" style="stroke-linejoin:round;fill-rule:evenodd;stroke:#666;fill:url(#radialGradient2418)" d="m30.5 20.937 17 16.5-7.75 0.25s3.25 6.75 3.25 6.75c1 3-3.5 4.125-4.25 1.875l-3-6.75-5.5 5.875 0.25-24.5z"/>
-   <path id="path4853" style="opacity:.4;stroke:#fff;fill:none" d="m31.657 23.379 13.476 13.186-6.9219 0.27746l3.8721 7.7566c0.40273 1.6501-2.0283 2.4126-2.5071 1.1529l-3.6831-7.845-4.4247 4.7083 0.18907-19.236z"/>
-  </g>
- </g>
-</svg>

=== removed file 'plugins/Unity/Indicators/resources/artwork/messaging/default_contact.png'
Binary files plugins/Unity/Indicators/resources/artwork/messaging/default_contact.png	2013-06-07 12:51:15 +0000 and plugins/Unity/Indicators/resources/artwork/messaging/default_contact.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'plugins/Unity/Indicators/resources/indicators.qrc'
--- plugins/Unity/Indicators/resources/indicators.qrc	2013-12-13 15:11:30 +0000
+++ plugins/Unity/Indicators/resources/indicators.qrc	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/indicators">
-        <file>artwork/messaging/default_contact.png</file>
-        <file>artwork/messaging/default_app.svg</file>
-    </qresource>
-</RCC>

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2014-07-17 17:10:05 +0000
+++ plugins/Utils/CMakeLists.txt	2014-09-25 12:44:25 +0000
@@ -13,6 +13,7 @@
 set(QMLPLUGIN_SRC
     qlimitproxymodelqml.cpp
     qsortfilterproxymodelqml.cpp
+    relativetimeformatter.cpp
     timeformatter.cpp
     unitymenumodelpaths.cpp
     windowkeysfilter.cpp

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2014-07-17 17:10:05 +0000
+++ plugins/Utils/plugin.cpp	2014-09-25 12:44:25 +0000
@@ -28,6 +28,7 @@
 // local
 #include "qlimitproxymodelqml.h"
 #include "qsortfilterproxymodelqml.h"
+#include "relativetimeformatter.h"
 #include "timeformatter.h"
 #include "unitymenumodelpaths.h"
 #include "windowkeysfilter.h"
@@ -44,6 +45,7 @@
     qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
     qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
     qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
+    qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");
 }
 
 void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== added file 'plugins/Utils/relativetimeformatter.cpp'
--- plugins/Utils/relativetimeformatter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/relativetimeformatter.cpp	2014-09-25 12:44:25 +0000
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Local
+#include "relativetimeformatter.h"
+
+// Qt
+#include <QDateTime>
+
+// Other
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <locale.h>
+#include <langinfo.h>
+#include <string.h>
+
+RelativeTimeFormatter::RelativeTimeFormatter(QObject *parent)
+    : GDateTimeFormatter(parent)
+{
+}
+
+ /* Check the system locale setting to see if the format is 24-hour
+   time or 12-hour time */
+gboolean
+is_locale_12h(void)
+{
+    int i;
+    static const char *formats_24h[] = {"%H", "%R", "%T", "%OH", "%k", nullptr};
+    const char* t_fmt = nl_langinfo(T_FMT);
+
+    for (i=0; formats_24h[i]!=nullptr; i++)
+        if (strstr(t_fmt, formats_24h[i]) != nullptr)
+            return FALSE;
+
+    return TRUE;
+}
+
+typedef enum
+{
+    DATE_PROXIMITY_YESTERDAY,
+    DATE_PROXIMITY_TODAY,
+    DATE_PROXIMITY_TOMORROW,
+    DATE_PROXIMITY_LAST_WEEK,
+    DATE_PROXIMITY_NEXT_WEEK,
+    DATE_PROXIMITY_FAR
+} date_proximity_t;
+
+static date_proximity_t
+getDateProximity(GDateTime* now, GDateTime* time)
+{
+    date_proximity_t prox = DATE_PROXIMITY_FAR;
+    gint now_year, now_month, now_day;
+    gint time_year, time_month, time_day;
+
+    // does it happen today?
+    g_date_time_get_ymd(now, &now_year, &now_month, &now_day);
+    g_date_time_get_ymd(time, &time_year, &time_month, &time_day);
+    if ((now_year == time_year) && (now_month == time_month) && (now_day == time_day)) {
+        return DATE_PROXIMITY_TODAY;
+    }
+
+    // did it happen yesterday?
+    GDateTime* tomorrow = g_date_time_add_days(now, -1);
+    gint tom_year, tom_month, tom_day;
+    g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
+    g_date_time_unref(tomorrow);
+    if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
+        return DATE_PROXIMITY_YESTERDAY;
+    }
+
+    // does it happen tomorrow?
+    if (prox == DATE_PROXIMITY_FAR)
+    {
+        GDateTime* tomorrow = g_date_time_add_days(now, 1);
+
+        gint tom_year, tom_month, tom_day;
+        g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
+        g_date_time_unref(tomorrow);
+        if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
+            return DATE_PROXIMITY_TOMORROW;
+        }
+    }
+
+    // does it happen this week?
+    if (prox == DATE_PROXIMITY_FAR) {
+        if (g_date_time_compare(time, now) < 0) {
+            GDateTime* last_week = g_date_time_add_days(now, -6);
+            GDateTime* last_week_bound = g_date_time_new_local(g_date_time_get_year(last_week),
+                                                               g_date_time_get_month(last_week),
+                                                               g_date_time_get_day_of_month(last_week),
+                                                               0, 0, 0);
+            if (g_date_time_compare(time, last_week_bound) >= 0)
+                prox = DATE_PROXIMITY_LAST_WEEK;
+
+            g_date_time_unref(last_week);
+            g_date_time_unref(last_week_bound);
+        } else {
+            GDateTime* next_week = g_date_time_add_days(now, 6);
+            GDateTime* next_week_bound = g_date_time_new_local(g_date_time_get_year(next_week),
+                                                               g_date_time_get_month(next_week),
+                                                               g_date_time_get_day_of_month(next_week),
+                                                               23, 59, 59.9);
+            if (g_date_time_compare(time, next_week_bound) <= 0)
+                prox = DATE_PROXIMITY_NEXT_WEEK;
+
+            g_date_time_unref(next_week);
+            g_date_time_unref(next_week_bound);
+        }
+
+    }
+
+    return prox;
+}
+
+const char*
+dgettext_datetime(const char *text)
+{
+    return dgettext("indicator-datetime", text);
+}
+
+/**
+ * _ a time yesterday should be shown as (e.g. “Yesterday 3:55 PM”)
+ * _ a time today should be shown as just the time (e.g. “3:55 PM”)
+ * _ a time tomorrow should be shown as(e.g. “Tomorrow 3:55 PM”)
+ * _ a time any other day this week should be shown as the short version of the
+ *   day and time (e.g. “Wed 3:55 PM”)
+ *   weekday (e.g. “Friday”)
+ * _ a time after this week should be shown as the short version of the day,
+ *   date, and time (e.g. “Wed 21 Apr 3:55 PM”)
+ * _ in addition, when presenting the times of upcoming events, the time should
+ *   be followed by the timezone if it is different from the one the computer
+ *   is currently set to. For example, “Wed 3:55 PM UTC−5”.
+ *
+ *   TODO - keep inline with indicator-datetime
+ */
+char* generate_full_format_string_at_time (GDateTime* now,
+                                           GDateTime* then)
+{
+    GString* ret = g_string_new (nullptr);
+
+    if (then != nullptr) {
+        const date_proximity_t prox = getDateProximity(now, then);
+
+        if (is_locale_12h()) {
+            switch (prox)  {
+                case DATE_PROXIMITY_YESTERDAY:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 12-hour clock, times that happen yesterday.
+                       (\u2003 is a unicode em space which is slightly wider than a normal space.)
+                       en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday  1:00 PM" */
+                    g_string_assign (ret, dgettext_datetime("Yesterday\u2003%l:%M %p"));
+                    break;
+
+                case DATE_PROXIMITY_TODAY:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 12-hour clock, times that happened today.
+                       en_US example: "%l:%M %p" --> "1:00 PM" */
+                    g_string_assign (ret, dgettext_datetime("%l:%M %p"));
+                    break;
+
+                case DATE_PROXIMITY_TOMORROW:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
+                       (\u2003 is a unicode em space which is slightly wider than a normal space.)
+                       en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow  1:00 PM" */
+                    g_string_assign (ret, dgettext_datetime("Tomorrow\u2003%l:%M %p"));
+                    break;
+
+                case DATE_PROXIMITY_LAST_WEEK:
+                case DATE_PROXIMITY_NEXT_WEEK:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 12-hour clock, times that happened in the last week.
+                       (\u2003 is a unicode em space which is slightly wider than a normal space.)
+                       en_US example: "%a\u2003%l:%M %p" --> "Fri  1:00 PM" */
+                    g_string_assign (ret, dgettext_datetime("%a\u2003%l:%M %p"));
+                    break;
+
+                case DATE_PROXIMITY_FAR:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
+                       (\u2003 is a unicode em space which is slightly wider than a normal space.)
+                       en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31  1:00 PM"
+                       en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct  1:00 PM" */
+                    g_string_assign (ret, dgettext_datetime("%a %d %b\u2003%l:%M %p"));
+                    break;
+            }
+        } else {
+            switch (prox) {
+
+                case DATE_PROXIMITY_YESTERDAY:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 24-hour clock, times that happen yesterday.
+                       (\u2003 is a unicode em space which is slightly wider than a normal space.)
+                       en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday  13:00" */
+                    g_string_assign (ret, dgettext_datetime("Yesterday\u2003%H:%M"));
+                    break;
+
+                case DATE_PROXIMITY_TODAY:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 24-hour clock, times that happened today.
+                       en_US example: "%H:%M" --> "13:00" */
+                    g_string_assign (ret, dgettext_datetime("%H:%M"));
+                    break;
+
+                case DATE_PROXIMITY_TOMORROW:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
+                       (\u2003 is a unicode em space which is slightly wider than a normal space.)
+                       en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow  13:00" */
+                    g_string_assign (ret, dgettext_datetime("Tomorrow\u2003%H:%M"));
+                    break;
+
+                case DATE_PROXIMITY_LAST_WEEK:
+                case DATE_PROXIMITY_NEXT_WEEK:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 24-hour clock, times that happened in the last week.
+                       (\u2003 is a unicode em space which is slightly wider than a normal space.)
+                       en_US example: "%a\u2003%H:%M" --> "Fri  13:00" */
+                    g_string_assign (ret, dgettext_datetime("%a\u2003%H:%M"));
+                    break;
+
+                case DATE_PROXIMITY_FAR:
+                    /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
+                       This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
+                       (\u2003 is a unicode em space which is slightly wider than a normal space.)
+                       en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31  13:00"
+                       en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct  13:00" */
+                    g_string_assign (ret, dgettext_datetime("%a %d %b\u2003%H:%M"));
+                    break;
+            }
+        }
+    }
+
+    return g_string_free (ret, FALSE);
+}
+
+QString RelativeTimeFormatter::format() const
+{
+    GDateTime* now = g_date_time_new_from_unix_utc(QDateTime::currentMSecsSinceEpoch() / 1000);
+    if (!now) { return QString(); }
+
+    GDateTime* then = g_date_time_new_from_unix_local(time());
+    if (!then) { return QString(); }
+
+    char* time_format = generate_full_format_string_at_time(now, then);
+
+    QString str(QString::fromUtf8(time_format));
+    g_free(time_format);
+
+    g_date_time_unref(now);
+    g_date_time_unref(then);
+
+    return str;
+}

=== added file 'plugins/Utils/relativetimeformatter.h'
--- plugins/Utils/relativetimeformatter.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/relativetimeformatter.h	2014-09-25 12:44:25 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef RELATIVETIMEFORMATTER_H
+#define RELATIVETIMEFORMATTER_H
+
+#include "timeformatter.h"
+
+// TODO - move this to the sdk
+// https://blueprints.launchpad.net/ubuntu-ui-toolkit/+spec/time-formatter
+class RelativeTimeFormatter : public GDateTimeFormatter
+{
+    Q_OBJECT
+public:
+    RelativeTimeFormatter(QObject *parent = 0);
+
+    QString format() const override;
+};
+
+#endif // RELATIVETIMEFORMATTER_H

=== modified file 'plugins/Utils/timeformatter.cpp'
--- plugins/Utils/timeformatter.cpp	2014-08-26 08:14:44 +0000
+++ plugins/Utils/timeformatter.cpp	2014-09-25 12:44:25 +0000
@@ -121,6 +121,11 @@
     g_bus_get (G_BUS_TYPE_SYSTEM, priv->cancellable, got_bus, priv);
 }
 
+TimeFormatter::TimeFormatter(const QString &initialFormat, QObject *parent): TimeFormatter(parent)
+{
+    priv->format = initialFormat;
+}
+
 TimeFormatter::~TimeFormatter()
 {
     if (priv->system_bus) {
@@ -177,7 +182,7 @@
 }
 
 GDateTimeFormatter::GDateTimeFormatter(QObject* parent)
-: TimeFormatter(parent)
+: TimeFormatter("%d-%m-%Y %I:%M%p", parent)
 {
 }
 

=== modified file 'plugins/Utils/timeformatter.h'
--- plugins/Utils/timeformatter.h	2013-12-13 13:25:35 +0000
+++ plugins/Utils/timeformatter.h	2014-09-25 12:44:25 +0000
@@ -33,7 +33,7 @@
     TimeFormatter(QObject *parent = 0);
     virtual ~TimeFormatter();
 
-    QString format() const;
+    virtual QString format() const;
     QString timeString() const;
     qint64 time() const;
 
@@ -48,6 +48,8 @@
     void timeChanged(qint64 time);
 
 protected:
+    TimeFormatter(const QString &initialFormat, QObject *parent = 0);
+
     virtual QString formatTime() const;
 
 private:

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-09-18 12:13:23 +0000
+++ po/unity8.pot	2014-09-25 12:44:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-18 20:12+0800\n"
+"POT-Creation-Date: 2014-09-24 10:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -21,12 +21,12 @@
 msgid "Password: "
 msgstr ""
 
-#: plugins/Unity/Launcher/launcheritem.cpp:44
-#: plugins/Unity/Launcher/launcheritem.cpp:74
+#: plugins/Unity/Launcher/launcheritem.cpp:45
+#: plugins/Unity/Launcher/launcheritem.cpp:91
 msgid "Pin shortcut"
 msgstr ""
 
-#: plugins/Unity/Launcher/launcheritem.cpp:74
+#: plugins/Unity/Launcher/launcheritem.cpp:91
 msgid "Unpin shortcut"
 msgstr ""
 
@@ -157,15 +157,15 @@
 msgid "Hello"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:364
+#: qml/Dash/GenericScopeView.qml:411
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr ""
@@ -203,7 +203,7 @@
 msgstr ""
 
 #: qml/Dash/ScopesOverview.qml:206
-msgid "Manage Dash"
+msgid "Manage Scopes"
 msgstr ""
 
 #: qml/Dash/ScopesOverview.qml:428
@@ -266,27 +266,31 @@
 msgid "Conference"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:651
+#: qml/Panel/Indicators/MenuItemFactory.qml:600
+msgid "Nothing is playing"
+msgstr ""
+
+#: qml/Panel/Indicators/MenuItemFactory.qml:748
 msgid "In queue…"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:655
+#: qml/Panel/Indicators/MenuItemFactory.qml:752
 msgid "Downloading"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:657
+#: qml/Panel/Indicators/MenuItemFactory.qml:754
 msgid "Paused, tap to resume"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:659
+#: qml/Panel/Indicators/MenuItemFactory.qml:756
 msgid "Canceled"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:661
+#: qml/Panel/Indicators/MenuItemFactory.qml:758
 msgid "Finished"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:663
+#: qml/Panel/Indicators/MenuItemFactory.qml:760
 msgid "Failed, tap to retry"
 msgstr ""
 
@@ -298,51 +302,51 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:292
+#: qml/Shell.qml:320
 msgid "Enter your passphrase"
 msgstr ""
 
-#: qml/Shell.qml:293
+#: qml/Shell.qml:321
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:295
+#: qml/Shell.qml:323
 msgid "Enter your passcode"
 msgstr ""
 
-#: qml/Shell.qml:296
+#: qml/Shell.qml:324
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:299
+#: qml/Shell.qml:327
 #, qt-format
 msgid "Enter your %1"
 msgstr ""
 
-#: qml/Shell.qml:300
+#: qml/Shell.qml:328
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:335
+#: qml/Shell.qml:363
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:336
+#: qml/Shell.qml:364
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:337
+#: qml/Shell.qml:365
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:339
+#: qml/Shell.qml:367
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:340
+#: qml/Shell.qml:368
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== added file 'qml/Components/Header.qml'
--- qml/Components/Header.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/Header.qml	2014-09-25 12:44:25 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Themes.Ambiance 1.1
+
+PageHeadStyle {
+    id: root
+
+    property var styledItem: root
+    property string title
+    property var config: PageHeadConfiguration {}
+    property var contents: null
+}

=== modified file 'qml/Panel/Indicators.qml'
--- qml/Panel/Indicators.qml	2014-07-23 23:41:38 +0000
+++ qml/Panel/Indicators.qml	2014-09-25 12:44:25 +0000
@@ -84,10 +84,6 @@
                 indicators.state = "locked";
             }
         }
-
-        if (enableRelease && revealProgress === 0) {
-            menuContent.releaseContent();
-        }
     }
 
     function calculateCurrentItem(xValue, useBuffer) {
@@ -189,8 +185,7 @@
         }
         indicatorsModel: visibleIndicators.model
         visible: indicators.partiallyOpened || indicators.fullyOpened
-        clip: !indicators.fullyOpened
-        activeHeader: indicators.state == "hint" || indicators.state == "reveal"
+        clip: indicators.partiallyOpened
         enabled: contentEnabled
 
         //small shadow gradient at bottom of menu
@@ -212,7 +207,7 @@
     Rectangle {
         id: handle
 
-        color:  menuContent.backgroundColor
+        color:  menuContent.color
 
         anchors {
             left: parent.left
@@ -358,12 +353,6 @@
         maxTotalDragDistance: openedHeight - panelHeight
         distanceThreshold: panelHeight
 
-        onStatusChanged: {
-            if (status === DirectionalDragArea.Recognized) {
-                menuContent.activateContent();
-            }
-        }
-
         onTapped: showTapped(Qt.point(touchSceneX, touchSceneY));
     }
 

=== modified file 'qml/Panel/Indicators/DefaultIndicatorPage.qml'
--- qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-07-30 20:50:34 +0000
+++ qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-09-25 12:44:25 +0000
@@ -26,14 +26,12 @@
     id: main
 
     //const
-    property bool contentActive: false
     property string title: rootActionState.title
-    property alias emptyText: emptyLabel.text
     property alias highlightFollowsCurrentItem : mainMenu.highlightFollowsCurrentItem
 
     Indicators.UnityMenuModelStack {
         id: menuStack
-        head: contentActive ? main.menuModel : null
+        head: main.menuModel
 
         property var rootMenu: null
 
@@ -88,11 +86,13 @@
             }
         }
 
-        // Ensure all delegates are cached in order to improve smoothness of scrolling
-        cacheBuffer: 10000
+        // Don't load all the delegates (only max of 3 pages worth -1/0/+1)
+        cacheBuffer: Math.max(height * 3, units.gu(70))
 
         // Only allow flicking if the content doesn't fit on the page
         interactive: contentHeight > height
+        // FIXME - https://bugreports.qt-project.org/browse/QTBUG-41207
+        boundsBehavior: Flickable.StopAtBounds
 
         property int selectedIndex: -1
         property bool blockCurrentIndexChange: false
@@ -125,17 +125,12 @@
         delegate: Loader {
             id: loader
             objectName: "menuItem" + index
-            asynchronous: false
+            asynchronous: true
+            width: ListView.view.width
             visible: status == Loader.Ready
 
             property int modelIndex: index
-
-            anchors {
-                left: parent.left
-                right: parent.right
-            }
-
-            sourceComponent: factory.load(model)
+            sourceComponent: factory.load(model, identifier)
 
             onLoaded: {
                 if (item.hasOwnProperty("selected")) {
@@ -180,44 +175,8 @@
         menuModel: mainMenu.model ? mainMenu.model : null
     }
 
-    Components.Label {
-        id: emptyLabel
-        objectName: "emptyLabel"
-        visible: mainMenu.count == 0
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            topMargin: units.gu(2)
-        }
-        wrapMode: Text.WordWrap
-        horizontalAlignment: Text.AlignHCenter
-
-        //style
-        color: "#e8e1d0"
-        fontSize: "medium"
-
-        text: "Empty!"
-    }
-
-    function start()
-    {
-        reset()
-        if (!contentActive) {
-            contentActive = true;
-        }
-    }
-
-    function stop()
-    {
-        if (contentActive) {
-            contentActive = false;
-        }
-    }
-
     function reset()
     {
-        mainMenu.selectedIndex = -1;
         mainMenu.positionViewAtBeginning();
     }
 }

=== modified file 'qml/Panel/Indicators/IndicatorDelegate.qml'
--- qml/Panel/Indicators/IndicatorDelegate.qml	2014-06-26 10:00:41 +0000
+++ qml/Panel/Indicators/IndicatorDelegate.qml	2014-09-25 12:44:25 +0000
@@ -20,14 +20,6 @@
 import QtQuick 2.0
 
 IndicatorBase {
-    enabled: false
-
-    onRootActionStateChanged: {
-        if (rootActionState == undefined) {
-            enabled = false;
-            return;
-        }
-
-        enabled = rootActionState.visible;
-    }
+    enabled: rootActionState.visible
+    property string title: rootActionState.title
 }

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2014-07-30 21:40:40 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2014-09-25 12:44:25 +0000
@@ -19,11 +19,10 @@
 
 import QtQuick 2.0
 import Ubuntu.Settings.Menus 0.1 as Menus
-import Ubuntu.Settings.Components 0.1 as SettingsComponents
 import QMenuModel 0.1
 import Utils 0.1 as Utils
 import Ubuntu.Components.ListItems 0.1 as ListItems
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Item {
     id: menuFactory
@@ -32,32 +31,38 @@
     property var menuModel: null
 
     property var _map:  {
-        "unity.widgets.systemsettings.tablet.volumecontrol" : sliderMenu,
-        "unity.widgets.systemsettings.tablet.switch"        : switchMenu,
-
-        "com.canonical.indicator.button"         : buttonMenu,
-        "com.canonical.indicator.div"            : separatorMenu,
-        "com.canonical.indicator.section"        : sectionMenu,
-        "com.canonical.indicator.progress"       : progressMenu,
-        "com.canonical.indicator.slider"         : sliderMenu,
-        "com.canonical.indicator.switch"         : switchMenu,
-        "com.canonical.indicator.alarm"          : alarmMenu,
-        "com.canonical.indicator.appointment"    : appointmentMenu,
-        "com.canonical.indicator.transfer"       : transferMenu,
-        "com.canonical.indicator.button-section" : buttonSectionMenu,
-
-        "com.canonical.indicator.messages.messageitem"  : messageItem,
-        "com.canonical.indicator.messages.sourceitem"   : groupedMessage,
-
-        "com.canonical.unity.slider"    : sliderMenu,
-        "com.canonical.unity.switch"    : switchMenu,
-
-        "com.canonical.unity.media-player"    : mediaPayerMenu,
-        "com.canonical.unity.playback-item"   : playbackItemMenu,
-
-        "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,
-        "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
-        "com.canonical.indicator.network.modeminfoitem" : modeminfoitem,
+        "default": {
+            "unity.widgets.systemsettings.tablet.volumecontrol" : sliderMenu,
+            "unity.widgets.systemsettings.tablet.switch"        : switchMenu,
+
+            "com.canonical.indicator.button"         : buttonMenu,
+            "com.canonical.indicator.div"            : separatorMenu,
+            "com.canonical.indicator.section"        : sectionMenu,
+            "com.canonical.indicator.progress"       : progressMenu,
+            "com.canonical.indicator.slider"         : sliderMenu,
+            "com.canonical.indicator.switch"         : switchMenu,
+            "com.canonical.indicator.alarm"          : alarmMenu,
+            "com.canonical.indicator.appointment"    : appointmentMenu,
+            "com.canonical.indicator.transfer"       : transferMenu,
+            "com.canonical.indicator.button-section" : buttonSectionMenu,
+            "com.canonical.indicator.link"           : linkMenu,
+
+            "com.canonical.indicator.messages.messageitem"  : messageItem,
+            "com.canonical.indicator.messages.sourceitem"   : groupedMessage,
+
+            "com.canonical.unity.slider"    : sliderMenu,
+            "com.canonical.unity.switch"    : switchMenu,
+
+            "com.canonical.unity.media-player"    : mediaPayerMenu,
+            "com.canonical.unity.playback-item"   : playbackItemMenu,
+
+            "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,
+            "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
+            "com.canonical.indicator.network.modeminfoitem" : modeminfoitem,
+        },
+        "indicator-messages" : {
+            "com.canonical.indicator.button"         : messagesButtonMenu
+        }
     }
 
     function getExtendedProperty(object, propertyName, defaultValue) {
@@ -100,6 +105,7 @@
                 return maximum;
             }
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
 
             onMenuModelChanged: {
                 loadAttributes();
@@ -138,12 +144,43 @@
 
             buttonText: menuData && menuData.label || ""
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
 
             onTriggered: {
                 menuModel.activate(menuIndex);
             }
         }
     }
+
+    Component {
+        id: messagesButtonMenu;
+
+        Item {
+            objectName: "messagesButtonMenu"
+            property QtObject menuData: null
+            property var menuModel: menuFactory.menuModel
+            property int menuIndex: -1
+
+            implicitHeight: units.gu(5)
+            enabled: menuData && menuData.sensitive || false
+
+            Label {
+                id: buttonMenuLabel
+                text: menuData && menuData.label || ""
+                anchors.centerIn: parent
+                font.bold: true
+            }
+
+            MouseArea {
+                anchors {
+                    fill: buttonMenuLabel
+                    margins: units.gu(-1)
+                }
+                onClicked: menuModel.activate(menuIndex);
+            }
+        }
+    }
+
     Component {
         id: sectionMenu;
 
@@ -169,6 +206,7 @@
             iconSource: menuData && menuData.icon || ""
             value : menuData && menuData.actionState || 0.0
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
         }
     }
 
@@ -183,9 +221,57 @@
             text: menuData && menuData.label || ""
             iconSource: menuData && menuData.icon || ""
             enabled: menuData && menuData.sensitive || false
-
-            onTriggered: {
-                menuModel.activate(menuIndex);
+            highlightWhenPressed: false
+
+            onTriggered: {
+                menuModel.activate(menuIndex);
+            }
+
+            // FIXME : At the moment, the indicators aren't using
+            // com.canonical.indicators.link for settings menu. Need to fudge it.
+            property bool settingsMenu: menuData && menuData.action.indexOf("settings") > -1 || false
+            backColor: settingsMenu ? Qt.rgba(1,1,1,0.07) : "transparent"
+            component: settingsMenu ? buttonForSettings : undefined
+            Component {
+                id: buttonForSettings
+                Icon {
+                    name: "settings"
+                    height: units.gu(3)
+                    width: height
+                    color: Theme.palette.selected.backgroundText
+                }
+            }
+        }
+    }
+
+    Component {
+        id: linkMenu;
+
+        Menus.StandardMenu {
+            objectName: "linkMenu"
+            property QtObject menuData: null
+            property int menuIndex: -1
+
+            text: menuData && menuData.label || ""
+            iconSource: menuData && menuData.icon || ""
+            enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
+
+            onTriggered: {
+                menuModel.activate(menuIndex);
+            }
+
+            backColor: Qt.rgba(1,1,1,0.07)
+
+            component: menuData.icon ? icon : undefined
+            Component {
+                id: icon
+                Icon {
+                    source: menuData.icon
+                    height: units.gu(3)
+                    width: height
+                    color: Theme.palette.selected.backgroundText
+                }
             }
         }
     }
@@ -201,6 +287,7 @@
             text: menuData && menuData.label || ""
             enabled: menuData && menuData.sensitive || false
             checked: menuData && menuData.isToggled || false
+            highlightWhenPressed: false
 
             onTriggered: {
                 menuModel.activate(menuIndex);
@@ -208,7 +295,6 @@
         }
     }
 
-
     Component {
         id: switchMenu;
 
@@ -221,6 +307,7 @@
             iconSource: menuData && menuData.icon || ""
             enabled: menuData && menuData.sensitive || false
             checked: menuData && menuData.isToggled || false
+            highlightWhenPressed: false
 
             onTriggered: {
                 menuModel.activate(menuIndex);
@@ -247,6 +334,7 @@
             iconSource: menuData && menuData.icon || "image://theme/alarm-clock"
             time: timeFormatter.timeString
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
 
             onMenuModelChanged: {
                 loadAttributes();
@@ -286,6 +374,7 @@
             time: timeFormatter.timeString
             eventColor: getExtendedProperty(extendedData, "xCanonicalColor", Qt.rgba(0.0, 0.0, 0.0, 0.0))
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
 
             onMenuModelChanged: {
                 loadAttributes();
@@ -351,10 +440,11 @@
 
             text: menuData && menuData.label || ""
             enabled: menuData && menuData.sensitive || false
-            checked: menuData && menuData.isToggled || false
+            active: menuData && menuData.isToggled || false
             secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
             adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
             signalStrength: strengthAction.valid ? strengthAction.state : 0
+            highlightWhenPressed: false
 
             onMenuModelChanged: {
                 loadAttributes();
@@ -383,6 +473,7 @@
             property var menuModel: menuFactory.menuModel
             property int menuIndex: -1
             property var extendedData: menuData && menuData.ext || undefined
+            highlightWhenPressed: false
 
             property var statusLabelAction: UnityMenuAction {
                 model: menuModel
@@ -468,9 +559,10 @@
             property var extendedData: menuData && menuData.ext || undefined
 
             text: menuData && menuData.label || ""
-            iconSource: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
+            iconSource: getExtendedProperty(extendedData, "icon", "image://theme/message")
             count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
             removable: true
 
             onMenuModelChanged: {
@@ -502,17 +594,20 @@
             property var menuModel: menuFactory.menuModel
             property int menuIndex: -1
             property var actionState: menuData && menuData.actionState || undefined
-
-            playerIcon: menuData && menuData.icon || ""
-            playerName: menuData && menuData.label || ""
-
-            albumArt: getExtendedProperty(actionState, "art-url", "")
-            song: getExtendedProperty(actionState, "title", "unknown")
-            artist: getExtendedProperty(actionState, "artist", "unknown")
-            album: getExtendedProperty(actionState, "album", "unknown")
-            running: getExtendedProperty(actionState, "running", false)
+            property bool running: getExtendedProperty(actionState, "running", false)
+
+            playerIcon: menuData && menuData.icon || "image://theme/stock_music"
+            playerName: menuData && menuData.label || i18n.tr("Nothing is playing")
+
+            albumArt: getExtendedProperty(actionState, "art-url", "image://theme/stock_music")
+            song: getExtendedProperty(actionState, "title", "")
+            artist: getExtendedProperty(actionState, "artist", "")
+            album: getExtendedProperty(actionState, "album", "")
+            showTrack: running && (state == "Playing" || state == "Paused")
             state: getExtendedProperty(actionState, "state", "")
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
+            showDivider: false
 
             onTriggered: {
                 model.activate(modelIndex);
@@ -551,6 +646,7 @@
             canGoNext: nextAction.valid
             canGoPrevious: previousAction.valid
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
 
             onPlay: {
                 playAction.activate();
@@ -590,9 +686,10 @@
             property var uid: getExtendedProperty(extendedData, "xCanonicalUid", undefined)
 
             text: menuData && menuData.label || ""
-            iconSource: menuData && menuData.icon || ""
+            iconSource: menuData && menuData.icon || "image://theme/transfer-none"
             maximum: 1.0
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
             removable: true
             confirmRemoval: true
 
@@ -688,7 +785,7 @@
     Component {
         id: buttonSectionMenu;
 
-        ListItems.Standard {
+        Menus.StandardMenu {
             objectName: "buttonSectionMenu"
             property QtObject menuData: null
             property var menuModel: menuFactory.menuModel
@@ -697,8 +794,9 @@
 
             iconSource: menuData && menuData.icon || ""
             enabled: menuData && menuData.sensitive || false
+            highlightWhenPressed: false
             text: menuData && menuData.label || ""
-            showDivider: false
+            foregroundColor: Theme.palette.normal.backgroundText
 
             onMenuModelChanged: {
                 loadAttributes();
@@ -711,22 +809,35 @@
                 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-extra-label': 'string'});
             }
 
-            control: Button {
-                text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
+            component: Component {
+                Button {
+                    objectName: "buttonSectionMenuControl"
+                    text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
 
-                onClicked: {
-                    menuModel.activate(menuIndex);
+                    onClicked: {
+                        menuModel.activate(menuIndex);
+                    }
                 }
             }
         }
     }
 
-    function load(modelData) {
+    function load(modelData, context) {
         if (modelData.type !== undefined) {
-            var component = _map[modelData.type];
+            var component = undefined;
+
+            var contextComponents = _map[context];
+            if (contextComponents !== undefined) {
+                component = contextComponents[modelData.type];
+            }
+
+            if (component === undefined) {
+                component = _map["default"][modelData.type];
+            }
             if (component !== undefined) {
                 return component;
             }
+            console.debug("Don't know how to make " + modelData.type + " for " + context);
         }
         if (modelData.isCheck || modelData.isRadio) {
             return checkableMenu;

=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
--- qml/Panel/Indicators/MessageMenuItemFactory.qml	2014-07-10 13:36:41 +0000
+++ qml/Panel/Indicators/MessageMenuItemFactory.qml	2014-09-25 12:44:25 +0000
@@ -24,8 +24,9 @@
 import QMenuModel 0.1 as QMenuModel
 import Utils 0.1 as Utils
 
-Item {
+Loader {
     id: messageFactoryItem
+    objectName: "messageItem"
     property var menuModel: null
     property QtObject menuData: null
     property int menuIndex: -1
@@ -38,9 +39,8 @@
     property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
 
     // TODO - bug #1260728
-    property var timeFormatter: Utils.TimeFormatter {
-        time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
-        format: "hh:mm - MMM dd"
+    property var timeFormatter: Utils.RelativeTimeFormatter {
+        time: getExtendedProperty(extendedData, "xCanonicalTime", 0) / 1000000
     }
 
     onMenuModelChanged: {
@@ -50,182 +50,7 @@
         loadAttributes();
     }
 
-    function loadAttributes() {
-        if (!menuModel || menuIndex == -1) return;
-        menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
-                                                     'x-canonical-text': 'string',
-                                                     'x-canonical-message-actions': 'variant',
-                                                     'icon': 'icon',
-                                                     'x-canonical-app-icon': 'icon'});
-    }
-
-    function getExtendedProperty(object, propertyName, defaultValue) {
-        if (object && object.hasOwnProperty(propertyName)) {
-            return object[propertyName];
-        }
-        return defaultValue;
-    }
-
-    implicitHeight: contents.status == Loader.Ready ? contents.item.implicitHeight : 0
-
-    Loader {
-        id: contents
-        objectName: "loader"
-        anchors.fill: parent
-
-        sourceComponent: loadMessage(actionsDescription);
-
-        Component {
-            id: simpleTextMessage
-
-            Menus.SimpleTextMessageMenu {
-                id: message
-                objectName: "simpleTextMessage"
-                // text
-                title: menuData && menuData.label || ""
-                time: timeFormatter.timeString
-                message: getExtendedProperty(extendedData, "xCanonicalText", "")
-                // icons
-                avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
-                appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
-                // actions
-                enabled: menuData && menuData.sensitive || false
-                removable: !selected
-                selected: messageFactoryItem.selected
-
-                onAppActivated: {
-                    menuModel.activate(menuIndex, true);
-                }
-                onDismissed: {
-                    menuModel.activate(menuIndex, false);
-                }
-                onClicked: {
-                    if (selected) {
-                        menuDeselected();
-                    } else {
-                        menuSelected();
-                    }
-                }
-
-                backgroundIndicator: RemoveBackground {
-                    state: message.swipingState
-                }
-            }
-        }
-
-        Component {
-            id: textMessage
-
-            Menus.TextMessageMenu {
-                id: message
-                objectName: "textMessage"
-                property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
-
-                property var replyAction: QMenuModel.UnityMenuAction {
-                    model: menuModel
-                    index: menuIndex
-                    name: getExtendedProperty(replyActionDescription, "name", "")
-                }
-
-                // text
-                title: menuData && menuData.label || ""
-                time: timeFormatter.timeString
-                message: getExtendedProperty(extendedData, "xCanonicalText", "")
-                replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
-                // icons
-                avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
-                appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
-                // actions
-                replyEnabled: replyAction.valid && replyAction.enabled
-                enabled: menuData && menuData.sensitive || false
-                removable: !selected
-                selected: messageFactoryItem.selected
-
-                onAppActivated: {
-                    menuModel.activate(menuIndex, true);
-                }
-                onDismissed: {
-                    menuModel.activate(menuIndex, false);
-                }
-                onReplied: {
-                    replyAction.activate(value);
-                }
-                onClicked: {
-                    if (selected) {
-                        menuDeselected();
-                    } else {
-                        menuSelected();
-                    }
-                }
-
-                backgroundIndicator: RemoveBackground {
-                    state: message.swipingState
-                }
-            }
-        }
-        Component {
-            id: snapDecision
-
-            Menus.SnapDecisionMenu {
-                id: message
-                objectName: "snapDecision"
-                property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
-                property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined
-
-                property var activateAction: QMenuModel.UnityMenuAction {
-                    model: menuModel
-                    index: menuIndex
-                    name: getExtendedProperty(activateActionDescription, "name", "")
-                }
-                property var replyAction: QMenuModel.UnityMenuAction {
-                    model: menuModel
-                    index: menuIndex
-                    name: getExtendedProperty(replyActionDescription, "name", "")
-                }
-
-                // text
-                title: menuData && menuData.label || ""
-                time: timeFormatter.timeString
-                message: getExtendedProperty(extendedData, "xCanonicalText", "")
-                actionButtonText: getExtendedProperty(activateActionDescription, "label", "Call back")
-                replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
-                replyMessages: getExtendedProperty(replyActionDescription, "parameter-hint", "")
-                // icons
-                avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
-                appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
-                // actions
-                activateEnabled: activateAction.valid && activateAction.enabled
-                replyEnabled: replyAction.valid && replyAction.enabled
-                enabled: menuData && menuData.sensitive || false
-                removable: !selected
-                selected: messageFactoryItem.selected
-
-                onAppActivated: {
-                    menuModel.activate(menuIndex, true);
-                }
-                onDismissed: {
-                    menuModel.activate(menuIndex, false);
-                }
-                onActivated: {
-                    activateAction.activate();
-                }
-                onReplied: {
-                    replyAction.activate(value);
-                }
-                onClicked: {
-                    if (selected) {
-                        menuDeselected();
-                    } else {
-                        menuSelected();
-                    }
-                }
-
-                backgroundIndicator: RemoveBackground {
-                    state: message.swipingState
-                }
-            }
-        }
-    }
+    sourceComponent: loadMessage(actionsDescription)
 
     function loadMessage(actions)
     {
@@ -240,7 +65,7 @@
         }
 
         if (parameterType === "") {
-            return simpleTextMessage;
+            return simpleMessage;
         } else if (parameterType === "s") {
             return textMessage;
         } else if (parameterType === "_s") {
@@ -250,4 +75,164 @@
         }
         return undefined;
     }
+
+    function loadAttributes() {
+        if (!menuModel || menuIndex == -1) return;
+        menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
+                                                     'x-canonical-text': 'string',
+                                                     'x-canonical-message-actions': 'variant',
+                                                     'icon': 'icon',
+                                                     'x-canonical-app-icon': 'icon'});
+    }
+
+    function getExtendedProperty(object, propertyName, defaultValue) {
+        if (object && object.hasOwnProperty(propertyName)) {
+            return object[propertyName];
+        }
+        return defaultValue;
+    }
+
+    Component {
+        id: simpleMessage
+
+        Menus.SimpleMessageMenu {
+            id: message
+            objectName: "simpleTextMessage"
+            // text
+            title: menuData && menuData.label || ""
+            time: timeFormatter.timeString
+            body: getExtendedProperty(extendedData, "xCanonicalText", "")
+            // icons
+            avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
+            icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/message")
+            // actions
+            enabled: menuData && menuData.sensitive || false
+            removable: !selected
+            confirmRemoval: true
+            selected: messageFactoryItem.selected
+
+            onIconActivated: {
+                menuModel.activate(menuIndex, true);
+            }
+            onDismissed: {
+                menuModel.activate(menuIndex, false);
+            }
+            onTriggered: {
+                if (selected) {
+                    menuDeselected();
+                } else {
+                    menuSelected();
+                }
+            }
+        }
+    }
+
+    Component {
+        id: textMessage
+
+        Menus.TextMessageMenu {
+            id: message
+            objectName: "textMessage"
+            property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
+
+            property var replyAction: QMenuModel.UnityMenuAction {
+                model: menuModel
+                index: menuIndex
+                name: getExtendedProperty(replyActionDescription, "name", "")
+            }
+
+            // text
+            title: menuData && menuData.label || ""
+            time: timeFormatter.timeString
+            body: getExtendedProperty(extendedData, "xCanonicalText", "")
+            replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
+            // icons
+            avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
+            icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/message")
+            // actions
+            replyEnabled: replyAction.valid && replyAction.enabled
+            enabled: menuData && menuData.sensitive || false
+            removable: !selected
+            confirmRemoval: true
+            selected: messageFactoryItem.selected
+            highlightWhenPressed: false
+
+            onIconActivated: {
+                menuModel.activate(menuIndex, true);
+            }
+            onDismissed: {
+                menuModel.activate(menuIndex, false);
+            }
+            onReplied: {
+                replyAction.activate(value);
+            }
+            onTriggered: {
+                if (selected) {
+                    menuDeselected();
+                } else {
+                    menuSelected();
+                }
+            }
+        }
+    }
+
+    Component {
+        id: snapDecision
+
+        Menus.SnapDecisionMenu {
+            id: message
+            objectName: "snapDecision"
+            property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
+            property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined
+
+            property var activateAction: QMenuModel.UnityMenuAction {
+                model: menuModel
+                index: menuIndex
+                name: getExtendedProperty(activateActionDescription, "name", "")
+            }
+            property var replyAction: QMenuModel.UnityMenuAction {
+                model: menuModel
+                index: menuIndex
+                name: getExtendedProperty(replyActionDescription, "name", "")
+            }
+
+            // text
+            title: menuData && menuData.label || ""
+            time: timeFormatter.timeString
+            body: getExtendedProperty(extendedData, "xCanonicalText", "")
+            actionButtonText: getExtendedProperty(activateActionDescription, "label", "Call back")
+            replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
+            // icons
+            avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
+            icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/missed-call")
+            // actions
+            actionEnabled: activateAction.valid && activateAction.enabled
+            replyEnabled: replyAction.valid && replyAction.enabled
+            enabled: menuData && menuData.sensitive || false
+            removable: !selected
+            confirmRemoval: true
+            selected: messageFactoryItem.selected
+            highlightWhenPressed: false
+
+            onIconActivated: {
+                menuModel.activate(menuIndex, true);
+            }
+            onDismissed: {
+                menuModel.activate(menuIndex, false);
+            }
+            onActionActivated: {
+                activateAction.activate();
+            }
+            onReplied: {
+                replyAction.activate(value);
+            }
+            onTriggered: {
+                if (selected) {
+                    menuDeselected();
+                } else {
+                    menuSelected();
+                }
+            }
+        }
+    }
 }

=== removed file 'qml/Panel/Indicators/RemoveBackground.qml'
--- qml/Panel/Indicators/RemoveBackground.qml	2014-06-20 15:13:17 +0000
+++ qml/Panel/Indicators/RemoveBackground.qml	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Rectangle {
-    anchors.fill: parent
-    color: "#333130"
-    Label {
-        id: backgroundText
-
-        anchors.fill: parent
-        verticalAlignment: Text.AlignVCenter
-        text: "Clear"
-        fontSize: "medium"
-        color: "#e8e1d0"
-        font.bold: true
-    }
-
-    states: [
-        State {
-            name: "SwipingRight"
-            PropertyChanges {
-                target: backgroundText
-                anchors.rightMargin: units.gu(3)
-                anchors.leftMargin: 0
-                horizontalAlignment: Text.AlignRight
-
-            }
-        },
-        State {
-            name: "SwipingLeft"
-            PropertyChanges {
-                target: backgroundText
-                anchors.rightMargin: 0
-                anchors.leftMargin: units.gu(3)
-                horizontalAlignment: Text.AlignLeft
-            }
-        }
-    ]
-}

=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
--- qml/Panel/Indicators/client/IndicatorsClient.qml	2014-01-30 14:54:01 +0000
+++ qml/Panel/Indicators/client/IndicatorsClient.qml	2014-09-25 12:44:25 +0000
@@ -25,6 +25,10 @@
     color: "black"
     id: root
 
+    Component.onCompleted: {
+        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+    }
+
     PageStack {
         id: pages
         anchors.fill: parent

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2014-03-05 12:52:57 +0000
+++ qml/Panel/MenuContent.qml	2014-09-25 12:44:25 +0000
@@ -15,143 +15,119 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.1
 import Unity.Indicators 0.1 as Indicators
 import Utils 0.1
 import "../Components"
+import "Indicators"
 
-// FIXME : We dont want to use MainView.
-// Need a regular Item which can have tabs with local header.
-// https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704
-MainView {
+Rectangle {
     id: content
 
     property QtObject indicatorsModel: null
-    property bool __contentActive: false
-    readonly property int currentMenuIndex: tabs.selectedTabIndex
-    backgroundColor: "#221e1c" // FIXME not in palette yet
-    property int contentReleaseInterval: 20000
-    property bool activeHeader: false
-    property real headerHeight: tabs.tabBar.height
+    readonly property alias currentMenuIndex: listViewHeader.currentIndex
+    color: "#221e1c" // FIXME not in palette yet
+    property real headerHeight: listViewHeader.height
 
     width: units.gu(40)
     height: units.gu(42)
 
     function setCurrentMenuIndex(index, animate) {
-        if (tabs.selectedTabIndex !== index) {
-            if (tabs.selectedTabIndex === -1 || !animate) {
-                tabs.tabBar.animate = false;
-            }
-            tabs.selectedTabIndex = index;
-            tabs.tabBar.animate = true;
-        }
-    }
-
-    function activateContent() {
-        contentReleaseTimer.stop();
-        __contentActive = true;
-    }
-
-    function releaseContent() {
-        if (__contentActive) {
-            contentReleaseTimer.restart();
-        }
-    }
-
-    onActiveHeaderChanged: {
-        tabs.tabBar.selectionMode = activeHeader;
-        tabs.tabBar.alwaysSelectionMode = activeHeader;
-    }
-
-    Tabs {
-        id: tabs
-        objectName: "tabs"
-        anchors.fill: parent
-
-        Repeater {
-            id: repeater
-            model: content.indicatorsModel ? content.indicatorsModel : null
-            objectName: "tabsRepeater"
-
-            // FIXME: This is needed because tabs dont handle repeaters well.
-            // Due to the child ordering happening after child insertion.
-            // QTBUG-32438
-            onItemAdded: {
-                parent.childrenChanged();
-            }
-
-            Tab {
-                id: tab
-                objectName: model.identifier
-
-                page: Page {
-                    Loader {
-                        id: loader
-                        clip: true
-                        anchors.fill: parent
-                        source: pageSource
-                        asynchronous: true
-
-                        readonly property bool indexActive: index >= 0 && index < menuActivator.count && menuActivator.content[index].active
-                        readonly property bool contentActive: content.__contentActive && indexActive
-
-                        onContentActiveChanged: {
-                            if (contentActive && item) {
-                                item.start()
-                            } else if (!contentActive && item) {
-                                item.stop()
-                            }
-                        }
-
-                        onVisibleChanged: {
-                            // Reset the indicator states
-                            if (!visible && item && item["reset"]) {
-                                item.reset()
-                            }
-                        }
-
-                        onLoaded: {
-                            for(var pName in indicatorProperties) {
-                                if (item.hasOwnProperty(pName)) {
-                                    item[pName] = indicatorProperties[pName]
-                                }
-                            }
-                            if (contentActive && tabs.visible) {
-                                item.start()
-                            }
-                        }
-
-                        Binding {
-                            target: tab
-                            property: "title"
-                            value: loader.item && loader.item.hasOwnProperty("title") && loader.item.title !== "" ? loader.item.title : model.identifier
-                        }
-
-                        Binding {
-                            target: loader.item
-                            property: "objectName"
-                            value: identifier + "-page"
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Timer {
-        id: contentReleaseTimer
-
-        interval: contentReleaseInterval
-        onTriggered: {
-            content.__contentActive = false;
-            menuActivator.clear();
-        }
-    }
-
-    Indicators.MenuContentActivator {
-        id:  menuActivator
-        running: content.__contentActive
-        baseIndex: content.currentMenuIndex
-        count: indicatorsModel.count
+        // FIXME - https://bugreports.qt-project.org/browse/QTBUG-41229
+        listViewHeader.currentIndex = -1;
+        listViewHeader.currentIndex = index;
+    }
+
+    ListView {
+        id: listViewHeader
+        objectName: "indicatorsHeaderListView"
+        model: content.indicatorsModel
+        clip: true
+
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        height: units.gu(8.5)
+
+        highlightFollowsCurrentItem: true
+        highlightMoveDuration: 0
+
+        orientation: ListView.Horizontal
+        snapMode: ListView.SnapOneItem
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        boundsBehavior: Flickable.StopAtBounds
+        // Load all the indicator menus (a big number)
+        cacheBuffer: 1073741823
+
+        delegate: Header {
+            width: ListView.view.width
+            height: implicitHeight
+
+            title: indicatorDelegate.title !== "" ? indicatorDelegate.title : identifier
+
+            IndicatorDelegate {
+                id: indicatorDelegate
+                Component.onCompleted: {
+                    for(var pName in indicatorProperties) {
+                        if (indicatorDelegate.hasOwnProperty(pName)) {
+                            indicatorDelegate[pName] = indicatorProperties[pName];
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    ListView {
+        id: listViewContent
+        objectName: "indicatorsContentListView"
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: listViewHeader.bottom
+            bottom: parent.bottom
+        }
+        model: content.indicatorsModel
+        clip: true
+
+        currentIndex: listViewHeader.currentIndex
+        interactive: false
+        highlightMoveDuration: 0
+        orientation: ListView.Horizontal
+        // Load all the indicator menus (a big number)
+        cacheBuffer: 1073741823
+
+        delegate: Loader {
+            id: loader
+            width: ListView.view.width
+            height: ListView.view.height
+            objectName: identifier
+
+            source: pageSource
+            asynchronous: true
+
+            onVisibleChanged: {
+                // Reset the indicator states
+                if (!visible && item && item["reset"]) {
+                    item.reset()
+                }
+            }
+
+            onLoaded: {
+                for(var pName in indicatorProperties) {
+                    if (item.hasOwnProperty(pName)) {
+                        item[pName] = indicatorProperties[pName]
+                    }
+                }
+            }
+
+            Binding {
+                target: loader.item
+                property: "objectName"
+                value: identifier + "-page"
+            }
+        }
     }
 }

=== modified file 'tests/mocks/Unity/Indicators/FakeMenuPage.qml'
--- tests/mocks/Unity/Indicators/FakeMenuPage.qml	2014-05-02 23:27:02 +0000
+++ tests/mocks/Unity/Indicators/FakeMenuPage.qml	2014-09-25 12:44:25 +0000
@@ -19,16 +19,6 @@
 Flickable {
     objectName: "fakeMenuPlugin"
     // Make it compatible with the PluginItem interface
-    function start() {
-        if (shell != undefined && shell.indicator_status != undefined) {
-            shell.indicator_status[objectName].started = true;
-        }
-    }
-    function stop() {
-        if (shell != undefined && shell.indicator_status != undefined) {
-            shell.indicator_status[objectName].started = false;
-        }
-    }
     function reset() {
         if (shell != undefined && shell.indicator_status != undefined) {
             shell.indicator_status[objectName].reset++;

=== modified file 'tests/plugins/Utils/CMakeLists.txt'
--- tests/plugins/Utils/CMakeLists.txt	2014-09-17 14:18:59 +0000
+++ tests/plugins/Utils/CMakeLists.txt	2014-09-25 12:44:25 +0000
@@ -7,11 +7,11 @@
 macro(run_tests)
     set(_test_list "")
     foreach(_test ${ARGN})
-        set(testCommand ${CMAKE_CURRENT_BINARY_DIR}/${_test}Exec
+        set(testCommand env "LC_ALL=C.UTF-8" ${CMAKE_CURRENT_BINARY_DIR}/${_test}Exec
               -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml
               -o -,txt)
         add_test(NAME ${_test} COMMAND ${testCommand})
-        add_custom_target(${_test} env "LC_ALL=C" ${testCommand})
+        add_custom_target(${_test} ${testCommand})
         add_executable(${_test}Exec ${_test}.cpp modeltest.cpp)
         qt5_use_modules(${_test}Exec Test Core Qml)
         target_link_libraries(${_test}Exec

=== modified file 'tests/plugins/Utils/timeformattertest.cpp'
--- tests/plugins/Utils/timeformattertest.cpp	2014-01-10 08:47:02 +0000
+++ tests/plugins/Utils/timeformattertest.cpp	2014-09-25 12:44:25 +0000
@@ -17,6 +17,9 @@
  */
 
 #include "timeformatter.h"
+#include "relativetimeformatter.h"
+
+#include <locale.h>
 
 #include <QtTest>
 #include <QDebug>
@@ -24,8 +27,24 @@
 class TimeFormatterTest : public QObject
 {
     Q_OBJECT
+private:
+    void addTestData(QList<int> daysToAdd = QList<int>()) {
+        QTest::addColumn<QDateTime>("time");
+
+        Q_FOREACH(int dayToAdd, daysToAdd) {
+            QDateTime time = QDateTime::currentDateTime().addDays(dayToAdd);
+            QDateTime am(time); am.setTime(QTime(1, 1, 1));
+            QDateTime midday(time); midday.setTime(QTime(12, 0, 0));
+            QDateTime pm(time); pm.setTime(QTime(17, 59, 59));
+
+            QTest::newRow(QString("%1day-am").arg(dayToAdd).toLatin1()) << am;
+            QTest::newRow(QString("%1day-midday").arg(dayToAdd).toLatin1()) << midday;
+            QTest::newRow(QString("%1day-pm").arg(dayToAdd).toLatin1()) << pm;
+        }
+
+    }
+
 private Q_SLOTS:
-
     void initTestCase()
     {
         setenv("UNITY_TEST_ENV", "1", 1);
@@ -36,12 +55,12 @@
         unsetenv("UNITY_TEST_ENV");
     }
 
-    void testFormat()
+    void testTimeFormatter_Format_data() { addTestData(QList<int>() << 0); }
+    void testTimeFormatter_Format()
     {
+        QFETCH(QDateTime, time);
         const QString format = "hh:mm dd.MM.yy";
 
-        QDateTime time = QDateTime::currentDateTime();
-
         TimeFormatter formatter;
         formatter.setTime(time.toMSecsSinceEpoch() * 1000);
         formatter.setFormat(format);
@@ -49,18 +68,96 @@
         QCOMPARE(formatter.timeString(), time.toString(format));
     }
 
-    void testFormatStrF()
+    void tesGDatetTimeFormatter_Format_data() { addTestData(QList<int>() << 0); }
+    void tesGDatetTimeFormatter_Format()
     {
+        QFETCH(QDateTime, time);
         const QString format = "%d-%m-%Y %I:%M%p";
 
-        QDateTime time = QDateTime::currentDateTime();
-
         GDateTimeFormatter formatter;
         formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc
         formatter.setFormat(format);
 
         QCOMPARE(formatter.timeString(), time.toString("dd-MM-yyyy hh:mmAP"));
     }
+
+    void tesRelativeTimeFormatter_FarBack_data() { addTestData(QList<int>() << -200  << -20 << -7); }
+    void tesRelativeTimeFormatter_FarBack()
+    {
+        QFETCH(QDateTime, time);
+
+        RelativeTimeFormatter formatter;
+        formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc
+
+        QCOMPARE(formatter.timeString(), time.toString("ddd dd MMM\u2003HH:mm"));
+    }
+
+    void tesRelativeTimeFormatter_WeekBack_data() { addTestData(QList<int>() << -6 << -2); }
+    void tesRelativeTimeFormatter_WeekBack()
+    {
+        QFETCH(QDateTime, time);
+
+        RelativeTimeFormatter formatter;
+        formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc
+
+        QCOMPARE(formatter.timeString(), time.toString("ddd\u2003HH:mm"));
+    }
+
+    void tesRelativeTimeFormatter_Yesterday_data() { addTestData(QList<int>() << -1); }
+    void tesRelativeTimeFormatter_Yesterday()
+    {
+        QFETCH(QDateTime, time);
+
+        RelativeTimeFormatter formatter;
+        formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc
+
+        QCOMPARE(formatter.timeString(), QString("Yesterday\u2003%1").arg(time.toString("HH:mm")));
+    }
+
+    void tesRelativeTimeFormatter_Today_data() { addTestData(QList<int>() << 0); }
+    void tesRelativeTimeFormatter_Today()
+    {
+        QFETCH(QDateTime, time);
+
+        RelativeTimeFormatter formatter;
+        formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc
+
+        QCOMPARE(formatter.timeString(), time.toString("HH:mm"));
+    }
+
+    void tesRelativeTimeFormatter_Tomorrow_data() { addTestData(QList<int>() << 1); }
+    void tesRelativeTimeFormatter_Tomorrow()
+    {
+        QFETCH(QDateTime, time);
+
+        RelativeTimeFormatter formatter;
+        formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc
+
+        QCOMPARE(formatter.timeString(), QString("Tomorrow\u2003%1").arg(time.toString("HH:mm")));
+    }
+
+
+    void tesRelativeTimeFormatter_WeekForward_data() { addTestData(QList<int>() << 2 << 6); }
+    void tesRelativeTimeFormatter_WeekForward()
+    {
+        QFETCH(QDateTime, time);
+
+        RelativeTimeFormatter formatter;
+        formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc
+
+        QCOMPARE(formatter.timeString(), time.toString("ddd\u2003HH:mm"));
+    }
+
+    void tesRelativeTimeFormatter_FarForward_data() { addTestData(QList<int>() << 7 << 20 << 200); }
+    void tesRelativeTimeFormatter_FarForward()
+    {
+        QFETCH(QDateTime, time);
+
+        RelativeTimeFormatter formatter;
+        formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc
+
+        QCOMPARE(formatter.timeString(), time.toString("ddd dd MMM\u2003HH:mm"));
+    }
 };
 
 QTEST_GUILESS_MAIN(TimeFormatterTest)

=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-07-31 13:31:32 +0000
+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-09-25 12:44:25 +0000
@@ -368,9 +368,9 @@
         function test_create_alarmMenu_data() {
             return [
                 {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),
-                            time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},
+                            time: new Date(2014, 04, 14), timeFormat: "%a %d %b %l:%M %p"},
                 {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),
-                            time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },
+                            time: new Date(2015, 11, 31), timeFormat: "%A" },
             ];
         }
 
@@ -380,11 +380,11 @@
             menuData.sensitive = data.enabled;
             menuData.icon = data.icon;
             menuData.ext = {
-                'xCanonicalTime': data.time,
+                'xCanonicalTime': data.time.getTime() / 1000,
                 'xCanonicalTimeFormat': data.timeFormat
             };
             timeFormatter.format = data.timeFormat;
-            timeFormatter.time = data.time;
+            timeFormatter.time = data.time.getTime() / 1000;
 
             loader.data = menuData;
             loader.sourceComponent = factory.load(menuData);
@@ -400,9 +400,9 @@
         function test_create_appointmentMenu_data() {
             return [
                 {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),
-                            time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},
+                            time: new Date(2014, 04, 14), timeFormat: "%a %d %b %l:%M %p"},
                 {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),
-                            time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },
+                            time: new Date(2015, 11, 31), timeFormat: "%A" },
             ];
         }
 
@@ -413,11 +413,11 @@
             menuData.icon = data.icon;
             menuData.ext = {
                 'xCanonicalColor': data.colour,
-                'xCanonicalTime': data.time,
+                'xCanonicalTime': data.time.getTime() / 1000,
                 'xCanonicalTimeFormat': data.timeFormat
             };
             timeFormatter.format = data.timeFormat;
-            timeFormatter.time = data.time;
+            timeFormatter.time = data.time.getTime() / 1000;
 
             loader.data = menuData;
             loader.sourceComponent = factory.load(menuData);
@@ -488,7 +488,10 @@
             compare(loader.item.text, data.label, "Label does not match data");
             compare(loader.item.iconSource, data.icon, "Icon does not match data");
             compare(loader.item.enabled, data.enabled, "Enabled does not match data");
-            compare(loader.item.control.text, data.buttonText, "Button text does not match data");
+
+            var button = findChild(loader.item, "buttonSectionMenuControl");
+            verify(button !== null);
+            compare(button.text, data.buttonText, "Button text does not match data");
         }
 
         function test_create_wifiSection_data() {
@@ -514,8 +517,8 @@
 
         function test_create_accessPoint_data() {
             return [
-                {label: "testLabel1", enabled: true, checked: false, secure: true, adHoc: false },
-                {label: "testLabel2", enabled: false, checked: true, secure: false, adHoc: true },
+                {label: "testLabel1", enabled: true, active: false, secure: true, adHoc: false },
+                {label: "testLabel2", enabled: false, active: true, secure: false, adHoc: true },
             ];
         }
 
@@ -523,7 +526,7 @@
             menuData.type = "unity.widgets.systemsettings.tablet.accesspoint";
             menuData.label = data.label;
             menuData.sensitive = data.enabled;
-            menuData.isToggled = data.checked;
+            menuData.isToggled = data.active;
             menuData.ext = {
                 'xCanonicalWifiApStrengthAction': "action::strength",
                 'xCanonicalWifiApIsSecure': data.secure,
@@ -539,7 +542,7 @@
             compare(loader.item.strengthAction.name, "action::strength", "Strength action incorrect");
             compare(loader.item.secure, data.secure, "Secure does not match data");
             compare(loader.item.adHoc, data.adHoc, "AdHoc does not match data");
-            compare(loader.item.checked, data.checked, "Checked does not match data");
+            compare(loader.item.active, data.active, "Checked does not match data");
             compare(loader.item.enabled, data.enabled, "Enabled does not match data");
         }
 
@@ -635,7 +638,8 @@
                     album: "album1",
                     running: true,
                     state: "Playing",
-                    enabled: true
+                    enabled: true,
+                    showTrack: true
                 },{
                     label: "player2",
                     icon: "file:://icon2",
@@ -645,7 +649,19 @@
                     album: "album2",
                     running: false,
                     state: "Paused",
-                    enabled: false
+                    enabled: false,
+                    showTrack: false
+                },{
+                    label: "player3",
+                    icon: "file:://icon3",
+                    albumArt: "file:://art3",
+                    song: "song3",
+                    artist: "artist3",
+                    album: "album3",
+                    running: true,
+                    state: "Stopped",
+                    enabled: true,
+                    showTrack: false
                 }
             ];
         }
@@ -675,7 +691,7 @@
             compare(loader.item.song, data.song, "Song does not match data");
             compare(loader.item.artist, data.artist, "Artist does not match data");
             compare(loader.item.album, data.album, "Album does not match data");
-            compare(loader.item.running, data.running, "Running does not match data");
+            compare(loader.item.showTrack, data.showTrack, "Show track does not match data");
             compare(loader.item.state, data.state, "State does not match data");
             compare(loader.item.enabled, data.enabled, "Enabled does not match data");
         }

=== modified file 'tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-06-20 15:13:17 +0000
+++ tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-09-25 12:44:25 +0000
@@ -32,9 +32,8 @@
         menuIndex: 0
     }
 
-    Utils.TimeFormatter {
+    Utils.RelativeTimeFormatter {
         id: timeFormatter
-        format: "hh:mm - MMM dd"
     }
 
     UT.UnityTestCase {
@@ -73,8 +72,8 @@
 
         function test_create_simpleTextmessage_data() {
             return [
-                { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},
-                { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},
+                { title: "Title1", time: new Date(2013, 10, 10), body: "This is a text message 1", avatar: "file:///avatar1", icon: "file:///appIcon1", enabled: true},
+                { title: "Title2", time: new Date(2014, 12, 10), body: "This is a text message 2", avatar: "file:///avatar2", icon: "file:///appIcon2", enabled: false},
             ];
         }
 
@@ -83,30 +82,27 @@
             menuData.label = data.title;
             menuData.sensitive = data.enabled;
             menuData.ext = {
-                'xCanonicalTime': data.time,
-                'xCanonicalText': data.message,
+                'xCanonicalTime': data.time.getTime()*1000,
+                'xCanonicalText': data.body,
                 'icon': data.avatar,
-                'xCanonicalAppIcon': data.appIcon,
+                'xCanonicalAppIcon': data.icon,
             };
             factory.menuData = menuData;
-            timeFormatter.time = data.time;
-
-            var loader = findChild(factory, "loader");
-            verify(loader !== undefined);
-
-            tryCompare(loader.item, "objectName", "simpleTextMessage");
-            compare(loader.item.title, data.title, "Title does not match data");
-            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
-            compare(loader.item.message, data.message, "Message does not match data");
-            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
-            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
-            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
+            timeFormatter.time = data.time.getTime()/1000;
+
+            tryCompare(factory.item, "objectName", "simpleTextMessage");
+            compare(factory.item.title, data.title, "Title does not match data");
+            compare(factory.item.time, timeFormatter.timeString, "Time does not match data");
+            compare(factory.item.body, data.body, "Message does not match data");
+            compare(factory.item.avatar, data.avatar, "Avatar does not match data");
+            compare(factory.item.icon, data.icon, "App icon does not match data");
+            compare(factory.item.enabled, data.enabled, "Enabled does not match data");
         }
 
         function test_create_textmessage_data() {
             return [
-                { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},
-                { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},
+                { title: "Title1", time: new Date(2013, 10, 10), body: "This is a text message 1", avatar: "file:///avatar1", icon: "file:///appIcon1", enabled: true},
+                { title: "Title2", time: new Date(2014, 12, 10), body: "This is a text message 2", avatar: "file:///avatar2", icon: "file:///appIcon2", enabled: false},
             ];
         }
 
@@ -115,10 +111,10 @@
             menuData.label = data.title;
             menuData.sensitive = data.enabled;
             menuData.ext = {
-                'xCanonicalTime': data.time,
-                'xCanonicalText': data.message,
+                'xCanonicalTime': data.time.getTime()*1000,
+                'xCanonicalText': data.body,
                 'icon': data.avatar,
-                'xCanonicalAppIcon': data.appIcon,
+                'xCanonicalAppIcon': data.icon,
                 'xCanonicalMessageActions': [{
                         'parameter-type': "s",
                         'name': "action::reply",
@@ -127,25 +123,22 @@
                 ]
             };
             factory.menuData = menuData;
-            timeFormatter.time = data.time;
-
-            var loader = findChild(factory, "loader");
-            verify(loader !== undefined);
-
-            tryCompare(loader.item, "objectName", "textMessage");
-            compare(loader.item.title, data.title, "Title does not match data");
-            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
-            compare(loader.item.message, data.message, "Message does not match data");
-            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
-            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
-            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
+            timeFormatter.time = data.time.getTime()/1000;
+
+            tryCompare(factory.item, "objectName", "textMessage");
+            compare(factory.item.title, data.title, "Title does not match data");
+            compare(factory.item.time, timeFormatter.timeString, "Time does not match data");
+            compare(factory.item.body, data.body, "Message does not match data");
+            compare(factory.item.avatar, data.avatar, "Avatar does not match data");
+            compare(factory.item.icon, data.icon, "App icon does not match data");
+            compare(factory.item.enabled, data.enabled, "Enabled does not match data");
         }
 
 
         function test_create_snapDecision_data() {
             return [
-                { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},
-                { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},
+                { title: "Title1", time: new Date(2013, 10, 10), body: "This is a text message 1", avatar: "file:///avatar1", icon: "file:///appIcon1", enabled: true},
+                { title: "Title2", time: new Date(2014, 12, 10), body: "This is a text message 2", avatar: "file:///avatar2", icon: "file:///appIcon2", enabled: false},
             ];
         }
 
@@ -154,10 +147,10 @@
             menuData.label = data.title;
             menuData.sensitive = data.enabled;
             menuData.ext = {
-                'xCanonicalTime': data.time,
-                'xCanonicalText': data.message,
+                'xCanonicalTime': data.time.getTime()*1000,
+                'xCanonicalText': data.body,
                 'icon': data.avatar,
-                'xCanonicalAppIcon': data.appIcon,
+                'xCanonicalAppIcon': data.icon,
                 'xCanonicalMessageActions': [{
                         'name': "action::callback",
                         'label': "Callback1"
@@ -169,18 +162,15 @@
                 ]
             };
             factory.menuData = menuData;
-            timeFormatter.time = data.time;
-
-            var loader = findChild(factory, "loader");
-            verify(loader !== undefined);
-
-            tryCompare(loader.item, "objectName", "snapDecision");
-            compare(loader.item.title, data.title, "Title does not match data");
-            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
-            compare(loader.item.message, data.message, "Message does not match data");
-            compare(loader.item.avatar, data.avatar, "Avatar does not match data");
-            compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
-            compare(loader.item.enabled, data.enabled, "Enabled does not match data");
+            timeFormatter.time = data.time.getTime()/1000;
+
+            tryCompare(factory.item, "objectName", "snapDecision");
+            compare(factory.item.title, data.title, "Title does not match data");
+            compare(factory.item.time, timeFormatter.timeString, "Time does not match data");
+            compare(factory.item.body, data.body, "Message does not match data");
+            compare(factory.item.avatar, data.avatar, "Avatar does not match data");
+            compare(factory.item.icon, data.icon, "App icon does not match data");
+            compare(factory.item.enabled, data.enabled, "Enabled does not match data");
         }
 
     }

=== modified file 'tests/qmltests/Panel/tst_Indicators.qml'
--- tests/qmltests/Panel/tst_Indicators.qml	2014-05-07 13:59:58 +0000
+++ tests/qmltests/Panel/tst_Indicators.qml	2014-09-25 12:44:25 +0000
@@ -173,7 +173,7 @@
         function test_row_visible_menuContent_visible(data) {
             indicators.show();
 
-            var indicatorTabs = findChild(indicators, "tabs");
+            var contentListView = findChild(indicators, "indicatorsContentListView");
             var indicatorRowItems = findChild(indicators, "indicatorRowItems");
 
             var count = data.visible.length
@@ -194,19 +194,19 @@
                 tryCompareFunction(function() { return findChild(indicatorRowItems, widgetName) !== null }, data.visible[i]);
 
                 // check for tab
-                tryCompareFunction(function() { return findChild(indicatorTabs, pageName) !== null }, data.visible[i]);
+                tryCompareFunction(function() { return findChild(contentListView, pageName) !== null }, data.visible[i]);
             }
         }
 
-        function test_indicator_visible_correct_tabs_data() { return [
-            {tag: "current-first", currentIndex: 0, visible: [false, true, true, true, true], expectedIndex: 0, expectedTab: "indicator-fake2"  },
-            {tag: "current-last", currentIndex: 4, visible: [true, true, true, true, false], expectedIndex: 3, expectedTab: "indicator-fake4" },
-            {tag: "after", currentIndex: 0, visible: [true, false, true, true, true], expectedIndex: 0, expectedTab: "indicator-fake1" },
-            {tag: "before", currentIndex: 1, visible: [false, true, true, true, true], expectedIndex: 1, expectedTab: "indicator-fake2" }];
+        function test_indicator_visible_correct_menu_data() { return [
+            {tag: "current-first", currentIndex: 0, visible: [false, true, true, true, true], expectedIndex: 0, expextedMenu: "indicator-fake2"  },
+            {tag: "current-last", currentIndex: 4, visible: [true, true, true, true, false], expectedIndex: 3, expextedMenu: "indicator-fake4" },
+            {tag: "after", currentIndex: 0, visible: [true, false, true, true, true], expectedIndex: 0, expextedMenu: "indicator-fake1" },
+            {tag: "before", currentIndex: 1, visible: [false, true, true, true, true], expectedIndex: 1, expextedMenu: "indicator-fake2" }];
         }
 
-        function test_indicator_visible_correct_tabs(data) {
-            var indicatorTabs = findChild(indicators, "tabs");
+        function test_indicator_visible_correct_menu(data) {
+            var contentListView = findChild(indicators, "indicatorsContentListView");
             var indicatorRow = findChild(indicators, "indicatorRow");
 
             indicators.show();
@@ -223,7 +223,7 @@
             tryCompare(indicatorRow, "currentItemIndex", data.expectedIndex);
 
             // check for current selected tab
-            tryCompareFunction(function() { return findChild(indicatorTabs, data.expectedTab) === indicatorTabs.selectedTab }, true);
+            tryCompareFunction(function() { return findChild(contentListView, data.expextedMenu) === contentListView.currentItem }, true);
 
         }
     }

=== modified file 'tests/qmltests/Panel/tst_MenuContent.qml'
--- tests/qmltests/Panel/tst_MenuContent.qml	2014-03-03 11:55:00 +0000
+++ tests/qmltests/Panel/tst_MenuContent.qml	2014-09-25 12:44:25 +0000
@@ -47,7 +47,6 @@
     MenuContent {
         id: menuContent
         indicatorsModel: indicatorsModel
-        contentReleaseInterval: 50
         height: parent.height - 50
     }
 
@@ -91,22 +90,22 @@
         return "indicator-fake" + (index + 1) + "-page";
     }
 
-    property string testTabObjectName : ""
-
-    function selected_tab_equals_test_tab() {
-        var currentTab = menu_content_test.findChild(menuContent, "tabs").selectedTab
-        if (currentTab === null) {
-            console.log("selected tab undefined");
-            return false;
-        }
-
-        var testTab = menu_content_test.findChild(menuContent, testTabObjectName);
-        if (testTab === null) {
-            console.log("test_tab " + testTabObjectName + " undefined");
-            return false;
-        }
-
-        return testTab == currentTab;
+    property string testItemObjectName : ""
+
+    function current_item_equals_test_item() {
+        var currentItem = menu_content_test.findChild(menuContent, "indicatorsContentListView").currentItem
+        if (currentItem === null) {
+            console.log("current item undefined");
+            return false;
+        }
+
+        var testItem = menu_content_test.findChild(menuContent, testItemObjectName);
+        if (testItem === null) {
+            console.log("testItem " + testItemObjectName + " undefined");
+            return false;
+        }
+
+        return testItem === currentItem;
     }
 
     UT.UnityTestCase {
@@ -114,63 +113,22 @@
         name: "MenuContentTest"
         when: windowShown
 
-        function init() {
-            if (menuContent.__contentActive)
-                menuContent.releaseContent();
-            tryCompare(menuContent, "__contentActive", false);
-        }
-
         // Check that the correct menus are displayed for the requested item.
         function test_show_menu() {
             var menuCount = indicatorsModel.count;
             verify(menuCount > 0, "Menu count should be greater than zero");
 
-            var tabs = menu_content_test.findChild(menuContent, "tabs")
+            var listView = menu_content_test.findChild(menuContent, "indicatorsContentListView")
+            verify(listView !== null)
 
             // Loop over twice to test jump between last and first.
             for (var i = 0; i < menuCount*2; i++) {
-
                 var menuIndex = i%menuCount;
 
                 activate_content(menuIndex);
-                testTabObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);
-                compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");
-                tryCompareFunction(selected_tab_equals_test_tab, true);
-            }
-        }
-
-        // Calling activateContent should call start on all menus
-        function test_activate_content() {
-            var menuCount = indicatorsModel.count;
-            verify(menuCount > 0, "Menu count should be greater than zero");
-
-            // Ensure all the menus are stopped first
-            menuContent.__contentActive = false;
-            for (var i = 0; i < menuCount; i++) {
-                tryCompare(indicator_status[get_test_menu_objecName(i)], "started", false);
-            }
-
-            // activate content the content to call stop.
-            menuContent.activateContent();
-            for (var i = 0; i < menuCount; i++) {
-                tryCompare(indicator_status[get_test_menu_objecName(i)], "started", true);
-            }
-        }
-
-        // Calling activateContent should call stop on all menus.
-        function test_release_content() {
-            var menuCount = indicatorsModel.count;
-            verify(menuCount > 0, "Menu count should be greater than zero");
-
-            // Ensure all the menus are started first
-            menuContent.__contentActive = true;
-            for (var i = 0; i < menuCount; i++) {
-                tryCompare(indicator_status[get_test_menu_objecName(i)], "started", true);
-            }
-            // release the content to call stop.
-            menuContent.releaseContent();
-            for (var i = 0; i < menuCount; i++) {
-                tryCompare(indicator_status[get_test_menu_objecName(i)], "started", false);
+                testItemObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);
+                compare(listView.currentIndex, menuIndex, "Current tab index does not match selected tab index");
+                tryCompareFunction(current_item_equals_test_item, true);
             }
         }