Merge lp:~fcole90/u-draw/u-draw into lp:u-draw

[fcole90]

First stable release: 1.0

[fcole90 (fcole90)]

review: Approve

[lp:~fcole90/u-draw/u-draw]

3. By fcole90 on 2013-09-17

130917

Unmerged revisions

3. By fcole90 on 2013-09-17

130917

2. By fcole90 on 2013-09-15

First release 1.0

1. By fcole90 on 2013-09-14

Added many tools and options

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2013-09-15 23:59:30 +0000
@@ -0,0 +1,21 @@
+# More information: https://wiki.ubuntu.com/Touch/Testing
+#
+# Notes for autopilot tests:
+# -----------------------------------------------------------
+# In order to run autopilot tests:
+# sudo apt-add-repository ppa:autopilot/ppa
+# sudo apt-get update
+# sudo apt-get install python-autopilot autopilot-qt
+#############################################################
+
+all:
+
+autopilot:
+	chmod +x tests/autopilot/run
+	tests/autopilot/run
+
+check:
+	qmltestrunner -input tests/unit
+
+run:
+	/usr/bin/qmlscene $@ U-Draw.qml

=== renamed file 'Makefile' => 'Makefile.moved'
=== added directory 'components'
=== renamed directory 'components' => 'components.moved'
=== added file 'components/ColorChooser.qml'
--- components/ColorChooser.qml	1970-01-01 00:00:00 +0000
+++ components/ColorChooser.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,208 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+
+Component {
+    id: colorsSheet
+
+
+
+    ComposerSheet {
+        id: sheet
+        title: i18n.tr("Palette")
+        height: units.gu(55)
+        width: units.gu(99)
+
+
+
+        Column
+            {
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: parent.width
+            spacing: units.gu(2)
+            Row{
+                spacing: units.gu(2)
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                UbuntuShape{
+                    width: units.gu(14)
+                    height: units.gu(3)
+                    color: canvas.currentColor
+
+                }
+
+                UbuntuShape{
+                    width: units.gu(14)
+                    height: units.gu(3)
+                    color: canvas.bufferColor
+
+                }
+
+
+            }
+
+            Rectangle{
+                id: separator1
+                color: "darkgray"
+                width: parent.width
+                height: units.gu(1)
+            }
+
+            Grid{
+                anchors.horizontalCenter: parent.horizontalCenter
+                rows: 6
+                columns: 5
+                spacing: units.gu(2)
+
+                //Row 1
+                ColorItem{
+                    color: "red"
+                }
+
+                ColorItem{
+                    color: "yellow"
+                }
+
+                ColorItem{
+                    color: "green"
+                }
+
+                ColorItem{
+                    color: "blue"
+                }
+
+                ColorItem{
+                    color: "magenta"
+                }
+
+                //Row2
+
+                ColorItem{
+                    color: "salmon"
+                }
+
+                ColorItem{
+                    color: "orange"
+                }
+
+                ColorItem{
+                    color: "aquamarine"
+                }
+
+                ColorItem{
+                    color: "cyan"
+                }
+
+                ColorItem{
+                    color: "pink"
+                }
+
+                //Row3
+
+                ColorItem{
+                    color: "orangered"
+                }
+
+                ColorItem{
+                    color: "gold"
+                }
+
+                ColorItem{
+                    color: "forestgreen"
+                }
+
+                ColorItem{
+                    color: "royalblue"
+                }
+
+                ColorItem{
+                    color: "purple"
+                }
+
+                //Row 4
+
+                ColorItem{
+                    color: "crimson"
+                }
+
+                ColorItem{
+                    color: "goldenrod"
+                }
+
+                ColorItem{
+                    color: "olive"
+                }
+
+                ColorItem{
+                    color: "slateblue"
+                }
+
+                ColorItem{
+                    color: "indigo"
+                }
+                //Row 5
+
+                ColorItem{
+                    color: "sienna"
+                }
+
+                ColorItem{
+                    color: UbuntuColors.orange
+                }
+
+                ColorItem{
+                    color: "teal"
+                }
+
+                ColorItem{
+                    color: "midnightblue"
+                }
+
+                ColorItem{
+                    color: UbuntuColors.lightAubergine
+                }
+
+                //Row6
+
+                ColorItem{
+                    color: "black"
+                }
+
+                ColorItem{
+                    color: "gray"
+                }
+
+                ColorItem{
+                    color: "darkgray"
+                }
+
+                ColorItem{
+                    color: "silver"
+                }
+
+
+                ColorItem{
+                    color: "white"
+                }
+
+
+
+            }
+            //End of grid
+
+
+        }
+
+
+
+
+        onCancelClicked: PopupUtils.close(sheet)
+        onConfirmClicked: {
+            canvas.currentColor = canvas.bufferColor
+            PopupUtils.close(sheet)
+        }
+    }
+}
+
+

=== added file 'components/ColorItem.qml'
--- components/ColorItem.qml	1970-01-01 00:00:00 +0000
+++ components/ColorItem.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,16 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+UbuntuShape {
+    width: units.gu(4)
+    height: units.gu(3)
+    color: "blue"
+
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            canvas.bufferColor = color
+        }
+    }
+}

