Merge lp:~fboucault/unity-2d/new_dash_layout into lp:unity-2d/3.0

[Florian Boucault]

[dash] New dash user interface layout.

The following user interface elements were updated for the new design:
- search bar
- scrollbar
- result groups and headers
- new refine search pane that replaces the section selector
- home page shortcuts have been modified to be more intuitive and their visual appearance updated
- home page 'shortcuts' button gets an icon

A few QML effects were made available under the "Effects" QML plugin:
- QGraphicsBlurEffect
- QGraphicsColorizeEffect
- QGraphicsDropShadowEffect

[Florian Boucault (fboucault)]

This merge request leaves the dash with several issues that will need to be dealt with later on:
- background color is wrong (should be black with 69% alpha)
- border color around home items is wrong (should be black with 59% alpha)
- background color behind home items is wrong (should be black with 73% alpha)
- home page's open/close shortcuts buttons: hover and pressed states are wrong
- button for switching to fullscreen mode: hover and pressed states are wrong
- Dash view should use "Preferred Applications" icons where appropriate https://bugs.launchpad.net/unity-2d/+bug/708479

[Florian Boucault (fboucault)]

Given the size of the merge request and in order to make the review easier I suggest to review the code by reviewing the commits individually.

[Florian Boucault (fboucault)]

No proposals found for merge of lp:~agateau/unity-2d/desktop-dash into lp:unity-2d.

[lp:~fboucault/unity-2d/new_dash_layout]

426. By Florian Boucault on 2011-02-24

Merged from trunk.

Unmerged revisions

426. By Florian Boucault on 2011-02-24

