Merge lp:~unity-2d-team/unity-2d/filter-option-compact-shell into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Lohith D Shivamurthy]

[shell][dash] Now we have a separate renderer filter-checkoption-compact. Hence the same change is incorparated in unity-2d-shell.

[Michał Sawicz (saviq)]

The tests rely on the fact that Application and Music lens as we know them have 2 and 3 columns, respectively.
That doesn't look like a reliable way to test, can you think of a better way? The easiest would probably be to go through the lenses / filters to find one that's filter-check-option and the other filter-check-option-compact.

Obviously that won't work when no lens uses those, but at some point we might have a fake testing lens that will have all of the different filter types for testing and the tests will still work, whereas we can't be sure people actually have the Applications or the Music lens.

Gerry, what's your take on it?

review: Needs Fixing

[Gerry Boland (gerboland)]

The lenses are something we don't have control over. However in the absense of test lenses, we've got to assume *some* lenses are there. I'm happy assuming Applications, Documents & Music are there, as they're the defaults.

And to do a reliable test, we've got to know a lens with filter-check-option, and one with filter-check-option-compact. Applications & Music (resp.) are suitable. Cycling through them doesn't test something we know, only that we found a lens which claims to have 2 or 3 columns.

So I think these tests are sufficient.

Long term goal is to have a test lens, so we don't need to worry about lens changes.

[Gerry Boland (gerboland)]

Comments on test script:

lines 28, 66, 111: Pet peeve: please use "lens" instead of "lense"
 - http://oxforddictionaries.com/spellcheck/?region=us&q=lense

line 29: 'pwd' not needed

lines 78, 123: Expand the comments like "Could not find AppLensButton" to ask if the relevant lens package is installed. Should help people who have removed it.

lines 82+, and others
+ XDo::Mouse.move(button['x_absolute'].to_i + 1, button['y_absolute'].to_i + 1, 0, true)
+ XDo::Mouse.click(nil, nil, :left)
Use button.tap, it's easier & safer.

line 86,130: no need to reset "button"

line 99:
+ verify( TIMEOUT, 'FilterCheckOption don\'t have two columns' ) {
+ loader.GridViewWithSpacing()['columns'] == '2'
+ }
Please use:
verify_equal( 2, TIMEOUT, 'FilterCheckOption don\'t have two columns' ) {
  loader.GridViewWithSpacing()['columns'].to_i
}
instead, as it returns better error output if it fails.

line 123: wrong comment

And some small English suggestions:
61: Check Filter results list view having renderer as filter-checkoption is displayed with two columns
   -> "Check Filter results list view rendered with filter-checkoption is displayed with two columns"
68: Check that filter-checkoption renderer is having two columns
   -> "Check that the filter-checkoption renderer uses two columns"
and similar.

review: Needs Fixing

[lp:~unity-2d-team/unity-2d/filter-option-compact-shell]

932. By Lohith D Shivamurthy on 2012-01-25

[shell][dash] Review comments fixed

933. By Lohith D Shivamurthy on 2012-01-26

[places][tests] replace sysytem with .execute_shell_command

934. By Lohith D Shivamurthy on 2012-01-26

[places][tests] Use the global and remove the local @sut

935. By Lohith D Shivamurthy on 2012-01-26

[places] replace 'system' i teardown too

[Gerry Boland (gerboland)]

Ok now I've verified that Unity-Core has been updated to support this change, I've tested it and it's working.

Issue found: the Documents lens, the "Last Modified" checkboxes are not compact - but they should be according to the mockups.

This requires a fix in the documents lens. I've logged this bug here:
https://bugs.launchpad.net/unity-lens-files/+bug/928208
I'll hold off merging this until that bug is fixed.

I suggest in the mean time you keep this branch up to date.

[Florian Boucault (fboucault)]

Please resubmit the MR against lp:unity-2d

[lp:~unity-2d-team/unity-2d/filter-option-compact-shell]

936. By Lohith D Shivamurthy on 2012-02-16

merge

937. By Lohith D Shivamurthy on 2012-02-17

nerge lp:unity-2d

938. By Lohith D Shivamurthy on 2012-02-17

merge lp:~dyams/unity-2d/fix-modifed-filter-3-columns

Unmerged revisions

938. By Lohith D Shivamurthy on 2012-02-17

merge lp:~dyams/unity-2d/fix-modifed-filter-3-columns

937. By Lohith D Shivamurthy on 2012-02-17

nerge lp:unity-2d

936. By Lohith D Shivamurthy on 2012-02-16

merge

935. By Lohith D Shivamurthy on 2012-01-26

[places] replace 'system' i teardown too

934. By Lohith D Shivamurthy on 2012-01-26

[places][tests] Use the global and remove the local @sut

933. By Lohith D Shivamurthy on 2012-01-26

[places][tests] replace sysytem with .execute_shell_command

932. By Lohith D Shivamurthy on 2012-01-25

[shell][dash] Review comments fixed

931. By Lohith D Shivamurthy on 2012-01-24

[shell] Have a separate QML for new renderer filter-checkoption-compact

930. By Lohith D Shivamurthy on 2012-01-24

[shell] Add comments to test cases

929. By Lohith D Shivamurthy on 2012-01-24

[shell] Tests added to verify the new renderer

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2012-01-27 12:39:09 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2012-02-16 08:01:24 +0000
@@ -23,7 +23,7 @@
       <description>Whether or not the super (also called windows key) key is used.</description>
     </key>
     <key name="hide-mode" type="i">
-      <default>2</default>
+      <default>0</default>
       <summary>Hiding mode of the launcher</summary>
       <description>Possible values:
         0: never hide; the launcher is always visible and windows won't overlap with it

=== modified file 'debian/control'
--- debian/control	2012-02-06 12:07:47 +0000
+++ debian/control	2012-02-16 08:01:24 +0000
@@ -15,7 +15,7 @@
                libqtgconf-dev,
                libdconf-qt-dev,
                libqtbamf-dev (>= 0.2.3-0ubuntu1),
-               libqtdee-dev (>= 0.2.3-0ubuntu2),
+               libqtdee-dev (>= 0.2.4-0ubuntu1),
                libdbusmenu-qt-dev,
                libx11-dev,
                libindicator3-dev,

=== modified file 'libunity-2d-private/src/lens.cpp'
--- libunity-2d-private/src/lens.cpp	2011-12-14 22:45:04 +0000
+++ libunity-2d-private/src/lens.cpp	2012-02-16 08:01:24 +0000
@@ -224,9 +224,21 @@
 
     m_filters = new Filters(m_unityLens->filters, this);
 