=== added file 'components/DrawingSheet.qml'
--- components/DrawingSheet.qml	1970-01-01 00:00:00 +0000
+++ components/DrawingSheet.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,122 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+
+Canvas{
+
+    id: canvas
+    width: units.gu(30)
+    height: units.gu(60)
+    smooth: true
+    antialiasing: true
+    renderStrategy: Canvas.Threaded //Needed to save()
+
+  //  property string lastImage: "../temp/last.png"
+  //  property bool loaded: false
+
+    property int strokeWidth: units.dp(2)
+    property color currentColor: "silver"
+    property color bufferColor: canvas.currentColor
+    property real currentOpacity: 1.0
+    property real currentStroke: 1
+    property color backgroundColor: "white"
+
+
+   // property variant dataBackup: []
+  //  property int index: 0
+/*
+    function saveOnData(){
+        var maxLen = 25
+        var data = canvas.toDataURL()
+
+        var myArray = new Array
+        if (dataBackup){
+            myArray = dataBackup
+        }
+
+        if (myArray.length>maxLen-1){
+            myArray.shift()
+        }
+
+        if (data) {
+            myArray.push(data)
+            index = myArray.length - 1
+        console.log("Data stored, index=" + index)
+            console.log(myArray[index])
+
+        }
+
+
+        dataBackup = myArray
+
+
+    }
+
+
+
+
+*/
+
+
+
+
+    //property rect canvasArea: "0, 0, 25x25"
+
+    onPaint: {
+        var ctx = canvas.getContext('2d')
+
+
+
+
+        ctx.rect(0, 0, width, height)
+        ctx.fillStyle = backgroundColor
+        ctx.fill()
+        console.log("Painted background")
+
+
+            toolBox.initialization.call()
+
+
+
+    }
+    MouseArea{
+        id: position
+        anchors.fill: parent
+        property alias px: position.mouseX
+        property alias py: position.mouseY
+        property bool isPressed: false
+
+        onPressed: {
+            isPressed = true
+            console.log("position pressing and holding")
+        }
+
+        onReleased: {
+            isPressed = false
+            canvas.bufferX = -1
+            canvas.bufferY = -1
+            console.log("position released and buffer resetted")
+            canvas.save("../temp/last.png")
+          //  canvas.saveOnData()
+
+
+
+        }
+        // Changing positions invokes canvas to paint
+        onPositionChanged: {
+            //(isPressed){
+                canvas.requestPaint()
+                console.log("Position at (" + px + "," + py + ")")
+           // }
+
+        }
+
+    }
+
+    property alias px: position.mouseX
+    property alias py: position.mouseY
+    property int bufferX: -1
+    property int bufferY: -1
+    property alias isPressed: position.isPressed
+
+}

=== added file 'components/DrawingTool.qml'
--- components/DrawingTool.qml	1970-01-01 00:00:00 +0000
+++ components/DrawingTool.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,36 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+UbuntuShape{
+    id:tool
+    width: units.gu(7)
+    height: units.gu(7)
+
+    anchors.horizontalCenter: parent.horizontalCenter
+
+    Image{
+        id: halo
+        anchors.fill: parent
+        source: "../graphics/halo.png"
+        visible: false
+    }
+
+    property alias halo: halo.visible
+
+    color: "gray"
+    property string name: ""
+    MouseArea{
+        anchors.fill: parent
+        onClicked:{
+            console.log("DrawingTool '" + name + "' Clicked")
+            toolBox.selection.call()
+            tool.state = "on"
+
+        }
+    }
+
+    onStateChanged: {
+        if (state=="on")
+            console.log("DrawingTool '" + name + "' enabled")
+    }
+}

=== added file 'components/FineTuneChooser.qml'
--- components/FineTuneChooser.qml	1970-01-01 00:00:00 +0000
+++ components/FineTuneChooser.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,117 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Component {
+        id: popoverComponent
+
+        Popover {
+            id: popover
+
+
+            Column {
+                id: containerLayout
+                anchors {
+                    left: parent.left
+                    top: parent.top
+                    right: parent.right
+                }
+                ListItem.Header {
+                    height: units.gu(8)
+                    text: "Fine tune"
+                }
+                ListItem.Standard {
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    Row{
+                        spacing: units.gu(1)
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        anchors.verticalCenter: parent.verticalCenter
+                        Text {
+                            anchors.verticalCenter: parent.verticalCenter
+                            text: i18n.tr("Opacity")
+
+                        }
+                        Slider{
+                            width: units.gu(15)
+                            height: units.gu(5)
+                            id: opacitySlider
+                            function formatValue(v) { return v.toFixed(2) }
+                            minimumValue: 0
+                            maximumValue: 100
+                            value: 100
+                            live: true
+
+                            onValueChanged: {
+                                canvas.currentOpacity = formatValue(value)/100
+                            }
+
+
+                        }
+                        TextField {
+                            height: units.gu(5)
+                            objectName: "textfield_standard"
+                            text: canvas.currentOpacity*100
+                            width: units.gu(10)
+                            onTextChanged: {
+                                if (text!=""){
+                                    opacitySlider.value = text
+                                }
+                            }
+
+
+
+                        }
+                    }
+                }
+
+                ListItem.Standard {
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    Row{
+                        spacing: units.gu(1)
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        anchors.verticalCenter: parent.verticalCenter
+                        Text {
+                            anchors.verticalCenter: parent.verticalCenter
+                            text: i18n.tr("Stroke")
+
+                        }
+                        Slider{
+                            width: units.gu(15)
+                            height: units.gu(5)
+                            id: strokeSlider
+                            function formatValue(v) { return v.toFixed(2) }
+                            minimumValue: 0
+                            maximumValue: 100
+                            value: 100
+                            live: true
+
+                            onValueChanged: {
+                                canvas.currentStroke = formatValue(value)
+                            }
+
+
+                        }
+                        TextField {
+                            height: units.gu(5)
+                            objectName: "textfield_standard"
+                            text: canvas.currentStroke
+                            width: units.gu(10)
+                            onTextChanged: {
+                                if (text!=""){
+                                    strokeSlider.value = text
+                                }
+                            }
+
+
+
+                        }
+                    }
+                }
+
+
+            }
+        }
+    }

