Merge lp:~fboucault/unity-2d/keyboard_navigation_experimental into lp:~fboucault/unity-2d/icon_provide_better_error_handling

[Florian Boucault]

[dash] Implemented keyboard navigation.

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

639. By Florian Boucault on 2011-07-27

Remade RendererGrid.interactive false thus preventing mouse interaction with the individual groups.

640. By Florian Boucault on 2011-07-27

Prevent the focus to be on the refine search pane when it is folded.

641. By Florian Boucault on 2011-07-27

Added FIXME/

642. By Florian Boucault on 2011-07-27

Merged colo:proper_grid

Unmerged revisions

642. By Florian Boucault on 2011-07-27

Merged colo:proper_grid

641. By Florian Boucault on 2011-07-27

Added FIXME/

640. By Florian Boucault on 2011-07-27

Prevent the focus to be on the refine search pane when it is folded.

639. By Florian Boucault on 2011-07-27

Remade RendererGrid.interactive false thus preventing mouse interaction with the individual groups.

638. By Florian Boucault on 2011-07-27

Merged colo:proper_grid

637. By Florian Boucault on 2011-07-27

Merged colo:proper_grid

636. By Florian Boucault on 2011-07-26

No change.

635. By Florian Boucault on 2011-07-26

Merged colo:proper_grid

634. By Florian Boucault on 2011-07-26

Merged colo:proper_grid

633. By Florian Boucault on 2011-07-26

Merged colo:proper_grid

=== modified file '.bzrignore'
--- .bzrignore	2011-06-15 14:39:35 +0000
+++ .bzrignore	2011-07-27 15:02:42 +0000
@@ -78,3 +78,4 @@
 debian/unity-qt-spread
 debian/libuqpanel-dev
 debian/libuqpanel0
+data/gschemas.compiled

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-06-27 13:40:51 +0000
+++ CMakeLists.txt	2011-07-27 15:02:42 +0000
@@ -4,6 +4,7 @@
 # Dirs
 set(UNITY_2D_DIR share/unity-2d)
 set(UNITY_DIR /usr/share/unity/)
+set(UNITY_2D_DATA_DIR "${CMAKE_SOURCE_DIR}/data")
 
 configure_file(config.h.in config.h)
 
