Merge lp:~mzanetti/reminders-app/add-image-support into lp:reminders-app

[Michael Zanetti]

added support for image resources and greatly improve editor compatibility

This adds support for fetching resources (e.g. images) with notes. To make use of that I've improved the editor's compatibility to enml. We can now display in-text images and TODOs (aka. checkboxes), support tables and most of the rich text.

This screenshot shows the current state: http://i.imgur.com/yeSEhiH.png

The TODOs are a bit of a problem because we can't embed checkbox controls into the TextEdit. We can tho (and that's what I'm doing in this merge) replace the checkboxes with images of checkboxes. The downside is that they aren't interactive. Maybe we can find some way to figure the image's position and put an overlaying MouseArea on top to toggle them but a first glance at it tells me that it's gonna be really tricky. Another idea would be to put an entry "manage TODOs" into the toolbar and open a sheet containing only the todos and real checkboxes there. Changing the checkboxes in there would then update the image in the text. Let's ask design for their opinion on this.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:28
http://91.189.93.70:8080/job/reminders-app-ci/41/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/451
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/41

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/41/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I get no image on device.

http://imgur.com/Ku8Z5GE vs http://popey.com/~alan/phablet/device-2013-12-29-140258.png

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> I get no image on device.
>
> http://imgur.com/Ku8Z5GE vs
> http://popey.com/~alan/phablet/device-2013-12-29-140258.png

Just tried again. Works fine here. Can you provide more details please? Is there any debug output hinting to an error or the like?

[David Planella (dpm)]

This worked for me:

http://ubuntuone.com/5Q4VcczoiRzc1hlFL9Wrkg

[David Planella (dpm)]

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/18/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/630/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-autolanding/18/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/18/console

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Hm, looking at Jenkins' output, it shows "bzr: ERROR: Conflicts from merge", but I don't see any conflicts coming from the MP in LP.

http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/18/console

[David Planella (dpm)]

Ah, trying to merge manually shows the actual conflicts:

RM src/plugin/Evernote/utils/html2enmlconverter.cpp => src/plugin/Evernote/utils/enmldocument.cpp
RM src/plugin/Evernote/utils/html2enmlconverter.h => src/plugin/Evernote/utils/enmldocument.h
Text conflict in src/plugin/Evernote/utils/enmldocument.cpp
Text conflict in src/plugin/Evernote/utils/enmldocument.h
2 conflicts encountered.

review: Needs Fixing

[lp:~mzanetti/reminders-app/add-image-support]

29. By Michael Zanetti on 2014-01-10

merge trunk

[Michael Zanetti (mzanetti)]

conflicts resolved

[David Planella (dpm)]

Works well after fixing the conflicts!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	2013-12-14 00:07:30 +0000
+++ src/app/qml/components/NotesDelegate.qml	2014-01-10 09:05:41 +0000
@@ -27,6 +27,7 @@
     property string title
     property date creationDate
     property string content
+    property string resource
 
     Column {
         id: contentColumn
@@ -36,7 +37,7 @@
             topMargin: units.gu(1)
             left: parent.left
             leftMargin: units.gu(2)
-            right: parent.right
+            right: resourceImage.left
             rightMargin: units.gu(2)
         }
         Label {
@@ -53,4 +54,11 @@
             maximumLineCount: 2
         }
     }
+
+    Image {
+        id: resourceImage
+        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
+        source: root.resource
+        sourceSize.height: height
+    }
 }
 
=== added directory 'src/app/qml/images'
=== added file 'src/app/qml/images/unchecked.svg'
--- src/app/qml/images/unchecked.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/unchecked.svg	2014-01-10 09:05:41 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="90"
+   height="90"
+   id="svg3140">
+  <defs
+     id="defs12" />
+  <metadata
+     id="metadata3145">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     width="90"
+     height="90"
+     x="0"
+     y="-1.4648437e-05"
+     id="rect4198"
+     style="color:#000000;fill:none" />
+  <path
+     d="m 6,24 v 42 c 0,18 3,18 30,18 h 18 c 27,0 30,0 30,-18 V 24 C 84,6 81,6 54,6 H 36 C 9,6 6,6 6,24 z M 36,12 h 18 c 24,0 24,0 24,12 v 42 c 0,12 0,12 -24,12 H 36 C 12,78 12,78 12,66 V 24 C 12,12 12,12 36,12 z"
+     id="path3759"
+     style="fill:#808080" />
+  <rect
+     width="90"
+     height="90"
+     x="0"
+     y="1.7382999e-05"
+     id="rect3045"
+     style="color:#000000;fill:none" />
+</svg>
 
