Merge lp:~mzanetti/reminders-app/new-edit-mode into lp:reminders-app

[Michael Zanetti]

improve note edit view

[lp:~mzanetti/reminders-app/new-edit-mode]

304. By Michael Zanetti on 2014-11-10

implement new edit mode

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

PASSED: Continuous integration, rev:304
http://91.189.93.70:8080/job/reminders-app-ci/599/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/109
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/20

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

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/new-edit-mode]

305. By Michael Zanetti on 2014-11-10

fix textedit sizing

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

PASSED: Continuous integration, rev:305
http://91.189.93.70:8080/job/reminders-app-ci/600/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/110
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/21

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Wow. Just wow, this is an amazing work!

I left some comments, mainly questions about the code.

Also, there are two little behavior I think have to be fixed:

#Text format
- Write a plain text (e.g. 123789)
- Place the cursor in the middle (e.g. 123|789)
- Set a style (e.g. bold)
- Start writing (e.g. 123*45|*789)
- Press enter (e.g.123*45\n|*789)
- Write a new char (e.g 6)

Note that the new char doesn't follow the previous style.

Result: 123*45*\n6789
Expected result: 123*45\n6*789

#Horizontal line is broke
- Write a text, click on horizontal line without going on a new line, the text is deleted. I expect the text is saved and horizontal line is created on a new line
- Write a text, create a horizontal line, insert other text, save the note.
The text after the horizontal line isn't saved

[lp:~mzanetti/reminders-app/new-edit-mode]

306. By Michael Zanetti on 2014-11-10

disable hr element for now

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

PASSED: Continuous integration, rev:306
http://91.189.93.70:8080/job/reminders-app-ci/601/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/124
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/22

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

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/new-edit-mode]

307. By Michael Zanetti on 2014-11-10

add capabilities to select text and format it

308. By Michael Zanetti on 2014-11-10

only allow text selection when formatting toolbox is open

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

PASSED: Continuous integration, rev:308
http://91.189.93.70:8080/job/reminders-app-ci/602/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/130
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/23

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

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/new-edit-mode]

309. By Michael Zanetti on 2014-11-12

fix selection mode

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

PASSED: Continuous integration, rev:309
http://91.189.93.70:8080/job/reminders-app-ci/608/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/176
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/29

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Excellent work!

Some notes:
- It's very difficult to focus the textarea, you have to click where there is some text. I expect to click in the textarea to activate the focus. Also, I think it could autofocus when you open editmode

- Already existing checkbox aren't rendered (two testcases):
  * Create a note, add a checkbox, save it, reenter edit mode, there isn't anymore the checkbox, save the note, in the noteview you see it, so isn't deleted, but it isn't rendered
  * Create a note, add a checkbox, click on add attachment, return to note, no checkbox is renderd, save the note, see the checkbox in the view

- Indentation is too much, you have to replace f.setIndent(f.indent() + 4); with f.setIndent(f.indent() + 1);, see doc[0]

- When I activate a list, I expect to dismiss it clicking on the same button again.
Instead, a new list is created

- The size button behavior is strange. When the cursor is between elements that have a size != 14 displays the size, but when the font is == 14 it says only 'Size'. It's like the font button says 'Font' when the text is in Ubuntu. I think you should always display the size of the text.

- Too much noise on terminal, could you please deactivate console.log for selection?

The new feature about selection works well, but there is a behavior I didn't expect. I don't know if you need to fix it, just let me know what you think.

Create a text, starting with normal text and then select both bold and italic, something like this:
abcd*_efgh_*

Select all the text: buttons say your text is both bold and italic. Click on bold button, all the text now isn't bold (as expected) but is also all italic.
So, this is the result:
_abcdefgh_
but I expect this:
abcd_efgh_

LibreOffice Writer uses another way: when you select a text it set to true attributes that all text has.
If you have something like this:
-abcd*ef_gh_*-
when you select all letters it says only strikeout, when you choose efgh it says bold and strikeout, and so on

[0]http://qt-project.org/doc/qt-5/qtextblockformat.html#setIndent

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> Excellent work!
>
> Some notes:
> - It's very difficult to focus the textarea, you have to click where there is
> some text. I expect to click in the textarea to activate the focus. Also, I
> think it could autofocus when you open editmode

The first one, the clicking, is the behavor if the TextEdit. It's too much work to get around it. Ubuntu's TextArea does fix that, but it has other issues so we can't use it yet. I'm reporting bugs for them and hope to be able to switch to TextArea at some point.

Focusing the TextEdit when entering edit mode is fixed now.

>
> - Already existing checkbox aren't rendered (two testcases):
> * Create a note, add a checkbox, save it, reenter edit mode, there isn't
> anymore the checkbox, save the note, in the noteview you see it, so isn't
> deleted, but it isn't rendered

Hmm... can't reproduce this... works fine for me.

> * Create a note, add a checkbox, click on add attachment, return to note, no
> checkbox is renderd, save the note, see the checkbox in the view

Also this seems to be working for me...

>
> - Indentation is too much, you have to replace f.setIndent(f.indent() + 4);
> with f.setIndent(f.indent() + 1);, see doc[0]

fixed

>
> - When I activate a list, I expect to dismiss it clicking on the same button
> again.
> Instead, a new list is created

fixed

>
> - The size button behavior is strange. When the cursor is between elements
> that have a size != 14 displays the size, but when the font is == 14 it says
> only 'Size'. It's like the font button says 'Font' when the text is in Ubuntu.
> I think you should always display the size of the text.

This is actually the same behavior as on the Evernote website. And it's motivated like this: If you see either "Font" or "Size" it means that no font is set. That causes it to be displayed in the default application font, that is "Ubuntu" font on Ubuntu devices, but for example in "Helvetica" on the Evernote website.

>
> - Too much noise on terminal, could you please deactivate console.log for
> selection?

fixed.

> The new feature about selection works well, but there is a behavior I didn't
> expect. I don't know if you need to fix it, just let me know what you think.
>
> Create a text, starting with normal text and then select both bold and italic,
> something like this:
> abcd*_efgh_*
>
> Select all the text: buttons say your text is both bold and italic. Click on
> bold button, all the text now isn't bold (as expected) but is also all italic.
> So, this is the result:
> _abcdefgh_
> but I expect this:
> abcd_efgh_
>
> LibreOffice Writer uses another way: when you select a text it set to true
> attributes that all text has.
> If you have something like this:
> -abcd*ef_gh_*-
> when you select all letters it says only strikeout, when you choose efgh it
> says bold and strikeout, and so on

Yeah, I noticed this myself. I did not implement "complexFormat" support yet and to be frank I'm too lazy to do that atm. It would required to walk step by step through each block and apply formatting individually. If you're ok with it, I'd prefer leaving that to another branch.

[lp:~mzanetti/reminders-app/new-edit-mode]

310. By Michael Zanetti on 2014-11-12

improve it as per comments from review

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

PASSED: Continuous integration, rev:310
http://91.189.93.70:8080/job/reminders-app-ci/613/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/186
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/34

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

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/new-edit-mode]

311. By Michael Zanetti on 2014-11-12

fix gu() if no GRID_UNIT_PX is exported

[Riccardo Padovani (rpadovani)]

After a long review, I could say this is awesome :-)

I agree with your comments now you fixed the checkbox issue ;-)

review: Approve

[David Planella (dpm)]

Hi,

Please, in the future, let's discuss before landing changes that change the UI - I had wanted to have a designer look at this branch before getting it merged.

This goes inline with the discussion that we had about controlling in more detail what lands in the next few weeks, as every Reminders release will now need to be approved before going into the store.

=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot	2014-11-11 15:12:52 +0000
+++ po/com.ubuntu.reminders.pot	2014-11-12 22:36:04 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-07 20:51+0100\n"
+"POT-Creation-Date: 2014-11-11 00:31+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"
@@ -73,21 +73,25 @@
 msgid "Tags"
 msgstr ""
 
-#: src/app/qml/reminders.qml:329
+#: src/app/qml/reminders.qml:330
+msgid "Reconnect"
+msgstr ""
+
+#: src/app/qml/reminders.qml:354
 msgid ""
 "No note selected.\n"
 "Select a note to see it in detail."
 msgstr ""
 
-#: src/app/qml/reminders.qml:366
+#: src/app/qml/reminders.qml:391
 msgid "No account available"
 msgstr ""
 
-#: src/app/qml/reminders.qml:367
+#: src/app/qml/reminders.qml:392
 msgid "Please configure and authorize an Evernote account in System Settings"
 msgstr ""
 
-#: src/app/qml/reminders.qml:387
+#: src/app/qml/reminders.qml:412
 msgid "Add account"
 msgstr ""
 
@@ -108,11 +112,39 @@
 msgid "Back"
 msgstr ""
 
-#: src/app/qml/ui/EditNoteView.qml:100 src/app/qml/ui/EditNoteView.qml:112
+#: src/app/qml/ui/EditNoteView.qml:95 src/app/qml/ui/EditNoteView.qml:108
 #: src/app/qml/ui/NotesPage.qml:71
 msgid "Untitled"
 msgstr ""
 
+#: src/app/qml/ui/EditNoteView.qml:406
+msgid "Font"
+msgstr ""
+
+#: src/app/qml/ui/EditNoteView.qml:417
+msgid "Size"
+msgstr ""
+
+#. TRANSLATORS: Toolbar button for "Bold"
+#: src/app/qml/ui/EditNoteView.qml:438
+msgid "B"
+msgstr ""
+
+#. TRANSLATORS: Toolbar button for "Italic"
+#: src/app/qml/ui/EditNoteView.qml:451
+msgid "I"
+msgstr ""
+
+#. TRANSLATORS: Toolbar button for "Underline"
+#: src/app/qml/ui/EditNoteView.qml:465
+msgid "U"
+msgstr ""
+
+#. TRANSLATORS: Toolbar button for "Strikeout"
+#: src/app/qml/ui/EditNoteView.qml:479
+msgid "T"
+msgstr ""
+
 #: src/app/qml/ui/NotePage.qml:34 src/app/qml/ui/NotesPage.qml:135
 msgid "Edit"
 msgstr ""
@@ -183,6 +215,55 @@
 msgid "No tags available. You can tag notes while viewing them."
 msgstr ""
 