@@ -23,6 +24,36 @@
 find_package(Qt4 REQUIRED)
 find_package(X11 REQUIRED)
 find_package(Gettext REQUIRED)
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(GDK REQUIRED gdk-2.0)
+pkg_check_modules(GTK REQUIRED gtk+-2.0)
+pkg_check_modules(GIO REQUIRED gio-2.0)
+pkg_check_modules(WNCK REQUIRED libwnck-1.0)
+
+
+# GSettings schemas
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+set (UNITY_2D_SCHEMAS "com.canonical.Unity2d.gschema.xml")
+set (UNITY_2D_GCONF_CONVERT "unity-2d.convert")
+set (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
+set (GCONF_CONVERT_DIR "${CMAKE_INSTALL_PREFIX}/share/GConf/gsettings")
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE GLIB_COMPILE_SCHEMAS OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# Run the schemas validator and error if it fails
+execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${UNITY_2D_DATA_DIR} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+if (_schemas_invalid)
+  message (SEND_ERROR "Schemas validation error: ${_schemas_invalid}")
+endif (_schemas_invalid)
+
+# Actually install and recompile the schemas
+message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
+install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_SCHEMAS} DESTINATION ${GSETTINGS_DIR})
+install (CODE "message (STATUS \"Compiling GSettings schemas\")")
+install (CODE "execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${GSETTINGS_DIR})")
+
+# Install GConf to GSettings conversion file
+install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_GCONF_CONVERT} DESTINATION ${GCONF_CONVERT_DIR})
 
 include_directories(
     ${CMAKE_BINARY_DIR}

=== added directory 'data'
=== added file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2011-07-27 15:02:42 +0000
@@ -0,0 +1,19 @@
+<schemalist>
+  <schema path="/com/canonical/unity-2d/launcher/" id="com.canonical.Unity2d.Launcher" gettext-domain="unity-2d">
+    <key type="b" name="super-key-enable">
+      <default>true</default>
+      <summary>Super key activation.</summary>
+      <description>Whether or not the super (also called windows key) key is used.</description>
+    </key>
+    <key name="hide-mode" type="i">
+      <default>2</default>
+      <summary>Hiding mode of the launcher</summary>
+      <description>Possible values: 0: never hide; the launcher is always visible. Always set /com/canonical/unity-2d/launcher/use-strut to true when using that mode 1: auto hide; the launcher will disappear after a short time if the user is not interacting with it 2: intellihide; the launcher will disappear if a window is placed on top of it and if the user is not interacting with it</description>
+    </key>
+    <key name="use-strut" type="b">
+      <default>false</default>
+      <summary>Reserve launcher area</summary>
+      <description>Use EWMH standard to reserve an area of the desktop (struts) so that no window can use the launcher's area</description>
+    </key>
+  </schema>
+</schemalist>

=== added file 'data/unity-2d.convert'
--- data/unity-2d.convert	1970-01-01 00:00:00 +0000
+++ data/unity-2d.convert	2011-07-27 15:02:42 +0000
@@ -0,0 +1,7 @@
+[com.canonical.Unity2d.Launcher]
+super-key-enable = /desktop/unity-2d/launcher/super_key_enable
+hide-mode = /desktop/unity-2d/launcher/hide_mode
+use-strut = /desktop/unity-2d/launcher/use_strut
+
+[com.canonical.Unity.Launcher]
+favorites = /desktop/unity-2d/launcher/favorites

=== modified file 'debian/20_unity-2d-gconf-default'
--- debian/20_unity-2d-gconf-default	2011-06-15 13:05:38 +0000
+++ debian/20_unity-2d-gconf-default	2011-07-27 15:02:42 +0000
@@ -1,9 +1,5 @@
 /apps/gnome-power-manager/lock/use_screensaver_settings true
 /apps/gnome-power-manager/general/use_time_for_policy false
-/desktop/unity-2d/launcher/favorites [ubiquity-gtkui.desktop,nautilus-home.desktop,firefox.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,ubuntu-software-center.desktop,ubuntuone-control-panel-gtk.desktop]
-/desktop/unity-2d/launcher/hide_mode 2
-/desktop/unity-2d/launcher/use_strut false
-/desktop/unity-2d/launcher/super_key_enable true
 /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 /desktop/gnome/applications/window_manager/current /usr/bin/metacity
 /apps/metacity/general/show_maximized_titlebars false

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-13 10:11:55 +0000
+++ debian/changelog	2011-07-27 15:02:42 +0000
@@ -1,10 +1,27 @@
 unity-2d (3.8.12-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Florian Boucault ]
   * do not run pkgbinarymangler to convert images to 8bit since this breaks
     the launcher icon background handling. (LP: #809205)
     (QT upstream bug: http://bugreports.qt.nokia.com/browse/QTBUG-4459)
-
- -- Florian Boucault <[e-mail]>  Wed, 13 Jul 2011 12:11:05 +0200
+  * debian/unity-2d.install:
+    - install GSettings schemas into usr/share/glib-2.0/schemas
+    - install GConf to GSettings conversion into usr/share/GConf/gsettings
+  * debian/gconf/schemas/unity-2d.schemas:
+    - remove GConf schema for /desktop/unity-2d/launcher/super_key_enable
+    - remove GConf schema for /desktop/unity-2d/launcher/favorites
+  * debian/20_unity-2d-gconf-default:
+    - remove default value for /desktop/unity-2d/launcher/super_key_enable
+    - remove default value for /desktop/unity-2d/launcher/favorites
+  * debian/control:
+    - add dependency on libdconf-qt-dev
+
+  [ Didier Roche ]
+  * Fix typo in trigger (debian/unity-2d.triggers): (LP: #807358)
+  * Install the apport hook in the right directory so that it's not launched
+    unconditionally (LP: #712343)
+
+ -- Florian Boucault <[e-mail]>  Fri, 22 Jul 2011 18:56:33 +0200
 
 unity-2d (3.8.10-0ubuntu1) natty; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-06-22 21:17:49 +0000
+++ debian/control	2011-07-27 15:02:42 +0000
@@ -12,6 +12,7 @@
                libglib2.0-dev,
                libwnck-dev,
                libqtgconf-dev,
+               libdconf-qt-dev,
                libqtbamf-dev,
                libqtdee-dev,
                libdbusmenu-qt-dev,
@@ -42,7 +43,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         unity-common,
 Description: Unity 2D shared library
  This library is used to host common code used by several Unity 2D components
  It is only used internally, there is no use case for it outside of the unity-2d

=== removed directory 'debian/gconf/schemas'
=== removed file 'debian/gconf/schemas/unity-2d.schemas'
--- debian/gconf/schemas/unity-2d.schemas	2011-06-15 13:10:14 +0000
+++ debian/gconf/schemas/unity-2d.schemas	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-<gconfschemafile>
-<schemalist>
-	<schema>
-		<key>/schemas/desktop/unity-2d/launcher/favorites</key>
-		<applyto>/desktop/unity-2d/launcher/favorites</applyto>
-		<owner>unity-2d</owner>
-		<type>list</type>
-		<list_type>string</list_type>
-		<default>[ubiquity-gtkui.desktop,nautilus-home.desktop,firefox.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,ubuntu-software-center.desktop,ubuntuone-control-panel-gtk.desktop]</default>
-		<locale name="C">
-		   <short>Favorite applications</short>
-		   <long>List of desktop files of applications that have been marked as favorites by the user in the launcher</long>
-		</locale>
-	</schema>
-
-	<schema>
-		<key>/schemas/desktop/unity-2d/launcher/hide_mode</key>
-		<applyto>/desktop/unity-2d/launcher/hide_mode</applyto>
-		<owner>unity-2d</owner>
-		<type>int</type>
-		<default>2</default>
-		<locale name="C">
-		   <short>Hiding mode of the launcher</short>
-		   <long>Possible values:
-0: never hide; the launcher is always visible. Always set /desktop/unity-2d/launcher/use_strut to true when using that mode
-1: auto hide; the launcher will disappear after a short time if the user is not interacting with it
-2: intellihide; the launcher will disappear if a window is placed on top of it and if the user is not interacting with it</long>
-		</locale>
-	</schema>
-
-	<schema>
-		<key>/schemas/desktop/unity-2d/launcher/use_strut</key>
-		<applyto>/desktop/unity-2d/launcher/use_strut</applyto>
-		<owner>unity-2d</owner>
-		<type>bool</type>
-		<default>false</default>
-		<locale name="C">
-		   <short>Reserve launcher area</short>
-		   <long>Use EWMH standard to reserve an area of the desktop (struts) so that no window can use the launcher's area</long>
-		</locale>
-	</schema>
-
-	<schema>
-		<key>/schemas/desktop/unity-2d/launcher/super_key_enable</key>
-		<applyto>/desktop/unity-2d/launcher/super_key_enable</applyto>
-		<owner>unity-2d</owner>
-		<type>bool</type>
-		<default>true</default>
-		<locale name="C">
-		   <short>Super key activation</short>
-		   <long>Whether or not the super (also called windows key) key is used</long>
-		</locale>
-	</schema>
-</schemalist>
-</gconfschemafile>
-

=== modified file 'debian/unity-2d.install'
--- debian/unity-2d.install	2011-06-15 13:05:38 +0000
+++ debian/unity-2d.install	2011-07-27 15:02:42 +0000
@@ -1,7 +1,9 @@
-debian/unity-2d.py /usr/share/apport/general-hooks
+debian/unity-2d.py /usr/share/apport/package-hooks
 debian/gconf/* /usr/share/gconf
 session/unity-2d.desktop /usr/share/xsessions
 session/2d-ubuntu.session /usr/share/gnome-session/sessions
 debian/20_unity-2d-gconf-mandatory /usr/share/gconf/unity-2d/mandatory
 debian/20_unity-2d-gconf-default /usr/share/gconf/unity-2d/default
 usr/share/locale/*/LC_MESSAGES/unity-2d.mo
+usr/share/glib-2.0/schemas/com.canonical.Unity2d.gschema.xml
+usr/share/GConf/gsettings

=== modified file 'debian/unity-2d.triggers'
--- debian/unity-2d.triggers	2011-01-26 11:34:38 +0000
+++ debian/unity-2d.triggers	2011-07-27 15:02:42 +0000
@@ -1,2 +1,2 @@
-interest /usr/share/gconf/unity-2d/defaults
+interest /usr/share/gconf/unity-2d/default
 interest /usr/share/gconf/unity-2d/mandatory

=== modified file 'launcher/app/CMakeLists.txt'
--- launcher/app/CMakeLists.txt	2011-06-11 11:33:52 +0000
+++ launcher/app/CMakeLists.txt	2011-07-27 15:02:42 +0000
@@ -1,8 +1,7 @@
 # Dependencies
-pkg_check_modules(GTK REQUIRED gtk+-2.0)
-pkg_check_modules(X11 REQUIRED x11)
 pkg_check_modules(GEIS REQUIRED libutouch-geis)
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
+pkg_check_modules(DCONFQT REQUIRED dconf-qt)
 
 # Sources
 set(launcher_SRCS
@@ -38,6 +37,7 @@
     ${X11_INCLUDE_DIRS}
     ${GEIS_INCLUDE_DIRS}
     ${QTGCONF_INCLUDE_DIRS}
+    ${DCONFQT_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -50,6 +50,7 @@
     ${X11_LDFLAGS}
     ${GEIS_LDFLAGS}
     ${QTGCONF_LDFLAGS}
+    ${DCONFQT_LDFLAGS}
     unity-2d-private
     )
 

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-06-22 08:33:52 +0000
+++ launcher/app/launcher.cpp	2011-07-27 15:02:42 +0000
@@ -17,16 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gtk/gtk.h>
-
 // unity-2d
 #include <gnomesessionclient.h>
 #include <launcherclient.h>
 #include <unity2dapplication.h>
 #include <propertybinder.h>
 
-// libqtgconf
-#include <gconfitem-qml-wrapper.h>
+// libdconf-qt
+#include "qconf.h"
 
 // Qt
 #include <QApplication>
@@ -44,6 +42,11 @@
 #include "unity2dpanel.h"
 #include "gesturehandler.h"
 
+// libc
+#include <stdlib.h>
+
+static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
+
 #if defined(QMLJSDEBUGGER)
 #include <qt_private/qdeclarativedebughelper_p.h>
 #endif
@@ -73,24 +76,7 @@
 
 int main(int argc, char *argv[])
 {
-    /* Unity2d plugin uses GTK APIs to retrieve theme icons
-       (gtk_icon_theme_get_default) and requires a call to gtk_init */
-    gtk_init(&argc, &argv);
-
-    Unity2dDebug::installHandlers();
-
-    /* When the environment variable QT_GRAPHICSSYSTEM is not set,
-       force graphics system to 'raster' instead of the default 'native'
-       which on X11 is 'XRender'.
-       'XRender' defaults to using a TrueColor visual. We do _not_ mimick that
-       behaviour with 'raster' by calling QApplication::setColorSpec because
-       of a bug where black rectangular artifacts were appearing randomly:
-
-       https://bugs.launchpad.net/unity-2d/+bug/734143
-    */
-    if(getenv("QT_GRAPHICSSYSTEM") == 0) {
-        QApplication::setGraphicsSystem("raster");
-    }
+    Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication application(argc, argv);
     QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
@@ -132,12 +118,11 @@
 
     launcherView->setSource(QUrl("./Launcher.qml"));
 
-    /* Synchronise panel's "useStrut" property with its corresponding GConf key */
-    GConfItemQmlWrapper useStrutGconf;
-    useStrutGconf.setKey("/desktop/unity-2d/launcher/use_strut");
-    panel.setUseStrut(useStrutGconf.getValue().toBool());
+    /* Synchronise panel's "useStrut" property with its corresponding DConf key */
+    QConf dconfLauncher(LAUNCHER_DCONF_SCHEMA);
+    panel.setUseStrut(dconfLauncher.property("useStrut").toBool());
     PropertyBinder useStrutBinder;
-    useStrutBinder.bind(&useStrutGconf, "value", &panel, "useStrut");
+    useStrutBinder.bind(&dconfLauncher, "useStrut", &panel, "useStrut");
 
     /* Composing the QML declarative view inside the panel */
     panel.addWidget(launcherView);
@@ -149,7 +134,7 @@
        the launcher itself was autostarted (which is the common case when
        running installed).
        For a discussion, see https://bugs.launchpad.net/upicek/+bug/684160. */
-    g_unsetenv("DESKTOP_AUTOSTART_ID");
+    unsetenv("DESKTOP_AUTOSTART_ID");
 
     /* Gesture handler instance in charge of listening to gesture events and
        trigger appropriate actions in response. */

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-06-22 08:54:52 +0000
+++ launcher/app/launcherview.cpp	2011-07-27 15:02:42 +0000
@@ -36,6 +36,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+// libdconf-qt
+#include "qconf.h"
+
 #include <keyboardmodifiersmonitor.h>
 #include <hotkey.h>
 #include <hotkeymonitor.h>
@@ -55,6 +58,7 @@
 static const char* SPREAD_DBUS_METHOD_IS_SHOWN = "IsShown";
 static const char* APPLICATIONS_PLACE = "/usr/share/unity/places/applications.place";
 static const char* COMMANDS_PLACE_ENTRY = "Runner";
+static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
 
 LauncherView::LauncherView(QWidget* parent) :
     Unity2DDeclarativeView(parent),
@@ -67,8 +71,8 @@
     connect(&m_superKeyHoldTimer, SIGNAL(timeout()), SLOT(updateSuperKeyHoldState()));
     connect(this, SIGNAL(superKeyTapped()), SLOT(toggleDash()));
 
-    m_enableSuperKey.setKey("/desktop/unity-2d/launcher/super_key_enable");
-    connect(&m_enableSuperKey, SIGNAL(valueChanged()), SLOT(updateSuperKeyMonitoring()));
+    m_dconf_launcher = new QConf(LAUNCHER_DCONF_SCHEMA);
+    connect(m_dconf_launcher, SIGNAL(superKeyEnableChanged(bool)), SLOT(updateSuperKeyMonitoring()));
     updateSuperKeyMonitoring();
 
     /* Alt+F1 gives the keyboard focus to the launcher. */
@@ -86,6 +90,11 @@
     }
 }
 
+LauncherView::~LauncherView()
+{
+    delete m_dconf_launcher;
+}
+
 void
 LauncherView::activateWindow()
 {
@@ -111,7 +120,7 @@
 {
     KeyboardModifiersMonitor *modifiersMonitor = KeyboardModifiersMonitor::instance();
 
-    QVariant value = m_enableSuperKey.getValue();
+    QVariant value = m_dconf_launcher->property("superKeyEnable");
     if (!value.isValid() || value.toBool() == true) {
         QObject::connect(modifiersMonitor,
                          SIGNAL(keyboardModifiersChanged(Qt::KeyboardModifiers)),

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-06-22 08:54:52 +0000
+++ launcher/app/launcherview.h	2011-07-27 15:02:42 +0000
@@ -24,13 +24,13 @@
 #include <QList>
 #include <QUrl>
 #include <QTimer>
-
-#include "gconfitem-qml-wrapper.h"
+#include <QVariant>
 
 #include <unity2ddeclarativeview.h>
 
 class DeclarativeDragDropEvent;
 class LauncherDBus;
+class QConf;
 
 class LauncherView : public Unity2DDeclarativeView
 {
@@ -40,6 +40,7 @@
 
 public:
     explicit LauncherView(QWidget* parent = NULL);
+    ~LauncherView();
 
     bool superKeyHeld() const { return m_superKeyHeld; }
 
@@ -66,7 +67,7 @@
     void focusOutEvent(QFocusEvent* event);
 
 private:
-    GConfItemQmlWrapper m_enableSuperKey;
+    QConf* m_dconf_launcher;
     bool m_superKeyPressed;
     bool m_superKeyHeld;
     QTimer m_superKeyHoldTimer;

=== modified file 'launcher/app/visibilitycontroller.cpp'
--- launcher/app/visibilitycontroller.cpp	2011-06-11 11:33:52 +0000
+++ launcher/app/visibilitycontroller.cpp	2011-07-27 15:02:42 +0000
@@ -30,27 +30,25 @@
 #include <debug_p.h>
 #include <unity2dpanel.h>
 
-// libqtgconf
-#include <gconfitem-qml-wrapper.h>
+// libdconf-qt
+#include "qconf.h"
 
 // Qt
 #include <QDBusConnection>
 #include <QDBusServiceWatcher>
 
-static const char* GCONF_LAUNCHER_HIDEMODE_KEY = "/desktop/unity-2d/launcher/hide_mode";
+static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
 
 VisibilityController::VisibilityController(Unity2dPanel* panel)
 : QObject(panel)
 , m_panel(panel)
-, m_hideModeKey(new GConfItemQmlWrapper(this))
+, m_dconf_launcher(new QConf(LAUNCHER_DCONF_SCHEMA))
 , m_dbusWatcher(new QDBusServiceWatcher(this))
 {
-    m_hideModeKey->setKey(GCONF_LAUNCHER_HIDEMODE_KEY);
-
     m_dbusWatcher->setConnection(QDBusConnection::sessionBus());
     m_dbusWatcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
 
-    connect(m_hideModeKey, SIGNAL(valueChanged()), SLOT(update()));
+    connect(m_dconf_launcher, SIGNAL(hideModeChanged(int)), SLOT(update()));
     connect(m_panel, SIGNAL(useStrutChanged(bool)), SLOT(update()));
     connect(m_panel, SIGNAL(manualSlidingChanged(bool)), SLOT(update()));
     connect(m_dbusWatcher, SIGNAL(serviceUnregistered(const QString&)), SLOT(slotServiceUnregistered(const QString&)));
@@ -59,6 +57,7 @@
 
 VisibilityController::~VisibilityController()
 {
+    delete m_dconf_launcher;
 }
 
 void VisibilityController::update()
@@ -66,7 +65,7 @@
     if (!m_forceVisibleCountHash.isEmpty()) {
         return;
     }
-    AutoHideMode mode = AutoHideMode(m_hideModeKey->getValue().toInt());
+    AutoHideMode mode = AutoHideMode(m_dconf_launcher->property("hideMode").toInt());
 
     setBehavior(0);
 

=== modified file 'launcher/app/visibilitycontroller.h'
--- launcher/app/visibilitycontroller.h	2011-06-11 11:33:52 +0000
+++ launcher/app/visibilitycontroller.h	2011-07-27 15:02:42 +0000
@@ -28,14 +28,14 @@
 #include <QObject>
 #include <QScopedPointer>
 
-class GConfItemQmlWrapper;
+class QConf;
 
 class AbstractVisibilityBehavior;
 class Unity2dPanel;
 class QDBusServiceWatcher;
 
 /**
- * This class monitors the hide_mode gconf key and set up an instance of
+ * This class monitors the hide_mode dconf key and set up an instance of
  * AbstractVisibilityBehavior depending on its value
  *
  * It also tracks requests for forced visibility: the launcher or another
@@ -77,7 +77,7 @@
     };
     Q_DISABLE_COPY(VisibilityController);
     Unity2dPanel* m_panel;
-    GConfItemQmlWrapper* m_hideModeKey;
+    QConf* m_dconf_launcher;
     QDBusServiceWatcher* m_dbusWatcher;
     QScopedPointer<AbstractVisibilityBehavior> m_behavior;
 

=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-06-22 08:54:52 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-27 15:02:42 +0000
@@ -1,16 +1,11 @@
 # Dependencies
-pkg_check_modules(WNCK REQUIRED libwnck-1.0)
 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
 pkg_check_modules(QTDEE REQUIRED libqtdee)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(GDK REQUIRED gdk-2.0)
-pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
 pkg_check_modules(INDICATOR REQUIRED indicator)
-
-find_package(X11 REQUIRED)
+pkg_check_modules(DCONFQT REQUIRED dconf-qt)
 
 # Sources
 set(unity-2d-private-qml_SRCS
@@ -100,6 +95,7 @@
     ${STARTUPNOTIFICATION_INCLUDE_DIRS}
     ${INDICATOR_INCLUDE_DIRS}
     ${X11_INCLUDE_DIR}
+    ${DCONFQT_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -119,6 +115,7 @@
     ${GIO_LDFLAGS}
     ${STARTUPNOTIFICATION_LDFLAGS}
     ${INDICATOR_LDFLAGS}
+    ${DCONFQT_LDFLAGS}
     ${X11_Xcomposite_LIB}
     unity-2d-private
     )

=== modified file 'libunity-2d-private/Unity2d/launcherapplicationslist.cpp'
--- libunity-2d-private/Unity2d/launcherapplicationslist.cpp	2011-07-13 16:04:50 +0000
+++ libunity-2d-private/Unity2d/launcherapplicationslist.cpp	2011-07-27 15:02:42 +0000
@@ -23,6 +23,9 @@
 #include "bamf-application.h"
 #include "gconfitem-qml-wrapper.h"
 
+// libdconf-qt
+#include "qconf.h"
+
 // unity-2d
 #include <debug_p.h>
 
@@ -40,7 +43,8 @@
 }
 
 
-#define FAVORITES_KEY QString("/desktop/unity-2d/launcher/favorites")
+#define LAUNCHER_DCONF_SCHEMA QString("com.canonical.Unity.Launcher")
+#define LAUNCHER_DCONF_PATH QString("/desktop/unity/launcher")
 #define DBUS_SERVICE_UNITY "com.canonical.Unity"
 #define DBUS_SERVICE_LAUNCHER_ENTRY "com.canonical.Unity.LauncherEntry"
 #define DBUS_SERVICE_LAUNCHER "com.canonical.Unity.Launcher"
@@ -52,8 +56,7 @@
 LauncherApplicationsList::LauncherApplicationsList(QObject *parent) :
     QAbstractListModel(parent)
 {
-    m_favorites_list = new GConfItemQmlWrapper();
-    m_favorites_list->setKey(FAVORITES_KEY);
+    m_dconf_launcher = new QConf(LAUNCHER_DCONF_SCHEMA);
 
     QDBusConnection session = QDBusConnection::sessionBus();
     /* FIXME: libunity will send out the Update signal for LauncherEntries
@@ -171,7 +174,7 @@
     sn_display_unref(m_snDisplay);
 
     qDeleteAll(m_applications);
-    delete m_favorites_list;
+    delete m_dconf_launcher;
 }
 
 QString
@@ -366,9 +369,8 @@
 LauncherApplicationsList::load()
 {
     /* Insert favorites */
-    /* FIXME: migrate to GSettings, like unity. */
     QString desktop_file;
-    QStringList favorites = m_favorites_list->getValue().toStringList();
+    QStringList favorites = m_dconf_launcher->property("favorites").toStringList();
 
     Q_FOREACH(QString favorite, favorites) {
        insertFavoriteApplication(favorite);
@@ -453,9 +455,9 @@
         }
     }
 
-    m_favorites_list->blockSignals(true);
-    m_favorites_list->setValue(QVariant(favorites));
-    m_favorites_list->blockSignals(false);
+    m_dconf_launcher->blockSignals(true);
+    m_dconf_launcher->setProperty("favorites", QVariant(favorites));
+    m_dconf_launcher->blockSignals(false);
 }
 
 int

=== modified file 'libunity-2d-private/Unity2d/launcherapplicationslist.h'
--- libunity-2d-private/Unity2d/launcherapplicationslist.h	2011-07-13 16:04:50 +0000
+++ libunity-2d-private/Unity2d/launcherapplicationslist.h	2011-07-27 15:02:42 +0000
@@ -37,6 +37,7 @@
 class BamfApplication;
 class BamfView;
 class GConfItemQmlWrapper;
+class QConf;
 
 class LauncherApplicationsList : public QAbstractListModel, protected AbstractX11EventFilter, protected QDBusContext
 {
@@ -88,7 +89,7 @@
        displayed (m_applications).
     */
     QHash<QString, LauncherApplication*> m_applicationForExecutable;
-    GConfItemQmlWrapper* m_favorites_list;
+    QConf* m_dconf_launcher;
 
     /* Startup notification support */
     SnDisplay *m_snDisplay;

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-07-14 11:17:30 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-07-27 15:02:42 +0000
@@ -47,6 +47,7 @@
 #include "cacheeffect.h"
 #include "iconutilities.h"
 #include "unity2dtr.h"
+#include "giodefaultapplication.h"
 
 #include "mimedata.h"
 #include "dragdropevent.h"
@@ -127,6 +128,8 @@
     qmlRegisterType<ForceVisibleBehavior>(uri, 0, 1, "ForceVisibleBehavior");
 
     qmlRegisterType<IconUtilities>(); // Register the type as non creatable
+
+    qmlRegisterType<GioDefaultApplication>(uri, 0, 1, "GioDefaultApplication");
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)

=== modified file 'libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp'
--- libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp	2011-04-28 13:09:25 +0000
+++ libunity-2d-private/Unity2d/qsortfilterproxymodelqml.cpp	2011-07-27 15:02:42 +0000
@@ -18,14 +18,17 @@
 #include <debug_p.h>
 
 QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent) :
-    QSortFilterProxyModel(parent)
+    QSortFilterProxyModel(parent), m_limit(-1)
 {
+    connect(this, SIGNAL(modelReset()), SIGNAL(countChanged()));
+    connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(countChanged()));
+    connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(countChanged()));
 }
 
-void
-QSortFilterProxyModelQML::updateRoleNames()
+void QSortFilterProxyModelQML::setRoleNames(const QHash<int,QByteArray> &roleNames)
 {
-    setRoleNames(((QAbstractItemModel*)sourceModel())->roleNames());
+    QSortFilterProxyModel::setRoleNames(roleNames);
+    Q_EMIT roleNamesChanged(roleNames);
 }
 
 QObject*
@@ -51,10 +54,25 @@
         sourceModel()->disconnect(this);
     }
 
+    /* Workaround for limitation of QAbstractProxyModel: if sourceModel's
+       roleNames changes, the QAbstractProxyModel's roleNames are not updated
+       to reflect that change.
+       As a consequence it works around Qt bug http://bugreports.qt.nokia.com/browse/QTBUG-20405
+    */
+    bool hasRoleNamesChangedSignal;
+    hasRoleNamesChangedSignal = connect(itemModel, SIGNAL(roleNamesChanged(QHash<int,QByteArray>)), SLOT(setRoleNames(QHash<int,QByteArray>)));
+    if (!hasRoleNamesChangedSignal) {
+        UQ_WARNING << "received a sourceModel that does not notify of changes of its roleNames";
+    }
+    setRoleNames(itemModel->roleNames());
+
     setSourceModel(itemModel);
 
-    connect(itemModel, SIGNAL(modelAboutToBeReset()), SLOT(updateRoleNames()));
-    connect(itemModel, SIGNAL(modelReset()), SLOT(updateRoleNames()));
+    connect(itemModel, SIGNAL(modelReset()), SIGNAL(totalCountChanged()));
+    connect(itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
+    connect(itemModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
+    Q_EMIT totalCountChanged();
+    Q_EMIT countChanged();
 }
 
 QVariantMap
@@ -76,7 +94,97 @@
 }
 
 int
+QSortFilterProxyModelQML::totalCount() const
+{
+    if (sourceModel() != NULL) {
+        return sourceModel()->rowCount();
+    } else {
+        return 0;
+    }
+}
+
+int
 QSortFilterProxyModelQML::count()
 {
     return rowCount();
 }
+
+int
+QSortFilterProxyModelQML::rowCount(const QModelIndex &parent) const
+{
+    int count = QSortFilterProxyModel::rowCount(parent);
+    if (m_limit >= 0) {
+        return qMin(count, m_limit);
+    } else {
+        return count;
+    }
+}
+
+int
+QSortFilterProxyModelQML::limit() const
+{
+    return m_limit;
+}
+
+void
+QSortFilterProxyModelQML::setLimit(int limit)
+{
+    if (limit != m_limit) {
+        int count = QSortFilterProxyModel::rowCount();
+        int start;
+        int end;
+        bool inserted = false;
+        bool removed = false;
+
+        if (m_limit == -1) {
+            if (limit < count) {
+                start = qMin(count, limit);
+                end = count-1;
+                removed = true;
+            }
+        } else if (limit == -1) {
+            if (m_limit < count) {
+                start = qMin(count, m_limit);
+                end = count-1;
+                inserted = true;
+            }
+        } else if (m_limit >= count && limit >= count) {
+            // Nothing
+        } else if (m_limit >= count && limit < count) {
+            start = qMin(count, limit);
+            end = count-1;
+            removed = true;
+        } else if (m_limit < count && limit >= count) {
+            start = qMin(count, m_limit);
+            end = count-1;
+            inserted = true;
+        } else if (m_limit < count && limit < count) {
+            if (m_limit < limit) {
+                start = qMin(count, m_limit);
+                end = qMin(count, limit)-1;
+                inserted = true;
+            } else {
+                start = qMin(count, limit);
+                end = qMin(count, m_limit)-1;
+                removed = true;
+            }
+        }
+
+        if (inserted) {
+            beginInsertRows(QModelIndex(), start, end);
+        }
+        if (removed) {
+            beginRemoveRows(QModelIndex(), start, end);
+        }
+        m_limit = limit;
+
+        if (inserted) {
+            endInsertRows();
+        }
+        if (removed) {
+            endRemoveRows();
+        }
+
+        Q_EMIT limitChanged();
+    }
+}

=== modified file 'libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h'
--- libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h	2011-03-23 14:04:23 +0000
+++ libunity-2d-private/Unity2d/qsortfilterproxymodelqml.h	2011-07-27 15:02:42 +0000
@@ -24,21 +24,36 @@
     Q_OBJECT
 
     Q_PROPERTY(QObject* model READ sourceModelQObject WRITE setSourceModelQObject)
+    Q_PROPERTY(int limit READ limit WRITE setLimit NOTIFY limitChanged)
+    Q_PROPERTY(int totalCount READ totalCount NOTIFY totalCountChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
     explicit QSortFilterProxyModelQML(QObject *parent = 0);
 
     Q_INVOKABLE QVariantMap get(int row);
     Q_INVOKABLE int count();
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
 
     /* getters */
     QObject* sourceModelQObject() const;
+    int limit() const;
+    int totalCount() const;
 
     /* setters */
     void setSourceModelQObject(QObject *model);
-
-private Q_SLOTS:
-    void updateRoleNames();
+    void setLimit(int limit);
+
+    Q_SLOT void setRoleNames(const QHash<int,QByteArray> &roleNames);
+
+Q_SIGNALS:
+    void limitChanged();
+    void totalCountChanged();
+    void countChanged();
+    void roleNamesChanged(const QHash<int,QByteArray> &);
+
+private:
+    int m_limit;
 };
 
 #endif // QSORTFILTERPROXYMODELQML_H

=== modified file 'libunity-2d-private/Unity2d/workspacesinfo.cpp'
--- libunity-2d-private/Unity2d/workspacesinfo.cpp	2011-06-27 13:43:05 +0000
+++ libunity-2d-private/Unity2d/workspacesinfo.cpp	2011-07-27 15:02:42 +0000
@@ -9,8 +9,6 @@
 #include <libwnck/workspace.h>
 }
 
-#include "gconfitem-qml-wrapper.h"
-
 #include <QAbstractEventDispatcher>
 #include <QX11Info>
 

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-07-12 10:30:50 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-07-27 15:02:42 +0000
@@ -1,7 +1,3 @@
-# Dependencies
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(WNCK REQUIRED libwnck-1.0)
-
 # Sources
 set(libunity-2d-private_SRCS
     gconnector.cpp
@@ -24,6 +20,7 @@
     edgehitdetector.cpp
     forcevisiblebehavior.cpp
     intellihidebehavior.cpp
+    giodefaultapplication.cpp
     )
 
 # Build

=== added file 'libunity-2d-private/src/giodefaultapplication.cpp'
--- libunity-2d-private/src/giodefaultapplication.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/giodefaultapplication.cpp	2011-07-27 15:02:42 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "giodefaultapplication.h"
+
+// libunity-2d
+#include <gscopedpointer.h>
+
+// Qt
+#include <QFileSystemWatcher>
+#include <QDir>
+#include <QTimer>
+
+// gio
+#include <gio/gio.h>
+#include <gio/gdesktopappinfo.h>
+
+static const QString MIMEAPPS_FILE = QDir::homePath() + QString("/.local/share/applications/mimeapps.list");
+
+GioDefaultApplication::GioDefaultApplication(QObject* parent)
+    : QObject(parent),
+      m_contentType(""),
+      m_desktopFile(""),
+      m_mimeappsWatcher(new QFileSystemWatcher(this))
+{
+    /* GIO does not have any signal to inform us of changes in default
+       applications to handle a certain content type. Work around that
+       by monitoring file MIMEAPPS_FILE that is overwritten when default
+       applications change. */
+    m_mimeappsWatcher->addPath(MIMEAPPS_FILE);
+    connect(m_mimeappsWatcher, SIGNAL(fileChanged(const QString&)),
+                               SLOT(onMimeappsFileChanged()));
+
+}
+
+void GioDefaultApplication::onMimeappsFileChanged()
+{
+    /* FIXME: wait for 10 seconds before updating the desktop file because
+       of a bug in gio where g_app_info_get_default_for_type will not immediately
+       return the updated result.
+       Ref.: https://bugzilla.gnome.org/show_bug.cgi?id=653999
+    */
+    QTimer::singleShot(10000, this, SLOT(updateDesktopFile()));
+    /* If the file is already being monitored, we shouldn’t need to do anything.
+       However it seems that in some cases, a change to the file will stop
+       emiting further fileChanged signals, despite the file still being in the
+       list of monitored files. This is the case when the desktop file is being
+       edited in gedit for example. This may be a bug in QT itself.
+       To work around this issue, remove the path and add it again. */
+    m_mimeappsWatcher->removePath(MIMEAPPS_FILE);
+    m_mimeappsWatcher->addPath(MIMEAPPS_FILE);
+}
+
+QString GioDefaultApplication::desktopFile() const
+{
+    return m_desktopFile;
+}
+
+QString GioDefaultApplication::contentType() const
+{
+    return m_contentType;
+}
+
+void GioDefaultApplication::setContentType(const QString& contentType)
+{
+    if (contentType == m_contentType) {
+        return;
+    }
+
+    m_contentType = contentType;
+    Q_EMIT contentTypeChanged();
+    updateDesktopFile();
+}
+
+void GioDefaultApplication::updateDesktopFile()
+{
+    GObjectScopedPointer<GAppInfo> app_info;
+    QByteArray byte_array = m_contentType.toUtf8();
+    gchar *content_type = byte_array.data();
+
+    app_info.reset(g_app_info_get_default_for_type(content_type, false));
+    if (!app_info.isNull()) {
+        m_desktopFile = QString::fromUtf8(g_desktop_app_info_get_filename((GDesktopAppInfo*)app_info.data()));
+    } else {
+        m_desktopFile = "";
+    }
+
+    Q_EMIT desktopFileChanged();
+}
+
+#include "giodefaultapplication.moc"

=== added file 'libunity-2d-private/src/giodefaultapplication.h'
--- libunity-2d-private/src/giodefaultapplication.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/giodefaultapplication.h	2011-07-27 15:02:42 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GIODEFAULTAPPLICATION_H
+#define GIODEFAULTAPPLICATION_H
+
+#include <QObject>
+#include <QString>
+
+class QFileSystemWatcher;
+
+/* Wrapper around GIO's g_app_info_get_default_for_type.
+   To use it, set the contentType property and the desktopFile will contain the
+   path to the desktop file of the application handling that kind of content.
+*/
+class GioDefaultApplication : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString desktopFile READ desktopFile NOTIFY desktopFileChanged)
+    Q_PROPERTY(QString contentType READ contentType WRITE setContentType NOTIFY contentTypeChanged)
+
+public:
+    GioDefaultApplication(QObject* parent=0);
+
+    /* getters */
+    QString desktopFile() const;
+    QString contentType() const;
+
+    /* setters */
+    void setContentType(const QString& contentType);
+
+Q_SIGNALS:
+    void desktopFileChanged();
+    void contentTypeChanged();
+
+private:
+    Q_SLOT void updateDesktopFile();
+    Q_SLOT void onMimeappsFileChanged();
+
+    QString m_contentType;
+    QString m_desktopFile;
+    QFileSystemWatcher* m_mimeappsWatcher;
+};
+
+#endif // GIODEFAULTAPPLICATION
+

=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-06-11 10:50:03 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2011-07-27 15:02:42 +0000
@@ -21,8 +21,17 @@
 
 // Self
 #include "unity2dapplication.h"
+#include "config.h"
+
+// libunity-2d
+#include <debug_p.h>
+#include <unity2ddebug.h>
 
 // Qt
+#include <QWindowsStyle>
+
+// GTK
+#include <gtk/gtk.h>
 
 AbstractX11EventFilter::~AbstractX11EventFilter()
 {
@@ -32,9 +41,38 @@
     }
 }
 
+void Unity2dApplication::earlySetup(int& argc, char** argv)
+{
+    // Parts of unity-2d uses GTK so it needs to be initialized
+    gtk_init(&argc, &argv);
+
+    Unity2dDebug::installHandlers();
+
+    /* When the environment variable QT_GRAPHICSSYSTEM is not set, force
+     * graphics system to 'raster' instead of the default 'native' which on X11
+     * is 'XRender'.  'XRender' defaults to using a TrueColor visual. We do
+     * _not_ mimick that behaviour with 'raster' by calling
+     * QApplication::setColorSpec because of bugs where some pixmaps become
+     * blueish or black rectangular artifacts were appearing randomly:
+     *
+     *  https://bugs.launchpad.net/unity-2d/+bug/689877
+     *  https://bugs.launchpad.net/unity-2d/+bug/734143
+     */
+    if(getenv("QT_GRAPHICSSYSTEM") == 0) {
+        QApplication::setGraphicsSystem("raster");
+    }
+}
+
 Unity2dApplication::Unity2dApplication(int& argc, char** argv)
 : QApplication(argc, argv)
 {
+    /* Allow developers to run Unity 2D uninstalled by telling dconf-qt
+       where to look for Unity 2D's schemas.
+       It relies on the fact that the schema is compiled when running cmake.
+    */
+    if (!isRunningInstalled()) {
+        qputenv("GSETTINGS_SCHEMA_DIR", unity2dDirectory().toLocal8Bit() + "/data");
+    }
 }
 
 Unity2dApplication::~Unity2dApplication()

=== modified file 'libunity-2d-private/src/unity2dapplication.h'
--- libunity-2d-private/src/unity2dapplication.h	2011-02-28 17:14:19 +0000
+++ libunity-2d-private/src/unity2dapplication.h	2011-07-27 15:02:42 +0000
@@ -49,6 +49,13 @@
     void removeX11EventFilter(AbstractX11EventFilter*);
 
     /**
+     * This method must be called *before* instantiating a Unity2dApplication.
+     * It inits gtk and adjusts settings like the graphics system and the Qt
+     * style.
+     */
+    static void earlySetup(int& argc, char** argv);
+
+    /**
      * Note: This function will return a null pointer if you did not use a Unity2dApplication in your application!
      */
     static Unity2dApplication* instance();

=== modified file 'libunity-2d-private/tests/CMakeLists.txt'
--- libunity-2d-private/tests/CMakeLists.txt	2011-07-12 10:30:50 +0000
+++ libunity-2d-private/tests/CMakeLists.txt	2011-07-27 15:02:42 +0000
@@ -40,6 +40,7 @@
     unity2dtrtest
     launchermenutest
     listaggregatormodeltest
+    qsortfilterproxymodeltest
     )
 
 add_custom_target(unity2dtr_po COMMAND

=== modified file 'libunity-2d-private/tests/keyboardmodifiersmonitortest.cpp'
--- libunity-2d-private/tests/keyboardmodifiersmonitortest.cpp	2011-01-26 15:50:26 +0000
+++ libunity-2d-private/tests/keyboardmodifiersmonitortest.cpp	2011-07-27 15:02:42 +0000
@@ -39,6 +39,7 @@
 #define UQ_TEST_MAIN(TestObject) \
 int main(int argc, char *argv[]) \
 { \
+    Unity2dApplication::earlySetup(argc, argv); \
     Unity2dApplication app(argc, argv); \
     QTEST_DISABLE_KEYPAD_NAVIGATION \
     TestObject tc; \

=== modified file 'libunity-2d-private/tests/mouseareademo.cpp'
--- libunity-2d-private/tests/mouseareademo.cpp	2011-02-15 18:18:13 +0000
+++ libunity-2d-private/tests/mouseareademo.cpp	2011-07-27 15:02:42 +0000
@@ -29,6 +29,7 @@
 
 int main(int argc, char** argv)
 {
+    Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication app(argc, argv);
     QWidget window;
     QLabel* enteredLabel = new QLabel("Entered");

=== added file 'libunity-2d-private/tests/qsortfilterproxymodeltest.cpp'
--- libunity-2d-private/tests/qsortfilterproxymodeltest.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/tests/qsortfilterproxymodeltest.cpp	2011-07-27 15:02:42 +0000
@@ -0,0 +1,384 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// local
+#include "qsortfilterproxymodelqml.h"
+
+// Qt
+#include <QTest>
+#include <QSignalSpy>
+#include <QModelIndex>
+#include <QAbstractListModel>
+#include <QDebug>
+
+
+class MockListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    MockListModel(QObject* parent = 0)
+        : QAbstractListModel(parent)
+    {
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const
+    {
+        return m_list.size();
+    }
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
+    {
+        Q_UNUSED(role)
+
+        if (!index.isValid() || index.row() < 0 || index.row() >= m_list.size()) {
+           return QVariant();
+        }
+        return QVariant(m_list[index.row()]);
+    }
+
+    void setRoleNames(const QHash<int,QByteArray> &roleNames) {
+        QAbstractListModel::setRoleNames(roleNames);
+        Q_EMIT roleNamesChanged(roleNames);
+    }
+
+    bool insertRows(int row, int count, const QModelIndex &parent=QModelIndex()) {
+        beginInsertRows(parent, row, row+count-1);
+        for (int i=0; i<count; i++) {
+            m_list.insert(i+row, "test"+i);
+        }
+        endInsertRows();
+        return true;
+    }
+
+    bool removeRows(int row, int count, const QModelIndex &parent=QModelIndex()) {
+        beginRemoveRows(parent, row, row+count-1);
+        for (int i=0; i<count; i++) {
+            m_list.removeAt(row);
+        }
+        endInsertRows();
+        return true;
+    }
+
+Q_SIGNALS:
+    void roleNamesChanged(const QHash<int,QByteArray> &);
+
+private:
+    QStringList m_list;
+};
+
+class QSortFilterProxyModelTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void initTestCase() {
+        qRegisterMetaType<QModelIndex>("QModelIndex");
+    }
+
+    void testRoleNamesSetAfter()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+        QHash<int, QByteArray> roles;
+
+        proxy.setSourceModelQObject(&model);
+
+        roles.clear();
+        roles[0] = "role0";
+        roles[1] = "role1";
+        model.setRoleNames(roles);
+        QCOMPARE(model.roleNames(), proxy.roleNames());
+    }
+
+    void testRoleNamesSetBefore()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+        QHash<int, QByteArray> roles;
+
+        roles.clear();
+        roles[0] = "role0";
+        roles[1] = "role1";
+        model.setRoleNames(roles);
+
+        proxy.setSourceModelQObject(&model);
+        QCOMPARE(model.roleNames(), proxy.roleNames());
+    }
+
+    void testCountSetAfter()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+        model.insertRows(0, 5);
+
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        proxy.setSourceModelQObject(&model);
+        QCOMPARE(proxy.count(), 5);
+        QVERIFY(spyOnCountChanged.count() >= 1);
+    }
+
+    void testCountInsert()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+
+        proxy.setSourceModelQObject(&model);
+
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.insertRows(0, 5);
+        QCOMPARE(proxy.count(), 5);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+    }
+
+    void testCountRemove()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+        model.insertRows(0, 5);
+
+        proxy.setSourceModelQObject(&model);
+
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.removeRows(0, 3);
+        QCOMPARE(proxy.count(), 2);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+    }
+
+    void testLimitCount()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+
+        proxy.setSourceModelQObject(&model);
+        proxy.setLimit(3);
+
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.insertRows(0, 5);
+        QCOMPARE(proxy.count(), 3);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+    }
+
+    void testLimitLesserThanCount()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+        model.insertRows(0, 10);
+
+        proxy.setSourceModelQObject(&model);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        proxy.setLimit(5);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 5);
+        QCOMPARE(arguments.at(2).toInt(), 9);
+        QCOMPARE(proxy.count(), 5);
+        spyOnRowsRemoved.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(7);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 5);
+        QCOMPARE(arguments.at(2).toInt(), 6);
+        QCOMPARE(proxy.count(), 7);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(3);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 6);
+        QCOMPARE(proxy.count(), 3);
+        spyOnRowsRemoved.clear();
+        spyOnCountChanged.clear();
+    }
+
+    void testLimitGreaterThanCount()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+        model.insertRows(0, 5);
+
+        proxy.setSourceModelQObject(&model);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        proxy.setLimit(7);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+        QCOMPARE(proxy.count(), 5);
+
+        proxy.setLimit(5);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+        QCOMPARE(proxy.count(), 5);
+
+        proxy.setLimit(3);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.count(), 3);
+        spyOnRowsRemoved.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(4);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 3);
+        QCOMPARE(proxy.count(), 4);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(7);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 4);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.count(), 5);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+    }
+
+    void testLimitMinusOne()
+    {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+        model.insertRows(0, 5);
+
+        proxy.setSourceModelQObject(&model);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        proxy.setLimit(7);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+        QCOMPARE(proxy.count(), 5);
+
+        proxy.setLimit(-1);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnCountChanged.count(), 0);
+        QCOMPARE(proxy.count(), 5);
+
+        proxy.setLimit(3);
+        QCOMPARE(spyOnRowsInserted.count(), 0);
+        QCOMPARE(spyOnRowsRemoved.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsRemoved.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.count(), 3);
+        spyOnRowsRemoved.clear();
+        spyOnCountChanged.clear();
+
+        proxy.setLimit(-1);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 3);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.count(), 5);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+    }
+
+    void testLimitInsert() {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model;
+        QList<QVariant> arguments;
+
+        proxy.setSourceModelQObject(&model);
+        proxy.setLimit(7);
+
+        QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+        QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+        QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
+
+        model.insertRows(0, 5);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 0);
+        QCOMPARE(arguments.at(2).toInt(), 4);
+        QCOMPARE(proxy.count(), 5);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        model.insertRows(2, 2);
+        QCOMPARE(spyOnRowsRemoved.count(), 0);
+        QCOMPARE(spyOnRowsInserted.count(), 1);
+        QCOMPARE(spyOnCountChanged.count(), 1);
+        arguments = spyOnRowsInserted.takeFirst();
+        QCOMPARE(arguments.at(1).toInt(), 2);
+        QCOMPARE(arguments.at(2).toInt(), 3);
+        QCOMPARE(proxy.count(), 7);
+        spyOnRowsInserted.clear();
+        spyOnCountChanged.clear();
+
+        /* FIXME: failing case due to QSortFilterProxyModel emitting
+           rowsInserted/rowsRemoved regardless of the limit */
+        //model.insertRows(5, 3);
+        //QCOMPARE(proxy.count(), 7);
+        //QCOMPARE(spyOnRowsRemoved.count(), 0);
+        //QCOMPARE(spyOnRowsInserted.count(), 0);
+        //QCOMPARE(spyOnCountChanged.count(), 0);
+    }
+};
+
+QTEST_MAIN(QSortFilterProxyModelTest)
+
+#include "qsortfilterproxymodeltest.moc"
+

