Merge lp:~mzanetti/unity/phablet-folding-launcher into lp:unity/phablet

[Michael Zanetti]

refactored launcher
- moved dummy data one level towards real implementation
- throw away all unused demo experiments from the launcher
- add folding effect
- preliminary (and disabled) drag'n'drop feature for icons

Ugly dummy data will of course be removed again when switching to real API.

preliminary drag and drop support in there is disabled as its not really working anyways. This will be fixed/completed in next steps.

This also fixes a signal in the DirectionalDragArea. As dragging is defined by (undecided || recognized) a switch to rejected should signal the ending of the drag.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:629
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1070/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1076
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/945/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/949/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1070/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:630
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1073/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/948
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/948/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/952
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1751

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1073/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:632
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1094/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/969
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/969/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/973
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1775

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1094/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:635
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1100/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/975
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/975/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/979
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1787

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1100/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:636
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1103/
Executed test runs:
    ABORTED: http://s-jenkins:8080/job/unity-phablet-qmluitests/1116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/978
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/978/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/982
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1793

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1103/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:636
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1110/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/985
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/985/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/989
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1810

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1110/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:637
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1111/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/986
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/986/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/990
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1812

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1111/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:637
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1112/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/987
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/987/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/991
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1813

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1112/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

My 2¢ here:
* feels like the long-drag-launcher-to-dash-apps has an unnecessary delay (behavior?) between the finger and the app edge
* when (un)folding, the icons change in distance from the adjacent, unfolded icon - that's not necessarily bad, just noting to make sure that's ok with design

review: Needs Information