+#: src/libqtevernote/evernoteconnection.cpp:234
+msgid "Error connecting to Evernote: Please check network connection."
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:239
+msgid "Unknown error connecting to Evernote."
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:252
+msgid ""
+"Error connecting to Evernote: Server version does not match app version. "
+"Please update the application."
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:258
+#: src/libqtevernote/evernoteconnection.cpp:263
+#, qt-format
+msgid "Error connecting to Evernote: Error code %1"
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:268
+msgid ""
+"Error connecting to Evernote: Cannot download version information from "
+"server."
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:273
+#: src/libqtevernote/evernoteconnection.cpp:298
+msgid "Unknown error connecting to Evernote"
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:287
+msgid "Error connecting to Evernote: Cannot download server information."
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:293
+msgid ""
+"Error connecting to Evernote: Connection failure when downloading server "
+"information."
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:319
+msgid "Error connecting to Evernote: Connection failure"
+msgstr ""
+
+#: src/libqtevernote/evernoteconnection.cpp:323
+msgid "Unknown Error connecting to Evernote"
+msgstr ""
+
 #: src/libqtevernote/jobs/evernotejob.cpp:94
 msgid "Authentication expired."
 msgstr ""

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-05-05 17:46:10 +0000
+++ src/app/CMakeLists.txt	2014-11-12 22:36:04 +0000
@@ -2,7 +2,7 @@
 
 set(reminders_SRCS
     main.cpp
-    camerahelper.cpp
+    formattinghelper.cpp
     preferences.cpp
     ${QML_SRCS}
 )

=== removed file 'src/app/camerahelper.cpp'
--- src/app/camerahelper.cpp	2014-07-23 21:00:14 +0000
+++ src/app/camerahelper.cpp	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright: 2013 - 2014 Canonical, Ltd
- *
- * This file is part of reminders
- *
- * reminders 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, either version 3 of the License, or
- * (at your option) any later version.
- *
- * reminders 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/>.
- *
- * Authors: Michael Zanetti <[e-mail]>
- *          Riccardo Padovani <[e-mail]>
- */
-
-#include "camerahelper.h"
-
-#include <QStandardPaths>
-#include <QCoreApplication>
-#include <QImage>
-#include <QTransform>
-#include <QDebug>
-#include <QFile>
-
-CameraHelper::CameraHelper(QObject *parent):
-    QObject(parent)
-{
-
-}
-
-QString CameraHelper::importLocation() const
-{
-    QString cachePath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first();
-    return  cachePath + "/tempImage.jpg";
-}
-
-bool CameraHelper::rotate(const QString &imageFile, int angle)
-{
-    QImage image;
-    if (!image.load(imageFile)) {
-        return false;
-    }
-    QTransform transform;
-    transform.rotate(angle);
-    image = image.transformed(transform);
-    return image.save(imageFile);
-}
-
-bool CameraHelper::removeTemp() 
-{
-    const char* location = importLocation().toUtf8();
-    if(QFile::remove(location) != true ) {
-        qDebug() << "No temporary file found, not deleting";
-    }
-  return 0;
-}

=== removed file 'src/app/camerahelper.h'
--- src/app/camerahelper.h	2014-02-27 12:06:05 +0000
+++ src/app/camerahelper.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright: 2013 - 2014 Canonical, Ltd
- *
- * This file is part of reminders
- *
- * reminders 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, either version 3 of the License, or
- * (at your option) any later version.
- *
- * reminders 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/>.
- *
- * Authors: Michael Zanetti <[e-mail]>
- *          Riccardo Padovani <[e-mail]>
- */
-
-#ifndef CAMERAHELPER_H
-#define CAMERAHELPER_H
-
-#include <QObject>
-
-class CameraHelper: public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString importLocation READ importLocation CONSTANT)
-public:
-    CameraHelper(QObject *parent = 0);
-
-    QString importLocation() const;
-
-    Q_INVOKABLE bool rotate(const QString &imageFile, int angle);
-
-    Q_INVOKABLE bool removeTemp();
-};
-
-#endif