=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2013-12-13 23:59:53 +0000
+++ src/app/qml/ui/NotePage.qml	2014-01-10 09:05:41 +0000
@@ -33,7 +33,7 @@
             width: parent.width
             text: "save"
             onClicked: {
-                note.content = noteTextArea.text
+                note.htmlContent = noteTextArea.text
                 note.save();
             }
         }
@@ -44,7 +44,7 @@
             height: parent.height - y
 
             textFormat: TextEdit.RichText
-            text: note.content
+            text: note.htmlContent
         }
     }
 }
 
=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-12-13 23:39:24 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-01-10 09:05:41 +0000
@@ -70,7 +70,8 @@
         delegate: NotesDelegate {
             title: model.title
             creationDate: model.created
-            content: NotesStore.note(model.guid).plaintextContent
+            content: model.plaintextContent
+            resource: model.resources.length > 0 ? model.resources[0] : ""
 
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})
 
=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml	2013-12-13 23:39:24 +0000
+++ src/app/qml/ui/SearchNotesPage.qml	2014-01-10 09:05:41 +0000
@@ -68,7 +68,7 @@
             delegate: NotesDelegate {
                 title: model.title
                 creationDate: model.created
-                content: NotesStore.note(model.guid).plaintextContent
+                content: model.plaintextContent
 
                 onClicked: {
                     pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})
 
=== modified file 'src/plugin/Evernote/Evernote.pro'
--- src/plugin/Evernote/Evernote.pro	2013-12-12 22:41:35 +0000
+++ src/plugin/Evernote/Evernote.pro	2014-01-10 09:05:41 +0000
@@ -1,7 +1,7 @@
 TARGET=evernoteplugin
 TEMPLATE=lib
 CONFIG = qt plugin
-QT += qml gui xml
+QT += qml gui xml quick
 QMAKE_CXXFLAGS += -std=c++0x -fPIC
 
 INCLUDEPATH += ../../../3rdParty/evernote-sdk-cpp/src/ ../../../3rdParty/libthrift
@@ -23,13 +23,14 @@
     jobs/evernotejob.cpp \
     jobs/savenotejob.cpp \
     jobs/deletenotejob.cpp \
-    utils/html2enmlconverter.cpp \
     evernoteconnection.cpp \
     jobs/userstorejob.cpp \
     jobs/notesstorejob.cpp \
     jobs/fetchusernamejob.cpp \
     jobs/createnotebookjob.cpp \
-    jobs/expungenotebookjob.cpp
+    jobs/expungenotebookjob.cpp \
+    resourceimageprovider.cpp \
+    utils/enmldocument.cpp
 
 HEADERS += evernoteplugin.h \
     notesstore.h \
@@ -45,13 +46,14 @@
     jobs/evernotejob.h \
     jobs/savenotejob.h \
     jobs/deletenotejob.h \
-    utils/html2enmlconverter.h \
     evernoteconnection.h \
     jobs/userstorejob.h \
     jobs/notesstorejob.h \
     jobs/fetchusernamejob.h \
     jobs/createnotebookjob.h \
-    jobs/expungenotebookjob.h
+    jobs/expungenotebookjob.h \
+    resourceimageprovider.h \
+    utils/enmldocument.h
 
 message(building in $$OUT_PWD)
 LIBS += -L$$OUT_PWD/../../../3rdParty/evernote-sdk-cpp/ -L$$OUT_PWD/../../../3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto
 
=== modified file 'src/plugin/Evernote/evernoteplugin.cpp'
--- src/plugin/Evernote/evernoteplugin.cpp	2013-11-28 00:39:33 +0000
+++ src/plugin/Evernote/evernoteplugin.cpp	2014-01-10 09:05:41 +0000
@@ -26,6 +26,7 @@
 #include "notes.h"
 #include "notebooks.h"
 #include "note.h"
+#include "resourceimageprovider.h"
 
 #include <QtQml>
 
@@ -44,7 +45,7 @@
     return EvernoteConnection::instance();
 }
 