Merged from trunk.

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-02-14 19:59:09 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-02-22 03:27:59 +0000
@@ -38,6 +38,7 @@
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
+#include <QGraphicsEffect>
 
 #undef signals
 extern "C" {
@@ -69,6 +70,9 @@
     qmlRegisterType<WorkspacesInfo>(); // Register the type as non creatable
 
     qmlRegisterType<CacheEffect>(uri, 0, 1, "CacheEffect");
+    qmlRegisterType<QGraphicsBlurEffect>("Effects", 1, 0, "Blur");
+    qmlRegisterType<QGraphicsColorizeEffect>("Effects", 1, 0, "Colorize");
+    qmlRegisterType<QGraphicsDropShadowEffect>("Effects", 1, 0, "DropShadow");
 
     /* Custom drag’n’drop implementation in QML */
     qmlRegisterType<DeclarativeMimeData>();

=== removed file 'places/BorderGlow.qml'
--- places/BorderGlow.qml	2010-11-27 02:56:39 +0000
+++ places/BorderGlow.qml	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-import Qt 4.7
-
-BorderImage {
-    source: "artwork/border_glow.sci"
-    smooth: false
-}

=== added file 'places/FoldingArrow.qml'
--- places/FoldingArrow.qml	1970-01-01 00:00:00 +0000
+++ places/FoldingArrow.qml	2011-02-22 03:27:59 +0000
@@ -0,0 +1,14 @@
+import Qt 4.7
+import Effects 1.0
+
+Image {
+    property bool folded: true
+
+    rotation: folded ? 0 : 90
+    source: "artwork/arrow.png"
+    width: sourceSize.width
+    height: sourceSize.height
+    fillMode: Image.PreserveAspectFit
+
+    Behavior on rotation {NumberAnimation {duration: 100}}
+}

=== modified file 'places/GroupHeader.qml'
--- places/GroupHeader.qml	2010-12-16 22:16:55 +0000
+++ places/GroupHeader.qml	2011-02-22 03:27:59 +0000
@@ -1,66 +1,94 @@
 import Qt 4.7
-
-Button {
-    property alias icon: icon.source
-    property alias label: label.text
+import Effects 1.0
+
+AbstractButton {
+    id: groupHeader
+
+    property string icon
+    property alias label: title.text
     property bool folded: true
     property int availableCount
 
+    effect: DropShadow {
+                blurRadius: 6
+                offset.x: 0
+                offset.y: 0
+                color: "white"
+                enabled: groupHeader.state == "pressed"
+            }
 
     Image {
-        id: icon
+        id: iconImage
+
+        source: icon
 
         width: 22
         height: 22
-        anchors.verticalCenter: parent.verticalCenter
+        anchors.bottom: underline.top
+        anchors.bottomMargin: 5
         anchors.left: parent.left
-        anchors.leftMargin: 7
+        anchors.leftMargin: 8
         fillMode: Image.PreserveAspectFit
         sourceSize.width: width
         sourceSize.height: height
     }
 
     TextCustom {
-        id: label
+        id: title
 
-        color: parent.state == "pressed" ? "#444444" : "#ffffff"
         font.pixelSize: 16
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 5
-        anchors.left: icon.right
-        anchors.leftMargin: 5
-        width: paintedWidth
+        anchors.baseline: underline.top
+        anchors.baselineOffset: -10
+        anchors.left: iconImage.right
+        anchors.leftMargin: 8
     }
 
-    Image {
-        id: arrow
+    Item {
+        id: moreResults
 
         visible: availableCount > 0
-        rotation: folded ? 0 : 90
-        source: "artwork/arrow.png"
-        width: 7
-        height: 7
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.left: label.right
-        anchors.leftMargin: 6
-        fillMode: Image.PreserveAspectFit
-        sourceSize.width: width
-        sourceSize.height: height
+        anchors.left: title.right
+        anchors.leftMargin: 11
+        anchors.baseline: title.baseline
+
+        opacity: groupHeader.state == "selected" || groupHeader.state == "pressed" ? 1.0 : 0.5
+        Behavior on opacity {NumberAnimation { duration: 100 }}
+
+        effect: DropShadow {
+                    blurRadius: 4
+                    offset.x: 0
+                    offset.y: 0
+                    color: "white"
+                    enabled: moreResults.opacity == 1.0
+                }
+
+        TextCustom {
+            id: label
+
+            text: groupHeader.folded ? qsTr("See %1 more results").arg(availableCount) : qsTr("See fewer results")
+            anchors.left: parent.left
+            anchors.baseline: parent.baseline
+        }
+
+        FoldingArrow {
+            id: arrow
+
+            folded: groupHeader.folded
+            anchors.left: label.right
+            anchors.leftMargin: 10
+            anchors.verticalCenter: label.verticalCenter
+        }
     }
 
     Rectangle {
         id: underline
 
-        opacity: parent.state == "selected" ? 0.0 : 1.0
-        Behavior on opacity {NumberAnimation {duration: 100}}
+        color: "white"
+        opacity: groupHeader.state == "pressed" ? 0.45 : 0.3
 
         height: 1
         anchors.bottom: parent.bottom
         anchors.left: parent.left
-        anchors.leftMargin: 5
         anchors.right: parent.right
-        anchors.rightMargin: 1
-
-        color: "#4cffffff"
     }
 }

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-02-22 03:27:59 +0000
+++ places/Home.qml	2011-02-22 03:27:59 +0000
@@ -24,22 +24,36 @@
     property bool expanded: globalSearchActive || shortcutsActive
 
     Button {
-        id: shortcutsButton
+        id: openShortcutsButton
+
         anchors.bottom: parent.top
         anchors.right: parent.right
         anchors.rightMargin: 50
         anchors.bottomMargin: 10
-        width: 80
-        height: 47
+        width: childrenRect.width
+        height: childrenRect.height
+
+        Image {
+            id: icon
+            source: "artwork/open_shortcuts.png"
+            width: sourceSize.width
+            height: sourceSize.height
+            anchors.left: parent.left
+        }
 
         TextCustom {
             text: "Shortcuts"
-            anchors.fill: parent
+            anchors.left: icon.right
+            anchors.leftMargin: 3
+            width: paintedWidth
+            height: icon.height
+            font.pixelSize: 16
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
         }
 
         opacity: (!expanded && dashView.dashMode == DashDeclarativeView.DesktopMode) ? 1 : 0
+        Behavior on opacity {NumberAnimation {duration: 100}}
 
         onClicked: {
             shortcutsActive = true
@@ -55,8 +69,7 @@
         list.model: dash.places
 
         list.delegate: UnityDefaultRenderer {
-            /* -2 is here because no rightMargin is set in ListViewWithScrollbar.list yet */
-            width: ListView.view.width-2
+            width: ListView.view.width
 
             parentListView: list
             placeEntryModel: modelData
@@ -91,81 +104,99 @@
         }
     }
 
-    Flow {
-        id: buttons
+    Rectangle {
+        id: shortcuts
 
         opacity: (!globalSearchActive && (shortcutsActive || dashView.dashMode == DashDeclarativeView.FullScreenMode)) ? 1 : 0
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
 
-        width: 692
-        height: 348
-        spacing: 62
-
-        HomeButton {
-            icon: "image://icons/unity-icon-theme/web"
-            label: qsTr("Web")
-
-            GConfItem {
-                id: desktop_file_path
-                key: "/desktop/gnome/applications/browser/exec"
-            }
-
-            onClicked: {
-                dashView.active = false
-                console.log("FIXME: should launch", desktop_file_path.value)
-                Qt.openUrlExternally("http://")
-            }
-        }
-
-        HomeButton {
-            icon: "image://icons/unity-icon-theme/music"
-            label: qsTr("Music")
-            onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 4)
-        }
-
-        HomeButton {
-            icon: "image://icons/unity-icon-theme/photos"
-            label: qsTr("Photos & Videos")
-            onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 4)
-        }
-
-        HomeButton {
-            icon: "image://icons/unity-icon-theme/games"
-            label: qsTr("Games")
-            onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 2)
-        }
-
-        HomeButton {
-            icon: "image://icons/unity-icon-theme/email_and_chat"
-            label: qsTr("Email & Chat")
-            onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 3)
-        }
-
-        HomeButton {
-            icon: "image://icons/unity-icon-theme/work"
-            label: qsTr("Office")
-            onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 5)
-        }
-
-        HomeButton {
-            icon: "image://icons/unity-icon-theme/filesandfolders"
-            label: qsTr("Files & Folders")
-            onClicked: activatePlaceEntry("/usr/share/unity/places/files.place", "Files", 0)
-        }
-
-        HomeButton {
-            icon: "image://icons/unity-icon-theme/softwarecentre"
-            label: qsTr("Get New Apps")
-
-            LauncherApplication {
-                id: software_center
-                desktop_file: "/usr/share/applications/ubuntu-software-center.desktop"
-            }
-
-            onClicked: {
-                dashView.active = false
-                software_center.activate()
+        width: 888
+        height: 466
+
+        radius: 5
+        border.width: 1
+        /* FIXME: wrong colors */
+        border.color: Qt.rgba(1, 1, 1, 0.2)
+        color: Qt.rgba(0, 0, 0, 0.3)
+
+        Button {
+            id: closeShortcutsButton
+
+            anchors.left: parent.left
+            anchors.top: parent.top
+            anchors.leftMargin: -width/2
+
+            width: childrenRect.width
+            height: childrenRect.height
+
+            Image {
+                id: search_icon
+
+                width: sourceSize.width
+                height: sourceSize.height
+
+                source: "artwork/cross.png"
+            }
+
+            opacity: (expanded && dashView.dashMode == DashDeclarativeView.DesktopMode) ? 1 : 0
+            Behavior on opacity {NumberAnimation {duration: 100}}
+
+            onClicked: shortcutsActive = false
+        }
+
+        Flow {
+            anchors.fill: parent
+            anchors.topMargin: 26
+            anchors.bottomMargin: 35
+            anchors.leftMargin: 32
+            anchors.rightMargin: 32
+            spacing: 61
+
+            /* FIXME: dummy icons need to be replaced by design's */
+            HomeButton {
+                label: qsTr("Find Media Apps")
+                icon: "artwork/find_media_apps.png"
+                onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 4)
+            }
+
+            HomeButton {
+                label: qsTr("Find Internet Apps")
+                icon: "artwork/find_internet_apps.png"
+                onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 3)
+            }
+
+            HomeButton {
+                label: qsTr("Find More Apps")
+                icon: "artwork/find_more_apps.png"
+                onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 0)
+            }
+
+            HomeButton {
+                label: qsTr("Find Files")
+                icon: "artwork/find_files.png"
+                onClicked: activatePlaceEntry("/usr/share/unity/places/files.place", "Files", 0)
+            }
+
+            /* FIXME: use user's preferred applications instead of hardcoding them */
+            HomeButtonApplication {
+                label: qsTr("Browse the Web")
+                desktopFile: "firefox.desktop"
+            }
+
+            HomeButtonApplication {
+                label: qsTr("View Photos")
+                desktopFile: "shotwell.desktop"
+            }
+
+            HomeButtonApplication {
+                label: qsTr("Check Email")
+                desktopFile: "evolution.desktop"
+            }
+
+            HomeButtonApplication {
+                label: qsTr("Listen to Music")
+                desktopFile: "banshee-1.desktop"
             }
         }
     }