=== added file 'src/app/formattinghelper.cpp'
--- src/app/formattinghelper.cpp	1970-01-01 00:00:00 +0000
+++ src/app/formattinghelper.cpp	2014-11-12 22:36:04 +0000
@@ -0,0 +1,383 @@
+/*
+ * Copyright: 2014 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders 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, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * reminders 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "formattinghelper.h"
+
+#include <QDebug>
+#include <QTextBlock>
+#include <QTextObject>
+#include <QTextCharFormat>
+#include <QTextList>
+
+FormattingHelper::FormattingHelper(QObject *parent):
+    QObject(parent),
+    m_textDoc(0),
+    m_formatPosition(-2)
+{
+
+}
+
+QQuickTextDocument *FormattingHelper::textDocument() const
+{
+    return m_textDoc;
+}
+
+void FormattingHelper::setTextDocument(QQuickTextDocument *textDocument)
+{
+    if (m_textDoc) {
+        disconnect(m_textDoc->textDocument());
+    }
+
+    m_textDoc = textDocument;
+    emit textDocumentChanged();
+
+    if (m_textDoc) {
+        connect(m_textDoc->textDocument(), &QTextDocument::undoAvailable, this, &FormattingHelper::canUndoChanged);
+        connect(m_textDoc->textDocument(), &QTextDocument::redoAvailable, this, &FormattingHelper::canRedoChanged);
+        m_textCursor = textDocument->textDocument()->rootFrame()->firstCursorPosition();
+        m_selectionCursor = textDocument->textDocument()->rootFrame()->firstCursorPosition();
+    } else {
+        m_textCursor.setPosition(0);
+    }
+    emit cursorPositionChanged();
+}
+
+QStringList FormattingHelper::allFontFamilies() const
+{
+    QFontDatabase db;
+    return db.families();
+}
+
+int FormattingHelper::cursorPosition() const
+{
+    return m_textCursor.position();
+}
+
+void FormattingHelper::setCursorPosition(int position)
+{
+    if (m_textCursor.position() == m_formatPosition + 1) {
+        m_textCursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
+        m_textCursor.setCharFormat(m_nextFormat);
+    }
+    m_textCursor.setPosition(position);
+    m_formatPosition = -2;
+    m_nextFormat = m_textCursor.charFormat();
+
+    emit formatChanged();
+}
+
+int FormattingHelper::selectionStart() const
+{
+    return m_selectionCursor.selectionStart();
+}
+
+void FormattingHelper::setSelectionStart(int selectionStart)
+{
+    m_selectionStart = selectionStart;
+    m_selectionCursor.setPosition(m_selectionStart, QTextCursor::MoveAnchor);
+    m_selectionCursor.setPosition(m_selectionEnd, QTextCursor::KeepAnchor);
+}
+
+int FormattingHelper::selectionEnd() const
+{
+    return m_selectionCursor.selectionEnd();
+}
+
+void FormattingHelper::setSelectionEnd(int selectionEnd)
+{
+    m_selectionEnd = selectionEnd;
+    m_selectionCursor.setPosition(m_selectionStart, QTextCursor::MoveAnchor);
+    m_selectionCursor.setPosition(m_selectionEnd, QTextCursor::KeepAnchor);
+}
+
+QString FormattingHelper::fontFamily() const
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        if (m_formatPosition != -2) {
+            return m_nextFormat.font().family();
+        }
+        return m_textCursor.charFormat().font().family();
+    } else {
+        return m_selectionCursor.charFormat().font().family();
+    }
+}
+
+void FormattingHelper::setFontFamily(const QString &fontFamily)
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        m_nextFormat.setFontFamily(fontFamily);
+        m_formatPosition = m_textCursor.position();
+    } else {
+        QTextCharFormat f = m_selectionCursor.charFormat();
+        f.setFontFamily(fontFamily);
+        m_selectionCursor.setCharFormat(f);
+    }
+    emit formatChanged();
+}
+
+int FormattingHelper::fontSize() const
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        if (m_formatPosition != 2) {
+            return m_nextFormat.fontPointSize();
+        }
+        return m_textCursor.charFormat().fontPointSize();
+    } else {
+        return m_selectionCursor.charFormat().fontPointSize();
+    }
+}
+
+void FormattingHelper::setFontSize(qreal fontSize)
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        m_nextFormat.setFontPointSize(fontSize);
+        m_formatPosition = m_textCursor.position();
+    } else {
+        QTextCharFormat f = m_selectionCursor.charFormat();
+        f.setFontPointSize(fontSize);
+        m_selectionCursor.setCharFormat(f);
+    }
+    emit formatChanged();
+}
+
+bool FormattingHelper::italic() const
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        if (m_formatPosition != -2) {
+            return m_nextFormat.fontItalic();
+        }
+        return m_textCursor.charFormat().fontItalic();
+    } else {
+        return m_selectionCursor.charFormat().fontItalic();
+    }
+}
+
+void FormattingHelper::setItalic(bool italic)
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        m_nextFormat.setFontItalic(italic);
+        m_formatPosition = m_textCursor.position();
+    } else {
+        QTextCharFormat f = m_selectionCursor.charFormat();
+        f.setFontItalic(italic);
+        m_selectionCursor.setCharFormat(f);
+    }
+    emit formatChanged();
+}
+
+bool FormattingHelper::bold() const
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        if (m_formatPosition != -2) {
+            return m_nextFormat.fontWeight() >= QFont::Bold;
+        }
+        return m_textCursor.charFormat().fontWeight() >= QFont::Bold;
+    } else {
+        return m_selectionCursor.charFormat().fontWeight() >= QFont::Bold;
+    }
+}
+
+void FormattingHelper::setBold(bool bold)
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        m_nextFormat.setFontWeight(bold ? QFont::Bold : QFont::Normal);
+        m_formatPosition = m_textCursor.position();
+    } else {
+        QTextCharFormat f = m_selectionCursor.charFormat();
+        f.setFontWeight(bold ? QFont::Bold : QFont::Normal);
+        m_selectionCursor.setCharFormat(f);
+    }
+    emit formatChanged();
+}
+
+bool FormattingHelper::underline() const
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        if (m_formatPosition != -2) {
+            return m_nextFormat.fontUnderline();
+        }
+        return m_textCursor.charFormat().fontUnderline();
+    } else {
+        return m_selectionCursor.charFormat().fontUnderline();
+    }
+}
+
+void FormattingHelper::setUnderline(bool underline)
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        m_nextFormat.setFontUnderline(underline);
+        m_formatPosition = m_textCursor.position();
+        emit formatChanged();
+    } else {
+        QTextCharFormat f = m_selectionCursor.charFormat();
+        f.setFontUnderline(underline);
+        m_selectionCursor.setCharFormat(f);
+    }
+}
+
+bool FormattingHelper::strikeout() const
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        if (m_formatPosition != -2) {
+            return m_nextFormat.fontStrikeOut();
+        }
+        return m_textCursor.charFormat().fontStrikeOut();
+    } else {
+        return m_selectionCursor.charFormat().fontStrikeOut();
+    }
+}
+
+void FormattingHelper::setStrikeout(bool strikeout)
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        m_nextFormat.setFontStrikeOut(strikeout);
+        m_formatPosition = m_textCursor.position();
+    } else {
+        QTextCharFormat f = m_selectionCursor.charFormat();
+        f.setFontStrikeOut(strikeout);
+        m_selectionCursor.setCharFormat(f);
+    }
+    emit formatChanged();
+}
+
+QColor FormattingHelper::color() const
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        if (m_formatPosition != -2) {
+            return m_nextFormat.foreground().color();
+        }
+        return m_textCursor.charFormat().foreground().color();
+    } else {
+        return m_selectionCursor.charFormat().foreground().color();
+    }
+}
+
+void FormattingHelper::setColor(const QColor &color)
+{
+    if (m_selectionCursor.selectedText().isEmpty()) {
+        m_nextFormat.setForeground(QBrush(color));
+        m_formatPosition = m_textCursor.position();
+    } else {
+        QTextCharFormat f = m_selectionCursor.charFormat();
+        f.setForeground(QBrush(color));
+        m_selectionCursor.setCharFormat(f);
+    }
+    emit formatChanged();
+}
+
+bool FormattingHelper::canUndo() const
+{
+    return m_textDoc != 0 && m_textDoc->textDocument()->isUndoAvailable();
+}
+
+bool FormattingHelper::canRedo() const
+{
+    return m_textDoc != 0 && m_textDoc->textDocument()->isRedoAvailable();
+}
+
+Qt::Alignment FormattingHelper::alignment() const
+{
+    return m_textCursor.blockFormat().alignment();
+}
+
+void FormattingHelper::setAlignment(Qt::Alignment alignment)
+{
+    QTextBlockFormat f = m_textCursor.blockFormat();
+    f.setAlignment(alignment);
+    m_textCursor.setBlockFormat(f);
+    emit formatChanged();
+}
+
+bool FormattingHelper::bulletList() const
+{
+    return m_textCursor.currentList() && m_textCursor.currentList()->format().style() == QTextListFormat::ListDisc;
+}
+
+void FormattingHelper::setBulletList(bool bulletList)
+{
+    if (this->bulletList() && !bulletList) {
+        m_textCursor.beginEditBlock();
+        m_textCursor.currentList()->remove(m_textCursor.block());
+        unindentBlock();
+        m_textCursor.endEditBlock();
+    } else if (!this->bulletList() && bulletList) {
+        QTextListFormat f;
+        f.setStyle(QTextListFormat::ListDisc);
+        m_textCursor.createList(f);
+    }
+    emit formatChanged();
+}
+
+bool FormattingHelper::numberedList() const
+{
+    return m_textCursor.currentList() && m_textCursor.currentList()->format().style() == QTextListFormat::ListDecimal;
+}
+
+void FormattingHelper::setNumberedList(bool numberedList)
+{
+    if (this->numberedList() && !numberedList) {
+        m_textCursor.beginEditBlock();
+        m_textCursor.currentList()->remove(m_textCursor.block());
+        unindentBlock();
+        m_textCursor.endEditBlock();
+    } else if (!this->numberedList() && numberedList) {
+        QTextListFormat f;
+        f.setStyle(QTextListFormat::ListDecimal);
+        m_textCursor.createList(f);
+    }
+    emit formatChanged();
+}
+
+void FormattingHelper::indentBlock()
+{
+    QTextBlockFormat f = m_textCursor.blockFormat();
+    f.setIndent(f.indent() + 1);
+    m_textCursor.setBlockFormat(f);
+}
+
+void FormattingHelper::unindentBlock()
+{
+    QTextBlockFormat f = m_textCursor.blockFormat();
+    f.setIndent(f.indent() - 1);
+    m_textCursor.setBlockFormat(f);
+}
+
+void FormattingHelper::undo()
+{
+    if (m_textDoc) {
+        m_textDoc->textDocument()->undo();
+    }
+}
+
+void FormattingHelper::redo()
+{
+    if (m_textDoc) {
+        m_textDoc->textDocument()->redo();
+    }
+}
+
+void FormattingHelper::addHorizontalLine()
+{
+    m_textCursor.beginEditBlock();
+    m_textCursor.insertHtml("____________________");
+    m_textDoc->textDocument()->setHtml(m_textDoc->textDocument()->toHtml().replace(QRegExp("____________________"), "<hr/><p></p>"));
+    m_textCursor.endEditBlock();
+}

=== added file 'src/app/formattinghelper.h'
--- src/app/formattinghelper.h	1970-01-01 00:00:00 +0000
+++ src/app/formattinghelper.h	2014-11-12 22:36:04 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright: 2014 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders 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, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * reminders 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef FORMATTINGHELPER_H
+#define FORMATTINGHELPER_H
+
+#include <QObject>
+#include <QQuickTextDocument>
+#include <QTextCursor>
+
+class FormattingHelper: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QStringList allFontFamilies READ allFontFamilies CONSTANT)
+
+    Q_PROPERTY(QQuickTextDocument* textDocument READ textDocument WRITE setTextDocument NOTIFY textDocumentChanged)
+
+    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
+    Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY cursorPositionChanged)
+    Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY cursorPositionChanged)
+
+    Q_PROPERTY(QString fontFamily READ fontFamily WRITE setFontFamily NOTIFY formatChanged)
+    Q_PROPERTY(qreal fontSize READ fontSize WRITE setFontSize NOTIFY formatChanged)
+    Q_PROPERTY(bool italic READ italic WRITE setItalic NOTIFY formatChanged)
+    Q_PROPERTY(bool bold READ bold WRITE setBold NOTIFY formatChanged)
+    Q_PROPERTY(bool underline READ underline WRITE setUnderline NOTIFY formatChanged)
+    Q_PROPERTY(bool strikeout READ strikeout WRITE setStrikeout NOTIFY formatChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY formatChanged)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY formatChanged)
+    Q_PROPERTY(bool bulletList READ bulletList WRITE setBulletList NOTIFY formatChanged)
+    Q_PROPERTY(bool numberedList READ numberedList WRITE setNumberedList NOTIFY formatChanged)
+
+    Q_PROPERTY(bool canUndo READ canUndo NOTIFY canUndoChanged)
+    Q_PROPERTY(bool canRedo READ canRedo NOTIFY canRedoChanged)
+
+
+public:
+    FormattingHelper(QObject *parent = 0);
+
+    QStringList allFontFamilies() const;
+
+    QQuickTextDocument* textDocument() const;
+    void setTextDocument(QQuickTextDocument* textDocument);
+
+    int cursorPosition() const;
+    void setCursorPosition(int position);
+
+    int selectionStart() const;
+    void setSelectionStart(int selectionStart);
+
+    int selectionEnd() const;
+    void setSelectionEnd(int selectionEnd);
+
+    QString fontFamily() const;
+    void setFontFamily(const QString &fontFamily);
+
+    int fontSize() const;
+    void setFontSize(qreal fontSize);
+
+    bool italic() const;
+    void setItalic(bool italic);
+
+    bool bold() const;
+    void setBold(bool bold);
+
+    bool underline() const;
+    void setUnderline(bool underline);
+
+    bool strikeout() const;
+    void setStrikeout(bool strikeout);
+
+    QColor color() const;
+    void setColor(const QColor &color);
+
+    bool canUndo() const;
+    bool canRedo() const;
+
+    Qt::Alignment alignment() const;
+    void setAlignment(Qt::Alignment alignment);
+
+    bool bulletList() const;
+    void setBulletList(bool bulletList);
+
+    bool numberedList() const;
+    void setNumberedList(bool numberedList);
+
+public slots:
+    void addHorizontalLine();
+    void indentBlock();
+    void unindentBlock();
+
+    void undo();
+    void redo();
+
+signals:
+    void textDocumentChanged();
+    void cursorPositionChanged();
+    void formatChanged();
+
+    void canUndoChanged(bool canUndo);
+    void canRedoChanged(bool canRedo);
+
+private:
+    QQuickTextDocument *m_textDoc;
+    QTextCursor m_textCursor;
+    QTextCursor m_selectionCursor;
+
+    QTextCharFormat m_nextFormat;
+    int m_formatPosition;
+    int m_selectionStart;
+    int m_selectionEnd;
+};
+
+#endif

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-10-08 21:08:07 +0000
+++ src/app/main.cpp	2014-11-12 22:36:04 +0000
@@ -20,8 +20,8 @@
  *          Riccardo Padovani <[e-mail]>
  */
 
-#include "camerahelper.h"
 #include "preferences.h"
+#include "formattinghelper.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickView>
@@ -105,14 +105,13 @@
 
     view.engine()->setImportPathList(importPathList);
 
-    // Set up camera helper
-    CameraHelper helper;
-    view.engine()->rootContext()->setContextProperty("cameraHelper", &helper);
-
     // Set up account preferences
     Preferences preferences;
     view.engine()->rootContext()->setContextProperty("preferences", &preferences);
 
+    // Register FormattingHelper
+    qmlRegisterType<FormattingHelper>("reminders", 1, 0, "FormattingHelper");
+
     QString qmlfile;
     const QString filePath = QLatin1String("qml/reminders.qml");
     QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);

=== added file 'src/app/qml/components/RtfButton.qml'
--- src/app/qml/components/RtfButton.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/components/RtfButton.qml	2014-11-12 22:36:04 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright: 2013-2014 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders 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.
+ *
+ * reminders 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 QtQuick 2.3
+import Ubuntu.Components 1.1
+
+Item {
+    id: root
+    property alias text: textField.text
+    property alias iconName: icon.name
+    property alias iconSource: icon.source
+    property string color: "transparent"
+    property alias horizontalAlignment: textField.horizontalAlignment
+
+    property alias font: textField.font
+
+    property bool active: false
+
+    signal clicked()
+
+    opacity: enabled ? 1 : 0.5
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: root.clicked()
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: UbuntuColors.darkGrey
+        opacity: root.active ? 0.2 : 0
+    }
+
+    Label {
+        id: textField
+        anchors { top: parent.top; bottom: parent.bottom; left: parent.left }
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        width: parent.width
+        elide: Text.ElideRight
+    }
+
+    Icon {
+        id: icon
+        anchors.fill: parent
+        anchors.margins: units.gu(0.5)
+    }
+
+    UbuntuShape {
+        id: colorRect
+        anchors.fill: parent
+        anchors.margins: units.gu(0.5)
+        color: root.color
+        radius: "small"
+        visible: root.color != "transparent"
+    }
+}