-void FitBitPlugin::registerTypes(const char *uri)
+void EvernotePlugin::registerTypes(const char *uri)
 {
     qmlRegisterSingletonType<UserStore>("Evernote", 0, 1, "UserStore", userStoreProvider);
     qmlRegisterSingletonType<NotesStore>("Evernote", 0, 1, "NotesStore", notesStoreProvider);
@@ -54,3 +55,8 @@
     qmlRegisterType<Notebooks>("Evernote", 0, 1, "Notebooks");
     qmlRegisterUncreatableType<Note>("Evernote", 0, 1, "Note", "Cannot create Notes in QML. Use NotesStore.createNote() instead.");
 }
+
+void EvernotePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    engine->addImageProvider("resource", new ResourceImageProvider);
+}
 
=== modified file 'src/plugin/Evernote/evernoteplugin.h'
--- src/plugin/Evernote/evernoteplugin.h	2013-11-21 23:30:15 +0000
+++ src/plugin/Evernote/evernoteplugin.h	2014-01-10 09:05:41 +0000
@@ -23,12 +23,13 @@
 
 #include <QQmlExtensionPlugin>
 
-class FitBitPlugin : public QQmlExtensionPlugin
+class EvernotePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:    
     void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
 };
 
 #endif // FITBITPLUGIN_H
 
=== modified file 'src/plugin/Evernote/jobs/evernotejob.cpp'
--- src/plugin/Evernote/jobs/evernotejob.cpp	2013-12-12 22:41:35 +0000
+++ src/plugin/Evernote/jobs/evernotejob.cpp	2014-01-10 09:05:41 +0000
@@ -83,7 +83,7 @@
 
 
     } catch (const evernote::edam::EDAMUserException &e) {
-        qWarning() << "EDAMUserException" << e.what();
+        qWarning() << "EDAMUserException" << e.what() << e.errorCode;
         emitJobDone(EvernoteConnection::ErrorCodeUserException, e.what());
     } catch (const evernote::edam::EDAMSystemException &e) {
         qWarning() << "EDAMSystemException" << e.what();
 
=== modified file 'src/plugin/Evernote/jobs/fetchnotejob.cpp'
--- src/plugin/Evernote/jobs/fetchnotejob.cpp	2013-12-13 23:59:53 +0000
+++ src/plugin/Evernote/jobs/fetchnotejob.cpp	2014-01-10 09:05:41 +0000
@@ -28,7 +28,7 @@
 
 void FetchNoteJob::startJob()
 {
-    client()->getNote(m_result, token().toStdString(), m_guid.toStdString(), true, false, false, false);
+    client()->getNote(m_result, token().toStdString(), m_guid.toStdString(), true, true, false, false);
 }
 
 void FetchNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
 
=== modified file 'src/plugin/Evernote/jobs/savenotejob.cpp'
--- src/plugin/Evernote/jobs/savenotejob.cpp	2013-12-12 21:36:17 +0000
+++ src/plugin/Evernote/jobs/savenotejob.cpp	2014-01-10 09:05:41 +0000
@@ -42,9 +42,9 @@
     note.__isset.title = true;
     note.notebookGuid = m_note->notebookGuid().toStdString();
     note.__isset.notebookGuid = true;
-    note.content = m_note->content().toStdString();
+    note.content = m_note->enmlContent().toStdString();
     note.__isset.content = true;
-    note.contentLength = m_note->content().length();
+    note.contentLength = m_note->enmlContent().length();
 
     note.__isset.attributes = true;
     note.attributes.reminderOrder = m_note->reminderOrder();
 
=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2013-12-13 23:39:24 +0000
+++ src/plugin/Evernote/note.cpp	2014-01-10 09:05:41 +0000
@@ -21,9 +21,10 @@
 #include "note.h"
 
 #include "notesstore.h"
-#include "utils/html2enmlconverter.h"
 
 #include <QDateTime>
+#include <QUrl>
+#include <QUrlQuery>
 #include <QDebug>
 
 Note::Note(const QString &guid, const QDateTime &created, QObject *parent) :
@@ -70,24 +71,35 @@
     }
 }
 
-QString Note::content() const
-{
-    return m_content;
-}
-
-void Note::setContent(const QString &content)
-{
-    if (m_content != content) {
-        m_content = content;
-        m_plaintextContent = Html2EnmlConverter::enml2plaintext(content);
-        qDebug() << "plaintext content is" << m_plaintextContent;
+QString Note::enmlContent() const
+{
+    return m_content.enml();
+}
+
+void Note::setEnmlContent(const QString &enmlContent)
+{
+    if (m_content.enml() != enmlContent) {
+        m_content.setEnml(enmlContent);
+        emit contentChanged();
+    }
+}
+
+QString Note::htmlContent() const
+{
+    return m_content.html(m_guid);
+}
+
+void Note::setHtmlContent(const QString &htmlContent)
+{
+    if (m_content.html(m_guid) != htmlContent) {
+        m_content.setHtml(htmlContent);
         emit contentChanged();
     }
 }
 
 QString Note::plaintextContent() const
 {
-    return m_plaintextContent;
+    return m_content.plaintext();
 }
 
 bool Note::reminder() const
@@ -171,12 +183,37 @@
     }
 }
 