-    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
-    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
-    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+    if (QString::fromStdString(m_unityLens->results()->swarm_name) == QString(":local")) {
+        m_results->setModel(m_unityLens->results()->model());
+    } else {
+        m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+    }
+    if (QString::fromStdString(m_unityLens->global_results()->swarm_name) == QString(":local")) {
+        m_globalResults->setModel(m_unityLens->global_results()->model());
+    } else {
+        m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+    }
+    if (QString::fromStdString(m_unityLens->categories()->swarm_name) == QString(":local")) {
+        m_categories->setModel(m_unityLens->categories()->model());
+    } else {
+        m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+    }
 
     /* Property change signals */
     m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));

=== modified file 'libunity-2d-private/src/lenses.cpp'
--- libunity-2d-private/src/lenses.cpp	2011-09-09 10:15:14 +0000
+++ libunity-2d-private/src/lenses.cpp	2012-02-16 08:01:24 +0000
@@ -27,6 +27,8 @@
 
 // libunity-core
 #include <UnityCore/FilesystemLenses.h>
+#include <UnityCore/HomeLens.h>
+#include <unity2dtr.h>
 
 Lenses::Lenses(QObject *parent) :
     QAbstractListModel(parent)
@@ -36,17 +38,18 @@
     roles[Lenses::RoleVisible] = "visible";
     setRoleNames(roles);
 
+    m_homeLens = new unity::dash::HomeLens(u2dTr("Home").toStdString(), u2dTr("Home screen").toStdString(), u2dTr("Search").toStdString());
     m_unityLenses = new unity::dash::FilesystemLenses("/usr/share/unity/lenses");
-    for (unsigned int i=0; i<m_unityLenses->count(); i++) {
-        unity::dash::Lens::Ptr unityLens = m_unityLenses->GetLensAtIndex(i);
-        addUnityLens(unityLens, i);
-    }
-    m_unityLenses->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
+    m_homeLens->AddLenses(*m_unityLenses);
+    m_homeLens->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
+    unity::dash::HomeLens::Ptr homeLensPtr(m_homeLens);
+    addUnityLens(homeLensPtr, 0);
 }
 
 Lenses::~Lenses()
 {
     delete m_unityLenses;
+    delete m_homeLens;
 }
 
 int Lenses::rowCount(const QModelIndex& parent) const

=== modified file 'libunity-2d-private/src/lenses.h'
--- libunity-2d-private/src/lenses.h	2011-08-11 14:38:51 +0000
+++ libunity-2d-private/src/lenses.h	2012-02-16 08:01:24 +0000
@@ -26,6 +26,7 @@
 
 // libunity-core
 #include <UnityCore/Lens.h>
