Merge lp:~unity-2d-team/unity-2d/shortcut-hint-overlay into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Lohith D Shivamurthy]

[launcher] Shortcut list should be shown while super key is held.

[Lohith D Shivamurthy (dyams)]

Further details:
The List of keys to be displayed and the layout of the overlay can be found in the bug description https://bugs.launchpad.net/unity-2d/+bug/855532
It is discussed with the design team, that certain keys having multiple values in gconf, like 'Switch workspaces' should only be displayed when the keys are symmetric.

[Albert Astals Cid (aacid)]

u2d.tr(description) won't work since the text of the description won't be extracted by the update-unity-2d-pot script, the same for the title. And since the won't be in the .po file they won't be translatable. You'll have to move the u2d.tr to were you have the actual "text" so the text is extracted.

review: Needs Fixing

[Florian Boucault (fboucault)]

Of course, we won't merge that until unity-2d-shell is merged into lp:unity-2d.

[Gerry Boland (gerboland)]

Please give credit to Tiago in the commit message, for working on the UI side of this MR.

[Michał Sawicz (saviq)]

Hey, this looks like it could go into lp:unity-2d with minor modifications, and will reduce the diff when we actually go to merging shell into trunk, could you please have a MR against lp:unity-2d for this?

review: Needs Information

[Michał Sawicz (saviq)]

> Hey, this looks like it could go into lp:unity-2d with minor modifications,
> and will reduce the diff when we actually go to merging shell into trunk,
> could you please have a MR against lp:unity-2d for this?

Actually that might not be worth it, since you don't have any fullscreen part of the UI with unity-2d, you'd have to hack up the dash to go fullscreen when the hint is supposed to show.

In that case I propose that we wait with merging this for the shell to be merged into trunk and then MR that change against trunk.

[Michał Sawicz (saviq)]

The overlay needs to have a blurred background, it's unreadable when you have a terminal window behind it.

Also, I wonder if the overlay should be input-shaped? Right now you can interact with windows behind the overlay, which makes sense, for it being just an overlay, but not sure that's the designed behavior.

review: Needs Fixing

[Gerry Boland (gerboland)]