+QStringList Note::resources() const
+{
+    QList<QString> ret;
+    foreach (const QString &hash, m_resources.keys()) {
+        QUrl url("image://resource/" + m_resourceTypes.value(hash));
+        QUrlQuery arguments;
+        arguments.addQueryItem("noteGuid", m_guid);
+        arguments.addQueryItem("hash", hash.toLocal8Bit().toHex());
+        url.setQuery(arguments);
+        ret << url.toString();
+    }
+    return ret;
+}
+
+QImage Note::resource(const QString &hash)
+{
+    return m_resources.value(hash);
+}
+
+void Note::addResource(const QString &hash, const QImage &image, const QString &type)
+{
+    m_resources.insert(hash, image);
+    m_resourceTypes.insert(hash, type);
+}
+
 Note *Note::clone()
 {
     Note *note = new Note(m_guid, m_created);
     note->setNotebookGuid(m_notebookGuid);
     note->setTitle(m_title);
-    note->setContent(m_content);
+    note->setEnmlContent(m_content.enml());
     note->setReminderOrder(m_reminderOrder);
     note->setReminderTime(m_reminderTime);
     note->setReminderDoneTime(m_reminderDoneTime);
 
=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2013-12-29 14:10:30 +0000
+++ src/plugin/Evernote/note.h	2014-01-10 09:05:41 +0000
@@ -21,9 +21,12 @@
 #ifndef NOTE_H
 #define NOTE_H
 
+#include "utils/enmldocument.h"
+
 #include <QObject>
 #include <QDateTime>
 #include <QStringList>
+#include <QImage>
 
 class Note : public QObject
 {
@@ -34,8 +37,10 @@
     Q_PROPERTY(QString notebookGuid READ notebookGuid WRITE setNotebookGuid NOTIFY notebookGuidChanged)
     Q_PROPERTY(QDateTime created READ created CONSTANT)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
-    Q_PROPERTY(QString content READ content WRITE setContent NOTIFY contentChanged)
+    Q_PROPERTY(QString htmlContent READ htmlContent WRITE setHtmlContent NOTIFY contentChanged)
+    Q_PROPERTY(QString enmlContent READ enmlContent WRITE setEnmlContent NOTIFY contentChanged)
     Q_PROPERTY(QString plaintextContent READ plaintextContent NOTIFY contentChanged)
+    Q_PROPERTY(QList<QString> resources READ resources NOTIFY contentChanged)
     Q_PROPERTY(bool reminder READ reminder WRITE setReminder NOTIFY reminderChanged)
     Q_PROPERTY(QDateTime reminderTime READ reminderTime WRITE setReminderTime NOTIFY reminderTimeChanged)
     Q_PROPERTY(bool reminderDone READ reminderDone WRITE setReminderDone NOTIFY reminderDoneChanged)
@@ -56,11 +61,13 @@
     QString title() const;
     void setTitle(const QString &title);
 
-    QString content() const;
-    void setContent(const QString &content);
+    QString enmlContent() const;
+    void setEnmlContent(const QString &enmlContent);
+
+    QString htmlContent() const;
+    void setHtmlContent(const QString &htmlContent);
 
     QString plaintextContent() const;
-    void setPlaintextContent(const QString &plaintextContent);
 
     // This is the QML representation as we don't want to deal with timestamps there.
     // setting it to false will reset the reminderOrder to 0, setting it to true will
@@ -86,6 +93,10 @@
     bool isSearchResult() const;
     void setIsSearchResult(bool isSearchResult);
 
+    QStringList resources() const;
+    QImage resource(const QString &hash);
+    void addResource(const QString &hash, const QImage &image, const QString &type);
+
     Note* clone();
 
 public slots:
@@ -106,12 +117,13 @@
     QString m_notebookGuid;
     QDateTime m_created;
     QString m_title;
-    QString m_content;
-    QString m_plaintextContent;
+    EnmlDocument m_content;
     qint64 m_reminderOrder;
     QDateTime m_reminderTime;
     QDateTime m_reminderDoneTime;
     bool m_isSearchResult;
+    QHash<QString, QImage> m_resources;
+    QHash<QString, QString> m_resourceTypes;
 };
 
 #endif // NOTE_H
 
=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-12-13 23:59:53 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-01-10 09:05:41 +0000
@@ -23,7 +23,7 @@
 #include "notebooks.h"
 #include "notebook.h"
 #include "note.h"
-#include "utils/html2enmlconverter.h"
+#include "utils/enmldocument.h"
 
 #include "jobs/fetchnotesjob.h"
 #include "jobs/fetchnotebooksjob.h"
@@ -34,6 +34,7 @@
 #include "jobs/createnotebookjob.h"
 #include "jobs/expungenotebookjob.h"
 
+#include <QImage>
 #include <QDebug>
 
 NotesStore* NotesStore::s_instance = 0;
@@ -84,6 +85,14 @@
         return m_notes.at(index.row())->reminderDone();
     case RoleReminderDoneTime:
         return m_notes.at(index.row())->reminderDoneTime();
+    case RoleEnmlContent:
+        return m_notes.at(index.row())->enmlContent();
+    case RoleHtmlContent:
+        return m_notes.at(index.row())->htmlContent();
+    case RolePlaintextContent:
+        return m_notes.at(index.row())->plaintextContent();
+    case RoleResources:
+        return m_notes.at(index.row())->resources();
     }
     return QVariant();
 }