=== added file 'src/app/qml/components/RtfSeparator.qml'
--- src/app/qml/components/RtfSeparator.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/components/RtfSeparator.qml	2014-11-12 22:36:04 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright: 2013-2014 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders 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.
+ *
+ * reminders 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 QtQuick 2.3
+import Ubuntu.Components.ListItems 1.0
+
+Item {
+    width: units.dp(1)
+    height: parent.height
+    ThinDivider {
+        width: parent.height
+        rotation: 90
+        anchors.centerIn: parent
+    }
+}

=== added file 'src/app/qml/images/block-align.svg'
--- src/app/qml/images/block-align.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/block-align.svg	2014-11-12 22:36:04 +0000
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="right-align.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9475981"
+     inkscape:cx="35.170166"
+     inkscape:cy="44.786927"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2880"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           y="977.36218"
+           x="9.0000038"
+           height="12.000018"
+           width="72"
+           id="rect4724"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4726"
+           width="72.000008"
+           height="12.000018"
+           x="-81.000008"
+           y="1001.3622"
+           transform="scale(-1,1)" />
+        <rect
+           y="1025.3622"
+           x="-81.000008"
+           height="12.000018"
+           width="72.000008"
+           id="rect4728"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="scale(-1,1)" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/app/qml/images/bullet-list.svg'
--- src/app/qml/images/bullet-list.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/bullet-list.svg	2014-11-12 22:36:04 +0000
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="view-list-symbolic.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9475981"
+     inkscape:cx="31.902171"
+     inkscape:cy="46.182001"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2880"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4067"
+           width="11.999965"
+           height="12.000018"
+           x="9.0000391"
+           y="977.36218"
+           rx="6"
+           ry="6" />
+        <rect
+           y="1001.3622"
+           x="9.0000391"
+           height="12.000018"
+           width="11.999965"
+           id="rect4691"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           rx="6"
+           ry="6" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4697"
+           width="11.999965"
+           height="12.000018"
+           x="9.0000391"
+           y="1025.3622"
+           rx="6"
+           ry="6" />
+        <rect
+           y="977.36218"
+           x="30.000042"
+           height="12.000018"
+           width="50.999962"
+           id="rect4724"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4726"
+           width="50.999962"
+           height="12.000018"
+           x="30.000042"
+           y="1001.3622" />
+        <rect
+           y="1025.3622"
+           x="30.000042"
+           height="12.000018"
+           width="50.999962"
+           id="rect4728"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/app/qml/images/center-align.svg'
--- src/app/qml/images/center-align.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/center-align.svg	2014-11-12 22:36:04 +0000
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="block-align.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9475981"
+     inkscape:cx="35.170166"
+     inkscape:cy="44.786927"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2880"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           y="977.36218"
+           x="9.0000038"
+           height="12.000018"
+           width="72"
+           id="rect4724"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4726"
+           width="54"
+           height="12.000018"
+           x="-72.000008"
+           y="1001.3622"
+           transform="scale(-1,1)" />
+        <rect
+           y="1025.3622"
+           x="-78.000008"
+           height="12.000018"
+           width="66.000008"
+           id="rect4728"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="scale(-1,1)" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/app/qml/images/indent-block.svg'
--- src/app/qml/images/indent-block.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/indent-block.svg	2014-11-12 22:36:04 +0000
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="numbered-list.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.068028"
+     inkscape:cx="40.293184"
+     inkscape:cy="46.278487"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2880"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           y="977.36218"
+           x="9.0000038"
+           height="12.000018"
+           width="72"
+           id="rect4724"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4726"
+           width="50.999962"
+           height="12.000018"
+           x="30.000042"
+           y="1001.3622" />
+        <rect
+           y="1025.3622"
+           x="30.000042"
+           height="12.000018"
+           width="50.999962"
+           id="rect4728"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="fill:#808080;fill-opacity:1"
+           d="m 9.0000038,1007.3622 15.0000002,12 -15.0000002,12 z"
+           id="rect3849"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/app/qml/images/left-align.svg'
--- src/app/qml/images/left-align.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/left-align.svg	2014-11-12 22:36:04 +0000
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="unindent-block.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.068028"
+     inkscape:cx="48.823164"
+     inkscape:cy="28.970989"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2880"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           y="977.36218"
+           x="9.0000038"
+           height="12.000018"
+           width="72"
+           id="rect4724"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4726"
+           width="50.999962"
+           height="12.000018"
+           x="-59.999966"
+           y="1001.3622"
+           transform="scale(-1,1)" />
+        <rect
+           y="1025.3622"
+           x="-72.000008"
+           height="12.000018"
+           width="63"
+           id="rect4728"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="scale(-1,1)" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/app/qml/images/numbered-list.svg'
--- src/app/qml/images/numbered-list.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/numbered-list.svg	2014-11-12 22:36:04 +0000
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="numbered-list.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.068028"
+     inkscape:cx="40.293184"
+     inkscape:cy="46.278487"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2880"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           y="977.36218"
+           x="30.000042"
+           height="12.000018"
+           width="50.999962"
+           id="rect4724"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4726"
+           width="50.999962"
+           height="12.000018"
+           x="30.000042"
+           y="1001.3622" />
+        <rect
+           y="1025.3622"
+           x="30.000042"
+           height="12.000018"
+           width="50.999962"
+           id="rect4728"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <text
+           xml:space="preserve"
+           style="font-size:24.47199631px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+           x="7.0000038"
+           y="992.28229"
+           id="text3050"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3052"
+             x="7.0000038"
+             y="992.28229">1</tspan></text>
+        <text
+           sodipodi:linespacing="125%"
+           id="text3822"
+           y="1016.1451"
+           x="7.333921"
+           style="font-size:23.96021271px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+           xml:space="preserve"><tspan
+             y="1016.1451"
+             x="7.333921"
+             id="tspan3824"
+             sodipodi:role="line">2</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-size:23.81980896px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;font-family:Sans"
+           x="7.2922583"
+           y="1040.041"
+           id="text3826"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan3828"
+             x="7.2922583"
+             y="1040.041">3</tspan></text>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/app/qml/images/right-align.svg'
--- src/app/qml/images/right-align.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/right-align.svg	2014-11-12 22:36:04 +0000
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="left-align.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9475981"
+     inkscape:cx="35.170166"
+     inkscape:cy="44.786927"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2880"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           y="977.36218"
+           x="9.0000038"
+           height="12.000018"
+           width="72"
+           id="rect4724"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4726"
+           width="50.999962"
+           height="12.000018"
+           x="-81.000008"
+           y="1001.3622"
+           transform="scale(-1,1)" />
+        <rect
+           y="1025.3622"
+           x="-81.000008"
+           height="12.000018"
+           width="63"
+           id="rect4728"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="scale(-1,1)" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/app/qml/images/unindent-block.svg'
--- src/app/qml/images/unindent-block.svg	1970-01-01 00:00:00 +0000
+++ src/app/qml/images/unindent-block.svg	2014-11-12 22:36:04 +0000
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="indent-block.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.068028"
+     inkscape:cx="48.823164"
+     inkscape:cy="28.970989"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1708"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="2880"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1708"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         inkscape:export-filename="add01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect1710"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <rect
+           y="977.36218"
+           x="9.0000038"
+           height="12.000018"
+           width="72"
+           id="rect4724"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4726"
+           width="50.999962"
+           height="12.000018"
+           x="-59.999966"
+           y="1001.3622"
+           transform="scale(-1,1)" />
+        <rect
+           y="1025.3622"
+           x="-59.999966"
+           height="12.000018"
+           width="50.999962"
+           id="rect4728"
+           style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="scale(-1,1)" />
+        <path
+           style="fill:#808080;fill-opacity:1"
+           d="m 81.000004,1007.3622 -15,12 15,12 z"
+           id="rect3849"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
+</svg>

