Merge lp:~uriboni/messaging-app/stickers into lp:messaging-app

[Ugo Riboni]

Prototype implementation for stickers support.

Prototype implementation for stickers support.
At the moment only the sticker picker component is implemented (including the most frequently used stickers panel).
Actually sending the sticker chosen by the user is not implemented by this branch yet.

It is also unclear what stickers will be preinstalled, so at the moment the app reads stickers from the user data directory: ~/.local/share/com.ubuntu.messaging-app/MessagingApp/stickers

Each subdirectory is considered a "sticker pack" and the pack can contain any number of png, webm or gif files, preferrably with transparency.

Test sticke packs: http://people.canonical.com/~bfiller/stickers.tgz

[lp:~uriboni/messaging-app/stickers]

475. By Ugo Riboni on 2015-11-13

Remove debug code

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:475
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~uriboni/messaging-app/stickers/+merge/277446/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/messaging-app-ci/700/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/213/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5158/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/700/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/706/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5157/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5171/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/706/rebuild

review: Needs Fixing (continuous-integration)

[lp:~uriboni/messaging-app/stickers]

476. By Ugo Riboni on 2015-11-16

Add stickers directory to cmake

477. By Ugo Riboni on 2015-11-16

The model is now a chronological list of the most recently used stickers

478. By Ugo Riboni on 2015-11-16

Add a limit property to the model to set the maximum size of the history

479. By Ugo Riboni on 2015-11-16

Fix .bzrignore to properly ignore test binaries, and remove mistakely added test binary

480. By Ugo Riboni on 2015-11-16

Add stickers qml dir to the list of installed files in debian

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/707/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/220/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5175/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/707/rebuild

review: Needs Fixing (continuous-integration)

[lp:~uriboni/messaging-app/stickers]

481. By Ugo Riboni on 2015-11-16

Fix interactions between OSK, stickers picker and the rest of the UI

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/708/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/221/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5179/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/708/rebuild

review: Needs Fixing (continuous-integration)

[lp:~uriboni/messaging-app/stickers]

482. By Ugo Riboni on 2015-11-16

Add missing debian dependecy

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:482
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/709/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5170/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5184
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5184/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/709/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:482
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/718/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5210/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/231
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4139/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5227
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5227/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25183

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/718/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:482
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/720/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/233
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5230
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5230/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25188

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/720/rebuild