Looks nice! Aside from above comments:
- along with blurred background, the sheen is also needed. See Background.qml
- background has unusual colour tint set. We don't have tinting just now, so should be removed.
- shell/Shell.qml - why remove "KeyNavigation.left: launcherLoader" ?
- in symmetricKey() and getShortcutKey(), GConfItem declared in Unity2D, no need to import QtQuick
- in your javascript, your notation is mixing camelCase and underscore_separator. Use camelCase please. Some spacing between arguments in the function calls would help readability too.
- symmetricKey deserves a comment to explain why it is there.
- can you check with design about using empty strings if no key is set? I think it looks confusing.
- I have a truncation for a long key combination: https://imgur.com/a/okLFf can you also check with design to see what to do?
- overlay needs to be positioned a little higher, see comparison image: https://imgur.com/xqAVf
- there are typos, and some EnglishUK spellings instead of US (see first screenshot again). Yes they're in the mockup, but check with design
- in "Switching" - the left/right cursor keys do not move focus in Metacity. Is this something that needs to be enabled, or should this listing be removed?
- Alt+Middle Mouse drag also doesn't work for me.
- Please use fontUtils.js to specify font sizes
- you have unrelated changes from tests/run-tests.rb & tests/shell/input_shaping.rb in the diff, please remove.
- recently we decided having authors names in text files was going to be a pain, so we removed them. Will you do the same?
- have you given any thought to accessibility? How will this work with Orca? Since focus is not stolen, what will Orca do? Will it be possible to have Orca read out these shortcuts in some way? Just something to think about.
- import Unity2d 1.0 /* required by GConfItem */ <- GConfItem requires Unity2D, not other way around
- qml (I know, Tiago's) could be cleaned up a little, with both x,y coordinates & anchors being used, lots of unnecessary margin:0 scattered about for example.

review: Needs Fixing

[Lohith D Shivamurthy (dyams)]

> The overlay needs to have a blurred background, it's unreadable when you have
> a terminal window behind it.
>
I checked with design and have done what they said.

> Also, I wonder if the overlay should be input-shaped? Right now you can
> interact with windows behind the overlay, which makes sense, for it being just
> an overlay, but not sure that's the designed behavior.
Yes you can interact with windows behind it.

[lp:~unity-2d-team/unity-2d/shortcut-hint-overlay]

955. By Lohith D Shivamurthy on 2012-02-08

[launcher] Use font utils

956. By Lohith D Shivamurthy on 2012-02-08

[launcher] Remove unnecessary margins

957. By Lohith D Shivamurthy on 2012-02-08

[launcher] Use camelCases and remove underscore_separator

958. By Lohith D Shivamurthy on 2012-02-08

[launcher] Fix spellings to US-English

959. By Lohith D Shivamurthy on 2012-02-08

[launcher] move import 'Unity2d 1.0' to ShortcutHitSection.qml

960. By Lohith D Shivamurthy on 2012-02-08

[launcher] Remove unnecessary margins

961. By Lohith D Shivamurthy on 2012-02-08

[launcher] Fix a confusing comment

962. By Lohith D Shivamurthy on 2012-02-08

[launcher] Fix gconf key for 'move window'

[Lohith D Shivamurthy (dyams)]

> Looks nice! Aside from above comments:
> - along with blurred background, the sheen is also needed. See Background.qml
> - background has unusual colour tint set. We don't have tinting just now, so
> should be removed.
I checked with design, this is the conversation:
dyams rosie: should we need to have a background for overlay hint?
dyams rosie: if the overlay is displayed on a white background for ex: gedit window, the shortcuts are hardly visible
rosie dyams: there is a 35% #5e2750 layer and a -80% (-150% - 150%) brightness layer

> - shell/Shell.qml - why remove "KeyNavigation.left: launcherLoader" ?
The only difference i see in Shell.qml is
30 + Loader {
31 + id: shortcutHintLoader
32 + anchors.centerIn: parent
33 + }
34 +

> - in symmetricKey() and getShortcutKey(), GConfItem declared in Unity2D, no
> need to import QtQuick
Are you sure? FYI, i get this '[WARNING] ShortcutHint.qml:22:1: Item is not a type'
> - in your javascript, your notation is mixing camelCase and
> underscore_separator. Use camelCase please. Some spacing between arguments in
> the function calls would help readability too.
> - symmetricKey deserves a comment to explain why it is there.
Done.
> - can you check with design about using empty strings if no key is set? I
> think it looks confusing.
true, but its design decision.

> - I have a truncation for a long key combination: https://imgur.com/a/okLFf
> can you also check with design to see what to do?
Design changed a bit, I have updated the same.

> - overlay needs to be positioned a little higher, see comparison image:
> https://imgur.com/xqAVf
It is positioned to the center. I doubt we need to adjust it again.

> - there are typos, and some EnglishUK spellings instead of US (see first
> screenshot again). Yes they're in the mockup, but check with design
Done

> - in "Switching" - the left/right cursor keys do not move focus in Metacity.
> Is this something that needs to be enabled, or should this listing be removed?
No, It works

> - Alt+Middle Mouse drag also doesn't work for me.
No, It works

> - Please use fontUtils.js to specify font sizes
Done.

> - you have unrelated changes from tests/run-tests.rb &
> tests/shell/input_shaping.rb in the diff, please remove.
Is it? but they are not listed under the 'differences' here.

> - recently we decided having authors names in text files was going to be a
> pain, so we removed them. Will you do the same?
Done.

> - have you given any thought to accessibility? How will this work with Orca?
> Since focus is not stolen, what will Orca do? Will it be possible to have Orca
> read out these shortcuts in some way? Just something to think about.
No.

> - import Unity2d 1.0 /* required by GConfItem */ <- GConfItem requires
> Unity2D, not other way around
Yes I know.

> - qml (I know, Tiago's) could be cleaned up a little, with both x,y
> coordinates & anchors being used, lots of unnecessary margin:0 scattered about
> for example.
Done.

[Florian Boucault (fboucault)]

Please resubmit the MR against lp:unity-2d

[Florian Boucault (fboucault)]

Maybe I am out of line here but I don't see how the overlay belongs to the launcher.

review: Needs Fixing

[lp:~unity-2d-team/unity-2d/shortcut-hint-overlay]

963. By Lohith D Shivamurthy on 2012-02-13

merge lp:unity-2d

964. By Lohith D Shivamurthy on 2012-02-13

Move shortcut overlay files into separate folder

965. By Lohith D Shivamurthy on 2012-02-13

Directly import gconf 0.1

966. By Lohith D Shivamurthy on 2012-02-13

keep object id same as objectname

967. By Lohith D Shivamurthy on 2012-02-13

Add a FIXME for i18n of display strings

968. By Lohith D Shivamurthy on 2012-02-13

Remove background color

969. By Lohith D Shivamurthy on 2012-02-13

Use TextCustom instead of Text element

970. By Lohith D Shivamurthy on 2012-02-13

Fix missing parent object

971. By Lohith D Shivamurthy on 2012-02-13

Apply blur background

972. By Lohith D Shivamurthy on 2012-02-13

Activate/Deactivate overlay in shell.qml

973. By Lohith D Shivamurthy on 2012-02-13

Deactivate the overlay on tapping launcher tile shortcuts

974. By Lohith D Shivamurthy on 2012-02-14

Add a dummy function and call u2d.tr on all display strings

975. By Lohith D Shivamurthy on 2012-02-14

Improve background

976. By Lohith D Shivamurthy on 2012-02-14

Use workaround mentioned in the bugreport

977. By Lohith D Shivamurthy on 2012-02-15

Use regExp to replace case-insensitively

978. By Lohith D Shivamurthy on 2012-02-15

Replace Shft with Shift

979. By Lohith D Shivamurthy on 2012-02-15

Add missing file ModelElement.qml

980. By Lohith D Shivamurthy on 2012-02-15

merge

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

Remove extra field from ModelElement.qml

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

deactivate overlay when view looses focus

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

Apply black background with 70% opacity

984. By Tiago Salem Herrmann on 2012-03-19

merge trunk

985. By Tiago Salem Herrmann on 2012-03-19

onSuperKeyHeldChanged was moved to shellManager

986. By Tiago Salem Herrmann on 2012-03-20

remove debug

987. By Tiago Salem Herrmann on 2012-03-20

Force string object for the key. In some cases key is a object so replace() and substring fail

988. By Tiago Salem Herrmann on 2012-03-20

fix white spaces

989. By Tiago Salem Herrmann on 2012-03-20

ignore <Primary> string

990. By Tiago Salem Herrmann on 2012-03-21

merge trunk

991. By Tiago Salem Herrmann on 2012-03-21

add MultiMonitor support
Use the same trick as Dash to update the blurred background

992. By Gerry Boland on 2012-03-26

Replace 'KP_' with 'Num' in gconf string. Needed for Numpad keys

993. By Gerry Boland on 2012-03-26

QtQuick1.0 not needed to read gconf values

994. By Gerry Boland on 2012-03-26

Add basic RTL support

995. By Gerry Boland on 2012-03-29

[debian] Install shortcut overlay QML files

Unmerged revisions

995. By Gerry Boland on 2012-03-29

[debian] Install shortcut overlay QML files

994. By Gerry Boland on 2012-03-26

Add basic RTL support

993. By Gerry Boland on 2012-03-26

QtQuick1.0 not needed to read gconf values

992. By Gerry Boland on 2012-03-26

Replace 'KP_' with 'Num' in gconf string. Needed for Numpad keys

991. By Tiago Salem Herrmann on 2012-03-21

add MultiMonitor support
Use the same trick as Dash to update the blurred background

990. By Tiago Salem Herrmann on 2012-03-21

merge trunk

989. By Tiago Salem Herrmann on 2012-03-20

ignore <Primary> string

988. By Tiago Salem Herrmann on 2012-03-20

fix white spaces

987. By Tiago Salem Herrmann on 2012-03-20

Force string object for the key. In some cases key is a object so replace() and substring fail

986. By Tiago Salem Herrmann on 2012-03-20

remove debug

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2012-02-08 11:05:30 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2012-02-13 12:01:24 +0000
@@ -77,6 +77,9 @@
 #include "unity2dpanel.h"
 #include "strutmanager.h"
 
+// libqtgconf
+#include <gconfitem-qml-wrapper.h>
+
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
@@ -176,6 +179,7 @@
 
     qmlRegisterType<Unity2dPanel>(uri, 0, 1, "Unity2dPanel");
     qmlRegisterType<StrutManager>(uri, 0, 1, "StrutManager");
+    qmlRegisterType<GConfItemQmlWrapper>(uri, 0, 1, "GConfItem");
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)

=== 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-13 12: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-13 12: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-13 12: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-13 12:01:24 +0000
@@ -120,6 +120,11 @@
         }
     }
 