=== modified file 'panel/app/main.cpp'
--- panel/app/main.cpp	2011-06-06 09:23:48 +0000
+++ panel/app/main.cpp	2011-07-27 15:02:42 +0000
@@ -52,21 +52,7 @@
 int main(int argc, char** argv)
 {
     ThemeEngineHandler handler;
-
-    Unity2dDebug::installHandlers();
-
-    /* When the environment variable QT_GRAPHICSSYSTEM is not set,
-       force graphics system to 'raster' instead of the default 'native'
-       which on X11 is 'XRender'.
-       'XRender' defaults to using a TrueColor visual. We do _not_ mimick that
-       behaviour with 'raster' by calling QApplication::setColorSpec because
-       of a bug where black rectangular artifacts were appearing randomly:
-
-       https://bugs.launchpad.net/unity-2d/+bug/734143
-    */
-    if(getenv("QT_GRAPHICSSYSTEM") == 0) {
-        QApplication::setGraphicsSystem("raster");
-    }
+    Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication app(argc, argv);
     QApplication::setStyle(new Unity2dStyle);
 

=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-06-22 08:22:14 +0000
+++ panel/applets/CMakeLists.txt	2011-07-27 15:02:42 +0000
@@ -14,11 +14,7 @@
 
 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
-pkg_check_modules(GTK REQUIRED gtk+-2.0)
 pkg_check_modules(INDICATOR REQUIRED indicator)
-pkg_check_modules(WNCK REQUIRED libwnck-1.0)
-
-find_package(X11 REQUIRED)
 
 # Get indicator dirs from pkgconfig
 read_pkg_variable(INDICATOR_DIR       indicator indicatordir)

=== modified file 'panel/applets/indicator/indicator.c'
--- panel/applets/indicator/indicator.c	2011-03-30 14:50:35 +0000
+++ panel/applets/indicator/indicator.c	2011-07-27 15:02:42 +0000
@@ -152,6 +152,20 @@
 	return;
 }
 