[Daniel d'Andrada (dandrader)]

Good refactoring and clean up. Looks way better now!

=====================================================

Icons are not getting highlighted when pressed. The only way I could get an icon highlighted was by long-pressing it.

=====================================================

The branch alone works fine, but if I merge it with latest trunk it get the following wrong behavior:
I have an application on foreground. Right from the beginning of a left-edge drag the application window slides rightwards instead of only after the launcher is fully revealed.

======================================================

+ MouseArea {
+ id: closeMouseArea
+ enabled: root.state == "visible"
+ anchors.fill: panel
+ anchors.rightMargin: -units.gu(2)
+ drag {
+ axis: Drag.XAxis
+ maximumX: 0
+ target: panel
+ }
+
+ onReleased: {
+ if (panel.x < -panel.width/3) {
+ root.switchToNextState("")
+ } else {
+ root.switchToNextState("visible")
             }
         }
- }

- function hide() {
- launcher.state = ""
+ }
+ MouseArea {
+ anchors {
+ left: closeMouseArea.right
+ top: parent.top
+ right: parent.right
+ bottom: parent.bottom
+ }
+ enabled: root.state == "visible"
+ onPressed: {
+ root.state = ""
+ }
     }

I think second MouseArea should be the one named "closeMouseArea" (as it closes the launcher when clicked), not the first one.

============================================================

+ if (distance > root.width / 2){

Coding style: spacing between ')' and '{'

============================================================

- default: // Rejected
+ case Rejected:
+ Q_EMIT draggingChanged(false);
+ break;
+ default:
             // no-op
             break;

Since the default case now deals specifically with invalid states, we could make it issue a qFatal().

============================================================

You can remove this line from Launcher.qml:

import "../Applications/applications.js" as ApplicationsModel

And this one from tst_Launcher.qml:

import "../../../Applications/applications.js" as ApplicationsModel

============================================================

In Shell.qml:

"""
+ InputFilterArea {
+ blockInput: launcher.shown
+ anchors {
+ top: parent.top
+ bottom: parent.bottom
+ left: parent.left
+ }
+ width: launcher.shown ? launcher.width : launcher.panelWidth
+ }

"""

Why not make width just:

+ width: launcher.width

Afterall it only works when launcher.shown is true anyway.

============================================================

tst_Launcher fails to run due to missing symbols, related to "import Unity 0.1".

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> My 2¢ here:
> * feels like the long-drag-launcher-to-dash-apps has an unnecessary delay
> (behavior?) between the finger and the app edge

Hmm... might be this:
Behavior on x {SmoothedAnimation{velocity: 600}}

However, I did not touch this and the current launcher has the same. If it would be just some NumberAnimation I would disable it while dragging, but as it is a SmoothedAnimation with some velocity it seems kinda intentional. I'll have a chat with Vesa about it.

> * when (un)folding, the icons change in distance from the adjacent, unfolded
> icon - that's not necessarily bad, just noting to make sure that's ok with
> design

Hmm... this seems to be pretty much the same distance as it is on the desktop. However, next steps in the design work is to figure how many folded items should be visible. Depending on how the others will fade out, this most likely will still change by design.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:639
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1132/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1007
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1007/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1011
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1830

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1132/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

> Icons are not getting highlighted when pressed. The only way I could get an
> icon highlighted was by long-pressing it.

fixed.

> =====================================================
>
> The branch alone works fine, but if I merge it with latest trunk it get the
> following wrong behavior:
> I have an application on foreground. Right from the beginning of a left-edge
> drag the application window slides rightwards instead of only after the
> launcher is fully revealed.

Hmm... Can't reproduce. After merging it still seems to be the same for me.

> ======================================================
>
> + MouseArea {
> + id: closeMouseArea
> + enabled: root.state == "visible"
> + anchors.fill: panel
> + anchors.rightMargin: -units.gu(2)
> + drag {
> + axis: Drag.XAxis
> + maximumX: 0
> + target: panel
> + }
> +
> + onReleased: {
> + if (panel.x < -panel.width/3) {
> + root.switchToNextState("")
> + } else {
> + root.switchToNextState("visible")
> }
> }
> - }
>
> - function hide() {
> - launcher.state = ""
> + }
> + MouseArea {
> + anchors {
> + left: closeMouseArea.right
> + top: parent.top
> + right: parent.right
> + bottom: parent.bottom
> + }
> + enabled: root.state == "visible"
> + onPressed: {
> + root.state = ""
> + }
> }
>
> I think second MouseArea should be the one named "closeMouseArea" (as it
> closes the launcher when clicked), not the first one.

Fixed.

> ============================================================
>
> + if (distance > root.width / 2){
>
> Coding style: spacing between ')' and '{'

Fixed.

> ============================================================
>
> - default: // Rejected
> + case Rejected:
> + Q_EMIT draggingChanged(false);
> + break;
> + default:
> // no-op
> break;
>
> Since the default case now deals specifically with invalid states, we could
> make it issue a qFatal().

How I read it, the default case is still valid for the Recognized state.

> ============================================================
>
> You can remove this line from Launcher.qml:
>
> import "../Applications/applications.js" as ApplicationsModel
>
> And this one from tst_Launcher.qml:
>
> import "../../../Applications/applications.js" as ApplicationsModel

fixed.

> ============================================================
>
> In Shell.qml:
>
> """
> + InputFilterArea {
> + blockInput: launcher.shown
> + anchors {
> + top: parent.top
> + bottom: parent.bottom
> + left: parent.left
> + }
> + width: launcher.shown ? launcher.width : launcher.panelWidth
> + }
>
> """
>
> Why not make width just:
>
> + width: launcher.width
>
> Afterall it only works when launcher.shown is true anyway.

Fixed.

> ==================================================...

[Daniel d'Andrada (dandrader)]

> >
> > The branch alone works fine, but if I merge it with latest trunk it get the
> > following wrong behavior:
> > I have an application on foreground. Right from the beginning of a left-edge
> > drag the application window slides rightwards instead of only after the
> > launcher is fully revealed.
>
> Hmm... Can't reproduce. After merging it still seems to be the same for me.

Well, it's also working fine for me now. Let's forget about it then. :)

> >
> > - default: // Rejected
> > + case Rejected:
> > + Q_EMIT draggingChanged(false);
> > + break;
> > + default:
> > // no-op
> > break;
> >
> > Since the default case now deals specifically with invalid states, we could
> > make it issue a qFatal().
>
> How I read it, the default case is still valid for the Recognized state.

Right!

[Daniel d'Andrada (dandrader)]

One last detail I just spotted:

plugins/Unity/launchermodel.cpp:56:5: warning: unused parameter ‘parent’ [-Wunused-parameter]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:643
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1133/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1008
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1008/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1012
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1831

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1133/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

> plugins/Unity/launchermodel.cpp:56:5: warning: unused parameter ‘parent’
> [-Wunused-parameter]

fixed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:645
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1135/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1161
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1838

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1135/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:646
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1141/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1846

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1141/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

All good.

Do you think it makes sense to fix those warnings that are output when tst_Launcher.qml is run?

review: Approve

[Michael Zanetti (mzanetti)]

> Do you think it makes sense to fix those warnings that are output when
> tst_Launcher.qml is run?

Done.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:647
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1142/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1849

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1142/rebuild

review: Approve (continuous-integration)

=== modified file 'Launcher/Launcher.qml'
--- Launcher/Launcher.qml	2013-05-27 15:12:07 +0000
+++ Launcher/Launcher.qml	2013-06-04 12:32:22 +0000
@@ -18,401 +18,225 @@
 import "../Components"
 import Ubuntu.Components 0.1
 import Ubuntu.Gestures 0.1
-import "../Applications/applications.js" as ApplicationsModel
+import Unity 0.1
 
 Item {
-    id: launcher
-
-    property var favourites: ["/usr/share/applications/phone-app.desktop",
-                              "/usr/share/applications/camera-app.desktop",
-                              "/usr/share/applications/gallery-app.desktop",
-                              "/usr/share/applications/facebook-webapp.desktop",
-                              "/usr/share/applications/webbrowser-app.desktop",
-                              "/usr/share/applications/twitter-webapp.desktop",
-                              "/usr/share/applications/gmail-webapp.desktop",
-                              "/usr/share/applications/ubuntu-weather-app.desktop",
-                              "/usr/share/applications/notes-app.desktop",
-                              "/usr/share/applications/ubuntu-calendar-app.desktop"]
-    property ListModel model: ListModel {}
-    property ListModel applicationsRunning: ListModel {}
-    property int lastFavouriteIndex: -1
+    id: root
 
     property bool available: true // can be used to disable all interactions
-    property bool applicationFocused: false
-
-    property bool shown: launcher.state != ""
-    property int progress
-    progress: {
-        if (launcher.state == "spreadMoving")
-            return dragArea.distance
-        else if (launcher.state == "spread")
-            return launcher.width
-        else
-            return 0
-    }
-
-    // Thresholds and dimensions
-    property int shortcutsHintWidth: units.gu(3)
-    property int shortcutsWidth: units.gu(6)
-    property int shortcutsThreshold: units.dp(2)
-    property int shortcutsCloseThreshold: units.gu(1)
-    property int spreadHintThreshold: shortcutsWidth
-    property int spreadOutThreshold: units.gu(18)
-
-    // For how long (in milliseconds) the launcher will stay up without being
-    // interacted with, before it finally hides itself.
-    property int inactivityTimeout: 8000
-
-    property string iconPath: "."
-
-    property int launcherProgressValue
-    launcherProgressValue: {
-        if (launcher.state == ""
-                || launcher.state == "hint"
-                || launcher.state == "moving"
-                || launcher.state == "shortcuts") {
-            return 0
-        } else if (launcher.state == "spreadHint") {
-            return units.gu(17)
-        } else if (launcher.state == "spreadMoving") {
-            return units.gu(22)
-        } else if (launcher.state == "spread") {
-            return units.gu(28)
-        }
-    }
 
     property bool teasing: false
-
-    signal launcherApplicationSelected(string name)
-    signal dashItemSelected(int itemIndex)
-
+    property int panelWidth: units.gu(8.5)
+    property int dragAreaWidth: units.gu(1)
+    property real progress: dragArea.dragging  && dragArea.touchX > panel.width ? dragArea.touchX : 0
+
+    readonly property bool shown: panel.x > -panel.width
+
+    // emitted when an application is selected
+    signal launcherApplicationSelected(string desktopFile)
+
+    // emitted when the apps dash should be shown because of a swipe gesture
     signal dash()
 
+    // emitted when the dash icon in the launcher has been tapped
+    signal dashItemSelected()
+
+    onStateChanged: {
+        if (state == "") {
+            dismissTimer.stop()
+        } else {
+            dismissTimer.restart()
+        }
+    }
+
+    function hide() {
+        state = ""
+    }
+
+    function switchToNextState(state) {
+        animateTimer.nextState = state
+        animateTimer.start();
+    }
+
     onTeasingChanged: {
         if (teasing) {
-            hintTimer.restart();
+            teaseTimer.start();
         }
     }
 
     Timer {
-        id: hintTimer
+        id: teaseTimer
         interval: 200
     }
 
-    // internal properties hidden from public api
-    QtObject {
-        id: priv
-
-        property bool shortcutAnimationOngoing
-        property string previousStateHelp
-        property string previousState: ""
-        property string teasing: launcher.teasing || hintTimer.running
-    }
-
-    onStateChanged: {
-        priv.previousState = priv.previousStateHelp
-        priv.previousStateHelp = state
-        if (launcher.state != "shorcuts") {
-            dismissTimer.stop()
-        }
-
-        if (launcher.state == "spread") {
-            dragArea.visible = false
-            hideTimer.restart()
-            dragArea.visible = true
-        }
-        //console.log("Launcher state: " + state)
-    }
-
-    Component.onCompleted: {
-        __populateWithFavouriteApplications();
-    }
-
-    function __populateWithFavouriteApplications() {
-        for (var i=0; i<launcher.favourites.length; i++) {
-            var desktopFile = launcher.favourites[i];
-            var application = ApplicationsModel.__availableApplications[desktopFile];
-            if (application) {
-                application["desktopFile"] = desktopFile;
-                launcher.model.append(application);
-            }
-        }
-    }
-
-    function hide() {
-        launcher.state = ""
+    Timer {
+        id: dismissTimer
+        interval: 5000
+        onTriggered: {
+            if (!panel.moving) {
+                root.state = ""
+            } else {
+                dismissTimer.restart()
+            }
+        }
+    }
+
+    // Because the animation on x is disabled while dragging
+    // switching state directly in the drag handlers would not animate
+    // the completion of the hide/reveal gesture. Lets update the state
+    // machine and switch to the final state in the next event loop run
+    Timer {
+        id: animateTimer
+        interval: 1
+        property string nextState: ""
+        onTriggered: {
+            // switching to an intermediate state here to make sure all the
+            // values are restored, even if we were already in the target state
+            root.state = "tmp"
+            root.state = nextState
+        }
+    }
+
+    LauncherModel {
+        id: launcherModel
+    }
+
+    MouseArea {
+        id: launcherDragArea
+        enabled: root.state == "visible"
+        anchors.fill: panel
+        anchors.rightMargin: -units.gu(2)
+        drag {
+            axis: Drag.XAxis
+            maximumX: 0
+            target: panel
+        }
+
+        onReleased: {
+            if (panel.x < -panel.width/3) {
+                root.switchToNextState("")
+            } else {
+                root.switchToNextState("visible")
+            }
+        }
+
+    }
+    MouseArea {
+        id: closeMouseArea
+        anchors {
+            left: launcherDragArea.right
+            top: parent.top
+            right: parent.right
+            bottom: parent.bottom
+        }
+        enabled: root.state == "visible"
+        onPressed: {
+            root.state = ""
+        }
     }
 
     Rectangle {
         id: backgroundShade
         anchors.fill: parent
         color: "black"
-        opacity: {
-            if (launcher.state == "" || launcher.state == "hint" || launcher.state == "moving") {
-                return 0
-            } else return 0.4
-        }
-        visible: opacity != 0
+        opacity: root.state == "visible" ? 0.4 : 0
 
         Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuad} }
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                launcher.state = ""
-            }
-            visible: launcher.state != "spread"
-        }
     }
 
-    LauncherShortcuts {
-        id: shortcuts
-        objectName: "shortcuts"
-        width: shortcutsWidth
+    LauncherPanel {
+        id: panel
+        objectName: "launcherPanel"
+        width: root.panelWidth
         anchors {
             top: parent.top
             bottom: parent.bottom
         }
         x: -width
-        model: launcher.model
+        model: launcherModel
+
+        property bool animate: true
+
         onApplicationSelected: {
-            launcher.state = ""
+            root.state = ""
             launcherApplicationSelected(desktopFile)
         }
         onDashItemSelected: {
-            launcher.state = ""
-            launcher.dashItemSelected(index)
-        }
-        iconPath: launcher.iconPath
-
-        Behavior on x { NumberAnimation {duration: launcher.state == "hint" ? 70 : launcher.state == "moving" ? 0 : 300; easing.type: Easing.OutCubic } }
+            root.state = ""
+            root.dashItemSelected(index)
+        }
+
+        onMovingChanged: {
+            if (dismissTimer.running) {
+                dismissTimer.restart();
+            }
+        }
+
+        Behavior on x {
+            NumberAnimation {
+                // Disabling animation when dragging
+                duration: dragArea.dragging || launcherDragArea.drag.active ?  0 : 300;
+                easing.type: Easing.OutCubic
+            }
+        }
     }
 
     DirectionalDragArea {
         id: dragArea
-        enabled: launcher.state != "shortcuts" || dragging
 
         direction: DirectionalDragArea.Rightwards
 
         // values to be tweaked and later removed from here and set in stone as defaults
         // once we are confident it's all good.
         maxDeviation: units.gu(1.5)
-        wideningAngle: 10
+        wideningAngle: 30
         distanceThreshold: units.gu(4)
 
-        visible: launcher.available
-        width: {
-            if (launcher.state == "") {
-                return shortcutsThreshold
-            } else {
-                return shortcutsWidth
+        enabled: root.available && root.state !== "visible"
+        width: root.dragAreaWidth
+        height: root.height
+
+        onTouchXChanged: {
+            if (dragging) {
+                panel.x = Math.min(0, touchX - panel.width);
             }
         }
-        height: launcher.height
 
         onDraggingChanged: {
-            if (dragging)
-                onDragStarted()
-            else
-                onDragEnded()
-        }
-
-        function onDragStarted() {
-            if (launcher.state == "") launcher.state = "hint"
-            dismissTimer.stop()
-        }
-
-        onDistanceChanged: {
-            if (launcher.state == "shortcuts" && distance < shortcutsCloseThreshold) {
-                launcher.state = ""
-            } else if (launcher.state == "hint" && distance > 0 ) {
-                launcher.state = "moving"
-            } else if (distance > shortcutsThreshold && distance < spreadHintThreshold) {
-                launcher.state = "shortcuts"
-            } else if (distance >= spreadHintThreshold && distance < shortcutsWidth) {
-                if (launcher.applicationFocused){
-                    launcher.state = "spreadHint"
-                }
-            } else if (distance >= shortcutsWidth && distance < spreadOutThreshold) {
-                if (launcher.applicationFocused) {
-                    launcher.state = "spreadMoving"
+            if (!dragging) {
+                if (distance > root.width / 2) {
+                    root.dash()
+                    root.switchToNextState("")
+                } else if (distance > panel.width/2) {
+                    root.switchToNextState("visible")
                 } else {
-                    dismissTimer.restart()
-                }
-            } else if (distance >= spreadOutThreshold && launcher.applicationFocused) {
-                launcher.state = "spread"
-            }
-        }
-
-        function onDragEnded() {
-            var currentApplicationIndex
-            if (launcher.state == "shortcuts" && !priv.shortcutAnimationOngoing) {
-                // launch app
-                currentApplicationIndex = shortcuts.selectCurrentApplication()
-                if (currentApplicationIndex === 0) {
-                    launcher.dashItemSelected(0)
-                    launcher.state = ""
-                } else if (currentApplicationIndex === -1) {
-                    launcher.state = "shortcuts"
-                }
-            }
-
-            if (launcher.state == "hint" || launcher.state == "moving") {
-                launcher.state = ""
-            } else if (launcher.state == "spreadMoving" || launcher.state == "spreadHint") {
-                launcher.state = "shortcuts"
-            }
-
-            shortcuts.stopScroll()
-
-            if (launcher.state == "shortcuts") {
-                dismissTimer.restart()
-            }
-
-        }
-    }
-
-    Timer {
-        id: dismissTimer
-        interval: launcher.inactivityTimeout;
-        running: false;
-        repeat: false
-        onTriggered: {
-            launcher.state = ""
-        }
-    }
-
-    Timer {
-        id: hideTimer
-        interval: 50;
-        running: false;
-        repeat: false
-        onTriggered: {
-            launcher.state = ""
+                    root.switchToNextState("")
+                }
+            }
         }
     }
 
     states: [
         State {
-            name: "hint"
-            when: priv.teasing
-            PropertyChanges {
-                target: shortcuts
-                x: -shortcuts.width + launcher.shortcutsHintWidth
-            }
-        },
-        State {
-            name: "moving"
-            PropertyChanges {
-                target: shortcuts
-                x: -shortcuts.width + dragArea.distance + launcher.shortcutsHintWidth
-            }
-        },
-        State {
-            name: "shortcuts"
-            PropertyChanges {
-                target: shortcuts
-                x: 0
-            }
-        },
-        State {
-            name: "spreadHint"
-            extend: "shortcuts"
-        },
-        State {
-            name: "spreadMoving"
-            PropertyChanges {
-                target: launcher
-                launcherProgressValue: dragArea.distance
-            }
-            PropertyChanges {
-                target: shortcuts
-                x: 0
-            }
-        },
-        State {
-            name: "spread"
-            extend: "shortcuts"
-        }
-
-    ]
-
-    transitions: [
-        Transition {
-            to: ""
-            SequentialAnimation {
-                PropertyAnimation {
-                    target: shortcuts
-                    properties: "x"
-                    duration: 400
-                    easing.type: Easing.OutCubic
-                }
-                ScriptAction {
-                    script: {
-                        shortcuts.resetScrollPosition()
-                    }
-                }
-            }
-        },
-        Transition {
-            to: "hint"
-            PropertyAnimation {
-                target: shortcuts
-                properties: "x"
-                duration: 400
-                easing.type: Easing.OutCubic
-            }
-        },
-        Transition {
-            to: "shortcuts"
-            SequentialAnimation {
-                ScriptAction {
-                    script: {
-                        if (priv.previousState == "moving") {
-                            priv.shortcutAnimationOngoing = true
-                        }
-                    }
-                }
-                ParallelAnimation {
-                    SequentialAnimation {
-                        PropertyAnimation {
-                            target: shortcuts
-                            properties: "x"
-                            duration: 300
-                            easing.type: Easing.OutCubic
-                        }
-                        ScriptAction {
-                            script: {
-                                priv.shortcutAnimationOngoing = false
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        Transition {
-            to: "spreadHint"
-            PropertyAnimation {
-                target: shortcuts
-                properties: "x"
-                duration: 300
-                easing.type: Easing.OutCubic
-            }
-        },
-        Transition {
-            to: "spreadMoving"
-            ScriptAction {
-                script: {
-                    priv.shortcutAnimationOngoing = false
-                }
-            }
-        },
-        Transition {
-            to: "spread"
-            ScriptAction {
-                script: {
-                    launcher.dash()
-                }
+            name: "" // hidden state. Must be the default state ("") because "when:" falls back to this.
+            PropertyChanges {
+                target: panel
+                x: -root.panelWidth
+            }
+        },
+        State {
+            name: "visible"
+            PropertyChanges {
+                target: panel
+                x: 0
+            }
+        },
+        State {
+            name: "teasing"
+            when: root.teasing || teaseTimer.running
+            PropertyChanges {
+                target: panel
+                x: -root.panelWidth + units.gu(2)
             }
         }
     ]

=== added file 'Launcher/LauncherDelegate.qml'
--- Launcher/LauncherDelegate.qml	1970-01-01 00:00:00 +0000
+++ Launcher/LauncherDelegate.qml	2013-06-04 12:32:22 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    id: root
+
+    property string iconName
+
+    property real angle: 0
+    property bool highlighted: false
+    property real offset: 0
+
+    property real maxAngle: 0
+    property bool inverted: false
+
+    readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * height
+    readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * height
+
+    property int itemsBeforeThis: 0
+    property int itemsAfterThis: 0
+
+    property bool dragging:false
+
+    signal clicked()
+    signal longtap()
+    signal released()
+
+    UbuntuShape {
+        id: iconItem
+        color: Qt.rgba(0, 0, 1, 0.5)
+        width: parent.width
+        height: parent.height
+        anchors.centerIn: parent
+        anchors.verticalCenterOffset: root.offset  + (height - root.effectiveHeight)/2 * (angle < 0 ? -1 : 1)
+        rotation: root.inverted ? 180 : 0
+        radius: "medium"
+
+        transform: Rotation {
+            axis { x: 1; y: 0; z: 0 }
+            origin { x: iconItem.width / 2; y: iconItem.height / 2; z: 0 }
+            angle: root.angle
+        }
+
+        image: Image {
+            source: "../graphics/applicationIcons/" + root.iconName + ".png"
+        }
+
+        MouseArea {
+            id: mouseArea
+            anchors.fill: parent
+            onClicked: root.clicked()
+            onCanceled: root.released()
+            preventStealing: false
+
+            onPressAndHold: {
+                root.state = "moving"
+            }
+            onReleased: {
+                root.state = "docked"
+            }
+        }
+
+        BorderImage {
+            id: overlayHighlight
+            anchors.centerIn: iconItem
+            rotation: inverted ? 180 : 0
+            source: root.highlighted || mouseArea.pressed ? "graphics/selected.sci" : "graphics/non-selected.sci"
+            width: iconItem.width + units.gu(1.5)
+            height: width
+        }
+    }
+
+    states: [
+        State {
+            name: "docked"
+            PropertyChanges {
+                target: root
+                offset: if (launcherFlickable.contentY > itemsBeforeThis * (foldedHeight + launcherColumn.spacing*2)) {
+                            return launcherFlickable.contentY - (index * (foldedHeight + launcherColumn.spacing*2));
+                        } else if (y + height - launcherFlickable.contentY > launcherFlickable.height - (itemsAfterThis*(foldedHeight - launcherColumn.spacing))) {
+                            return launcherFlickable.height - (y+height) + launcherFlickable.contentY - (itemsAfterThis*(foldedHeight - launcherColumn.spacing));
+                        } else {
+                            return 0;
+                        }
+                angle: -Math.min(Math.max(offset * maxAngle / foldedHeight, -maxAngle), maxAngle)
+
+            }
+        },
+
+        State {
+            name: "moving"
+            PropertyChanges {
+                target: launcherDelegate;
+                offset: 0
+                angle: 0
+            }
+            PropertyChanges {
+                target: root
+                highlighted: true
+                dragging: true
+            }
+            PropertyChanges {
+                target: mouseArea
+                preventStealing: true
+                drag.target: root
+            }
+        }
+
+    ]
+
+}

=== renamed file 'Launcher/LauncherShortcuts.qml' => 'Launcher/LauncherPanel.qml'
--- Launcher/LauncherShortcuts.qml	2013-05-27 15:13:11 +0000
+++ Launcher/LauncherPanel.qml	2013-06-04 12:32:22 +0000
@@ -16,301 +16,104 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Unity 0.1
 
 Item {
-    id: shortcuts
-
-    property ListModel model
-    property ListModel shortcutsModel: model
-    property ListModel openModel: ListModel{}
-    property ListModel semiFoldedModel: ListModel{}
-    property ListModel foldedModel: ListModel{}
-
-    property bool enabled: true
-    property string iconPath: "."
-
-    property bool animating: openShortcuts.animating || semiFoldedShortcut.animating || foldedShortcuts.animating // read only
-    property int currentIndex: -1
-
-    property int scrollValue: 0
-    property bool scrolling: scrollTimer.running
-
-    property int itemWidth: units.gu(9)
-    property int itemHeight: units.gu(7.5)
-    property int iconWidth: units.gu(7)
-    property int iconHeight: units.gu(6.5)
-
-    property int iconCount: shortcutsModel.count
-
-    property int foldedSize: itemWidth - foldedShortcuts.initialFoldedOffset
-
-    property int openItemsCount
-    property int foldedItemsCount: iconCount - openItemsCount
-    property int fillItemHeight: height - openItemsCount * itemHeight - foldedItemsCount * foldedSize
-    property bool open: false
+    id: root
+
+    rotation: inverted ? 180 : 0
+
+    property var model
     property bool inverted: true
-    property int labelPosition
-    labelPosition: {
-        if (!inverted) {
-            return currentIndex*shortcuts.itemHeight + shortcuts.itemHeight/2 + shortcutsContainer.targetY
-        } else {
-            return shortcuts.height - (currentIndex*shortcuts.itemHeight + shortcuts.itemHeight/2 + shortcutsContainer.targetY)
-        }
-    }
-
-    rotation: inverted ? 180 : 0
-
-    QtObject {
-        id: priv
-
-        property int modelCount: shortcuts.model ? shortcuts.model.count : 0
-    }
+    property bool dragging: false
+    property bool moving: launcherFlickable.moving
+    property int dragPosition: 0
+    property int highlightIndex: -1
 
     signal applicationSelected(string desktopFile)
     signal dashItemSelected(int index)
 
-    Component.onCompleted: init()
-
-    function resetScrollPosition() {
-        flickable.contentY = 0
-    }
-
-    function init() {
-        clearModels()
-        addDashIcon()
-        calculateOpenIcons()
-        createModels()
-    }
-
-    function clearModels() {
-        openModel.clear()
-        semiFoldedModel.clear()
-        foldedModel.clear()
-    }
-
-    function addDashIcon() {
-        shortcutsModel.insert(0, {"desktopFile": "dash.desktop",
-                                  "name": "Home",
-                                  "icon": "dash",
-                                  "exec": ""
-                                  });
-    }
-
-    function calculateOpenIcons() {
-        var foldedSize = (shortcuts.itemHeight - foldedShortcuts.initialFoldedOffset)
-        var maxopenItemsCount = Math.floor(shortcuts.height / shortcuts.itemHeight)
-        var leftOverIcons = shortcuts.iconCount - maxopenItemsCount
-        var leftOverSpace
-        if (leftOverIcons > 0) {
-            leftOverSpace = shortcuts.height - shortcuts.itemHeight * maxopenItemsCount
-            leftOverIcons = leftOverIcons - Math.floor(leftOverSpace / foldedSize)
-            while (leftOverIcons > 0) {
-                maxopenItemsCount--
-                leftOverIcons = shortcuts.iconCount - maxopenItemsCount
-                if (leftOverIcons > 0) {
-                    leftOverSpace = shortcuts.height - shortcuts.itemHeight * maxopenItemsCount
-                    leftOverIcons = leftOverIcons - Math.floor(leftOverSpace / foldedSize)
-                }
-            }
-        }
-        shortcuts.openItemsCount = Math.min(maxopenItemsCount, shortcuts.iconCount)
-        shortcuts.visible = true
-    }
-
-    function createModels() {
-        for (var i = 0; i < shortcutsModel.count; i++) {
-            if (i < shortcuts.openItemsCount) {
-                shortcuts.openModel.append(shortcutsModel.get(i))
-            } else if (i == shortcuts.openItemsCount) {
-                shortcuts.semiFoldedModel.append(shortcutsModel.get(i))
-            } else {
-                shortcuts.foldedModel.append(shortcutsModel.get(i))
-            }
-        }
-    }
-
-    function scroll() {
-        if (!scrolling && shortcutsContainer.height > shortcuts.height) {
-            var scrollingAtStart = shortcutsContainer.targetY == 0
-            var scrollingAtEnd = shortcutsContainer.targetY == shortcuts.height - shortcutsContainer.height
-            var scrollingInTheMiddle = shortcutsContainer.targetY > (shortcuts.height - shortcutsContainer.height) && shortcutsContainer.targetY < 0
-            var scrollValue = inverted ? -shortcuts.scrollValue : shortcuts.scrollValue
-
-            shortcutsContainer.animateY = false
-
-            if (scrollingInTheMiddle || (scrollingAtEnd && scrollValue > 0) || (scrollingAtStart && scrollValue < 0)) {
-                scrollTimer.start()
-            }
-        }
-    }
-
-    function stopScroll() {
-        scrollTimer.stop()
-        shortcutsContainer.animateY = true
-    }
-
-    function selectCurrentApplication() {
-        if (currentIndex < shortcuts.openItemsCount || foldedShortcuts.foldedAngle == 0) {
-            return currentIndex
-        } else {
-            return -1
-        }
+    onDragPositionChanged: {
+        var effectiveDragPosition = root.inverted ? launcherFlickable.height - dragPosition : dragPosition - mainColumn.anchors.margins
+
+        var hiddenContentHeight = launcherFlickable.contentHeight - launcherFlickable.height
+        // Shortening scrollable height because the first/last item needs to be fully expanded before reaching the top/bottom
+        var scrollableHeight = launcherFlickable.height - (launcherFlickable.itemSize + launcherColumn.spacing) *2
+        // As we shortened the scrollableHeight, lets move everything down by the itemSize
+        var shortenedEffectiveDragPosition = effectiveDragPosition - launcherFlickable.itemSize - launcherColumn.spacing
+        var newContentY = shortenedEffectiveDragPosition * hiddenContentHeight / scrollableHeight
+
+        // limit top/bottom to prevent overshooting
+        launcherFlickable.contentY = Math.min(hiddenContentHeight, Math.max(0, newContentY));
+
+        // Now calculate the current index:
+        // > the current mouse position + the hidden/scolled content on top is the mouse position in the averall view
+        // > adjust that removing all the margins
+        // > divide by itemSize to get index
+        highlightIndex = (effectiveDragPosition + launcherFlickable.contentY - mainColumn.anchors.margins*3 - launcherColumn.spacing/2) / (launcherFlickable.itemSize + launcherColumn.spacing)
     }
 
     BorderImage {
         id: background
         source: "graphics/launcher_bg.sci"
-        width: parent.width
-        x: 0
-        rotation: inverted ? 180 : 0
-        height: parent.height
+        anchors.fill: parent
     }
 
-    Component {
-        id: shortcutsItemDelegate
-        Item {
-            id: delegateItem
-            property int ownIndex: parent ? index + parent.initialIndex : -1
-            property bool isCurrentItem: ownIndex == shortcuts.currentIndex
-            property bool ribbonModeHighlight: itemMouseArea.pressed
-
-            z: -index
-            anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
-            width: shortcuts.itemWidth
-            height: shortcuts.itemHeight
-
-            Item {
-                width: shortcuts.iconWidth
-                height: shortcuts.iconHeight
-                anchors.centerIn: parent
-                transform: Rotation { origin.x: width/2; origin.y: height; axis { x: 1; y: 0; z: 0 } angle: parent ? parent.foldedAngle : 0 }
-                smooth: true
-                UbuntuShape {
-                    id: icon
-                    objectName: "delegate " + model.desktopFile
-                    anchors.centerIn: parent
-                    rotation: inverted ? 180 : 0
-                    width: shortcuts.iconWidth
-                    height: width * units.gu(7.5) / units.gu(8)
-                    radius: "medium"
-                    borderSource: ""
-                    image: Image {
-                        id: iconImage
-                        source:  '../' + shortcuts.iconPath + "/" + model.icon + '.png'
-                        sourceSize { width: icon.width; height: icon.height }
+    Column {
+        id: mainColumn
+        anchors.fill: parent
+        anchors.margins: units.gu(1)
+        spacing: units.gu(1)
+
+        LauncherDelegate {
+            id: dashItem
+            objectName: "dashItem"
+            width: launcherFlickable.itemSize
+            height: launcherFlickable.itemSize
+            anchors.horizontalCenter: parent.horizontalCenter
+            iconName: "dash"
+            onClicked: root.dashItemSelected(0)
+        }
+        Flickable {
+            id: launcherFlickable
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: parent.height - dashItem.height - parent.spacing
+            contentHeight: launcherColumn.height
+
+            property int itemSize: width
+
+            Column {
+                id: launcherColumn
+                width: parent.width
+                spacing: units.gu(1)
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                Repeater {
+                    id: iconRepeater
+                    model: root.model
+
+                    LauncherDelegate {
+                        id: launcherDelegate
+                        objectName: "launcherDelegate" + index
+                        width: launcherFlickable.itemSize
+                        height: launcherFlickable.itemSize
+                        iconName: model.icon
+                        inverted: root.inverted
+                        highlighted: root.dragging && index === root.highlightIndex
+                        z: -Math.abs(offset)
+                        state: "docked"
+
+                        maxAngle: 60
+
+                        itemsBeforeThis: index
+                        itemsAfterThis: iconRepeater.count - (index+1)
+
+                        onClicked: {
+                            root.applicationSelected(launcherModel.get(index).desktopFile);
+                        }
                     }
                 }
-
-                BorderImage {
-                    id: overlayHighlight
-                    anchors.centerIn: icon
-                    rotation: inverted ? 180 : 0
-                    source: isCurrentItem && (ribbonModeHighlight) ? "graphics/selected.sci" : "graphics/non-selected.sci"
-                    width: icon.width + units.gu(1.5)
-                    height: width * units.gu(7.5) / units.gu(8)
-                }
-            }
-            MouseArea {
-                id: itemMouseArea
-                anchors.fill: parent
-                onPressed: shortcuts.currentIndex = ownIndex
-                onClicked: {
-                    if (model.desktopFile === "dash.desktop") shortcuts.dashItemSelected(ownIndex)
-                    else shortcuts.applicationSelected(model.desktopFile)
-                }
-            }
-        }
-    }
-
-    Flickable {
-        id: flickable
-        width: parent.width
-        height: parent.height
-        contentWidth: width
-        contentHeight: shortcutsContainer.height
-        Item {
-            id: shortcutsContainer
-
-            property bool animateY: true
-            property real targetY
-
-            x: ( parent.width - background.width) / 2
-            y: targetY
-            width: shortcuts.width
-            height: openShortcuts.height + semiFoldedShortcut.height + foldedShortcuts.height
-
-            Behavior on y { NumberAnimation{duration: shortcutsContainer.animateY ? 200 : 0; } }
-
-            ShortcutsContainer {
-                id: openShortcuts
-                objectName: "openShortcuts"
-
-                width: shortcuts.width
-                height: childrenRect.height
-                z: 3
-                model: shortcuts.openModel
-                delegate: shortcutsItemDelegate
-                initialIndex: 0
-            }
-
-            ShortcutsContainer {
-                id: semiFoldedShortcut
-                objectName: "semiFoldedShortcut"
-
-                foldedAngle: 0 // FIXME: folding disabled // shortcuts.open ? 0 : 90 * (height - initialFoldedOffset)/height - 80 // todo: better algorithm here
-                initialFoldedOffset: -2 * shortcuts.itemHeight / 3 + shortcuts.fillItemHeight
-                foldedOffset: 0 // FIXME: folding disabled //shortcuts.open ? 0 : initialFoldedOffset
-                visible: shortcuts.iconCount > shortcuts.openItemsCount
-                width: shortcuts.itemWidth
-                height: childrenRect.height
-                anchors.top: openShortcuts.bottom
-                z: 2
-                anchors.horizontalCenter: parent.horizontalCenter
-                anchors.topMargin: foldedOffset
-                model: shortcuts.semiFoldedModel
-                delegate: shortcutsItemDelegate
-                initialIndex: shortcuts.openModel.count
-            }
-
-            ShortcutsContainer {
-                id: foldedShortcuts
-                objectName: "foldedShortcuts"
-
-                foldedAngle: 0 // FIXME: folding disabled //shortcuts.open ? 0 : 68
-                initialFoldedOffset: 2 * shortcuts.itemHeight / 3
-                foldedOffset: 0 // FIXME: folding disabled // shortcuts.open ? 0 : initialFoldedOffset
-                width: shortcuts.width
-                height: childrenRect.height
-                spacing: -foldedOffset
-                anchors.top: semiFoldedShortcut.bottom
-                anchors.topMargin: -foldedOffset
-                z: 1
-                model: shortcuts.foldedModel
-                delegate: shortcutsItemDelegate
-                initialIndex: shortcuts.openModel.count + shortcuts.semiFoldedModel.count
-            }
-        }
-    }
-
-    Timer {
-        id: scrollTimer
-
-        repeat: true
-        running: false
-        interval: 16
-        onTriggered:{
-            if (shortcutsContainer.height > shortcuts.height) {
-                var scrollValue = inverted ? -shortcuts.scrollValue : shortcuts.scrollValue
-                var newValue = shortcutsContainer.targetY + scrollValue
-
-                if (newValue > 0) {
-                    newValue = 0
-                    stop()
-                } else if (newValue < shortcuts.height - shortcutsContainer.height) {
-                    newValue = shortcuts.height - shortcutsContainer.height
-                    stop()
-                }
-                shortcutsContainer.targetY = newValue
             }
         }
     }

=== modified file 'Shell.qml'
--- Shell.qml	2013-06-03 08:29:01 +0000
+++ Shell.qml	2013-06-04 12:32:22 +0000
@@ -479,16 +479,23 @@
             enabled: !panel.indicators.shown
         }
 
+        InputFilterArea {
+            blockInput: launcher.shown
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                left: parent.left
+            }
+            width: launcher.width
+        }
+
         Launcher {
             id: launcher
 
             anchors.top: parent.top
             anchors.bottom: parent.bottom
             width: parent.width
-            applicationFocused: stages.shown
-            shortcutsWidth: units.gu(9)
-            shortcutsThreshold: shell.edgeSize
-            iconPath: "graphics/applicationIcons"
+            dragAreaWidth: shell.edgeSize
             available: !greeter.locked
             teasing: available && greeter.leftTeaserPressed
             onDashItemSelected: {
@@ -502,17 +509,12 @@
                 stages.hide();
             }
             onDash: {
-                greeter.hide()
+                dash.setCurrentLens("applications.lens", true, false)
                 stages.hide();
             }
             onLauncherApplicationSelected:{
                 greeter.hide()
-                shell.activateApplication(name)
-            }
-            onStateChanged: {
-                if (state == "spreadMoving") {
-                    dash.setCurrentLens("applications.lens", false, true)
-                }
+                shell.activateApplication(desktopFile)
             }
             onShownChanged: {
                 if (shown) {
@@ -521,16 +523,6 @@
                 }
             }
         }
-
-        InputFilterArea {
-            blockInput: launcher.shown
-            anchors {
-                top: parent.top
-                bottom: parent.bottom
-                left: parent.left
-            }
-            width: launcher.shortcutsWidth
-        }
     }
 
     focus: true

=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2013-05-20 11:12:09 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2013-06-04 12:32:22 +0000
@@ -243,17 +243,24 @@
     if (newStatus == m_status)
         return;
 
+    DirectionalDragArea::Status oldStatus = m_status;
+
     m_status = newStatus;
     Q_EMIT statusChanged(m_status);
 
     switch (newStatus) {
         case WaitingForTouch:
+            if (oldStatus != DirectionalDragArea::Rejected) {
+                Q_EMIT draggingChanged(false);
+            }
+            break;
+        case Undecided:
+            Q_EMIT draggingChanged(true);
+            break;
+        case Rejected:
             Q_EMIT draggingChanged(false);
             break;
-        case Undecided:
-            Q_EMIT draggingChanged(true);
-            break;
-        default: // Rejected
+        default:
             // no-op
             break;
     }

=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.h'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.h	2013-05-20 13:12:51 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.h	2013-06-04 12:32:22 +0000
@@ -47,8 +47,9 @@
     // The current status of the directional drag gesture area.
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 
-    // Whether a drag gesture is taking place (regardless of whether it's a correct
-    // single-finger directional drag or not)
+    // Whether a drag gesture is taking place
+    // This will be true as long as status is Undecided or Recognized
+    // When a gesture gets rejected, dragging turns to false.
     Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
 
     /////

=== modified file 'plugins/Unity/CMakeLists.txt'
--- plugins/Unity/CMakeLists.txt	2013-05-08 09:51:55 +0000
+++ plugins/Unity/CMakeLists.txt	2013-06-04 12:32:22 +0000
@@ -20,6 +20,7 @@
     peoplepreviewdata.cpp
     plugin.cpp
     bottombarvisibilitycommunicatorshell.cpp
+    launchermodel.cpp
     )
 
 add_library(Unity-qml MODULE

=== added file 'plugins/Unity/launchermodel.cpp'
--- plugins/Unity/launchermodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/launchermodel.cpp	2013-06-04 12:32:22 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Zanetti <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "launchermodel.h"
+
+LauncherModel::LauncherModel(QObject *parent): QAbstractListModel(parent)
+{
+    // FIXME: Dummy data... Aggregate real data from backends
+
+    // Fake favorites
+    LauncherItem *item = new LauncherItem("/usr/share/applications/phone-app.desktop", "Phone", "phone-app");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/camera-app.desktop", "Camera", "camera");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/gallery-app.desktop", "Gallery", "gallery");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/webbrowser-app.desktop", "Browser", "browser");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/notes-app.desktop", "Notepad", "notepad");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/ubuntu-calendar-app.desktop","Calendar", "calendar");
+    m_list.append(item);
+}
+
+LauncherModel::~LauncherModel()
+{
+    while (!m_list.empty()) {
+        m_list.takeFirst()->deleteLater();
+    }
+}
+
+int LauncherModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return m_list.count();
+}
+
+QVariant LauncherModel::data(const QModelIndex &index, int role) const
+{
+    LauncherItem *item = m_list.at(index.row());
+    switch(role) {
+    case RoleName:
+        return item->name();
+    case RoleIcon:
+        return item->icon();
+    case RoleFavorite:
+        return item->favorite();
+    }
+
+    return QVariant();
+}
+
+LauncherItem *LauncherModel::get(int index) const
+{
+    if (index < 0 || index >= m_list.count()) {
+        return 0;
+    }
+    return m_list.at(index);
+}
+
+void LauncherModel::move(int oldIndex, int newIndex)
+{
+    beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), newIndex);
+    m_list.move(oldIndex, newIndex);
+    endMoveRows();
+}
+
+QHash<int, QByteArray> LauncherModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles.insert(RoleDesktopFile, "desktopFile");
+    roles.insert(RoleName, "name");
+    roles.insert(RoleIcon, "icon");
+    roles.insert(RoleFavorite, "favorite");
+    roles.insert(RoleRunning, "runnng");
+    return roles;
+}
+
+
+LauncherItem::LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent):
+    QObject(parent),
+    m_desktopFile(desktopFile),
+    m_name(name),
+    m_icon(icon),
+    m_favorite(false)
+{
+
+}
+
+QString LauncherItem::desktopFile() const
+{
+    return m_desktopFile;
+}
+
+QString LauncherItem::name() const
+{
+    return m_name;
+}
+
+QString LauncherItem::icon() const
+{
+    return m_icon;
+}
+
+bool LauncherItem::favorite() const
+{
+    return m_favorite;
+}
+
+void LauncherItem::setFavorite(bool favorite)
+{
+    if (m_favorite != favorite) {
+        m_favorite = favorite;
+        Q_EMIT favoriteChanged(m_favorite);
+    }
+}
+
+bool LauncherItem::running() const
+{
+    return m_running;
+}
+
+void LauncherItem::setRunning(bool running)
+{
+    if (m_running != running) {
+        m_running = running;
+        Q_EMIT runningChanged(running);
+    }
+}

=== added file 'plugins/Unity/launchermodel.h'
--- plugins/Unity/launchermodel.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/launchermodel.h	2013-06-04 12:32:22 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Zanetti <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QAbstractListModel>
+
+class LauncherItem;
+
+class LauncherModel: public QAbstractListModel
+{
+   Q_OBJECT
+
+public:
+    enum Roles {
+        RoleDesktopFile = Qt::UserRole,
+        RoleName,
+        RoleIcon,
+        RoleFavorite,
+        RoleRunning
+    };
+
+    LauncherModel(QObject *parent = 0);
+    ~LauncherModel();
+
+    int rowCount(const QModelIndex &parent) const;
+
+    QVariant data(const QModelIndex &index, int role) const;
+
+    Q_INVOKABLE LauncherItem* get(int index) const;
+    Q_INVOKABLE void move(int oldIndex, int newIndex);
+
+    QHash<int, QByteArray> roleNames() const;
+
+private:
+    QList<LauncherItem*> m_list;
+};
+
+class LauncherItem: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
+    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(QString icon READ icon CONSTANT)
+    Q_PROPERTY(bool favorite READ favorite WRITE setFavorite NOTIFY favoriteChanged)
+    Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
+
+public:
+    LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent = 0);
+
+    QString desktopFile() const;
+
+    QString name() const;
+    QString icon() const;
+
+    bool favorite() const;
+    void setFavorite(bool favorite);
+
+    bool running() const;
+    void setRunning(bool running);
+
+Q_SIGNALS:
+    void favoriteChanged(bool favorite);
+    void runningChanged(bool running);
+
+private:
+    QString m_desktopFile;
+    QString m_name;
+    QString m_icon;
+    bool m_favorite;
+    bool m_running;
+};

=== modified file 'plugins/Unity/plugin.cpp'
--- plugins/Unity/plugin.cpp	2013-04-05 22:03:12 +0000
+++ plugins/Unity/plugin.cpp	2013-06-04 12:32:22 +0000
@@ -30,6 +30,7 @@
 #include "categoryfilter.h"
 #include "peoplepreviewdata.h"
 #include "bottombarvisibilitycommunicatorshell.h"
+#include "launchermodel.h"
 
 // libqtdee
 #include "deelistmodel.h"
@@ -49,6 +50,8 @@
     qmlRegisterType<PeoplePhoneData>(uri, 0, 1, "PeoplePhoneData");
     qmlRegisterType<PeopleAddressData>(uri, 0, 1, "PeopleAddressData");
     qmlRegisterType<PeopleIMData>(uri, 0, 1, "PeopleIMData");
+    qmlRegisterType<LauncherModel>(uri, 0, 1, "LauncherModel");
+    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
     qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");
 }
 

=== modified file 'tests/autopilot/qml_phone_shell/tests/helpers.py'
--- tests/autopilot/qml_phone_shell/tests/helpers.py	2013-05-30 20:17:20 +0000
+++ tests/autopilot/qml_phone_shell/tests/helpers.py	2013-06-04 12:32:22 +0000
@@ -154,7 +154,7 @@
         view = self.main_window.get_qml_view()
         start_x = view.x + 1
         start_y = view.y + view.height / 2
-        stop_x = start_x + launcher.shortcutsWidth + 1
+        stop_x = start_x + launcher.panelWidth + 1
         stop_y = start_y
         self.touch.drag(start_x, start_y, stop_x, stop_y)
         self.assertThat(launcher.shown, Eventually(Equals(True)))

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2013-05-20 13:12:51 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2013-06-04 12:32:22 +0000
@@ -162,8 +162,10 @@
     if (expectedGestureRecognition)
         QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Recognized);
 
-    if (edgeDragArea->status() == DirectionalDragArea::Rejected)
+    if (edgeDragArea->status() == DirectionalDragArea::Rejected) {
         QCOMPARE(edgeDragArea->dragging(), false);
+        QCOMPARE(draggingSpy.count(), 2);
+    }
 
     QTest::touchEvent(view, device).release(0, touchPoint.toPoint());
 

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-06-03 20:18:44 +0000
+++ tests/qmltests/CMakeLists.txt	2013-06-04 12:32:22 +0000
@@ -53,7 +53,7 @@
                                   ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
 add_qml_test(Hud Hud)
 add_qml_test(Hud Result)
-add_qml_test(Launcher Launcher IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
+add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Notifications Notifications)
 add_qml_test(Panel IndicatorRow)
 add_qml_test(Panel Indicators)

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2013-05-21 11:32:49 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2013-06-04 12:32:22 +0000
@@ -19,7 +19,6 @@
 import Unity.Test 0.1 as UT
 import ".."
 import "../../../Launcher"
-import "../../../Applications/applications.js" as ApplicationsModel
 
 /* Nothing is shown at first. If you drag from left edge you will bring up the
    launcher. */
@@ -32,20 +31,12 @@
         x: 0
         y: 0
         width: units.gu(40)
-        height: units.gu(71)
-
-        favourites: ["/usr/share/applications/phone-app.desktop",
-                     "/usr/share/applications/camera-app.desktop",
-                     "/usr/share/applications/gallery-app.desktop"]
-
-        shortcutsWidth: units.gu(9)
-        shortcutsThreshold: units.gu(2)
-        iconPath: "graphics/applicationIcons"
+        height: units.gu(81)
 
         property string latestApplicationSelected
 
         onLauncherApplicationSelected: {
-            latestApplicationSelected = name
+            latestApplicationSelected = desktopFile
         }
 
         property int dashItemSelected_count: 0
@@ -62,13 +53,11 @@
         // Drag from the left edge of the screen rightwards and check that the launcher
         // appears (as if being dragged by the finger/pointer)
         function test_dragLeftEdgeToRevealLauncherAndTapCenterToDismiss() {
-            // "shortcuts" is the vertical stripe of icons the user see.
-            // i.e., the launcher graphical element itself.
-            var shortcuts = findChild(launcher, "shortcuts")
-            verify(shortcuts != undefined)
+            var panel = findChild(launcher, "launcherPanel")
+            verify(panel != undefined)
 
             // it starts out hidden just left of the left launcher edge
-            compare(shortcuts.x, -shortcuts.width)
+            compare(panel.x, -panel.width)
 
             dragLauncherIntoView()
 
@@ -76,7 +65,7 @@
             mouseClick(launcher, launcher.width/2, launcher.height/2)
 
             // should eventually get fully retracted (hidden)
-            tryCompare(shortcuts, "x", -shortcuts.width, 1000)
+            tryCompare(panel, "x", -launcher.panelWidth, 1000)
         }
 
         /* If I click on the icon of an application on the launcher
@@ -88,11 +77,10 @@
 
             dragLauncherIntoView()
 
-            var phoneIcon = findChild(launcher,
-                                      "delegate /usr/share/applications/phone-app.desktop")
-            verify(phoneIcon != undefined)
+            var appIcon = findChild(launcher, "launcherDelegate0")
+            verify(appIcon != undefined)
 
-            mouseClick(phoneIcon, phoneIcon.width/2, phoneIcon.height/2)
+            mouseClick(appIcon, appIcon.width/2, appIcon.height/2)
 
             tryCompare(launcher, "latestApplicationSelected",
                        "/usr/share/applications/phone-app.desktop")
@@ -108,8 +96,7 @@
 
             dragLauncherIntoView()
 
-            var dashIcon = findChild(launcher,
-                                      "delegate dash.desktop")
+            var dashIcon = findChild(launcher, "dashItem")
             verify(dashIcon != undefined)
 
             mouseClick(dashIcon, dashIcon.width/2, dashIcon.height/2)
@@ -121,24 +108,23 @@
         }
 
         function dragLauncherIntoView() {
-            var startX = launcher.shortcutsThreshold/2
+            var startX = launcher.dragAreaWidth/2
             var startY = launcher.height/2
             touchFlick(launcher,
                        startX, startY,
                        startX+units.gu(8), startY)
 
-            // "shortcuts" is the vertical stripe of icons the user see.
-            // i.e., the launcher graphical element itself.
-            var shortcuts = findChild(launcher, "shortcuts")
-            verify(shortcuts != undefined)
+            var panel = findChild(launcher, "launcherPanel")
+            verify(panel != undefined)
 
             // wait until it gets fully extended
-            tryCompare(shortcuts, "x", 0)
+            tryCompare(panel, "x", 0)
+            tryCompare(launcher, "state", "visible")
         }
 
         function waitUntilLauncherDisappears() {
-            var shortcuts = findChild(launcher, "shortcuts")
-            tryCompare(shortcuts, "x", -shortcuts.width, 1000)
+            var panel = findChild(launcher, "launcherPanel")
+            tryCompare(panel, "x", -panel.width, 1000)
         }
     }
 }

=== modified file 'tests/qmltests/plugins/Unity/CMakeLists.txt'
--- tests/qmltests/plugins/Unity/CMakeLists.txt	2013-05-02 16:38:00 +0000
+++ tests/qmltests/plugins/Unity/CMakeLists.txt	2013-06-04 12:32:22 +0000
@@ -25,6 +25,7 @@
   fake_lens.cpp
   fake_lenses.cpp
   fake_unity_plugin.cpp
+  fake_launchermodel.cpp
 )
 
 add_library(FakeUnityQml MODULE ${UnityQML_SOURCES})

=== added file 'tests/qmltests/plugins/Unity/fake_launchermodel.cpp'
--- tests/qmltests/plugins/Unity/fake_launchermodel.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/plugins/Unity/fake_launchermodel.cpp	2013-06-04 12:32:22 +0000
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Zanetti <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "launchermodel.h"
+
+LauncherModel::LauncherModel(QObject *parent): QAbstractListModel(parent)
+{
+    LauncherItem *item = new LauncherItem("/usr/share/applications/phone-app.desktop", "Phone", "phone-app");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/camera-app.desktop", "Camera", "camera");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/gallery-app.desktop", "Gallery", "gallery");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/webbrowser-app.desktop", "Browser", "browser");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/notes-app.desktop", "Notepad", "notepad");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/ubuntu-calendar-app.desktop","Calendar", "calendar");
+    m_list.append(item);
+}
+
+LauncherModel::~LauncherModel()
+{
+    while (!m_list.empty()) {
+        m_list.takeFirst()->deleteLater();
+    }
+}
+
+int LauncherModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return m_list.count();
+}
+
+QVariant LauncherModel::data(const QModelIndex &index, int role) const
+{
+    LauncherItem *item = m_list.at(index.row());
+    switch(role) {
+    case RoleName:
+        return item->name();
+    case RoleIcon:
+        return item->icon();
+    case RoleFavorite:
+        return item->favorite();
+    }
+
+    return QVariant();
+}
+
+LauncherItem *LauncherModel::get(int index) const
+{
+    if (index < 0 || index >= m_list.count()) {
+        return 0;
+    }
+    return m_list.at(index);
+}
+
+void LauncherModel::move(int oldIndex, int newIndex)
+{
+    beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), newIndex);
+    m_list.move(oldIndex, newIndex);
+    endMoveRows();
+}
+
+QHash<int, QByteArray> LauncherModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles.insert(RoleDesktopFile, "desktopFile");
+    roles.insert(RoleName, "name");
+    roles.insert(RoleIcon, "icon");
+    roles.insert(RoleFavorite, "favorite");
+    roles.insert(RoleRunning, "runnng");
+    return roles;
+}
+
+
+LauncherItem::LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent):
+    QObject(parent),
+    m_desktopFile(desktopFile),
+    m_name(name),
+    m_icon(icon),
+    m_favorite(false)
+{
+
+}
+
+QString LauncherItem::desktopFile() const
+{
+    return m_desktopFile;
+}
+
+QString LauncherItem::name() const
+{
+    return m_name;
+}
+
+QString LauncherItem::icon() const
+{
+    return m_icon;
+}
+
+bool LauncherItem::favorite() const
+{
+    return m_favorite;
+}
+
+void LauncherItem::setFavorite(bool favorite)
+{
+    if (m_favorite != favorite) {
+        m_favorite = favorite;
+        Q_EMIT favoriteChanged(m_favorite);
+    }
+}
+
+bool LauncherItem::running() const
+{
+    return m_running;
+}
+
+void LauncherItem::setRunning(bool running)
+{
+    if (m_running != running) {
+        m_running = running;
+        Q_EMIT runningChanged(running);
+    }
+}

=== added file 'tests/qmltests/plugins/Unity/fake_launchermodel.h'
--- tests/qmltests/plugins/Unity/fake_launchermodel.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/plugins/Unity/fake_launchermodel.h	2013-06-04 12:32:22 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Zanetti <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QAbstractListModel>
+
+class LauncherItem;
+
+class LauncherModel: public QAbstractListModel
+{
+   Q_OBJECT
+
+public:
+    enum Roles {
+        RoleDesktopFile = Qt::UserRole,
+        RoleName,
+        RoleIcon,
+        RoleFavorite,
+        RoleRunning
+    };
+
+    LauncherModel(QObject *parent = 0);
+    ~LauncherModel();
+
+    int rowCount(const QModelIndex &parent) const;
+
+    QVariant data(const QModelIndex &index, int role) const;
+
+    Q_INVOKABLE LauncherItem* get(int index) const;
+    Q_INVOKABLE void move(int oldIndex, int newIndex);
+
+    QHash<int, QByteArray> roleNames() const;
+
+private:
+    QList<LauncherItem*> m_list;
+};
+
+class LauncherItem: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
+    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(QString icon READ icon CONSTANT)
+    Q_PROPERTY(bool favorite READ favorite WRITE setFavorite NOTIFY favoriteChanged)
+    Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
+
+public:
+    LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent = 0);
+
+    QString desktopFile() const;
+
+    QString name() const;
+    QString icon() const;
+
+    bool favorite() const;
+    void setFavorite(bool favorite);
+
+    bool running() const;
+    void setRunning(bool running);
+
+Q_SIGNALS:
+    void favoriteChanged(bool favorite);
+    void runningChanged(bool running);
+
+private:
+    QString m_desktopFile;
+    QString m_name;
+    QString m_icon;
+    bool m_favorite;
+    bool m_running;
+};

=== modified file 'tests/qmltests/plugins/Unity/fake_unity_plugin.cpp'
--- tests/qmltests/plugins/Unity/fake_unity_plugin.cpp	2013-05-02 23:05:09 +0000
+++ tests/qmltests/plugins/Unity/fake_unity_plugin.cpp	2013-06-04 12:32:22 +0000
@@ -23,6 +23,7 @@
 #include "fake_lenses.h"
 #include "categories.h"
 #include "categoryfilter.h"
+#include "fake_launchermodel.h"
 
 // External
 #include <glib-object.h>
@@ -40,4 +41,6 @@
     qmlRegisterType<Lens>(uri, 0, 1, "Lens");
     qmlRegisterType<Categories>(uri, 0, 1, "Categories");
     qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
+    qmlRegisterType<LauncherModel>(uri, 0, 1, "LauncherModel");
+    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create");
 }