=== added file 'components/HelloComponent.qml'
--- components/HelloComponent.qml	1970-01-01 00:00:00 +0000
+++ components/HelloComponent.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+UbuntuShape {
+    width: 200
+    height: width
+    
+    property alias text : myText.text
+    
+    Label {
+        id: myText
+        anchors.centerIn: parent
+    }
+}

=== added file 'components/UbuntuIconButton.qml'
--- components/UbuntuIconButton.qml	1970-01-01 00:00:00 +0000
+++ components/UbuntuIconButton.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Button{
+    id:shapeButton
+    width: units.gu(7)
+    height: units.gu(7)
+    anchors.horizontalCenter: parent.horizontalCenter
+    color: "gray"
+
+
+}

=== added directory 'graphics'
=== renamed directory 'graphics' => 'graphics.moved'
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added file 'graphics/[e-mail]'
Binary files graphics/[e-mail]	1970-01-01 00:00:00 +0000 and graphics/[e-mail]	2013-09-15 23:59:30 +0000 differ
=== added directory 'js'
=== added file 'js/Behaviours.js'
--- js/Behaviours.js	1970-01-01 00:00:00 +0000
+++ js/Behaviours.js	2013-09-15 23:59:30 +0000
@@ -0,0 +1,131 @@
+function pencilBehaviour() {
+    if (canvas.isPressed){
+        var ctx = canvas.getContext('2d')
+        if ((canvas.bufferX != -1) || (canvas.bufferY != -1)){
+
+            ctx.globalCompositeOperation = "source-atop"
+            ctx.beginPath()
+            ctx.moveTo(canvas.bufferX, canvas.bufferY)
+            ctx.lineTo(canvas.px, canvas.py)
+            ctx.closePath()
+            //Invastigate to understand why globalAlpha gains opacity [SOLVED]: caused by missing beginPath()
+            ctx.globalAlpha = canvas.currentOpacity
+            ctx.lineCap = "round"
+            ctx.lineJoin = "round"
+            ctx.strokeStyle = canvas.currentColor
+            ctx.lineWidth = canvas.currentStroke
+            ctx.stroke()
+            console.log("pencil invoking canvas")
+
+            //Buffers are needed to draw a line from buffer to current position
+            canvas.bufferX = canvas.px
+            canvas.bufferY = canvas.py
+
+
+        }
+        else{
+            //Buffers are needed to draw a line from buffer to current position
+            canvas.bufferX = canvas.px
+            canvas.bufferY = canvas.py
+        }
+    }
+}
+
+
+function brushBehaviour() {
+    if (canvas.isPressed){
+        var ctx = canvas.getContext('2d')
+        var gradient = ctx.createRadialGradient(canvas.px, canvas.py, canvas.currentStroke/3, canvas.px, canvas.py, canvas.currentStroke)
+        gradient.addColorStop(0, canvas.currentColor)
+        gradient.addColorStop(0.6, "transparent")
+
+
+        ctx.globalCompositeOperation = "source-atop"
+
+        ctx.beginPath()
+        ctx.arc(canvas.px, canvas.py, canvas.currentStroke, 0, 2 * Math.PI, false)
+        ctx.closePath()
+        //Invastigate to understand why globalAlpha gains opacity [SOLVED]: caused by missing beginPath()
+        ctx.globalAlpha = canvas.currentOpacity
+        ctx.fillStyle = gradient
+        ctx.fill()
+
+        console.log("brush invoking canvas")
+
+        //Buffers are needed to draw a line from buffer to current position
+
+
+    }
+}
+
+function fingerBehaviour() {
+    if (canvas.isPressed){
+        var ctx = canvas.getContext('2d')
+        var gradient = ctx.createRadialGradient(canvas.px, canvas.py, canvas.currentStroke*2/3, canvas.px, canvas.py, canvas.currentStroke)
+        gradient.addColorStop(0.5, canvas.currentColor)
+        gradient.addColorStop(1, "transparent")
+
+
+
+        ctx.globalCompositeOperation = "source-atop"
+
+        ctx.beginPath()
+        ctx.arc(canvas.px, canvas.py, canvas.currentStroke, 0, 2 * Math.PI, false)
+        ctx.closePath()
+
+        ctx.globalAlpha = canvas.currentOpacity
+        ctx.fillStyle = gradient
+        ctx.fill()
+        ctx.closePath()
+
+        console.log("finger invoking canvas")
+
+        //Subtractive center gradient
+        if ((canvas.bufferX != -1) || (canvas.bufferY != -1)){
+            ctx.beginPath()
+            ctx.moveTo(canvas.bufferX, canvas.bufferY)
+            ctx.lineTo(canvas.px, canvas.py)
+            ctx.closePath()
+
+            ctx.globalAlpha = canvas.currentOpacity
+            ctx.lineCap = "round"
+            ctx.lineJoin = "round"
+            ctx.strokeStyle = canvas.backgroundColor
+            ctx.lineWidth = canvas.currentStroke*2*0.8
+            ctx.stroke()
+
+        }
+
+        canvas.bufferX = canvas.px
+        canvas.bufferY = canvas.py
+
+
+    }
+}
+
+
+function rubberBehaviour() {
+    if (canvas.isPressed){
+        var ctx = canvas.getContext('2d')
+        var gradient = ctx.createRadialGradient(canvas.px, canvas.py, canvas.currentStroke/3, canvas.px, canvas.py, canvas.currentStroke)
+        gradient.addColorStop(0, canvas.backgroundColor)
+        gradient.addColorStop(0.8, "transparent")
+
+
+        ctx.globalCompositeOperation = "source-atop"
+
+        ctx.beginPath()
+        ctx.arc(canvas.px, canvas.py, canvas.currentStroke, 0, 2 * Math.PI, false)
+        ctx.closePath()
+
+        ctx.globalAlpha = canvas.currentOpacity
+        ctx.fillStyle = gradient
+        ctx.fill()
+
+        console.log("brush invoking canvas")
+
+        //Buffers are needed to draw a line from buffer to current position
+
+
+    }
+}