=== removed file 'src/app/qml/ui/CameraComponents/CameraToolbar.qml'
--- src/app/qml/ui/CameraComponents/CameraToolbar.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/CameraComponents/CameraToolbar.qml	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-/*
- * Copyright 2012 - 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 QtQuick 2.3
-import QtMultimedia 5.0
-import Ubuntu.Components 1.1
-
-Item {
-    id: toolbar
-
-    property Camera camera
-
-    signal zoomClicked()
-
-    Behavior on opacity { NumberAnimation { duration: 500 } }
-
-    height: middle.height
-    property int iconWidth: units.gu(6)
-    property int iconHeight: units.gu(5)
-    property bool canCapture
-
-    function switchFlashMode() {
-        camera.flash.mode = (flashButton.flashState == "off") ? Camera.FlashOn :
-        ((flashButton.flashState == "on") ? Camera.FlashAuto : Camera.FlashOff);
-    }
-
-    BorderImage {
-        id: leftBackground
-        anchors {
-            left: parent.left; top: parent.top; bottom: parent.bottom; right: middle.left; 
-            topMargin: units.dp(2); bottomMargin: units.dp(2) 
-        }
-        source: "assets/toolbar-left.sci"
-
-        property int iconSpacing: (width - toolbar.iconWidth * children.length) / 3
-
-        FlashButton {
-            id: flashButton
-            anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: parent.iconSpacing }
-
-            height: toolbar.iconHeight
-            width: toolbar.iconWidth
-            enabled: toolbar.opacity > 0.0
-
-            flashState: { switch (camera.flash.mode) {
-                case Camera.FlashAuto: return "auto";
-                case Camera.FlashOn:
-                case Camera.FlashVideoLight: return "on";
-                case Camera.FlashOff:
-                default: return "off"
-            }}
-
-            onClicked: toolbar.switchFlashMode()
-
-            property variant previousFlashMode: Camera.FlashOff
-        }
-    }
-
-    BorderImage {
-        id: middle
-        anchors { top: parent.top; bottom: parent.bottom; horizontalCenter: parent.horizontalCenter }
-        height: shootButton.height + units.gu(1)
-        source: "assets/toolbar-middle.sci"
-
-        CameraToolbarButton {
-            id: shootButton
-            anchors.centerIn: parent
-            iconWidth: units.gu(8)
-            iconHeight: units.gu(8)
-            iconSource: "assets/shoot.png"
-
-            onClicked: camera.imageCapture.captureToLocation(cameraHelper.importLocation);
-            enabled: toolbar.canCapture
-            opacity: enabled ? 1.0 : 0.5
-        }
-    }
-
-    BorderImage {
-        id: rightBackground
-        anchors { 
-            right: parent.right; top: parent.top; bottom: parent.bottom; left: middle.right; 
-            topMargin: units.dp(2); bottomMargin: units.dp(2) 
-        }
-        source: "assets/toolbar-right.sci"
-
-        CameraToolbarButton {
-            id: closeButton
-            anchors.centerIn: parent
-            iconWidth: toolbar.iconWidth
-            iconHeight: toolbar.iconHeight
-            iconSource: "assets/close.png"
-
-            onClicked: pagestack.pop();
-        }
-    }
-}

=== removed file 'src/app/qml/ui/CameraComponents/CameraToolbarButton.qml'
--- src/app/qml/ui/CameraComponents/CameraToolbarButton.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/CameraComponents/CameraToolbarButton.qml	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-
-AbstractButton {
-    property alias iconWidth: icon.width
-    property alias iconHeight: icon.height
-    property alias iconSource: icon.source
-
-    width: icon.paintedWidth
-    height: icon.paintedHeight
-
-    Image {
-        id: icon
-    }
-}
-

=== removed file 'src/app/qml/ui/CameraComponents/CrossFadingButton.qml'
--- src/app/qml/ui/CameraComponents/CrossFadingButton.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/CameraComponents/CrossFadingButton.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import "constants.js" as Const
-
-AbstractButton {
-    id: button
-    property string iconSource
-
-    property Image __active: icon1
-    property Image __inactive: icon2
-
-    onIconSourceChanged: {
-        if (__active && __inactive) {
-            __inactive.source = iconSource
-            __active.opacity = 0.0
-            __inactive.opacity = 1.0
-            var swap = __active
-            __active = __inactive
-            __inactive = swap
-        } else icon1.source = iconSource
-    }
-
-    Image {
-        id: icon1
-        anchors.fill: parent
-        Behavior on opacity {
-            NumberAnimation {
-                duration: Const.iconFadeDuration; easing.type: Easing.InOutQuad
-            }
-        }
-    }
-
-    Image {
-        id: icon2
-        anchors.fill: parent
-        opacity: 0.0
-        Behavior on opacity {
-            NumberAnimation {
-                duration: Const.iconFadeDuration; easing.type: Easing.InOutQuad
-            }
-        }
-    }
-}
-

=== removed file 'src/app/qml/ui/CameraComponents/FadingButton.qml'
--- src/app/qml/ui/CameraComponents/FadingButton.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/CameraComponents/FadingButton.qml	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import "constants.js" as Const
-
-AbstractButton {
-    id: button
-    property string iconSource
-
-    property Image __active: icon1
-    property Image __inactive: icon2
-
-    onIconSourceChanged: {
-        if (__active && __inactive) {
-            __inactive.source = iconSource
-            __active.opacity = 0.0
-        } else icon1.source = iconSource
-    }
-
-    Image {
-        id: icon1
-        anchors.fill: parent
-        Behavior on opacity {
-            NumberAnimation {
-                duration: Const.iconFadeDuration; easing.type: Easing.InOutQuad
-            }
-        }
-    }
-
-    Image {
-        id: icon2
-        anchors.fill: parent
-        opacity: 0.0
-        Behavior on opacity {
-            NumberAnimation {
-                duration: Const.iconFadeDuration; easing.type: Easing.InOutQuad
-            }
-        }
-    }
-
-    Connections {
-        target: __active
-        onOpacityChanged: if (__active.opacity == 0.0) __inactive.opacity = 1.0
-    }
-
-    Connections {
-        target: __inactive
-        onOpacityChanged: {
-            if (__inactive.opacity == 1.0) {
-                var swap = __active
-                __active = __inactive
-                __inactive = swap
-            }
-        }
-    }
-}
-

=== removed file 'src/app/qml/ui/CameraComponents/FlashButton.qml'
--- src/app/qml/ui/CameraComponents/FlashButton.qml	2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraComponents/FlashButton.qml	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import "constants.js" as Const
-
-Item {
-    id: button
-
-    property bool flashAllowed: true
-    property string flashState: "off"
-    signal clicked()
-
-    CrossFadingButton {
-        id: flash
-        anchors.fill: parent
-        iconSource: (flashState == "off") ? "assets/flash_off.png" :
-                    ((flashState == "on") ? "assets/flash_on.png" : "assets/flash_auto.png")
-        onClicked: button.clicked()
-    }
-}

=== removed file 'src/app/qml/ui/CameraComponents/ThinSliderStyle.qml'
--- src/app/qml/ui/CameraComponents/ThinSliderStyle.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/CameraComponents/ThinSliderStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-
-/*
-  This delegate is styled using the following properties:
-  - backgroundImage: image source for the bar
-  - backgroundImageHeight: specifies the height of the image to be used;
-        if not specified, the images source height will be used
-  - thumbImage: image source for the thumb
-  - thumbWidth, thumbHeight: width and height of the thumb; source measurements
-        will be used if not specified
-  - thumbSpacing: spacing between the thumb and the bar; 0 if not specified
-  */
-
-Item {
-
-    id: main
-    anchors.fill: parent
-
-    property Item bar: backgroundShape
-    property Item thumb: thumbShape
-
-    property real normalizedValue: SliderUtils.normalizedValue(styledItem)
-    property real thumbSpacing: 0.0
-    property real thumbSpace: backgroundShape.width - (2.0 * thumbSpacing + thumbWidth)
-    property real thumbWidth: units.gu(1.5)
-    property real thumbHeight: units.gu(1.5)
-
-    property string backgroundImage: "assets/[e-mail]"
-    property string thumbImage: "assets/[e-mail]"
-
-    Image {
-        id: backgroundShape
-        anchors {
-            left: parent.left
-            right: parent.right
-            verticalCenter: parent.verticalCenter
-        }
-        source: backgroundImage
-        height: sourceSize.height
-    }
-
-    Image {
-        id: thumbShape
-        objectName: "sliderThumb"
-
-        x: backgroundShape.x + thumbSpacing + normalizedValue * thumbSpace
-        y: backgroundShape.y + thumbSpacing
-        width: thumbWidth
-        height: thumbHeight
-        anchors.verticalCenter: backgroundShape.verticalCenter
-        source: thumbImage
-    }
-
-    // set styledItem's implicitHeight to the thumbShape's height
-    // this can also control the default sensing area
-    Binding {
-        target: styledItem
-        property: "implicitHeight"
-        value: thumbShape.height + 2.0 * thumbSpacing
-    }
-}

=== removed file 'src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml'
--- src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml	2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +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 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 QtQuick 2.3
-
-Item {
-    property size cameraResolution;
-    property int viewFinderHeight;
-    property int viewFinderWidth;
-    property int viewFinderOrientation;
-
-    property int __cameraWidth: Math.abs(viewFinderOrientation) == 90 ?
-                                cameraResolution.height : cameraResolution.width
-    property int __cameraHeight: Math.abs(viewFinderOrientation) == 90 ?
-                                 cameraResolution.width : cameraResolution.height
-
-    property real widthScale: viewFinderWidth / __cameraWidth
-    property real heightScale: viewFinderHeight / __cameraHeight
-
-    width: (widthScale <= heightScale) ? viewFinderWidth : __cameraWidth * heightScale
-    height: (widthScale <= heightScale) ? __cameraHeight * widthScale : viewFinderHeight
-}

=== removed file 'src/app/qml/ui/CameraComponents/ZoomControl.qml'
--- src/app/qml/ui/CameraComponents/ZoomControl.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/CameraComponents/ZoomControl.qml	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-
-Item {
-    id: zoom
-    property alias maximumValue: slider.maximumValue
-    property alias value: slider.value
-    property real zoomStep: (slider.maximumValue - slider.minimumValue) / 20
-
-    AbstractButton {
-        id: minus
-        objectName: "zoomMinus"
-        anchors {left: parent.left; verticalCenter: parent.verticalCenter}
-        width: minusIcon.width
-        height: minusIcon.height
-        onClicked: slider.value = Math.max(value - zoom.zoomStep, slider.minimumValue)
-        onPressedChanged: if (pressed) minusTimer.restart(); else minusTimer.stop();
-
-        Image {
-            id: minusIcon
-            anchors.centerIn: parent
-            source: "assets/zoom_minus.png"
-            sourceSize.height: units.gu(2)
-            smooth: true
-        }
-
-        Timer {
-            id: minusTimer
-            interval: 40
-            repeat: true
-            onTriggered: slider.value = Math.max(value - zoom.zoomStep, slider.minimumValue)
-        }
-    }
-
-    Slider {
-        id: slider
-        style: ThinSliderStyle {}
-        anchors { left: minus.right; right: plus.left; verticalCenter: parent.verticalCenter }
-        live: true
-        minimumValue: 1.0 // No zoom => 1.0 zoom factor
-        value: minimumValue
-        height: slider.implicitHeight + units.gu(4)
-    }
-
-    AbstractButton {
-        id: plus
-        objectName: "zoomPlus"
-        anchors { right: parent.right; verticalCenter: parent.verticalCenter }
-        width: plusIcon.width
-        height: plusIcon.height
-        onClicked: slider.value = Math.min(value + zoom.zoomStep, slider.maximumValue)
-        onPressedChanged: if (pressed) plusTimer.restart(); else plusTimer.stop();
-
-        Image {
-            id: plusIcon
-            anchors.centerIn: parent
-            source: "assets/zoom_plus.png"
-            sourceSize.height: units.gu(2)
-            smooth: true
-        }
-
-        Timer {
-            id: plusTimer
-            interval: 40
-            repeat: true
-            onTriggered: slider.value = Math.min(value + zoom.zoomStep, slider.maximumValue)
-        }
-    }
-}
-

=== removed file 'src/app/qml/ui/CameraComponents/assets/[e-mail]'
--- src/app/qml/ui/CameraComponents/assets/[e-mail]	2014-02-19 00:05:24 +0000
+++ src/app/qml/ui/CameraComponents/assets/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-source: [e-mail]
-border.left: 80
-border.right: 0
-border.top: 30
-border.bottom: 30
-horizontalTileMode: Stretch
-verticalTileMode: Stretch

=== removed file 'src/app/qml/ui/CameraComponents/assets/[e-mail]'
--- src/app/qml/ui/CameraComponents/assets/[e-mail]	2014-02-19 00:05:24 +0000
+++ src/app/qml/ui/CameraComponents/assets/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-source: [e-mail]
-border.left: 0
-border.right: 0
-border.top: 41
-border.bottom: 41
-horizontalTileMode: Stretch
-verticalTileMode: Stretch

=== removed file 'src/app/qml/ui/CameraComponents/assets/[e-mail]'
--- src/app/qml/ui/CameraComponents/assets/[e-mail]	2014-02-19 00:05:24 +0000
+++ src/app/qml/ui/CameraComponents/assets/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-source: [e-mail]
-border.right: 80
-border.left: 0
-border.top: 30
-border.bottom: 30
-horizontalTileMode: Stretch
-verticalTileMode: Stretch