+static gboolean
+entry_scrolled (GtkWidget *menuitem, GdkEventScroll *event, gpointer data)
+{
+	IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_OBJECT);
+	IndicatorObjectEntry *entry = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_ENTRY);
+
+	g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE);
+
+	g_signal_emit_by_name (io, "scroll", 1, event->direction);
+	g_signal_emit_by_name (io, "scroll-entry", entry, 1, event->direction);
+
+	return FALSE;
+}
+
 static void
 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
@@ -233,6 +247,7 @@
 
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);
+	g_signal_connect(G_OBJECT (menuitem), "scroll-event", G_CALLBACK(entry_scrolled), NULL);
 
 	return;
 }

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-06-23 17:08:53 +0000
+++ places/Home.qml	2011-07-27 15:02:42 +0000
@@ -19,7 +19,7 @@
 import QtQuick 1.0
 import Unity2d 1.0 /* Necessary for SortFilterProxyModel and for the ImageProvider serving image://icons/theme_name/icon_name */
 
-Item {
+FocusScope {
     property variant model: PageModel {
         /* model.entrySearchQuery is copied over to all place entries's globalSearchQuery property */
         onEntrySearchQueryChanged: {
@@ -36,7 +36,7 @@
         var placeEntry, i
         for (i=0; i<dash.places.rowCount(); i=i+1) {
             placeEntry = dash.places.get(i)
-            if (placeEntry.globalResultsModel != null && placeEntry.globalResultsModel.count() != 0) {
+            if (placeEntry.globalResultsModel != null && placeEntry.globalResultsModel.count != 0) {
                 var firstResult = placeEntry.globalResultsModel.get(0)
                 /* Places give back the uri of the item in 'column_0' per specification */
                 var uri = firstResult.column_0
@@ -96,50 +96,39 @@
     ListViewWithScrollbar {
         id: globalSearch
 
+        focus: globalSearchActive
         opacity: globalSearchActive ? 1 : 0
         anchors.fill: parent
 
-        list.model: dash.places
-
-        list.delegate: UnityDefaultRenderer {
-            width: ListView.view.width
-
-            parentListView: list
-            placeEntryModel: item
-            displayName: item.name
-            iconHint: item.icon
-
-            /* Filter out results for which the corresponding group's renderer
-               is 'UnityEmptySearchRenderer'.
-               Each result has a column (the second one) containing the id of
-               the group it belongs to (groupId).
-            */
-            model:  SortFilterProxyModel {
-                model: item.globalResultsModel
-
-                /* FIXME: we ignore the groupId with renderer 'UnityEmptySearchRenderer'
-                   by hardcoding it instead of looking it up in the Place's
-                   groupsModel as Unity does.
-
-                   Two solutions could be envisioned:
-                   1) Actually looking for the row in the Place's groupsModel
-                      that has in its first column 'UnityEmptySearchRenderer'.
-                      That would require adding an API in libqtdee's DeeListModel.
-                   2) Changing the behaviour of the place daemons so that the
-                      Place's globalResultsModel is empty when there are no
-                      results. The applications place does that but not the
-                      files place.
-                */
-                property int ignoredGroupId: 5
-                filterRole: 2 /* groupId column */
-                filterRegExp: RegExp("^[^%1]$".arg(ignoredGroupId)) /* anything but the ignoredGroupId */
-            }
+        model: dash.places
+
+        bodyDelegate: UnityDefaultRenderer {
+            placeEntryModel: model.item
+            displayName: model.item.name
+            iconHint: model.item.icon
+
+            group_model: model.item.globalResultsModel
+            property bool focusable: group_model != undefined && group_model.count > 0
+        }
+
+        headerDelegate: GroupHeader {
+            visible: body.needHeader && body.focusable
+            height: visible ? 32 : 0
+
+            property bool foldable: body.folded != undefined
+            availableCount: foldable && body.group_model != null ? body.group_model.count - body.cellsPerRow : 0
+            folded: foldable ? body.folded : false
+            onClicked: if(foldable) body.folded = !body.folded
+
+            icon: body.iconHint
+            label: body.displayName
         }
     }
 
-    Rectangle {
+    FocusScope {
         id: shortcuts
 
+        focus: !globalSearchActive
         opacity: (!globalSearchActive && (shortcutsActive || dashView.dashMode == DashDeclarativeView.FullScreenMode)) ? 1 : 0
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
@@ -147,11 +136,14 @@
         width: 888
         height: 466
 
-        radius: 5
-        border.width: 1
-        /* FIXME: wrong colors */
-        border.color: Qt.rgba(1, 1, 1, 0.2)
-        color: Qt.rgba(0, 0, 0, 0.3)
+        Rectangle {
+            anchors.fill: parent
+            radius: 5
+            border.width: 1
+            /* FIXME: wrong colors */
+            border.color: Qt.rgba(1, 1, 1, 0.2)
+            color: Qt.rgba(0, 0, 0, 0.3)
+        }
 
         Button {
             id: closeShortcutsButton
@@ -182,11 +174,13 @@
            on the default version if a custom one doesn’t exist. */
         Loader {
             id: customShortcutsLoader
+            focus: status == Loader.Ready
             anchors.fill: parent
             source: "HomeShortcutsCustomized.qml"
         }
         Loader {
             id: defaultShortcutsLoader
+            focus: !customShortcutsLoader.focus
             anchors.fill: parent
             source: (customShortcutsLoader.status == Loader.Error) ? "HomeShortcuts.qml" : ""
         }

=== added file 'places/HomeButtonDefaultApplication.qml'
--- places/HomeButtonDefaultApplication.qml	1970-01-01 00:00:00 +0000
+++ places/HomeButtonDefaultApplication.qml	2011-07-27 15:02:42 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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
+/* Necessary for:
+   - ImageProvider serving image://icons/theme_name/icon_name
+   - LauncherApplication
+*/
+import Unity2d 1.0
+
+HomeButton {
+    property alias contentType: defaultApplication.contentType
+
+    GioDefaultApplication {
+        id: defaultApplication
+    }
+
+    LauncherApplication {
+        id: application
+        desktop_file: defaultApplication.desktopFile
+    }
+
+    visible: application.desktop_file != ""
+
+    onClicked: {
+        dashView.active = false
+        application.activate()
+    }
+
+    icon: "image://icons/" + application.icon
+    iconSourceSize.width: 128
+    iconSourceSize.height: 128
+}

=== modified file 'places/HomeShortcuts.qml'
--- places/HomeShortcuts.qml	2011-06-23 17:08:53 +0000
+++ places/HomeShortcuts.qml	2011-07-27 15:02:42 +0000
@@ -19,16 +19,41 @@
 import QtQuick 1.0
 import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */
 
-Flow {
+Grid {
     anchors.fill: parent
     anchors.topMargin: 26
     anchors.bottomMargin: 35
     anchors.leftMargin: 32
     anchors.rightMargin: 32
     spacing: 61
+    columns: 4
+    rows: 2
+
+    function selectChild(index) {
+        if (index < 0 || index >= children.length) return false
+        currentIndex = index
+        children[index].focus = true
+        return true
+    }
+
+    property int currentIndex: 0
+    Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
+    function handleKeyPress(key) {
+        switch (key) {
+        case Qt.Key_Right:
+            return selectChild(currentIndex+1)
+        case Qt.Key_Left:
+            return selectChild(currentIndex-1)
+        case Qt.Key_Up:
+            return selectChild(currentIndex-columns)
+        case Qt.Key_Down:
+            return selectChild(currentIndex+columns)
+        }
+    }
 
     /* FIXME: dummy icons need to be replaced by design's */
     HomeButton {
+        focus: true
         label: u2d.tr("Media Apps")
         icon: "artwork/find_media_apps.png"
         onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 9)
@@ -53,9 +78,9 @@
     }
 
     /* FIXME: use user's preferred applications instead of hardcoding them */
-    HomeButtonApplication {
+    HomeButtonDefaultApplication {
         label: u2d.tr("Browse the Web")
-        key: "/desktop/gnome/applications/browser/exec"
+        contentType: "x-scheme-handler/http"
     }
 
     HomeButtonApplication {
@@ -63,9 +88,9 @@
         desktopFile: "shotwell.desktop"
     }
 
-    HomeButtonApplication {
+    HomeButtonDefaultApplication {
         label: u2d.tr("Check Email")
-        key: "/desktop/gnome/url-handlers/mailto/command"
+        contentType: "x-scheme-handler/mailto"
     }
 
     HomeButtonApplication {

=== added file 'places/ListViewWithHeaders.qml'
--- places/ListViewWithHeaders.qml	1970-01-01 00:00:00 +0000
+++ places/ListViewWithHeaders.qml	2011-07-27 15:02:42 +0000
@@ -0,0 +1,277 @@
+/*
+ * 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
+
+/*
+  List item that behaves similarly to a ListView but supports adding headers
+  before every delegate.
+  It works around the lack of flexibility in section headers positioning of
+  ListView (cf. http://bugreports.qt.nokia.com/browse/QTBUG-12880). It also
+  supports delegates that are flickable by flicking their content properly
+  depending on where you are in the list.
+
+  To use it the following properties need to be set:
+  - bodyDelegate: Component used as a template for each item of the model; it
+    must have the following properties:
+     - 'contentY': same definition as a Flickable's
+     - 'totalHeight': the total height of the content of the body
+     - 'currentItem': a reference to the item of the body (e.g. a delegate of
+                      a ListView) currently focused by the body
+  - headerDelegate: Component used as a template for the header preceding each body
+
+  Two behaviours are available for the headers positioning:
+  - normal: the headers are always positioned just before the body
+  - accordion: the headers are stacked at the top and bottom of the list
+
+  Currently, it only works in a vertical layout.
+*/
+FocusScope {
+    id: list
+
+    property alias flickable: mouse
+    property alias model: repeater.model
+    property bool accordion: false
+    /* bodyDelegate must be an item that has the following properties:
+        - 'contentY'
+        - 'totalHeight'
+        - 'currentItem'
+    */
+    property Component bodyDelegate
+    property Component headerDelegate
+    property int currentIndex: -1
+    /* FIXME: Should be read-only but it is not possible to define a read-only property from QML.
+       Ref.: https://bugreports.qt.nokia.com//browse/QTBUG-15257
+    */
+    property variant currentItem: items.childFromIndex(currentIndex)
+
+
+    clip: true
+
+    /* updateMouseContentY() needs to be called when any of the variable
+       involved in the computation of the 'y' property of the currentSubItem changes.
+
+       if accordion is false:
+       - heightFirstChildren(index)
+       - headerLoader.height
+       - list.height
+
+       if accordion is true:
+       - heightFirstChildren(index)
+       - items.availableHeight
+       - heightFirstHeaders(index)
+
+       items.contentHeight seems to depend on all of those so it's enough to
+       depend only on it.
+    */
+    function updateMouseContentY() {
+        if (currentSubItem != undefined) {
+            mouse.contentY = Math.max(currentSubItem.mapToItem(mouse.contentItem, 0, 0).y -list.height/2, 0)
+        }
+    }
+    property variant currentSubItem: currentItem != undefined ? currentItem.bodyLoader.item.currentItem : undefined
+    onCurrentSubItemChanged: updateMouseContentY()
+
+    Connections {
+        target: items
+        onContentHeightChanged: updateMouseContentY()
+    }
+
+    FocusScope {
+        id: items
+
+        property int availableHeight: list.height - heightFirstHeaders(repeater.count)
+        property int contentHeight: items.heightFirstChildren(repeater.count)
+        property real value: mouse.contentY
+
+        anchors.fill: parent
+
+        function heightFirstChildren(n) {
+            var i
+            var totalHeight = 0
+            /* items.children contains both the repeated items and the repeater
+               itself. Skip and ignore the repeater. */
+            for (i=0; i<n && i<children.length; i++) {
+                if(children[i] == repeater) {n += 1; continue}
+                totalHeight += children[i].height
+            }
+            return totalHeight
+        }
+
+        function heightFirstHeaders(n) {
+            var i
+            var totalHeight = 0
+            /* items.children contains both the repeated items and the repeater
+               itself. Skip and ignore the repeater. */
+            for (i=0; i<n && i<children.length; i++) {
+                if(children[i] == repeater) {n += 1; continue}
+                totalHeight += children[i].headerLoader.height
+            }
+            return totalHeight
+        }
+
+        function clamp(x, min, max) {
+            return Math.max(Math.min(x, max), min)
+        }
+
+
+        /* Keyboard navigation */
+        function isIndexValid(index) {
+            /* Assuming that children contains exactly one item that is not a child (repeater) */
+            return index >= 0 && index < children.length-1
+        }
+
+        focus: true
+        Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
+        function handleKeyPress(key) {
+            switch (key) {
+            case Qt.Key_Down:
+                return selectNextEnabled()
+            case Qt.Key_Up:
+                return selectPreviousEnabled()
+            }
+        }
+
+        function childFromIndex(index) {
+            var indexInChildren = 0
+            for(var i=0; i<children.length; i++) {
+                if (children[i] != repeater) {
+                    if (indexInChildren == index) return children[i]
+                    indexInChildren++
+                }
+            }
+
+            return undefined
+        }
+
+        function selectNextEnabled() {
+            var index = currentIndex
+            do {
+                index += 1
+                if (!isIndexValid(index)) return false
+            } while(!childFromIndex(index).focusable)
+            currentIndex = index
+            return true
+        }
+
+        function selectPreviousEnabled() {
+            var index = currentIndex
+            do {
+                index -= 1
+                if (!isIndexValid(index)) return false
+            } while(!childFromIndex(index).focusable)
+            currentIndex = index
+            return true
+        }
+
+        property bool needsFocus: false
+        onChildrenChanged: {
+            /* FIXME: this workarounds the fact that list.focus is set to false
+                      when the child with focus is destroyed
+            */
+            if (needsFocus) {
+                list.focus = true
+                needsFocus = false
+            }
+            /* Assuming that children contains exactly one item that is not a child (repeater) */
+            if(children.length <= 1) {
+                list.currentIndex = -1
+            } else {
+                list.currentIndex = -1
+                selectNextEnabled()
+            }
+        }
+
+        Repeater {
+            id: repeater
+
+            FocusScope {
+                property alias bodyLoader: bodyLoader
+                property alias headerLoader: headerLoader
+
+                focus: index == list.currentIndex
+                Component.onDestruction: items.needsFocus = true
+
+                width: list.width
+                height: headerLoader.height + bodyLoader.item.totalHeight
+                property bool focusable: bodyLoader.item.focusable
+
+                property int pmin: pmax - (ymax - ymin)
+                property int pmax: items.heightFirstChildren(index) - ymin
+                property int ymin: list.accordion ? items.heightFirstHeaders(index) : -headerLoader.height
+                property int ymax: list.accordion ? ymin + items.availableHeight : list.height
+                y: items.clamp(-items.value + ymax + pmin, ymin, ymax)
+
+                Loader {
+                    id: headerLoader
+
+                    focus: visible
+                    KeyNavigation.down: bodyLoader
+                    sourceComponent: headerDelegate
+                    onLoaded: item.focus = true
+                    width: parent.width
+
+                    /* Workaround Qt bug http://bugreports.qt.nokia.com/browse/QTBUG-18857
+                       More documentation at http://bugreports.qt.nokia.com/browse/QTBUG-18011
+                    */
+                    property int index
+                    Binding { target: headerLoader; property: "index"; value: index }
+                    property variant model
+                    Binding { target: headerLoader; property: "model"; value: model }
+                    property variant body
+                    Binding { target: headerLoader; property: "body"; value: bodyLoader.item }
+                }
+
+                Loader {
+                    id: bodyLoader
+
+                    focus: !headerLoader.focus
+                    KeyNavigation.up: headerLoader
+                    sourceComponent: list.bodyDelegate
+                    onLoaded: item.focus = true
+                    width: parent.width
+                    anchors.top: headerLoader.bottom
+                    height: items.clamp(parent.ymax - parent.y, 0, item.totalHeight)
+
+                    Binding {
+                        target: bodyLoader.item
+                        property: "contentY"
+                        value: Math.max(items.value - pmax, 0)
+                    }
+
+                    /* Workaround Qt bug http://bugreports.qt.nokia.com/browse/QTBUG-18857
+                       More documentation at http://bugreports.qt.nokia.com/browse/QTBUG-18011
+                    */
+                    property int index
+                    Binding { target: bodyLoader; property: "index"; value: index }
+                    property variant model
+                    Binding { target: bodyLoader; property: "model"; value: model }
+                }
+            }
+        }
+    }
+
+    Flickable {
+        id: mouse
+
+        z: -1
+        anchors.fill: parent
+        contentWidth: parent.width
+        contentHeight: items.contentHeight
+    }
+}

=== modified file 'places/ListViewWithScrollbar.qml'
--- places/ListViewWithScrollbar.qml	2011-06-23 17:08:53 +0000
+++ places/ListViewWithScrollbar.qml	2011-07-27 15:02:42 +0000
@@ -18,44 +18,21 @@
 
 import QtQuick 1.0
 
-Item {
-    property alias list: list
+FocusScope {
     property alias scrollbar: scrollbar
+    property alias model: list.model
+    property alias bodyDelegate: list.bodyDelegate
+    property alias headerDelegate: list.headerDelegate
 
-    ListView {
+    ListViewWithHeaders {
         id: list
 
+        focus: true
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         anchors.right: scrollbar.left
         anchors.rightMargin: 15
-
-        clip: true
-        /* FIXME: proper spacing cannot be set because of the hack in Group.qml
-           whereby empty groups are still in the list but invisible and of
-           height 0.
-        */
-        //spacing: 31
-
-        orientation: ListView.Vertical
-
-        /* WARNING - HACK - FIXME
-           Issue:
-           User wise annoying jumps in the list are observable if cacheBuffer is
-           set to 0 (which is the default value). States such as 'folded' are
-           lost when scrolling a lot.
-
-           Explanation:
-           The height of the Group delegate depends on its content. However its
-           content is not known until the delegate is instantiated because it
-           depends on the number of results displayed by its GridView.
-
-           Resolution:
-           We set the cacheBuffer to the biggest possible int in order to make
-           sure all delegates are always instantiated.
-        */
-        cacheBuffer: 2147483647
     }
 
     Scrollbar {
@@ -67,7 +44,7 @@
         anchors.bottomMargin: 10
         anchors.right: parent.right
 
-        targetFlickable: list
+        targetFlickable: list.flickable
 
         /* Hide the scrollbar if there is less than a page of results */
         opacity: targetFlickable.visibleArea.heightRatio < 1.0 ? 1.0 : 0.0

=== modified file 'places/PlaceEntryView.qml'
--- places/PlaceEntryView.qml	2011-06-23 17:08:53 +0000
+++ places/PlaceEntryView.qml	2011-07-27 15:02:42 +0000
@@ -19,7 +19,7 @@
 import QtQuick 1.0
 import Unity2d 1.0 /* Necessary for SortFilterProxyModel */
 
-Item {
+FocusScope {
     id: placeEntryView
 
     /* An instance of PlaceEntryModel */
@@ -31,9 +31,9 @@
            ('firstGroupModel') is used to filter the search results per group.
         */
         var placeEntry, i
-        for (i=0; i<placeEntryView.model.entryGroupsModel.count(); i=i+1) {
+        for (i=0; i<placeEntryView.model.entryGroupsModel.count; i=i+1) {
             firstGroupModel.groupId = i
-            if (firstGroupModel.count() != 0) {
+            if (firstGroupModel.count != 0) {
                 var firstResult = firstGroupModel.get(0)
                 /* Places give back the uri of the item in 'column_0' per specification */
                 var uri = firstResult.column_0
@@ -62,6 +62,7 @@
     ListViewWithScrollbar {
         id: results
 
+        focus: true
         anchors.fill: parent
 
         /* The group's delegate is chosen dynamically depending on what
@@ -74,10 +75,10 @@
            If groupRenderer == 'UnityShowcaseRenderer' then it will look for
            the file 'UnityShowcaseRenderer.qml' and use it to render the group.
         */
-        list.delegate: Loader {
-            property string groupRenderer: column_0
-            property string displayName: column_1
-            property string iconHint: column_2
+        bodyDelegate: Loader {
+            property string groupRenderer: model.column_0
+            property string displayName: model.column_1
+            property string iconHint: model.column_2
             property int groupId: index
 
             source: groupRenderer ? groupRenderer+".qml" : ""
@@ -86,12 +87,8 @@
                     console.log("Failed to load renderer", groupRenderer)
             }
 
-            width: ListView.view.width
-
             /* Model that will be used by the group's delegate */
-            SortFilterProxyModel {
-                id: group_model
-
+            property variant group_model: SortFilterProxyModel {
                 model: placeEntryView.model.entryResultsModel
 
                 /* resultsModel contains data for all the groups of a given Place.
@@ -102,16 +99,37 @@
                 filterRegExp: RegExp("^%1$".arg(groupId)) /* exact match */
             }
 
-            onLoaded: {
-                item.parentListView = results.list
-                item.displayName = displayName
-                item.iconHint = iconHint
-                item.groupId = groupId
-                item.model = group_model
-                item.placeEntryModel = placeEntryView.model
-            }
-        }
-
-        list.model: placeEntryView.model != undefined ? placeEntryView.model.entryGroupsModel : undefined
+            /* Required by ListViewWithHeaders when the loaded Renderer is a Flickable.
+               In that case the list view scrolls the Flickable appropriately.
+            */
+            property int totalHeight: item.totalHeight != undefined ? item.totalHeight : 0
+            property int contentY
+            Binding { target: item; property: "contentY"; value: contentY }
+            property bool focusable: group_model.count > 0
+            property variant currentItem: item.currentItem
+
+            Binding { target: item; property: "displayName"; value: displayName }
+            Binding { target: item; property: "iconHint"; value: iconHint }
+            Binding { target: item; property: "groupId"; value: groupId }
+            Binding { target: item; property: "group_model"; value: group_model }
+            Binding { target: item; property: "placeEntryModel"; value: placeEntryView.model }
+
+            onLoaded: item.focus = true
+        }
+
+        headerDelegate: GroupHeader {
+            visible: body.item.needHeader && body.focusable
+            height: visible ? 32 : 0
+
+            property bool foldable: body.item.folded != undefined
+            availableCount: foldable ? body.group_model.count - body.item.cellsPerRow : 0
+            folded: foldable ? body.item.folded : false
+            onClicked: if(foldable) body.item.folded = !body.item.folded
+
+            icon: body.iconHint
+            label: body.displayName
+        }
+
+        model: placeEntryView.model != undefined ? placeEntryView.model.entryGroupsModel : undefined
     }
 }

=== modified file 'places/Renderer.qml'
--- places/Renderer.qml	2011-06-23 17:08:53 +0000
+++ places/Renderer.qml	2011-07-27 15:02:42 +0000
@@ -26,11 +26,11 @@
    itself. A typical renderer is the UnityDefaultRender that lays out the items
    in a grid of icons with the item's title underneath it.
 */
-Item {
+FocusScope {
     property string displayName /* Name of the group typically displayed in the header */
     property string iconHint /* Icon id of the group */
     property int groupId /* Index of the group */
-    property variant model /* List model containing the items to be displayed by the renderer */
+    property variant group_model /* List model containing the items to be displayed by the renderer */
     property variant placeEntryModel /* Reference to the place entry the group belongs to */
-    property variant parentListView /* Reference to the ListView the renderer is nested into */
+    property bool needHeader: false /* Whether or not the renderer requires a header to be displayed */
 }

=== modified file 'places/RendererGrid.qml'
--- places/RendererGrid.qml	2011-06-23 17:08:53 +0000
+++ places/RendererGrid.qml	2011-07-27 15:02:42 +0000
@@ -28,6 +28,11 @@
 Renderer {
     id: renderer
 
+    needHeader: true
+    property alias cellsPerRow: results.cellsPerRow
+    property alias contentY: results.contentY
+    property alias currentItem: results.currentItem
+
     property variant cellRenderer
     property bool folded
     folded: {
@@ -44,99 +49,35 @@
     property int horizontalSpacing: 26
     property int verticalSpacing: 26
 
-    /* Using results.contentHeight produces binding loop warnings and potential
-       rendering issues. We compute the height manually.
-    */
-    /* FIXME: tricking the system by making the delegate of height 0 and with
-              an invisible header is no good: the item in the model still
-              exists and some things such as keyboard selection break.
-    */
-    height: results.count > 0 ? header.height + results_layout.anchors.topMargin + results.totalHeight : 0
-    //Behavior on height {NumberAnimation {duration: 200}}
-
-    GroupHeader {
-        id: header
-
-        visible: results.count > 0
-        availableCount: results.count - results.cellsPerRow
-        folded: parent.folded
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: 32
-        icon: parent.iconHint
-        label: parent.displayName
-
-        onClicked: parent.folded = !parent.folded
-    }
+    /* FIXME: using results_layout.anchors.topMargin in the following expression
+              causes QML to think they might be an anchor loop. */
+    property int totalHeight: results.count > 0 ? results_layout.anchors.topMargin + results.totalHeight : 0
 
     Item {
         id: results_layout
 
-        anchors.top: header.bottom
-        anchors.topMargin: 22
-        anchors.left: parent.left
+        anchors.fill: parent
+        anchors.topMargin: 12
         anchors.leftMargin: 2
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
 
         CenteredGridView {
             id: results
 
-            /* FIXME: this is a gross hack compensating for the lack of sections
-               in GridView (see ListView.section).
-
-               We nest GridViews inside a ListView and add headers manually
-               (GroupHeader). The total height of each Group is computed
-               manually and given back to the ListView. However that size cannot
-               be used by the individual GridViews because it would make them
-               load all of their delegates at once using far too much memory and
-               processing power. Instead we constrain the height of the GridViews
-               and compute their position manually to compensate for the position
-               changes when flicking the ListView.
-
-               We assume that renderer.parentListView is the ListView we nest our
-               GridView into.
-            */
-            property variant flickable: renderer.parentListView.contentItem
-
-            /* flickable.contentY*0 is equal to 0 but is necessary in order to
-               have the entire expression being evaluated at the right moment.
-            */
-            property int inFlickableY: flickable.contentY*0+parent.mapToItem(flickable, 0, 0).y
-            /* note: testing for flickable.height < 0 is probably useless since it is
-               unlikely flickable.height will ever be negative.
-            */
-            property int compensateY: inFlickableY > 0 || flickable.height < 0 || totalHeight < flickable.height ? 0 : -inFlickableY
-
-            /* Synchronise the position and content's position of the GridView
-               with the current position of flickable's visibleArea */
-            function synchronisePosition() {
-                y = compensateY
-                contentY = compensateY
-            }
-
-            onCompensateYChanged: synchronisePosition()
-            /* Any change in content needs to trigger a synchronisation */
-            onCountChanged: synchronisePosition()
-            onModelChanged: synchronisePosition()
-
-            width: flickable.width
-            height: Math.min(totalHeight, flickable.height)
-
-            /* Only display one line of items when folded */
-            property int displayedCount: folded ? cellsPerRow : count
-            property int totalHeight: results.cellHeight*Math.ceil(displayedCount/cellsPerRow)
+            focus: true
+
+            anchors.fill: parent
+
+            property int totalHeight: results.cellHeight*Math.ceil(count/cellsPerRow)
 
             minHorizontalSpacing: renderer.horizontalSpacing
             minVerticalSpacing: renderer.verticalSpacing
             delegateWidth: renderer.cellWidth
             delegateHeight: renderer.cellHeight
 
-            interactive: false
+//            interactive: false
             clip: true
 
-            delegate: Item {
+            delegate: FocusScope {
 
                 width: results.cellWidth
                 height: results.cellHeight
@@ -157,6 +98,7 @@
                     height: results.delegateHeight
                     anchors.horizontalCenter: parent.horizontalCenter
 
+                    focus: true
                     sourceComponent: cellRenderer
                     onLoaded: {
                         item.uri = uri
@@ -164,11 +106,16 @@
                         item.mimetype = mimetype
                         item.displayName = displayName
                         item.comment = comment
+                        item.focus = true
                     }
                 }
             }
 
-            model: renderer.model
+            /* Only display one line of items when folded */
+            model: SortFilterProxyModel {
+                model: renderer.group_model != undefined ? renderer.group_model : null
+                limit: folded ? results.cellsPerRow : -1
+            }
         }
     }
 }

=== modified file 'places/Scrollbar.qml'
--- places/Scrollbar.qml	2011-06-23 17:08:53 +0000
+++ places/Scrollbar.qml	2011-07-27 15:02:42 +0000
@@ -72,12 +72,18 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        y: {
-            var clampedYPosition = Math.max(0, Math.min(1-targetFlickable.visibleArea.heightRatio,
-                                                        targetFlickable.visibleArea.yPosition))
-            return clampedYPosition * scrollbar.height
+        Binding {
+            target: slider
+            property: "y"
+            value: {
+                var clampedYPosition = Math.max(0, Math.min(1-targetFlickable.visibleArea.heightRatio,
+                                                            targetFlickable.visibleArea.yPosition))
+                return clampedYPosition * scrollbar.height
+            }
+            when: !dragMouseArea.drag.active
         }
-        height: Math.max(minimalHeight, targetFlickable.visibleArea.heightRatio * scrollbar.height)
+
+        height: Math.min(scrollbar.height, Math.max(minimalHeight, targetFlickable.visibleArea.heightRatio * scrollbar.height))
 
         Behavior on height {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
 

=== modified file 'places/SearchEntry.qml'
--- places/SearchEntry.qml	2011-06-23 17:08:53 +0000
+++ places/SearchEntry.qml	2011-07-27 15:02:42 +0000
@@ -19,7 +19,7 @@
 import QtQuick 1.0
 import Effects 1.0
 
-FocusScope {
+AbstractButton {
     property string searchQuery
 
     /* Cancels current search when the dash becomes invisible */
@@ -37,6 +37,8 @@
     /* Keys forwarded to the search entry are forwarded to the text input. */
     Keys.forwardTo: [search_input]
 
+    opacity: state == "selected" ? 1.0 : 0.7
+
     BorderImage {
         anchors.fill: parent
         source: "artwork/search_background.sci"

=== modified file 'places/SearchRefine.qml'
--- places/SearchRefine.qml	2011-06-23 17:08:53 +0000
+++ places/SearchRefine.qml	2011-07-27 15:02:42 +0000
@@ -49,6 +49,8 @@
 
         focus: true
 
+        KeyNavigation.down: options
+
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: parent.top
@@ -61,6 +63,7 @@
             text: u2d.tr("Refine search")
             font.bold: true
             font.pixelSize: 16
+            font.underline: parent.state == "selected"
 
             anchors.top: parent.top
             anchors.left: parent.left
@@ -92,6 +95,8 @@
         opacity: folded ? 0.0 : 1.0
         Behavior on opacity {NumberAnimation {duration: 100; easing.type: Easing.InOutQuad}}
 
+        KeyNavigation.up: header
+
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: header.bottom

=== modified file 'places/SearchRefineOptionType.qml'
--- places/SearchRefineOptionType.qml	2011-06-23 17:08:53 +0000
+++ places/SearchRefineOptionType.qml	2011-07-27 15:02:42 +0000
@@ -21,9 +21,11 @@
 SearchRefineOption {
     id: searchRefineOption
 
-    AbstractButton {
+    Item {
         id: header
 
+        KeyNavigation.down: filters
+
         focus: true
         anchors.top: parent.top
         anchors.left: parent.left
@@ -39,6 +41,7 @@
             text: searchRefineOption.title
             font.pixelSize: 16
             font.bold: true
+            font.underline: parent.state == "selected"
         }
     }
 
@@ -63,6 +66,7 @@
 
         /* Make sure the first item is selected when getting the focus for the first time */
         currentIndex: 0
+        KeyNavigation.up: header
 
         delegate: TickBox {
             height: filters.cellHeight
@@ -70,7 +74,7 @@
             /* Not checking for placeEntryModel != undefined leads to a segfault
                when switching places */
             text: placeEntryModel != undefined ? column_0 : ""
-            ticked: dash.currentPage.model.activeSection == model.index
+            checked: dash.currentPage.model.activeSection == model.index
 
             onClicked: placeEntryModel.activeSection = model.index
         }

=== modified file 'places/TickBox.qml'
--- places/TickBox.qml	2011-06-23 17:08:53 +0000
+++ places/TickBox.qml	2011-07-27 15:02:42 +0000
@@ -22,8 +22,8 @@
     id: tickBox
 
     property string text
-    property bool ticked: false
-    property bool canUntick: true
+    property bool checked: false
+    property bool canUncheck: true
 
     width: childrenRect.width
     height: childrenRect.height
@@ -43,7 +43,7 @@
     Image {
         id: box
 
-        opacity: !canUntick && ticked ? 0 : 1
+        opacity: !canUncheck && checked ? 0 : 1
         anchors.top: parent.top
         anchors.left: parent.left
         source: "artwork/tick_box.png"
@@ -58,7 +58,7 @@
         anchors.topMargin: 2
         anchors.left: box.left
         anchors.leftMargin: 3
-        opacity: ticked ? 1.0 : parent.state == "selected" ? 0.4 : 0.0
+        opacity: checked ? 1.0 : parent.state == "selected" ? 0.4 : 0.0
         source: "artwork/tick.png"
         width: sourceSize.width
         height: sourceSize.height

=== modified file 'places/UnityEmptySearchRenderer.qml'
--- places/UnityEmptySearchRenderer.qml	2011-06-23 17:08:53 +0000
+++ places/UnityEmptySearchRenderer.qml	2011-07-27 15:02:42 +0000
@@ -40,7 +40,7 @@
         boundsBehavior: ListView.StopAtBounds
         orientation: ListView.Vertical
 
-        model: renderer.model
+        model: renderer.group_model
         delegate: Button {
             property string uri: column_0
             property string iconHint: column_1

=== modified file 'places/app/CMakeLists.txt'
--- places/app/CMakeLists.txt	2011-03-08 09:20:02 +0000
+++ places/app/CMakeLists.txt	2011-07-27 15:02:42 +0000
@@ -1,7 +1,5 @@
 # Dependencies
-find_package(X11 REQUIRED)
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
-pkg_check_modules(GTK REQUIRED gtk+-2.0)
 
 # Sources
 set(places_SRCS

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-06-27 13:43:05 +0000
+++ places/app/places.cpp	2011-07-27 15:02:42 +0000
@@ -31,9 +31,8 @@
 
 #include <X11/Xlib.h>
 
-#include <gtk/gtk.h>
-
 // unity-2d
+#include <unity2dapplication.h>
 #include <unity2ddebug.h>
 
 #include "dashdeclarativeview.h"
@@ -41,23 +40,8 @@
 
 int main(int argc, char *argv[])
 {
-    /* gtk needs to be inited, otherwise we get an assert failure in gdk */
-    gtk_init(&argc, &argv);
-    Unity2dDebug::installHandlers();
-
-    /* When the environment variable QT_GRAPHICSSYSTEM is not set,
-       force graphics system to 'raster' instead of the default 'native'
-       which on X11 is 'XRender'.
-       'XRender' defaults to using a TrueColor visual. We do _not_ mimick that
-       behaviour with 'raster' by calling QApplication::setColorSpec because
-       of a bug where some pixmaps become blueish:
-
-       https://bugs.launchpad.net/unity-2d/+bug/689877
-    */
-    if(getenv("QT_GRAPHICSSYSTEM") == 0) {
-        QApplication::setGraphicsSystem("raster");
-    }
-    QApplication application(argc, argv);
+    Unity2dApplication::earlySetup(argc, argv);
+    Unity2dApplication application(argc, argv);
     QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     qmlRegisterType<DashDeclarativeView>("Unity2d", 1, 0, "DashDeclarativeView");

=== modified file 'places/dash.qml'
--- places/dash.qml	2011-07-05 19:01:18 +0000
+++ places/dash.qml	2011-07-27 15:02:42 +0000
@@ -31,6 +31,9 @@
     }
 
     function activatePage(page) {
+        /* Always give the focus to the search entry when switching pages */
+        search_entry.focus = true
+
         if (page == currentPage) {
             return
         }
@@ -40,12 +43,6 @@
         }
         currentPage = page
         currentPage.visible = true
-        /* FIXME: For some reason currentPage gets the focus when it becomes
-           visible. Reset the focus to the search_bar instead.
-           It could be due to Qt bug QTBUG-13380:
-           "Listview gets focus when it becomes visible"
-        */
-        search_entry.focus = true
     }
 
     function activatePlaceEntry(fileName, groupName, section) {
@@ -121,13 +118,18 @@
         /* Unhandled keys will always be forwarded to the search bar. That way
            the user can type and search from anywhere in the interface without
            necessarily focusing the search bar first. */
-        Keys.forwardTo: [search_entry]
+        //Keys.forwardTo: [search_entry]
 
 
         SearchEntry {
             id: search_entry
 
             focus: true
+            /* FIXME: check on visible necessary; fixed in Qt Quick 1.1
+                      ref: http://bugreports.qt.nokia.com/browse/QTBUG-15862
+            */
+            KeyNavigation.right: refine_search.visible ? refine_search : search_entry
+            KeyNavigation.down: pageLoader
 
             anchors.top: parent.top
             anchors.topMargin: 10
@@ -142,6 +144,8 @@
         SearchRefine {
             id: refine_search
 
+            KeyNavigation.left: search_entry
+
             /* SearchRefine is only to be displayed for places, not in the home page */
             visible: dashView.activePlaceEntry != ""
             placeEntryModel: visible && currentPage != undefined ? currentPage.model : undefined
@@ -158,6 +162,12 @@
         Loader {
             id: pageLoader
 
+            /* FIXME: check on visible necessary; fixed in Qt Quick 1.1
+                      ref: http://bugreports.qt.nokia.com/browse/QTBUG-15862
+            */
+            KeyNavigation.right: refine_search.visible && !refine_search.folded ? refine_search : pageLoader
+            KeyNavigation.up: search_entry
+
             anchors.top: search_entry.bottom
             anchors.topMargin: 2
             anchors.bottom: parent.bottom
@@ -165,6 +175,7 @@
             anchors.leftMargin: 20
             anchors.right: !refine_search.visible || refine_search.folded ? parent.right : refine_search.left
             anchors.rightMargin: !refine_search.visible || refine_search.folded ? 0 : 15
+            onLoaded: item.focus = true
         }
     }
 

=== modified file 'spread/app/CMakeLists.txt'
--- spread/app/CMakeLists.txt	2011-03-07 14:52:11 +0000
+++ spread/app/CMakeLists.txt	2011-07-27 15:02:42 +0000
@@ -1,7 +1,3 @@
-# Dependencies
-pkg_check_modules(GTK REQUIRED gtk+-2.0)
-find_package(X11 REQUIRED)
-
 # Sources
 set(spread_SRCS
     spread.cpp

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-06-22 08:33:52 +0000
+++ spread/app/spread.cpp	2011-07-27 15:02:42 +0000
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gtk/gtk.h>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QDeclarativeEngine>
@@ -28,31 +27,14 @@
 #include "spreadcontrol.h"
 #include "launcherclient.h"
 
-#include <unity2ddebug.h>
+#include <unity2dapplication.h>
 
 #include "config.h"
 
 int main(int argc, char *argv[])
 {
-    /* Unity2d plugin uses GTK APIs to retrieve theme icons
-       (gtk_icon_theme_get_default) and requires a call to gtk_init */
-    gtk_init(&argc, &argv);
-
-    Unity2dDebug::installHandlers();
-
-    /* When the environment variable QT_GRAPHICSSYSTEM is not set,
-       force graphics system to 'raster' instead of the default 'native'
-       which on X11 is 'XRender'.
-       'XRender' defaults to using a TrueColor visual. We do _not_ mimick that
-       behaviour with 'raster' by calling QApplication::setColorSpec because
-       of a bug where some pixmaps become blueish:
-
-       https://bugs.launchpad.net/unity-2d/+bug/689877
-    */
-    if(getenv("QT_GRAPHICSSYSTEM") == 0) {
-        QApplication::setGraphicsSystem("raster");
-    }
-    QApplication application(argc, argv);
+    Unity2dApplication::earlySetup(argc, argv);
+    Unity2dApplication application(argc, argv);
     QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     SpreadView view;