=== added file 'manifest.json'
--- manifest.json	1970-01-01 00:00:00 +0000
+++ manifest.json	2013-09-15 23:59:30 +0000
@@ -0,0 +1,14 @@
+{
+    "description": "description of U-Draw",
+    "framework": "ubuntu-sdk-13.10",
+    "hooks": {
+        "U-Draw": {
+            "apparmor": "uDraw.json",
+            "desktop": "uDraw.desktop"
+        }
+    },
+    "maintainer": "fcole90 <[e-mail]>",
+    "name": "com.ubuntu.developer.fcole90.uDraw",
+    "title": "uDraw",
+    "version": "1.0"
+}

=== renamed file 'manifest.json' => 'manifest.json.moved'
=== added directory 'pictures'
=== added directory 'temp'
=== added file 'temp/last.png'
Binary files temp/last.png	1970-01-01 00:00:00 +0000 and temp/last.png	2013-09-15 23:59:30 +0000 differ
=== added directory 'tests'
=== renamed directory 'tests' => 'tests.moved'
=== added directory 'tests/autopilot'
=== added directory 'tests/autopilot/U-Draw'
=== added file 'tests/autopilot/U-Draw/__init__.py'
--- tests/autopilot/U-Draw/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/U-Draw/__init__.py	2013-09-15 23:59:30 +0000
@@ -0,0 +1,131 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Ubuntu Touch App autopilot tests."""
+
+from os import remove
+import os.path
+from tempfile import mktemp
+import subprocess
+
+from autopilot.input import Mouse, Touch, Pointer
+from autopilot.matchers import Eventually
+from autopilot.platform import model
+from testtools.matchers import Is, Not, Equals
+from autopilot.testcase import AutopilotTestCase
+
+def get_module_include_path():
+    return os.path.abspath(
+        os.path.join(
+            os.path.dirname(__file__),
+            '..',
+            '..',
+            '..',
+            '..',
+            'modules')
+        )
+
+
+class UbuntuTouchAppTestCase(AutopilotTestCase):
+    """A common test case class that provides several useful methods for the tests."""
+
+    if model() == 'Desktop':
+        scenarios = [
+        ('with mouse', dict(input_device_class=Mouse))
+        ]
+    else:
+        scenarios = [
+        ('with touch', dict(input_device_class=Touch))
+        ]
+
+    @property
+    def main_window(self):
+        return MainWindow(self.app)
+
+
+    def setUp(self):
+        self.pointing_device = Pointer(self.input_device_class.create())
+        super(UbuntuTouchAppTestCase, self).setUp()
+        self.launch_test_qml()
+
+
+    def launch_test_qml(self):
+        # If the test class has defined a 'test_qml' class attribute then we
+        # write it to disk and launch it inside the QML Scene. If not, then we
+        # silently do nothing (presumably the test has something else planned).
+        arch = subprocess.check_output(["dpkg-architecture",
+        "-qDEB_HOST_MULTIARCH"]).strip()
+        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
+            qml_path = mktemp(suffix='.qml')
+            open(qml_path, 'w').write(self.test_qml)
+            self.addCleanup(remove, qml_path)
+
+            self.app = self.launch_test_application(
+                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
+                "-I", get_module_include_path(),
+                qml_path,
+                app_type='qt')
+
+        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
+            qml_path = self.test_qml_file
+            self.app = self.launch_test_application(
+                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
+                "-I", get_module_include_path(),
+                qml_path,
+                app_type='qt')
+
+        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
+
+
+    def get_qml_view(self):
+        """Get the main QML view"""
+
+        return self.app.select_single("QQuickView")
+
+    def get_mainview(self):
+        """Get the QML MainView"""
+
+        mainView = self.app.select_single("MainView")
+        self.assertThat(mainView, Not(Is(None)))
+        return mainView
+
+
+    def get_object(self,objectName):
+        """Get a object based on the objectName"""
+
+        obj = self.app.select_single(objectName=objectName)
+        self.assertThat(obj, Not(Is(None)))
+        return obj
+
+
+    def mouse_click(self,objectName):
+        """Move mouse on top of the object and click on it"""
+
+        obj = self.get_object(objectName)
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.click()
+
+
+    def mouse_press(self,objectName):
+        """Move mouse on top of the object and press mouse button (without releasing it)"""
+
+        obj = self.get_object(objectName)
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.press()
+
+
+    def mouse_release(self):
+        """Release mouse button"""
+
+        self.pointing_device.release()     
+
+
+    def type_string(self, string):
+        """Type a string with keyboard"""
+
+        self.keyboard.type(string)
+
+
+    def type_key(self, key):
+        """Type a single key with keyboard"""
+
+        self.keyboard.key(key)

=== added directory 'tests/autopilot/U-Draw/main'
=== added file 'tests/autopilot/U-Draw/main/__init__.py'
--- tests/autopilot/U-Draw/main/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/U-Draw/main/__init__.py	2013-09-15 23:59:30 +0000
@@ -0,0 +1,1 @@
+""" A main.qml test suite """

=== added file 'tests/autopilot/U-Draw/main/test_main.py'
--- tests/autopilot/U-Draw/main/test_main.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/U-Draw/main/test_main.py	2013-09-15 23:59:30 +0000
@@ -0,0 +1,23 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Tests for the Hello World"""
+
+from autopilot.matchers import Eventually
+from textwrap import dedent
+from testtools.matchers import Is, Not, Equals
+from testtools import skip
+import os
+from U-Draw import UbuntuTouchAppTestCase
+
+
+class MainTests(UbuntuTouchAppTestCase):
+    """Generic tests for the Hello World"""
+
+    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../U-Draw")
+
+    def test_0_can_select_mainView(self):
+        """Must be able to select the mainview."""
+
+        mainView = self.get_mainview()
+        self.assertThat(mainView.visible,Eventually(Equals(True)))
+

