Merge lp:~verzegnassi-stefano/quick-memo/10-misc-refactoring into lp:quick-memo

[Stefano Verzegnassi]

General refactoring of the project:
- changed folder structures
- cleaning up the project

General refactoring of the project:
- changed folder structures
- cleaning up the project

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-13 20:26:48 +0000
+++ CMakeLists.txt	2015-04-26 16:57:43 +0000
@@ -43,6 +43,7 @@
 set(APP_NAME          quick-memo)
 set(APP_DIR           "app")
 set(MAIN_QML          "main.qml")
+set(DESKTOP_FILE      "quick-memo.desktop")
 set(ICON              "graphics/quick-memo.png")
 
 # Set install paths
@@ -64,6 +65,8 @@
 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
         DESTINATION ${CMAKE_INSTALL_PREFIX})
+configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/app_info.json)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/app_info.json DESTINATION ${DATA_DIR})
 
 install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
 install(FILES "quick-memo.apparmor" DESTINATION ${DATA_DIR})
@@ -71,12 +74,18 @@
 install(FILES "COPYING.LGPL-3" DESTINATION ${DATA_DIR})
 install(FILES "copyright" DESTINATION ${DATA_DIR})
 
-# Configure app_info.json
-configure_file(app_info.json.in ${CMAKE_CURRENT_BINARY_DIR}/app_info.json)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/app_info.json DESTINATION ${DATA_DIR})
-
-add_subdirectory(app)
-#add_subdirectory(backend)
+# "App" subdirectory
+configure_file(${DESKTOP_FILE_NAME}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME}.in)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
+
+file(GLOB_RECURSE QML_JS_FILES *.qml *.js)
+add_custom_target(quick-memo_QMlFiles ALL
+    SOURCES ${QML_JS_FILES}
+    COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/app ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${QMLFILES}
+)
+install(DIRECTORY app DESTINATION ${DATA_DIR})
+
 add_subdirectory(po)
 
 add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run

=== removed file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2014-11-03 00:21:23 +0000
+++ app/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-file(GLOB QML_JS_FILES *.qml *.js)
-
-# make the files visible on qtcreator
-add_custom_target(quick-memo_QMlFiles ALL SOURCES ${QML_JS_FILES})
-
-#substitute variables in the desktop file
-set(DESKTOP_FILE "quick-memo.desktop")
-configure_file(${DESKTOP_FILE_NAME}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME}.in)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
-install(FILES ${QML_JS_FILES} DESTINATION ${APP_DIR})
-
-add_subdirectory(components)
-add_subdirectory(ubuntucomponents)
-