@@ -99,6 +108,10 @@
     roles.insert(RoleReminderTime, "reminderTime");
     roles.insert(RoleReminderDone, "reminderDone");
     roles.insert(RoleReminderDoneTime, "reminderDoneTime");
+    roles.insert(RoleEnmlContent, "enmlContent");
+    roles.insert(RoleHtmlContent, "htmlContent");
+    roles.insert(RolePlaintextContent, "plaintextContent");
+    roles.insert(RoleResources, "resources");
     return roles;
 }
 
@@ -209,7 +222,17 @@
     Note *note = m_notesHash.value(QString::fromStdString(result.guid));
     note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
     note->setTitle(QString::fromStdString(result.title));
-    note->setContent(QString::fromStdString(result.content));
+
+    // Resources need to be set before the content because otherwise the image provider won't find them when the content is updated in the ui
+    for (int i = 0; i < result.resources.size(); ++i) {
+        evernote::edam::Resource resource = result.resources.at(i);
+        if (QString::fromStdString(resource.mime).startsWith("image/")) {
+            QImage image = QImage::fromData((const uchar*)resource.data.body.data(), resource.data.size);
+            note->addResource(QString::fromStdString(resource.data.bodyHash), image, QString::fromStdString(resource.mime));
+        }
+    }
+
+    note->setEnmlContent(QString::fromStdString(result.content));
     note->setReminderOrder(result.attributes.reminderOrder);
     QDateTime reminderDoneTime;
     if (result.attributes.reminderDoneTime > 0) {
@@ -274,7 +297,7 @@
     Note *note = new Note(guid, created, this);
     note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
     note->setTitle(QString::fromStdString(result.title));
-    note->setContent(QString::fromStdString(result.content));
+    note->setEnmlContent(QString::fromStdString(result.content));
 
     beginInsertRows(QModelIndex(), m_notes.count(), m_notes.count());
     m_notesHash.insert(note->guid(), note);
@@ -287,10 +310,6 @@
 void NotesStore::saveNote(const QString &guid)
 {
     Note *note = m_notesHash.value(guid);
-
-    QString enml = Html2EnmlConverter::html2enml(note->content());
-    note->setContent(enml);
-
     SaveNoteJob *job = new SaveNoteJob(note, this);
     connect(job, &SaveNoteJob::jobDone, this, &NotesStore::saveNoteJobDone);
     EvernoteConnection::instance()->enqueue(job);
 
=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2013-12-18 20:57:07 +0000
+++ src/plugin/Evernote/notesstore.h	2014-01-10 09:05:41 +0000
@@ -57,7 +57,11 @@
         RoleReminderTime,
         RoleReminderDone,
         RoleReminderDoneTime,
-        RoleIsSearchResult
+        RoleIsSearchResult,
+        RoleEnmlContent,
+        RoleHtmlContent,
+        RolePlaintextContent,
+        RoleResources
     };
 
     ~NotesStore();
 
=== added file 'src/plugin/Evernote/resourceimageprovider.cpp'
--- src/plugin/Evernote/resourceimageprovider.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/resourceimageprovider.cpp	2014-01-10 09:05:41 +0000
@@ -0,0 +1,42 @@
+#include "resourceimageprovider.h"
+
+#include <notesstore.h>
+#include <note.h>
+
+#include <QUrlQuery>
+#include <QDebug>
+
+ResourceImageProvider::ResourceImageProvider():
+    QQuickImageProvider(QQuickImageProvider::Image)
+{
+
+}
+
+QImage ResourceImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
+{
+    QUrlQuery arguments(id.split('?').last());
+    QString noteGuid = arguments.queryItemValue("noteGuid");
+    QString resourceHash = arguments.queryItemValue("hash");
+    Note *note = NotesStore::instance()->note(noteGuid);
+    if (!note) {
+        qWarning() << "Unable to find note for resource:" << id;
+        return QImage();
+    }
+
+    QByteArray binHash = QByteArray::fromHex(resourceHash.toLatin1());
+
+    QImage image = NotesStore::instance()->note(noteGuid)->resource(binHash);
+    *size = image.size();
+
+    if (requestedSize.isValid()) {
+        if (requestedSize.height() > 0 && requestedSize.width() > 0) {
+            image = image.scaled(requestedSize);
+        } else if (requestedSize.height() > 0) {
+            image = image.scaledToHeight(requestedSize.height());
+        } else {
+            image = image.scaledToWidth(requestedSize.width());
+        }
+        *size = requestedSize;
+    }
+    return image;
+}
 
=== added file 'src/plugin/Evernote/resourceimageprovider.h'
--- src/plugin/Evernote/resourceimageprovider.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/resourceimageprovider.h	2014-01-10 09:05:41 +0000
@@ -0,0 +1,14 @@
+#ifndef RESOURCEIMAGEPROVIDER_H
+#define RESOURCEIMAGEPROVIDER_H
+
+#include <QQuickImageProvider>
+
+class ResourceImageProvider : public QQuickImageProvider
+{
+public:
+    explicit ResourceImageProvider();
+
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
+};
+
+#endif // RESOURCEIMAGEPROVIDER_H
 
=== renamed file 'src/plugin/Evernote/utils/html2enmlconverter.cpp' => 'src/plugin/Evernote/utils/enmldocument.cpp'
--- src/plugin/Evernote/utils/html2enmlconverter.cpp	2013-12-29 14:10:30 +0000
+++ src/plugin/Evernote/utils/enmldocument.cpp	2014-01-10 09:05:41 +0000
@@ -18,32 +18,165 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-#include "html2enmlconverter.h"
+#include "enmldocument.h"
 
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 #include <QStringList>
-
-// Taken from http://xml.evernote.com/pub/enml2.dtd
-QStringList supportedTags = QStringList() << "a" << "abbr" << "acronym" << "address" << "area" << "b" << "bdo" << "big" <<
-                                             "blockquote" << "br" << "caption" << "center" << "cite" << "code" << "col" <<
-                                             "colgroup" << "dd" << "del" << "dfn" << "div" << "dl" << "dt" << "em" <<
-                                             "en-crypt" << "en-media" << "en-todo" << "font" << "h1" << "h2" << "h3" <<
-                                             "h4" << "h5" << "h6" << "hr" << "i" << "img" << "ins" << "kbd" << "li" <<
-                                             "map" << "ol" << "p" << "pre" << "q" << "s" << "samp" << "small" << "span" <<
-                                             "strike" << "strong" << "sub" << "sup" << "table" << "tbody" << "td" <<
-                                             "tfoot" << "th" << "thead" << "tr" << "tt" << "u" << "ul" << "var";
-
-
-Html2EnmlConverter::Html2EnmlConverter()
-{
-}
-
-QString Html2EnmlConverter::html2enml(const QString &html)
-{
-    // output
-    QString evml;
-    QXmlStreamWriter writer(&evml);
+#include <QUrl>
+#include <QUrlQuery>
+#include <QDebug>
+
+// ENML spec: http://xml.evernote.com/pub/enml2.dtd
+// QML supported HTML subset: http://qt-project.org/doc/qt-5.0/qtgui/richtext-html-subset.html
+
+// This is the list of common tags between enml and html. We can just copy those over as they are
+QStringList EnmlDocument::s_commonTags = QStringList()
+        << "a" << "abbr" << "acronym" << "address" << "area" << "b" << "bdo" << "big"
+        << "blockquote" << "br" << "caption" << "center" << "cite" << "code" << "col"
+        << "colgroup" << "dd" << "del" << "dfn" << "div" << "dl" << "dt" << "em"
+        << "en-crypt" << "en-todo" << "font" << "h1" << "h2" << "h3" << "h4" << "h5"
+        << "h6" << "hr" << "i" << "ins" << "kbd" << "li" << "map" << "ol"
+        << "p" << "pre" << "q" << "s" << "samp" << "small" << "span" << "strike"
+        << "strong" << "sub" << "sup" << "table" << "tbody" << "td" << "tfoot"
+        << "th" << "thead" << "tr" << "tt" << "u" << "ul" << "var";
+
+// QML tends to generate more attributes than neccessary and Evernote's web editor gets confused by it.
+// Let's blacklist adding attributes to given tags.
+QStringList EnmlDocument::s_argumentBlackListTags = QStringList()
+        << "ul" << "li" << "ol";
+
+EnmlDocument::EnmlDocument(const QString &enml):
+    m_enml(enml)
+{
+}
+
+QString EnmlDocument::enml() const
+{
+    return m_enml;
+}
+
+void EnmlDocument::setEnml(const QString &enml)
+{
+    m_enml = enml;
+}
+
+QString EnmlDocument::html(const QString &noteGuid) const
+{
+    // output
+    QString html;
+    QXmlStreamWriter writer(&html);
+    writer.writeStartDocument();
+
+    // input
+    QXmlStreamReader reader(m_enml);
+
+    // state
+    bool isBody = false;
+
+    while (!reader.atEnd() && !reader.hasError()) {
+        QXmlStreamReader::TokenType token = reader.readNext();
+        if(token == QXmlStreamReader::StartDocument) {
+            continue;
+        }
+
+        // Handle start elements
+        if(token == QXmlStreamReader::StartElement) {
+            // skip everything if body hasn't started yet
+            if (!isBody) {
+                if (reader.name() == "en-note") {
+                    writer.writeStartElement("body");
+                    isBody = true;
+                }
+                continue;
+            }
+            // Write supported start elements to output (including attributes)
+            if (s_commonTags.contains(reader.name().toString())) {
+                writer.writeStartElement(reader.name().toString());
+
+                writer.writeAttributes(reader.attributes());
+
+                // Fix paragraph alignment (text-align -> align)
+                if (reader.name() == "p") {
+                    foreach (const QXmlStreamAttribute &attribute, reader.attributes()) {
+                        if (attribute.name() == "style" && attribute.value().contains("text-align")) {
+                            QString style = attribute.value().toString();
+                            QString textAlign = style.split("text-align: ").at(1).split(';').first();
+                            writer.writeAttribute("align", textAlign);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // Convert images
+            // TODO: what to do with music files etc?
+            if (reader.name() == "en-media") {
+                writer.writeStartElement("img");
+                QUrl url("image://resource/" + reader.attributes().value("type").toString());
+                QUrlQuery arguments;
+                arguments.addQueryItem("noteGuid", noteGuid);
+                arguments.addQueryItem("hash", reader.attributes().value("hash").toString());
+                url.setQuery(arguments);
+                writer.writeAttribute("src", url.toString());
+            }
+
+            // Convert todo checkboxes
+            if (reader.name() == "en-todo") {
+                bool checked = false;
+                foreach(const QXmlStreamAttribute &attr, reader.attributes().toList()) {
+                    if (attr.name() == "checked" && attr.value() == "true") {
+                        checked = true;
+                    }
+                }
+
+                writer.writeStartElement("img");
+                writer.writeAttribute("src", checked ? "image://theme/select" : "image://theme/help");
+            }
+
+            // We can't just copy over img tags with s_commonTags, because we generate img tags on our own.
+            // Lets copy them manually
+            if (reader.name() == "img") {
+                writer.writeStartElement("img");
+                writer.writeAttributes(reader.attributes());
+            }
+
+        }
+
+        // Write *all* normal text inside <body> </body> to output
+        if (isBody && token == QXmlStreamReader::Characters) {
+            writer.writeCharacters(reader.text().toString());
+        }
+
+        // handle end elements
+        if (token == QXmlStreamReader::EndElement) {
+
+            // skip everything after body
+            if (reader.name() == "en-note") {
+                writer.writeEndElement();
+                isBody = false;
+                break;
+            }
+
+            // Write closing tags for supported elements
+            if (s_commonTags.contains(reader.name().toString())
+                    || reader.name() == "en-media"
+                    || reader.name() == "en-todo"
+                    || reader.name() == "img") {
+                writer.writeEndElement();
+            }
+        }
+    }
+
+    writer.writeEndDocument();
+    return html;
+}
+
+void EnmlDocument::setHtml(const QString &html)
+{
+    // output
+    m_enml.clear();
+    QXmlStreamWriter writer(&m_enml);
     writer.writeStartDocument();
     writer.writeDTD("<!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\">");
 
@@ -69,13 +202,38 @@
                 }
                 continue;
             }
+
             // Write supported start elements to output (including attributes)
-            if (supportedTags.contains(reader.name().toString())) {
+            if (s_commonTags.contains(reader.name().toString())) {
                 writer.writeStartElement(reader.name().toString());
-                writer.writeAttributes(reader.attributes());
+                if (!s_argumentBlackListTags.contains(reader.name().toString())) {
+                    writer.writeAttributes(reader.attributes());
+                }
+
+            }
+
+            if (reader.name() == "img") {
+                QUrl imageUrl = QUrl(reader.attributes().value("src").toString());
+                if (imageUrl.authority() == "resource") {
+                    QString type = imageUrl.path().remove(QRegExp("^/"));
+
+                    QUrlQuery arguments(imageUrl.query());
+                    QString hash = arguments.queryItemValue("hash");
+
+                    writer.writeStartElement("en-media");
+                    writer.writeAttribute("hash", hash);
+                    writer.writeAttribute("type", type);
+                } else if (imageUrl.authority() == "theme") {
+                    writer.writeStartElement("en-todo");
+                    writer.writeAttribute("checked", imageUrl.path() == "/select" ? "true" : "false");
+                } else {
+                    writer.writeStartElement("img");
+                    writer.writeAttributes(reader.attributes());
+                }
             }
         }
 
+
         // Write *all* normal text inside <body> </body> to output
         if (isBody && token == QXmlStreamReader::Characters) {
             writer.writeCharacters(reader.text().toString());
@@ -92,24 +250,26 @@
             }
 
             // Write closing tags for supported elements
-            if (supportedTags.contains(reader.name().toString())) {
+            if (s_commonTags.contains(reader.name().toString())) {
+                writer.writeEndElement();
+            }
+
+            if (reader.name() == "img") {
                 writer.writeEndElement();
             }
         }
     }
 
     writer.writeEndDocument();
-
-    return evml;
 }
 
-QString Html2EnmlConverter::enml2plaintext(const QString &enml)
+QString EnmlDocument::plaintext() const
 {
     // output
     QString plaintext;
 
     // input
-    QXmlStreamReader reader(enml);
+    QXmlStreamReader reader(m_enml);
 
     while (!reader.atEnd() && !reader.hasError()) {
         QXmlStreamReader::TokenType token = reader.readNext();
 
=== renamed file 'src/plugin/Evernote/utils/html2enmlconverter.h' => 'src/plugin/Evernote/utils/enmldocument.h'
--- src/plugin/Evernote/utils/html2enmlconverter.h	2013-12-29 14:10:30 +0000
+++ src/plugin/Evernote/utils/enmldocument.h	2014-01-10 09:05:41 +0000
@@ -18,19 +18,31 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-#ifndef HTML2ENMLCONVERTER_H
-#define HTML2ENMLCONVERTER_H
+#ifndef ENMLDOCUMENT_H
+#define ENMLDOCUMENT_H
 
 #include <QString>
 
-class Html2EnmlConverter
+class EnmlDocument
 {
 public:
-    Html2EnmlConverter();
-
-    static QString html2enml(const QString &html);
-
-    static QString enml2plaintext(const QString &enml);
+    EnmlDocument(const QString &enml = QString());
+
+    QString enml() const;
+    void setEnml(const QString &enml);
+
+    // noteGuid is required to convert en-media tags to urls for image provider
+    QString html(const QString &noteGuid) const;
+    void setHtml(const QString &html);
+
+    QString plaintext() const;
+
+private:
+    QString m_enml;
+
+    static QStringList s_commonTags;
+    static QStringList s_argumentBlackListTags;
+
 };
 
-#endif // HTML2ENMLCONVERTER_H
+#endif // ENMLDOCUMENT_H