=== added file 'tests/autopilot/run'
--- tests/autopilot/run	1970-01-01 00:00:00 +0000
+++ tests/autopilot/run	2013-09-15 23:59:30 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ -z `which autopilot` ]]; then
+  echo "Autopilot is not installed. Skip"
+  exit
+fi
+
+SCRIPTPATH=`dirname $0`
+pushd ${SCRIPTPATH}
+autopilot run U-Draw
+popd

=== added directory 'tests/unit'
=== added file 'tests/unit/tst_hellocomponent.qml'
--- tests/unit/tst_hellocomponent.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_hellocomponent.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,49 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 0.1
+import "../../components"
+
+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
+
+// Execute tests with:
+//   qmltestrunner
+
+Item {
+    // The objects
+    HelloComponent {
+        id: objectUnderTest
+    }
+    
+    TestCase {
+        name: "HelloComponent"
+        
+        function init() {
+            console.debug(">> init");
+            compare("",objectUnderTest.text,"text was not empty on init");
+            console.debug("<< init");    
+        }
+        
+        function cleanup() {
+            console.debug(">> cleanup");
+            console.debug("<< cleanup");
+        }
+        
+        function initTestCase() {
+            console.debug(">> initTestCase");
+            console.debug("<< initTestCase");
+        }
+        
+        function cleanupTestCase() {
+            console.debug(">> cleanupTestCase");
+            console.debug("<< cleanupTestCase");
+        }
+        
+        function test_canReadAndWriteText() {
+            var expected = "Hello World";
+            
+            objectUnderTest.text = expected;
+            
+            compare(expected,objectUnderTest.text,"expected did not equal result");
+        }
+    }
+}

=== added file 'uDraw.desktop'
--- uDraw.desktop	1970-01-01 00:00:00 +0000
+++ uDraw.desktop	2013-09-15 23:59:30 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=U-Draw
+Comment=My project description
+Exec=/usr/bin/qmlscene $@ /usr/share/U-Draw/U-Draw.qml
+Icon=qmlscene
+Terminal=false
+Type=Application
+X-Ubuntu-Touch=true

=== added file 'uDraw.json'
--- uDraw.json	1970-01-01 00:00:00 +0000
+++ uDraw.json	2013-09-15 23:59:30 +0000
@@ -0,0 +1,6 @@
+{
+    "policy_groups": [
+        "location"
+    ],
+    "policy_version": 1
+}

=== added file 'uDraw.qml'
--- uDraw.qml	1970-01-01 00:00:00 +0000
+++ uDraw.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,39 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "ui"
+
+/*!
+    \brief MainView with Tabs element.
+           First Tab has a single Label and
+           second Tab has a single ToolbarAction.
+*/
+
+MainView {
+    // objectName for functional testing purposes (autopilot-qt5)
+    objectName: "mainView"
+    
+    // Note! applicationName needs to match the .desktop filename 
+    applicationName: "U-Draw"
+    
+    /* 
+     This property enables the application to change orientation 
+     when the device is rotated. The default is false.
+    */
+    //automaticOrientation: true
+    
+    width: units.gu(100)
+    height: units.gu(75)
+    
+    Tabs {
+        id: tabs
+                
+        DrawTab {
+            objectName: "Draw"
+        }
+/*
+        NoteTab{
+            objectName: "Notes"
+        }
+*/
+    }
+}