=== removed file 'src/app/qml/ui/CameraComponents/constants.js'
--- src/app/qml/ui/CameraComponents/constants.js	2014-02-19 00:05:24 +0000
+++ src/app/qml/ui/CameraComponents/constants.js	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-.pragma library
-
-var iconFadeDuration = 300;

=== removed file 'src/app/qml/ui/CameraConfirm.qml'
--- src/app/qml/ui/CameraConfirm.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/CameraConfirm.qml	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright: 2014 Canonical, Ltd
- *
- * This file is part of reminders-app
- *
- * reminders-app 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.
- *
- * reminders-app 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 QtQuick 2.3
-import Ubuntu.Components 1.1
-import Evernote 0.1
-
-Page {
-    id: confirmPage
-
-    property var imageLocation
-
-    Image {
-    	source: imageLocation
-    	anchors {
-            fill: parent;
-        }
-    }
-
-    Rectangle {
-        anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
-        height: units.gu(6)
-        color: "white"
-
-        Icon {
-            name: "back"
-
-            height: units.gu(3)
-            width: height
-
-            anchors.left: parent.left
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.margins: units.gu(2)
-            
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    cameraHelper.removeTemp();
-                    pagestack.pop();
-                }
-            }
-        }
-
-        Icon {
-            name: "tick"
-
-            height: units.gu(3)
-            width: height
-
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.margins: units.gu(2)
-            
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    root.imageConfirmed();
-                    pagestack.pop();
-                }
-            }
-        }
-    }
-}

=== removed file 'src/app/qml/ui/CameraPage.qml'
--- src/app/qml/ui/CameraPage.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/CameraPage.qml	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-/*
- * Copyright: 2013 - 2014 Canonical, Ltd
- *
- * This file is part of reminders-app
- *
- * reminders-app 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.
- *
- * reminders-app 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 QtQuick 2.3
-import Ubuntu.Components 1.1
-import QtMultimedia 5.0
-import QtQuick.Window 2.0
-import Evernote 0.1
-
-import "CameraComponents"
-
-Page {
-    id: root
-    property var note
-    property int position
-    property var imageLocation
-
-    signal imageConfirmed()
-
-    onImageConfirmed: {
-        root.note.attachFile(root.position, imageLocation);
-        print("got image", imageLocation);
-        pagestack.pop();
-    }
-
-    tools: ToolbarItems {
-        locked: true
-        opened: false
-    }
-
-    Camera {
-        id: camera
-        flash.mode: Camera.FlashOff
-        focus.focusMode: Camera.FocusContinuous
-        focus.focusPointMode: Camera.FocusPointAuto
-
-        property alias currentZoom: camera.digitalZoom
-        property alias maximumZoom: camera.maximumDigitalZoom
-
-        Component.onCompleted: cameraHelper.removeTemp();
-
-        imageCapture {
-            onImageSaved: {
-                if (videoOutput.orientation != 0) {
-                    cameraHelper.rotate(path, -videoOutput.orientation)
-                }
-                imageLocation = path;
-                var component = Qt.createComponent(Qt.resolvedUrl("CameraConfirm.qml"));
-                var page = component.createObject(root, {imageLocation: imageLocation});
-                pagestack.push(page);
-            }
-        }
-    }
-
-    VideoOutput {
-        id: videoOutput
-        anchors {
-            fill: parent
-        }
-        fillMode: Image.PreserveAspectCrop
-        orientation: Screen.primaryOrientation === Qt.PortraitOrientation  ? -90 : 0
-        source: camera
-        focus: visible
-
-        ViewFinderGeometry {
-            id: viewFinderGeometry
-            anchors.centerIn: parent
-
-            Item {
-                id: itemScale
-                visible: false
-            }
-        }
-    }
-
-    Item {
-        id: controlsArea
-        anchors {
-            centerIn: parent;
-            fill: parent
-        }
-        
-        ZoomControl {
-            id: zoomControl
-            maximumValue: camera.maximumZoom
-            height: units.gu(4.5)
-
-            anchors {
-                left: parent.left; right: parent.right; bottom: toolbar.top; 
-                leftMargin: units.gu(0.75); rightMargin: units.gu(0.75); bottomMargin: units.gu(0.5); topMargin: units.gu(0.5)
-            }
-
-            visible: camera.maximumZoom > 1
-
-            // Create a two way binding between the zoom control value and the actual camera zoom,
-            // so that they can stay in sync when the zoom is changed from the UI or from the hardware
-            Binding { target: zoomControl; property: "value"; value: camera.currentZoom }
-            Binding { target: camera; property: "currentZoom"; value: zoomControl.value }
-        }
-
-        CameraToolbar {
-            id: toolbar
-
-            anchors {
-                bottom: parent.bottom; left: parent.left; right: parent.right;
-                bottomMargin: units.gu(1); leftMargin: units.gu(1); rightMargin: units.gu(1)
-            }
-
-            camera: camera
-            canCapture: camera.imageCapture.ready
-        }
-    }
-}

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/EditNoteView.qml	2014-11-12 22:36:04 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright: 2013 Canonical, Ltd
+ * Copyright: 2013-2014 Canonical, Ltd
  *
  * This file is part of reminders
  *
@@ -17,10 +17,14 @@
  */
 
 import QtQuick 2.3
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Content 0.1
+import Ubuntu.Components.Themes.Ambiance 1.1
 import Evernote 0.1