=== added directory 'app/common'
=== added file 'app/common/ColorDialog.qml'
--- app/common/ColorDialog.qml	1970-01-01 00:00:00 +0000
+++ app/common/ColorDialog.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,168 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+
+Dialog {
+    id: rootItem
+
+    title: i18n.tr("Pick a color")
+
+    property var colors: ["#fdfdfd", "#e9674d", "#f0a250", "#eec34f", "#aea79f", "#95c253", "#8bbee2", "#e46f8e"]
+    property color selectedColor: colors[0]
+
+    property bool showTick: true
+    property bool askConfirmation: false
+
+    signal colorPicked(bool isChanged)
+
+    onSelectedColorChanged: view.setCurrentColor()
+    Component.onCompleted: internal.oldColor = rootItem.selectedColor
+
+    QtObject {
+        id: internal
+
+        property color oldColor
+    }
+
+    Grid {
+        id: grid
+        width: parent.width
+
+        columns: (width / cellWidth).toFixed(0)
+
+        property int cellHeight: units.gu(5)
+        property int cellWidth: units.gu(5)
+
+        Repeater {
+            id: view
+
+            width: parent.width
+
+            Component.onCompleted: setCurrentColor()
+
+            function setCurrentColor() {
+                if (rootItem.colors) {
+                    for (var i=0; i<rootItem.colors.length; i++) {
+                        if (rootItem.colors[i] == rootItem.selectedColor) {
+                            view.currentIndex = i
+                        }
+                    }
+                }
+            }
+
+            model: rootItem.colors
+
+            property int currentIndex: 0
+
+            delegate: AbstractButton {
+                id: delegate
+
+                height: grid.cellHeight
+                width: grid.cellWidth
+
+                onClicked: {
+                    view.currentIndex = model.index
+
+                    if (!rootItem.askConfirmation) {
+                        rootItem.selectedColor = rootItem.colors[view.currentIndex]
+
+                        console.log ("Old color:", internal.oldColor, "New color:", rootItem.selectedColor)
+                        if (internal.oldColor == rootItem.selectedColor) {
+                            rootItem.colorPicked(false)
+                        } else {
+                            rootItem.colorPicked(true)
+                        }
+
+                        rootItem.hide()
+                    }
+                }
+
+                UbuntuShape {
+                    anchors { fill: parent; margins: units.gu(0.5)}
+                    color: modelData
+                    clip: true
+
+                    Icon {
+                        id: tick
+                        anchors { fill: parent; margins: units.gu(0.5) }
+                        name: "tick"
+                        visible: view.currentIndex == model.index && rootItem.showTick
+                        color: getColor()
+
+                        function getColor() {
+                            return Qt.rgba(1 - parseInt(modelData.substr(1,2), 16) / 255, 1 - parseInt(modelData.substr(3,2), 16) / 255, 1 - parseInt(modelData.substr(5,2), 16) / 255)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Column {
+        width: parent.width
+        spacing: units.gu(2)
+
+        Loader {
+            width: parent.width
+            sourceComponent: if (askConfirmation) return confirmationButtons
+
+            Component {
+                id: confirmationButtons
+                Button {
+                    width: parent.width
+                    text: i18n.tr("OK")
+                    color: UbuntuColors.orange
+
+                    onClicked: {
+                        rootItem.selectedColor = rootItem.colors[view.currentIndex]
+
+                        console.log ("Old color:", internal.oldColor, "New color:", rootItem.selectedColor)
+                        if (internal.oldColor == rootItem.selectedColor) {
+                            rootItem.colorPicked(false)
+                        } else {
+                            rootItem.colorPicked(true)
+                        }
+
+                        rootItem.hide()
+                    }
+                }
+            }
+        }
+
+        Button {
+            width: parent.width
+            text: i18n.tr("Cancel")
+
+            onClicked: {
+                rootItem.hide()
+
+                for (var i=0; i<rootItem.colors.length; i++) {
+                    if (rootItem.colors[i] == internal.oldColor) {
+                        view.currentIndex = i
+                    }
+                }
+                rootItem.selectedColor = internal.oldColor
+            }
+        }
+    }
+
+
+
+}

=== added file 'app/common/NoteModel.qml'
--- app/common/NoteModel.qml	1970-01-01 00:00:00 +0000
+++ app/common/NoteModel.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,119 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import U1db 1.0 as U1db
+import Ubuntu.Components 1.1
+
+Item {
+    id: rootItem
+    property alias model: model
+
+    signal initialized()
+
+    // *** functions
+    function addNote(noteTitle, noteText, noteColor, noteList, notePictures) {
+        // Get the current date
+        var dateString = new Date().valueOf()
+
+        db.putDoc(JSON.stringify({memos: {title: noteTitle, text: noteText, color: noteColor, date: dateString, list: noteList, pictures: notePictures}}))
+    }
+
+    // Function used for changing a single value of the note
+    function setNoteProperty(index, field, value) {
+        var obj = JSON.parse(JSON.stringify(model.get(index)))
+
+        // Edit the required property
+        switch(field) {
+        case "title":
+            obj.contents.title = value
+            break
+        case "text":
+            obj.contents.text = value
+            break
+        case "color":
+            // The char '#' from the hex color is not correctly parse by JSON. We add an empty string, so that it works well.
+            obj.contents.color = "" + value
+            break
+        case "list":
+            obj.contents.list = value
+            break
+        case "pictures":
+            obj.contents.pictures = value
+        }
+
+        // Get the current date and update the time of the last update
+        obj.contents.date = new Date().valueOf()
+
+        db.putDoc(JSON.stringify({memos: obj.contents}), obj.docId)
+    }
+
+    // Function used for rewriting the whole content of the note. json variant is a JSON object.
+    function editNote(index, json) {
+        var obj = json
+
+        // Get the current date and update the time of the last update
+        obj.contents.date = new Date().valueOf()
+
+        console.log(JSON.stringify({memos: obj.contents}))
+        db.putDoc(JSON.stringify({memos: obj.contents}), obj.docId)
+    }
+
+
+    function deleteNote(index) {
+        db.deleteDoc(model.get(index).docId)
+    }
+
+    function deleteNotes(indexes) {
+        var deletedItemNumber = 0;
+        for (var i=0; i<indexes.length; i++) {
+            db.deleteDoc(model.get(indexes[i] - deletedItemNumber).docId)
+            deletedItemNumber++
+        }
+    }
+
+    // *** U1db database
+    U1db.Database {
+        id: db
+        path: "quick-memo"
+        Component.onCompleted: {
+            // TODO: Delete pictures that are not used by the notes at startup.
+            rootItem.initialized()
+        }
+    }
+
+    // TODO: More queries, more pages, a more powerful app.
+    // TODO: Search feature. Use "filter" from SortFilterModel?
+    SortFilterModel {
+        id: model
+        sort {
+            property: "date"
+            order: Qt.DescendingOrder
+        }
+
+        model: U1db.Query {
+            id: query
+            index: U1db.Index {
+                database: db
+                expression: ["memos.docId", "memos.title", "memos.text", "memos.color", "memos.date", "memos.list", "memos.pictures"]
+            }
+            query: ["*", "*", "*", "*", "*", "*", "*"]
+        }
+    }
+
+
+}

=== added file 'app/common/NoteTextArea.qml'
--- app/common/NoteTextArea.qml	1970-01-01 00:00:00 +0000
+++ app/common/NoteTextArea.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,59 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Themes.Ambiance 0.1
+
+TextArea {
+    id: rootItem
+    width: parent.width
+
+    autoSize: true
+    maximumLineCount: 0
+
+    // Prevent data loss
+    inputMethodHints: Qt.ImhNoPredictiveText
+
+    opacity: 1.0
+
+    signal focusLost()
+    signal textReallyChanged
+
+    property string __oldText: ""
+    onTextChanged: {
+        //WORKAROUND: textChanged seems to be emitted also when TextArea has the activeFocus (and text does not change).
+        if (__oldText !== text) {
+            rootItem.textReallyChanged()
+            __oldText = text;
+        }
+    }
+
+    InverseMouseArea {
+        visible: parent.activeFocus
+        anchors.fill: parent
+        onClicked: {
+            rootItem.focusLost()
+            mouse.accepted = false
+        }
+    }
+
+    style: TextAreaStyle {
+        frameSpacing: 0
+        background: Item { anchors.fill: parent }
+    }
+}

=== added file 'app/common/NoteTextField.qml'
--- app/common/NoteTextField.qml	1970-01-01 00:00:00 +0000
+++ app/common/NoteTextField.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,53 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Themes.Ambiance 0.1
+
+import "../ubuntucomponents" as UbuntuComponents
+
+// WORKAROUND: We need a 'custom' version of TextField in wait of LP:1376510 to be fixed.
+// FIXME: Some issue with InputHandler (e.g. Keys.Down or Keys.PgDown) but we don't care it, since at the moment the main focus is not desktop.
+UbuntuComponents.TextField {
+    id: textArea
+    width: parent.width - (checkBox.width + (parent.spacing * 2))
+
+    // Dynamic height: units.gu(3) = implicitHeight - (frameSpacing * 2)
+    height: (contentHeight > units.gu(3)) ? contentHeight : units.gu(3)
+
+    wrapMode: TextInput.Wrap
+
+    // Prevent data loss
+    inputMethodHints: Qt.ImhNoPredictiveText
+
+    signal focusLost()
+    signal focusReceived()
+
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            focusReceived()
+        } else {
+            focusLost()
+        }
+    }
+
+    style: TextFieldStyle {
+        frameSpacing: 0
+        background: Item { anchors.fill: parent }
+    }
+}

=== added file 'app/common/PageBackground.qml'
--- app/common/PageBackground.qml	1970-01-01 00:00:00 +0000
+++ app/common/PageBackground.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,25 @@
+import QtQuick 2.0
+
+// Background
+Rectangle {
+    id: bg
+    anchors.fill: parent
+    z: -10; opacity: 0.5
+
+    property bool __parentPageAboutToBeClosed: false
+
+    /* MainView clips its content, so that it does not overlap the header.
+       We need to bypass this, using another Rectangle that specifically overlap the header. */
+    Rectangle {
+        parent: root.header
+        z: -10; opacity: 0.5
+
+        width: root.width
+        height: root.header.height
+        color: bg.color
+
+        // FIXME: Header background should progressively change opacity to 0.0 when the BottomEdge page is dismissed.
+        visible: !bg.__parentPageAboutToBeClosed
+    }
+}
+

=== added file 'app/common/PageWithBottomEdge.qml'
--- app/common/PageWithBottomEdge.qml	1970-01-01 00:00:00 +0000
+++ app/common/PageWithBottomEdge.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,407 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+    Example:
+
+    MainView {
+        objectName: "mainView"
+
+        applicationName: "com.ubuntu.developer.boiko.bottomedge"
+
+        width: units.gu(100)
+        height: units.gu(75)
+
+        Component {
+            id: pageComponent
+
+            PageWithBottomEdge {
+                id: mainPage
+                title: i18n.tr("Main Page")
+
+                Rectangle {
+                    anchors.fill: parent
+                    color: "white"
+                }
+
+                bottomEdgePageComponent: Page {
+                    title: "Contents"
+                    anchors.fill: parent
+                    //anchors.topMargin: contentsPage.flickable.contentY
+
+                    ListView {
+                        anchors.fill: parent
+                        model: 50
+                        delegate: ListItems.Standard {
+                            text: "One Content Item: " + index
+                        }
+                    }
+                }
+                bottomEdgeTitle: i18n.tr("Bottom edge action")
+            }
+        }
+
+        PageStack {
+            id: stack
+            Component.onCompleted: stack.push(pageComponent)
+        }
+    }
+
+*/
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+Page {
+    id: page
+
+    property alias bottomEdgePageComponent: edgeLoader.sourceComponent
+    property alias bottomEdgePageSource: edgeLoader.source
+    property alias bottomEdgeTitle: tipLabel.text
+    property bool bottomEdgeEnabled: true
+    property int bottomEdgeExpandThreshold: page.height * 0.2
+    property int bottomEdgeExposedArea: bottomEdge.state !== "expanded" ? (page.height - bottomEdge.y - bottomEdge.tipHeight) : _areaWhenExpanded
+    property bool reloadBottomEdgePage: true
+
+    readonly property alias bottomEdgePage: edgeLoader.item
+    readonly property bool isReady: ((bottomEdge.y === 0) && bottomEdgePageLoaded && edgeLoader.item.active)
+    readonly property bool isCollapsed: (bottomEdge.y === page.height)
+    readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
+
+    property bool _showEdgePageWhenReady: false
+    property int _areaWhenExpanded: 0
+
+    signal bottomEdgeReleased()
+    signal bottomEdgeDismissed()
+
+
+    function showBottomEdgePage(source, properties)
+    {
+        edgeLoader.setSource(source, properties)
+        _showEdgePageWhenReady = true
+    }
+
+    function setBottomEdgePage(source, properties)
+    {
+        edgeLoader.setSource(source, properties)
+    }
+
+    function _pushPage()
+    {
+        if (edgeLoader.status === Loader.Ready) {
+            edgeLoader.item.active = true
+            page.pageStack.push(edgeLoader.item)
+            if (edgeLoader.item.flickable) {
+                edgeLoader.item.flickable.contentY = -page.header.height
+                edgeLoader.item.flickable.returnToBounds()
+            }
+            if (edgeLoader.item.ready)
+                edgeLoader.item.ready()
+        }
+    }
+
+
+    Component.onCompleted: {
+        // avoid a binding on the expanded height value
+        var expandedHeight = height;
+        _areaWhenExpanded = expandedHeight;
+    }
+
+    onActiveChanged: {
+        if (active) {
+            bottomEdge.state = "collapsed"
+        }
+    }
+
+    onBottomEdgePageLoadedChanged: {
+        if (_showEdgePageWhenReady && bottomEdgePageLoaded) {
+            bottomEdge.state = "expanded"
+            _showEdgePageWhenReady = false
+        }
+    }
+
+    Rectangle {
+        id: bgVisual
+
+        color: "black"
+        anchors.fill: page
+        opacity: 0.7 * ((page.height - bottomEdge.y) / page.height)
+        z: 1
+    }
+
+    UbuntuShape {
+        id: tip
+        objectName: "bottomEdgeTip"
+
+        property bool hidden: (activeFocus === false) || ((bottomEdge.y - units.gu(1)) < tip.y)
+
+        enabled: mouseArea.enabled
+        visible: page.bottomEdgeEnabled
+        anchors {
+            bottom: parent.bottom
+            horizontalCenter: bottomEdge.horizontalCenter
+            bottomMargin: hidden ? - height + units.gu(1) : -units.gu(1)
+            Behavior on bottomMargin {
+                SequentialAnimation {
+                    // wait some msecs in case of the focus change again, to avoid flickering
+                    PauseAnimation {
+                        duration: 300
+                    }
+                    UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
+                }
+            }
+        }
+
+        z: 1
+        width: tipLabel.paintedWidth + units.gu(6)
+        height: bottomEdge.tipHeight + units.gu(1)
+        color: Theme.palette.normal.overlay
+        Label {
+            id: tipLabel
+
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+            }
+            height: bottomEdge.tipHeight
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            opacity: tip.hidden ? 0.0 : 1.0
+            Behavior on opacity {
+                UbuntuNumberAnimation {
+                    duration: UbuntuAnimation.SnapDuration
+                }
+            }
+        }
+    }
+
+    Rectangle {
+        id: shadow
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: units.gu(1)
+        z: 1
+        opacity: 0.0
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "transparent" }
+            GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+
+        property real previousY: -1
+        property string dragDirection: "None"
+
+        preventStealing: true
+        drag {
+            axis: Drag.YAxis
+            target: bottomEdge
+            minimumY: bottomEdge.pageStartY
+            maximumY: page.height
+        }
+        enabled: edgeLoader.status == Loader.Ready
+        visible: page.bottomEdgeEnabled
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+
+        }
+        height: bottomEdge.tipHeight
+        z: 1
+
+        onReleased: {
+            page.bottomEdgeReleased()
+            if ((dragDirection === "BottomToTop") &&
+                bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
+                bottomEdge.state = "expanded"
+            } else {
+                bottomEdge.state = "collapsed"
+            }
+            previousY = -1
+            dragDirection = "None"
+        }
+
+        onPressed: {
+            previousY = mouse.y
+            tip.forceActiveFocus()
+        }
+
+        onMouseYChanged: {
+            var yOffset = previousY - mouseY
+            // skip if was a small move
+            if (Math.abs(yOffset) <= units.gu(2)) {
+                return
+            }
+            previousY = mouseY
+            dragDirection = yOffset > 0 ? "BottomToTop" : "TopToBottom"
+        }
+    }
+
+    Rectangle {
+        id: bottomEdge
+        objectName: "bottomEdge"
+
+        readonly property int tipHeight: units.gu(3)
+        readonly property int pageStartY: 0
+
+        z: 1
+        color: Theme.palette.normal.background
+        clip: true
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        height: page.height
+        y: height
+        visible: !page.isCollapsed
+        state: "collapsed"
+        states: [
+            State {
+                name: "collapsed"
+                PropertyChanges {
+                    target: bottomEdge
+                    y: bottomEdge.height
+                }
+            },
+            State {
+                name: "expanded"
+                PropertyChanges {
+                    target: bottomEdge
+                    y: bottomEdge.pageStartY
+                }
+            },
+            State {
+                name: "floating"
+                when: mouseArea.drag.active
+                PropertyChanges {
+                    target: shadow
+                    opacity: 1.0
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                to: "expanded"
+                SequentialAnimation {
+                    alwaysRunToEnd: true
+
+                    SmoothedAnimation {
+                        target: bottomEdge
+                        property: "y"
+                        duration: UbuntuAnimation.FastDuration
+                        easing.type: Easing.Linear
+                    }
+                    SmoothedAnimation {
+                        target: edgeLoader
+                        property: "anchors.topMargin"
+                        to: - units.gu(4)
+                        duration: UbuntuAnimation.FastDuration
+                        easing.type: Easing.Linear
+                    }
+                    SmoothedAnimation {
+                        target: edgeLoader
+                        property: "anchors.topMargin"
+                        to: 0
+                        duration: UbuntuAnimation.FastDuration
+                        easing: UbuntuAnimation.StandardEasing
+                    }
+                    ScriptAction {
+                        script: page._pushPage()
+                    }
+                }
+            },
+            Transition {
+                from: "expanded"
+                to: "collapsed"
+                SequentialAnimation {
+                    alwaysRunToEnd: true
+
+                    ScriptAction {
+                        script: {
+                            Qt.inputMethod.hide()
+                            edgeLoader.item.parent = edgeLoader
+                            edgeLoader.item.anchors.fill = edgeLoader
+                            edgeLoader.item.active = false
+                        }
+                    }
+                    SmoothedAnimation {
+                        target: bottomEdge
+                        property: "y"
+                        duration: UbuntuAnimation.SlowDuration
+                    }
+                    ScriptAction {
+                        script: {
+                            // destroy current bottom page
+                            if (page.reloadBottomEdgePage) {
+                                edgeLoader.active = false
+                                // tip will receive focus on page active true
+                            } else {
+                                tip.forceActiveFocus()
+                            }
+
+                            // notify
+                            page.bottomEdgeDismissed()
+
+                            edgeLoader.active = true
+                        }
+                    }
+                }
+            },
+            Transition {
+                from: "floating"
+                to: "collapsed"
+                SmoothedAnimation {
+                    target: bottomEdge
+                    property: "y"
+                    duration: UbuntuAnimation.FastDuration
+                }
+            }
+        ]
+
+        Loader {
+            id: edgeLoader
+
+            asynchronous: true
+            anchors.fill: parent
+            //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
+            Binding {
+                target: edgeLoader.status === Loader.Ready ? edgeLoader : null
+                property: "anchors.topMargin"
+                value:  edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
+                when: !page.isReady
+            }
+
+            onLoaded: {
+                tip.forceActiveFocus()
+                if (page.isReady && edgeLoader.item.active !== true) {
+                    page._pushPage()
+                }
+            }
+        }
+    }
+}

=== added file 'app/common/Toaster.qml'
--- app/common/Toaster.qml	1970-01-01 00:00:00 +0000
+++ app/common/Toaster.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,81 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import Ubuntu.Components 1.1
+
+Rectangle {
+    id: rootItem
+
+    property alias text: label.text
+
+    width: parent.width
+    height: units.gu(8)
+
+    color: "#131313"
+    opacity: 0.85
+
+    anchors {
+        horizontalCenter: parent.horizontalCenter
+        bottom: parent.bottom; bottomMargin: - height
+    }
+
+    Label {
+        id: label
+        anchors.centerIn: parent
+
+        font.weight: Font.DemiBold
+        color: "white"
+    }
+
+    MouseArea {
+        anchors.fill: parent
+
+        onClicked: {
+            showAnimation.stop()
+            destroyAnimation.restart()
+        }
+    }
+
+    Rectangle {
+        anchors {
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+
+        height: units.dp(2)
+        color: UbuntuColors.orange
+    }
+
+    SequentialAnimation {
+        id: showAnimation
+        running: true
+
+        NumberAnimation { target: rootItem; property: "anchors.bottomMargin"; to: 0; duration: 300 }
+        PauseAnimation { duration: 2000 }
+        ScriptAction { script: destroyAnimation.restart() }
+    }
+
+    SequentialAnimation {
+        id: destroyAnimation
+
+        NumberAnimation { target: rootItem; property: "opacity"; to: 0; duration: 500 }
+        ScriptAction { script: rootItem.destroy() }
+    }
+}
+

=== added file 'app/common/dateHelper.js'
--- app/common/dateHelper.js	1970-01-01 00:00:00 +0000
+++ app/common/dateHelper.js	2015-04-26 16:57:43 +0000
@@ -0,0 +1,23 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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/.
+*/
+
+function parseDate(value) {
+    var d = new Date();
+    d.setTime(value)
+
+    return d
+}

=== removed file 'app/components/AboutPage.qml'
--- app/components/AboutPage.qml	2015-01-17 20:25:00 +0000
+++ app/components/AboutPage.qml	1970-01-01 00:00:00 +0000
@@ -1,206 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014-2015 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
-
-Page {
-    id: aboutPage
-
-    title: i18n.tr("About")
-    head.sections.model: [i18n.tr("About"), i18n.tr("Credits"), i18n.tr("Copyright")]
-
-    property string version
-
-    Loader {
-        id: view
-
-        anchors {
-            fill: parent
-            margins: units.gu(2)
-        }
-
-        sourceComponent: {
-            if (aboutPage.head.sections.selectedIndex == 0)
-                return aboutSection
-
-            if (aboutPage.head.sections.selectedIndex == 1)
-                return creditSection
-
-            if (aboutPage.head.sections.selectedIndex == 2)
-                return copyrightSection
-        }
-    }
-
-    // ABOUT SECTION
-    Component {
-        id: aboutSection
-        Column {
-            anchors.centerIn: parent
-            width: root.width > units.gu(50) ? units.gu(50) : parent.width
-            spacing: units.gu(4)
-
-            UbuntuShape {
-                id: logo
-
-                width: root.width > units.gu(50) ? units.gu(25) : parent.width / 2
-                height: width
-                radius: "medium"
-
-                image: Image {
-                    source: "../../graphics/quick-memo.png"
-                }
-
-                anchors.horizontalCenter: parent.horizontalCenter
-            }
-
-            Column {
-                width: parent.width
-
-                Label {
-                    fontSize: "x-large"
-                    font.weight: Font.DemiBold
-                    text: "Quick Memo"
-
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-
-                Label {
-                    // TRANSLATORS: Version of the software (e.g. "Version 0.3.51")
-                    text: i18n.tr("Version ") + aboutPage.version
-
-                    anchors.horizontalCenter: parent.horizontalCenter
-
-                    Component.onCompleted: {
-                        // Extract version info from manifest.json
-                        var doc = new XMLHttpRequest();
-                        var json_string;
-                        doc.onreadystatechange = function() {
-                            if (doc.readyState == XMLHttpRequest.DONE) {
-                                json_string = doc.responseText;
-
-                                if (json_string) {
-                                    var obj = JSON.parse(json_string)
-                                    aboutPage.version = obj.version
-                                } else {
-                                    /* TRANSLATORS: This is shown where it's impossible to get
-                                      the version number (e.g. "Version UNKNOWN") */
-                                    aboutPage.version = i18n.tr("UNKNOWN")
-                                }
-                            }
-                        }
-                        doc.open("get", Qt.resolvedUrl("../../app_info.json"));
-
-                        doc.setRequestHeader("Content-Encoding", "UTF-8");
-                        doc.send();
-                    }
-                }
-            }
-
-            Column {
-                width: parent.width
-
-                Label {
-                    text: "(C) 2014-2015 Stefano Verzegnassi"
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-
-                Label {
-                    fontSize: "small"
-                    text: i18n.tr("Released under the terms of the GNU GPL v3")
-
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-            }
-
-            Column {
-                width: parent.width
-                spacing: units.gu(2)
-
-                Label {
-                    fontSize: "small"
-                    text: i18n.tr("Source code available on ") + "<a href=\"https://launchpad.net/quick-memo\">launchpad.net</a>"
-
-                    anchors.horizontalCenter: parent.horizontalCenter
-
-                    onLinkActivated: Qt.openUrlExternally(link)
-                }
-            }
-        }
-    }   // END ABOUT SECTION
-
-    // CREDITS SECTION
-    Component {
-        id: creditSection
-
-        Column {
-            anchors.fill: parent
-            width: root.width > units.gu(50) ? units.gu(50) : parent.width
-
-            ListItem.Header {
-                text: i18n.tr("A big thanks to:")
-            }
-
-            ListItem.Subtitled {
-                text: "Nekhelesh Ramananthan"
-                subText: "Code contribution"
-            }
-
-            ListItem.Subtitled {
-                text: "Renato Araujo Oliveira Filho"
-                subText: "Code contribution"
-            }
-        }
-    }   // END CREDIT SECTION
-
-    // COPYRIGHT SECTION
-    Component {
-        id: copyrightSection
-
-        Flickable {
-            anchors.fill: parent
-
-            clip: true
-            contentHeight: copyrightText.height
-
-            // Indipendent GU flickable speed workaround
-            flickDeceleration: 1500 * units.gridUnit / 8
-            maximumFlickVelocity: 2500 * units.gridUnit / 8
-
-            Label {
-                id: copyrightText
-                wrapMode: Text.WordWrap
-                width: parent.width
-                fontSize: "x-small"
-
-                Component.onCompleted: {
-                    var doc = new XMLHttpRequest();
-                    doc.onreadystatechange = function() {
-                        if (doc.readyState == XMLHttpRequest.DONE) {
-                            text = doc.responseText;
-                        }
-                    }
-                    doc.open("get", Qt.resolvedUrl("../../copyright"));
-                    doc.setRequestHeader("Content-Encoding", "UTF-8");
-                    doc.send();
-                }
-            }
-        }
-    }
-}

=== removed file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	2014-11-03 00:21:23 +0000
+++ app/components/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
-
-# make the files visible in the qtcreator tree
-add_custom_target(quick-memo_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
-
-install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${APP_DIR}/components)
-

=== removed file 'app/components/ColorDialog.qml'
--- app/components/ColorDialog.qml	2014-09-02 00:16:08 +0000
+++ app/components/ColorDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,168 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
-
-Dialog {
-    id: rootItem
-
-    title: i18n.tr("Pick a color")
-
-    property var colors: ["#fdfdfd", "#e9674d", "#f0a250", "#eec34f", "#aea79f", "#95c253", "#8bbee2", "#e46f8e"]
-    property color selectedColor: colors[0]
-
-    property bool showTick: true
-    property bool askConfirmation: false
-
-    signal colorPicked(bool isChanged)
-
-    onSelectedColorChanged: view.setCurrentColor()
-    Component.onCompleted: internal.oldColor = rootItem.selectedColor
-
-    QtObject {
-        id: internal
-
-        property color oldColor
-    }
-
-    Grid {
-        id: grid
-        width: parent.width
-
-        columns: (width / cellWidth).toFixed(0)
-
-        property int cellHeight: units.gu(5)
-        property int cellWidth: units.gu(5)
-
-        Repeater {
-            id: view
-
-            width: parent.width
-
-            Component.onCompleted: setCurrentColor()
-
-            function setCurrentColor() {
-                if (rootItem.colors) {
-                    for (var i=0; i<rootItem.colors.length; i++) {
-                        if (rootItem.colors[i] == rootItem.selectedColor) {
-                            view.currentIndex = i
-                        }
-                    }
-                }
-            }
-
-            model: rootItem.colors
-
-            property int currentIndex: 0
-
-            delegate: AbstractButton {
-                id: delegate
-
-                height: grid.cellHeight
-                width: grid.cellWidth
-
-                onClicked: {
-                    view.currentIndex = model.index
-
-                    if (!rootItem.askConfirmation) {
-                        rootItem.selectedColor = rootItem.colors[view.currentIndex]
-
-                        console.log ("Old color:", internal.oldColor, "New color:", rootItem.selectedColor)
-                        if (internal.oldColor == rootItem.selectedColor) {
-                            rootItem.colorPicked(false)
-                        } else {
-                            rootItem.colorPicked(true)
-                        }
-
-                        rootItem.hide()
-                    }
-                }
-
-                UbuntuShape {
-                    anchors { fill: parent; margins: units.gu(0.5)}
-                    color: modelData
-                    clip: true
-
-                    Icon {
-                        id: tick
-                        anchors { fill: parent; margins: units.gu(0.5) }
-                        name: "tick"
-                        visible: view.currentIndex == model.index && rootItem.showTick
-                        color: getColor()
-
-                        function getColor() {
-                            return Qt.rgba(1 - parseInt(modelData.substr(1,2), 16) / 255, 1 - parseInt(modelData.substr(3,2), 16) / 255, 1 - parseInt(modelData.substr(5,2), 16) / 255)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Column {
-        width: parent.width
-        spacing: units.gu(2)
-
-        Loader {
-            width: parent.width
-            sourceComponent: if (askConfirmation) return confirmationButtons
-
-            Component {
-                id: confirmationButtons
-                Button {
-                    width: parent.width
-                    text: i18n.tr("OK")
-                    color: UbuntuColors.orange
-
-                    onClicked: {
-                        rootItem.selectedColor = rootItem.colors[view.currentIndex]
-
-                        console.log ("Old color:", internal.oldColor, "New color:", rootItem.selectedColor)
-                        if (internal.oldColor == rootItem.selectedColor) {
-                            rootItem.colorPicked(false)
-                        } else {
-                            rootItem.colorPicked(true)
-                        }
-
-                        rootItem.hide()
-                    }
-                }
-            }
-        }
-
-        Button {
-            width: parent.width
-            text: i18n.tr("Cancel")
-
-            onClicked: {
-                rootItem.hide()
-
-                for (var i=0; i<rootItem.colors.length; i++) {
-                    if (rootItem.colors[i] == internal.oldColor) {
-                        view.currentIndex = i
-                    }
-                }
-                rootItem.selectedColor = internal.oldColor
-            }
-        }
-    }
-
-
-
-}

=== removed file 'app/components/Delegate.qml'
--- app/components/Delegate.qml	2014-11-06 05:09:59 +0000
+++ app/components/Delegate.qml	1970-01-01 00:00:00 +0000
@@ -1,291 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Thumbnailer 0.1
-import "dateHelper.js" as DateHelper
-
-AbstractButton {
-    id: rootItem
-
-    height: layout.height + layout.anchors.topMargin
-    width: parent.width
-
-    property bool selected: false
-    property int maxListDelegatesNumber: 3
-
-    // RGB channels from 'shape.color' are in [0; 1] range.
-    property color foregroundColor: ((shape.color.r * 0.30 + shape.color.g * 0.59 + shape.color.b * 0.11) > 0.5) ? UbuntuColors.darkGrey : "#F3F3E7"
-
-    UbuntuShape {
-        id: shape
-        anchors.fill: parent
-
-        // Add 70% opacity
-        color: contents.color.toString().replace("#", "#B3")
-
-        radius: "medium"
-
-        Column {
-            id: layout
-            anchors { top: parent.top; left: parent.left; right: parent.right; topMargin: units.gu(2) }
-
-            Column {
-                id: column
-                width: parent.width - (spacing * 2)
-                x: spacing
-                spacing: units.gu(2)
-
-                Loader {
-                    width: parent.width
-                    sourceComponent: (contents.title == "") ? undefined : titleComponent
-
-                    Component {
-                        id: titleComponent
-
-                        Label {
-                            width: parent.width
-                            fontSize: "large"
-                            font.weight: Font.Bold
-                            text: contents.title
-                            elide: Text.ElideRight
-                            maximumLineCount: 2
-                            wrapMode: Text.WrapAnywhere
-                            color: rootItem.foregroundColor
-                        }
-                    }
-
-                }
-
-                Loader {
-                    width: parent.width
-                    sourceComponent: (contents.text == "") ? undefined : textComponent
-
-                    Component {
-                        id: textComponent
-
-                        Label {
-                            width: parent.width
-                            text: contents.text
-                            wrapMode: Text.WrapAnywhere
-                            elide: Text.ElideRight
-                            maximumLineCount: 5
-                            color: rootItem.foregroundColor
-                        }
-                    }
-                }
-            }
-
-            // A spacer item
-            Item {
-                width: parent.width
-                height: units.gu(2)
-                visible: picsRepeater.count > 0
-            }
-
-            Item {
-                id: picsItem
-                width: parent.width
-                height: picFlow.height
-
-                // TODO: As for listDelegates, limit pics to a number of 9
-                Flow {
-                    id: picFlow
-                    width: parent.width
-
-                    Repeater {
-                        id: picsRepeater
-
-                        model: contents.pictures
-
-                        delegate: Image {
-                            id: img
-                            width: parent.width
-                            fillMode: Image.PreserveAspectCrop
-                            source: "image://thumbnailer/" + Qt.resolvedUrl(contents.pictures[index].url)
-
-                            Connections {
-                                target: picsRepeater
-                                onItemAdded: calculateSize(index)
-                                onItemRemoved: calculateSize(index)
-                            }
-
-                            Connections {
-                                target: picFlow
-                                onWidthChanged: calculateSize(index)
-                            }
-
-                            Component.onCompleted: calculateSize(index)
-
-                             function calculateSize(index) {
-                                var n = picsRepeater.count
-                                var i = n % 3
-                                var m = Math.floor(n / 3)
-
-                                height = units.gu(6)
-
-                                // Need to be hardcoded because of an issue.
-                                // FIXME: Think it requires a better solution
-                                var picFlowRealWidth = ((root.width - units.gu(4)) * 0.5) - units.gu(1)
-
-                                switch(i) {
-                                case 0:
-                                    width = picFlowRealWidth / 3
-                                    return
-                                case 1:
-                                    if (index == 0) {
-                                        width = picFlowRealWidth
-                                        return
-                                    } else {
-                                        width = picFlowRealWidth / 3
-                                        return
-                                    }
-                                case 2:
-                                    if (index <= 1) {
-                                        width = picFlowRealWidth / 2
-                                        return
-                                    } else {
-                                        width = picFlowRealWidth / 3
-                                        return
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    Component.onCompleted: picsRepeater.model = contents.pictures
-                }
-            }
-
-            Loader {
-                id: listLoader
-                width: parent.width
-                sourceComponent: (contents.list[0]) ? listComponent : null
-
-                Component {
-                    id: listComponent
-
-                    Column {
-                        width: parent.width
-
-                        // A spacer item
-                        Item {
-                            width: parent.width
-                            height: units.gu(1)
-                        }
-
-                        Repeater {
-                            id: listRepeater
-                            width: parent.width
-
-                            model: contents.list
-
-                            delegate: Loader {
-                                width: parent.width
-                                sourceComponent: model.index < 4 ? listDelegate : null
-
-                                Component {
-                                    id: listDelegate
-
-                                    Row {
-                                        id: rootItem
-                                        spacing: units.gu(1)
-                                        width: parent.width
-                                        height: Math.max(checkBox.height, textArea.height)
-
-                                        Item {
-                                            id: checkBox
-                                            width: parent.width
-                                            height: units.gu(4)
-
-                                            property bool checked: contents.list[index].checked
-
-                                            Icon {
-                                                id: tick
-                                                anchors {
-                                                    left: parent.left; leftMargin: units.gu(2.25);
-                                                    top: parent.top; topMargin: units.gu(0.35)
-                                                }
-                                                width: (source == "../../graphics/select.svg") ? units.gu(2.25) : units.gu(1.5)
-                                                height: (source == "../../graphics/select.svg") ? units.gu(2) : units.gu(1.5)
-
-                                                source: checkBox.checked ? "../../graphics/select.svg" : "../../graphics/unselect.svg"
-                                                visible: model.index !== 3
-                                                color: foregroundColor
-                                            }
-
-                                            Label {
-                                                id: textArea
-                                                anchors { left: tick.right; right: parent.right; margins: units.gu(1) }
-
-                                                font.strikeout: checkBox.checked
-                                                text: (model.index == 3) ? ". . ." : contents.list[index].text
-                                                elide: Text.ElideRight
-                                                maximumLineCount: 2
-                                                wrapMode: Text.WrapAnywhere
-                                                color: foregroundColor
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        Component.onCompleted: listRepeater.model = contents.list
-                    }
-                }
-            }
-
-            // A spacer item
-            Item {
-                width: parent.width
-                height: units.gu(2)
-            }
-
-            Item {
-                id: date
-                width: parent.width
-                height: units.gu(4)
-
-                Label {
-                    anchors { right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(2) }
-                    text: Qt.formatDateTime(DateHelper.parseDate(contents.date), "d MMM yyyy, hh:mm")
-                    fontSize: "small"
-                    color: rootItem.foregroundColor
-                }
-            }
-        }
-    }
-
-    // Visual feedback when pressed. Not listed in official documentation, still useful.
-    onPressedChanged: {
-        if (pressed)
-            shape.borderSource = "radius_pressed.sci"
-        else
-            shape.borderSource = "radius_idle.sci"
-    }
-
-    // Visual feedback when selected.
-    onSelectedChanged: {
-        if (selected) {
-            shape.color = Qt.darker(contents.color)
-        } else {
-            shape.color = contents.color.toString().replace("#", "#B3")
-        }
-    }
-}

=== removed file 'app/components/EditMemoPage.qml'
--- app/components/EditMemoPage.qml	2015-01-17 20:30:56 +0000
+++ app/components/EditMemoPage.qml	1970-01-01 00:00:00 +0000
@@ -1,328 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014-2015 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Keyboard 0.1
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-import "dateHelper.js" as DateHelper
-
-Page {
-    id: memoPage
-    title: editMemo ? i18n.tr("Details") : i18n.tr("Add a new memo")
-
-    /* This page has two modes: NewMemo and EditMemo.
-       Following properties are used to load the right mode.
-    */
-    property bool editMemo: false
-    property int index
-
-    property bool canSave: (title.text != "") || (desc.text != "") || (listManager.model.count > 0) || (picsView.model.count > 0)
-    property bool contentChanged: false
-
-    // Load an existent memo if required
-    Component.onCompleted: { if (editMemo) loadNote() }
-
-    head.backAction: editMemo ? backEditMemo : backNewMemo
-    head.actions: [colorToolAction, deleteMemo, saveMemo]
-
-    // Background
-    PageBackground { id: bg }
-
-    // flickable property needs to be explicitly set, to avoid a binding loop for memoPage.height
-    flickable: flickable
-    Flickable {
-        id: flickable
-        anchors.fill: parent
-
-        // Indipendent GU flickable speed workaround
-        flickDeceleration: 1500 * units.gridUnit / 8
-        maximumFlickVelocity: 2500 * units.gridUnit / 8
-
-        // Could this be an SDK-related issue?
-        contentHeight: layout.height + root.header.height
-        interactive: contentHeight > height
-
-        Column {
-            id: layout
-            anchors { left: parent.left; right: parent.right }
-            spacing: units.gu(1)
-
-            // Spacing
-            Item { width: parent.width; height: units.gu(1) }
-
-            NoteTextField {
-                id: title
-                x: units.gu(2); width: parent.width - units.gu(4)
-
-                font.weight: Font.Bold
-                font.pixelSize: FontUtils.sizeToPixels("large")
-
-                placeholderText: i18n.tr("No title")
-                onFocusLost: flickable.forceActiveFocus()
-
-                // Ubuntu Keyboard
-                /* TRANSLATORS: This is a custom text for the "enter" key of
-                  the on-screen keyboard (max 4 char, so it's not elided)  */
-                InputMethod.extensions: { "enterKeyText": i18n.tr("Next") }
-                Keys.onReturnPressed: desc.forceActiveFocus()
-            }
-
-            NoteTextArea {
-                id: desc
-                x: units.gu(2); width: parent.width - units.gu(4)
-
-                placeholderText: i18n.tr("No description")
-                onFocusLost: flickable.forceActiveFocus()
-            }
-
-            ListManager {
-                id: listManager
-
-                width: parent.width
-                flickable: flickable
-            }
-
-            PicturesManager { id: picsView; width: parent.width }
-
-            Label {
-                id: updateLabel
-                anchors { right: parent.right; rightMargin: units.gu(2) }
-
-                fontSize: "x-small"
-                visible: editMemo
-
-                function refresh() {
-                    updateLabel.text = i18n.tr("Last update: %1").arg(Qt.formatDateTime(DateHelper.parseDate(notes.model.get(index).contents.date), "d MMM yyyy, hh:mm:ss"))
-                }
-            }
-        }
-    }
-
-    // Used for auto saving while editing fields
-    Timer {
-        id: autoSaveTimer
-        interval: 1000   // Is this a good timing?
-
-        onTriggered: {
-            if (!canSave) { // Change timer inteval if can't save?
-                deleteDialog.emptyMemo = true;
-                deleteDialog.show();
-            } else {
-                console.log("autoSaveTimer triggered... updating the note!")
-                saveNote()
-            }
-        }
-    }
-
-    function loadNote() {
-        var memoObj = notes.model.get(index)
-
-        title.text = memoObj.contents.title
-        desc.text = memoObj.contents.text
-        bg.color = memoObj.contents.color
-
-        // Append list items provided by NoteModel
-        listManager.model.clear()
-        for (var i=0; i<memoObj.contents.list.length; i++) {
-            listManager.model.append(JSON.parse(JSON.stringify(memoObj.contents.list[i])))
-        }
-
-        // Append pictures items provided by NoteModel
-        picsView.model.clear()
-        for (var i=0; i<memoObj.contents.pictures.length; i++) {
-            picsView.model.append(JSON.parse(JSON.stringify(memoObj.contents.pictures[i])))
-        }
-
-        // Connect signals for auto-saving
-        title.textChanged.connect(updateNote)
-        desc.textReallyChanged.connect(updateNote)
-        listManager.listChanged.connect(updateNote)
-        picsView.picsModelChanged.connect(updateNote)
-        bg.colorChanged.connect(updateNote)
-
-        updateLabel.refresh()
-    }
-
-    function updateNote() {
-        autoSaveTimer.restart()
-    }
-
-    function saveNote() {
-        var obj = JSON.parse(JSON.stringify(notes.model.get(index)))
-
-        obj.contents.title = title.text
-        obj.contents.text = desc.text
-        // The char '#' from the hex color is not correctly parse by JSON. We add an empty string, so that it works well.
-        obj.contents.color = "" +  bg.color
-        obj.contents.list = listManager.exportModel()
-        obj.contents.pictures = picsView.exportModel()
-
-        notes.editNote(memoPage.index, obj)
-        updateLabel.refresh()
-
-        memoPage.contentChanged = true;
-    }
-
-    function addNote() {
-        notes.addNote(title.text,
-                      desc.text,
-                      "" + bg.color,    // The char '#' from the hex color is not correctly parse by JSON. We add an empty string, so that it works well.
-                      listManager.exportModel(),
-                      picsView.exportModel())
-        pageStack.pop()
-
-        root.showNotification(i18n.tr("Memo saved!"))
-    }
-
-    // *** ACTIONS ***
-    Action {
-        id: saveMemo
-        text: i18n.tr("Save")
-        iconName: "ok"
-        onTriggered: addNote()
-
-        visible: !editMemo
-        enabled: canSave
-    }
-    Action {
-        id: deleteMemo
-        text: i18n.tr("Delete memo")
-        iconName: "delete"
-        onTriggered: deleteDialog.show()
-        visible: editMemo
-    }
-    Action {
-        id: colorToolAction
-        text: i18n.tr("Change memo color")
-        iconSource: "../../graphics/palette.svg"
-        onTriggered: PopupUtils.open(colorNotePopover)
-    }
-
-    // *** BACK ACTIONS ***
-    Action {
-        id: backEditMemo
-        iconName: "back"
-        onTriggered: {
-            if (!canSave) {
-                deleteDialog.emptyMemo = true;
-                deleteDialog.show();
-            } else {
-                // Check if a saveNote request was made. If so, stop the timer and save before exiting the page.
-                if (autoSaveTimer.running) {
-                    console.log("It's ok. Saving the note before closing the page...")
-                    autoSaveTimer.running = false
-                    saveNote()
-                }
-                pageStack.pop()
-
-                /* Workaround: see MainPage.qml, comment for mainView.delegate.onClicked().
-                        We simply re-push in the stack what we removed earlier.*/
-                pageStack.push(mainPage)
-
-                if (memoPage.contentChanged)
-                    root.showNotification(i18n.tr("Memo updated!"))
-            }
-        }
-    }
-
-    Action {
-        id: backNewMemo
-        iconName: "close"
-        onTriggered: {
-            if (canSave)
-                PopupUtils.open(dataLosingOnBackDialog)
-            else {
-                // Just a pop() because this is called only when the page is loaded through bottomEdge.
-                pageStack.pop()
-
-                root.showNotification(i18n.tr("Memo aborted!"))
-            }
-        }
-    }
-
-    //  *** DIALOGS ***
-    Dialog {
-        id: deleteDialog
-
-        property bool emptyMemo: false
-
-        title: emptyMemo ? i18n.tr("Empty memo") : i18n.tr("Delete memo")
-        text: emptyMemo ? i18n.tr("This memo has no content.") : i18n.tr("Are you sure?")
-
-        Button {
-            text: i18n.tr("Cancel")
-            gradient: UbuntuColors.greyGradient
-            onClicked: deleteDialog.hide()
-            visible: !emptyMemo
-        }
-        Button {
-            text: i18n.tr("Delete")
-            color: UbuntuColors.orange
-            onClicked: {
-                deleteDialog.hide()
-                pageStack.pop();
-                pageStack.push(mainPage)
-                notes.deleteNote(index)
-
-                root.showNotification(i18n.tr("Memo deleted!"))
-            }
-        }
-    }
-
-    Component {
-        id: dataLosingOnBackDialog
-        Dialog {
-            id: dataLosingOnBackDialogue
-
-            title: i18n.tr("Discard changes?")
-            text: i18n.tr("Your memo will be PERMANENTLY lost.")
-
-            Button {
-                text: i18n.tr("Cancel")
-                gradient: UbuntuColors.greyGradient
-                onClicked: PopupUtils.close(dataLosingOnBackDialogue)
-            }
-            Button {
-                text: i18n.tr("Go back!")
-                color: UbuntuColors.orange
-                onClicked: {
-                    PopupUtils.close(dataLosingOnBackDialogue)
-                    pageStack.pop();
-                }
-            }
-        }
-    }
-
-    Component {
-        id: colorNotePopover
-
-        ColorDialog {
-            id: colorDialog
-
-            selectedColor: bg.color
-            onColorPicked: {
-                if (isChanged)
-                    bg.color = selectedColor
-
-                PopupUtils.close(colorDialog)
-            }
-        }
-    }
-}

=== removed file 'app/components/HorizontalFlowListView.qml'
--- app/components/HorizontalFlowListView.qml	2014-10-04 18:40:51 +0000
+++ app/components/HorizontalFlowListView.qml	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- *  Copyright 2012 Ruediger Gad
- *  Copyright 2014 Stefano Verzegnassi <[e-mail]>
- *
- *  This file is part of FlowListView.
- *
- *  FlowListView is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License (LGPL)
- *  as published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  FlowListView 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 Lesser General Public License
- *  along with FlowListView.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// A derivative version of FlowListView.qml
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-Flickable {
-    id: flowListView
-
-    contentWidth: flow.childrenRect.width
-
-    property alias count: repeater.count
-    property int currentIndex: -1
-    property variant currentItem;
-    property alias delegate: repeater.delegate
-    property alias model: repeater.model
-
-    property alias spacing: flow.spacing
-
-    property alias add: flow.add
-    property alias populate: flow.populate
-    property alias move: flow.move
-
-    // Indipendent GU flickable speed workaround
-    flickDeceleration: 1500 * units.gridUnit / 8
-    maximumFlickVelocity: 2500 * units.gridUnit / 8
-
-    onCurrentIndexChanged: {
-        currentItem = repeater.itemAt(currentIndex)
-    }
-
-    Flow {
-        id: flow
-
-        height: parent.height
-        flow: Flow.TopToBottom
-
-        Item { width: units.gu(1); height: parent.height }
-
-        Repeater {
-            id: repeater
-
-            onCountChanged: {
-                if (flowListView.currentIndex === -1 && count > 0) {
-                    flowListView.currentIndex = 0
-                    return
-                }
-                if (flowListView.currentIndex >= count) {
-                    flowListView.currentIndex = count - 1
-                    return
-                }
-
-                flowListView.currentIndex = -1
-            }
-        }
-
-        Item { width: units.gu(1); height: parent.height }
-    }
-}

=== removed file 'app/components/IconButton.qml'
--- app/components/IconButton.qml	2014-08-24 18:35:14 +0000
+++ app/components/IconButton.qml	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import QtGraphicalEffects 1.0
-
-AbstractButton {
-    id: rootItem
-    height: units.gu(4)
-    width: height
-
-    property alias source: image.name
-
-    Icon {
-        id: image
-        anchors.fill: parent
-        visible: false
-    }
-
-    ColorOverlay {
-        id: co
-        anchors { fill: image; margins: units.gu(0.5) }
-        source: image
-        color: rootItem.pressed ? UbuntuColors.orange : Theme.palette.selected.backgroundText
-
-        Behavior on color {
-            ColorAnimation { duration: UbuntuAnimation.SnapDuration }
-        }
-    }
-}

=== removed file 'app/components/ImageViewer.qml'
--- app/components/ImageViewer.qml	2014-10-04 18:40:51 +0000
+++ app/components/ImageViewer.qml	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-// Following are used by the custom header
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import QtGraphicalEffects 1.0
-
-Page {
-    id: imageViewer
-
-    property alias source: image.source
-
-    // Don't use Ubuntu header. Use a custom one.
-    Item {
-        id: header
-
-        anchors { left: parent.left; top: parent.top; right: parent.right }
-        height: units.gu(6)
-
-        Rectangle {
-            anchors.fill: parent
-            color: "black"
-            opacity: 0.3
-
-            ListItem.Divider {
-                anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
-            }
-        }
-
-        AbstractButton {
-            id: backButton
-            anchors { left: parent.left; top: parent.top; bottom: parent.bottom; leftMargin: units.gu(2);  }
-            width: backImg.width + title.width + title.anchors.margins
-
-            onClicked: pageStack.pop()
-
-            Icon {
-                id: backImg
-                anchors { left: parent.left; verticalCenter: parent.verticalCenter }
-                height: units.gu(2)
-                width: height
-                visible: false
-                name: "back"
-            }
-
-            ColorOverlay {
-                id: co
-                anchors.fill: backImg
-                source: backImg
-                color: backButton.pressed ? UbuntuColors.orange : "white"
-                Behavior on color {
-                    ColorAnimation { duration: UbuntuAnimation.SnapDuration }
-                }
-            }
-
-            Label {
-                id: title
-                anchors { left: co.right; verticalCenter: parent.verticalCenter; margins: units.gu(1) }
-                text: i18n.tr("Back")
-
-                fontSize: "large"
-                font.weight: Font.DemiBold
-                color: backButton.pressed ? UbuntuColors.orange : "white"
-
-                Behavior on color {
-                    ColorAnimation { duration: UbuntuAnimation.SnapDuration }
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        color: "black"
-        z:-10
-    }
-
-    Flickable {
-        id: flickable
-        anchors { left: parent.left; top: header.bottom; right: parent.right; bottom: parent.bottom }
-
-        contentWidth: Math.max(container.width, width)
-        contentHeight: Math.max(container.height, height)
-
-        // Indipendent GU flickable speed workaround
-        flickDeceleration: 1500 * units.gridUnit / 8
-        maximumFlickVelocity: 2500 * units.gridUnit / 8
-
-        Item {
-            id: container
-            anchors.centerIn: parent
-            width: image.paintedWidth * image.scale
-            height: image.paintedHeight * image.scale
-
-            Image {
-                id: image
-                anchors.centerIn: parent
-                width: flickable.width
-                height: flickable.height
-                fillMode: Image.PreserveAspectFit
-            }
-        }
-
-        PinchArea {
-            anchors.fill: parent
-            pinch.target: image
-            pinch.minimumScale: 1.0
-            pinch.maximumScale: 5.0
-        }
-
-        // Go below the custom header
-        z: -1
-    }
-}

=== removed file 'app/components/ListManager.qml'
--- app/components/ListManager.qml	2015-01-07 18:27:48 +0000
+++ app/components/ListManager.qml	1970-01-01 00:00:00 +0000
@@ -1,311 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Keyboard 0.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-Column {
-    id: rootItem
-
-    width: parent.width
-    spacing: units.gu(0.25)
-
-    property Flickable flickable
-    property alias model: repeater.model
-    property alias delegate: repeater.delegate
-    property alias footer: footerLoader.sourceComponent
-    readonly property bool focusOnLastItem: (model.focusedIndex === -1) || (model.focusedIndex === (model.count - 1))
-
-    signal listChanged()
-
-    ListItem.Header {
-        text: i18n.tr("List:")
-    }
-
-    Repeater {
-        id: repeater
-        width: parent.width
-
-        model: ListModel {
-            id: dataModel
-
-            property int focusedIndex: -1
-        }
-
-        delegate: delegate
-    }
-
-    // TODO: When user adds an element in the list, the new element should gain focus.
-    Loader {
-        id: footerLoader
-        width: parent.width
-
-        sourceComponent: ListItem.Empty {
-            width: parent.width
-            opacity: enabled ? 1.0 : 0.5
-            showDivider: false
-
-            enabled: {
-                if (rootItem.model.count > 0) {
-                    if (rootItem.model.get(rootItem.model.count - 1).text !== "") {
-                        return true
-                    } else {
-                        return false
-                    }
-                } else {
-                    return true
-                }
-            }
-
-            Row {
-                spacing: units.gu(2)
-                anchors {
-                    left: parent.left; leftMargin: units.gu(2);
-                    right: parent.right;
-                    verticalCenter: parent.verticalCenter
-                }
-
-                Item {
-                    id: addListBtnImage
-                    implicitWidth: units.gu(4.25)
-                    implicitHeight: units.gu(4)
-
-                    Icon {
-                        anchors { fill: parent; margins: units.gu(0.5) }
-                        name: "add"
-                    }
-                }
-
-                Label {
-                    id: addListBtnLabel
-                    // TRANSLATORS: Text of a button used for add an item in the To-do list.
-                    text: i18n.tr("Add item")
-                    anchors.verticalCenter: addListBtnImage.verticalCenter
-                }
-            }
-
-            onClicked: {
-                rootItem.addItem({"checked": false, "text": ""})
-                // Here we don't send listChanged signal, since it is an empty item that should not be saved
-            }
-        }
-    }
-
-
-    function exportModel() {
-        var list = []
-
-        if (rootItem.model.count > 0 && rootItem.model.get(0).text !== "") {
-            for (var i=0; i<rootItem.model.count; i++) {
-                if (i != rootItem.model.count && rootItem.model.get(i).text != "") {
-                    list[i] = rootItem.model.get(i)
-                }
-            }
-        }
-
-        return list
-    }
-
-    function addItem(args) {
-        rootItem.model.append(args)
-        var newItem = repeater.itemAt(repeater.count - 1)
-        newItem.textArea.forceActiveFocus()
-        autoScrollAnimation.makeMeVisible(newItem)
-    }
-
-    SequentialAnimation {
-        id: autoScrollAnimation
-
-        property var targetItem: null
-        alwaysRunToEnd: true
-
-        // wait item be moved to correct place
-        PauseAnimation {
-            duration: 100
-        }
-        // scroll to new item position
-        ScriptAction {
-            script: {
-                if (autoScrollAnimation.targetItem) {
-                    autoScrollAnimation.makeMeVisibleImpl(autoScrollAnimation.targetItem)
-                    autoScrollAnimation.targetItem = null
-                }
-            }
-        }
-
-        function makeMeVisible(newItem) {
-            autoScrollAnimation.targetItem = newItem
-            autoScrollAnimation.restart()
-        }
-
-        function makeMeVisibleImpl(newItem) {
-            if (!newItem) {
-                return
-            }
-
-            var positionY = rootItem.y + repeater.y + newItem.y
-
-            // check if the item is already visible
-            var bottomY = flickable.contentY + flickable.height
-            var itemBottom = positionY + (newItem.height *3) // margin
-            if (positionY >= flickable.contentY && itemBottom <= bottomY) {
-                return;
-            }
-
-            // if it is not, try to scroll and make it visible
-            var targetY = itemBottom - flickable.height
-            if (targetY >= 0 && positionY) {
-                flickable.contentY = targetY
-            } else if (positionY < flickable.contentY) {
-                // if it is hidden at the top, also show it
-                flickable.contentY = positionY
-            }
-            flickable.returnToBounds()
-        }
-    }
-
-
-    // *** DELEGATE ***
-    Component {
-        id: delegate
-
-        ListItem.Empty {
-            id: item
-            width: parent ? parent.width : undefined
-            height: (layoutDelegate.height > item.__height) ? layoutDelegate.height : item.__height
-
-            showDivider: false
-
-            property alias textArea: textArea
-
-            Rectangle {
-                anchors.fill: parent
-                opacity: 0.1
-                visible: textArea.activeFocus
-                color: "black"
-            }
-
-            backgroundIndicator: Rectangle {
-                anchors.fill: parent
-                color: "red"
-
-                Icon {
-                    anchors.centerIn: parent
-                    name: "delete"
-                    color: Theme.palette.selected.field
-                    height: units.gu(3)
-                    width: units.gu(3)
-                }
-            }
-
-            // ListItem is removable for all items, except the first when the text field is empty.
-            //confirmRemoval: true
-            removable: rootItem.model.count > 1 || (rootItem.model.get(0).text !== "")
-            confirmRemoval: true
-            onItemRemoved: {
-                // Send the signal before removing the item. This avoids a ReferenceError.
-                rootItem.listChanged()
-                rootItem.model.remove(model.index)
-            }
-
-            Row {
-                id: layoutDelegate
-
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                    verticalCenter: parent.verticalCenter
-                }
-
-                spacing: units.gu(1)
-                height: Math.max(checkBox.height, textArea.height)
-
-                CheckBox {
-                    id: checkBox
-
-                    checked: model.checked
-                    onCheckedChanged: layoutDelegate.updateModel()
-
-                    style: Item {
-                        implicitWidth: units.gu(4.25)
-                        implicitHeight: units.gu(4)
-
-                        Image {
-                            anchors { fill: parent; margins: units.gu(0.5) }
-
-                            source: checkBox.checked ? "../../graphics/select.svg" : "../../graphics/unselect.svg"
-                        }
-                    }
-                }
-
-                NoteTextField {
-                    id: textArea
-
-                    width: parent.width - (checkBox.width + (parent.spacing * 2))
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    font.strikeout: checkBox.checked
-
-                    onFocusReceived: {
-                       rootItem.model.focusedIndex = model.index
-                    }
-
-                    text: model.text
-                    onTextChanged: {
-                        layoutDelegate.updateModel()
-
-                        /* This requires some test. No problem when TextField is used, but it seems to break dataModel when
-                            TextArea is used. Could be related to NoteTextArea.qml, line 39.*/
-                        if (text === "") {
-                            rootItem.model.remove(model.index)
-                        }
-                    }
-
-                    //hasClearButton: false
-                    focus: true
-
-                    // Ubuntu Keyboard
-                    // TODO: Disable Enter key if model.text is empty.
-                    InputMethod.extensions: {
-                        "enterKeyText": rootItem.focusOnLastItem ? i18n.tr("Add") : i18n.tr("Next")
-                    }
-
-                    Keys.onReturnPressed: {
-                        if (rootItem.focusOnLastItem && (model.text !== "")) {
-                            // Create a new item.
-                            rootItem.addItem({"checked": false, "text": ""})
-                        } else if (!rootItem.focusOnLastItem) {
-                            var nextItem = repeater.itemAt(model.index + 1)
-                            if (nextItem) {
-                                nextItem.textArea.forceActiveFocus()
-                                autoScrollAnimation.makeMeVisible(nextItem)
-                            }
-                        }
-                    }
-                }
-
-                function updateModel() {
-                    rootItem.model.set(model.index, {"checked": checkBox.checked, "text": textArea.text})
-                    rootItem.listChanged()
-                }
-            }
-        }
-    }
-}

=== removed file 'app/components/ListViewDelegate.qml'
--- app/components/ListViewDelegate.qml	2014-11-06 05:09:59 +0000
+++ app/components/ListViewDelegate.qml	1970-01-01 00:00:00 +0000
@@ -1,299 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Thumbnailer 0.1
-import "dateHelper.js" as DateHelper
-
-AbstractButton {
-    id: rootItem
-
-    height: layout.height + layout.anchors.topMargin
-    width: parent.width
-
-    property bool selected: false
-    property int maxListDelegatesNumber: 3
-
-    // RGB channels from 'shape.color' are in [0; 1] range.
-    property color foregroundColor: ((shape.color.r * 0.30 + shape.color.g * 0.59 + shape.color.b * 0.11) > 0.5) ? UbuntuColors.darkGrey : "#F3F3E7"
-
-    UbuntuShape {
-        id: shape
-        anchors.fill: parent
-
-        // Add 70% opacity
-        color: contents.color.toString().replace("#", "#B3")
-
-        radius: "medium"
-
-        Column {
-            id: layout
-            anchors { top: parent.top; left: parent.left; right: parent.right; topMargin: units.gu(2) }
-
-            Loader {
-                x: units.gu(2)
-                width: parent.width - x
-                sourceComponent: (contents.title == "") ? undefined : titleComponent
-
-                Component {
-                    id: titleComponent
-
-                    Label {
-                        width: parent.width
-                        fontSize: "large"
-                        font.weight: Font.Bold
-                        text: contents.title
-                        elide: Text.ElideRight
-                        maximumLineCount: 2
-                        wrapMode: Text.WrapAnywhere
-                        color: rootItem.foregroundColor
-                    }
-                }
-            }
-
-            // A spacer item
-            Item {
-                width: parent.width
-                height: units.gu(1)
-            }
-
-            Item {
-                x: (column1.width > 0) ? units.gu(2) : 0
-                width: parent.width - units.gu(4)
-                height: Math.max(column1.height, column2.height)
-
-                Column {
-                    id: column1
-                    anchors { left: parent.left; top: parent.top }
-                    width: ((contents.text == "") && (picsRepeater.count == 0)) ? 0
-                                                                                : (listRepeater.count > 0) ? (parent.width * 0.5)
-                                                                                                           : parent.width
-                    spacing: units.gu(2)
-
-                    Loader {
-                        width: parent.width
-                        sourceComponent: (contents.text == "") ? undefined : textComponent
-
-                        Component {
-                            id: textComponent
-
-                            Label {
-                                width: parent.width
-                                text: contents.text
-                                wrapMode: Text.WrapAnywhere
-                                elide: Text.ElideRight
-                                maximumLineCount: 5
-                                color: rootItem.foregroundColor
-                            }
-                        }
-                    }
-
-                    Item {
-                        id: picsItem
-                        width: parent.width
-                        height: picFlow.height
-
-                        // TODO: As for listDelegates, limit pics to a number of 9
-                        Flow {
-                            id: picFlow
-                            width: parent.width
-
-                            Repeater {
-                                id: picsRepeater
-
-                                model: contents.pictures
-
-                                delegate: Image {
-                                    id: img
-                                    width: parent.width
-                                    fillMode: Image.PreserveAspectCrop
-                                    source: "image://thumbnailer/" + Qt.resolvedUrl(contents.pictures[index].url)
-
-                                    Connections {
-                                        target: picsRepeater
-                                        onItemAdded: calculateSize(index)
-                                        onItemRemoved: calculateSize(index)
-                                    }
-
-                                    Connections {
-                                        target: picFlow
-                                        onWidthChanged: calculateSize(index)
-                                    }
-
-                                    Component.onCompleted: calculateSize(index)
-
-                                     function calculateSize(index) {
-                                        var n = picsRepeater.count
-                                        var i = n % 3
-                                        var m = Math.floor(n / 3)
-
-                                        height = units.gu(6)
-
-                                        // Need to be hardcoded because of an issue.
-                                        // FIXME: Think it requires a better solution
-                                        var picFlowRealWidth = column1.width  - units.gu(1)
-
-                                        switch(i) {
-                                        case 0:
-                                            width = picFlowRealWidth / 3
-                                            return
-                                        case 1:
-                                            if (index == 0) {
-                                                width = picFlowRealWidth
-                                                return
-                                            } else {
-                                                width = picFlowRealWidth / 3
-                                                return
-                                            }
-                                        case 2:
-                                            if (index <= 1) {
-                                                width = picFlowRealWidth / 2
-                                                return
-                                            } else {
-                                                width = picFlowRealWidth / 3
-                                                return
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            Component.onCompleted: picsRepeater.model = contents.pictures
-                        }
-                    }
-                }
-
-                Loader {
-                    anchors { right: column2.left; top: parent.top; bottom: parent.bottom; rightMargin: -units.gu(1) }
-                    sourceComponent: ((column2.width > 0) && (column1.width > 0)) ? divider : null
-                    width: 1
-
-                    Component {
-                        id: divider
-                        Rectangle {
-                            anchors.fill: parent
-                            color: foregroundColor
-                            opacity: 0.3
-                        }
-                    }
-                }
-
-                Column {
-                    id: column2
-                    anchors { left: column1.right; top: parent.top }
-                    width: (listRepeater.count > 0) ? ((contents.text == "") && (picsRepeater.count == 0)) ? parent.width
-                                                                                                           : (parent.width * 0.5)
-                                                    : 0
-
-                    Repeater {
-                        id: listRepeater
-                        width: parent.width
-
-                        model: contents.list
-
-                        delegate: Loader {
-                            width: parent.width
-                            sourceComponent: model.index < 4 ? listDelegate : null
-
-                            Component {
-                                id: listDelegate
-
-                                Row {
-                                    id: rootItem
-                                    spacing: units.gu(1)
-                                    width: parent.width
-                                    height: Math.max(checkBox.height, textArea.height)
-
-                                    Item {
-                                        id: checkBox
-                                        width: parent.width
-                                        height: units.gu(4)
-
-                                        property bool checked: contents.list[index].checked
-
-                                        Icon {
-                                            id: tick
-                                            anchors {
-                                                left: parent.left; leftMargin: units.gu(2.25);
-                                                top: parent.top; topMargin: units.gu(0.35)
-                                            }
-                                            width: (source == "../../graphics/select.svg") ? units.gu(2.25) : units.gu(1.5)
-                                            height: (source == "../../graphics/select.svg") ? units.gu(2) : units.gu(1.5)
-
-                                            source: checkBox.checked ? "../../graphics/select.svg" : "../../graphics/unselect.svg"
-                                            visible: model.index !== 3
-                                            color: foregroundColor
-                                        }
-
-                                        Label {
-                                            id: textArea
-                                            anchors { left: tick.right; right: parent.right; margins: units.gu(1) }
-
-                                            font.strikeout: checkBox.checked
-                                            text: (model.index == 3) ? ". . ." : contents.list[index].text
-                                            elide: Text.ElideRight
-                                            maximumLineCount: 2
-                                            wrapMode: Text.WrapAnywhere
-                                            color: foregroundColor
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            // A spacer item
-            Item {
-                width: parent.width
-                height: units.gu(1)
-            }
-
-            Item {
-                id: date
-                width: parent.width
-                height: units.gu(4)
-
-                Label {
-                    anchors { right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(2) }
-                    text: Qt.formatDateTime(DateHelper.parseDate(contents.date), "d MMM yyyy, hh:mm")
-                    fontSize: "small"
-                    color: rootItem.foregroundColor
-                }
-            }
-        }
-    }
-
-    // Visual feedback when pressed. Not listed in official documentation, still useful.
-    onPressedChanged: {
-        if (pressed)
-            shape.borderSource = "radius_pressed.sci"
-        else
-            shape.borderSource = "radius_idle.sci"
-    }
-
-    // Visual feedback when selected.
-    onSelectedChanged: {
-        if (selected) {
-            shape.color = Qt.darker(contents.color)
-        } else {
-            shape.color = contents.color.toString().replace("#", "#B3")
-        }
-    }
-}

=== renamed file 'app/components/MainPage.qml' => 'app/components/MainPage.qml.THIS'
=== removed file 'app/components/MultiSelectionHandler.qml'
--- app/components/MultiSelectionHandler.qml	2014-11-03 00:21:23 +0000
+++ app/components/MultiSelectionHandler.qml	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-
-PageHeadState {
-    id: rootItem
-
-    property string title
-
-    property var indexes: []
-    property int count: rootItem.indexes.length
-    property Page targetPage
-
-    head: targetPage.head
-
-    backAction: Action {
-        text: i18n.tr("Cancel")
-        iconName: "back"
-        onTriggered: targetPage.state = "default"
-    }
-
-    contents: Item {
-        anchors.fill: parent
-
-        Connections {
-            target: targetPage
-            onStateChanged: {
-                if (targetPage.state !== "multiSelection") {
-                    // Clean the model
-                    rootItem.indexes = []
-                }
-            }
-        }
-
-        Label {
-            fontSize: "x-large"
-
-            // See LP:1184810
-            text: (rootItem.count == 0) ? i18n.tr("No item selected")
-                                        : i18n.tr("%1 item selected", "%1 items selected", rootItem.count).arg(rootItem.count)
-
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        // Provide a visual feedback when active
-        Rectangle {
-            id: headerBg
-            parent: targetPage.header
-            z: -10
-
-            width: targetPage.width
-            height: targetPage.header.height
-            color: "#19B6EE"   // Cyan
-            visible: mainPage.state == "multiSelection"
-        }
-    }
-
-    signal indexAdded(var index)
-    signal indexRemoved(var index)
-
-    function selectUnselectItem(index) {
-        for (var i=0; i<rootItem.indexes.length; i++) {
-            // Search for index in the model
-            if (rootItem.indexes[i] === index) {
-                // That means it's already in, so remove it.
-                rootItem.indexes.splice(i, 1);
-
-                // Update count and header
-                rootItem.count = rootItem.indexes.length
-
-                // Return false if the index is removed.
-                rootItem.indexRemoved(index)
-                return false
-            }
-        }
-
-        // Otherwise, the item is not in the model, so add it.
-        rootItem.indexes.push(index)
-
-        // Update count
-        rootItem.count = rootItem.indexes.length
-
-        // Sort indexes, so that it's easier to use the indexes we collect.
-        indexes.sort(function(a,b) {return a-b})
-
-        // Return true if the index is added
-        rootItem.indexAdded(index)
-        return true
-    }
-}

=== removed file 'app/components/NoteModel.qml'
--- app/components/NoteModel.qml	2014-08-21 20:09:02 +0000
+++ app/components/NoteModel.qml	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import U1db 1.0 as U1db
-import Ubuntu.Components 1.1
-
-Item {
-    id: rootItem
-    property alias model: model
-
-    signal initialized()
-
-    // *** functions
-    function addNote(noteTitle, noteText, noteColor, noteList, notePictures) {
-        // Get the current date
-        var dateString = new Date().valueOf()
-
-        db.putDoc(JSON.stringify({memos: {title: noteTitle, text: noteText, color: noteColor, date: dateString, list: noteList, pictures: notePictures}}))
-    }
-
-    // Function used for changing a single value of the note
-    function setNoteProperty(index, field, value) {
-        var obj = JSON.parse(JSON.stringify(model.get(index)))
-
-        // Edit the required property
-        switch(field) {
-        case "title":
-            obj.contents.title = value
-            break
-        case "text":
-            obj.contents.text = value
-            break
-        case "color":
-            // The char '#' from the hex color is not correctly parse by JSON. We add an empty string, so that it works well.
-            obj.contents.color = "" + value
-            break
-        case "list":
-            obj.contents.list = value
-            break
-        case "pictures":
-            obj.contents.pictures = value
-        }
-
-        // Get the current date and update the time of the last update
-        obj.contents.date = new Date().valueOf()
-
-        db.putDoc(JSON.stringify({memos: obj.contents}), obj.docId)
-    }
-
-    // Function used for rewriting the whole content of the note. json variant is a JSON object.
-    function editNote(index, json) {
-        var obj = json
-
-        // Get the current date and update the time of the last update
-        obj.contents.date = new Date().valueOf()
-
-        console.log(JSON.stringify({memos: obj.contents}))
-        db.putDoc(JSON.stringify({memos: obj.contents}), obj.docId)
-    }
-
-
-    function deleteNote(index) {
-        db.deleteDoc(model.get(index).docId)
-    }
-
-    function deleteNotes(indexes) {
-        var deletedItemNumber = 0;
-        for (var i=0; i<indexes.length; i++) {
-            db.deleteDoc(model.get(indexes[i] - deletedItemNumber).docId)
-            deletedItemNumber++
-        }
-    }
-
-    // *** U1db database
-    U1db.Database {
-        id: db
-        path: "quick-memo"
-        Component.onCompleted: {
-            // TODO: Delete pictures that are not used by the notes at startup.
-            rootItem.initialized()
-        }
-    }
-
-    // TODO: More queries, more pages, a more powerful app.
-    // TODO: Search feature. Use "filter" from SortFilterModel?
-    SortFilterModel {
-        id: model
-        sort {
-            property: "date"
-            order: Qt.DescendingOrder
-        }
-
-        model: U1db.Query {
-            id: query
-            index: U1db.Index {
-                database: db
-                expression: ["memos.docId", "memos.title", "memos.text", "memos.color", "memos.date", "memos.list", "memos.pictures"]
-            }
-            query: ["*", "*", "*", "*", "*", "*", "*"]
-        }
-    }
-
-
-}

=== removed file 'app/components/NoteTextArea.qml'
--- app/components/NoteTextArea.qml	2014-10-04 00:46:31 +0000
+++ app/components/NoteTextArea.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.Ambiance 0.1
-
-TextArea {
-    id: rootItem
-    width: parent.width
-
-    autoSize: true
-    maximumLineCount: 0
-
-    // Prevent data loss
-    inputMethodHints: Qt.ImhNoPredictiveText
-
-    opacity: 1.0
-
-    signal focusLost()
-    signal textReallyChanged
-
-    property string __oldText: ""
-    onTextChanged: {
-        //WORKAROUND: textChanged seems to be emitted also when TextArea has the activeFocus (and text does not change).
-        if (__oldText !== text) {
-            rootItem.textReallyChanged()
-            __oldText = text;
-        }
-    }
-
-    InverseMouseArea {
-        visible: parent.activeFocus
-        anchors.fill: parent
-        onClicked: {
-            rootItem.focusLost()
-            mouse.accepted = false
-        }
-    }
-
-    style: TextAreaStyle {
-        frameSpacing: 0
-        background: Item { anchors.fill: parent }
-    }
-}

=== removed file 'app/components/NoteTextField.qml'
--- app/components/NoteTextField.qml	2015-01-07 18:27:48 +0000
+++ app/components/NoteTextField.qml	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.Ambiance 0.1
-
-import "../ubuntucomponents" as UbuntuComponents
-
-// WORKAROUND: We need a 'custom' version of TextField in wait of LP:1376510 to be fixed.
-// FIXME: Some issue with InputHandler (e.g. Keys.Down or Keys.PgDown) but we don't care it, since at the moment the main focus is not desktop.
-UbuntuComponents.TextField {
-    id: textArea
-    width: parent.width - (checkBox.width + (parent.spacing * 2))
-
-    // Dynamic height: units.gu(3) = implicitHeight - (frameSpacing * 2)
-    height: (contentHeight > units.gu(3)) ? contentHeight : units.gu(3)
-
-    wrapMode: TextInput.Wrap
-
-    // Prevent data loss
-    inputMethodHints: Qt.ImhNoPredictiveText
-
-    signal focusLost()
-    signal focusReceived()
-
-    onActiveFocusChanged: {
-        if (activeFocus) {
-            focusReceived()
-        } else {
-            focusLost()
-        }
-    }
-
-    style: TextFieldStyle {
-        frameSpacing: 0
-        background: Item { anchors.fill: parent }
-    }
-}

=== removed file 'app/components/PageBackground.qml'
--- app/components/PageBackground.qml	2014-09-28 23:58:26 +0000
+++ app/components/PageBackground.qml	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-import QtQuick 2.0
-
-// Background
-Rectangle {
-    id: bg
-    anchors.fill: parent
-    z: -10; opacity: 0.5
-
-    property bool __parentPageAboutToBeClosed: false
-
-    /* MainView clips its content, so that it does not overlap the header.
-       We need to bypass this, using another Rectangle that specifically overlap the header. */
-    Rectangle {
-        parent: root.header
-        z: -10; opacity: 0.5
-
-        width: root.width
-        height: root.header.height
-        color: bg.color
-
-        // FIXME: Header background should progressively change opacity to 0.0 when the BottomEdge page is dismissed.
-        visible: !bg.__parentPageAboutToBeClosed
-    }
-}
-

=== removed file 'app/components/PageWithBottomEdge.qml'
--- app/components/PageWithBottomEdge.qml	2014-10-21 16:01:52 +0000
+++ app/components/PageWithBottomEdge.qml	1970-01-01 00:00:00 +0000
@@ -1,407 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
-    Example:
-
-    MainView {
-        objectName: "mainView"
-
-        applicationName: "com.ubuntu.developer.boiko.bottomedge"
-
-        width: units.gu(100)
-        height: units.gu(75)
-
-        Component {
-            id: pageComponent
-
-            PageWithBottomEdge {
-                id: mainPage
-                title: i18n.tr("Main Page")
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: "white"
-                }
-
-                bottomEdgePageComponent: Page {
-                    title: "Contents"
-                    anchors.fill: parent
-                    //anchors.topMargin: contentsPage.flickable.contentY
-
-                    ListView {
-                        anchors.fill: parent
-                        model: 50
-                        delegate: ListItems.Standard {
-                            text: "One Content Item: " + index
-                        }
-                    }
-                }
-                bottomEdgeTitle: i18n.tr("Bottom edge action")
-            }
-        }
-
-        PageStack {
-            id: stack
-            Component.onCompleted: stack.push(pageComponent)
-        }
-    }
-
-*/
-
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-
-Page {
-    id: page
-
-    property alias bottomEdgePageComponent: edgeLoader.sourceComponent
-    property alias bottomEdgePageSource: edgeLoader.source
-    property alias bottomEdgeTitle: tipLabel.text
-    property bool bottomEdgeEnabled: true
-    property int bottomEdgeExpandThreshold: page.height * 0.2
-    property int bottomEdgeExposedArea: bottomEdge.state !== "expanded" ? (page.height - bottomEdge.y - bottomEdge.tipHeight) : _areaWhenExpanded
-    property bool reloadBottomEdgePage: true
-
-    readonly property alias bottomEdgePage: edgeLoader.item
-    readonly property bool isReady: ((bottomEdge.y === 0) && bottomEdgePageLoaded && edgeLoader.item.active)
-    readonly property bool isCollapsed: (bottomEdge.y === page.height)
-    readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
-
-    property bool _showEdgePageWhenReady: false
-    property int _areaWhenExpanded: 0
-
-    signal bottomEdgeReleased()
-    signal bottomEdgeDismissed()
-
-
-    function showBottomEdgePage(source, properties)
-    {
-        edgeLoader.setSource(source, properties)
-        _showEdgePageWhenReady = true
-    }
-
-    function setBottomEdgePage(source, properties)
-    {
-        edgeLoader.setSource(source, properties)
-    }
-
-    function _pushPage()
-    {
-        if (edgeLoader.status === Loader.Ready) {
-            edgeLoader.item.active = true
-            page.pageStack.push(edgeLoader.item)
-            if (edgeLoader.item.flickable) {
-                edgeLoader.item.flickable.contentY = -page.header.height
-                edgeLoader.item.flickable.returnToBounds()
-            }
-            if (edgeLoader.item.ready)
-                edgeLoader.item.ready()
-        }
-    }
-
-
-    Component.onCompleted: {
-        // avoid a binding on the expanded height value
-        var expandedHeight = height;
-        _areaWhenExpanded = expandedHeight;
-    }
-
-    onActiveChanged: {
-        if (active) {
-            bottomEdge.state = "collapsed"
-        }
-    }
-
-    onBottomEdgePageLoadedChanged: {
-        if (_showEdgePageWhenReady && bottomEdgePageLoaded) {
-            bottomEdge.state = "expanded"
-            _showEdgePageWhenReady = false
-        }
-    }
-
-    Rectangle {
-        id: bgVisual
-
-        color: "black"
-        anchors.fill: page
-        opacity: 0.7 * ((page.height - bottomEdge.y) / page.height)
-        z: 1
-    }
-
-    UbuntuShape {
-        id: tip
-        objectName: "bottomEdgeTip"
-
-        property bool hidden: (activeFocus === false) || ((bottomEdge.y - units.gu(1)) < tip.y)
-
-        enabled: mouseArea.enabled
-        visible: page.bottomEdgeEnabled
-        anchors {
-            bottom: parent.bottom
-            horizontalCenter: bottomEdge.horizontalCenter
-            bottomMargin: hidden ? - height + units.gu(1) : -units.gu(1)
-            Behavior on bottomMargin {
-                SequentialAnimation {
-                    // wait some msecs in case of the focus change again, to avoid flickering
-                    PauseAnimation {
-                        duration: 300
-                    }
-                    UbuntuNumberAnimation {
-                        duration: UbuntuAnimation.SnapDuration
-                    }
-                }
-            }
-        }
-
-        z: 1
-        width: tipLabel.paintedWidth + units.gu(6)
-        height: bottomEdge.tipHeight + units.gu(1)
-        color: Theme.palette.normal.overlay
-        Label {
-            id: tipLabel
-
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-            }
-            height: bottomEdge.tipHeight
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            opacity: tip.hidden ? 0.0 : 1.0
-            Behavior on opacity {
-                UbuntuNumberAnimation {
-                    duration: UbuntuAnimation.SnapDuration
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        id: shadow
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: units.gu(1)
-        z: 1
-        opacity: 0.0
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "transparent" }
-            GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        property real previousY: -1
-        property string dragDirection: "None"
-
-        preventStealing: true
-        drag {
-            axis: Drag.YAxis
-            target: bottomEdge
-            minimumY: bottomEdge.pageStartY
-            maximumY: page.height
-        }
-        enabled: edgeLoader.status == Loader.Ready
-        visible: page.bottomEdgeEnabled
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-
-        }
-        height: bottomEdge.tipHeight
-        z: 1
-
-        onReleased: {
-            page.bottomEdgeReleased()
-            if ((dragDirection === "BottomToTop") &&
-                bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
-                bottomEdge.state = "expanded"
-            } else {
-                bottomEdge.state = "collapsed"
-            }
-            previousY = -1
-            dragDirection = "None"
-        }
-
-        onPressed: {
-            previousY = mouse.y
-            tip.forceActiveFocus()
-        }
-
-        onMouseYChanged: {
-            var yOffset = previousY - mouseY
-            // skip if was a small move
-            if (Math.abs(yOffset) <= units.gu(2)) {
-                return
-            }
-            previousY = mouseY
-            dragDirection = yOffset > 0 ? "BottomToTop" : "TopToBottom"
-        }
-    }
-
-    Rectangle {
-        id: bottomEdge
-        objectName: "bottomEdge"
-
-        readonly property int tipHeight: units.gu(3)
-        readonly property int pageStartY: 0
-
-        z: 1
-        color: Theme.palette.normal.background
-        clip: true
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        height: page.height
-        y: height
-        visible: !page.isCollapsed
-        state: "collapsed"
-        states: [
-            State {
-                name: "collapsed"
-                PropertyChanges {
-                    target: bottomEdge
-                    y: bottomEdge.height
-                }
-            },
-            State {
-                name: "expanded"
-                PropertyChanges {
-                    target: bottomEdge
-                    y: bottomEdge.pageStartY
-                }
-            },
-            State {
-                name: "floating"
-                when: mouseArea.drag.active
-                PropertyChanges {
-                    target: shadow
-                    opacity: 1.0
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                to: "expanded"
-                SequentialAnimation {
-                    alwaysRunToEnd: true
-
-                    SmoothedAnimation {
-                        target: bottomEdge
-                        property: "y"
-                        duration: UbuntuAnimation.FastDuration
-                        easing.type: Easing.Linear
-                    }
-                    SmoothedAnimation {
-                        target: edgeLoader
-                        property: "anchors.topMargin"
-                        to: - units.gu(4)
-                        duration: UbuntuAnimation.FastDuration
-                        easing.type: Easing.Linear
-                    }
-                    SmoothedAnimation {
-                        target: edgeLoader
-                        property: "anchors.topMargin"
-                        to: 0
-                        duration: UbuntuAnimation.FastDuration
-                        easing: UbuntuAnimation.StandardEasing
-                    }
-                    ScriptAction {
-                        script: page._pushPage()
-                    }
-                }
-            },
-            Transition {
-                from: "expanded"
-                to: "collapsed"
-                SequentialAnimation {
-                    alwaysRunToEnd: true
-
-                    ScriptAction {
-                        script: {
-                            Qt.inputMethod.hide()
-                            edgeLoader.item.parent = edgeLoader
-                            edgeLoader.item.anchors.fill = edgeLoader
-                            edgeLoader.item.active = false
-                        }
-                    }
-                    SmoothedAnimation {
-                        target: bottomEdge
-                        property: "y"
-                        duration: UbuntuAnimation.SlowDuration
-                    }
-                    ScriptAction {
-                        script: {
-                            // destroy current bottom page
-                            if (page.reloadBottomEdgePage) {
-                                edgeLoader.active = false
-                                // tip will receive focus on page active true
-                            } else {
-                                tip.forceActiveFocus()
-                            }
-
-                            // notify
-                            page.bottomEdgeDismissed()
-
-                            edgeLoader.active = true
-                        }
-                    }
-                }
-            },
-            Transition {
-                from: "floating"
-                to: "collapsed"
-                SmoothedAnimation {
-                    target: bottomEdge
-                    property: "y"
-                    duration: UbuntuAnimation.FastDuration
-                }
-            }
-        ]
-
-        Loader {
-            id: edgeLoader
-
-            asynchronous: true
-            anchors.fill: parent
-            //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
-            Binding {
-                target: edgeLoader.status === Loader.Ready ? edgeLoader : null
-                property: "anchors.topMargin"
-                value:  edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
-                when: !page.isReady
-            }
-
-            onLoaded: {
-                tip.forceActiveFocus()
-                if (page.isReady && edgeLoader.item.active !== true) {
-                    page._pushPage()
-                }
-            }
-        }
-    }
-}

=== removed file 'app/components/PictureButton.qml'
--- app/components/PictureButton.qml	2014-10-04 17:44:08 +0000
+++ app/components/PictureButton.qml	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-
-AbstractButton {
-    id: rootItem
-    width: units.gu(8)
-    height: units.gu(8)
-
-    property alias image: shape.image
-    default property alias contentsItem: shape.data
-
-    onPressedChanged: {
-        if (pressed)
-            shape.borderSource = "radius_pressed.sci"
-        else
-            shape.borderSource = "radius_idle.sci"
-    }
-
-    UbuntuShape {
-        id: shape
-        anchors.fill: parent
-    }
-}

=== removed file 'app/components/PicturesManager.qml'
--- app/components/PicturesManager.qml	2014-10-21 18:21:13 +0000
+++ app/components/PicturesManager.qml	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-import Ubuntu.Thumbnailer 0.1
-import Ubuntu.Content 0.1
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
-Item {
-    id: rootItem
-
-    property alias model: repeater.model
-
-    width: parent.width
-    height: childrenRect.height
-
-    signal picsModelChanged()
-
-    function exportModel() {
-        var list = []
-        for (var i=0; i<picModel.count; i++) {
-            list[i] = picModel.get(i)
-        }
-
-        return list
-    }
-
-    ListItem.Header { id: header; text: i18n.tr("Related pictures:") }
-
-    Flow {
-        id: flow
-
-        anchors {
-            top: header.bottom; topMargin: units.gu(1)
-            left: parent.left
-            right: parent.right
-            margins: units.gu(2)
-        }
-        spacing: units.gu(2)
-
-        Repeater {
-            id: repeater
-
-            model: ListModel { id: picModel; onRowsRemoved: rootItem.picsModelChanged() }
-            delegate: PictureButton {
-                image: Image {
-                    source: "image://thumbnailer/" + Qt.resolvedUrl(model.url)
-                    fillMode: Image.PreserveAspectCrop
-                }
-
-                //TODO: Add right click support
-                onClicked: pageStack.push(Qt.resolvedUrl("./ImageViewer.qml"), {source: Qt.resolvedUrl(model.url)})
-                onPressAndHold: PopupUtils.open(pictureMenuPopover, this, {index: model.index})
-            }
-        }
-
-        PictureButton {
-            Icon {
-                anchors.centerIn: parent
-                height: parent.height / 2
-                width: height
-                name: "add"
-            }
-
-            onClicked: rootItem.importImageFromContentHub()
-        }
-    }
-
-    // *** CONTENT HANDLER ***
-    //This should be probably moved in main.qml
-    property var activeTransfer
-
-    function importImageFromContentHub() {
-        pageStack.push(picker)
-    }
-
-    Page {
-        id: picker
-        visible: false
-
-        ContentPeerPicker {
-            visible: parent.visible
-
-            contentType: ContentType.Pictures
-            handler: ContentHandler.Source
-
-            onPeerSelected: {
-                rootItem.activeTransfer = peer.request(appStore);
-                pageStack.pop();
-            }
-
-            onCancelPressed: {
-                pageStack.pop();
-            }
-        }
-    }
-
-    ContentTransferHint {
-        id: transferHint
-        anchors.fill: parent
-        activeTransfer: rootItem.activeTransfer
-    }
-
-    ContentStore {
-        id: appStore
-        scope: ContentScope.App
-    }
-
-    Connections {
-        target: rootItem.activeTransfer ? rootItem.activeTransfer : null
-        onStateChanged: {
-            if (rootItem.activeTransfer.state === ContentTransfer.Charged) {
-                for (var i=0; i<rootItem.activeTransfer.items.length; i++) {
-                    picModel.append({url: rootItem.activeTransfer.items[i].url.toString().replace("file://", "")})
-                    console.log("CONTENT IMPORTED:", rootItem.activeTransfer.items[i].url.toString().replace("file://", ""))
-                    rootItem.picsModelChanged()
-                }
-            }
-        }
-    }
-
-    // *** PICTURE POPOVER ***
-    Component {
-        id: pictureMenuPopover
-        ActionSelectionPopover {
-            id: popover
-            property int index
-
-            actions: ActionList {
-                Action {
-                    text: i18n.tr("Remove picture from selection")
-                    onTriggered: {
-                        PopupUtils.close(popover)
-                        rootItem.model.remove(popover.index)
-                    }
-                }
-            }
-
-            delegate: ListItem.Standard {
-                // ForegroundColor is not correctly set
-                __foregroundColor: Theme.palette.normal.overlayText
-                showDivider: false
-            }
-        }
-    }
-}

=== removed file 'app/components/Toaster.qml'
--- app/components/Toaster.qml	2014-10-22 12:43:11 +0000
+++ app/components/Toaster.qml	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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.0
-import Ubuntu.Components 1.1
-
-Rectangle {
-    id: rootItem
-
-    property alias text: label.text
-
-    width: parent.width
-    height: units.gu(8)
-
-    color: "#131313"
-    opacity: 0.85
-
-    anchors {
-        horizontalCenter: parent.horizontalCenter
-        bottom: parent.bottom; bottomMargin: - height
-    }
-
-    Label {
-        id: label
-        anchors.centerIn: parent
-
-        font.weight: Font.DemiBold
-        color: "white"
-    }
-
-    MouseArea {
-        anchors.fill: parent
-
-        onClicked: {
-            showAnimation.stop()
-            destroyAnimation.restart()
-        }
-    }
-
-    Rectangle {
-        anchors {
-            bottom: parent.bottom
-            left: parent.left
-            right: parent.right
-        }
-
-        height: units.dp(2)
-        color: UbuntuColors.orange
-    }
-
-    SequentialAnimation {
-        id: showAnimation
-        running: true
-
-        NumberAnimation { target: rootItem; property: "anchors.bottomMargin"; to: 0; duration: 300 }
-        PauseAnimation { duration: 2000 }
-        ScriptAction { script: destroyAnimation.restart() }
-    }
-
-    SequentialAnimation {
-        id: destroyAnimation
-
-        NumberAnimation { target: rootItem; property: "opacity"; to: 0; duration: 500 }
-        ScriptAction { script: rootItem.destroy() }
-    }
-}
-

=== removed file 'app/components/dateHelper.js'
--- app/components/dateHelper.js	2014-08-04 17:05:04 +0000
+++ app/components/dateHelper.js	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-/*
-  This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
-
-    This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License 3 as published by
-  the Free Software Foundation.
-
-    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/.
-*/
-
-function parseDate(value) {
-    var d = new Date();
-    d.setTime(value)
-
-    return d
-}

=== added directory 'app/editPage'
=== added file 'app/editPage/ListManager.qml'
--- app/editPage/ListManager.qml	1970-01-01 00:00:00 +0000
+++ app/editPage/ListManager.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,313 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014, 2015 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Keyboard 0.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+import "../common"
+
+Column {
+    id: rootItem
+
+    width: parent.width
+    spacing: units.gu(0.25)
+
+    property Flickable flickable
+    property alias model: repeater.model
+    property alias delegate: repeater.delegate
+    property alias footer: footerLoader.sourceComponent
+    readonly property bool focusOnLastItem: (model.focusedIndex === -1) || (model.focusedIndex === (model.count - 1))
+
+    signal listChanged()
+
+    ListItem.Header {
+        text: i18n.tr("List:")
+    }
+
+    Repeater {
+        id: repeater
+        width: parent.width
+
+        model: ListModel {
+            id: dataModel
+
+            property int focusedIndex: -1
+        }
+
+        delegate: delegate
+    }
+
+    // TODO: When user adds an element in the list, the new element should gain focus.
+    Loader {
+        id: footerLoader
+        width: parent.width
+
+        sourceComponent: ListItem.Empty {
+            width: parent.width
+            opacity: enabled ? 1.0 : 0.5
+            showDivider: false
+
+            enabled: {
+                if (rootItem.model.count > 0) {
+                    if (rootItem.model.get(rootItem.model.count - 1).text !== "") {
+                        return true
+                    } else {
+                        return false
+                    }
+                } else {
+                    return true
+                }
+            }
+
+            Row {
+                spacing: units.gu(2)
+                anchors {
+                    left: parent.left; leftMargin: units.gu(2);
+                    right: parent.right;
+                    verticalCenter: parent.verticalCenter
+                }
+
+                Item {
+                    id: addListBtnImage
+                    implicitWidth: units.gu(4.25)
+                    implicitHeight: units.gu(4)
+
+                    Icon {
+                        anchors { fill: parent; margins: units.gu(0.5) }
+                        name: "add"
+                    }
+                }
+
+                Label {
+                    id: addListBtnLabel
+                    // TRANSLATORS: Text of a button used for add an item in the To-do list.
+                    text: i18n.tr("Add item")
+                    anchors.verticalCenter: addListBtnImage.verticalCenter
+                }
+            }
+
+            onClicked: {
+                rootItem.addItem({"checked": false, "text": ""})
+                // Here we don't send listChanged signal, since it is an empty item that should not be saved
+            }
+        }
+    }
+
+
+    function exportModel() {
+        var list = []
+
+        if (rootItem.model.count > 0 && rootItem.model.get(0).text !== "") {
+            for (var i=0; i<rootItem.model.count; i++) {
+                if (i != rootItem.model.count && rootItem.model.get(i).text != "") {
+                    list[i] = rootItem.model.get(i)
+                }
+            }
+        }
+
+        return list
+    }
+
+    function addItem(args) {
+        rootItem.model.append(args)
+        var newItem = repeater.itemAt(repeater.count - 1)
+        newItem.textArea.forceActiveFocus()
+        autoScrollAnimation.makeMeVisible(newItem)
+    }
+
+    SequentialAnimation {
+        id: autoScrollAnimation
+
+        property var targetItem: null
+        alwaysRunToEnd: true
+
+        // wait item be moved to correct place
+        PauseAnimation {
+            duration: 100
+        }
+        // scroll to new item position
+        ScriptAction {
+            script: {
+                if (autoScrollAnimation.targetItem) {
+                    autoScrollAnimation.makeMeVisibleImpl(autoScrollAnimation.targetItem)
+                    autoScrollAnimation.targetItem = null
+                }
+            }
+        }
+
+        function makeMeVisible(newItem) {
+            autoScrollAnimation.targetItem = newItem
+            autoScrollAnimation.restart()
+        }
+
+        function makeMeVisibleImpl(newItem) {
+            if (!newItem) {
+                return
+            }
+
+            var positionY = rootItem.y + repeater.y + newItem.y
+
+            // check if the item is already visible
+            var bottomY = flickable.contentY + flickable.height
+            var itemBottom = positionY + (newItem.height *3) // margin
+            if (positionY >= flickable.contentY && itemBottom <= bottomY) {
+                return;
+            }
+
+            // if it is not, try to scroll and make it visible
+            var targetY = itemBottom - flickable.height
+            if (targetY >= 0 && positionY) {
+                flickable.contentY = targetY
+            } else if (positionY < flickable.contentY) {
+                // if it is hidden at the top, also show it
+                flickable.contentY = positionY
+            }
+            flickable.returnToBounds()
+        }
+    }
+
+
+    // *** DELEGATE ***
+    Component {
+        id: delegate
+
+        ListItem.Empty {
+            id: item
+            width: parent ? parent.width : undefined
+            height: (layoutDelegate.height > item.__height) ? layoutDelegate.height : item.__height
+
+            showDivider: false
+
+            property alias textArea: textArea
+
+            Rectangle {
+                anchors.fill: parent
+                opacity: 0.1
+                visible: textArea.activeFocus
+                color: "black"
+            }
+
+            backgroundIndicator: Rectangle {
+                anchors.fill: parent
+                color: "red"
+
+                Icon {
+                    anchors.centerIn: parent
+                    name: "delete"
+                    color: Theme.palette.selected.field
+                    height: units.gu(3)
+                    width: units.gu(3)
+                }
+            }
+
+            // ListItem is removable for all items, except the first when the text field is empty.
+            //confirmRemoval: true
+            removable: rootItem.model.count > 1 || (rootItem.model.get(0).text !== "")
+            confirmRemoval: true
+            onItemRemoved: {
+                // Send the signal before removing the item. This avoids a ReferenceError.
+                rootItem.listChanged()
+                rootItem.model.remove(model.index)
+            }
+
+            Row {
+                id: layoutDelegate
+
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+
+                spacing: units.gu(1)
+                height: Math.max(checkBox.height, textArea.height)
+
+                CheckBox {
+                    id: checkBox
+
+                    checked: model.checked
+                    onCheckedChanged: layoutDelegate.updateModel()
+
+                    style: Item {
+                        implicitWidth: units.gu(4.25)
+                        implicitHeight: units.gu(4)
+
+                        Image {
+                            anchors { fill: parent; margins: units.gu(0.5) }
+
+                            source: checkBox.checked ? "../../graphics/select.svg" : "../../graphics/unselect.svg"
+                        }
+                    }
+                }
+
+                NoteTextField {
+                    id: textArea
+
+                    width: parent.width - (checkBox.width + (parent.spacing * 2))
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    font.strikeout: checkBox.checked
+
+                    onFocusReceived: {
+                       rootItem.model.focusedIndex = model.index
+                    }
+
+                    text: model.text
+                    onTextChanged: {
+                        layoutDelegate.updateModel()
+
+                        /* This requires some test. No problem when TextField is used, but it seems to break dataModel when
+                            TextArea is used. Could be related to NoteTextArea.qml, line 39.*/
+                        if (text === "") {
+                            rootItem.model.remove(model.index)
+                        }
+                    }
+
+                    //hasClearButton: false
+                    focus: true
+
+                    // Ubuntu Keyboard
+                    // TODO: Disable Enter key if model.text is empty.
+                    InputMethod.extensions: {
+                        "enterKeyText": rootItem.focusOnLastItem ? i18n.tr("Add") : i18n.tr("Next")
+                    }
+
+                    Keys.onReturnPressed: {
+                        if (rootItem.focusOnLastItem && (model.text !== "")) {
+                            // Create a new item.
+                            rootItem.addItem({"checked": false, "text": ""})
+                        } else if (!rootItem.focusOnLastItem) {
+                            var nextItem = repeater.itemAt(model.index + 1)
+                            if (nextItem) {
+                                nextItem.textArea.forceActiveFocus()
+                                autoScrollAnimation.makeMeVisible(nextItem)
+                            }
+                        }
+                    }
+                }
+
+                function updateModel() {
+                    rootItem.model.set(model.index, {"checked": checkBox.checked, "text": textArea.text})
+                    rootItem.listChanged()
+                }
+            }
+        }
+    }
+}

=== added file 'app/editPage/PictureButton.qml'
--- app/editPage/PictureButton.qml	1970-01-01 00:00:00 +0000
+++ app/editPage/PictureButton.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,40 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import Ubuntu.Components 1.1
+
+AbstractButton {
+    id: rootItem
+    width: units.gu(8)
+    height: units.gu(8)
+
+    property alias image: shape.image
+    default property alias contentsItem: shape.data
+
+    onPressedChanged: {
+        if (pressed)
+            shape.borderSource = "radius_pressed.sci"
+        else
+            shape.borderSource = "radius_idle.sci"
+    }
+
+    UbuntuShape {
+        id: shape
+        anchors.fill: parent
+    }
+}

=== added file 'app/editPage/PicturesManager.qml'
--- app/editPage/PicturesManager.qml	1970-01-01 00:00:00 +0000
+++ app/editPage/PicturesManager.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,162 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014, 2015 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Thumbnailer 0.1
+import Ubuntu.Content 0.1
+import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Item {
+    id: rootItem
+
+    property alias model: repeater.model
+
+    width: parent.width
+    height: childrenRect.height
+
+    signal picsModelChanged()
+
+    function exportModel() {
+        var list = []
+        for (var i=0; i<picModel.count; i++) {
+            list[i] = picModel.get(i)
+        }
+
+        return list
+    }
+
+    ListItem.Header { id: header; text: i18n.tr("Related pictures:") }
+
+    Flow {
+        id: flow
+
+        anchors {
+            top: header.bottom; topMargin: units.gu(1)
+            left: parent.left
+            right: parent.right
+            margins: units.gu(2)
+        }
+        spacing: units.gu(2)
+
+        Repeater {
+            id: repeater
+
+            model: ListModel { id: picModel; onRowsRemoved: rootItem.picsModelChanged() }
+            delegate: PictureButton {
+                image: Image {
+                    source: "image://thumbnailer/" + Qt.resolvedUrl(model.url)
+                    fillMode: Image.PreserveAspectCrop
+                }
+
+                //TODO: Add right click support
+                onClicked: pageStack.push(Qt.resolvedUrl("../ui/ImageViewer.qml"), {source: Qt.resolvedUrl(model.url)})
+                onPressAndHold: PopupUtils.open(pictureMenuPopover, this, {index: model.index})
+            }
+        }
+
+        PictureButton {
+            Icon {
+                anchors.centerIn: parent
+                height: parent.height / 2
+                width: height
+                name: "add"
+            }
+
+            onClicked: rootItem.importImageFromContentHub()
+        }
+    }
+
+    // *** CONTENT HANDLER ***
+    //This should be probably moved in main.qml
+    property var activeTransfer
+
+    function importImageFromContentHub() {
+        pageStack.push(picker)
+    }
+
+    Page {
+        id: picker
+        visible: false
+
+        ContentPeerPicker {
+            visible: parent.visible
+
+            contentType: ContentType.Pictures
+            handler: ContentHandler.Source
+
+            onPeerSelected: {
+                rootItem.activeTransfer = peer.request(appStore);
+                pageStack.pop();
+            }
+
+            onCancelPressed: {
+                pageStack.pop();
+            }
+        }
+    }
+
+    ContentTransferHint {
+        id: transferHint
+        anchors.fill: parent
+        activeTransfer: rootItem.activeTransfer
+    }
+
+    ContentStore {
+        id: appStore
+        scope: ContentScope.App
+    }
+
+    Connections {
+        target: rootItem.activeTransfer ? rootItem.activeTransfer : null
+        onStateChanged: {
+            if (rootItem.activeTransfer.state === ContentTransfer.Charged) {
+                for (var i=0; i<rootItem.activeTransfer.items.length; i++) {
+                    picModel.append({url: rootItem.activeTransfer.items[i].url.toString().replace("file://", "")})
+                    console.log("CONTENT IMPORTED:", rootItem.activeTransfer.items[i].url.toString().replace("file://", ""))
+                    rootItem.picsModelChanged()
+                }
+            }
+        }
+    }
+
+    // *** PICTURE POPOVER ***
+    Component {
+        id: pictureMenuPopover
+        ActionSelectionPopover {
+            id: popover
+            property int index
+
+            actions: ActionList {
+                Action {
+                    text: i18n.tr("Remove picture from selection")
+                    onTriggered: {
+                        PopupUtils.close(popover)
+                        rootItem.model.remove(popover.index)
+                    }
+                }
+            }
+
+            delegate: ListItem.Standard {
+                // ForegroundColor is not correctly set
+                __foregroundColor: Theme.palette.normal.overlayText
+                showDivider: false
+            }
+        }
+    }
+}

=== modified file 'app/main.qml'
--- app/main.qml	2014-10-21 16:01:52 +0000
+++ app/main.qml	2015-04-26 16:57:43 +0000
@@ -1,6 +1,6 @@
 /*
   This file is part of quick-memo
-  Copyright (C) 2014 Stefano Verzegnassi
+  Copyright (C) 2014, 2015 Stefano Verzegnassi
 
     This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License 3 as published by
@@ -18,7 +18,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.1
 import Qt.labs.settings 1.0
-import "components"
+import "common"
 
 MainView {
     id: root   
@@ -42,28 +42,15 @@
     }
 
     // This is where we manage the pages of the application.
-    PageStack {
-        id: pageStack
-
-        Component {
-            id: mainPage
-            MainPage {}
-        }
-
-        Component {
-            id: memoPage
-            EditMemoPage {}
-        }
-    }
+    PageStack { id: pageStack }
 
     NoteModel {
         id: notes
-        onInitialized: pageStack.push(mainPage)
+        onInitialized: pageStack.push(Qt.resolvedUrl("./ui/MainPage.qml"))
     }
 
-
     function showNotification(text) {
-        var component = Qt.createComponent("components/Toaster.qml")
+        var component = Qt.createComponent("./common/Toaster.qml")
         var toast = component.createObject(root, {"text" : text});
     }
 

=== added directory 'app/mainPage'
=== added file 'app/mainPage/Delegate.qml'
--- app/mainPage/Delegate.qml	1970-01-01 00:00:00 +0000
+++ app/mainPage/Delegate.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,291 @@
+/*
+  This file is part of quick-memo
+  Copyright (C) 2014, 2015 Stefano Verzegnassi
+
+    This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License 3 as published by
+  the Free Software Foundation.
+
+    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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Thumbnailer 0.1
+import "../common/dateHelper.js" as DateHelper
+
+AbstractButton {
+    id: rootItem
+
+    height: layout.height + layout.anchors.topMargin
+    width: parent.width
+
+    property bool selected: false
+    property int maxListDelegatesNumber: 3
+
+    // RGB channels from 'shape.color' are in [0; 1] range.
+    property color foregroundColor: ((shape.color.r * 0.30 + shape.color.g * 0.59 + shape.color.b * 0.11) > 0.5) ? UbuntuColors.darkGrey : "#F3F3E7"
+
+    UbuntuShape {
+        id: shape
+        anchors.fill: parent
+
+        // Add 70% opacity
+        color: contents.color.toString().replace("#", "#B3")
+
+        radius: "medium"
+
+        Column {
+            id: layout
+            anchors { top: parent.top; left: parent.left; right: parent.right; topMargin: units.gu(2) }
+
+            Column {
+                id: column
+                width: parent.width - (spacing * 2)
+                x: spacing
+                spacing: units.gu(2)
+
+                Loader {
+                    width: parent.width
+                    sourceComponent: (contents.title == "") ? undefined : titleComponent
+
+                    Component {
+                        id: titleComponent
+
+                        Label {
+                            width: parent.width
+                            fontSize: "large"
+                            font.weight: Font.Bold
+                            text: contents.title
+                            elide: Text.ElideRight
+                            maximumLineCount: 2
+                            wrapMode: Text.WrapAnywhere
+                            color: rootItem.foregroundColor
+                        }
+                    }
+
+                }
+
+                Loader {
+                    width: parent.width
+                    sourceComponent: (contents.text == "") ? undefined : textComponent
+
+                    Component {
+                        id: textComponent
+
+                        Label {
+                            width: parent.width
+                            text: contents.text
+                            wrapMode: Text.WrapAnywhere
+                            elide: Text.ElideRight
+                            maximumLineCount: 5
+                            color: rootItem.foregroundColor
+                        }
+                    }
+                }
+            }
+
+            // A spacer item
+            Item {
+                width: parent.width
+                height: units.gu(2)
+                visible: picsRepeater.count > 0
+            }
+
+            Item {
+                id: picsItem
+                width: parent.width
+                height: picFlow.height
+
+                // TODO: As for listDelegates, limit pics to a number of 9
+                Flow {
+                    id: picFlow
+                    width: parent.width
+
+                    Repeater {
+                        id: picsRepeater
+
+                        model: contents.pictures
+
+                        delegate: Image {
+                            id: img
+                            width: parent.width
+                            fillMode: Image.PreserveAspectCrop
+                            source: "image://thumbnailer/" + Qt.resolvedUrl(contents.pictures[index].url)
+
+                            Connections {
+                                target: picsRepeater
+                                onItemAdded: calculateSize(index)
+                                onItemRemoved: calculateSize(index)
+                            }
+
+                            Connections {
+                                target: picFlow
+                                onWidthChanged: calculateSize(index)
+                            }
+
+                            Component.onCompleted: calculateSize(index)
+
+                             function calculateSize(index) {
+                                var n = picsRepeater.count
+                                var i = n % 3
+                                var m = Math.floor(n / 3)
+
+                                height = units.gu(6)
+
+                                // Need to be hardcoded because of an issue.
+                                // FIXME: Think it requires a better solution
+                                var picFlowRealWidth = ((root.width - units.gu(4)) * 0.5) - units.gu(1)
+
+                                switch(i) {
+                                case 0:
+                                    width = picFlowRealWidth / 3
+                                    return
+                                case 1:
+                                    if (index == 0) {
+                                        width = picFlowRealWidth
+                                        return
+                                    } else {
+                                        width = picFlowRealWidth / 3
+                                        return
+                                    }
+                                case 2:
+                                    if (index <= 1) {
+                                        width = picFlowRealWidth / 2
+                                        return
+                                    } else {
+                                        width = picFlowRealWidth / 3
+                                        return
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: picsRepeater.model = contents.pictures
+                }
+            }
+
+            Loader {
+                id: listLoader
+                width: parent.width
+                sourceComponent: (contents.list[0]) ? listComponent : null
+
+                Component {
+                    id: listComponent
+
+                    Column {
+                        width: parent.width
+
+                        // A spacer item
+                        Item {
+                            width: parent.width
+                            height: units.gu(1)
+                        }
+
+                        Repeater {
+                            id: listRepeater
+                            width: parent.width
+
+                            model: contents.list
+
+                            delegate: Loader {
+                                width: parent.width
+                                sourceComponent: model.index < 4 ? listDelegate : null
+
+                                Component {
+                                    id: listDelegate
+
+                                    Row {
+                                        id: rootItem
+                                        spacing: units.gu(1)
+                                        width: parent.width
+                                        height: Math.max(checkBox.height, textArea.height)
+
+                                        Item {
+                                            id: checkBox
+                                            width: parent.width
+                                            height: units.gu(4)
+
+                                            property bool checked: contents.list[index].checked
+
+                                            Icon {
+                                                id: tick
+                                                anchors {
+                                                    left: parent.left; leftMargin: units.gu(2.25);
+                                                    top: parent.top; topMargin: units.gu(0.35)
+                                                }
+                                                width: (source == "../../graphics/select.svg") ? units.gu(2.25) : units.gu(1.5)
+                                                height: (source == "../../graphics/select.svg") ? units.gu(2) : units.gu(1.5)
+
+                                                source: checkBox.checked ? "../../graphics/select.svg" : "../../graphics/unselect.svg"
+                                                visible: model.index !== 3
+                                                color: foregroundColor
+                                            }
+
+                                            Label {
+                                                id: textArea
+                                                anchors { left: tick.right; right: parent.right; margins: units.gu(1) }
+
+                                                font.strikeout: checkBox.checked
+                                                text: (model.index == 3) ? ". . ." : contents.list[index].text
+                                                elide: Text.ElideRight
+                                                maximumLineCount: 2
+                                                wrapMode: Text.WrapAnywhere
+                                                color: foregroundColor
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        Component.onCompleted: listRepeater.model = contents.list
+                    }
+                }
+            }
+
+            // A spacer item
+            Item {
+                width: parent.width
+                height: units.gu(2)
+            }
+
+            Item {
+                id: date
+                width: parent.width
+                height: units.gu(4)
+
+                Label {
+                    anchors { right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(2) }
+                    text: Qt.formatDateTime(DateHelper.parseDate(contents.date), "d MMM yyyy, hh:mm")
+                    fontSize: "small"
+                    color: rootItem.foregroundColor
+                }
+            }
+        }
+    }
+
+    // Visual feedback when pressed. Not listed in official documentation, still useful.
+    onPressedChanged: {
+        if (pressed)
+            shape.borderSource = "radius_pressed.sci"
+        else
+            shape.borderSource = "radius_idle.sci"
+    }
+
+    // Visual feedback when selected.
+    onSelectedChanged: {
+        if (selected) {
+            shape.color = Qt.darker(contents.color)
+        } else {
+            shape.color = contents.color.toString().replace("#", "#B3")
+        }
+    }
+}

=== added file 'app/mainPage/HorizontalFlowListView.qml'
--- app/mainPage/HorizontalFlowListView.qml	1970-01-01 00:00:00 +0000
+++ app/mainPage/HorizontalFlowListView.qml	2015-04-26 16:57:43 +0000
@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2012 Ruediger Gad
+ *  Copyright 2014 Stefano Verzegnassi <[e-mail]>
+ *
+ *  This file is part of FlowListView.
+ *
+ *  FlowListView is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License (LGPL)
+ *  as published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  FlowListView 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 Lesser General Public License
+ *  along with FlowListView.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// A derivative version of FlowListView.qml
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Flickable {
+    id: flowListView
+
+    contentWidth: flow.childrenRect.width
+
+    property alias count: repeater.count
+    property int currentIndex: -1
+    property variant currentItem;
+    property alias delegate: repeater.delegate