=== added file 'uDraw.qmlproject'
--- uDraw.qmlproject	1970-01-01 00:00:00 +0000
+++ uDraw.qmlproject	2013-09-15 23:59:30 +0000
@@ -0,0 +1,46 @@
+/* File generated by Qt Creator (with Ubuntu Plugin), version 2.7.1 */
+
+import QmlProject 1.1
+
+Project {
+    mainFile: "uDraw.qml"
+    
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    Files {
+        filter: "*.desktop"
+    }
+    Files {
+        filter: "Makefile"
+    }
+    Files {
+        directory: "html"
+        filter: "*"
+    }
+    Files {
+        directory: "img/"
+        filter: "*"
+    }
+    Files {
+        directory: "css/"
+        filter: "*"
+    }
+    Files {
+        directory: "tests/"
+        filter: "*"
+    }
+    Files {
+        directory: "debian"
+        filter: "*"
+    }
+    /* List of plugin directories passed to QML runtime */
+    importPaths: [ "." ,"/usr/bin","/usr/lib/x86_64-linux-gnu/qt5/qml" ]
+}

=== added file 'uDraw.qmlproject.user'
--- uDraw.qmlproject.user	1970-01-01 00:00:00 +0000
+++ uDraw.qmlproject.user	2013-09-15 23:59:30 +0000
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 2.7.1, 2013-09-16T01:11:30. -->
+<qtcreator>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QByteArray" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QString" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QByteArray" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
+   <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{a67867ed-7c03-4e7a-955b-bfadb85b6463}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value>
+    <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value>
+    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
+    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
+    <valuelist type="QVariantList" key="QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges"/>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
+  <value type="QString">{bd4b52d6-7419-4e8e-b3cb-b9f86e55364e}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">12</value>
+ </data>
+</qtcreator>

=== added file 'uDraw.qmlproject~'
--- uDraw.qmlproject~	1970-01-01 00:00:00 +0000
+++ uDraw.qmlproject~	2013-09-15 23:59:30 +0000
@@ -0,0 +1,46 @@
+/* File generated by Qt Creator (with Ubuntu Plugin), version 2.7.1 */
+
+import QmlProject 1.1
+
+Project {
+    mainFile: "U-Draw.qml"
+    
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    Files {
+        filter: "*.desktop"
+    }
+    Files {
+        filter: "Makefile"
+    }
+    Files {
+        directory: "html"
+        filter: "*"
+    }
+    Files {
+        directory: "img/"
+        filter: "*"
+    }
+    Files {
+        directory: "css/"
+        filter: "*"
+    }
+    Files {
+        directory: "tests/"
+        filter: "*"
+    }
+    Files {
+        directory: "debian"
+        filter: "*"
+    }
+    /* List of plugin directories passed to QML runtime */
+    importPaths: [ "." ,"/usr/bin","/usr/lib/x86_64-linux-gnu/qt5/qml" ]
+}