+#include <UnityCore/HomeLens.h>
 
 namespace unity
 {
@@ -64,6 +65,7 @@
 
 private:
     unity::dash::Lenses* m_unityLenses;
+    unity::dash::HomeLens* m_homeLens;
     QList<Lens*> m_lenses;
 
     void addUnityLens(unity::dash::Lens::Ptr unity_lens, int index);

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-10 17:03:01 +0000
+++ shell/Shell.qml	2012-02-16 08:01:24 +0000
@@ -164,7 +164,7 @@
 
             InputShapeMask {
                 id: shape1
-                source: "shell/dash/artwork/desktop_dash_background_no_transparency.png"
+                source: "shell/common/artwork/desktop_dash_background_no_transparency.png"
                 color: "red"
                 position: Qt.point(dashLoader.width - 50, dashLoader.height - 49)
                 enabled: declarativeView.dashMode == ShellDeclarativeView.DesktopMode

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-09 12:27:35 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-02-16 08:01:24 +0000
@@ -41,6 +41,7 @@
 #include <QtDBus/QDBusInterface>
 #include <QX11Info>
 #include <QGraphicsObject>
+#include <QFileInfo>
 
 // X11
 #include <X11/Xlib.h>
@@ -188,6 +189,12 @@
     return m_active;
 }
 
+bool
+ShellDeclarativeView::haveCustomHomeShortcuts() const
+{
+    return QFileInfo(unity2dDirectory() + "/shell/dash/HomeShortcutsCustomized.qml").exists();
+}
+
 void
 ShellDeclarativeView::setDashMode(ShellDeclarativeView::DashMode mode)
 {

=== modified file 'shell/app/shelldeclarativeview.h'
--- shell/app/shelldeclarativeview.h	2012-02-09 02:22:19 +0000
+++ shell/app/shelldeclarativeview.h	2012-02-16 08:01:24 +0000
@@ -39,6 +39,7 @@
     Q_PROPERTY(QString activeLens READ activeLens WRITE setActiveLens NOTIFY activeLensChanged)
     Q_PROPERTY(bool focus READ hasFocus NOTIFY focusChanged) // overridden to add notify
     Q_PROPERTY(bool superKeyHeld READ superKeyHeld NOTIFY superKeyHeldChanged)
+    Q_PROPERTY(bool haveCustomHomeShortcuts READ haveCustomHomeShortcuts)
 
     /* These two properties and mouse movement tracking on the widget are added here only because
        we need to detect when the mouse is inside the area occupied by the lancher. This should
@@ -59,6 +60,7 @@
 
     /* getters */
     bool dashActive() const;
+    bool haveCustomHomeShortcuts() const;
     DashMode dashMode() const;
     const QString& activeLens() const;
     bool expanded() const;

=== added file 'shell/common/Background.qml'
--- shell/common/Background.qml	1970-01-01 00:00:00 +0000
+++ shell/common/Background.qml	2012-02-16 08:01:24 +0000
@@ -0,0 +1,111 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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 1.1
+import Unity2d 1.0
+import Effects 1.0
+
+Item {
+    id: background
+    property bool active: false
+    property bool fullscreen: false
+    property int bottomBorderThickness
+    property int rightBorderThickness
+
+    /* Avoid redraw at rendering */
+    effect: CacheEffect {}
+
+    Item {
+        anchors.fill: parent
+        anchors.bottomMargin: bottomBorderThickness
+        anchors.rightMargin: rightBorderThickness
+        clip: true
+
+        Image {
+            id: blurredBackground
+
+            effect: Blur {blurRadius: 12}
+
+            /* 'source' needs to be set when this becomes visible, that is when active
+               becomes true, so that a screenshot of the desktop is taken at that point.
+               See http://doc.qt.nokia.com/4.7-snapshot/qml-image.html#cache-prop
+            */
+
+            /* Use an image of the root window which essentially is a
+               capture of the entire screen */
+            source: active ? "image://window/root" : ""
+            cache: false
+
+            fillMode: Image.PreserveAspectCrop
+
+            /* Place the screenshot of the desktop background on top of the desktop background,
+               no matter where the DeclarativeView or the parent object are placed.
+            */
+            property variant origin: parent.mapFromItem(null, -declarativeView.globalPosition.x, -declarativeView.globalPosition.y)
+            x: origin.x
+            y: origin.y
+        }
+
+        Image {
+            anchors.fill: parent
+            fillMode: Image.PreserveAspectCrop
+            source: "artwork/background_sheen.png"
+        }
+    }
+
+    BorderImage {
+        id: border
+
+        /* Define properties of border here */
+        property int bottomThickness: 39
+        property int rightThickness: 37
+
+        anchors.fill: parent
+        source: desktop.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
+        mirror: isRightToLeft()
+    }
+
+    states: [
+        State {
+            name: "normal"
+            when: !fullscreen
+            PropertyChanges {
+                target: background
+                bottomBorderThickness: border.bottomThickness
+                rightBorderThickness: border.rightThickness
+            }
+            PropertyChanges {
+                target: border
+                visible: true
+            }
+        },
+        State {
+            name: "fullscreen"
+            when: fullscreen
+            PropertyChanges {
+                target: background
+                bottomBorderThickness: 0
+                rightBorderThickness: 0
+            }
+            PropertyChanges {
+                target: border
+                visible: false
+            }
+        }
+    ]
+}

=== added file 'shell/common/IconTile.qml'
--- shell/common/IconTile.qml	1970-01-01 00:00:00 +0000
+++ shell/common/IconTile.qml	2012-02-16 08:01:24 +0000
@@ -0,0 +1,97 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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 1.1
+import Unity2d 1.0
+
+Item {
+    id: iconTile
+
+    property bool activeFocus: false
+    property bool backgroundFromIcon: true
+    property alias source: icon.source
+    property alias backgroundOpacity: tileBackground.opacity
+
+    /* For icons that do not follow usual tile design, can specify custom tile background,
+       custom tile background when tile selected, and custom shine image for on top */
+    property string selectedTileBackgroundImage: ""
+    property string tileBackgroundImage: ""
+    property string tileShineImage: ""
+
+    property color defaultBackgroundColor: "#333333"
+    property color selectedBackgroundColor: "#dddddd"
+
+    /* This is the image providing the background image. The color blended
+       with this image is obtained from the color of the icon when it's loaded.
+       While the application is launching, this will fade out and in. */
+    Image {
+        id: tileBackground
+        objectName: "tileBackground"
+        property color color: defaultBackgroundColor
+        anchors.fill: parent
+        smooth: true
+
+        source: {
+            if (selectedTileBackgroundImage != "" && declarativeView.focus && activeFocus) {
+                return selectedTileBackgroundImage
+            } else if (tileBackgroundImage != "") {
+                return tileBackgroundImage
+            }
+
+            var actualColor = declarativeView.focus && activeFocus ? selectedBackgroundColor : color
+            return "image://blended/%1color=%2alpha=%3"
+                .arg("common/artwork/round_corner_54x54.png")
+                .arg(actualColor.toString().replace("#", ""))
+                .arg(1.0)
+        }
+    }
+
+    /* This is just the main icon of the tile */
+    Image {
+        id: icon
+        objectName: "icon"
+        anchors.centerIn: parent
+        smooth: true
+
+        sourceSize.width: 48
+        sourceSize.height: 48
+
+        /* Whenever one of the parameters used in calculating the background color of
+           the icon changes, recalculate its value */
+        onWidthChanged: updateColors()
+        onHeightChanged: updateColors()
+        onSourceChanged: updateColors()
+        onStatusChanged: if (status == Image.Error) source = "image://icons/unknown"
+
+        function updateColors() {
+            if (!backgroundFromIcon) return;
+
+            var colors = iconUtilities.getColorsFromIcon(icon.source, icon.sourceSize)
+            if (colors && colors.length > 0) tileBackground.color = colors[0]
+        }
+    }
+
+    /* This just adds some shiny effect to the tile */
+    Image {
+        id: tileShine
+        anchors.fill: parent
+        smooth: true
+
+        source: (tileShineImage != "") ? tileShineImage : "artwork/round_shine_54x54.png"
+    }
+}

=== renamed file 'shell/dash/SearchEntry.qml' => 'shell/common/SearchEntry.qml'
--- shell/dash/SearchEntry.qml	2012-01-10 10:42:46 +0000
+++ shell/common/SearchEntry.qml	2012-02-16 08:01:24 +0000
@@ -18,28 +18,22 @@
 
 import QtQuick 1.1
 import Effects 1.0
-import "../common/fontUtils.js" as FontUtils
-import "../common"
+import "fontUtils.js" as FontUtils
 
 AbstractButton {
     property string searchQuery
+    property string placeHolderText: ""
+    property bool active: false
+
+    signal activateFirstResult
 
     Accessible.name: "Search Entry"
 
-    /* Cancels current search when the dash becomes invisible */
-    Connections {
-        target: dash
-        onActiveChanged: if (!dash.active) search_input.text = ""
-    }
-
-    Binding {
-        target: dash.currentPage != undefined ? dash.currentPage.model : null
-        property: "searchQuery"
-        value: searchQuery
-    }
+    /* Delete search when set in-active */
+    onActiveChanged: if (!active) searchInput.text = ""
 
     /* Keys forwarded to the search entry are forwarded to the text input. */
-    Keys.forwardTo: [search_input]
+    Keys.forwardTo: [searchInput]
 
     opacity: ( state == "selected" || state == "hovered" ) ? 1.0 : 0.7
 
@@ -58,7 +52,7 @@
         anchors.rightMargin: 16
 
         Image {
-            id: search_icon
+            id: searchIcon
 
             anchors.left: parent.left
             anchors.leftMargin: -9
@@ -68,28 +62,28 @@
 
             smooth: true
 
-            source: search_input.text ? "artwork/cross.png" : "artwork/search_icon.png"
+            source: searchInput.text ? "artwork/cross.png" : "artwork/search_icon.png"
             fillMode: Image.PreserveAspectFit
         }
 
         MouseArea {
-            id: clear_button
+            id: clearButton
 
             Accessible.name: "Clear"
             Accessible.role: Accessible.PushButton
 
-            anchors.fill: search_icon
+            anchors.fill: searchIcon
 
             onClicked: {
-                search_input.forceActiveFocus()
-                search_input.text = ""
+                searchInput.forceActiveFocus()
+                searchInput.text = ""
             }
         }
 
         TextInput {
-            id: search_input
+            id: searchInput
 
-            Accessible.name: search_instructions.text
+            Accessible.name: searchInstructions.text
             Accessible.role: Accessible.EditableText
 
             effect: DropShadow {
@@ -99,10 +93,10 @@
                     offset.x: 0
                     offset.y: 0
                     color: "white"
-                    enabled: search_input.text != "" || search_input.inputMethodComposing
+                    enabled: searchInput.text != "" || searchInput.inputMethodComposing
                 }
 
-            anchors.left: search_icon.right
+            anchors.left: searchIcon.right
             anchors.leftMargin: -5
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
@@ -115,17 +109,17 @@
             cursorDelegate: cursor
             selectionColor: "gray"
 
-            onTextChanged: live_search_timeout.restart()
+            onTextChanged: liveSearchTimeout.restart()
 
             Timer {
-                id: live_search_timeout
+                id: liveSearchTimeout
                 interval: 200
-                onTriggered: searchQuery = search_input.text
+                onTriggered: searchQuery = searchInput.text
             }
 
             Keys.onPressed: {
                 if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter) {
-                    dash.currentPage.activateFirstResult()
+                    activateFirstResult()
                     event.accepted = true;
                 }
             }
@@ -159,7 +153,7 @@
             }
 
             TextCustom {
-                id: search_instructions
+                id: searchInstructions
 
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -173,12 +167,10 @@
                 fontSize: "x-large"
                 font.italic: true
                 text: {
-                    if(search_input.text || search_input.inputMethodComposing)
+                    if(searchInput.text || searchInput.inputMethodComposing)
                         return ""
-                    else if(dash.currentPage != undefined && dash.currentPage.model.searchHint)
-                        return dash.currentPage.model.searchHint
                     else
-                        return u2d.tr("Search")
+                        return placeHolderText
                 }
             }
         }

=== renamed file 'shell/dash/artwork/background_sheen.png' => 'shell/common/artwork/background_sheen.png'
=== renamed file 'shell/dash/artwork/cross.png' => 'shell/common/artwork/cross.png'
=== renamed file 'shell/dash/artwork/desktop_dash_background.png' => 'shell/common/artwork/desktop_dash_background.png'
=== renamed file 'shell/dash/artwork/desktop_dash_background.sci' => 'shell/common/artwork/desktop_dash_background.sci'
=== renamed file 'shell/dash/artwork/desktop_dash_background_no_transparency.png' => 'shell/common/artwork/desktop_dash_background_no_transparency.png'
=== renamed file 'shell/dash/artwork/desktop_dash_background_no_transparency.sci' => 'shell/common/artwork/desktop_dash_background_no_transparency.sci'
=== renamed file 'shell/launcher/artwork/round_corner_54x54.png' => 'shell/common/artwork/round_corner_54x54.png'
=== renamed file 'shell/launcher/artwork/round_shine_54x54.png' => 'shell/common/artwork/round_shine_54x54.png'
=== renamed file 'shell/dash/artwork/search_background.png' => 'shell/common/artwork/search_background.png'
=== renamed file 'shell/dash/artwork/search_background.sci' => 'shell/common/artwork/search_background.sci'
=== renamed file 'shell/dash/artwork/search_icon.png' => 'shell/common/artwork/search_icon.png'
=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-02-09 11:22:43 +0000
+++ shell/dash/Dash.qml	2012-02-16 08:01:24 +0000
@@ -106,6 +106,7 @@
         for (var i=0; i<lenses.rowCount(); i++) {
             lenses.get(i).viewType = Lens.Hidden
         }
+        declarativeView.activeLens = ""
     }
 
     SpreadMonitor {
@@ -133,11 +134,19 @@
             return
         }
 