+    Loader {
+        id: shortcutHintLoader
+        anchors.centerIn: parent
+    }
+
     Connections {
         target: declarativeView
         onLauncherFocusRequested: {
@@ -164,7 +169,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-13 12: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-13 12: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-13 12:01:24 +0000
@@ -0,0 +1,109 @@
+/*
+ * 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
+    /* coordinates of top left corner needed to capture correct segment of background */
+    property int xPosition: 0
+    property int yPosition: 0
+
+    /* 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
+            x: -xPosition
+            y: -yPosition
+        }
+
+        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
+            }
+        }
+    ]
+}

=== 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-13 12: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/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-13 12: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,15 @@
         }
     }
 
-    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
+        xPosition: launcherLoader.width
+        yPosition: declarativeView.globalPosition.y
     }
 
     Item {
@@ -269,8 +237,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 +264,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 +283,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/Home.qml'
--- shell/dash/Home.qml	2012-01-20 09:35:38 +0000
+++ shell/dash/Home.qml	2012-02-13 12: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-13 12: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
@@ -118,9 +102,26 @@
                 Accessible.name: u2d.tr(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-13 12: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-13 12: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/LauncherLoader.qml'
--- shell/launcher/LauncherLoader.qml	2012-02-10 11:17:36 +0000
+++ shell/launcher/LauncherLoader.qml	2012-02-13 12:01:24 +0000
@@ -72,8 +72,18 @@
     Connections {
         target: declarativeView
         onSuperKeyHeldChanged: {
-            if (superKeyHeld) visibilityController.beginForceVisible()
-            else visibilityController.endForceVisible()
+            if (superKeyHeld) {
+                visibilityController.beginForceVisible()
+                if (shell.width > 1024 || shell.height > 768) {
+                    shortcutHintLoader.source = "../shortcutoverlay/ShortcutHint.qml"
+                }
+                if (declarativeView.dashActive) {
+                    declarativeView.dashActive = false
+                }
+            } else {
+                shortcutHintLoader.source = ""
+                visibilityController.endForceVisible()
+            }
         }
     }
 

=== added directory 'shell/shortcutoverlay'
=== added file 'shell/shortcutoverlay/ShortcutHint.qml'
--- shell/shortcutoverlay/ShortcutHint.qml	1970-01-01 00:00:00 +0000
+++ shell/shortcutoverlay/ShortcutHint.qml	2012-02-13 12:01:24 +0000
@@ -0,0 +1,207 @@
+/*
+ * 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/>.
+ */
+import QtQuick 1.0
+import "../common/fontUtils.js" as FontUtils
+
+Item {
+    id: main
+    objectName: "shortcutHintOverlay"
+    width: 950
+    height: 660
+
+    BorderImage {
+        id: border
+        smooth: true
+        anchors.fill: parent
+        border { left: 20; top: 20; right: 20; bottom: 20 }
+        source: "artwork/shortcut_hint_borders.png"
+    }
+
+    ListModel {
+        id: leftColumnModel
+        ListElement { sectionId: "launcher"; title: "Launcher"}
+        ListElement { sectionId: "dash"; title: "Dash"}
+        ListElement { sectionId: "topBar"; title: "Top Bar"}
+    }
+
+    ListModel {
+        id: rightColumnModel
+        ListElement { sectionId: "switching"; title: "Switching"}
+        ListElement { sectionId: "workspaces"; title: "Workspaces"}
+        ListElement { sectionId: "windows"; title: "Windows"}
+    }
+
+    ListModel {
+        id: launcherModel
+        ListElement { defaultKey: "Super (Press)"; description: "Open Launcher, displays shortcuts."; gconfKey: "" }
+        ListElement { defaultKey: "Alt + F1"; description: "Open Launcher keyboard navigation mode."; gconfKey: "" }
+        ListElement { defaultKey: "Super + Tab"; description: "Switch applications via Launcher."; gconfKey: "" }
+        ListElement { defaultKey: "Super + 1 to 9"; description: "Same as clicking on a Launcher icon."; gconfKey: "" }
+        ListElement { defaultKey: "Super + Shift + 1 to 9"; description: "Open new window of the app."; gconfKey: "" }
+        ListElement { defaultKey: "Super + T"; description: "Open the Rubbish Bin."; gconfKey: "" }
+    }
+
+    ListModel {
+        id: dashModel
+        ListElement { defaultKey: "Super (Tap)"; description: "Open the Dash home."; gconfKey: "" }
+        ListElement { defaultKey: "Super + A"; description: "Open the Dash App Lens."; gconfKey: "" }
+        ListElement { defaultKey: "Super + F"; description: "Open the Dash Files Lens."; gconfKey: "" }
+        ListElement { defaultKey: "Super + M"; description: "Open the Dash Files Music."; gconfKey: "" }
+        ListElement { defaultKey: "Ctrl + Tab"; description: "Switches between Lenses."; gconfKey: "" }
+        ListElement { defaultKey: "Cursors Keys"; description: "Moves the focus."; gconfKey: "" }
+        ListElement { defaultKey: "Enter / Return"; description: "Open currently focused item."; gconfKey: "" }
+        ListElement { defaultKey: "Alt + F2"; description: "'Run Command' mode."; gconfKey: "" }
+    }
+
+    ListModel {
+        id: topBarModel
+        ListElement { defaultKey: "Alt"; description: "Reveals application menu."; gconfKey: "" }
+        ListElement { defaultKey: "Alt + F10"; description: "Open the indicator menu."; gconfKey: "" }
+        ListElement { defaultKey: "Cursor Left & Right"; description: "Moves focus between indicators."; gconfKey: "" }
+    }
+
+    ListModel {
+        id: switchingModel
+        ListElement { defaultKey: "Alt + Tab"; description: "Switch between applications."; gconfKey: "/apps/metacity/global_keybindings/switch_windows"}
+        ListElement { defaultKey: "Alt + Grave"; description: "Switch windows of current application."; gconfKey: "/apps/metacity/global_keybindings/cycle_group"}
+        ListElement { defaultKey: "Cursor Up"; description: "Close window switch, return to app switch."; gconfKey: "" }
+        ListElement { defaultKey: "Cursor Left & Right"; description: "Moves the focus."; gconfKey: "" }
+    }
+
+    ListModel {
+        id: workspacesModel
+        ListElement { defaultKey: "Super + S"; description: "Spread workspaces."; gconfKey: "" }
+        ListElement { defaultKey: "Super + Cursors"; description: "Switch workspaces."; gconfKey: "/apps/metacity/global_keybindings/;switch_to_workspace_down;switch_to_workspace_up;switch_to_workspace_left;switch_to_workspace_right" }
+        ListElement { defaultKey: "Super + Alt + Cursors"; description: "Move focused window to other workspace."; gconfKey: "/apps/metacity/window_keybindings/;move_to_workspace_down;move_to_workspace_left;move_to_workspace_right;move_to_workspace_up" }
+    }
+
+    ListModel {
+        id: windowModel
+        ListElement { defaultKey: "Super + W"; description: "Spreads all windows in the current workspace."; gconfKey: "" }
+        ListElement { defaultKey: "Super + D"; description: "Minimizes all windows."; gconfKey: "/apps/metacity/global_keybindings/show_desktop" }
+        ListElement { defaultKey: "Alt + Space"; description: "Opens window accessibility menu."; gconfKey: "/apps/metacity/window_keybindings/activate_window_menu" }
+        ListElement { defaultKey: "Alt + F10"; description: "Maximizes or un-maximizes current window."; gconfKey: "/apps/metacity/window_keybindings/toggle_maximized" }
+        ListElement { defaultKey: "Alt + F9"; description: "Minimizes current window."; gconfKey: "/apps/metacity/window_keybindings/minimize" }
+        ListElement { defaultKey: "Alt + F8"; description: "Resizes current window."; gconfKey: "/apps/metacity/window_keybindings/begin_resize" }
+        ListElement { defaultKey: "Alt + F4"; description: "Closes current window."; gconfKey: "/apps/metacity/window_keybindings/close" }
+        ListElement { defaultKey: "Ctrl + Alt + Num"; description: "Places window in corresponding positions."; gconfKey: "/apps/metacity/window_keybindings/;move_to_corner_ne;move_to_corner_nw;move_to_corner_se;move_to_corner_sw;move_to_side_e;move_to_side_n;move_to_side_s;move_to_side_w" }
+        ListElement { defaultKey: "Alt + Left Mouse Drag"; description: "Move window."; gconfKey: "" }
+        ListElement { defaultKey: "Alt + Middle Mouse Drag"; description: "Resize window."; gconfKey: "" }
+    }
+
+    Rectangle {
+        id: totalArea
+        color: Qt.lighter("#5e275023", -0.8)
+        radius: 8
+        smooth: true
+        anchors.fill: parent
+        anchors.margins: 10
+
+        Item {
+            id: headerArea
+            y: 0
+            height: 75
+            anchors.left: parent.left
+            anchors.right: parent.right
+            smooth: false
+
+            Text {
+                id: title
+                x: 350
+                y: 25
+                color: "#ffffff"
+                text: u2d.tr("Keyboard Shortcuts")
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: 22
+                anchors.horizontalCenterOffset: 0
+                verticalAlignment: Text.AlignTop
+                anchors.horizontalCenter: parent.horizontalCenter
+                smooth: true
+                font.bold: true
+                horizontalAlignment: Text.AlignHCenter
+                font.pixelSize: FontUtils.fontSizeToPixels("x-large")
+            }
+        }
+
+        Item {
+            id: contentsArea
+            anchors.top: headerArea.bottom
+            anchors.right: parent.right
+            anchors.bottom: parent.bottom
+            anchors.left: parent.left
+            anchors.leftMargin: 20
+            anchors.rightMargin: 20
+
+            Rectangle {
+                id: topDivider
+                width: 200
+                height: 1
+                color: "#ffffff"
+                opacity: 0.2
+                smooth: true
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.top: parent.top
+            }
+
+            Item {
+                id: contentLeft
+                anchors.left: parent.left
+                anchors.right: contentCenter.left
+                anchors.top: topDivider.bottom
+                anchors.bottom: parent.bottom
+
+                Column {
+                    id: leftColumn
+                    Repeater {
+                        model: leftColumnModel
+                        ShortcutHintSection {}
+                    }
+                }
+            }
+
+            Item {
+                id: contentCenter
+                x: 438
+                width: 40
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
+            Item {
+                id: contentRight
+                x: 445
+                y: 0
+                width: 445
+                anchors.left: contentCenter.right
+                anchors.right: parent.right
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+
+                Column {
+                    id: rightColumn
+                    Repeater {
+                        model: rightColumnModel
+                        ShortcutHintSection {}
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'shell/shortcutoverlay/ShortcutHintSection.qml'
--- shell/shortcutoverlay/ShortcutHintSection.qml	1970-01-01 00:00:00 +0000
+++ shell/shortcutoverlay/ShortcutHintSection.qml	2012-02-13 12:01:24 +0000
@@ -0,0 +1,160 @@
+/*
+ * 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/>.
+ */
+import QtQuick 1.0
+import Unity2d 1.0 /* required for GConfItem */
+import "../common/fontUtils.js" as FontUtils
+
+Item {
+    id: shortcutHitSection
+    width: 430
+    height: list.height + sectionTitle.height + sectionTitle.y + bottomSpacing.height + divider.height
+
+    // It is decided by design, that certain keys having multiple values in gconf,
+    // like 'Switch workspaces' should only be displayed when the keys are symmetric.
+    function symmetricKey( gconfKey ) {
+        var gconfKeys = gconfKey.split(";");
+        var previousModifier = ""
+        var count = gconfKeys.length
+        var gconfKey_base = gconfKeys[0]
+        for (var i = 1; i < count; i++) {
+            var gconfItem = Qt.createQmlObject('import QtQuick 1.0; import Unity2d 1.0; GConfItem {}', main);
+            gconfItem.key = gconfKey_base+gconfKeys[i]
+            var gconfValue = gconfItem.value
+            var modifier = gconfValue.substring(0,gconfValue.lastIndexOf(">")+1)
+            var key = gconfValue.substring(gconfValue.lastIndexOf(">")+1)
+            if (previousModifier == "") {
+                previousModifier = gconfValue.substring(0,gconfValue.lastIndexOf(">")+1)
+                continue
+            }  else {
+                if (modifier != previousModifier) {
+                    return ""
+                }
+            }
+        }
+
+        if (key.toLowerCase().indexOf("kp") == 0){
+            previousModifier = previousModifier + "Num"
+        } else {
+            previousModifier = previousModifier + "Cursors"
+        }
+
+        return previousModifier;
+    }
+
+    Component {
+        id: itemDelegate
+        Item {
+            anchors.right: parent.right
+            anchors.left: parent.left
+
+            function getShortcutKey() {
+                if (gconfKey === "") {
+                    return defaultKey;
+                }
+
+                var key = ""
+                // Check is symmetric
+                if (gconfKey.indexOf(";") != -1) {
+                    key = symmetricKey(gconfKey);
+                    if (key == "") {
+                        return ""
+                    }
+                } else {
+                    var gconfItem = Qt.createQmlObject('import QtQuick 1.0; import Unity2d 1.0; GConfItem {}', main);
+                    gconfItem.key = gconfKey
+                    key = gconfItem.value
+                }
+
+                key = key.replace("<Control>", "Ctrl + ")
+                key = key.replace("<Shift>", "Shft + ")
+                key = key.replace("<Alt>", "Alt + ")
+                key = key.replace("<Mod4>", "Super + ")
+                key = key.replace("<Super>", "Super + ")
+                key = key.replace( /(^|\s)([a-z])/g , function(m,p1,p2){ return p1+p2.toUpperCase(); } );
+                return key
+            }
+
+            Item {
+                id: key
+                anchors.left: parent.left
+                anchors.leftMargin: 0
+                width: 150
+                Text { id: keyText; text: getShortcutKey(); color: "#ffffff"; font.pixelSize: FontUtils.fontSizeToPixels("small") }
+            }
+
+            Item {
+                id: spacing
+                anchors.left: key.right
+                width: 10
+            }
+
+            Item {
+                id: value
+                width: 265
+                anchors.left: spacing.right
+                Text { text: description; color: "#ffffff"; font.pixelSize: FontUtils.fontSizeToPixels("small") }
+            }
+        }
+    }
+
+    Text {
+        id: sectionTitle
+        y: 27
+        color: "#ffffff"
+        text: title
+        anchors.left: parent.left
+        font.bold: true
+        font.pixelSize: FontUtils.fontSizeToPixels("large")
+    }
+
+    ListView {
+        id: list
+        model: {
+            if (sectionId == "launcher") return launcherModel
+            else if (sectionId == "dash") return dashModel
+            else if (sectionId == "topBar") return topBarModel
+            else if (sectionId == "switching") return switchingModel
+            else if (sectionId == "workspaces") return workspacesModel
+            else if (sectionId == "windows") return windowModel
+            else return ""
+        }
+        spacing: 18
+        anchors.left: parent.left
+        anchors.top: sectionTitle.bottom
+        anchors.topMargin: 14
+        height: (spacing * count) + anchors.topMargin
+        delegate: itemDelegate
+    }
+
+    Item {
+        id: bottomSpacing
+        height: 20
+    }
+
+    Rectangle {
+        id: divider
+        height: 1
+        color: "#ffffff"
+        smooth: true
+        anchors.top: shortcutHitSection.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        opacity: 0.2
+        visible: (index != 2)
+    }
+}

=== added directory 'shell/shortcutoverlay/artwork'
=== added file 'shell/shortcutoverlay/artwork/shortcut_hint_borders.png'
Binary files shell/shortcutoverlay/artwork/shortcut_hint_borders.png	1970-01-01 00:00:00 +0000 and shell/shortcutoverlay/artwork/shortcut_hint_borders.png	2012-02-13 12:01:24 +0000 differ
=== added file 'tests/shell/shortcut-hint-overlay-tests.rb'
--- tests/shell/shortcut-hint-overlay-tests.rb	1970-01-01 00:00:00 +0000
+++ tests/shell/shortcut-hint-overlay-tests.rb	2012-02-13 12:01:24 +0000
@@ -0,0 +1,89 @@
+#!/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'
+
+############################# Test Suite #############################
+context "Launcher Shortcut hint overlay 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'
+
+    # Minimize all windows
+    XDo::XWindow.toggle_minimize_all
+  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 )
+    # Make certain application is ready for testing
+    verify{ @app.Launcher() }
+  end
+
+  # Run after each test case completes
+  teardown do
+    $SUT.execute_shell_command 'pkill -nf unity-2d-shell'
+  end
+
+  #####################################################################################
+  # Test cases
+    # Test case objectives:
+    #   * Check shortcut hint overlay display/close
+    # Pre-conditions
+    #   * None
+    # Test steps
+    #   * Hold super key
+    #   * Check the shortcut hint overlay is displayed
+    #   * Release super key
+    #   * Check that shortcut hint overlay is closed
+    # Post-conditions
+    #   * None
+    # References
+    #   * lp:#855532
+  test "Check shortcut hint overlay display/close" do
+    # Check the hint window is not displayed initially
+    verify_not(TIMEOUT, 'Shortcut hint overlay should be closed, but visible') {
+        @app.ShellDeclarativeView().ShortcutHint();
+    }
+
+    XDo::Keyboard.key_down('SUPER')
+    # Check the hint window is displayed when 'super' is pressed
+    verify(TIMEOUT, 'Shortcut hint overlay should be displayed, but it is not') {
+        @app.ShellDeclarativeView().ShortcutHint();
+    }
+
+    XDo::Keyboard.key_up('SUPER')
+    # Check the hint window is closed when 'super' is released
+    verify_not(TIMEOUT, 'Shortcut hint overlay should be closed, but visible') {
+        @app.ShellDeclarativeView().ShortcutHint();
+    }
+  end
+end