+import reminders 1.0
 import "../components"
 
 Item {
@@ -29,15 +33,14 @@
     property bool isBottomEdge: false
 
     onNoteChanged: {
-        for (var i = 0; i < notebookSelector.model.count; i++) {
-            if (notebookSelector.model.notebook(i).guid == note.notebookGuid) {
+        for (var i = 0; i < notebookSelector.values.count; i++) {
+            if (notebookSelector.values.notebook(i).guid == note.notebookGuid) {
                 notebookSelector.selectedIndex = i;
             }
         }
     }
 
     signal exitEditMode(var note)
-    signal attachFromCamera(int position, var note)
 
     QtObject {
         id: priv
@@ -51,13 +54,6 @@
         activeTransfer: priv.activeTransfer
     }
 
-    ContentPeer {
-        id: picSource
-        contentType: ContentType.Pictures
-        handler: ContentHandler.Source
-        selectionType: ContentTransfer.Single
-    }
-
     Connections {
          target: priv.activeTransfer ? priv.activeTransfer : null
          onStateChanged: {
@@ -65,19 +61,18 @@
                  var file = priv.activeTransfer.items[0].url.toString()
                  print("attaching file", file, "on note", note)
                  note.attachFile(priv.insertPosition, file);
+                 noteTextArea.insert(priv.insertPosition + 1, "<br>&nbsp;")
              }
          }
      }
 
     Column {
         anchors { left: parent.left; top: parent.top; right: parent.right; bottom: toolbox.top }
-        anchors.margins: units.gu(2)
-        spacing: units.gu(1)
 
         Row {
             visible: !root.isBottomEdge
-            anchors { left: parent.left; right: parent.right }
-            height: units.gu(5)
+            anchors { left: parent.left; right: parent.right; margins: units.gu(1) }
+            height: units.gu(7)
             spacing: units.gu(2)
             Icon {
                 id: backIcon
@@ -98,8 +93,9 @@
                 id: titleTextField
                 text: root.note ? root.note.title : ""
                 placeholderText: i18n.tr("Untitled")
-                height: units.gu(5)
+                height: units.gu(4)
                 width: parent.width - (backIcon.width + parent.spacing) * 2
+                anchors.verticalCenter: parent.verticalCenter
             }
             Icon {
                 name: "save"
@@ -129,84 +125,548 @@
 
         Divider {
             visible: !root.isBottomEdge
-            anchors { leftMargin: -units.gu(2); rightMargin: -units.gu(2) }
             height: units.gu(2)
         }
 
-        OptionSelector {
-            id: notebookSelector
-            model: Notebooks {}
-            property string selectedGuid: model.notebook(selectedIndex) ? model.notebook(selectedIndex).guid : ""
-
-            delegate: OptionSelectorDelegate {
-                text: model.name
+        Rectangle {
+            anchors { left: parent.left; right: parent.right }
+            height: notebookSelector.height
+            ValueSelector {
+                id: notebookSelector
+                text: values.notebook(selectedIndex).name
+                property string selectedGuid: values.notebook(selectedIndex) ? values.notebook(selectedIndex).guid : ""
+                values: Notebooks {}
             }
         }
 
-        TextArea {
-            id: noteTextArea
+        Rectangle {
             anchors { left: parent.left; right: parent.right }
             height: parent.height - y
-            highlighted: true
-
-            textFormat: TextEdit.RichText
-            text: root.note ? root.note.richTextContent : ""
+            color: "white"
+
+//            TextArea {
+//                id: noteTextArea
+//                anchors.fill: parent
+//                focus: true
+//                wrapMode: TextEdit.Wrap
+//                textFormat: TextEdit.RichText
+//                text: root.note ? root.note.richTextContent : ""
+//            }
+
+            Flickable {
+                 id: flick
+                 anchors.fill: parent
+                 contentWidth: noteTextArea.paintedWidth
+                 contentHeight: noteTextArea.paintedHeight
+                 flickableDirection: Flickable.VerticalFlick
+                 clip: true
+
+                 function ensureVisible(r)
+                 {
+                     if (contentX >= r.x)
+                         contentX = r.x;
+                     else if (contentX+width <= r.x+r.width)
+                         contentX = r.x+r.width-width;
+                     if (contentY >= r.y)
+                         contentY = r.y;
+                     else if (contentY+height <= r.y+r.height)
+                         contentY = r.y+r.height-height;
+                 }
+
+                TextEdit {
+                    id: noteTextArea
+                    width: flick.width
+                    height: paintedHeight
+                    focus: true
+                    wrapMode: TextEdit.Wrap
+                    textFormat: TextEdit.RichText
+                    text: root.note ? root.note.richTextContent : ""
+                    onCursorRectangleChanged: flick.ensureVisible(cursorRectangle)
+                    selectByMouse: toolbox.charFormatExpanded
+
+                    // Due to various things updating when creating the view,
+                    // we need to set the focus in the next event loop pass
+                    // in order to have any effect.
+                    Timer {
+                        id: setFocusTimer
+                        interval: 1
+                        running: true
+                        repeat: false
+                        onTriggered: {
+                            noteTextArea.cursorPosition = noteTextArea.length;
+                            noteTextArea.forceActiveFocus();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    FormattingHelper {
+        id: formattingHelper
+        textDocument: noteTextArea.textDocument
+        cursorPosition: noteTextArea.cursorPosition
+        selectionStart: noteTextArea.selectionStart
+        selectionEnd: noteTextArea.selectionEnd
+    }
+
+    Component {
+        id: fontPopoverComponent
+        Popover {
+            id: fontPopover
+
+            property int selectionStart: -1
+            property int selectionEnd: -1
+
+            ListView {
+                width: parent.width - units.gu(2)
+                height: Math.min(contentHeight, root.height / 2)
+                model: formattingHelper.allFontFamilies
+                clip: true
+                delegate: Empty {
+                    height: units.gu(6)
+                    width: parent.width
+                    Label {
+                        anchors.fill: parent
+                        anchors.margins: units.gu(1)
+                        verticalAlignment: Text.AlignVCenter
+                        text: modelData
+                        font.family: modelData
+                    }
+                    onClicked: {
+                        noteTextArea.cursorPosition = fontPopover.selectionStart;
+                        noteTextArea.moveCursorSelection(fontPopover.selectionEnd);
+                        formattingHelper.fontFamily = modelData;
+                        PopupUtils.close(fontPopover)
+                    }
+                }
+            }
+        }
+    }
+    Component {
+        id: fontSizePopoverComponent
+        Popover {
+            id: fontSizePopover
+
+            property int selectionStart: -1
+            property int selectionEnd: -1
+
+            ListView {
+                anchors { left: parent.left; right: parent.right; top: parent.top }
+                height: Math.min(contentHeight, root.height / 2)
+                clip:true
+                model: ListModel {
+                    ListElement { modelData: "8" }
+                    ListElement { modelData: "10" }
+                    ListElement { modelData: "12" }
+                    ListElement { modelData: "14" }
+                    ListElement { modelData: "18" }
+                    ListElement { modelData: "24" }
+                    ListElement { modelData: "36" }
+                }
+
+                delegate: Empty {
+                    Label {
+                        anchors.fill: parent
+                        anchors.margins: units.gu(1)
+                        verticalAlignment: Text.AlignVCenter
+                        text: modelData
+                        font.family: modelData
+                    }
+                    onClicked: {
+                        noteTextArea.cursorPosition = fontSizePopover.selectionStart;
+                        noteTextArea.moveCursorSelection(fontSizePopover.selectionEnd);
+                        formattingHelper.fontSize = modelData;
+                        PopupUtils.close(fontSizePopover)
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: colorPopoverComponent
+        Popover {
+            id: colorPopover
+
+            property int selectionStart: -1
+            property int selectionEnd: -1
+
+            GridView {
+                id: colorsGrid
+                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(0.5) }
+                height: cellWidth * 5 + units.gu(1)
+
+
+                cellWidth: width / 8
+                cellHeight: cellWidth
+
+                model: ListModel {
+                    ListElement { color: "#000000" }
+                    ListElement { color: "#993300" }
+                    ListElement { color: "#333300" }
+                    ListElement { color: "#003300" }
+                    ListElement { color: "#003366" }
+                    ListElement { color: "#000080" }
+                    ListElement { color: "#333399" }
+                    ListElement { color: "#333333" }
+
+                    ListElement { color: "#800000" }
+                    ListElement { color: "#ff6600" }
+                    ListElement { color: "#808000" }
+                    ListElement { color: "#008000" }
+                    ListElement { color: "#008080" }
+                    ListElement { color: "#0000ff" }
+                    ListElement { color: "#666699" }
+                    ListElement { color: "#808080" }
+
+                    ListElement { color: "#ff0000" }
+                    ListElement { color: "#ff6600" }
+                    ListElement { color: "#99CC00" }
+                    ListElement { color: "#339966" }
+                    ListElement { color: "#33CCCC" }
+                    ListElement { color: "#3366FF" }
+                    ListElement { color: "#800080" }
+                    ListElement { color: "#999999" }
+
+                    ListElement { color: "#ff00ff" }
+                    ListElement { color: "#ffcc00" }
+                    ListElement { color: "#ffff00" }
+                    ListElement { color: "#00ff00" }
+                    ListElement { color: "#00ffff" }
+                    ListElement { color: "#00ccff" }
+                    ListElement { color: "#993366" }
+                    ListElement { color: "#c0c0c0" }
+
+                    ListElement { color: "#ff99cc" }
+                    ListElement { color: "#ffcc99" }
+                    ListElement { color: "#ffff99" }
+                    ListElement { color: "#ccffcc" }
+                    ListElement { color: "#ccffff" }
+                    ListElement { color: "#99ccff" }
+                    ListElement { color: "#cc99ff" }
+                    ListElement { color: "#ffffff" }
+                }
+                delegate: AbstractButton {
+                    width: colorsGrid.cellWidth
+                    height: colorsGrid.cellHeight
+                    UbuntuShape {
+                        anchors.fill: parent
+                        anchors.margins: units.gu(.5)
+                        color: model.color
+                        radius: "small"
+                    }
+                    onClicked: {
+                        noteTextArea.cursorPosition = colorPopover.selectionStart;
+                        noteTextArea.moveCursorSelection(colorPopover.selectionEnd);
+                        formattingHelper.color = color
+                        PopupUtils.close(colorPopover)
+                    }
+                }
+            }
         }
     }
 
     Rectangle {
+        anchors.fill: toolbox
+        color: "#efefef"
+    }
+
+    Column {
         id: toolbox
         anchors { left: parent.left; right: parent.right; bottom: keyboardRect.top }
-        height: units.gu(6)
-        color: "white"
-
-        Icon {
-            name: "import-image"
-            height: units.gu(3)
-            width: height
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.margins: units.gu(2)
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    priv.insertPosition = noteTextArea.cursorPosition;
-                    note.richTextContent = noteTextArea.text;
-                    priv.activeTransfer = picSource.request();
-                }
-            }
-        }
-
-        Icon {
-            name: "camera-symbolic"
-            height: units.gu(3)
-            width: height
-            anchors.centerIn: parent
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    note.richTextContent = noteTextArea.text;
-                    priv.insertPosition = noteTextArea.cursorPosition;
-                    pagestack.push(Qt.resolvedUrl("CameraPage.qml"), {note: root.note, position: priv.insertPosition})
-                }
-            }
-        }
-
-        Icon {
-            name: "edit"
-            height: units.gu(3)
-            width: height
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.right: parent.right
-            anchors.margins: units.gu(2)
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                }
-            }
-        }
-
-
+        height: implicitHeight + units.gu(1)
+        clip: true
+        spacing: units.gu(1)
+
+        property bool charFormatExpanded: false
+        property bool blockFormatExpanded: false
+
+        Behavior on height { UbuntuNumberAnimation {} }
+
+        move: Transition {
+            UbuntuNumberAnimation { properties: "y" }
+        }
+        add: Transition {
+            UbuntuNumberAnimation { property: "opacity"; from: 0; to: 1 }
+        }
+
+        Item {
+            anchors {
+                left: parent.left
+                right: parent.right
+                leftMargin: units.gu(1)
+                rightMargin: units.gu(1)
+            }
+            height: 1
+        }
+
+        RowLayout {
+            anchors {
+                left: parent.left
+                right: parent.right
+                leftMargin: units.gu(1)
+                rightMargin: units.gu(1)
+            }
+            height: units.gu(4)
+            visible: toolbox.charFormatExpanded
+            opacity: visible ? 1 : 0
+
+            RtfButton {
+                id: fontButton
+                text: formattingHelper.fontFamily || i18n.tr("Font")
+                height: parent.height
+                horizontalAlignment: Text.AlignLeft
+                Layout.fillWidth: true
+                onClicked: {
+                    PopupUtils.open(fontPopoverComponent, fontButton, {selectionStart: noteTextArea.selectionStart, selectionEnd: noteTextArea.selectionEnd})
+                }
+            }
+
+            RtfButton {
+                id: fontSizeButton
+                text: formattingHelper.fontSize || i18n.tr("Size")
+                height: parent.height
+                width: height
+                onClicked: {
+                    PopupUtils.open(fontSizePopoverComponent, fontSizeButton, {selectionStart: noteTextArea.selectionStart, selectionEnd: noteTextArea.selectionEnd})
+                }
+            }
+            RtfButton {
+                id: colorButton
+                height: parent.height
+                width: height
+                color: formattingHelper.color
+                onClicked: {
+                    PopupUtils.open(colorPopoverComponent, colorButton, {selectionStart: noteTextArea.selectionStart, selectionEnd: noteTextArea.selectionEnd})
+                }
+            }
+
+            RtfButton {
+                height: parent.height
+                width: height
+                // TRANSLATORS: Toolbar button for "Bold"
+                text: i18n.tr("B")
+                font.bold: true
+                font.family: "Serif"
+                active: formattingHelper.bold
+                onClicked: {
+                    formattingHelper.bold = !formattingHelper.bold
+                }
+            }
+
+            RtfButton {
+                height: parent.height
+                width: height
+                // TRANSLATORS: Toolbar button for "Italic"
+                text: i18n.tr("I")
+                font.bold: true
+                font.italic: true
+                font.family: "Serif"
+                active: formattingHelper.italic
+                onClicked: {
+                    formattingHelper.italic = !formattingHelper.italic;
+                }
+            }
+
+            RtfButton {
+                height: parent.height
+                width: height
+                // TRANSLATORS: Toolbar button for "Underline"
+                text: i18n.tr("U")
+                font.bold: true
+                font.underline: true
+                font.family: "Serif"
+                active: formattingHelper.underline
+                onClicked: {
+                    formattingHelper.underline = !formattingHelper.underline;
+                }
+            }
+
+            RtfButton {
+                height: parent.height
+                width: height
+                // TRANSLATORS: Toolbar button for "Strikeout"
+                text: i18n.tr("T")
+                font.bold: true
+                font.strikeout: true
+                font.family: "Serif"
+                active: formattingHelper.strikeout
+                onClicked: {
+                    formattingHelper.strikeout = !formattingHelper.strikeout;
+                }
+            }
+        }
+
+        RowLayout {
+            anchors {
+                left: parent.left
+                right: parent.right
+                leftMargin: units.gu(1)
+                rightMargin: units.gu(1)
+            }
+            height: units.gu(4)
+            visible: toolbox.blockFormatExpanded
+            opacity: visible ? 1 : 0
+
+            RtfButton {
+                iconSource: "../images/bullet-list.svg"
+                height: parent.height
+                width: height
+                active: formattingHelper.bulletList
+                onClicked: {
+                    formattingHelper.bulletList = !formattingHelper.bulletList;
+                }
+            }
+
+            RtfButton {
+                iconSource: "../images/numbered-list.svg"
+                height: parent.height
+                width: height
+                active: formattingHelper.numberedList
+                onClicked: {
+                    formattingHelper.numberedList = !formattingHelper.numberedList;
+                }
+            }
+
+            RtfSeparator {}
+
+            RtfButton {
+                height: parent.height
+                width: height
+                iconSource: "../images/indent-block.svg"
+                onClicked: {
+                    formattingHelper.indentBlock();
+                }
+            }
+            RtfButton {
+                height: parent.height
+                width: height
+                iconSource: "../images/unindent-block.svg"
+                onClicked: {
+                    formattingHelper.unindentBlock();
+                }
+            }
+
+            RtfSeparator {}
+
+            RtfButton {
+                height: parent.height
+                width: height
+                iconSource: "../images/left-align.svg"
+                active: formattingHelper.alignment & Qt.AlignLeft
+                onClicked: {
+                    formattingHelper.alignment = Qt.AlignLeft
+                }
+            }
+            RtfButton {
+                height: parent.height
+                width: height
+                iconSource: "../images/center-align.svg"
+                active: formattingHelper.alignment & Qt.AlignHCenter
+                onClicked: {
+                    formattingHelper.alignment = Qt.AlignHCenter
+                }
+            }
+            RtfButton {
+                height: parent.height
+                width: height
+                iconSource: "../images/right-align.svg"
+                active: formattingHelper.alignment & Qt.AlignRight
+                onClicked: {
+                    formattingHelper.alignment = Qt.AlignRight
+                }
+            }
+        }
+
+        RowLayout {
+            anchors { left: parent.left; right: parent.right }
+            anchors.margins: units.gu(1)
+            height: units.gu(4)
+
+            RtfButton {
+                iconName: "undo"
+                height: parent.height
+                width: height
+                enabled: formattingHelper.canUndo
+                onClicked: {
+                    formattingHelper.undo();
+                }
+            }
+            RtfButton {
+                iconName: "redo"
+                height: parent.height
+                width: height
+                enabled: formattingHelper.canRedo
+                onClicked: {
+                    formattingHelper.redo();
+                }
+            }
+
+            RtfSeparator {}
+
+            Item {
+                Layout.fillWidth: true
+            }
+
+            RtfButton {
+                iconName: "select"
+                height: parent.height
+                width: height
+                onClicked: {
+                    var pos = noteTextArea.cursorPosition
+                    noteTextArea.insert(pos, "<img src=\"../images/unchecked.svg\" height=" + units.gu(2) + ">")
+                    noteTextArea.cursorPosition = pos + 1;
+                }
+            }
+
+
+// TextEdit can't display horizontal lines yet :/
+// https://bugreports.qt-project.org/browse/QTBUG-42545
+//            RtfButton {
+//                text: "__"
+//                height: parent.height
+//                width: height
+//                onClicked: {
+//                    formattingHelper.addHorizontalLine();
+//                }
+//            }
+
+            RtfButton {
+                iconName: "attachment"
+                height: parent.height
+                width: height
+                onClicked: {
+                    priv.insertPosition = noteTextArea.cursorPosition;
+                    note.richTextContent = noteTextArea.text;
+                    importPicker.visible = true;
+                }
+            }
+
+            RtfSeparator {}
+
+            RtfButton {
+                iconName: "navigation-menu"
+                height: parent.height
+                width: height
+                active: toolbox.blockFormatExpanded
+                onClicked: {
+                    toolbox.blockFormatExpanded = !toolbox.blockFormatExpanded
+                }
+            }
+
+            RtfSeparator {}
+
+            RtfButton {
+                iconName: "edit-select-all"
+                height: parent.height
+                width: height
+                active: toolbox.charFormatExpanded
+                onClicked: {
+                    toolbox.charFormatExpanded = !toolbox.charFormatExpanded
+                }
+            }
+        }
     }
 
     Item {
@@ -214,5 +674,21 @@
         anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
         height: Qt.inputMethod.keyboardRectangle.height
     }
+
+    ContentPeerPicker {
+        id: importPicker
+        anchors.fill: parent
+        contentType: ContentType.Pictures
+        handler: ContentHandler.Source
+        visible: false
+
+        onCancelPressed: visible = false
+
+        onPeerSelected: {
+            peer.selectionType = ContentTransfer.Single
+            priv.activeTransfer = peer.request()
+            visible = false;
+        }
+    }
 }
 

=== modified file 'src/libqtevernote/notebooks.cpp'
--- src/libqtevernote/notebooks.cpp	2014-10-23 21:27:46 +0000
+++ src/libqtevernote/notebooks.cpp	2014-11-12 22:36:04 +0000
@@ -58,6 +58,7 @@
     switch(role) {
     case RoleGuid:
         return notebook->guid();
+    case Qt::UserRole:
     case RoleName:
         return notebook->name();
     case RoleNoteCount:
@@ -81,6 +82,7 @@
 QHash<int, QByteArray> Notebooks::roleNames() const
 {
     QHash<int, QByteArray> roles;
+    roles.insert(Qt::UserRole, "modelData");
     roles.insert(RoleGuid, "guid");
     roles.insert(RoleName, "name");
     roles.insert(RoleNoteCount, "noteCount");

=== modified file 'src/libqtevernote/utils/enmldocument.cpp'
--- src/libqtevernote/utils/enmldocument.cpp	2014-02-19 12:25:52 +0000
+++ src/libqtevernote/utils/enmldocument.cpp	2014-11-12 22:36:04 +0000
@@ -80,10 +80,13 @@
     // output
     QString html;
     QXmlStreamWriter writer(&html);
-    writer.writeStartDocument();
+    writer.writeDTD("<!DOCTYPE html>");
+    writer.writeStartElement("html");
+    writer.writeStartElement("head");
     writer.writeStartElement("meta");
     writer.writeAttribute("name", "viewport");
-    writer.writeAttribute("content", QString("width=%1px").arg(QString::number(EnmlDocument::s_richtextContentWidth)));
+    writer.writeAttribute("content", QString("width=device-width, initial-scale=1.0"));
+    writer.writeEndElement();
     writer.writeEndElement();
 
     // input
@@ -114,18 +117,35 @@
             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;
+                        if (attribute.name() == "style") {
+                            // Fix paragraph alignment (text-align -> align)
+                            if (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;
+                            }
+                            if (type == TypeRichText) {
+                                if (attribute.value().contains("padding-left")) {
+                                    QString style = attribute.value().toString();
+                                    int padding = style.split("padding-left:").at(1).split("px").first().toInt();
+                                    int indent = padding / 30 * 4;
+                                    style.replace(QRegExp("padding-left:[ 0-9]*px;"), "-qt-block-indent:" + QString::number(indent) + ";");
+                                    writer.writeAttribute("style", style);
+                                } else {
+                                    writer.writeAttribute(attribute);
+                                }
+                            } else {
+                                writer.writeAttribute(attribute);
+                            }
+                        } else {
+                            writer.writeAttribute(attribute);
                         }
                     }
+                } else {
+                    writer.writeAttributes(reader.attributes());
                 }
             }
 
@@ -201,7 +221,8 @@
 
                 if (type == TypeRichText) {
                     writer.writeStartElement("img");
-                    writer.writeAttribute("src", checked ? "image://theme/select" : "image://theme/help");
+                    writer.writeAttribute("src", checked ? "image://theme/select" : "../images/unchecked.svg");
+                    writer.writeAttribute("height", QString::number(gu(2)));
                 } else if (type == TypeHtml){
                     writer.writeStartElement("input");
                     writer.writeAttribute("id", "en-todo" + QString::number(todoIndex++));
@@ -246,10 +267,22 @@
         }
     }
 
+    writer.writeEndElement();
     writer.writeEndDocument();
+    qDebug() << "converted to html" << html;
     return html;
 }
 
+qreal EnmlDocument::gu(qreal px) const
+{
+    QByteArray ppguString = qgetenv("GRID_UNIT_PX");
+    int ppgu = ppguString.toInt();
+    if (ppgu == 0) {
+        ppgu = 8;
+    }
+    return px * ppgu;
+}
+
 void EnmlDocument::setRichText(const QString &richText)
 {
     // output
@@ -282,7 +315,6 @@
             if (!isBody) {
                 if (reader.name() == "body") {
                     writer.writeStartElement("en-note");
-                    writer.writeAttributes(reader.attributes());
                     isBody = true;
                 }
                 continue;
@@ -292,9 +324,27 @@
             if (s_commonTags.contains(reader.name().toString())) {
                 writer.writeStartElement(reader.name().toString());
                 if (!s_argumentBlackListTags.contains(reader.name().toString())) {
-                    writer.writeAttributes(reader.attributes());
+
+                    if (reader.name() == "p") {
+                        foreach (const QXmlStreamAttribute &attribute, reader.attributes()) {
+                            if (attribute.name() == "style") {
+                                if (attribute.value().contains("-qt-block-indent")) {
+                                    QString style = attribute.value().toString();
+                                    int indent = style.split("-qt-block-indent:").at(1).split(";").first().toInt();
+                                    int padding = indent / 4 * 30;
+                                    style.replace(QRegExp("-qt-block-indent:[0-9]*;"), "padding-left:" + QString::number(padding) + "px;");
+                                    writer.writeAttribute("style", style);
+                                } else {
+                                    writer.writeAttribute(attribute);
+                                }
+                            } else {
+                                writer.writeAttribute(attribute);
+                            }
+                        }
+                    } else {
+                        writer.writeAttributes(reader.attributes());
+                    }
                 }
-
             }
 
             if (reader.name() == "img") {
@@ -308,7 +358,7 @@
                     writer.writeStartElement("en-media");
                     writer.writeAttribute("hash", hash);
                     writer.writeAttribute("type", type);
-                } else if (imageUrl.authority() == "theme") {
+                } else if (imageUrl.authority() == "theme" || imageUrl.path() == "../images/unchecked.svg") {
                     writer.writeStartElement("en-todo");
                     writer.writeAttribute("checked", imageUrl.path() == "/select" ? "true" : "false");
                 } else {

=== modified file 'src/libqtevernote/utils/enmldocument.h'
--- src/libqtevernote/utils/enmldocument.h	2014-02-19 12:25:52 +0000
+++ src/libqtevernote/utils/enmldocument.h	2014-11-12 22:36:04 +0000
@@ -50,13 +50,15 @@
     };
 
     QString convert(const QString &noteGuid, Type type) const;
+
+    qreal gu(qreal px) const;
+
 private:
     QString m_enml;
 
     static QStringList s_commonTags;
     static QStringList s_argumentBlackListTags;
     static int s_richtextContentWidth;
-
 };
 
 #endif // ENMLDOCUMENT_H