-        /* To activate lens, we set its viewType to LensView, and then set all
-           other lenses to Hidden */
         for (var i=0; i<lenses.rowCount(); i++) {
             var thislens = lenses.get(i)
-            thislens.viewType = (lens == thislens) ?  Lens.LensView : Lens.Hidden
+            if (lensId == "home.lens") {
+                if (thislens.id == lensId) {
+                    thislens.viewType = Lens.LensView
+                    continue
+                }
+                /* When Home is shown, need to notify all other lenses. Those in the global view
+                    (in home search results page) are set to HomeView, all others to Hidden */
+                thislens.viewType = (thislens.searchInGlobal) ? Lens.HomeView : Lens.Hidden
+            } else {
+                thislens.viewType = (lens == thislens) ?  Lens.LensView : Lens.Hidden
+            }
         }
 
         buildLensPage(lens)
@@ -147,20 +156,19 @@
 
     function activateHome() {
         if (spreadMonitor.shown) return
-
-        /* When Home is shown, need to notify all other lenses. Those in the global view
-           (in home search results page) are set to HomeView, all others to Hidden */
-        for (var i=0; i<lenses.rowCount(); i++) {
-            var thislens = lenses.get(i)
-            thislens.viewType = (thislens.searchInGlobal) ? Lens.HomeView : Lens.Hidden
+        if (declarativeView.haveCustomHomeShortcuts) {
+            for (var i=0; i<lenses.rowCount(); i++) {
+                lenses.get(i).viewType = Lens.Hidden
+            }
+            pageLoader.setSource("Home.qml")
+            /* Take advantage of the fact that the loaded qml is local and setting
+               the source loads it immediately making pageLoader.item valid */
+            activatePage(pageLoader.item)
+            declarativeView.activeLens = ""
+            dash.active = true
+        } else {
+            activateLens("home.lens")
         }
-
-        pageLoader.setSource("Home.qml")
-        /* Take advantage of the fact that the loaded qml is local and setting
-           the source loads it immediately making pageLoader.item valid */
-        activatePage(pageLoader.item)
-        declarativeView.activeLens = ""
-        dash.active = true
     }
 
     function activateLensWithOptionFilter(lensId, filterId, optionId) {
@@ -211,55 +219,13 @@
         }
     }
 