=== added file 'uDraw64.png'
Binary files uDraw64.png	1970-01-01 00:00:00 +0000 and uDraw64.png	2013-09-15 23:59:30 +0000 differ
=== added directory 'ui'
=== renamed directory 'ui' => 'ui.moved'
=== added file 'ui/DrawTab.qml'
--- ui/DrawTab.qml	1970-01-01 00:00:00 +0000
+++ ui/DrawTab.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,391 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Layouts 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import "../js/Behaviours.js" as Behaviours
+import "../components"
+
+Tab {
+    title: i18n.tr("Draw")
+
+    page: Page {
+
+
+
+        Rectangle {
+            id: container
+            color: Theme.palette.normal.background
+            width: parent.width - (toolBox.width + anchors.leftMargin + rightMargin)
+            height: parent.height
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(1)
+            property real rightMargin: units.gu(1)
+
+            DrawingSheet{
+                id: canvas
+                anchors.centerIn: parent
+                
+
+            }
+
+
+        }
+
+        Rectangle {
+            id: toolBox
+            color: "darkgray"
+            width: units.gu(8)
+            height: parent.height
+            anchors.right: parent.right
+            signal initialization
+            signal selection
+
+            onSelection: {
+                console.log("Deselecting tools..")
+                pencil.state = "off"
+                brush.state = "off"
+                finger.state = "off"
+                rubber.state = "off"
+
+            }
+
+            onInitialization: {
+                console.log("Initialization...")
+                pencil.state = "on"
+            }
+
+            Column{
+                id: column
+                anchors.centerIn: parent
+                spacing: units.gu(1)
+
+
+                DrawingTool{
+                    id: pencil
+                    name: "pencil"
+
+                    image: Image {
+                        source: "../graphics/[e-mail]"
+                        fillMode: Image.PreserveAspectCrop
+                    }
+
+                    onStateChanged: {
+                        if (state == "off"){
+                            canvas.currentStroke = 1
+                        }
+                    }
+
+                    states: [
+                        State {
+                            name: "on"
+                            PropertyChanges {
+                                target: canvas
+
+                                onPaint: {
+                                    Behaviours.pencilBehaviour()
+                                }
+                            }
+                            PropertyChanges {
+                                target: pencil
+                                halo: true
+
+                            }
+                        },
+                        State {
+                            name: "off"
+                            PropertyChanges {
+                                target: pencil
+                                halo: false
+
+                            }
+
+                        },
+                        State {
+                            name: "delete"
+                            PropertyChanges {
+                                target: canvas
+
+                                onPaint: {
+                                    var ctx = canvas.getContext('2d')
+
+                                    ctx.rect(0, 0, width, height)
+                                    ctx.fillStyle = backgroundColor
+                                    ctx.fill()
+                                    console.log("Painted background")
+                                    toolBox.initialization.call()
+                                }
+                            }
+
+                        }
+                    ]
+                }
+
+                DrawingTool{
+                    id: brush
+                    name: "brush"
+
+
+                    image: Image {
+                        source: "../graphics/[e-mail]"
+                        fillMode: Image.PreserveAspectCrop
+                    }
+
+                    onStateChanged: {
+                        if (state == "on"){
+                            canvas.currentStroke = 5
+                        }
+                    }
+
+                    states: [
+                        State {
+                            name: "on"
+                            PropertyChanges {
+                                target: canvas
+                                onPaint: {
+                                    Behaviours.brushBehaviour()
+                                }
+                            }
+                            PropertyChanges {
+                                target: brush
+                                halo: true
+
+                            }
+                        },
+                        State {
+                            name: "off"
+                            PropertyChanges {
+                                target: brush
+                                halo: false
+
+                            }
+
+                        }
+                    ]
+
+                }
+
+                DrawingTool{
+                    id: finger
+                    name: "finger"
+
+
+                    image: Image {
+                        source: "../graphics/[e-mail]"
+                        fillMode: Image.PreserveAspectCrop
+                    }
+
+                    onStateChanged: {
+                        if (state == "on"){
+                            canvas.currentStroke = 25
+                        }
+                    }
+
+                    states: [
+                        State {
+                            name: "on"
+                            PropertyChanges {
+                                target: canvas
+                                onPaint: {
+                                    Behaviours.fingerBehaviour()
+                                }
+                            }
+                            PropertyChanges {
+                                target: finger
+                                halo: true
+
+                            }
+                        },
+                        State {
+                            name: "off"
+                            PropertyChanges {
+                                target: finger
+                                halo: false
+
+                            }
+
+                        }
+                    ]
+
+                }
+
+                DrawingTool{
+                    id: rubber
+                    name: "rubber"
+
+
+                    image: Image {
+                        source: Qt.resolvedUrl("../graphics/[e-mail]")
+                        fillMode: Image.PreserveAspectCrop
+                    }
+
+                    onStateChanged: {
+                        if (state == "on"){
+                            canvas.currentStroke = 22
+                        }
+                    }
+
+                    states: [
+                        State {
+                            name: "on"
+                            PropertyChanges {
+                                target: canvas
+                                onPaint: {
+                                    Behaviours.rubberBehaviour()
+                                }
+                            }
+                            PropertyChanges {
+                                target: rubber
+                                halo: true
+
+                            }
+                        },
+                        State {
+                            name: "off"
+                            PropertyChanges {
+                                target: rubber
+                                halo: false
+
+                            }
+
+                        }
+                    ]
+
+                }
+
+                ColorChooser{
+                    id: colors
+                }
+
+                UbuntuShape{
+                    id: paletteTool
+
+                    width: units.gu(7)
+                    height: units.gu(7)
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    MouseArea{
+                        anchors.fill: parent
+                        onClicked: PopupUtils.open(colors)
+                    }
+                    image: Image {
+                        source: Qt.resolvedUrl("../graphics/palette.png")
+                        fillMode: Image.PreserveAspectCrop
+                    }
+                }
+
+                FineTuneChooser{
+                    id: popoverComponent
+                }
+
+                UbuntuIconButton {
+                        id: popoverButton
+                        UbuntuShape{
+                            anchors.fill: parent
+                            image: Image {
+                                source: Qt.resolvedUrl("../graphics/finetune.png")
+                                fillMode: Image.PreserveAspectCrop
+                            }
+
+
+                        }
+
+                        onClicked: PopupUtils.open(popoverComponent, popoverButton)
+                    }
+
+
+                /*
+                UbuntuIconButton{
+                    id: back
+                    state: "off"
+                    property bool fake: false
+                    property variant rememberSelection: ["off","off","off","off"]
+                    onClicked:{
+                        console.log("back clicked")
+                        rememberSelection[0] = pencil.state
+                        rememberSelection[1] = brush.state
+                        rememberSelection[2] = finger.state
+                        rememberSelection[3] = rubber.state
+                        toolBox.selection.call()
+                        var myArray = new Array
+                        myArray = canvas.dataBackup
+                        console.log(myArray[canvas.index])
+                        canvas.imageBackup = canvas.loadImage(myArray[canvas.index])
+                        back.state = "on"
+
+
+                    }
+
+                    onStateChanged: {
+                        if (back.state=="on"){
+                            canvas.requestPaint()
+                            console.log("Reverting image..")
+
+                        }
+                        else{
+                            pencil.state = rememberSelection[0]
+                            brush.state = rememberSelection[1]
+                            finger.state = rememberSelection[2]
+                            rubber.state = rememberSelection[3]
+
+                        }
+                    }
+
+                    UbuntuShape{
+                        anchors.fill: parent
+                        image: Image {
+                            source: "../graphics/[e-mail]"
+                            fillMode: Image.PreserveAspectCrop
+                        }
+                    }
+
+
+
+                    states: [
+                        State {
+                            name: "on"
+                            PropertyChanges {
+                                target: canvas
+                                onPaint: {
+                                    var ctx = canvas.getContext('2d')
+                                    var myArray = new Array
+                                    myArray = canvas.dataBackup
+                                    ctx.drawImage(myArray[canvas.index], 0, 0)
+                                    console.log("Image reverted")
+                                }
+                            }
+                            PropertyChanges {
+                                target: back
+                                fake: true
+
+                            }
+
+                        },
+                        State {
+                            name: "off"
+                            PropertyChanges {
+                                target: back
+                                fake: false
+
+                            }
+
+                            }
+
+
+                    ]
+
+                }*/
+
+
+            }
+
+        }
+
+        //This must be the last element
+        tools: DrawTabTools {
+            objectName: "DrawTabTools"
+        }
+        
+    }
+    // End of Page
+}
+//End of Tab