=== modified file 'places/HomeButton.qml'
--- places/HomeButton.qml	2010-10-20 03:06:47 +0000
+++ places/HomeButton.qml	2011-02-22 03:27:59 +0000
@@ -3,26 +3,31 @@
 Button {
     property alias icon: icon.source
     property alias label: label.text
-
-    width: 126
-    height: 148
-
-    Image {
-        id: icon
-
+    property alias iconSourceSize: icon.sourceSize
+
+    width: 160
+    height: 172
+
+    Item {
+        anchors.right: parent.right
+        anchors.left: parent.left
         anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.leftMargin: -1
-        anchors.topMargin: -1
-        width: 128
-        height: 128
-        fillMode: Image.PreserveAspectFit
-        sourceSize.width: width
-        sourceSize.height: height
-
-        asynchronous: true
-        opacity: status == Image.Ready ? 1 : 0
-        Behavior on opacity {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
+        anchors.bottom: label.bottom
+        anchors.bottomMargin: 30
+
+        Image {
+            id: icon
+
+            width: sourceSize.width
+            height: sourceSize.height
+
+            anchors.centerIn: parent
+            fillMode: Image.PreserveAspectFit
+
+            asynchronous: true
+            opacity: status == Image.Ready ? 1 : 0
+            Behavior on opacity {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
+        }
     }
 
     TextCustom {
@@ -38,5 +43,7 @@
         anchors.rightMargin: 5
         anchors.leftMargin: 7
         font.underline: parent.activeFocus
+        font.bold: true
+        font.pixelSize: 16
     }
 }

=== added file 'places/HomeButtonApplication.qml'
--- places/HomeButtonApplication.qml	1970-01-01 00:00:00 +0000
+++ places/HomeButtonApplication.qml	2011-02-22 03:27:59 +0000
@@ -0,0 +1,23 @@
+import Qt 4.7
+/* Necessary for:
+   - ImageProvider serving image://icons/theme_name/icon_name
+   - LauncherApplication
+*/
+import UnityApplications 1.0
+
+HomeButton {
+    property alias desktopFile: application.desktop_file
+
+    LauncherApplication {
+        id: application
+    }
+
+    onClicked: {
+        dashView.active = false
+        application.activate()
+    }
+
+    icon: "image://icons/" + application.icon
+    iconSourceSize.width: 128
+    iconSourceSize.height: 128
+}

=== modified file 'places/ListViewWithScrollbar.qml'
--- places/ListViewWithScrollbar.qml	2010-12-16 12:14:20 +0000
+++ places/ListViewWithScrollbar.qml	2011-02-22 03:27:59 +0000
@@ -10,8 +10,8 @@
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         anchors.left: parent.left
-        /* Take all available horizontal space if the scrollbar is invisible */
-        anchors.right: scrollbar.opacity > 0 ? scrollbar.left : parent.right
+        anchors.right: scrollbar.left
+        anchors.rightMargin: 15
 
         clip: true
         /* FIXME: proper spacing cannot be set because of the hack in Group.qml
@@ -44,6 +44,7 @@
         id: scrollbar
 
         anchors.top: parent.top
+        anchors.topMargin: 15
         anchors.bottom: parent.bottom
         anchors.right: parent.right
 

=== modified file 'places/PlaceEntryView.qml'
--- places/PlaceEntryView.qml	2011-01-27 09:30:14 +0000
+++ places/PlaceEntryView.qml	2011-02-22 03:27:59 +0000
@@ -34,8 +34,7 @@
                     console.log("Failed to load renderer", groupRenderer)
             }
 
-            /* -2 is here to prevent clipping of the group; it looks like a bug */
-            width: ListView.view.width-2
+            width: ListView.view.width
 
             /* Model that will be used by the group's delegate */
             QSortFilterProxyModelQML {

=== modified file 'places/RendererGrid.qml'
--- places/RendererGrid.qml	2011-02-11 00:07:17 +0000
+++ places/RendererGrid.qml	2011-02-22 03:27:59 +0000
@@ -45,7 +45,7 @@
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        height: 28
+        height: 32
         icon: parent.iconHint
         label: parent.displayName
 
@@ -56,7 +56,7 @@
         id: results_layout
 
         anchors.top: header.bottom
-        anchors.topMargin: 14
+        anchors.topMargin: 22
         anchors.left: parent.left
         anchors.leftMargin: 2
         anchors.right: parent.right

=== modified file 'places/Scrollbar.qml'
--- places/Scrollbar.qml	2010-11-27 03:13:00 +0000
+++ places/Scrollbar.qml	2011-02-22 03:27:59 +0000
@@ -1,8 +1,7 @@
 import Qt 4.7
 
 /* Scrollbar composed of:
-   - a background track; clicking on it triggers page scrolling
-   - a draggable slider on top
+   - a draggable slider
 
    Usage:
 
@@ -19,39 +18,31 @@
 
     property variant targetFlickable
 
-    width: 10
+    width: 3
 
-    BorderImage {
-        id: background
+    MouseArea {
+        id: scrollMouseArea
 
         anchors.fill: parent
-        source: "artwork/scrollbar/background.sci"
-        smooth: false
-
-        MouseArea {
-            id: scrollMouseArea
-
-            anchors.fill: parent
-            acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
-
-            onPressed: {
-                /* Scroll one page without overshooting */
-                var scrollAmount = mouseY > slider.y ? targetFlickable.height : -targetFlickable.height
-                var destination = targetFlickable.contentY + scrollAmount
-                var clampedDestination = Math.max(0, Math.min(targetFlickable.contentHeight - targetFlickable.height,
-                                                              destination))
-                scrollAnimation.to = clampedDestination
-                scrollAnimation.restart()
-            }
-
-            NumberAnimation {
-                id: scrollAnimation
-
-                duration: 200
-                easing.type: Easing.InOutQuad
-                target: targetFlickable
-                property: "contentY"
-            }
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+
+        onPressed: {
+            /* Scroll one page without overshooting */
+            var scrollAmount = mouseY > slider.y ? targetFlickable.height : -targetFlickable.height
+            var destination = targetFlickable.contentY + scrollAmount
+            var clampedDestination = Math.max(0, Math.min(targetFlickable.contentHeight - targetFlickable.height,
+                                                          destination))
+            scrollAnimation.to = clampedDestination
+            scrollAnimation.restart()
+        }
+
+        NumberAnimation {
+            id: scrollAnimation
+
+            duration: 200
+            easing.type: Easing.InOutQuad
+            target: targetFlickable
+            property: "contentY"
         }
     }
 
@@ -74,35 +65,16 @@
 
         BorderImage {
             anchors.fill: parent
-            /* The glow around the slider is 5 pixels wide */
-            anchors.margins: -5
+            /* The glow around the slider is 5 pixels wide on the left and right sides
+               and 10 pixels tall on the top and bottom sides. */
+            anchors.rightMargin: -5
+            anchors.leftMargin: -5
+            anchors.topMargin: -10
+            anchors.bottomMargin: -10
 
             smooth: false
 
-            source: {
-                if(dragMouseArea.pressed)
-                    return "artwork/scrollbar/slider_pressed.sci"
-                else if(dragMouseArea.containsMouse)
-                    return "artwork/scrollbar/slider_hovered.sci"
-                else
-                    return "artwork/scrollbar/slider_default.sci"
-            }
-
-            Image {
-                id: handle
-
-                anchors.centerIn: parent
-                source: {
-                    if(dragMouseArea.pressed)
-                        return "artwork/scrollbar/handle_pressed.png"
-                    else
-                        return "artwork/scrollbar/handle_default.png"
-                }
-                width: sourceSize.width
-                height: sourceSize.height
-                fillMode: Image.Tile
-                smooth: false
-            }
+            source: "artwork/scrollbar.sci"
         }
 
         MouseArea {

=== removed file 'places/SearchBar.qml'
--- places/SearchBar.qml	2011-01-06 18:35:39 +0000
+++ places/SearchBar.qml	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-import Qt 4.7
-
-FocusScope {
-    /* Keys forwarded to the search bar are forwarded to the search entry. */
-    Keys.forwardTo: [search_entry]
-
-    BorderGlow {
-        id: background
-
-        anchors.fill: parent
-
-        Image {
-            anchors.fill: parent
-            anchors.margins: 6
-            source: "artwork/checker.png"
-            fillMode: Image.Tile
-        }
-    }
-
-    SearchEntry {
-        id: search_entry
-
-        focus: true
-        KeyNavigation.right: sections
-
-        width: 281
-        anchors.left: parent.left
-        anchors.leftMargin: 82
-        anchors.top: parent.top
-        anchors.topMargin: 7
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 6
-    }
-
-    ListView {
-        id: sections
-
-        KeyNavigation.left: search_entry
-
-        visible: model != undefined
-        orientation: ListView.Horizontal
-        /* Non-draggable when all sections are visible */
-        boundsBehavior: Flickable.StopAtBounds
-
-        anchors.left: search_entry.right
-        anchors.leftMargin: 14
-        anchors.right: parent.right
-        anchors.rightMargin: 15
-        spacing: 10
-
-        height: parent.height
-        /* Make sure the first section is selected when getting the focus */
-        currentIndex: 0
-        onActiveFocusChanged: {
-            /* It really should be onFocusChanged but the following bug makes
-               using focus impossible:
-               http://bugreports.qt.nokia.com/browse/QTBUG-12649
-            */
-            if(!focus) currentIndex = 0
-        }
-
-        delegate: Section {
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalPadding: 4
-            verticalPadding: 3
-            /* FIXME: check for sections.model != undefined is a
-               workaround for a crash in Qt happening when setting the model of
-               a ListView to undefined after it being non-empty.
-               It seems that the model count is not 0 and delegates are still
-               being created and updated with data.
-
-               To reproduce the crash: go to the applications place, exit the
-               dash and then go to the home page of the dash.
-            */
-            label: sections.model != undefined ? column_0 : ""
-            isActiveSection: dash.currentPage.model.activeSection == index
-
-            onClicked: {
-                sections.focus = false
-                search_entry.focus = true
-                dash.currentPage.model.activeSection = model.index
-            }
-        }
-
-        model: dash.currentPage != undefined ? dash.currentPage.model.sections : undefined
-    }
-}

=== modified file 'places/SearchEntry.qml'
--- places/SearchEntry.qml	2011-01-06 23:19:27 +0000
+++ places/SearchEntry.qml	2011-02-22 03:27:59 +0000
@@ -1,4 +1,5 @@
 import Qt 4.7
+import Effects 1.0
 
 FocusScope {
     property string searchQuery
@@ -12,8 +13,10 @@
     /* Keys forwarded to the search entry are forwarded to the text input. */
     Keys.forwardTo: [search_input]
 
-    BorderGlow {
+    BorderImage {
         anchors.fill: parent
+        source: "artwork/search_background.sci"
+        smooth: false
     }
 
     Item {
@@ -21,35 +24,54 @@
         anchors.topMargin: 6
         anchors.bottomMargin: 6
         anchors.leftMargin: 6
-        anchors.rightMargin: 6
+        anchors.rightMargin: 16
 
         Image {
             id: search_icon
 
             anchors.left: parent.left
-            anchors.leftMargin: 3
+            anchors.leftMargin: -5
             anchors.top: parent.top
-            anchors.topMargin: 1
             anchors.bottom: parent.bottom
-            anchors.bottomMargin: 1
+            width: sourceSize.width
+
             smooth: true
-            width: 18
-
-            source: "artwork/search_icon.png"
-            fillMode: Image.PreserveAspectCrop
+
+            source: search_input.text ? "artwork/cross.png" : "artwork/search_icon.png"
+            fillMode: Image.PreserveAspectFit
+        }
+
+        MouseArea {
+            id: clear_button
+
+            anchors.fill: search_icon
+
+            onClicked: {
+                search_input.forceActiveFocus()
+                search_input.text = ""
+            }
         }
 
         TextInput {
             id: search_input
 
+            effect: DropShadow {
+                    id: glow
+
+                    blurRadius: 4
+                    offset.x: 0
+                    offset.y: 0
+                    color: "white"
+                    enabled: search_input.text != ""
+                }
+
             anchors.left: search_icon.right
-            anchors.leftMargin: 2
-            anchors.right: clear_button.left
-            anchors.rightMargin: 5
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 3
+            anchors.leftMargin: -5
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
 
             color: "#ffffff"
+            font.pixelSize: 28
             focus: true
             selectByMouse: true
             cursorDelegate: cursor
@@ -100,40 +122,23 @@
             Text {
                 id: search_instructions
 
-                anchors.fill: parent
-                anchors.leftMargin: 4
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
 
+                color: "white"
+                opacity: 0.5
+                font.pixelSize: 20
                 font.italic: true
-                color: "#eeeeee"
                 text: {
                     if(search_input.text)
                         return ""
                     else if(dash.currentPage != undefined && dash.currentPage.model.name)
-                        return qsTr("Search %1").arg(dash.currentPage.model.name)
+                        return qsTr("Search for %1").arg(dash.currentPage.model.name)
                     else
                         return qsTr("Search")
                 }
             }
         }
-
-        Image {
-            id: clear_button
-
-            anchors.right: parent.right
-            anchors.rightMargin: 4
-            anchors.verticalCenter: parent.verticalCenter
-            width: 10
-
-            source: "artwork/cross.png"
-            fillMode: Image.PreserveAspectFit
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    search_input.forceActiveFocus()
-                    search_input.text = ""
-                }
-            }
-        }
     }
 }

=== added file 'places/SearchRefine.qml'
--- places/SearchRefine.qml	1970-01-01 00:00:00 +0000
+++ places/SearchRefine.qml	2011-02-22 03:27:59 +0000
@@ -0,0 +1,99 @@
+import Qt 4.7
+import Effects 1.0
+
+FocusScope {
+    id: searchRefine
+
+    property bool folded: true
+    property int headerHeight
+    property variant placeEntryModel
+
+    AbstractButton {
+        id: header
+
+        effect: DropShadow {
+                    blurRadius: {
+                        switch (header.state) {
+                            case "selected":
+                                return 4
+                            case "pressed":
+                                return 8
+                            default:
+                                return 0
+                        }
+                    }
+                    offset.x: 0
+                    offset.y: 0
+                    color: "white"
+                }
+
+        onClicked: searchRefine.folded = !searchRefine.folded
+
+        focus: true
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.topMargin: 10
+        height: headerHeight - anchors.topMargin
+
+        TextCustom {
+            id: title
+
+            text: qsTr("Refine search")
+            font.bold: true
+            font.pixelSize: 16
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+        }
+
+        FoldingArrow {
+            id: arrow
+
+            folded: searchRefine.folded
+
+            anchors.verticalCenter: title.verticalCenter
+            anchors.left: title.right
+            anchors.leftMargin: 10
+        }
+    }
+
+    VisualItemModel {
+        id: optionsModel
+
+        SearchRefineOptionType {
+            title: qsTr("Type")
+            placeEntryModel: searchRefine.placeEntryModel
+        }
+    }
+
+    ListView {
+        id: options
+
+        opacity: folded ? 0.0 : 1.0
+        Behavior on opacity {NumberAnimation {duration: 100; easing.type: Easing.InOutQuad}}
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: header.bottom
+        anchors.topMargin: 7
+        anchors.bottom: parent.bottom
+        orientation: ListView.Vertical
+
+        /* Make sure the first section is selected when getting the focus */
+        currentIndex: 0
+        onActiveFocusChanged: {
+            /* It really should be onFocusChanged but the following bug makes
+               using focus impossible (fixed in Qt 4.7.1):
+               http://bugreports.qt.nokia.com/browse/QTBUG-12649
+            */
+            if(!focus) currentIndex = 0
+        }
+
+        /* Non-draggable when all items are visible */
+        boundsBehavior: Flickable.StopAtBounds
+
+        model: optionsModel
+    }
+}

=== added file 'places/SearchRefineOption.qml'
--- places/SearchRefineOption.qml	1970-01-01 00:00:00 +0000
+++ places/SearchRefineOption.qml	2011-02-22 03:27:59 +0000
@@ -0,0 +1,9 @@
+import Qt 4.7
+
+FocusScope {
+    property string title
+    property variant placeEntryModel
+
+    width: parent.width
+    height: childrenRect.height
+}

=== added file 'places/SearchRefineOptionType.qml'
--- places/SearchRefineOptionType.qml	1970-01-01 00:00:00 +0000
+++ places/SearchRefineOptionType.qml	2011-02-22 03:27:59 +0000
@@ -0,0 +1,62 @@
+import Qt 4.7
+
+SearchRefineOption {
+    id: searchRefineOption
+
+    AbstractButton {
+        id: header
+
+        focus: true
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: childrenRect.height
+
+        TextCustom {
+            id: title
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+
+            text: searchRefineOption.title
+            font.pixelSize: 16
+            font.bold: true
+        }
+    }
+
+    GridView {
+        id: filters
+
+        property int columns: 2
+        property int rowsPerColumn: Math.ceil(count/columns)
+
+        cellHeight: 35
+        cellWidth: width/columns
+
+        anchors.top: header.bottom
+        anchors.topMargin: 15
+        height: cellHeight * rowsPerColumn
+        boundsBehavior: Flickable.StopAtBounds
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        flow: GridView.TopToBottom
+
+        /* Make sure the first item is selected when getting the focus for the first time */
+        currentIndex: 0
+
+        delegate: TickBox {
+            height: filters.cellHeight
+            width: filters.cellWidth-10
+            /* Not checking for placeEntryModel != undefined leads to a segfault
+               when switching places */
+            text: placeEntryModel != undefined ? column_0 : ""
+            ticked: dash.currentPage.model.activeSection == model.index
+
+            onClicked: placeEntryModel.activeSection = model.index
+        }
+
+        model: placeEntryModel != undefined ? placeEntryModel.sections : undefined
+    }
+}

=== removed file 'places/Section.qml'
--- places/Section.qml	2010-11-21 23:02:27 +0000
+++ places/Section.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-import Qt 4.7
-
-AbstractButton {
-    property alias label: label.text
-    property int horizontalPadding: 0
-    property int verticalPadding: 0
-    property bool isActiveSection: false
-    property bool activeOrPressed: isActiveSection || state == "pressed"
-
-    width: label.width + horizontalPadding*2
-    height: label.height + verticalPadding*2
-
-    Rectangle {
-        anchors.fill: parent
-        opacity: activeOrPressed || parent.state == "selected" ? 1.0 : 0.0
-
-        color: activeOrPressed ? "#ffffffff" : "#00000000"
-        border.color: "#cccccc"
-        border.width: 1
-        radius: 3
-
-        Behavior on opacity {NumberAnimation {duration: 100}}
-
-        Image {
-            fillMode: Image.Tile
-            anchors.fill: parent
-            source: "artwork/button_background.png"
-            smooth: false
-        }
-    }
-
-    TextCustom {
-        id: label
-
-        width: paintedWidth
-        height: paintedHeight
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-
-        color: activeOrPressed ? "#444444" : "#ffffff"
-        horizontalAlignment: Text.AlignHCenter
-    }
-}

=== added file 'places/TickBox.qml'
--- places/TickBox.qml	1970-01-01 00:00:00 +0000
+++ places/TickBox.qml	2011-02-22 03:27:59 +0000
@@ -0,0 +1,47 @@
+import Qt 4.7
+
+AbstractButton {
+    id: tickBox
+
+    property string text
+    property bool ticked: false
+    property bool canUntick: true
+
+    width: childrenRect.width
+    height: childrenRect.height
+
+    TextCustom {
+        id: label
+
+        anchors.left: box.right
+        anchors.leftMargin: 8
+        width: paintedWidth
+        anchors.top: parent.top
+        font.pixelSize: 16
+        text: tickBox.text
+    }
+
+    Image {
+        id: box
+
+        opacity: !canUntick && ticked ? 0 : 1
+        anchors.top: parent.top
+        anchors.left: parent.left
+        source: "artwork/tick_box.png"
+        width: sourceSize.width
+        height: sourceSize.height
+    }
+
+    Image {
+        id: tick
+
+        anchors.top: box.top
+        anchors.topMargin: 2
+        anchors.left: box.left
+        anchors.leftMargin: 3
+        opacity: ticked ? 1.0 : parent.state == "selected" ? 0.4 : 0.0
+        source: "artwork/tick.png"
+        width: sourceSize.width
+        height: sourceSize.height
+    }
+}

=== modified file 'places/UnityDefaultRenderer.qml'
--- places/UnityDefaultRenderer.qml	2011-02-10 09:38:47 +0000
+++ places/UnityDefaultRenderer.qml	2011-02-22 03:27:59 +0000
@@ -1,10 +1,10 @@
 import Qt 4.7
 
 RendererGrid {
-    cellWidth: 158
-    cellHeight: 76
-    horizontalSpacing: 26
-    verticalSpacing: 26
+    cellWidth: 136
+    cellHeight: 108
+    horizontalSpacing: 10
+    verticalSpacing: 10
 
     cellRenderer: Component {
         Button {
@@ -24,7 +24,7 @@
                 height: 48
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: parent.top
-                anchors.topMargin: 3
+                anchors.topMargin: 10
                 fillMode: Image.PreserveAspectFit
                 sourceSize.width: width
                 sourceSize.height: height
@@ -41,9 +41,11 @@
                 color: parent.state == "pressed" ? "#5e5e5e" : "#ffffff"
                 elide: Text.ElideMiddle
                 horizontalAlignment: Text.AlignHCenter
+                anchors.top: icon.bottom
                 anchors.bottom: parent.bottom
                 anchors.right: parent.right
                 anchors.left: parent.left
+                anchors.topMargin: 13
                 anchors.bottomMargin: 5
                 anchors.rightMargin: 3
                 anchors.leftMargin: 3

=== modified file 'places/artwork/arrow.png'
Binary files places/artwork/arrow.png	2010-10-17 03:39:26 +0000 and places/artwork/arrow.png	2011-02-22 03:27:59 +0000 differ
=== removed file 'places/artwork/border_glow.png'
Binary files places/artwork/border_glow.png	2010-10-15 00:14:28 +0000 and places/artwork/border_glow.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'places/artwork/border_glow.sci'
--- places/artwork/border_glow.sci	2010-11-27 02:56:39 +0000
+++ places/artwork/border_glow.sci	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-border.left: 11
-border.top: 12
-border.bottom: 12
-border.right: 11
-source: border_glow.png
-# It might be more efficient to have a png with a bigger transparent
-# middle and setting the tile rules to Repeat
-horizontalTileRule: Stretch
-verticalTileRule: Stretch

=== removed file 'places/artwork/checker.png'
Binary files places/artwork/checker.png	2010-10-15 00:14:28 +0000 and places/artwork/checker.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'places/artwork/cross.png'
Binary files places/artwork/cross.png	2010-10-15 03:54:08 +0000 and places/artwork/cross.png	2011-02-22 03:27:59 +0000 differ
=== added file 'places/artwork/find_files.png'
Binary files places/artwork/find_files.png	1970-01-01 00:00:00 +0000 and places/artwork/find_files.png	2011-02-22 03:27:59 +0000 differ
=== added file 'places/artwork/find_internet_apps.png'
Binary files places/artwork/find_internet_apps.png	1970-01-01 00:00:00 +0000 and places/artwork/find_internet_apps.png	2011-02-22 03:27:59 +0000 differ
=== added file 'places/artwork/find_media_apps.png'
Binary files places/artwork/find_media_apps.png	1970-01-01 00:00:00 +0000 and places/artwork/find_media_apps.png	2011-02-22 03:27:59 +0000 differ
=== added file 'places/artwork/find_more_apps.png'
Binary files places/artwork/find_more_apps.png	1970-01-01 00:00:00 +0000 and places/artwork/find_more_apps.png	2011-02-22 03:27:59 +0000 differ
=== added file 'places/artwork/open_shortcuts.png'
Binary files places/artwork/open_shortcuts.png	1970-01-01 00:00:00 +0000 and places/artwork/open_shortcuts.png	2011-02-22 03:27:59 +0000 differ
=== removed directory 'places/artwork/scrollbar'
=== added file 'places/artwork/scrollbar.png'
Binary files places/artwork/scrollbar.png	1970-01-01 00:00:00 +0000 and places/artwork/scrollbar.png	2011-02-22 03:27:59 +0000 differ
=== added file 'places/artwork/scrollbar.sci'
--- places/artwork/scrollbar.sci	1970-01-01 00:00:00 +0000
+++ places/artwork/scrollbar.sci	2011-02-22 03:27:59 +0000
@@ -0,0 +1,7 @@
+border.top: 10
+border.bottom: 10
+border.left: 5
+border.right: 5
+source: scrollbar.png
+horizontalTileRule: Repeat
+verticalTileRule: Repeat

=== removed file 'places/artwork/scrollbar/background.png'
Binary files places/artwork/scrollbar/background.png	2010-11-27 03:13:00 +0000 and places/artwork/scrollbar/background.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'places/artwork/scrollbar/background.sci'
--- places/artwork/scrollbar/background.sci	2010-11-27 03:13:00 +0000
+++ places/artwork/scrollbar/background.sci	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-border.top: 7
-border.bottom: 6
-border.left: 4
-border.right: 4
-source: background.png
-horizontalTileRule: Repeat
-verticalTileRule: Repeat

=== removed file 'places/artwork/scrollbar/handle_default.png'
Binary files places/artwork/scrollbar/handle_default.png	2010-11-27 03:13:00 +0000 and places/artwork/scrollbar/handle_default.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'places/artwork/scrollbar/handle_pressed.png'
Binary files places/artwork/scrollbar/handle_pressed.png	2010-11-27 03:13:00 +0000 and places/artwork/scrollbar/handle_pressed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'places/artwork/scrollbar/slider_default.png'
Binary files places/artwork/scrollbar/slider_default.png	2010-11-27 03:13:00 +0000 and places/artwork/scrollbar/slider_default.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'places/artwork/scrollbar/slider_default.sci'
--- places/artwork/scrollbar/slider_default.sci	2010-11-27 03:13:00 +0000
+++ places/artwork/scrollbar/slider_default.sci	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-border.top: 12
-border.bottom: 12
-border.left: 9
-border.right: 9
-source: slider_default.png
-horizontalTileRule: Repeat
-verticalTileRule: Repeat

=== removed file 'places/artwork/scrollbar/slider_hovered.png'
Binary files places/artwork/scrollbar/slider_hovered.png	2010-11-27 03:13:00 +0000 and places/artwork/scrollbar/slider_hovered.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'places/artwork/scrollbar/slider_hovered.sci'
--- places/artwork/scrollbar/slider_hovered.sci	2010-11-27 03:13:00 +0000
+++ places/artwork/scrollbar/slider_hovered.sci	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-border.top: 12
-border.bottom: 12
-border.left: 9
-border.right: 9
-source: slider_hovered.png
-horizontalTileRule: Repeat
-verticalTileRule: Repeat

=== removed file 'places/artwork/scrollbar/slider_pressed.png'
Binary files places/artwork/scrollbar/slider_pressed.png	2010-11-27 03:13:00 +0000 and places/artwork/scrollbar/slider_pressed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'places/artwork/scrollbar/slider_pressed.sci'
--- places/artwork/scrollbar/slider_pressed.sci	2010-11-27 03:13:00 +0000
+++ places/artwork/scrollbar/slider_pressed.sci	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-border.top: 12
-border.bottom: 12
-border.left: 9
-border.right: 9
-source: slider_pressed.png
-horizontalTileRule: Repeat
-verticalTileRule: Repeat

=== added file 'places/artwork/search_background.png'
Binary files places/artwork/search_background.png	1970-01-01 00:00:00 +0000 and places/artwork/search_background.png	2011-02-22 03:27:59 +0000 differ
=== added file 'places/artwork/search_background.sci'
--- places/artwork/search_background.sci	1970-01-01 00:00:00 +0000
+++ places/artwork/search_background.sci	2011-02-22 03:27:59 +0000
@@ -0,0 +1,7 @@
+border.left: 11
+border.top: 10
+border.bottom: 10
+border.right: 11
+source: search_background.png
+horizontalTileRule: Repeat
+verticalTileRule: Repeat

=== modified file 'places/artwork/search_icon.png'
Binary files places/artwork/search_icon.png	2010-11-28 03:03:12 +0000 and places/artwork/search_icon.png	2011-02-22 03:27:59 +0000 differ
=== removed file 'places/artwork/separator.png'
Binary files places/artwork/separator.png	2010-10-15 03:25:21 +0000 and places/artwork/separator.png	1970-01-01 00:00:00 +0000 differ
=== added file 'places/artwork/tick.png'
Binary files places/artwork/tick.png	1970-01-01 00:00:00 +0000 and places/artwork/tick.png	2011-02-22 03:27:59 +0000 differ
=== added file 'places/artwork/tick_box.png'
Binary files places/artwork/tick_box.png	1970-01-01 00:00:00 +0000 and places/artwork/tick_box.png	2011-02-22 03:27:59 +0000 differ
=== modified file 'places/dash.qml'
--- places/dash.qml	2011-02-22 03:27:59 +0000
+++ places/dash.qml	2011-02-22 03:27:59 +0000
@@ -28,7 +28,7 @@
            It could be due to Qt bug QTBUG-13380:
            "Listview gets focus when it becomes visible"
         */
-        search_bar.focus = true
+        search_entry.focus = true
     }
 
     function activatePlaceEntry(fileName, groupName, section) {
@@ -85,18 +85,38 @@
         /* Unhandled keys will always be forwarded to the search bar. That way
            the user can type and search from anywhere in the interface without
            necessarily focusing the search bar first. */
-        Keys.forwardTo: [search_bar]
-
-        SearchBar {
-            id: search_bar
+        Keys.forwardTo: [search_entry]
+
+
+        SearchEntry {
+            id: search_entry
 
             focus: true
 
             anchors.top: parent.top
+            anchors.topMargin: 10
             anchors.left: parent.left
-            anchors.leftMargin: 3
-            width: 616
-            height: 47
+            anchors.leftMargin: 16
+            anchors.right: refine_search.left
+            anchors.rightMargin: 10
+
+            height: 53
+        }
+
+        SearchRefine {
+            id: refine_search
+
+            /* SearchRefine is only to be displayed for places, not in the home page */
+            visible: dashView.activePlaceEntry != ""
+            placeEntryModel: visible && currentPage != undefined ? currentPage.model : undefined
+
+            anchors.top: search_entry.anchors.top
+            anchors.topMargin: search_entry.anchors.topMargin
+            height: parent.height
+            headerHeight: search_entry.height
+            width: 295
+            anchors.right: parent.right
+            anchors.rightMargin: 19
         }
 
         Button {
@@ -122,14 +142,14 @@
         Loader {
             id: pageLoader
 
-            anchors.top: search_bar.bottom
-            anchors.topMargin: 12
+            anchors.top: search_entry.bottom
+            anchors.topMargin: 2
             anchors.bottom: parent.bottom
             anchors.bottomMargin: 12
             anchors.left: parent.left
-            anchors.leftMargin: 7
-            anchors.right: parent.right
-            anchors.rightMargin: 8
+            anchors.leftMargin: 20
+            anchors.right: refine_search.folded ? parent.right : refine_search.left
+            anchors.rightMargin: refine_search.folded ? 0 : 15
         }
     }
 }