-    Item {
+    Background {
         id: background
 
         anchors.fill: parent
 
-        /* Avoid redraw at rendering */
-        effect: CacheEffect {}
-
-        Item {
-            anchors.fill: parent
-            anchors.bottomMargin: content.anchors.bottomMargin
-            anchors.rightMargin: content.anchors.rightMargin
-            clip: true
-
-            Image {
-                id: blurredBackground
-
-                effect: Blur {blurRadius: 12}
-
-                /* 'source' needs to be set when the dash becomes visible, that
-                   is when dash.active becomes true, so that a
-                   screenshot of the windows behind the dash is taken at that
-                   point.
-                   See http://doc.qt.nokia.com/4.7-snapshot/qml-image.html#cache-prop
-                */
-
-                /* Use an image of the root window which essentially is a
-                   capture of the entire screen */
-                source: dash.active ? "image://window/root" : ""
-                cache: false
-
-                fillMode: Image.PreserveAspectCrop
-                x: -launcherLoader.width
-                y: -declarativeView.globalPosition.y
-            }
-
-            Image {
-                anchors.fill: parent
-                fillMode: Image.PreserveAspectCrop
-                source: "artwork/background_sheen.png"
-            }
-        }
-
-        BorderImage {
-            anchors.fill: parent
-            visible: declarativeView.dashMode == ShellDeclarativeView.DesktopMode
-            source: desktop.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
-            mirror: isRightToLeft()
-        }
+        active: dash.active
+        fullscreen: declarativeView.dashMode != ShellDeclarativeView.DesktopMode
     }
 
     Item {
@@ -269,8 +235,8 @@
         /* Margins in DesktopMode set so that the content does not overlap with
            the border defined by the background image.
         */
-        anchors.bottomMargin: declarativeView.dashMode == ShellDeclarativeView.DesktopMode ? 39 : 0
-        anchors.rightMargin: declarativeView.dashMode == ShellDeclarativeView.DesktopMode ? 37 : 0
+        anchors.bottomMargin: background.bottomBorderThickness
+        anchors.rightMargin: background.rightBorderThickness
 
         /* Unhandled keys will always be forwarded to the search bar. That way
            the user can type and search from anywhere in the interface without
@@ -296,6 +262,17 @@
             anchors.rightMargin: 15
 
             height: 42
+
+            active: dash.active
+            placeHolderText: {
+                if(dash.currentPage != undefined && dash.currentPage.model.searchHint)
+                    return dash.currentPage.model.searchHint
+                else
+                    return u2d.tr("Search")
+            }
+
+            onSearchQueryChanged: if (dash.currentPage != undefined) dash.currentPage.model.searchQuery = searchQuery
+            onActivateFirstResult: if (dash.currentPage != undefined) dash.currentPage.activateFirstResult()
         }
 
         FilterPane {
@@ -304,7 +281,7 @@
             KeyNavigation.left: search_entry
 
             /* FilterPane is only to be displayed for lenses, not in the home page or Alt+F2 Run page */
-            visible: declarativeView.activeLens != "" && declarativeView.activeLens != "commands.lens"
+            visible: declarativeView.activeLens != "home.lens" && declarativeView.activeLens != "" && declarativeView.activeLens != "commands.lens"
             lens: visible && currentPage != undefined ? currentPage.model : undefined
 
             anchors.top: search_entry.anchors.top

=== modified file 'shell/dash/FilterCheckoption.qml'
--- shell/dash/FilterCheckoption.qml	2012-01-10 16:52:24 +0000
+++ shell/dash/FilterCheckoption.qml	2012-02-16 08:01:24 +0000
@@ -23,11 +23,13 @@
 
     height: filters.height
 
+    property variant grid_columns : 2
+
     GridViewWithSpacing {
         id: filters
 
-        columns: ( filterView.filterModel.id == "genre"
-                  || filterView.filterModel.id == "modified" ) ? 3 : 2
+        columns: grid_columns
+
         rows: Math.ceil(count/columns)
 
         horizontalSpacing: 10

=== added file 'shell/dash/FilterCheckoptionCompact.qml'
--- shell/dash/FilterCheckoptionCompact.qml	1970-01-01 00:00:00 +0000
+++ shell/dash/FilterCheckoptionCompact.qml	2012-02-16 08:01:24 +0000
@@ -0,0 +1,22 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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 1.0
+
+FilterCheckoption {
+    grid_columns : 3
+}

=== modified file 'shell/dash/FilterLoader.qml'
--- shell/dash/FilterLoader.qml	2011-11-30 10:28:01 +0000
+++ shell/dash/FilterLoader.qml	2012-02-16 08:01:24 +0000
@@ -22,6 +22,7 @@
 
 FocusScope {
     id: filterLoader
+    objectName: filterModel.rendererName
 
     property variant lens
     property variant filterModel
@@ -96,6 +97,7 @@
 
     Loader {
         id: filterView
+        objectName: filterModel.rendererName
 
         KeyNavigation.up: header
         anchors.top: header.bottom

=== modified file 'shell/dash/FilterPane.qml'
--- shell/dash/FilterPane.qml	2012-01-10 17:31:32 +0000
+++ shell/dash/FilterPane.qml	2012-02-16 08:01:24 +0000
@@ -32,6 +32,7 @@
 
     AbstractButton {
         id: header
+        objectName: "filterResults"
 
         Accessible.name: title.text
 

=== modified file 'shell/dash/Home.qml'
--- shell/dash/Home.qml	2012-01-20 09:35:38 +0000
+++ shell/dash/Home.qml	2012-02-16 08:01:24 +0000
@@ -170,7 +170,7 @@
                 width: sourceSize.width
                 height: sourceSize.height
 
-                source: "artwork/cross.png"
+                source: "../common/artwork/cross.png"
             }
 
             opacity: (expanded && declarativeView.dashMode == ShellDeclarativeView.DesktopMode) ? 1 : 0

=== modified file 'shell/dash/LensBar.qml'
--- shell/dash/LensBar.qml	2012-01-10 13:07:48 +0000
+++ shell/dash/LensBar.qml	2012-02-16 08:01:24 +0000
@@ -93,22 +93,6 @@
             return undefined
         }
 
-        /* Need to manually include the Home lens */
-        LensButton {
-            id: homeLens
-
-            Accessible.name: u2d.tr("home")
-
-            focus: true
-            icon: "artwork/lens-nav-home.svg"
-            onClicked: dash.activateHome()
-            active: ( declarativeView.activeLens == "" )
-            iconWidth: lensBar.iconWidth
-            iconSpacing: lensBar.iconSpacing
-            width: iconWidth+iconSpacing
-            height: lensContainer.height
-        }
-
         /* Now fetch all other lenses and display */
         Repeater{
             id: repeater
@@ -116,11 +100,29 @@
             model: visibleLenses
             delegate: LensButton {
                 Accessible.name: u2d.tr(item.name)
+                objectName: item.name
 
                 /* Heuristic: if iconHint does not contain a '/' then it is an icon name */
-                icon: item.iconHint.indexOf("/") == -1 ? "image://icons/" + item.iconHint : item.iconHint
-                active: item.viewType == Lens.LensView
-                onClicked: dash.activateLens(item.id)
+                icon: {
+                    if (item.id == "home.lens") {
+                        return "artwork/lens-nav-home.svg"
+                    }
+                    item.iconHint.indexOf("/") == -1 ? "image://icons/" + item.iconHint : item.iconHint
+                }
+                active: {
+                    /* we need this in order to activate the arrow when using a custom shortcuts file */
+                    if (item.id == "home.lens" && declarativeView.activeLens == "") {
+                        return true
+                    }
+                    return item.viewType == Lens.LensView
+                }
+                onClicked: {
+                    if (item.id == "home.lens") {
+                        dash.activateHome()
+                    } else {
+                        dash.activateLens(item.id)
+                    }
+                }
                 iconWidth: lensBar.iconWidth
                 iconSpacing: lensBar.iconSpacing
                 width: iconWidth+iconSpacing

=== modified file 'shell/dash/LensView.qml'
--- shell/dash/LensView.qml	2012-01-10 10:42:46 +0000
+++ shell/dash/LensView.qml	2012-02-16 08:01:24 +0000
@@ -81,7 +81,7 @@
         bodyDelegate: Loader {
             visible: category_model.count > 0
             width: parent.width
-            height: visible ? item.contentHeight : 0
+            height: item ? visible ? item.contentHeight : 0 : 0
 
             property string name: model.column_0
             property string iconHint: model.column_1
@@ -119,18 +119,19 @@
             Binding { target: item; property: "categoryId"; value: categoryId }
             Binding { target: item; property: "category_model"; value: category_model }
             Binding { target: item; property: "lens"; value: lensView.model }
+            Binding { target: item; property: "lensId"; value: lensView.model.id }
 
             onLoaded: item.focus = true
         }
 
         headerDelegate: CategoryHeader {
-            visible: body.item.needHeader && body.visible
+            visible: body.item ? body.item.needHeader && body.visible : false
             height: visible ? 32 : 0
 
-            property bool foldable: body.item.folded != undefined
-            availableCount: foldable ? body.category_model.count - body.item.cellsPerRow : 0
-            folded: foldable ? body.item.folded : false
-            onClicked: if(foldable) body.item.folded = !body.item.folded
+            property bool foldable: body.item ? body.item.folded != undefined : false
+            availableCount: body.item ? foldable ? body.category_model.count - body.item.cellsPerRow : 0 : 0
+            folded: body.item ? foldable ? body.item.folded : false : false
+            onClicked: if(foldable && body.item) body.item.folded = !body.item.folded
             moving: flickerMoving
 
             icon: body.iconHint

=== modified file 'shell/dash/RendererGrid.qml'
--- shell/dash/RendererGrid.qml	2011-11-23 10:27:05 +0000
+++ shell/dash/RendererGrid.qml	2012-02-16 08:01:24 +0000
@@ -77,14 +77,6 @@
 
                 FocusPath.index: index
 
-                property string uri: column_0
-                property string iconHint: column_1
-                property string categoryId: column_2 // FIXME: rename to categoryIndex
-                property string mimetype: column_3
-                property string displayName: column_4 // FIXME: rename to name
-                property string comment: column_5
-                property string dndUri: column_6
-
                 Loader {
                     id: loader
 
@@ -96,13 +88,13 @@
 
                     sourceComponent: cellRenderer
                     onLoaded: {
-                        item.uri = uri
-                        item.iconHint = iconHint
-                        item.mimetype = mimetype
-                        item.displayName = displayName
-                        item.comment = comment
+                        item.uri = column_0
+                        item.iconHint = column_1
+                        item.mimetype = column_3
+                        item.displayName = column_4
+                        item.comment = column_5
                         item.focus = true
-                        item.dndUri = dndUri
+                        item.dndUri = column_6
                     }
                 }
             }

=== modified file 'shell/launcher/LauncherItem.qml'
--- shell/launcher/LauncherItem.qml	2012-02-06 12:07:47 +0000
+++ shell/launcher/LauncherItem.qml	2012-02-16 08:01:24 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 1.1
 import Unity2d 1.0
+import "../common"
 
 /* This component represents a single "tile" in the launcher and the surrounding
    indicator icons.
@@ -191,19 +192,22 @@
             height: item.tileSize
             anchors.centerIn: parent
 
-            /* This is the image providing the background image. The
-               color blended with this image is obtained from the color of the icon when it's
-               loaded.
-               While the application is launching, this will fade out and in. */
-            Image {
-                id: tileBackground
-                objectName: "tileBackground"
-                property color color: defaultBackgroundColor
-                anchors.fill: parent
-                smooth: true
-                opacity: 1
-
-                SequentialAnimation on opacity {
+            /* This draws the icon, the tile background and the sheen on top */
+            IconTile {
+                id: icon
+                width: item.tileSize
+                height: item.tileSize
+                anchors.centerIn: parent
+
+                activeFocus: item.activeFocus
+                backgroundFromIcon: item.backgroundFromIcon
+
+                tileBackgroundImage: (item.isBfb) ? "../launcher/artwork/squircle_base_54.png" : ""
+                tileShineImage: (item.isBfb) ? "../launcher/artwork/squircle_shine_54.png" : ""
+                selectedTileBackgroundImage: (item.isBfb) ? "../launcher/artwork/squircle_base_selected_54.png" : ""
+
+                /* tile background fade in/out animation */
+                SequentialAnimation on backgroundOpacity {
                     NumberAnimation { to: 0.0; duration: 1000; easing.type: Easing.InOutQuad }
                     NumberAnimation { to: 1.0; duration: 1000; easing.type: Easing.InOutQuad }
 
@@ -211,24 +215,6 @@
                     alwaysRunToEnd: true
                     running: launching
                 }
-
-                sourceSize.width: item.tileSize
-                sourceSize.height: item.tileSize
-                source: {
-                    if (isBfb) {
-                        if (declarativeView.focus && item.activeFocus) {
-                            return "artwork/squircle_base_selected_54.png"
-                        } else {
-                            return "artwork/squircle_base_54.png"
-                        }
-                    }
-
-                    var actualColor = declarativeView.focus && item.activeFocus ? selectedBackgroundColor : color
-                    return "image://blended/%1color=%2alpha=%3"
-                        .arg("launcher/artwork/round_corner_54x54.png")
-                        .arg(actualColor.toString().replace("#", ""))
-                        .arg(1.0)
-                }
             }
 
             /* This image appears only while launching, and pulses in and out in counterpoint
@@ -254,42 +240,6 @@
                 }
             }
 
-            /* This is just the main icon of the tile */
-            Image {
-                id: icon
-                objectName: "icon"
-                anchors.centerIn: parent
-                smooth: true
-
-                sourceSize.width: 48
-                sourceSize.height: 48
-
-                /* Whenever one of the parameters used in calculating the background color of
-                   the icon changes, recalculate its value */
-                onWidthChanged: updateColors()
-                onHeightChanged: updateColors()
-                onSourceChanged: updateColors()
-                onStatusChanged: if (status == Image.Error) source = "image://icons/unknown"
-
-                function updateColors() {
-                    if (!item.backgroundFromIcon) return;
-
-                    var colors = iconUtilities.getColorsFromIcon(icon.source, icon.sourceSize)
-                    if (colors && colors.length > 0) tileBackground.color = colors[0]
-                }
-            }
-
-            /* This just adds some shiny effect to the tile */
-            Image {
-                id: tileShine
-                anchors.fill: parent
-                smooth: true
-
-                source: isBfb ? "artwork/squircle_shine_54.png" : "artwork/round_shine_54x54.png"
-                sourceSize.width: item.tileSize
-                sourceSize.height: item.tileSize
-            }
-
             Image {
                 id: selectionOutline
                 objectName: "selectionOutline"

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-02-08 10:47:00 +0000
+++ shell/launcher/LauncherList.qml	2012-02-16 08:01:24 +0000
@@ -25,7 +25,7 @@
 
     /* The spacing is explicitly set in order to compensate
        the space added by selectionOutline and round_corner_54x54.png. */
-    spacing: -8
+    spacing: -7
 
     property int tileSize: 54
 

=== modified file 'tests/dash/dash-tests.rb'
--- tests/dash/dash-tests.rb	2012-02-07 18:53:20 +0000
+++ tests/dash/dash-tests.rb	2012-02-16 08:01:24 +0000
@@ -214,6 +214,7 @@
   test "Super, Super and Alt+F1 interaction" do
     XDo::Mouse.move(200, 200, 0, true)
     xid = TmpWindow.open_window_at(10,100)
+    hide_mode = $SUT.execute_shell_command('gsettings get com.canonical.Unity2d.Launcher hide-mode').to_i
     verify_equal( xid.id, TIMEOUT, 'terminal should have focus after starting it' ) {
       XDo::XWindow.active_window
     }
@@ -231,7 +232,8 @@
     verify_equal( xid.id, TIMEOUT, 'terminal should have focus after toggling the dash' ) {
       XDo::XWindow.active_window
     }
-    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher should be hiding after toggling the dash' ) {
+    verify_equal((hide_mode == 0) ? 0 : -LAUNCHER_WIDTH, TIMEOUT, 
+                 'Launcher position wrong after toggling the dash' ) {
       @app.Launcher()['x_absolute'].to_i
     }
     XDo::Keyboard.alt_F1 #Must use uppercase F to indicate function keys

=== added file 'tests/dash/test-renderer-filter-check-option-compact.rb'
--- tests/dash/test-renderer-filter-check-option-compact.rb	1970-01-01 00:00:00 +0000
+++ tests/dash/test-renderer-filter-check-option-compact.rb	2012-02-16 08:01:24 +0000
@@ -0,0 +1,135 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 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/>.
+ */
+=end
+
+require '../run-tests.rb' unless $INIT_COMPLETED
+require 'xdo/xwindow'
+require 'xdo/keyboard'
+require 'xdo/mouse'
+
+############################# Test Suite #############################
+context "Dash - Filter Results renderer tests" do
+  # Run once at the beginning of this test suite
+  startup do
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+  end
+
+  # Run once at the end of this test suite
+  shutdown do
+  end
+
+  # Run before each test case begins
+  setup do
+    # Execute the application
+    @app = $SUT.run( :name => UNITY_2D_SHELL,
+                     :arguments => "-testability",
+                     :sleeptime => 2 )
+  end
+
+  # Run after each test case completes
+  teardown do
+    $SUT.execute_shell_command "pkill -nf unity-2d-shell"
+  end
+
+  #####################################################################################
+  # Test cases
+
+  # Test case objectives:
+  #   * Verify renderer filter-check-option is displayed with two columns
+  # Pre-conditions
+  #   * None
+  # Test steps
+  #   * Open Dash
+  #   * Goto Applications Lens
+  #   * Open Filter Results
+  #   * verify that filter-checkoption renderer is having two columns
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "Verify renderer filter-check-option" do
+    XDo::Keyboard.super
+    verify (TIMEOUT) { @app.Dash() }
+
+    button = ""
+    verify( TIMEOUT, 'Could not find Applications Lens. Did you install it?' ) {
+        button = @app.Dash().LensBar().LensButton( :name => 'Applications' )
+    }
+
+    button.tap
+
+    verify( TIMEOUT, 'Could not find filterResults button' ) {
+        button = @app.Dash().FilterPane().AbstractButton( :name => 'filterResults' )
+    }
+
+    button.tap
+
+    loader = ""
+    verify( TIMEOUT, 'Could not find FilterCheckOption Loader' ) {
+        loader = @app.Dash().FilterPane().FilterLoader(:name => 'filter-checkoption').QDeclarativeLoader( :name => 'filter-checkoption' )
+    }
+
+    verify_equal(2, TIMEOUT, 'FilterCheckOption don\'t have two columns' ) {
+        loader.GridViewWithSpacing()['columns'].to_i
+    }
+
+  end
+
+  # Test case objectives:
+  #   * Verify renderer filter-check-option-compact is displayed with three columns
+  # Pre-conditions
+  #   * None
+  # Test steps
+  #   * Open Dash
+  #   * Goto Music Lens
+  #   * Open Filter-Results
+  #   * verify that filter-checkoption-compact renderer is having three columns
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "Verify renderer filter-check-option-compact" do
+    XDo::Keyboard.super
+    verify (TIMEOUT) { @app.Dash() }
+
+    button = ""
+    verify( TIMEOUT, 'Could not find Music Lens. Did you install it?' ) {
+        button = @app.Dash().LensBar().LensButton( :name => 'Music' )
+    }
+
+    button.tap
+
+    verify( TIMEOUT, 'Could not find filterResults button' ) {
+        button = @app.Dash().FilterPane().AbstractButton( :name => 'filterResults' )
+    }
+
+    button.tap
+
+    loader = ""
+    verify( TIMEOUT, 'Could not find FilterCheckOptionCompact Loader' ) {
+        loader = @app.Dash().FilterPane().FilterLoader(:name => 'filter-checkoption-compact').QDeclarativeLoader( :name => 'filter-checkoption-compact' )
+    }
+
+    verify_equal(3, TIMEOUT, 'FilterCheckOptionCompact don\'t have three columns' ) {
+        loader.GridViewWithSpacing()['columns'].to_i
+    }
+    end
+end

=== modified file 'tests/launcher/autohide_show_tests.rb'
--- tests/launcher/autohide_show_tests.rb	2012-02-07 11:18:21 +0000
+++ tests/launcher/autohide_show_tests.rb	2012-02-16 08:01:24 +0000
@@ -32,6 +32,7 @@
 ############################# Test Suite #############################
 context "Launcher Autohide and Show Tests" do
   launcher_favorites = ""
+  hide_mode = 0
 
   def verify_launcher_visible(timeout, message = '')
     verify_equal( 0, timeout, message ) {
@@ -75,12 +76,18 @@
     $SUT.execute_shell_command 'killall unity-2d-shell'
     $SUT.execute_shell_command 'killall unity-2d-shell'
 
+    hide_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher hide-mode'
+    
+    # Set hide mode to intellihide
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 2'
+
     # Minimize all windows
     XDo::XWindow.toggle_minimize_all
   end
   
   # Run once at the end of this test suite
   shutdown do
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
   end
 
   # Run before each test case begins

=== modified file 'tests/launcher/autohide_show_tests_rtl.rb'
--- tests/launcher/autohide_show_tests_rtl.rb	2012-02-07 11:18:21 +0000
+++ tests/launcher/autohide_show_tests_rtl.rb	2012-02-16 08:01:24 +0000
@@ -32,6 +32,7 @@
 ############################# Test Suite #############################
 context "Launcher Autohide and Show Tests on RTL" do
   launcher_favorites = ""
+  hide_mode = 0
 
   def verify_launcher_visible(timeout, message = '')
     verify_equal( XDo::XWindow.display_geometry[0] - LAUNCHER_WIDTH, timeout, message ) {
@@ -76,12 +77,18 @@
     $SUT.execute_shell_command 'killall unity-2d-shell'
     $SUT.execute_shell_command 'killall unity-2d-shell'
 
+    hide_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher hide-mode'
+    
+    # Set hide mode to intellihide
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 2'
+
     # Minimize all windows
     XDo::XWindow.toggle_minimize_all
   end
   
   # Run once at the end of this test suite
   shutdown do
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
   end
 
   # Run before each test case begins

=== modified file 'tests/shell/input_shaping.rb'
--- tests/shell/input_shaping.rb	2012-02-06 14:00:19 +0000
+++ tests/shell/input_shaping.rb	2012-02-16 08:01:24 +0000
@@ -33,6 +33,7 @@
 ############################# Test Suite #############################
 context "Shell input shape tests" do
   pwd = File.expand_path(File.dirname(__FILE__)) + '/'
+  hide_mode = 0
 
   # Run once at the beginning of this test suite
   startup do
@@ -41,6 +42,11 @@
     $SUT.execute_shell_command 'killall unity-2d-panel'
     $SUT.execute_shell_command 'killall unity-2d-panel'
 
+    hide_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher hide-mode'
+    
+    # Set hide mode to intellihide
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 2'
+
     # Need panel running as position of shell depends on it
     @@panel = $SUT.run(:name => UNITY_2D_PANEL,
                        :arguments => "-testability" )
@@ -51,6 +57,7 @@
   
   # Run once at the end of this test suite
   shutdown do
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
   end
 
   # Run before each test case begins

=== modified file 'tests/shell/input_shaping_rtl.rb'
--- tests/shell/input_shaping_rtl.rb	2012-02-03 11:00:51 +0000
+++ tests/shell/input_shaping_rtl.rb	2012-02-16 08:01:24 +0000
@@ -33,6 +33,7 @@
 ############################# Test Suite #############################
 context "Shell input shape tests" do
   pwd = File.expand_path(File.dirname(__FILE__)) + '/'
+  hide_mode = 0
 
   # Run once at the beginning of this test suite
   startup do
@@ -41,6 +42,11 @@
     $SUT.execute_shell_command 'killall unity-2d-panel'
     $SUT.execute_shell_command 'killall unity-2d-panel'
 
+    hide_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher hide-mode'
+    
+    # Set hide mode to intellihide
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 2'
+
     # Need panel running as position of shell depends on it
     @@panel = $SUT.run(:name => UNITY_2D_PANEL,
                        :arguments => "-testability" )
@@ -51,6 +57,7 @@
   
   # Run once at the end of this test suite
   shutdown do
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
   end
 
   # Run before each test case begins

=== modified file 'tests/spread/spread-tests.rb'
--- tests/spread/spread-tests.rb	2012-01-27 09:06:28 +0000
+++ tests/spread/spread-tests.rb	2012-02-16 08:01:24 +0000
@@ -86,11 +86,15 @@
   # References
   #   * None
   test "Super+s shows the launcher and the spread" do
+    hide_mode = $SUT.execute_shell_command('gsettings get com.canonical.Unity2d.Launcher hide-mode').to_i
+
     verify_not(2, 'There should not be a Spread declarative view on startup') {
       @app_spread.SpreadView()
     }
     xid = TmpWindow.open_window_at(10,100)
-    verify_equal(-LAUNCHER_WIDTH, TIMEOUT, 'The launcher should not be visible with an overlapping window') {
+
+    verify_equal((hide_mode == 0) ? 0 :-LAUNCHER_WIDTH, TIMEOUT, 
+                 'The launcher should not be visible with an overlapping window (unless Launcher in always-show mode)') {
       @app_shell.Launcher()['x_absolute'].to_i
     }
     XDo::Keyboard.super_s