=== added file 'ui/DrawTabTools.qml'
--- ui/DrawTabTools.qml	1970-01-01 00:00:00 +0000
+++ ui/DrawTabTools.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,142 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Qt.labs.folderlistmodel 1.0
+
+ToolbarItems {
+    ToolbarButton {
+        iconSource: Qt.resolvedUrl("../graphics/toolbarSaveIcon.png")
+        text: i18n.tr("Save")
+        
+        onTriggered: {
+            if (1){
+                PopupUtils.open(saveDialogComponent, null)
+            }
+        }
+    }
+
+    ToolbarButton {
+        iconSource: Qt.resolvedUrl("../graphics/toolbarImageDeleteIcon.png")
+        text: i18n.tr("Delete")
+
+        onTriggered: {
+            if (1){
+                PopupUtils.open(clearDialogComponent, null)
+            }
+        }
+    }
+
+    Component {
+        id: saveDialogComponent
+        Dialog {
+            id: saveDialog
+            title: "Save your draw!"
+            text: "How do you want to call your picture?"
+
+
+            Column{
+
+
+                /*FolderListModel {
+                        id: progModel
+                        folder: "../pictures"
+                        //nameFilters: ["*.png"]
+                    }
+    */
+                UbuntuShape{
+                    width: parent.width
+                    height: units.gu(20)
+                    color: "white"
+
+                    FolderListModel{
+                        id: fileModel
+                        folder: "../pictures"
+                        nameFilters: ["*.png","*.jpg","*.jpeg"]
+
+                    }
+
+                        Component {
+                            id: fileDelegate
+                            Text{
+                                text: fileName
+                                MouseArea{
+                                    anchors.fill: parent
+                                    onClicked: {
+                                        imageName.text = text
+                                    }
+                                }
+                            }
+                        }
+
+                        ListView {
+                            anchors.fill: parent
+                                id: listFiles
+                                model: fileModel
+                                delegate: fileDelegate
+                            }
+                }
+
+            }
+
+
+
+            TextField{
+                id: imageName
+                text: "mycanvas.png"
+
+            }
+
+            Button {
+                text: "Cancel"
+                gradient: UbuntuColors.greyGradient
+                onClicked: PopupUtils.close(saveDialog)
+            }
+            Button {
+                text: "Save"
+
+                onClicked: {
+                    PopupUtils.close(saveDialog)
+                    var extension = ""
+                    if ((imageName.text.search(".png")==-1)||(imageName.text.search(".jpg")==-1)(imageName.text.search(".jpeg")==-1)) {
+                        extension = ".png"
+                    }
+
+                    if (canvas.save("../pictures/" + imageName.text + extension)){
+                        console.log("Canvas saved as "  + imageName.text + extension)
+                    }
+                }
+
+            }
+        }
+    }
+
+    Component {
+        id: clearDialogComponent
+        Dialog {
+            id: clearDialog
+            title: "Delete canvas"
+            text: "Are you sure that you want to delete your canvas?"
+
+            Button {
+                text: "Cancel"
+                gradient: UbuntuColors.greyGradient
+                onClicked: PopupUtils.close(clearDialog)
+            }
+            Button {
+                text: "Clear"
+                onClicked: {
+                    PopupUtils.close(clearDialog)
+                    toolBox.selection.call()
+                    pencil.state = "delete"
+                    canvas.requestPaint()
+
+                }
+
+            }
+        }
+
+    }
+
+}
+
+

=== added file 'ui/NoteTab.qml'
--- ui/NoteTab.qml	1970-01-01 00:00:00 +0000
+++ ui/NoteTab.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 100
+    height: 62
+}

=== added file 'ui/TestingTab.qml'
--- ui/TestingTab.qml	1970-01-01 00:00:00 +0000
+++ ui/TestingTab.qml	2013-09-15 23:59:30 +0000
@@ -0,0 +1,38 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Qt.labs.folderlistmodel 1.0
+
+Tab{
+    title: "Test"
+
+    page: Page{
+
+        Item{
+            width:200
+            height:250
+
+            FolderListModel{
+                id: fileModel
+                folder: "../pictures"
+                nameFilters: ["*.png","*.jpg","*.jpeg"]
+
+            }
+
+                Component {
+                    id: fileDelegate
+                    Text{
+                        text: fileName
+                    }
+                }
+
+                ListView {
+                    anchors.fill: parent
+                        id: listFiles
+                        model: fileModel
+                        delegate: fileDelegate
+                    }
+        }
+
+    }
+
+}