review: Needs Fixing (continuous-integration)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-11-16 14:15:20 +0000
@@ -0,0 +1,37 @@
+*.qmlproject.user
+CMakeCache.txt
+CMakeFiles/
+CMakeLists.txt.user
+cmake_install.cmake
+cmake_uninstall.cmake
+Makefile
+install_manifest.txt
+CTestTestfile.cmake
+
+*.cbp
+*.moc
+moc_*.cpp
+*_automoc.cpp
+
+Testing
+RE:tests/qml/tst_\w+Tests$
+po/*.gmo
+po/src
+
+config.h
+src/messaging-app
+src/messaging-app.desktop*
+
+obj-*
+debian/usr.bin.webbrowser-app
+debian/files
+debian/tmp/
+debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/
+debian/qtdeclarative5-ubuntu-web-plugin/
+debian/qtdeclarative5-ubuntu-web-plugin-doc/
+debian/messaging-app/
+debian/messaging-app-autopilot/
+debian/*.debhelper
+debian/*.debhelper.log
+debian/*.substvars
+debian/stamp-*

=== modified file 'debian/control'
--- debian/control	2015-09-11 14:25:57 +0000
+++ debian/control	2015-11-16 14:15:20 +0000
@@ -23,6 +23,7 @@
                qtdeclarative5-ubuntu-addressbook0.1,
                qtdeclarative5-qtcontacts-plugin,
                qml-module-qt-labs-settings,
+               qtdeclarative5-folderlistmodel-plugin,
                qtpim5-dev,
                xvfb,
 Standards-Version: 3.9.4

=== modified file 'debian/messaging-app.install'
--- debian/messaging-app.install	2014-08-11 22:22:59 +0000
+++ debian/messaging-app.install	2015-11-16 14:15:20 +0000
@@ -8,4 +8,5 @@
 usr/share/messaging-app/3rd_party
 usr/share/messaging-app/MMS/*.qml
 usr/share/messaging-app/Dialogs/*.qml
+usr/share/messaging-app/Stickers/*.qml
 usr/bin/*messaging-app*

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-02-24 13:33:31 +0000
+++ src/CMakeLists.txt	2015-11-16 14:15:20 +0000
@@ -2,17 +2,19 @@
 
 set(messaging_app_HDRS
     messagingapplication.h
+    stickers-history-model.h
     )
 
 set(messaging_app_SRCS
     messagingapplication.cpp
     main.cpp
+    stickers-history-model.cpp
     )
 
 add_executable(${MESSAGING_APP}
     ${messaging_app_SRCS}
     )
-qt5_use_modules(${MESSAGING_APP} Core DBus Gui Qml Quick Versit)
+qt5_use_modules(${MESSAGING_APP} Core DBus Gui Qml Quick Versit Sql)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}

=== modified file 'src/messagingapplication.cpp'
--- src/messagingapplication.cpp	2015-07-07 16:31:26 +0000
+++ src/messagingapplication.cpp	2015-11-16 14:15:20 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "messagingapplication.h"
+#include "stickers-history-model.h"
 
 #include <libnotify/notify.h>
 
@@ -24,6 +25,7 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QDebug>
+#include <QDir>
 #include <QStringList>
 #include <QQuickItem>
 #include <QQmlComponent>
@@ -36,6 +38,7 @@
 #include "config.h"
 #include <QQmlEngine>
 #include <QMimeDatabase>
+#include <QStandardPaths>
 #include <QVersitReader>
 
 using namespace QtVersit;
@@ -71,6 +74,13 @@
     setApplicationName("MessagingApp");
 }
 
+static QObject* StickersHistoryModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new StickersHistoryModel();
+}
+
 bool MessagingApplication::setup()
 {
     installIconPath();
@@ -149,6 +159,13 @@
         m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", contactsBackend);
     }
 
+    QDir dataLocation(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
+    m_view->rootContext()->setContextProperty("dataLocation", dataLocation.absolutePath());
+    dataLocation.mkpath("stickers");
+    const char* uri = "messagingapp.private";
+    qmlRegisterSingletonType<StickersHistoryModel>(uri, 0, 1, "StickersHistoryModel", StickersHistoryModel_singleton_factory);
+
+
     // used by autopilot tests to load vcards during tests
     QByteArray testData = qgetenv("QTCONTACTS_PRELOAD_VCARD");
     m_view->rootContext()->setContextProperty("QTCONTACTS_PRELOAD_VCARD", testData);

=== modified file 'src/qml/CMakeLists.txt'
--- src/qml/CMakeLists.txt	2014-08-11 22:22:59 +0000
+++ src/qml/CMakeLists.txt	2015-11-16 14:15:20 +0000
@@ -17,3 +17,4 @@
 
 add_subdirectory(MMS)
 add_subdirectory(Dialogs)
+add_subdirectory(Stickers)

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-11-12 17:33:30 +0000
+++ src/qml/Messages.qml	2015-11-16 14:15:20 +0000
@@ -26,6 +26,7 @@
 import Ubuntu.Telephony 0.1
 import Ubuntu.Contacts 0.1
 
+import "Stickers"
 import "dateUtils.js" as DateUtils
 
 Page {
@@ -783,9 +784,26 @@
         }
     }
 
+    StickersPicker {
+        id: stickersPicker
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        height: keyboard.maximumHeight
+        visible: false
+
+        onStickerSelected: console.log(">>>>>>>>>>>> send:", path)
+
+        Connections {
+            target: Qt.inputMethod
+            onVisibleChanged: if (Qt.inputMethod.visible) stickersPicker.visible = false
+        }
+    }
+
     Item {
         id: bottomPanel
-        anchors.bottom: isSearching ? parent.bottom : keyboard.top
+        anchors.bottom: isSearching ? parent.bottom :
+                       (Qt.inputMethod.visible ? keyboard.top : stickersPicker.top)
         anchors.left: parent.left
         anchors.right: parent.right
         height: selectionMode || (participants.length > 0 && !contactWatcher.interactive) ? 0 : textEntry.height + units.gu(2)
@@ -826,6 +844,32 @@
             }
         }
 
+        Icon {
+            id: stickersButton
+            objectName: "stickersButton"
+            anchors.left: attachButton.right
+            anchors.leftMargin: units.gu(2)
+            anchors.verticalCenter: sendButton.verticalCenter
+            height: units.gu(3)
+            width: units.gu(3)
+            color: "gray"
+            visible: messageTextArea.activeFocus || stickersPicker.visible
+            source: Qt.resolvedUrl("./assets/" + (Qt.inputMethod.visible ?
+                                                  "face-smile-big-symbolic-2.svg" :
+                                                  "input-keyboard-symbolic.svg"))
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (Qt.inputMethod.visible) {
+                        messageTextArea.focus = false
+                        stickersPicker.visible = true
+                    } else {
+                        messageTextArea.forceActiveFocus()
+                    }
+                }
+            }
+        }
+
         StyledItem {
             id: textEntry
             property alias text: messageTextArea.text
@@ -834,7 +878,7 @@
             style: Theme.createStyleComponent("TextAreaStyle.qml", textEntry)
             anchors.bottomMargin: units.gu(1)
             anchors.bottom: parent.bottom
-            anchors.left: attachButton.right
+            anchors.left: stickersButton.visible ? stickersButton.right : attachButton.right
             anchors.leftMargin: units.gu(1)
             anchors.right: sendButton.left
             anchors.rightMargin: units.gu(1)
@@ -1045,6 +1089,7 @@
                 font.pixelSize: FontUtils.sizeToPixels("medium")
                 color: "#5d5d5d"
                 text: messages.text
+                onActiveFocusChanged: if (activeFocus) stickersPicker.visible = false
             }
 
             /*InverseMouseArea {
@@ -1125,6 +1170,14 @@
 
     KeyboardRectangle {
         id: keyboard
+
+        // Workaround for not being able to know the keyboard rectangle size
+        // before it has shown at least once: keep matching its height until it
+        // has reached its maximum.
+        property int maximumHeight: 0
+        onHeightChanged: {
+            if (height > maximumHeight) maximumHeight = height
+        }
     }
 
     MessageInfoDialog {

=== added directory 'src/qml/Stickers'
=== added file 'src/qml/Stickers/CMakeLists.txt'
--- src/qml/Stickers/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qml/Stickers/CMakeLists.txt	2015-11-16 14:15:20 +0000
@@ -0,0 +1,4 @@
+file(GLOB STICKERS_QML_FILES *.qml)
+
+add_custom_target(messaging_app_Stickers_QMlFiles ALL SOURCES ${STICKERS_QML_FILES})
+install(FILES ${STICKERS_QML_FILES} DESTINATION ${MESSAGING_APP_DIR}/Stickers)

=== added file 'src/qml/Stickers/HistoryButton.qml'
--- src/qml/Stickers/HistoryButton.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Stickers/HistoryButton.qml	2015-11-16 14:15:20 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.3
+
+AbstractButton {
+    property bool selected
+
+    Rectangle {
+        anchors.fill: parent
+        color: selected ? "#f5f5f5" : "transparent"
+    }
+
+    Icon {
+        name: "history"
+        anchors.fill: parent
+        anchors.margins: units.gu(1.5)
+    }
+}

=== added file 'src/qml/Stickers/StickerDelegate.qml'
--- src/qml/Stickers/StickerDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Stickers/StickerDelegate.qml	2015-11-16 14:15:20 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.3
+
+AbstractButton {
+    property alias stickerSource: image.source
+
+    Image {
+        id: image
+        anchors.fill: parent
+        anchors.margins: units.gu(0.5)
+        fillMode: Image.PreserveAspectFit
+        smooth: true
+    }
+}

=== added file 'src/qml/Stickers/StickerPackDelegate.qml'
--- src/qml/Stickers/StickerPackDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Stickers/StickerPackDelegate.qml	2015-11-16 14:15:20 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Qt.labs.folderlistmodel 2.1
+import Ubuntu.Components 1.3
+
+AbstractButton {
+    property alias path: stickers.folder
+    property string name
+    property bool selected
+
+    Rectangle {
+        anchors.fill: parent
+        color: selected ? "#f5f5f5" : "transparent"
+    }
+
+    Icon {
+        anchors.fill: parent
+        visible: stickers.count === 0
+        name: "cancel"
+    }
+
+    Image {
+        visible: stickers.count > 0
+        anchors.fill: parent
+        anchors.margins: units.gu(0.5)
+        fillMode: Image.PreserveAspectFit
+        smooth: true
+        source: visible ? stickers.get(0, "filePath") : ""
+    }
+
+    FolderListModel {
+        id: stickers
+        showDirs: false
+        nameFilters: ["*.png", "*.webm", "*.gif"]
+    }
+}

=== added file 'src/qml/Stickers/StickerPackModel.qml'
--- src/qml/Stickers/StickerPackModel.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Stickers/StickerPackModel.qml	2015-11-16 14:15:20 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Qt.labs.folderlistmodel 2.1
+
+FolderListModel {
+    property string packName
+    folder: "%1/stickers/%2".arg(dataLocation).arg(packName)
+    showDirs: false
+    nameFilters: ["*.png", "*.webm", "*.gif"]
+}

=== added file 'src/qml/Stickers/StickerPacksModel.qml'
--- src/qml/Stickers/StickerPacksModel.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Stickers/StickerPacksModel.qml	2015-11-16 14:15:20 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Qt.labs.folderlistmodel 2.1
+
+FolderListModel {
+    folder: dataLocation + "/stickers/"
+    showFiles: false
+}

=== added file 'src/qml/Stickers/StickersPicker.qml'
--- src/qml/Stickers/StickersPicker.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Stickers/StickersPicker.qml	2015-11-16 14:15:20 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.3
+import messagingapp.private 0.1
+
+FocusScope {
+    id: pickerRoot
+    signal stickerSelected(string path)
+
+    Component.onCompleted: {
+        StickersHistoryModel.databasePath = dataLocation + "/stickers/stickers.sqlite"
+        StickersHistoryModel.limit = 10
+    }
+
+    ListView {
+        id: setsList
+        model: StickerPacksModel {}
+        orientation: ListView.Horizontal
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        height: units.gu(6)
+
+        header: HistoryButton {
+            height: units.gu(6)
+            width: height
+
+            onTriggered: stickersGrid.model.packName = ""
+            selected: stickersGrid.model.packName === ""
+        }
+        delegate: StickerPackDelegate {
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            width: units.gu(6)
+
+            path: filePath
+            onTriggered: stickersGrid.model.packName = fileName
+            selected: stickersGrid.model.packName === fileName
+        }
+    }
+
+    Rectangle {
+        anchors.fill: stickersGrid
+        color: "#f5f5f5"
+    }
+
+    GridView {
+        id: stickersGrid
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: setsList.bottom
+        anchors.bottom: parent.bottom
+        clip: true
+        cellWidth: units.gu(10)
+        cellHeight: units.gu(10)
+        visible: stickersGrid.model.packName.length > 0
+
+        model: StickerPackModel { }
+        delegate: StickerDelegate {
+            stickerSource: filePath
+            width: stickersGrid.cellWidth
+            height: stickersGrid.cellHeight
+
+            onTriggered: {
+                StickersHistoryModel.add("%1/%2".arg(stickersGrid.model.packName).arg(fileName))
+                pickerRoot.stickerSelected(stickerSource)
+            }
+        }
+    }
+
+    GridView {
+        id: historyGrid
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: setsList.bottom
+        anchors.bottom: parent.bottom
+        clip: true
+        cellWidth: units.gu(10)
+        cellHeight: units.gu(10)
+        visible: stickersGrid.model.packName.length === 0
+
+        model: StickersHistoryModel
+
+        delegate: StickerDelegate {
+            stickerSource: "%1/stickers/%2".arg(dataLocation).arg(sticker)
+            width: stickersGrid.cellWidth
+            height: stickersGrid.cellHeight
+
+            onTriggered: {
+                StickersHistoryModel.add(sticker)
+                pickerRoot.stickerSelected(stickerSource)
+            }
+        }
+    }
+}

=== added file 'src/qml/assets/face-smile-big-symbolic-2.svg'
--- src/qml/assets/face-smile-big-symbolic-2.svg	1970-01-01 00:00:00 +0000
+++ src/qml/assets/face-smile-big-symbolic-2.svg	2015-11-16 14:15:20 +0000
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   viewBox="0 0 96 96.000001"
+   sodipodi:docname="face-smile-big-symbolic.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8774396"
+     inkscape:cx="-93.086241"
+     inkscape:cy="47.64648"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4780"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="8" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="8,-8.0000001"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="4,-8.0000001"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,88.000001"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,92.000001"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="104,4"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,8.0000001"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="92,-8.0000001"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="88,-8.0000001"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,84.000001"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,-8.0000001"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,12"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,-9.0000001"
+       id="guide4080" />
+    <sodipodi:guide
+       position="48,-8.0000001"
+       orientation="1,0"
+       id="guide4170" />
+    <sodipodi:guide
+       position="-8,48"
+       orientation="0,1"
+       id="guide4172" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-78.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="next01.png"
+         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
+         id="g4778"
+         inkscape:label="Layer 1">
+        <g
+           transform="matrix(-1,0,0,1,575.99999,611)"
+           id="g4780"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             id="rect4782"
+             width="96.037987"
+             height="96"
+             x="-438.00244"
+             y="345.36221"
+             transform="scale(-1,1)" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 432,393.36133 c 0,23.17236 -18.83538,42 -42.01562,42 -23.18025,0 -42.01563,-18.82764 -42.01563,-42 0,-23.17236 18.83538,-42 42.01563,-42 23.18024,0 42.01562,18.82764 42.01562,42 z m -4.00195,0 c 0,-21.00932 -16.99476,-37.99805 -38.01367,-37.99805 -21.01892,0 -38.01563,16.98873 -38.01563,37.99805 0,21.00931 16.99671,37.99804 38.01563,37.99805 21.01891,0 38.01367,-16.98874 38.01367,-37.99805 z"
+             id="path4116"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:64.01265717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             d="m 404.99002,409.36281 1.50057,-8.00059 -13.50534,0 0,8.00059 z"
+             id="rect4175"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4178"
+             d="m 404.99002,385.36222 1.50057,-7.99941 -13.50534,0 0,7.99941 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:64.01265717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:'Ubuntu, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.00019777px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 383.98169,414.37529 c -1.5268,-0.21155 -2.98748,-0.52576 -4.37873,-0.94375 -2.81692,-0.88674 -5.23617,-2.19676 -7.25967,-3.92985 -2.0236,-1.77325 -3.59002,-3.99099 -4.70116,-6.65098 -1.11104,-2.70036 -1.66756,-5.86393 -1.66756,-9.49118 0,-3.62725 0.55652,-6.77166 1.66756,-9.43164 1.11114,-2.70027 2.67756,-4.91499 4.70116,-6.64799 2.0235,-1.77334 4.44275,-3.0835 7.25967,-3.92986 1.39125,-0.4379 2.85193,-0.76678 4.37873,-0.98841 l 0,42.01366 z"
+             id="path4190"
+             inkscape:connector-curvature="0"
+             inkscape:transform-center-x="0.0068360001"
+             inkscape:transform-center-y="-9.0000001" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/qml/assets/history.svg'
--- src/qml/assets/history.svg	1970-01-01 00:00:00 +0000
+++ src/qml/assets/history.svg	2015-11-16 14:15:20 +0000
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   viewBox="0 0 96 96.000001"
+   sodipodi:docname="history.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.7812488"
+     inkscape:cx="12.412809"
+     inkscape:cy="56.142342"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4780"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="8" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="8,-8.0000001"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="4,-8.0000001"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,88.000001"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,92.000001"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="104,4"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,8.0000001"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="92,-8.0000001"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="88,-8.0000001"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,84.000001"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,-8.0000001"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,12"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,-9.0000001"
+       id="guide4080" />
+    <sodipodi:guide
+       position="48,-8.0000001"
+       orientation="1,0"
+       id="guide4170" />
+    <sodipodi:guide
+       position="-8,48"
+       orientation="0,1"
+       id="guide4172" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-78.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="next01.png"
+         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
+         id="g4778"
+         inkscape:label="Layer 1">
+        <g
+           transform="matrix(-1,0,0,1,575.99999,611)"
+           id="g4780"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             id="rect4782"
+             width="96.037987"
+             height="96"
+             x="-438.00244"
+             y="345.36221"
+             transform="scale(-1,1)" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 420.87891,421.82617 c -13.02519,14.12639 -34.00962,17.61704 -50.90821,8.4668 -16.89858,-9.15024 -25.43667,-28.62704 -20.71484,-47.25 4.72183,-18.62296 21.51014,-31.68164 40.72852,-31.68164 l 0,4.00195 c -17.40844,0 -32.5749,11.79684 -36.85157,28.66406 -4.27667,16.86723 3.43743,34.45783 18.74414,42.7461 15.30671,8.28827 34.26279,5.13698 46.06055,-7.65821 l 2.94141,2.71094 z"
+             id="path4116"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:8.00158199, 8.00158199;stroke-dashoffset:1.60031641;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 431.99414,394.00977 -0.0137,0.42968 -3.99805,-0.13281 0.0137,-0.42187 0,-0.008 -0.006,-1.35937 0,-0.0254 -0.0527,-1.31446 -0.002,-0.0254 -0.10352,-1.36328 -0.002,-0.01 -0.16016,-1.41016 -0.20312,-1.34961 -0.004,-0.0215 -0.041,-0.21875 3.93164,-0.74414 0.0449,0.24023 0.0117,0.0723 0.2207,1.45703 0.01,0.0723 0.16602,1.45899 0.008,0.0742 0.11133,1.46093 0.006,0.0723 0.0586,1.46094 0,0.0723 0.006,1.45899 z m -1.11914,9.00195 -0.0156,0.0703 -0.36133,1.4082 -0.0195,0.0684 -0.41211,1.39453 -0.0215,0.0703 -0.46289,1.3789 -0.0234,0.0703 -0.51367,1.36328 -0.0273,0.0684 -0.5625,1.3457 -0.0293,0.0664 -0.17969,0.38867 -3.63281,-1.67774 0.15039,-0.32226 0.0137,-0.0312 0.54493,-1.30274 0.004,-0.0117 0.48242,-1.28516 0.004,-0.0117 0.42773,-1.27734 0.40039,-1.35938 0.3418,-1.33789 0.0469,-0.2168 3.9082,0.85352 z m -5.52344,-23.56055 -0.25,-0.63476 -0.0117,-0.0312 -0.54492,-1.24805 -0.0156,-0.0312 -0.60352,-1.25586 -0.0137,-0.0254 -0.68359,-1.29297 -0.002,-0.004 -0.6914,-1.19531 -0.0176,-0.0293 -0.64453,-1.02343 3.38672,-2.12891 0.68359,1.08789 0.0391,0.0625 0.74414,1.28906 0.0371,0.0664 0.69922,1.32227 0.0332,0.0664 0.6543,1.35547 0.0312,0.0684 0.60547,1.38477 0.0273,0.0703 0.26172,0.66601 z m -1.52929,38.8086 -0.0449,0.0605 -0.90625,1.18164 -0.0469,0.0566 -0.95313,1.15235 -0.0488,0.0566 -1.00196,1.12304 -0.0527,0.0547 -1.04883,1.08789 -2.88086,-2.77539 1.02344,-1.06054 0.92773,-1.03711 0.0234,-0.0274 0.88477,-1.0664 0.0215,-0.0274 0.86719,-1.13086 0.0176,-0.0234 0.1875,-0.26563 3.26171,2.31445 z m -6.66993,-51.46875 -0.68554,-0.68946 -0.0215,-0.0215 -0.99219,-0.92774 -0.0195,-0.0176 -0.98828,-0.85938 -0.0117,-0.01 -1.11132,-0.89648 -0.008,-0.008 -1.04687,-0.78516 -0.0176,-0.0117 -0.94922,-0.66015 2.28125,-3.28711 0.9668,0.67187 0.0586,0.043 1.16406,0.87109 0.0566,0.0449 1.13086,0.91406 0.0566,0.0469 1.09766,0.95508 0.0547,0.0488 1.06445,0.99609 0.0527,0.0508 0.70507,0.71093 z m -12.49609,-8.47852 -0.86523,-0.35547 -0.0176,-0.006 -1.32813,-0.49023 -0.0254,-0.01 -1.29101,-0.41992 -1.30469,-0.375 -0.0156,-0.004 -1.39843,-0.3457 -0.0156,-0.004 -1.02734,-0.21289 0.81445,-3.91601 1.10156,0.22851 0.0703,0.0156 1.43164,0.35351 0.0703,0.0195 1.41211,0.40429 0.0703,0.0215 1.39258,0.45508 0.0703,0.0254 1.3711,0.5039 0.0684,0.0274 0.9336,0.38281 z"
+             id="ellipse4178"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.5999999;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 387.98242,367.36133 0,26.83008 20.5957,20.58593 2.82813,-2.83007 -19.42187,-19.41407 0,-25.17187 -4.00196,0 z"
+             id="path4180"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/qml/assets/input-keyboard-symbolic.svg'
--- src/qml/assets/input-keyboard-symbolic.svg	1970-01-01 00:00:00 +0000
+++ src/qml/assets/input-keyboard-symbolic.svg	2015-11-16 14:15:20 +0000
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   viewBox="0 0 96 96.000001"
+   sodipodi:docname="input-keyboard-symbolic.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.0249992"
+     inkscape:cx="12.362986"
+     inkscape:cy="54.10675"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4780"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="8" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="8,-8.0000001"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="4,-8.0000001"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,88.000001"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,92.000001"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="104,4"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,8.0000001"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="88,-8.0000001"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,84.000001"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,-8.0000001"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,-8.0000001"
+       id="guide4080" />
+    <sodipodi:guide
+       position="48,-8.0000001"
+       orientation="1,0"
+       id="guide4170" />
+    <sodipodi:guide
+       position="-8,48"
+       orientation="0,1"
+       id="guide4172" />
+    <sodipodi:guide
+       position="92,-8.0000001"
+       orientation="1,0"
+       id="guide4760" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-78.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="next01.png"
+         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
+         id="g4778"
+         inkscape:label="Layer 1">
+        <g
+           transform="matrix(-1,0,0,1,575.99999,611)"
+           id="g4780"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             id="rect4782"
+             width="96.037987"
+             height="96"
+             x="-438.00244"
+             y="345.36221"
+             transform="scale(-1,1)" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 407.99059,425.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             id="path4321"
+             inkscape:connector-curvature="0" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 379.97952,411.36222 0,-36 -8.00318,0 0,36 8.00318,0 z"
+             id="path4301"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="ccccccccc"
+             inkscape:connector-curvature="0"
+             id="path4297"
+             d="m 371.97588,349.36261 c -10.00396,0 -9.8873,3.91306 -10.00396,14 l 0,59.99961 c 0.11666,10.08694 0,14 10.00396,14 l 36.01466,0 c 10.00396,0 9.8873,-3.91306 10.00396,-14 l 0,-59.99961 c -0.11666,-10.08694 0,-14 -10.00396,-14 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:4.00079155;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4165"
+             d="m 407.99059,411.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 407.99059,397.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             id="path4167"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4169"
+             d="m 407.99059,383.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4171"
+             d="m 393.98503,418.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 393.98503,404.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             id="path4173"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4175"
+             d="m 393.98503,390.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 393.98503,376.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             id="path4177"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4179"
+             d="m 379.97951,425.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4181"
+             d="m 379.97947,369.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none" />
+          <path
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 407.99059,369.36222 0,-8.00001 -8.00317,0 0,8.00001 8.00317,0 z"
+             id="path4185"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/stickers-history-model.cpp'
--- src/stickers-history-model.cpp	1970-01-01 00:00:00 +0000
+++ src/stickers-history-model.cpp	2015-11-16 14:15:20 +0000
@@ -0,0 +1,307 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "stickers-history-model.h"
+
+// Qt
+#include <QtCore/QDebug>
+#include <QtCore/QMutexLocker>
+#include <QtSql/QSqlQuery>
+#include <QtSql/QSqlError>
+
+#define CONNECTION_NAME "messaging-app-stickers-history"
+
+/*!
+    \class StickersHistoryModel
+    \brief List model that stores information about most recently used stickers
+
+    StickersHistoryModel is a list model that stores information about the most
+    recently used stickers.
+    Each sticker is simply identified by the sticker pack name plus the name of
+    the sticker image file itself.
+    Stickers are ordered by the time of last use, with the most recent first.
+    By default the model stores a rolling list of the 10 most recently used
+    stickers, though this number can be changed by setting the /a limit
+*/
+StickersHistoryModel::StickersHistoryModel(QObject* parent)
+    : QAbstractListModel(parent),
+      m_limit(10)
+{
+    m_database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), CONNECTION_NAME);
+}
+
+StickersHistoryModel::~StickersHistoryModel()
+{
+    m_database.close();
+    m_database = QSqlDatabase();
+    QSqlDatabase::removeDatabase(CONNECTION_NAME);
+}
+
+void StickersHistoryModel::resetDatabase(const QString& databaseName)
+{
+    beginResetModel();
+    m_entries.clear();
+    m_database.close();
+    m_database.setDatabaseName(databaseName);
+    m_database.open();
+    createOrAlterDatabaseSchema();
+    endResetModel();
+    populateFromDatabase();
+}
+
+void StickersHistoryModel::createOrAlterDatabaseSchema()
+{
+    QMutexLocker ml(&m_dbMutex);
+    QSqlQuery query(m_database);
+    QString statement = QLatin1String("CREATE TABLE IF NOT EXISTS history "
+                                      "(sticker VARCHAR, mostRecentUse DATETIME);");
+    query.prepare(statement);
+    if (!query.exec()) {
+      qWarning() << "Query failed" << query.lastError();
+    }
+}
+
+void StickersHistoryModel::populateFromDatabase()
+{
+    QSqlQuery query(m_database);
+    QString statement = QLatin1String("SELECT sticker, mostRecentUse "
+                                      "FROM history ORDER BY mostRecentUse DESC;");
+    query.prepare(statement);
+    if (!query.exec()) {
+      qWarning() << "Query failed" << query.lastError();
+    }
+
+    int count = 0;
+    while (query.next()) {
+        HistoryEntry entry;
+        entry.sticker = query.value(0).toString();
+        entry.mostRecentUse = QDateTime::fromTime_t(query.value(1).toInt());
+        beginInsertRows(QModelIndex(), count, count);
+        m_entries.append(entry);
+        endInsertRows();
+        ++count;
+    }
+}
+
+QHash<int, QByteArray> StickersHistoryModel::roleNames() const
+{
+    static QHash<int, QByteArray> roles;
+    if (roles.isEmpty()) {
+        roles[Sticker] = "sticker";
+        roles[MostRecentUse] = "mostRecentUse";
+    }
+    return roles;
+}
+
+int StickersHistoryModel::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+    return m_entries.count();
+}
+
+QVariant StickersHistoryModel::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+    const HistoryEntry& entry = m_entries.at(index.row());
+    switch (role) {
+    case Sticker:
+        return entry.sticker;
+    case MostRecentUse:
+        return entry.mostRecentUse;
+    default:
+        return QVariant();
+    }
+}
+
+const QString StickersHistoryModel::databasePath() const
+{
+    return m_database.databaseName();
+}
+
+int StickersHistoryModel::limit() const
+{
+    return m_limit;
+}
+
+void StickersHistoryModel::setLimit(int limit)
+{
+    if (limit != m_limit) {
+        m_limit = limit;
+        Q_EMIT limitChanged();
+        removeExcessRows();
+    }
+}
+
+void StickersHistoryModel::setDatabasePath(const QString& path)
+{
+    if (path != databasePath()) {
+        if (path.isEmpty()) {
+            resetDatabase(":memory:");
+        } else {
+            resetDatabase(path);
+        }
+        Q_EMIT databasePathChanged();
+    }
+}
+
+int StickersHistoryModel::getEntryIndex(const QString& sticker) const
+{
+    for (int i = 0; i < m_entries.count(); ++i) {
+        if (m_entries.at(i).sticker == sticker) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+/*!
+    Add an entry to the model.
+
+    If an entry for the same sticker already exists, it is updated and placed
+    first in the model. Otherwise a new entry is created and added at the
+    begining of the model.
+    If the new row count exceeds the limit, excess rows are purged.
+*/
+void StickersHistoryModel::add(const QString& sticker)
+{
+    if (sticker.isEmpty()) {
+        return;
+    }
+    QDateTime now = QDateTime::currentDateTime();
+    int index = getEntryIndex(sticker);
+
+    if (index == -1) {
+        HistoryEntry entry;
+        entry.sticker = sticker;
+        entry.mostRecentUse = now;
+        beginInsertRows(QModelIndex(), 0, 0);
+        m_entries.prepend(entry);
+        endInsertRows();
+        insertNewEntryInDatabase(entry);
+        Q_EMIT rowCountChanged();
+        removeExcessRows();
+    } else {
+        HistoryEntry entry;
+        if (index > 0) {
+          beginMoveRows(QModelIndex(), index, index, QModelIndex(), 0);
+        }
+        entry = m_entries.takeAt(index);
+        entry.mostRecentUse = now;
+        m_entries.prepend(entry);
+        if (index > 0) {
+          endMoveRows();
+        }
+        QVector<int> roles;
+        roles << MostRecentUse;
+        Q_EMIT dataChanged(this->index(0), this->index(0), roles);
+        updateExistingEntryInDatabase(m_entries.first());
+    }
+}
+
+void StickersHistoryModel::removeExcessRows()
+{
+    if (m_limit < rowCount()) {
+        beginRemoveRows(QModelIndex(), m_limit, rowCount() - 1);
+        for (int i = rowCount() - 1; i >= m_limit; i--) {
+            HistoryEntry item = m_entries.takeAt(i);
+            removeEntryFromDatabase(item.sticker);
+        }
+        endRemoveRows();
+        Q_EMIT rowCountChanged();
+    }
+}
+
+void StickersHistoryModel::insertNewEntryInDatabase(const HistoryEntry& entry)
+{
+    QMutexLocker ml(&m_dbMutex);
+    QSqlQuery query(m_database);
+    static QString statement = QLatin1String("INSERT INTO history (sticker, mostRecentUse) "
+                                             "VALUES (?, ?);");
+    query.prepare(statement);
+    query.addBindValue(entry.sticker);
+    query.addBindValue(entry.mostRecentUse.toTime_t());
+
+    if (!query.exec()) {
+      qWarning() << "Query failed" << query.lastError();
+    }
+}
+
+void StickersHistoryModel::updateExistingEntryInDatabase(const HistoryEntry& entry)
+{
+    QMutexLocker ml(&m_dbMutex);
+    QSqlQuery query(m_database);
+    static QString statement = QLatin1String("UPDATE history SET mostRecentUse=?"
+                                             " WHERE sticker=?;");
+    query.prepare(statement);
+    query.addBindValue(entry.mostRecentUse.toTime_t());
+    query.addBindValue(entry.sticker);
+    if (!query.exec()) {
+      qWarning() << "Query failed" << query.lastError();
+    }
+}
+
+void StickersHistoryModel::removeEntryFromDatabase(const QString& sticker)
+{
+    QMutexLocker ml(&m_dbMutex);
+    QSqlQuery query(m_database);
+    static QString statement = QLatin1String("DELETE FROM history WHERE sticker=?;");
+    query.prepare(statement);
+    query.addBindValue(sticker);
+    if (!query.exec()) {
+      qWarning() << "Query failed" << query.lastError();
+    }
+}
+
+void StickersHistoryModel::clearAll()
+{
+    if (!m_entries.isEmpty()) {
+        beginResetModel();
+        m_entries.clear();
+        endResetModel();
+        clearDatabase();
+        Q_EMIT rowCountChanged();
+    }
+}
+
+void StickersHistoryModel::clearDatabase()
+{
+    QMutexLocker ml(&m_dbMutex);
+    QSqlQuery query(m_database);
+    QString statement = QLatin1String("DELETE FROM history;");
+    query.prepare(statement);
+    if (!query.exec()) {
+      qWarning() << "Query failed" << query.lastError();
+    }
+}
+
+QVariantMap StickersHistoryModel::get(int i) const
+{
+    QVariantMap item;
+    QHash<int, QByteArray> roles = roleNames();
+
+    QModelIndex modelIndex = index(i, 0);
+    if (modelIndex.isValid()) {
+        Q_FOREACH(int role, roles.keys()) {
+            QString roleName = QString::fromUtf8(roles.value(role));
+            item.insert(roleName, data(modelIndex, role));
+        }
+    }
+    return item;
+}

=== added file 'src/stickers-history-model.h'
--- src/stickers-history-model.h	1970-01-01 00:00:00 +0000
+++ src/stickers-history-model.h	2015-11-16 14:15:20 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __STICKERS_HISTORY_MODEL_H__
+#define __STICKERS_HISTORY_MODEL_H__
+
+// Qt
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QDateTime>
+#include <QtCore/QList>
+#include <QtCore/QMutex>
+#include <QtCore/QString>
+#include <QtSql/QSqlDatabase>
+
+class StickersHistoryModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString databasePath READ databasePath WRITE setDatabasePath NOTIFY databasePathChanged)
+    Q_PROPERTY(int limit READ limit WRITE setLimit NOTIFY limitChanged)
+    Q_PROPERTY(int count READ rowCount NOTIFY rowCountChanged)
+
+    Q_ENUMS(Roles)
+
+public:
+    StickersHistoryModel(QObject* parent=0);
+    ~StickersHistoryModel();
+
+    enum Roles {
+        Sticker = Qt::UserRole + 1,
+        MostRecentUse
+    };
+
+    // reimplemented from QAbstractListModel
+    QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex& parent=QModelIndex()) const;
+    QVariant data(const QModelIndex& index, int role) const;
+
+    const QString databasePath() const;
+    void setDatabasePath(const QString& path);
+    int limit() const;
+    void setLimit(int limit);
+
+    Q_INVOKABLE void add(const QString& sticker);
+    Q_INVOKABLE void clearAll();
+    Q_INVOKABLE QVariantMap get(int index) const;
+
+Q_SIGNALS:
+    void databasePathChanged() const;
+    void rowCountChanged() const;
+    void limitChanged() const;
+
+protected:
+    struct HistoryEntry {
+        QString sticker;
+        QDateTime mostRecentUse;
+    };
+    QList<HistoryEntry> m_entries;
+    int getEntryIndex(const QString& sticker) const;
+    void updateExistingEntryInDatabase(const HistoryEntry& entry);
+
+private:
+    QMutex m_dbMutex;
+    QSqlDatabase m_database;
+    int m_limit;
+
+    void resetDatabase(const QString& databaseName);
+    void createOrAlterDatabaseSchema();
+    void populateFromDatabase();
+    void insertNewEntryInDatabase(const HistoryEntry& entry);
+    void removeEntryFromDatabase(const QString& sticker);
+    void clearDatabase();
+    void removeExcessRows();
+};
+
+#endif // __STICKERS_HISTORY_MODEL_H__

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2015-08-13 18:34:55 +0000
+++ tests/qml/CMakeLists.txt	2015-11-16 14:15:20 +0000
@@ -1,33 +1,45 @@
-find_program(QMLTESTRUNNER_BIN
-    NAMES qmltestrunner
-    PATHS /usr/lib/*/qt5/bin
-    NO_DEFAULT_PATH
-)
-
-find_program(XVFB_RUN_BIN
-    NAMES xvfb-run
-)
-
-macro(DECLARE_QML_TEST TST_NAME TST_QML_FILE)
-    add_test(NAME ${TST_NAME}
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMAND ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24" ${QMLTESTRUNNER_BIN} -import ${qml_BINARY_DIR} -input ${CMAKE_CURRENT_SOURCE_DIR}/${TST_QML_FILE}
-    )
-endmacro()
-
-if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
-    declare_qml_test("message_bubble" tst_MessageBubble.qml)
-    declare_qml_test("messages_view" tst_MessagesView.qml)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5Qml REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Qt5QuickTest REQUIRED)
+find_package(Qt5Sql REQUIRED)
+
+set(XVFB_COMMAND)
+find_program(XVFBRUN xvfb-run)
+if(XVFBRUN)
+  set(XVFB_COMMAND ${XVFBRUN} -s "-screen 0 1024x768x24" -a)
 else()
-    if (NOT QMLTESTRUNNER_BIN)
-        message(WARNING "Qml tests disabled: qmltestrunner not found")
-    else()
-        message(WARNING "Qml tests disabled: xvfb-run not found")
-    endif()
+  message(WARNING "Cannot find xvfb-run.")
 endif()
 
-set(QML_TST_FILES
-    tst_MessageBubble.qml
-    tst_MessagesView.qml
-)
-add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})
+set(CMAKE_AUTOMOC ON)
+
+set(TEST tst_QmlTests)
+set(SOURCES
+    ${messaging-app_SOURCE_DIR}/src/stickers-history-model.cpp
+    tst_QmlTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${messaging-app_SOURCE_DIR}/src/
+)
+target_link_libraries(${TEST}
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Network
+    Qt5::Qml
+    Qt5::Quick
+    Qt5::QuickTest
+    Qt5::Sql
+)
+add_test(${TEST} ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
+         -input ${CMAKE_CURRENT_SOURCE_DIR}
+         -import ${CMAKE_BINARY_DIR}/src)
+
+# make qml files visible in QtCreator
+file(GLOB_RECURSE NON_COMPILED_FILES *.qml)
+add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_FILES})

=== added file 'tests/qml/tst_QmlTests.cpp'
--- tests/qml/tst_QmlTests.cpp	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_QmlTests.cpp	2015-11-16 14:15:20 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Qt
+#include <QtCore/QDir>
+#include <QtCore/QTemporaryDir>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTemporaryDir>
+#include <QtQml/QtQml>
+#include <QtQuickTest/QtQuickTest>
+
+// local
+#include "stickers-history-model.h"
+
+static QObject* StickersHistoryModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new StickersHistoryModel();
+}
+
+class TestContext : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString testDir READ testDir CONSTANT)
+
+public:
+    explicit TestContext(QObject* parent=0)
+        : QObject(parent)
+    {
+        QDir dir(m_temporary.path());
+        dir.mkpath("stickers");
+    }
+
+    QString testDir() const
+    {
+        return m_temporary.path();
+    }
+
+    QTemporaryDir m_temporary;
+};
+
+static QObject* TestContext_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new TestContext();
+}
+
+int main(int argc, char** argv)
+{
+    const char* uri = "messagingapp.private";
+    qmlRegisterSingletonType<StickersHistoryModel>(uri, 0, 1, "StickersHistoryModel", StickersHistoryModel_singleton_factory);
+
+    const char* testUri = "messagingapptest.private";
+    qmlRegisterSingletonType<TestContext>(testUri, 0, 1, "TestContext", TestContext_singleton_factory);
+
+    return quick_test_main(argc, argv, "QmlTests", 0);
+}
+
+#include "tst_QmlTests.moc"

=== added file 'tests/qml/tst_StickersHistoryModel.qml'
--- tests/qml/tst_StickersHistoryModel.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_StickersHistoryModel.qml	2015-11-16 14:15:20 +0000
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import QtTest 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Test 0.1
+import messagingapp.private 0.1
+import messagingapptest.private 0.1
+
+Item {
+    id: root
+    width: 1
+    height: 1
+
+    property var model: StickersHistoryModel
+
+    SignalSpy {
+       id: countSpy
+       target: model
+       signalName: "rowCountChanged"
+    }
+
+    SignalSpy {
+       id: rowsInsertedSpy
+       target: model
+       signalName: "rowsInserted"
+    }
+
+    SignalSpy {
+       id: rowsMovedSpy
+       target: model
+       signalName: "rowsMoved"
+    }
+
+    SignalSpy {
+       id: dataChangedSpy
+       target: model
+       signalName: "dataChanged"
+    }
+
+    SignalSpy {
+       id: rowsRemovedSpy
+       target: model
+       signalName: "rowsRemoved"
+    }
+
+    UbuntuTestCase {
+        id: test
+        name: 'stickersHistoryModelTestCase'
+        when: windowShown
+
+        function init() {
+            model.databasePath = ":memory:"
+            model.limit = 10
+        }
+
+        function cleanup() {
+            model.databasePath = ""
+            countSpy.clear()
+            rowsInsertedSpy.clear()
+            dataChangedSpy.clear()
+            rowsMovedSpy.clear()
+            rowsRemovedSpy.clear()
+        }
+
+        function test_initiallyEmpty() {
+            compare(model.count, 0)
+        }
+
+        function test_addingEmptyOrInvalidDoesNothing() {
+            model.add("")
+            compare(model.count, 0)
+            model.add(null)
+            compare(model.count, 0)
+            model.add(undefined)
+            compare(model.count, 0)
+        }
+
+        function test_add_new() {
+            model.add("foo")
+            compare(model.count, 1)
+            compare(countSpy.count, 1)
+            compare(rowsInsertedSpy.count, 1)
+            compare(rowsInsertedSpy.signalArguments[0][1], 0) // first
+            compare(rowsInsertedSpy.signalArguments[0][2], 0) // last
+
+            model.add("bar")
+            compare(model.count, 2)
+            compare(countSpy.count, 2)
+            compare(rowsInsertedSpy.count, 2)
+            compare(rowsInsertedSpy.signalArguments[0][1], 0) // first
+            compare(rowsInsertedSpy.signalArguments[0][2], 0) // last
+        }
+
+        function test_signals() {
+            model.limit = 2
+
+            model.add("a")
+            compare(model.count, 1)
+            compare(countSpy.count, 1)
+            compare(rowsInsertedSpy.count, 1)
+            compare(rowsInsertedSpy.signalArguments[0][1], 0) // first
+            compare(rowsInsertedSpy.signalArguments[0][2], 0) // last
+
+            model.add("a")
+            compare(dataChangedSpy.count, 1)
+
+            model.add("b")
+            compare(model.count, 2)
+            compare(countSpy.count, 2)
+            compare(rowsInsertedSpy.count, 2)
+            compare(rowsInsertedSpy.signalArguments[0][1], 0) // first
+            compare(rowsInsertedSpy.signalArguments[0][2], 0) // last
+
+            model.add("a")
+            compare(rowsMovedSpy.count, 1)
+            compare(rowsMovedSpy.signalArguments[0][1], 1) // from first
+            compare(rowsMovedSpy.signalArguments[0][2], 1) // from last
+            compare(rowsMovedSpy.signalArguments[0][4], 0) // to
+            compare(dataChangedSpy.count, 2)
+
+            model.add("c")
+            compare(model.count, 2)
+            compare(rowsRemovedSpy.count, 1)
+            compare(rowsRemovedSpy.signalArguments[0][1], 2) // from
+            compare(rowsRemovedSpy.signalArguments[0][2], 2) // to
+        }
+
+        function test_get_and_order() {
+            model.add("a")
+            // datetimes have only millisecond precision, and we want to prevent
+            // the two entries to have the same timestamp
+            wait(100)
+            model.add("b")
+
+            var a = model.get(1)
+            verify(a !== null)
+            compare(a.sticker, "a")
+
+            var b = model.get(0)
+            verify(b !== null)
+            compare(b.sticker, "b")
+
+            verify(b.mostRecentUse.toISOString() > a.mostRecentUse.toISOString())
+
+            wait(100)
+            model.add("a")
+
+            a = model.get(0)
+            verify(a !== null)
+            compare(a.sticker, "a")
+
+            b = model.get(1)
+            verify(b !== null)
+            compare(b.sticker, "b")
+
+            verify(a.mostRecentUse.toISOString() > b.mostRecentUse.toISOString())
+        }
+
+        function test_limit_change() {
+            model.add("d")
+            model.add("c")
+            model.add("b")
+            model.add("a")
+            model.limit = 2
+
+            compare(model.count, 2)
+            compare(model.get(0).sticker, "a")
+            compare(model.get(1).sticker, "b")
+        }
+    }
+}