Merge lp://staging/~mzanetti/reminders-app/notes-headers into lp://staging/~notes-app-dev/reminders-app/new-design

Just one thing I've noticed at a quick glance before testing it on a device:

61 + return QStringLiteral("Today");

This string (and all of those inside that same function) needs to be internationalized, either using the i18n plugin from the SDK (I still couldn't figure out whether it can be used from C++ or only from QML) or with plain gettext (which should work in any case).

107 +// sort(0, Qt::DescendingOrder);

Why has the sorting been commented out?

> 107 +// sort(0, Qt::DescendingOrder);
>
> Why has the sorting been commented out?

good catch :D I hoped to sneak them in with noone noticing :D

No, this disables sorting, which works around *the* bug. I thought as long as this won't end up in trunk (and as long as I don't have the patch on my desktop-qt) I'd just work around it. Will enable them back when merging to trunk or when the qt patch hits my and Ricardo's desktops, whichever comes first.

Looking at my list of notes, they all now get put under the "Last week" section, when they're clearly older than that.

See the screenshot at http://i.imgur.com/NDDRjyv.png

> Just one thing I've noticed at a quick glance before testing it on a device:
>
> 61 + return QStringLiteral("Today");
>
> This string (and all of those inside that same function) needs to be
> internationalized, either using the i18n plugin from the SDK (I still couldn't
> figure out whether it can be used from C++ or only from QML) or with plain
> gettext (which should work in any case).

fixed

Michael, I think even before the new design lands, this is a really cool improvement already on the notes list. As I'm guessing the new design might not be ready by the end of the week when we'd like to talk to the Evernote guys, do you think it might be worth splitting this into two branches, so that we can land this already, independently of the new design (i.e. landing this without the coloured note titles)?