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

[Florian Boucault]

[dash] Collapse categories by default.

Unmerged revisions

653. By Florian Boucault on 2011-08-16

[dash] Collapse categories by default.

652. By Gerry Boland on 2011-08-12

[dash] Fix Lens bar icons so they scale correctly. Use correct Home lens icon.

651. By Florian Boucault on 2011-08-12

Readded dependency on libdee as a workaround until the proper fix is made in UnityCore.

650. By Florian Boucault on 2011-08-12

Removed mistakenly introduced dependency on libdee.

649. By Didier Roche-Tolomelli on 2011-08-11

releasing version 4.0.0-0ubuntu1

648. By Didier Roche-Tolomelli on 2011-08-11

* New upstream release:
  - [launcher] Impossible to keep KDE Apps in Launcher (LP: #741129)
  - [dash] Background should be blurred (LP: #823326)
  - No 'safely remove' option is present in the unity menu when a usb disk
    is inserted (LP: #660010)
  - Quicklist item "Keep In Launcher" should be "Keep in launcher" as design
    (LP: #795422)
  - [launcher] ESC doesn't dismiss launcher when activated with Alt+F1
    (LP: #812792)
  - [dash] Background wallpaper shifted when using a non compositing window
    manager (LP: #823295)
  - [launcher] Bottom gradient appears too early (LP: #823877)
  - mute/unmute sound when user clicks on sound applet using scroll button
    or middle mouse button (LP: #609860)
  - Secondary activate (i.e. middle click) support for indicators advanced
    usage (LP: #812933)
  - Unused GConfItemQmlWrapper dep found (LP: #821880)

647. By Didier Roche-Tolomelli on 2011-08-11

recommends lenses and not places anymore. Adding music lens

646. By Didier Roche-Tolomelli on 2011-08-11

* debian/control:
  - bump libunity-core-4.0-dev, libnux-1.0-dev

645. By Florian Boucault on 2011-08-11

[dash] Introduce bindings of shared backend for the dash and make use of them in the user interface.

Only search results have been integrated. The filters have been deactivated for now.
Also broken is the drag and drop from the dash to the launcher because lenses return garbled URIs.
All references to Place and PlaceEntry have been replaced by Lens.

644. By Aurélien Gâteau on 2011-08-11

[panel][launcher] Turn the HomeButtonApplet into a launcher item.

=== modified file '.bzrignore'
--- .bzrignore	2011-08-09 08:05:28 +0000
+++ .bzrignore	2011-08-16 09:38:07 +0000
@@ -17,6 +17,8 @@
 panel/app/unity-2d-panel
 panel/applets/indicator-config.h
 panel/applets/registraradaptor.*
+panel/lib/libuqpanel.so*
+panel/tests/Testing
 panel/tests/homebuttonapplettest
 
 libunity-2d-private/src/libunity-2d-private.so.*
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-27 09:42:32 +0000
+++ CMakeLists.txt	2011-08-16 09:38:07 +0000
@@ -25,10 +25,13 @@
 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(GDK REQUIRED gdk-3.0)
+pkg_check_modules(GTK REQUIRED gtk+-3.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
-pkg_check_modules(WNCK REQUIRED libwnck-1.0)
+pkg_check_modules(WNCK REQUIRED libwnck-3.0)
+pkg_check_modules(QTGCONF REQUIRED libqtgconf)
+pkg_check_modules(NUXCORE REQUIRED nux-core-1.0)
+pkg_check_modules(PANGO REQUIRED pango)
 
 
 # GSettings schemas
 
=== modified file 'data/unity-2d.convert'
--- data/unity-2d.convert	2011-07-25 11:56:59 +0000
+++ data/unity-2d.convert	2011-08-16 09:38:07 +0000
@@ -3,5 +3,3 @@
 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
 
=== renamed file 'debian/20_unity-2d-gconf-default' => 'debian/20_ubuntu-2d-gconf-default'
--- debian/20_unity-2d-gconf-default	2011-07-25 11:56:59 +0000
+++ debian/20_ubuntu-2d-gconf-default	2011-08-16 09:38:07 +0000
@@ -1,13 +1,5 @@
-/apps/gnome-power-manager/lock/use_screensaver_settings true
-/apps/gnome-power-manager/general/use_time_for_policy false
-/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
 /apps/metacity/general/auto_maximize_windows true
 /apps/metacity/general/capture_before_unmap true
 /apps/metacity/general/compositing_manager true
 /apps/metacity/general/compositor_effects false
-/apps/metacity/general/theme Ambiance
-/desktop/gnome/interface/gtk_theme Ambiance
-/desktop/gnome/interface/icon_theme ubuntu-mono-dark
-/desktop/gnome/peripherals/mouse/cursor_theme DMZ-White
 
=== renamed file 'debian/20_unity-2d-gconf-mandatory' => 'debian/20_ubuntu-2d-gconf-mandatory'
--- debian/20_unity-2d-gconf-mandatory	2011-06-15 13:05:38 +0000
+++ debian/20_ubuntu-2d-gconf-mandatory	2011-08-16 09:38:07 +0000
@@ -1,3 +1,2 @@
-/apps/nautilus/preferences/exit_with_last_window false
 /apps/metacity/global_keybindings/panel_main_menu disabled
 /apps/metacity/global_keybindings/panel_run_dialog disabled
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-29 14:05:54 +0000
+++ debian/changelog	2011-08-16 09:38:07 +0000
@@ -1,20 +1,58 @@
-unity-2d (3.8.14-0ubuntu1) UNRELEASED; urgency=low
-
-  * 
-
- -- Florian Boucault <[e-mail]>  Fri, 29 Jul 2011 16:05:25 +0200
-
-unity-2d (3.8.12-0ubuntu2) natty; urgency=low
+unity-2d (4.0.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release:
+    - [launcher] Impossible to keep KDE Apps in Launcher (LP: #741129)
+    - [dash] Background should be blurred (LP: #823326)
+    - No 'safely remove' option is present in the unity menu when a usb disk
+      is inserted (LP: #660010)
+    - Quicklist item "Keep In Launcher" should be "Keep in launcher" as design
+      (LP: #795422)
+    - [launcher] ESC doesn't dismiss launcher when activated with Alt+F1
+      (LP: #812792)
+    - [dash] Background wallpaper shifted when using a non compositing window
+      manager (LP: #823295)
+    - [launcher] Bottom gradient appears too early (LP: #823877)
+    - mute/unmute sound when user clicks on sound applet using scroll button
+      or middle mouse button (LP: #609860)
+    - Secondary activate (i.e. middle click) support for indicators advanced
+      usage (LP: #812933)
+    - Unused GConfItemQmlWrapper dep found (LP: #821880)
+  * debian/control:
+    - bump libunity-core-4.0-dev, libnux-1.0-dev
+    - recommends lenses and not places anymore. Adding music lens
+
+ -- Didier Roche <[e-mail]>  Thu, 11 Aug 2011 21:22:18 +0200
+
+unity-2d (3.8.14.1-0ubuntu1) oneiric; urgency=low
+
+  * Few upstream fixes:
+    - unity-2d-places crashed with SIGSEGV in
+      QDeclarativePropertyPrivate::initProperty() (LP: #817896)
+    - update resets unity launcher favorites (LP: #817954)
+
+ -- Didier Roche <[e-mail]>  Tue, 02 Aug 2011 16:08:27 +0200
+
+unity-2d (3.8.14-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release:
+    - [launcher] Need to press Alt+F1 twice to show launcher (LP: #812787)
+  * debian/control:
+    - build on latest libunity-core-4.0-dev and latest libnux-1.0-dev
+
+ -- Didier Roche <[e-mail]>  Mon, 01 Aug 2011 19:53:40 +0200
+
+unity-2d (3.8.12-0ubuntu2) oneiric; urgency=low
 
   * debian/control:
     - enforcing latest libunity-private0 to be installed for each local
       consumer
+    - don't recommends indicator-me, it's deprecated
   * debian/libunity-2d-private0.lintian-overrides:
     - remove a qml-related exported symbol warning wrongly detected
 
- -- Didier Roche <[e-mail]>  Fri, 29 Jul 2011 08:01:51 +0200
+ -- Didier Roche <[e-mail]>  Fri, 29 Jul 2011 15:19:11 +0200
 
-unity-2d (3.8.12-0ubuntu1) natty; urgency=low
+unity-2d (3.8.12-0ubuntu1) oneiric; urgency=low
 
   [ Florian Boucault ]
   * Upstreamed patch 01_build_with_new_indicator.patch
@@ -32,6 +70,7 @@
     - remove default value for /desktop/unity-2d/launcher/favorites
   * debian/control:
     - add dependency on libdconf-qt-dev
+    - add dependency on libnux-1.0-dev
 
   [ Didier Roche ]
   * New upstream release:
@@ -73,13 +112,27 @@
   * 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)
+  * debian/control:
+    - dep on latest libqtdee-dev
+    - dep now on gtk3 indicator version
+    - dep on versionned libnux-1.0-dev
+    - dep on versionned libunity-core-4.0-dev
   * debian/control, debian/rules, debian/libunity-2d-private-dev:
     - add new -dev project (LP: #814709)
     - add an upstream pc file
 
- -- Florian Boucault <[e-mail]>  Thu, 28 Jul 2011 12:05:05 +0200
-
-unity-2d (3.8.10-0ubuntu1) natty; urgency=low
+ -- Didier Roche <[e-mail]>  Thu, 28 Jul 2011 12:05:38 +0200
+
+unity-2d (3.8.10-0ubuntu2) oneiric; urgency=low
+
+  * debian/control:
+    - rebuild with new indicator 0.4
+  * 01_build_with_new_indicator.patch:
+    - patch to build with the new indicator 0.4 stack
+
+ -- Didier Roche <[e-mail]>  Sun, 10 Jul 2011 23:48:01 +0200
+
+unity-2d (3.8.10-0ubuntu1) oneiric; urgency=low
 
   [ Florian Boucault ]
   * debian/unity-2d-launcher.install:
@@ -102,10 +155,17 @@
     - Missing a GConf schema file for the /desktop/unity-2d/… keys
       (LP: #750303)
     - [dash] home screen search hint should be 'Search' (LP: #797825)
-
- -- Florian Boucault <[e-mail]>  Wed, 13 Jul 2011 11:59:29 +0200
-
-unity-2d (3.8.8-0ubuntu1) natty; urgency=low
+  * debian/unity-2d.gconf-defaults,
+    debian/20_ubuntu-2d-gconf-default:
+    - transition some gconf keys from session-wide to system-wide
+      (LP: #797672, #797676)
+  * debian/control:
+    - ensure we are still using gtk2 indicator for alpha2 (LP: #804938)
+    - bump standards-version
+
+ -- Didier Roche <[e-mail]>  Mon, 04 Jul 2011 11:05:54 +0200
+
+unity-2d (3.8.8-0ubuntu1) oneiric; urgency=low
 
   [ Didier Roche ]
   * new upstream release:
@@ -152,7 +212,21 @@
 
  -- Didier Roche <[e-mail]>  Tue, 14 Jun 2011 16:14:18 +0200
 
-unity-2d (3.8.6-0ubuntu1) natty; urgency=low
+unity-2d (3.8.6-0ubuntu3~ppa1) oneiric; urgency=low
+
+  * Rebuild with new gcc
+
+ -- Didier Roche <[e-mail]>  Tue, 07 Jun 2011 15:00:32 +0200
+
+unity-2d (3.8.6-0ubuntu2) oneiric; urgency=low
+
+  * debian/unity-2d.postinst, debian/unity-2d.postrm:
+    - remove the magic to set unity-2d in oneiric as the default session in gdm
+      as it's now installed on the ubuntu CD.
+
+ -- Didier Roche <[e-mail]>  Wed, 01 Jun 2011 09:42:21 +0200
+
+unity-2d (3.8.6-0ubuntu1) oneiric; urgency=low
 
   * New upstream release:
     - [launcher] Support static shortcuts in the quicklists. (LP: #669923)
@@ -196,6 +270,18 @@
   * debian/libunity-2d-private0.post*
     - removed: ldconfig is generated directly by dh_makeshlibs as we don't pass
       -n anymore
+  * don't install unity-2d session as it's in gnome-session now
+  * debian/unity-2d.install
+    debian/20_ubuntu-2d-gconf-default
+    debian/20_ubuntu-2d-gconf-mandatory
+    debian/gconf/ubuntu-2d.default.path
+    debian/gconf/ubuntu-2d.mandatory.path:
+    - remove uneeded defaults and mandatory
+    - remove some deprecated keys
+    - the session is now called ubuntu-2d and not unity-2d anymore
+  * debian/unity-2d.preinst, debian/unity-2d.postinst
+    debian/unity-2d.postrm:
+    - take into account the natty -> oneiric migration with session name change
 
  -- Didier Roche <[e-mail]>  Wed, 25 May 2011 12:19:25 +0200
 
 
=== modified file 'debian/control'
--- debian/control	2011-07-29 11:55:03 +0000
+++ debian/control	2011-08-16 09:38:07 +0000
@@ -10,19 +10,22 @@
                libqt4-dev,
                libqt4-opengl-dev,
                libglib2.0-dev,
-               libwnck-dev,
+               libwnck-3-dev,
+               libpango1.0-dev,
                libqtgconf-dev,
                libdconf-qt-dev,
                libqtbamf-dev,
-               libqtdee-dev,
+               libqtdee-dev (>= 0.2.3),
                libdbusmenu-qt-dev,
                libx11-dev,
-               libindicator-dev,
-               libgtk2.0-dev,
+               libindicator3-dev,
+               libgtk-3-dev,
                libutouch-geis-dev,
-               libstartup-notification0-dev
-Standards-Version: 3.9.1
-Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/unity-2d/trunk
+               libstartup-notification0-dev,
+               libunity-core-4.0-dev (>= 4.8.0),
+               libnux-1.0-dev (>= 1.2.0),
+Standards-Version: 3.9.2
+Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/unity-2d/oneiric
 
 Package: unity-2d
 Architecture: all
@@ -56,9 +59,10 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libunity-2d-private0 (= ${binary:Version}),
-         libgtk2.0-dev,
-         libwnck-dev,
+         libgtk-3-dev,
+         libwnck-3-dev,
          libglib2.0-dev,
+         libpango1.0-dev,
 Description: Unity 2D shared library - development files
  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
@@ -73,8 +77,9 @@
          unity-asset-pool,
          libunity-2d-private0 (= ${binary:Version}),
          libqt4-svg,
-Recommends: unity-place-files,
-            unity-place-applications
+Recommends: unity-lens-files,
+            unity-lens-applications,
+            unity-lens-music,
 Description: Unity 2D Launcher
  The Unity 2D launcher displays a list of running applications as well as a
  list of favorite applications in a panel at the left of the screen.
@@ -90,7 +95,6 @@
 Recommends: indicator-application,
             indicator-appmenu,
             indicator-datetime,
-            indicator-me,
             indicator-messages,
             indicator-session,
             indicator-sound,
 
=== renamed file 'debian/gconf/unity-2d.default.path' => 'debian/gconf/ubuntu-2d.default.path'
--- debian/gconf/unity-2d.default.path	2011-06-15 13:05:38 +0000
+++ debian/gconf/ubuntu-2d.default.path	2011-08-16 09:38:07 +0000
@@ -1,3 +1,3 @@
-# Additional mandatory path for unity-2d experience
-xml:readonly:/var/lib/gconf/unity-2d.default
+# Additional mandatory path for ubuntu-2d experience
+xml:readonly:/var/lib/gconf/ubuntu-2d.default
 
 
=== renamed file 'debian/gconf/unity-2d.mandatory.path' => 'debian/gconf/ubuntu-2d.mandatory.path'
--- debian/gconf/unity-2d.mandatory.path	2011-06-15 13:05:38 +0000
+++ debian/gconf/ubuntu-2d.mandatory.path	2011-08-16 09:38:07 +0000
@@ -1,3 +1,3 @@
-# Additional mandatory path for unity-2d experience
-xml:readonly:/var/lib/gconf/unity-2d.mandatory
+# Additional mandatory path for ubuntu-2d experience
+xml:readonly:/var/lib/gconf/ubuntu-2d.mandatory
 
 
=== modified file 'debian/unity-2d-panel.install'
--- debian/unity-2d-panel.install	2011-01-14 21:41:39 +0000
+++ debian/unity-2d-panel.install	2011-08-16 09:38:07 +0000
@@ -1,4 +1,2 @@
 usr/bin/unity-2d-panel
 usr/share/applications/unity-2d-panel.desktop
-usr/share/unity-2d/panel/artwork/background.png
-usr/share/unity-2d/panel/artwork/divider.png
 
=== added file 'debian/unity-2d.gconf-defaults'
--- debian/unity-2d.gconf-defaults	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.gconf-defaults	2011-08-16 09:38:07 +0000
@@ -0,0 +1,4 @@
+/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
 
=== modified file 'debian/unity-2d.install'
--- debian/unity-2d.install	2011-07-22 14:44:57 +0000
+++ debian/unity-2d.install	2011-08-16 09:38:07 +0000
@@ -1,9 +1,7 @@
 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
+debian/20_ubuntu-2d-gconf-mandatory /usr/share/gconf/ubuntu-2d/mandatory
+debian/20_ubuntu-2d-gconf-default /usr/share/gconf/ubuntu-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.postinst'
--- debian/unity-2d.postinst	2011-06-15 13:05:38 +0000
+++ debian/unity-2d.postinst	2011-08-16 09:38:07 +0000
@@ -9,24 +9,21 @@
 
 case "$1" in
   configure|upgrade)
-    if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then
-        /usr/lib/gdm/gdm-set-default-session --keep-old unity-2d || true
-    fi
     if which update-gconf-defaults >/dev/null 2>&1 ; then
-        mkdir -p /var/lib/gconf/unity-2d.mandatory
-        mkdir -p /var/lib/gconf/unity-2d.default
+        mkdir -p /var/lib/gconf/ubuntu-2d.mandatory
+        mkdir -p /var/lib/gconf/ubuntu-2d.default
     fi
   ;;
   triggered)
     for trigger in $2; do
       case $trigger in
-        /usr/share/gconf/unity-2d/mandatory)
-          update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
-          --destination /var/lib/gconf/unity-2d.mandatory --no-signal
+        /usr/share/gconf/ubuntu-2d/mandatory)
+          update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
+          --destination /var/lib/gconf/ubuntu-2d.mandatory --no-signal
         ;;
-        /usr/share/gconf/unity-2d/default)
-          update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
-          --destination /var/lib/gconf/unity-2d.default --no-signal
+        /usr/share/gconf/ubuntu-2d/default)
+          update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
+          --destination /var/lib/gconf/ubuntu-2d.default --no-signal
         ;;
       esac
     done
@@ -39,9 +36,9 @@
 
 # Upon installation/upgrade, regenerate all databases, because in this case 
 # there will be no trigger run
-update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
-                      --destination /var/lib/gconf/unity-2d.mandatory --no-signal
-update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
-                      --destination /var/lib/gconf/unity-2d.default --no-signal
+update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
+                      --destination /var/lib/gconf/ubuntu-2d.mandatory --no-signal
+update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
+                      --destination /var/lib/gconf/ubuntu-2d.default --no-signal
 signal_daemons
 
 
=== modified file 'debian/unity-2d.postrm'
--- debian/unity-2d.postrm	2011-06-15 13:05:38 +0000
+++ debian/unity-2d.postrm	2011-08-16 09:38:07 +0000
@@ -3,20 +3,17 @@
 
 case "$1" in
   remove|purge)
-    if which update-gconf-defaults >/dev/null 2>&1 && [ -d /usr/share/gconf/mandatory/unity-2d ]; then
-        update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
-        --destination /var/lib/gconf/unity-2d.mandatory
-        update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
-        --destination /var/lib/gconf/unity-2d.default
-    fi
-    if [ -d /var/lib/gconf/unity-2d.mandatory ]; then
-        rm -rf /var/lib/gconf/unity-2d.mandatory
-    fi
-    if [ -d /var/lib/gconf/unity-2d.default ]; then
-        rm -rf /var/lib/gconf/unity-2d.default
-    fi
-    if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then
-        /usr/lib/gdm/gdm-set-default-session --remove unity-2d || true
+    if which update-gconf-defaults >/dev/null 2>&1 && [ -d /usr/share/gconf/mandatory/ubuntu-2d ]; then
+        update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
+        --destination /var/lib/gconf/ubuntu-2d.mandatory
+        update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
+        --destination /var/lib/gconf/ubuntu-2d.default
+    fi
+    if [ -d /var/lib/gconf/ubuntu-2d.mandatory ]; then
+        rm -rf /var/lib/gconf/ubuntu-2d.mandatory
+    fi
+    if [ -d /var/lib/gconf/ubuntu-2d.default ]; then
+        rm -rf /var/lib/gconf/ubuntu-2d.default
     fi
     ;;
 esac
 
=== added file 'debian/unity-2d.preinst'
--- debian/unity-2d.preinst	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.preinst	2011-08-16 09:38:07 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+  install|upgrade)
+    if dpkg --compare-versions "$2" le "3.8.6-0ubuntu1"; then
+        if [ -d /var/lib/gconf/unity-2d.mandatory ]; then
+          mv /var/lib/gconf/unity-2d.mandatory /var/lib/gconf/ubuntu-2d.mandatory || true
+          mv /var/lib/gconf/unity-2d.default /var/lib/gconf/ubuntu-2d.default || true
+        fi
+    fi
+  ;;
+esac
+
+#DEBHELPER#
+
 
=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-08-01 11:58:35 +0000
+++ launcher/Launcher.qml	2011-08-16 09:38:07 +0000
@@ -22,7 +22,10 @@
 LauncherDropItem {
     id: launcher
 
+    Accessible.name: "root"
+
     GnomeBackground {
+        Accessible.name: "background"
         anchors.fill: parent
         overlay_color: "black"
         overlay_alpha: 0.66
@@ -30,6 +33,7 @@
     }
 
     Rectangle {
+        Accessible.name: "background"
         anchors.fill: parent
         color: "black"
         opacity: 0.66
@@ -37,6 +41,7 @@
     }
     
     Image {
+        Accessible.name: "border"
         id: border
 
         width: 1
@@ -50,12 +55,16 @@
     onWebpageUrlDropped: applications.insertWebFavorite(url)
 
     FocusScope {
+        Accessible.name: "content"
+
         focus: true
         anchors.fill: parent
         z: 1 /* ensure the lists are always strictly on top of the background */
 
         LauncherList {
             id: main
+            Accessible.name: "main"
+
             anchors.top: parent.top
             anchors.bottom: shelf.top
             anchors.bottomMargin: itemPadding
@@ -75,6 +84,8 @@
 
         LauncherList {
             id: shelf
+            Accessible.name: "shelf"
+
             anchors.bottom: parent.bottom
             anchors.bottomMargin: main.anchors.bottomMargin
             height: (tileSize + itemPadding) * count
@@ -92,23 +103,14 @@
         }
     }
 
-    SortFilterProxyModel {
-        id: visiblePlaces
-        model: places
-        dynamicSortFilter: true
-
-        filterRole: Place.RoleShowEntry
-        filterRegExp: RegExp("^true$")
+    BfbModel {
+        id: bfbModel
     }
 
     LauncherApplicationsList {
         id: applications
     }
 
-    LauncherPlacesList {
-        id: places
-    }
-
     LauncherDevicesList {
         id: devices
     }
@@ -129,9 +131,9 @@
     }
 
     Component.onCompleted: {
+        items.appendModel(bfbModel);
         items.appendModel(applications);
         items.appendModel(workspaces);
-        items.appendModel(visiblePlaces);
         items.appendModel(devices);
         shelfItems.appendModel(trashes);
     }
 
=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-07-14 11:17:30 +0000
+++ launcher/LauncherItem.qml	2011-08-16 09:38:07 +0000
@@ -48,6 +48,8 @@
 DropItem {
     id: item
 
+    Accessible.role: Accessible.PushButton
+
     anchors.horizontalCenter: parent.horizontalCenter
 
     property int padding
 
=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-08-10 11:58:31 +0000
+++ launcher/LauncherList.qml	2011-08-16 09:38:07 +0000
@@ -77,6 +77,17 @@
     delegate: LauncherItem {
         id: launcherItem
 
+        function accessibleDescription() {
+            if (running) {
+                var windows = u2d.tr("%1 window opened", "%1 windows opened", item.windowCount).arg(item.windowCount)
+                return "%1 %2".arg(item.name).arg(windows)
+            } else {
+                return "%1 %2".arg(item.name).arg(u2d.tr("not running"))
+            }
+        }
+
+        Accessible.name: accessibleDescription()
+
         width: list.width
         tileSize: list.tileSize
         padding: list.itemPadding
 
=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-08-09 13:33:24 +0000
+++ launcher/app/launcher.cpp	2011-08-16 09:38:07 +0000
@@ -78,6 +78,7 @@
 {
     Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication application(argc, argv);
+    application.setApplicationName("Unity 2D Launcher");
     QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     GnomeSessionClient client(INSTALL_PREFIX "/share/applications/unity-2d-launcher.desktop");
@@ -91,6 +92,7 @@
     Unity2dPanel panel(true);
     panel.setEdge(Unity2dPanel::LeftEdge);
     panel.setFixedWidth(LauncherClient::MaximumWidth);
+    panel.setAccessibleName("Launcher");
 
     VisibilityController* visibilityController = new VisibilityController(&panel);
 
 
=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-08-01 11:58:35 +0000
+++ launcher/app/launcherview.cpp	2011-08-16 09:38:07 +0000
@@ -56,8 +56,7 @@
 static const char* DASH_DBUS_PROPERTY_ACTIVE = "active";
 static const char* DASH_DBUS_METHOD_ACTIVATE_HOME = "activateHome";
 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* COMMANDS_LENS_ID = "commands.lens";
 static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
 
 LauncherView::LauncherView(QWidget* parent) :
@@ -79,9 +78,9 @@
     Hotkey* altF1 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F1, Qt::AltModifier);
     connect(altF1, SIGNAL(pressed()), SLOT(forceActivateWindow()));
 
-    /* Alt+F2 shows the dash with the commands place entry activated. */
+    /* Alt+F2 shows the dash with the commands lens activated. */
     Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
-    connect(altF2, SIGNAL(pressed()), SLOT(showCommandsPlace()));
+    connect(altF2, SIGNAL(pressed()), SLOT(showCommandsLens()));
 
     /* Super+{n} for 0 ≤ n ≤ 9 activates the item with index (n + 9) % 10. */
     for (Qt::Key key = Qt::Key_0; key <= Qt::Key_9; key = (Qt::Key) (key + 1)) {
@@ -232,10 +231,9 @@
 }
 
 void
-LauncherView::showCommandsPlace()
+LauncherView::showCommandsLens()
 {
     QDBusInterface dashInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
-    dashInterface.asyncCall("activatePlaceEntry",
-                            APPLICATIONS_PLACE, COMMANDS_PLACE_ENTRY, 0);
+    dashInterface.asyncCall("activateLens", COMMANDS_LENS_ID);
 }
 
 
=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-08-01 11:58:35 +0000
+++ launcher/app/launcherview.h	2011-08-16 09:38:07 +0000
@@ -57,7 +57,7 @@
     void updateSuperKeyMonitoring();
     void updateSuperKeyHoldState();
     void toggleDash();
-    void showCommandsPlace();
+    void showCommandsLens();
 
 protected:
     void focusInEvent(QFocusEvent* event);
 
=== modified file 'libunity-2d-private/CMakeLists.txt'
--- libunity-2d-private/CMakeLists.txt	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/CMakeLists.txt	2011-08-16 09:38:07 +0000
@@ -6,8 +6,10 @@
 pkg_check_modules(QTDEE REQUIRED libqtdee)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
-pkg_check_modules(INDICATOR REQUIRED indicator)
+pkg_check_modules(INDICATOR REQUIRED indicator3-0.4)
 pkg_check_modules(DCONFQT REQUIRED dconf-qt)
+pkg_check_modules(UNITYCORE REQUIRED unity-core-4.0)
+pkg_check_modules(DEE REQUIRED dee-1.0)
 
 set(libunity-2d-private_SOVERSION 0)
 set(libunity-2d-private_VERSION ${libunity-2d-private_SOVERSION}.0.0)
 
=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-08-16 09:38:07 +0000
@@ -30,6 +30,9 @@
     ${INDICATOR_INCLUDE_DIRS}
     ${X11_INCLUDE_DIR}
     ${DCONFQT_INCLUDE_DIRS}
+    ${UNITYCORE_INCLUDE_DIRS}
+    ${NUXCORE_INCLUDE_DIRS}
+    ${DEE_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
 
=== modified file 'libunity-2d-private/Unity2d/GnomeBackground.qml'
--- libunity-2d-private/Unity2d/GnomeBackground.qml	2011-08-09 13:33:24 +0000
+++ libunity-2d-private/Unity2d/GnomeBackground.qml	2011-08-16 09:38:07 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 1.0
-import gconf 1.0
+import QConf 1.0
 /* Necessary to access the blended image provider and CacheEffect */
 import Unity2d 1.0
 
@@ -32,19 +32,9 @@
     property bool cached: true
     effect: (cached) ? cacheEffect : null
 
-    GConfItem {
-        id: primary_color
-        key: "/desktop/gnome/background/primary_color"
-    }
-
-    GConfItem {
-        id: picture_filename
-        key: "/desktop/gnome/background/picture_filename"
-    }
-
-    GConfItem {
-        id: picture_options
-        key: "/desktop/gnome/background/picture_options"
+    QConf {
+        id: desktopBackground
+        schema: "org.gnome.desktop.background"
     }
 
     Rectangle {
@@ -55,13 +45,13 @@
         }
 
         anchors.fill: parent
-        color: primary_color.value
+        color: desktopBackground.primaryColor
     }
 
     Image {
         id: picture
 
-        visible: picture_filename.value
+        visible: desktopBackground.pictureUri
         source: {
             if (!visible) return ""
             
@@ -74,8 +64,8 @@
                https://bugs.launchpad.net/ubuntu/+source/ubuntu-wallpapers/+bug/296538
                http://bugreports.qt.nokia.com/browse/QTBUG-7276
             */
-            var filename = picture_filename.value
-            if(filename == "/usr/share/backgrounds/warty-final-ubuntu.png")
+            var filename = desktopBackground.pictureUri
+            if(filename == "file:///usr/share/backgrounds/warty-final-ubuntu.png")
                 filename = "/usr/share/unity-2d/warty-final-ubuntu.jpg"
 
             if(overlay_alpha > 0.0)
@@ -99,13 +89,13 @@
             - "spanned" (NOT IMPLEMENTED)
         */
         fillMode: {
-            if(picture_options.value == "wallpaper")
+            if(desktopBackground.pictureOptions== "wallpaper")
                 return Image.Tile
-            else if(picture_options.value == "scaled")
+            else if(desktopBackground.pictureOptions == "scaled")
                 return Image.PreserveAspectFit
-            else if(picture_options.value == "stretched")
+            else if(desktopBackground.pictureOptions == "stretched")
                 return Image.Stretch
-            else if(picture_options.value == "zoom")
+            else if(desktopBackground.pictureOptions == "zoom")
                 return Image.PreserveAspectCrop
             else return Image.PreserveAspectFit
         }
 
=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-07-26 16:05:51 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-08-16 09:38:07 +0000
@@ -20,10 +20,6 @@
 /* Required otherwise using wnck_set_client_type breaks linking with error:
    undefined reference to `wnck_set_client_type(WnckClientType)'
 */
-extern "C" {
-#include <libwnck/util.h>
-}
-
 #include "plugin.h"
 
 #include "launcherapplication.h"
@@ -60,6 +56,10 @@
 #include "autohidebehavior.h"
 #include "intellihidebehavior.h"
 #include "forcevisiblebehavior.h"
+#include "bfb.h"
+
+#include "lenses.h"
+#include "lens.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeEngine>
@@ -105,6 +105,9 @@
 
     qmlRegisterType<ListAggregatorModel>(uri, 0, 1, "ListAggregatorModel");
 
+    qmlRegisterType<BfbModel>(uri, 0, 1, "BfbModel");
+    qmlRegisterType<BfbItem>(uri, 0, 1, "BfbItem");
+
     qmlRegisterType<LauncherApplicationsList>(uri, 0, 1, "LauncherApplicationsList");
     qmlRegisterType<LauncherApplication>(uri, 0, 1, "LauncherApplication");
 
@@ -130,6 +133,9 @@
     qmlRegisterType<IconUtilities>(); // Register the type as non creatable
 
     qmlRegisterType<GioDefaultApplication>(uri, 0, 1, "GioDefaultApplication");
+
+    qmlRegisterType<Lenses>(uri, 1, 0, "Lenses");
+    qmlRegisterType<Lens>(uri, 1, 0, "Lens");
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
 
=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-08-16 09:38:07 +0000
@@ -2,7 +2,11 @@
 
 # Sources
 set(lib${LIB_NAME}_SRCS
+    bfb.cpp
+    dashclient.cpp
+    debug.cpp
     gconnector.cpp
+    gimageutils.cpp
     gnomesessionclient.cpp
     keyboardmodifiersmonitor.cpp
     hotkeymonitor.cpp
@@ -53,6 +57,10 @@
     workspaces.cpp
     launcherdropitem.cpp
     iconutilities.cpp
+    lenses.cpp
+    lens.cpp
+    filter.cpp
+    ratingsfilter.cpp
     )
 
 # Build
@@ -64,6 +72,8 @@
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GLIB_INCLUDE_DIRS}
+    ${GTK_INCLUDE_DIRS}
+    ${PANGO_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
     ${QTBAMF_INCLUDE_DIRS}
     ${QTGCONF_INCLUDE_DIRS}
@@ -75,6 +85,9 @@
     ${INDICATOR_INCLUDE_DIRS}
     ${X11_INCLUDE_DIR}
     ${DCONFQT_INCLUDE_DIRS}
+    ${UNITYCORE_INCLUDE_DIRS}
+    ${NUXCORE_INCLUDE_DIRS}
+    ${DEE_INCLUDE_DIRS}
     )
 
 add_library(${LIB_NAME} SHARED ${libunity-2d-private_SRCS})
@@ -93,6 +106,8 @@
     ${QT_QTNETWORK_LIBRARIES}
     ${X11_LIBRARIES}
     ${GLIB_LDFLAGS}
+    ${GTK_LDFLAGS}
+    ${PANGO_LDFLAGS}
     ${WNCK_LDFLAGS}
     ${GDK_LDFLAGS}
     ${GIO_LDFLAGS}
@@ -104,6 +119,9 @@
     ${STARTUPNOTIFICATION_LDFLAGS}
     ${INDICATOR_LDFLAGS}
     ${DCONFQT_LDFLAGS}
+    ${UNITYCORE_LDFLAGS}
+    ${NUXCORE_LDFLAGS}
+    ${DEE_LDFLAGS}
     )
 
 # Install
 
=== added file 'libunity-2d-private/src/bfb.cpp'
--- libunity-2d-private/src/bfb.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/bfb.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Aurélien Gâteau <[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 "bfb.h"
+
+// libunity-2d
+#include <dashclient.h>
+#include <debug_p.h>
+#include <unity2dtr.h>
+
+// Qt
+
+BfbItem::BfbItem()
+: m_active(false)
+{
+    connect(DashClient::instance(), SIGNAL(activePageChanged(const QString&)),
+        SLOT(slotActivePageChanged(const QString&)));
+}
+
+BfbItem::~BfbItem()
+{
+}
+
+bool BfbItem::active() const
+{
+    return m_active;
+}
+
+void BfbItem::slotActivePageChanged(const QString& page)
+{
+    bool active = !page.isEmpty();
+    if (m_active != active) {
+        m_active = active;
+        activeChanged(m_active);
+    }
+}
+
+bool BfbItem::running() const
+{
+    return false;
+}
+
+int BfbItem::windowCount() const
+{
+    return 0;
+}
+
+bool BfbItem::urgent() const
+{
+    return false;
+}
+
+QString BfbItem::name() const
+{
+    return u2dTr("Dash");
+}
+
+QString BfbItem::icon() const
+{
+    return "unity-icon-theme/distributor-logo";
+}
+
+bool BfbItem::launching() const
+{
+    return false;
+}
+
+void BfbItem::activate()
+{
+    DashClient::instance()->setActivePage(m_active ? "" : "home");
+}
+
+void BfbItem::createMenuActions()
+{
+}
+
+////////////////////////////////////////////////////////////
+BfbModel::BfbModel(QObject* parent)
+: QAbstractListModel(parent)
+, m_bfbItem(new BfbItem)
+{
+}
+
+BfbModel::~BfbModel()
+{
+    delete m_bfbItem;
+}
+
+int BfbModel::rowCount(const QModelIndex& /*parent*/) const
+{
+    return 1;
+}
+
+QVariant BfbModel::data(const QModelIndex& index, int /*role*/) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    return QVariant::fromValue(m_bfbItem);
+}
+
+#include <bfb.moc>
 
=== added file 'libunity-2d-private/src/bfb.h'
--- libunity-2d-private/src/bfb.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/bfb.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Aurélien Gâteau <[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 BFB_H
+#define BFB_H
+
+#include "launcheritem.h"
+
+// Qt
+#include <QAbstractListModel>
+#include <QMetaType>
+
+class BfbItem : public LauncherItem
+{
+    Q_OBJECT
+public:
+    BfbItem();
+    ~BfbItem();
+
+    /* getters */
+    virtual bool active() const;
+    virtual bool running() const;
+    virtual int windowCount() const;
+    virtual bool urgent() const;
+    virtual QString name() const;
+    virtual QString icon() const;
+    virtual bool launching() const;
+
+    /* methods */
+    Q_INVOKABLE virtual void activate();
+    Q_INVOKABLE virtual void createMenuActions();
+
+private Q_SLOTS:
+    void slotActivePageChanged(const QString&);
+
+private:
+    Q_DISABLE_COPY(BfbItem)
+    bool m_active;
+};
+
+Q_DECLARE_METATYPE(BfbItem*)
+
+
+class BfbModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    BfbModel(QObject* parent = 0);
+    ~BfbModel();
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const;
+
+private:
+    Q_DISABLE_COPY(BfbModel)
+    BfbItem* m_bfbItem;
+};
+
+#endif // BFB_H
 
=== added file 'libunity-2d-private/src/dashclient.cpp'
--- libunity-2d-private/src/dashclient.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/dashclient.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,155 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[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/>.
+ */
+// Self
+#include "dashclient.h"
+
+// Local
+
+// libunity-2d
+#include <debug_p.h>
+
+// Qt
+#include <QApplication>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
+#include <QDBusServiceWatcher>
+
+static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
+static const char* DASH_DBUS_PATH = "/Dash";
+static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
+
+DashClient::DashClient(QObject* parent)
+: QObject(parent)
+, m_dashDbusIface(0)
+, m_dashActive(false)
+{
+    /* Check if the dash is already up and running by asking the bus instead of
+       trying to create an instance of the interface. Creating an instance would
+       cause D-Bus to activate the dash and we don’t want this to happen, the
+       dash should be started on demand only. */
+    QDBusConnectionInterface* sessionBusIFace = QDBusConnection::sessionBus().interface();
+    QDBusReply<bool> reply = sessionBusIFace->isServiceRegistered(DASH_DBUS_SERVICE);
+    if (reply.isValid() && reply.value()) {
+        connectToDash();
+    } else {
+        /* The dash is not running: monitor its registration on the bus so we
+           can connect to it when it comes up. */
+        QDBusServiceWatcher* watcher = new QDBusServiceWatcher(DASH_DBUS_SERVICE,
+                                                               QDBusConnection::sessionBus(),
+                                                               QDBusServiceWatcher::WatchForRegistration,
+                                                               this);
+        connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(connectToDash()));
+    }
+}
+
+void DashClient::connectToDash()
+{
+    if (m_dashDbusIface) {
+        return;
+    }
+
+    m_dashDbusIface = new QDBusInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE,
+                                         QDBusConnection::sessionBus(), this);
+    connect(m_dashDbusIface, SIGNAL(activeChanged(bool)),
+            SLOT(slotDashActiveChanged(bool)));
+    connect(m_dashDbusIface, SIGNAL(activeLensChanged(const QString&)),
+            SLOT(slotDashActiveLensChanged(const QString&)));
+
+    QVariant value = m_dashDbusIface->property("active");
+    if (value.isValid()) {
+        m_dashActive = value.toBool();
+    } else {
+        UQ_WARNING << "Fetching Dash.active property failed";
+    }
+    value = m_dashDbusIface->property("activeLens");
+    if (value.isValid()) {
+        m_dashActiveLens = value.toString();
+    } else {
+        UQ_WARNING << "Fetching Dash.activeLens property failed";
+    }
+
+    updateActivePage();
+}
+
+DashClient* DashClient::instance()
+{
+    static DashClient* client = new DashClient(qApp);
+    return client;
+}
+
+void DashClient::slotDashActiveChanged(bool value)
+{
+    if (m_dashActive != value) {
+        m_dashActive = value;
+        updateActivePage();
+    }
+}
+
+void DashClient::slotDashActiveLensChanged(const QString& lens)
+{
+    if (m_dashActiveLens != lens) {
+        m_dashActiveLens = lens;
+        updateActivePage();
+    }
+}
+
+QString DashClient::activePage() const
+{
+    return m_activePage;
+}
+
+void DashClient::setActivePage(const QString& page, const QString& lensId)
+{
+    if (m_activePage == page) {
+        return;
+    }
+    if (page.isEmpty()) {
+        // Use m_dashDbusIface to close the dash, but only if it is running
+        if (m_dashDbusIface) {
+            m_dashDbusIface->setProperty("active", false);
+        }
+        return;
+    }
+    // Use a separate QDBusInterface so that the dash is started if it is not
+    // already running
+    QDBusInterface iface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
+    if (page == "home") {
+        iface.asyncCall("activateHome");
+    } else {
+        iface.asyncCall("activateLens", lensId);
+    }
+}
+
+void DashClient::updateActivePage()
+{
+    QString activePage;
+    if (m_dashActive) {
+        activePage = m_dashActiveLens.isEmpty() ? "home" : m_dashActiveLens;
+    }
+
+    if (m_activePage != activePage) {
+        m_activePage = activePage;
+        activePageChanged(m_activePage);
+    }
+}
+
+#include "dashclient.moc"
 
=== added file 'libunity-2d-private/src/dashclient.h'
--- libunity-2d-private/src/dashclient.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/dashclient.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,68 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[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 DASHCLIENT_H
+#define DASHCLIENT_H
+
+// Local
+
+// Qt
+#include <QObject>
+
+class QDBusInterface;
+
+/**
+ * Monitors the dash and provide a single point of entry to its status
+ */
+class DashClient : public QObject
+{
+    Q_OBJECT
+public:
+    static DashClient* instance();
+
+    /**
+     * Returns the active page. This is either:
+     * - The lens id of the active lens
+     * - "home" if the home is visible
+     * - "" if the dash is not visible
+     */
+    QString activePage() const;
+
+    void setActivePage(const QString& page, const QString& lensId=QString());
+
+Q_SIGNALS:
+    void activePageChanged(const QString&);
+
+private Q_SLOTS:
+    void connectToDash();
+    void slotDashActiveChanged(bool);
+    void slotDashActiveLensChanged(const QString&);
+
+private:
+    DashClient(QObject* parent=0);
+    void updateActivePage();
+
+    QDBusInterface* m_dashDbusIface;
+    bool m_dashActive;
+    QString m_dashActiveLens;
+    QString m_activePage;
+};
+
+#endif /* DASHCLIENT_H */
 
=== added file 'libunity-2d-private/src/debug.cpp'
--- libunity-2d-private/src/debug.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/debug.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,23 @@
+/* This file is part of unity-2d
+   Copyright 2011 Canonical
+   Author: Aurelien Gateau <[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/>.
+ */
+// Self
+#include <debug_p.h>
+
+QDebug operator<<(QDebug& dbg, const std::string& str)
+{
+    return dbg << QString::fromUtf8(str.c_str());
+}
 
=== modified file 'libunity-2d-private/src/debug_p.h'
--- libunity-2d-private/src/debug_p.h	2011-03-28 14:06:14 +0000
+++ libunity-2d-private/src/debug_p.h	2011-08-16 09:38:07 +0000
@@ -17,8 +17,12 @@
 #ifndef DEBUG_P_H
 #define DEBUG_P_H
 
+// Qt
 #include <QDebug>
 
+// STL
+#include <string>
+
 #define _UQ_TRACE(level) (level().nospace() << __PRETTY_FUNCTION__ << ":").space()
 
 // Simple macros to get KDebug like support
@@ -62,5 +66,7 @@
 
 #define UQ_DEBUG_BLOCK Unity2dDebugBlock __unity2dDebugBlock__(__PRETTY_FUNCTION__)
 
+// Support for outputing std::string with qDebug
+QDebug operator<<(QDebug& dbg, const std::string& str);
 
 #endif /* DEBUG_P_H */
 
=== added file 'libunity-2d-private/src/filter.cpp'
--- libunity-2d-private/src/filter.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/filter.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,92 @@
+/*
+ * 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/>.
+ */
+
+// Self
+#include "filter.h"
+
+Filter::Filter(QObject *parent) :
+    QObject(parent)
+{
+}
+
+
+QString Filter::id() const
+{
+    return QString::fromStdString(m_unityFilter->id());
+}
+
+QString Filter::name() const
+{
+    return QString::fromStdString(m_unityFilter->name());
+}
+
+QString Filter::iconHint() const
+{
+    return QString::fromStdString(m_unityFilter->icon_hint());
+}
+
+QString Filter::rendererName() const
+{
+    return QString::fromStdString(m_unityFilter->renderer_name());
+}
+
+bool Filter::visible() const
+{
+    return m_unityFilter->visible();
+}
+
+bool Filter::collapsed() const
+{
+    return m_unityFilter->collapsed();
+}
+
+bool Filter::filtering() const
+{
+    return m_unityFilter->filtering();
+}
+
+void Filter::clear()
+{
+    m_unityFilter->Clear();
+}
+
+
+void Filter::setUnityFilter(unity::dash::Filter::Ptr filter)
+{
+    if (m_unityFilter != NULL) {
+        // FIXME: should disconnect from m_unityFilter's signals
+    }
+
+    m_unityFilter = filter;
+
+    /* Property change signals */
+    m_unityFilter->id.changed.connect(sigc::mem_fun(this, &Filter::idChanged));
+    m_unityFilter->name.changed.connect(sigc::mem_fun(this, &Filter::nameChanged));
+    m_unityFilter->icon_hint.changed.connect(sigc::mem_fun(this, &Filter::iconHintChanged));
+    m_unityFilter->renderer_name.changed.connect(sigc::mem_fun(this, &Filter::rendererNameChanged));
+    m_unityFilter->visible.changed.connect(sigc::mem_fun(this, &Filter::visibleChanged));
+    m_unityFilter->collapsed.changed.connect(sigc::mem_fun(this, &Filter::collapsedChanged));
+    m_unityFilter->filtering.changed.connect(sigc::mem_fun(this, &Filter::filteringChanged));
+
+    /* Signals forwarding */
+    m_unityFilter->removed.connect(sigc::mem_fun(this, &Filter::removed));
+}
+
+
+#include "filter.moc"
 
=== added file 'libunity-2d-private/src/filter.h'
--- libunity-2d-private/src/filter.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/filter.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,74 @@
+/*
+ * 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 FILTER_H
+#define FILTER_H
+
+// Qt
+#include <QObject>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/Filter.h>
+
+class Filter : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString id READ id NOTIFY idChanged)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
+    Q_PROPERTY(QString rendererName READ rendererName NOTIFY rendererNameChanged)
+    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
+    Q_PROPERTY(bool collapsed READ collapsed NOTIFY collapsedChanged)
+    Q_PROPERTY(bool filtering READ filtering NOTIFY filteringChanged)
+
+public:
+    explicit Filter(QObject *parent = 0);
+
+    /* getters */
+    QString id() const;
+    QString name() const;
+    QString iconHint() const;
+    QString rendererName() const;
+    bool visible() const;
+    bool collapsed() const;
+    bool filtering() const;
+
+    void clear();
+    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+
+Q_SIGNALS:
+    void idChanged(std::string);
+    void nameChanged(std::string);
+    void iconHintChanged(std::string);
+    void rendererNameChanged(std::string);
+    void visibleChanged(bool);
+    void collapsedChanged(bool);
+    void filteringChanged(bool);
+
+    void removed();
+
+protected:
+    unity::dash::Filter::Ptr m_unityFilter;
+};
+
+Q_DECLARE_METATYPE(Filter*)
+
+#endif // FILTER_H
 
=== added file 'libunity-2d-private/src/gimageutils.cpp'
--- libunity-2d-private/src/gimageutils.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/gimageutils.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,102 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[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/>.
+ */
+// Self
+#include <gimageutils.h>
+
+// Local
+#include <debug_p.h>
+#include <gscopedpointer.h>
+
+// Qt
+#include <QByteArray>
+#include <QImage>
+
+// GTK
+#include <gtk/gtk.h>
+
+namespace GImageUtils
+{
+
+QImage imageForIconString(const QString& name, int size, GtkIconTheme* theme)
+{
+    if (!theme) {
+        theme = gtk_icon_theme_get_default();
+    }
+    QByteArray utf8Name = name.toUtf8();
+
+    /* Load the icon by creating a GIcon from the string icon_name.
+       icon_name can contain more than a simple icon name but possibly
+       a string as returned by g_icon_to_string().
+    */
+    GObjectScopedPointer<GIcon> icon(g_icon_new_for_string(utf8Name.data(), NULL));
+    GScopedPointer<GtkIconInfo, gtk_icon_info_free> iconInfo;
+    iconInfo.reset(gtk_icon_theme_lookup_by_gicon(
+        theme,
+        icon.data(),
+        size,
+        (GtkIconLookupFlags)0)
+        );
+
+    if (!iconInfo) {
+        UQ_WARNING << "Failed to find icon:" << name;
+        return QImage();
+    }
+
+    GObjectScopedPointer<GdkPixbuf> pixbuf(gtk_icon_info_load_icon(iconInfo.data(), NULL));
+    if (!pixbuf) {
+        UQ_WARNING << "Failed to load icon:" << name;
+        return QImage();
+    }
+
+    return imageForPixbuf(pixbuf.data());
+}
+
+QImage imageForPixbuf(const GdkPixbuf* pixbuf)
+{
+    QImage image(gdk_pixbuf_get_pixels(pixbuf),
+                   gdk_pixbuf_get_width(pixbuf),
+                   gdk_pixbuf_get_height(pixbuf),
+                   gdk_pixbuf_get_rowstride(pixbuf),
+                   QImage::Format_ARGB32);
+
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+    /* ABGR → ARGB */
+    QImage swappedImage = image.rgbSwapped();
+#else
+    /* ABGR → BGRA */
+    /* Reference: https://bugs.launchpad.net/unity-2d/+bug/758782 */
+    QImage swappedImage(image.size(), image.format());
+    for (int i = 0; i < swappedImage.height(); ++i) {
+        QRgb* p = (QRgb*) image.constScanLine(i);
+        QRgb* q = (QRgb*) swappedImage.scanLine(i);
+        QRgb* end = p + image.width();
+        while (p < end) {
+            *q = qRgba(qAlpha(*p), qRed(*p), qGreen(*p), qBlue(*p));
+            p++;
+            q++;
+        }
+    }
+#endif
+
+    return swappedImage;
+}
+
+} // namespace
 
=== added file 'libunity-2d-private/src/gimageutils.h'
--- libunity-2d-private/src/gimageutils.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/gimageutils.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,46 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[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 GIMAGEUTILS_H
+#define GIMAGEUTILS_H
+
+// Local
+
+// Qt
+
+class QImage;
+class QString;
+
+struct _GdkPixbuf;
+struct _GtkIconTheme;
+
+/**
+ * Helper methods to deal with GTK images
+ */
+namespace GImageUtils
+{
+
+QImage imageForIconString(const QString& name, int size, struct _GtkIconTheme* theme = 0);
+
+QImage imageForPixbuf(const struct _GdkPixbuf* pixbuf);
+
+} // namespace
+
+#endif /* GIMAGEUTILS_H */
 
=== modified file 'libunity-2d-private/src/iconimageprovider.cpp'
--- libunity-2d-private/src/iconimageprovider.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/iconimageprovider.cpp	2011-08-16 09:38:07 +0000
@@ -23,6 +23,7 @@
 #include <QFile>
 
 #include <debug_p.h>
+#include <gimageutils.h>
 
 static const char* UNITY_RES_PATH = "/usr/share/unity/";
 
@@ -114,62 +115,9 @@
         icon_name.chop(4);
     }
 
-    /* Load the icon by creating a GIcon from the string icon_name.
-       icon_name can contain more than a simple icon name but possibly
-       a string as returned by g_icon_to_string().
-    */
-    QByteArray byte_array = icon_name.toUtf8();
-    gchar *g_icon_name = byte_array.data();
-
-    GIcon *g_icon = g_icon_new_for_string(g_icon_name, NULL);
-    GtkIconInfo *icon_info = gtk_icon_theme_lookup_by_gicon(theme, g_icon,
-                                                            requestedSize.width(),
-                                                            (GtkIconLookupFlags)0);
-    g_object_unref(g_icon);
-
-    if (icon_info == NULL) {
-        UQ_WARNING << "Failed to find icon:" << icon_name;
-        return QImage();
-    }
-
-    GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon_info, NULL);
-    gtk_icon_info_free(icon_info);
-
-    if (pixbuf == NULL) {
-        UQ_WARNING << "Failed to load icon:" << icon_name;
-        return QImage();
-    }
-
-    QImage image(gdk_pixbuf_get_pixels(pixbuf),
-                   gdk_pixbuf_get_width(pixbuf),
-                   gdk_pixbuf_get_height(pixbuf),
-                   gdk_pixbuf_get_rowstride(pixbuf),
-                   QImage::Format_ARGB32);
-
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-    /* ABGR → ARGB */
-    QImage swappedImage = image.rgbSwapped();
-#else
-    /* ABGR → BGRA */
-    /* Reference: https://bugs.launchpad.net/unity-2d/+bug/758782 */
-    QImage swappedImage(image.size(), image.format());
-    for (int i = 0; i < swappedImage.height(); ++i) {
-        QRgb* p = (QRgb*) image.constScanLine(i);
-        QRgb* q = (QRgb*) swappedImage.scanLine(i);
-        QRgb* end = p + image.width();
-        while (p < end) {
-            *q = qRgba(qAlpha(*p), qRed(*p), qGreen(*p), qBlue(*p));
-            p++;
-            q++;
-        }
-    }
-#endif
-
-    g_object_unref(pixbuf);
-
+    QImage image = GImageUtils::imageForIconString(icon_name, requestedSize.width(), theme);
     if (size) {
-        *size = swappedImage.size();
+        *size = image.size();
     }
-
-    return swappedImage;
+    return image;
 }
 
=== modified file 'libunity-2d-private/src/launcherapplication.cpp'
--- libunity-2d-private/src/launcherapplication.cpp	2011-08-09 11:28:45 +0000
+++ libunity-2d-private/src/launcherapplication.cpp	2011-08-16 09:38:07 +0000
@@ -14,10 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Those have to be included before any QObject-style header to avoid
-   compilation errors. */
-#include <gdk/gdk.h>
-
 /* Note regarding the use of wnck: it is critically important that the client
    type be set to pager because wnck will pass that type over to the window
    manager through XEvents.
@@ -59,6 +55,7 @@
 #include <QX11Info>
 
 extern "C" {
+#include <gdk/gdk.h>
 #include <libsn/sn.h>
 }
 
@@ -662,7 +659,8 @@
     GTimeVal timeval;
 
     g_get_current_time (&timeval);
-    GObjectScopedPointer<GdkAppLaunchContext> context(gdk_app_launch_context_new());
+    GdkDisplay* display = gdk_display_get_default();
+    GObjectScopedPointer<GdkAppLaunchContext> context(gdk_display_get_app_launch_context(display));
     /* Using GDK_CURRENT_TIME doesn’t seem to work, launched windows
        sometimes don’t get focus (see https://launchpad.net/bugs/643616). */
     gdk_app_launch_context_set_timestamp(context.data(), timeval.tv_sec);
@@ -893,7 +891,7 @@
         QAction* keep = new QAction(m_menu);
         keep->setCheckable(is_running);
         keep->setChecked(sticky());
-        keep->setText(is_running ? u2dTr("Keep In Launcher") : u2dTr("Remove From Launcher"));
+        keep->setText(is_running ? u2dTr("Keep in launcher") : u2dTr("Remove from launcher"));
         actions.append(keep);
         QObject::connect(keep, SIGNAL(triggered()), this, SLOT(onKeepTriggered()));
     }
 
=== modified file 'libunity-2d-private/src/launcherapplicationslist.cpp'
--- libunity-2d-private/src/launcherapplicationslist.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherapplicationslist.cpp	2011-08-16 09:38:07 +0000
@@ -101,6 +101,16 @@
         application->installX11EventFilter(this);
     }
 
+    /* Get the system applications data dirs and be flexible if / is not at the
+       end of each path. */
+    QString xdgDataDir = QFile::decodeName(getenv("XDG_DATA_DIRS"));
+    if (xdgDataDir.isEmpty()) {
+        xdgDataDir = "/usr/local/share/:/usr/share/";
+    }
+    Q_FOREACH(const QString& dirName, xdgDataDir.split(':')) {
+      m_xdgApplicationDirs << QDir::cleanPath(dirName + "/applications") + "/";
+    }
+
     load();
 }
 
@@ -178,9 +188,17 @@
 }
 
 QString
-LauncherApplicationsList::favoriteFromDesktopFilePath(QString desktop_file)
+LauncherApplicationsList::favoriteFromDesktopFilePath(const QString& _desktopFile) const
 {
-    return QDir(desktop_file).dirName();
+    QString desktopFile(_desktopFile);
+    Q_FOREACH(const QString& applicationDir, m_xdgApplicationDirs) {
+        if (_desktopFile.startsWith(applicationDir)) {
+            desktopFile.remove(applicationDir);
+            desktopFile.replace("/", "-");
+            break;
+        }
+    }
+    return desktopFile;
 }
 
 void
 
=== modified file 'libunity-2d-private/src/launcherapplicationslist.h'
--- libunity-2d-private/src/launcherapplicationslist.h	2011-08-06 10:42:04 +0000
+++ libunity-2d-private/src/launcherapplicationslist.h	2011-08-16 09:38:07 +0000
@@ -70,7 +70,7 @@
     void insertApplication(LauncherApplication* application);
     void removeApplication(LauncherApplication* application);
 
-    static QString favoriteFromDesktopFilePath(QString desktop_file);
+    QString favoriteFromDesktopFilePath(const QString& desktop_file) const;
 
     void writeFavoritesToGConf();
 
@@ -89,6 +89,7 @@
     */
     QHash<QString, LauncherApplication*> m_applicationForExecutable;
     QConf* m_dconf_launcher;
+    QStringList m_xdgApplicationDirs;
 
     /* Startup notification support */
     SnDisplay *m_snDisplay;
 
=== modified file 'libunity-2d-private/src/launcherdevice.cpp'
--- libunity-2d-private/src/launcherdevice.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherdevice.cpp	2011-08-16 09:38:07 +0000
@@ -186,35 +186,65 @@
 }
 
 void
+LauncherDevice::unmount(GMountOperation* mountOperation)
+{
+    if (m_volume == NULL) {
+        return;
+    }
+
+    GObjectScopedPointer<GMount> mount(g_volume_get_mount(m_volume));
+
+    if (mount.isNull()) {
+        return;
+    }
+
+    if (g_mount_can_unmount(mount.data())) {
+        g_mount_unmount_with_operation(mount.data(), G_MOUNT_UNMOUNT_NONE, mountOperation, NULL,
+                                       (GAsyncReadyCallback) LauncherDevice::onMountUnmounted,
+                                       NULL);
+    }
+}
+
+void
 LauncherDevice::eject()
 {
     if (m_volume == NULL) {
         return;
     }
 
-    GMountOperation *mountOperation;
-    mountOperation = gtk_mount_operation_new(NULL);
+    GObjectScopedPointer<GMountOperation> mountOperation(gtk_mount_operation_new(NULL));
 
     if (g_volume_can_eject(m_volume)) {
-        g_volume_eject_with_operation(m_volume, G_MOUNT_UNMOUNT_NONE, mountOperation,
-            NULL, (GAsyncReadyCallback) LauncherDevice::onVolumeEjected, NULL);
-    } else {
-        GMount* mount = g_volume_get_mount(m_volume);
-
-        if (mount == NULL) {
-            return;
-        }
-
-        if (g_mount_can_unmount(mount)) {
-            g_mount_unmount_with_operation(mount, G_MOUNT_UNMOUNT_NONE, mountOperation,
-                NULL, (GAsyncReadyCallback) LauncherDevice::onMountUnmounted,
-                NULL);
-        } else {
-            g_object_unref(mount);
-        }
-    }
-
-    g_object_unref(mountOperation);
+        g_volume_eject_with_operation(m_volume, G_MOUNT_UNMOUNT_NONE, mountOperation.data(),
+                                      NULL,
+                                      (GAsyncReadyCallback) LauncherDevice::onVolumeEjected,
+                                      NULL);
+    } else {
+        unmount(mountOperation.data());
+    }
+}
+
+void
+LauncherDevice::stop()
+{
+    if (m_volume == NULL) {
+        return;
+    }
+
+    GObjectScopedPointer<GDrive> drive(g_volume_get_drive(m_volume));
+
+    if (drive.isNull()) {
+        return;
+    }
+
+    GObjectScopedPointer<GMountOperation> mountOperation(gtk_mount_operation_new(NULL));
+
+    if (g_drive_can_stop(drive.data())) {
+        g_drive_stop(drive.data(), G_MOUNT_UNMOUNT_NONE, mountOperation.data(), NULL,
+                     (GAsyncReadyCallback) LauncherDevice::onDriveStopped, NULL);
+    } else {
+        unmount(mountOperation.data());
+    }
 }
 
 void
@@ -224,6 +254,12 @@
 }
 
 void
+LauncherDevice::onDriveStopped(GDrive* drive, GAsyncResult* res)
+{
+    g_drive_stop_finish(drive, res, NULL);
+}
+
+void
 LauncherDevice::onMountUnmounted(GMount* mount, GAsyncResult* res)
 {
     g_mount_unmount_with_operation_finish(mount, res, NULL);
@@ -237,6 +273,15 @@
     eject->setText(u2dTr("Eject"));
     m_menu->addAction(eject);
     QObject::connect(eject, SIGNAL(triggered()), this, SLOT(onEjectTriggered()));
+
+    GObjectScopedPointer<GDrive> drive(g_volume_get_drive(m_volume));
+
+    if (!drive.isNull() && g_drive_can_stop(drive.data())) {
+        QAction* stop = new QAction(m_menu);
+        stop->setText(u2dTr("Safely remove"));
+        m_menu->addAction(stop);
+        QObject::connect(stop, SIGNAL(triggered()), this, SLOT(onStopTriggered()));
+    }
 }
 
 void
@@ -246,4 +291,11 @@
     eject();
 }
 
+void
+LauncherDevice::onStopTriggered()
+{
+    m_menu->hide();
+    stop();
+}
+
 #include "launcherdevice.moc"
 
=== modified file 'libunity-2d-private/src/launcherdevice.h'
--- libunity-2d-private/src/launcherdevice.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launcherdevice.h	2011-08-16 09:38:07 +0000
@@ -51,18 +51,22 @@
     Q_INVOKABLE GVolume* getVolume();
     Q_INVOKABLE void setVolume(GVolume* volume);
     Q_INVOKABLE void open();
+    Q_INVOKABLE void unmount(GMountOperation* mountOperation);
     Q_INVOKABLE void eject();
+    Q_INVOKABLE void stop();
 
     Q_INVOKABLE virtual void createMenuActions();
 
 private Q_SLOTS:
     void onEjectTriggered();
+    void onStopTriggered();
 
 private:
     GVolume* m_volume;
 
     static void onVolumeMounted(GVolume* volume, GAsyncResult* res);
     static void onVolumeEjected(GVolume* volume, GAsyncResult* res);
+    static void onDriveStopped(GDrive* drive, GAsyncResult* res);
     static void onMountUnmounted(GMount* mount, GAsyncResult* res);
 };
 
 
=== modified file 'libunity-2d-private/src/launchermenu.cpp'
--- libunity-2d-private/src/launchermenu.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launchermenu.cpp	2011-08-16 09:38:07 +0000
@@ -96,6 +96,7 @@
 void
 LauncherContextualMenu::setTitle(const QString& title)
 {
+    setAccessibleName(title);
     m_title = title;
     /* Escaping ampersands so that they are not considered as keyboard
        accelerators. */
 
=== added file 'libunity-2d-private/src/lens.cpp'
--- libunity-2d-private/src/lens.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/lens.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,272 @@
+/*
+ * 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/>.
+ */
+
+// Self
+#include "lens.h"
+
+// libunity-2d
+#include <debug_p.h>
+#include "launcherapplication.h"
+
+// Qt
+#include <QUrl>
+#include <QDesktopServices>
+
+Lens::Lens(QObject *parent) :
+    QObject(parent)
+{
+    m_results = new DeeListModel;
+    m_globalResults = new DeeListModel;
+    m_categories = new DeeListModel;
+}
+
+QString Lens::id() const
+{
+    return QString::fromStdString(m_unityLens->id());
+}
+
+QString Lens::dbusName() const
+{
+    return QString::fromStdString(m_unityLens->dbus_name());
+}
+
+QString Lens::dbusPath() const
+{
+    return QString::fromStdString(m_unityLens->dbus_path());
+}
+
+QString Lens::name() const
+{
+    return QString::fromStdString(m_unityLens->name());
+}
+
+QString Lens::iconHint() const
+{
+    return QString::fromStdString(m_unityLens->icon_hint());
+}
+
+QString Lens::description() const
+{
+    return QString::fromStdString(m_unityLens->description());
+}
+
+QString Lens::searchHint() const
+{
+    return QString::fromStdString(m_unityLens->search_hint());
+}
+
+bool Lens::visible() const
+{
+    return m_unityLens->visible();
+}
+
+bool Lens::searchInGlobal() const
+{
+    return m_unityLens->search_in_global();
+}
+
+QString Lens::shortcut() const
+{
+    return QString::fromStdString(m_unityLens->shortcut());
+}
+
+bool Lens::connected() const
+{
+    return m_unityLens->connected();
+}
+
+DeeListModel* Lens::results() const
+{
+    return m_results;
+}
+
+DeeListModel* Lens::globalResults() const
+{
+    return m_globalResults;
+}
+
+DeeListModel* Lens::categories() const
+{
+    return m_categories;
+}
+
+bool Lens::active() const
+{
+    return m_unityLens->active();
+}
+
+QString Lens::searchQuery() const
+{
+    return m_searchQuery;
+}
+
+QString Lens::globalSearchQuery() const
+{
+    return m_globalSearchQuery;
+}
+
+void Lens::setActive(bool active)
+{
+    m_unityLens->active = active;
+}
+
+void Lens::setSearchQuery(const QString& search_query)
+{
+    if (search_query != m_searchQuery) {
+        m_searchQuery = search_query;
+        m_unityLens->Search(search_query.toStdString());
+        Q_EMIT searchQueryChanged();
+    }
+}
+
+void Lens::setGlobalSearchQuery(const QString& search_query)
+{
+    if (search_query != m_globalSearchQuery) {
+        m_globalSearchQuery = search_query;
+        m_unityLens->GlobalSearch(search_query.toStdString());
+        Q_EMIT globalSearchQueryChanged();
+    }
+}
+
+void Lens::activate(const QString& uri)
+{
+    m_unityLens->Activate(uri.toStdString());
+}
+
+void Lens::onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&)
+{
+    if (type == unity::dash::NOT_HANDLED) {
+        fallbackActivate(QString::fromStdString(uri));
+    }
+}
+
+void Lens::fallbackActivate(const QString& uri)
+{
+    /* FIXME: stripping all content before the first column because for some
+              reason the lenses give uri with junk content at their beginning.
+    */
+    QString tweakedUri = uri;
+    int firstColumnAt = tweakedUri.indexOf(":");
+    tweakedUri.remove(0, firstColumnAt+1);
+
+    /* Tries various methods to trigger a sensible action for the given 'uri'.
+       If it has no understanding of the given scheme it falls back on asking
+       Qt to open the uri.
+    */
+    QUrl url(tweakedUri);
+    if (url.scheme() == "file") {
+        /* Override the files place's default URI handler: we want the file
+           manager to handle opening folders, not the dash.
+
+           Ref: https://bugs.launchpad.net/upicek/+bug/689667
+        */
+        QDesktopServices::openUrl(url);
+        return;
+    }
+    if (url.scheme() == "application") {
+        LauncherApplication application;
+        /* Cannot set the desktop file to url.host(), because the QUrl constructor
+           converts the host name to lower case to conform to the Nameprep
+           RFC (see http://doc.qt.nokia.com/qurl.html#FormattingOption-enum).
+           Ref: https://bugs.launchpad.net/unity-place-applications/+bug/784478 */
+        QString desktopFile = tweakedUri.mid(tweakedUri.indexOf("://") + 3);
+        application.setDesktopFile(desktopFile);
+        application.activate();
+        return;
+    }
+
+    UQ_WARNING << "FIXME: Possibly no handler for scheme: " << url.scheme();
+    UQ_WARNING << "Trying to open" << tweakedUri;
+    /* Try our luck */
+    QDesktopServices::openUrl(url);
+}
+
+void Lens::setUnityLens(unity::dash::Lens::Ptr lens)
+{
+    if (m_unityLens != NULL) {
+        // FIXME: should disconnect from m_unityLens's signals
+    }
+
+    // FIXME: should emit change notification signals for all properties
+
+    m_unityLens = lens;
+
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+
+    /* Property change signals */
+    m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));
+    m_unityLens->dbus_name.changed.connect(sigc::mem_fun(this, &Lens::dbusNameChanged));
+    m_unityLens->dbus_path.changed.connect(sigc::mem_fun(this, &Lens::dbusPathChanged));
+    m_unityLens->name.changed.connect(sigc::mem_fun(this, &Lens::nameChanged));
+    m_unityLens->icon_hint.changed.connect(sigc::mem_fun(this, &Lens::iconHintChanged));
+    m_unityLens->description.changed.connect(sigc::mem_fun(this, &Lens::descriptionChanged));
+    m_unityLens->search_hint.changed.connect(sigc::mem_fun(this, &Lens::searchHintChanged));
+    m_unityLens->visible.changed.connect(sigc::mem_fun(this, &Lens::visibleChanged));
+    m_unityLens->search_in_global.changed.connect(sigc::mem_fun(this, &Lens::searchInGlobalChanged));
+    m_unityLens->shortcut.changed.connect(sigc::mem_fun(this, &Lens::shortcutChanged));
+    m_unityLens->connected.changed.connect(sigc::mem_fun(this, &Lens::connectedChanged));
+    m_unityLens->results.changed.connect(sigc::mem_fun(this, &Lens::onResultsChanged));
+    m_unityLens->results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onResultsSwarmNameChanged));
+    m_unityLens->global_results.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsChanged));
+    m_unityLens->global_results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsSwarmNameChanged));
+    m_unityLens->categories.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesChanged));
+    m_unityLens->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesSwarmNameChanged));
+    m_unityLens->active.changed.connect(sigc::mem_fun(this, &Lens::activeChanged));
+
+    /* Signals forwarding */
+    m_unityLens->search_finished.connect(sigc::mem_fun(this, &Lens::searchFinished));
+    m_unityLens->global_search_finished.connect(sigc::mem_fun(this, &Lens::globalSearchFinished));
+
+    /* FIXME: signal should be forwarded instead of calling the handler directly */
+    m_unityLens->activated.connect(sigc::mem_fun(this, &Lens::onActivated));
+}
+
+void Lens::onResultsSwarmNameChanged(std::string swarm_name)
+{
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+}
+
+void Lens::onResultsChanged(unity::dash::Results::Ptr results)
+{
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+}
+
+void Lens::onGlobalResultsSwarmNameChanged(std::string swarm_name)
+{
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+}
+
+void Lens::onGlobalResultsChanged(unity::dash::Results::Ptr global_results)
+{
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+}
+
+void Lens::onCategoriesSwarmNameChanged(std::string swarm_name)
+{
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+}
+
+void Lens::onCategoriesChanged(unity::dash::Categories::Ptr categories)
+{
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
+}
+
+#include "lens.moc"
 
=== added file 'libunity-2d-private/src/lens.h'
--- libunity-2d-private/src/lens.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/lens.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,130 @@
+/*
+ * 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 LENS_H
+#define LENS_H
+
+// Qt
+#include <QObject>
+#include <QString>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/Lens.h>
+
+// dee-qt
+#include "deelistmodel.h"
+
+
+class Lens : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString id READ id NOTIFY idChanged)
+    Q_PROPERTY(QString dbusName READ dbusName NOTIFY dbusNameChanged)
+    Q_PROPERTY(QString dbusPath READ dbusPath NOTIFY dbusPathChanged)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
+    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
+    Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
+    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
+    Q_PROPERTY(bool searchInGlobal READ searchInGlobal NOTIFY searchInGlobalChanged)
+    Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
+    Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
+    Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)
+    Q_PROPERTY(DeeListModel* globalResults READ globalResults NOTIFY globalResultsChanged)
+    Q_PROPERTY(DeeListModel* categories READ categories NOTIFY categoriesChanged)
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+
+    Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
+    Q_PROPERTY(QString globalSearchQuery READ globalSearchQuery WRITE setGlobalSearchQuery NOTIFY globalSearchQueryChanged)
+
+public:
+    explicit Lens(QObject *parent = 0);
+
+    /* getters */
+    QString id() const;
+    QString dbusName() const;
+    QString dbusPath() const;
+    QString name() const;
+    QString iconHint() const;
+    QString description() const;
+    QString searchHint() const;
+    bool visible() const;
+    bool searchInGlobal() const;
+    QString shortcut() const;
+    bool connected() const;
+    DeeListModel* results() const;
+    DeeListModel* globalResults() const;
+    DeeListModel* categories() const;
+    bool active() const;
+    QString searchQuery() const;
+    QString globalSearchQuery() const;
+
+    /* setters */
+    void setActive(bool active);
+    void setSearchQuery(const QString& search_query);
+    void setGlobalSearchQuery(const QString& search_query);
+
+    Q_INVOKABLE void activate(const QString& uri);
+    void setUnityLens(unity::dash::Lens::Ptr lens);
+
+Q_SIGNALS:
+    void idChanged(std::string);
+    void dbusNameChanged(std::string);
+    void dbusPathChanged(std::string);
+    void nameChanged(std::string);
+    void iconHintChanged(std::string);
+    void descriptionChanged(std::string);
+    void searchHintChanged(std::string);
+    void visibleChanged(bool);
+    void searchInGlobalChanged(bool);
+    void shortcutChanged(std::string);
+    void connectedChanged(bool);
+    void resultsChanged();
+    void globalResultsChanged();
+    void categoriesChanged();
+    void activeChanged(bool);
+    void searchFinished(std::string const&);
+    void globalSearchFinished(std::string const&);
+    void searchQueryChanged();
+    void globalSearchQueryChanged();
+
+private:
+    void onResultsSwarmNameChanged(std::string);
+    void onResultsChanged(unity::dash::Results::Ptr);
+    void onGlobalResultsSwarmNameChanged(std::string);
+    void onGlobalResultsChanged(unity::dash::Results::Ptr);
+    void onCategoriesSwarmNameChanged(std::string);
+    void onCategoriesChanged(unity::dash::Categories::Ptr);
+
+    void onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&);
+    void fallbackActivate(const QString& uri);
+
+    unity::dash::Lens::Ptr m_unityLens;
+    DeeListModel* m_results;
+    DeeListModel* m_globalResults;
+    DeeListModel* m_categories;
+    QString m_searchQuery;
+    QString m_globalSearchQuery;
+};
+
+Q_DECLARE_METATYPE(Lens*)
+
+#endif // LENS_H
 
=== added file 'libunity-2d-private/src/lenses.cpp'
--- libunity-2d-private/src/lenses.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/lenses.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,123 @@
+/*
+ * 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/>.
+ */
+
+// Self
+#include "lenses.h"
+
+// Local
+#include "lens.h"
+
+// Qt
+
+// libunity-core
+#include <UnityCore/FilesystemLenses.h>
+
+Lenses::Lenses(QObject *parent) :
+    QAbstractListModel(parent)
+{
+    QHash<int, QByteArray> roles;
+    roles[Lenses::RoleItem] = "item";
+    roles[Lenses::RoleVisible] = "visible";
+    setRoleNames(roles);
+
+    m_unityLenses = new unity::dash::FilesystemLenses("/usr/share/unity/lenses");
+    for (unsigned int i=0; i<m_unityLenses->count(); i++) {
+        unity::dash::Lens::Ptr unityLens = m_unityLenses->GetLensAtIndex(i);
+        addUnityLens(unityLens, i);
+    }
+    m_unityLenses->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
+}
+
+Lenses::~Lenses()
+{
+    delete m_unityLenses;
+}
+
+int Lenses::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent)
+
+    return m_unityLenses->count();
+}
+
+QVariant Lenses::data(const QModelIndex& index, int role) const
+{
+    Q_UNUSED(role)
+
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    Lens* lens = m_lenses.at(index.row());
+
+    if (role == Lenses::RoleItem) {
+        return QVariant::fromValue(lens);
+    } else if (role == Lenses::RoleVisible) {
+        return QVariant::fromValue(lens->visible());
+    } else {
+        return QVariant();
+    }
+}
+
+QVariant Lenses::get(int row) const
+{
+    return data(QAbstractListModel::index(row), 0);
+}
+
+QVariant Lenses::get(const QString& lens_id) const
+{
+    Q_FOREACH(Lens* lens, m_lenses) {
+        if (lens->id() == lens_id) {
+            return QVariant::fromValue(lens);
+        }
+    }
+
+    return QVariant();
+}
+
+void Lenses::onLensAdded(unity::dash::Lens::Ptr& lens)
+{
+    int index = m_unityLenses->count()-1;
+    beginInsertRows(QModelIndex(), index, index);
+    addUnityLens(lens, index);
+    endInsertRows();
+}
+
+void Lenses::onLensPropertyChanged()
+{
+    QModelIndex lensIndex = index(m_lenses.indexOf(qobject_cast<Lens*>(sender())));
+    Q_EMIT dataChanged(lensIndex, lensIndex);
+}
+
+void Lenses::addUnityLens(unity::dash::Lens::Ptr unity_lens, int index)
+{
+    Lens* lens = new Lens();
+    lens->setUnityLens(unity_lens);
+    /* DOCME */
+    QObject::connect(lens, SIGNAL(visibleChanged(bool)), this, SLOT(onLensPropertyChanged()));
+    m_lenses.insert(index, lens);
+}
+
+void Lenses::removeUnityLens(int index)
+{
+    Lens* lens = m_lenses.takeAt(index);
+    delete lens;
+}
+
+#include "lenses.moc"
 
=== added file 'libunity-2d-private/src/lenses.h'
--- libunity-2d-private/src/lenses.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/lenses.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,73 @@
+/*
+ * 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 LENSES_H
+#define LENSES_H
+
+// Qt
+#include <QAbstractListModel>
+#include <QList>
+
+// libunity-core
+#include <UnityCore/Lens.h>
+
+namespace unity
+{
+namespace dash
+{
+class Lenses;
+}
+}
+
+class Lens;
+
+class Lenses : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+public:
+    explicit Lenses(QObject *parent = 0);
+    ~Lenses();
+
+    enum Roles {
+        RoleItem,
+        RoleVisible
+    };
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
+
+    Q_INVOKABLE QVariant get(int row) const;
+    Q_INVOKABLE QVariant get(const QString& lens_id) const;
+
+private Q_SLOTS:
+    void onLensAdded(unity::dash::Lens::Ptr& lens);
+    void onLensPropertyChanged();
+
+private:
+    unity::dash::Lenses* m_unityLenses;
+    QList<Lens*> m_lenses;
+
+    void addUnityLens(unity::dash::Lens::Ptr unity_lens, int index);
+    void removeUnityLens(int index);
+};
+
+#endif // LENSES_H
 
=== modified file 'libunity-2d-private/src/placeentry.cpp'
--- libunity-2d-private/src/placeentry.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/placeentry.cpp	2011-08-16 09:38:07 +0000
@@ -22,14 +22,12 @@
 #include "launchermenu.h"
 
 // libunity-2d
+#include <dashclient.h>
 #include <debug_p.h>
 
 #include <QDBusMetaType>
 #include <QAction>
 #include <QDebug>
-#include <QDBusServiceWatcher>
-#include <QDBusConnectionInterface>
-#include <QDBusReply>
 
 // Marshall the RendererInfoStruct data into a D-Bus argument
 QDBusArgument &operator<<(QDBusArgument &argument, const RendererInfoStruct &r)
@@ -146,10 +144,6 @@
 static const char* UNITY_PLACE_ENTRY_INTERFACE = "com.canonical.Unity.PlaceEntry";
 static const char* SECTION_PROPERTY = "section";
 
-static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
-static const char* DASH_DBUS_PATH = "/Dash";
-static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
-
 PlaceEntry::PlaceEntry(QObject* parent) :
     LauncherItem(parent),
     m_position(0),
@@ -163,32 +157,15 @@
     m_entryResultsModel(NULL),
     m_globalGroupsModel(NULL),
     m_globalResultsModel(NULL),
-    m_dbusIface(NULL),
-    m_dashDbusIface(NULL),
-    m_dashActive(false)
+    m_dbusIface(NULL)
 {
     qDBusRegisterMetaType<RendererInfoStruct>();
     qDBusRegisterMetaType<PlaceEntryInfoStruct>();
     qDBusRegisterMetaType<QList<PlaceEntryInfoStruct> >();
     qDBusRegisterMetaType<QHash<QString, QString>>();
 
-    /* Check if the dash is already up and running by asking the bus instead of
-       trying to create an instance of the interface. Creating an instance would
-       cause D-Bus to activate the dash and we don’t want this to happen, the
-       dash should be started on demand only. */
-    QDBusConnectionInterface* sessionBusIFace = QDBusConnection::sessionBus().interface();
-    QDBusReply<bool> reply = sessionBusIFace->isServiceRegistered(DASH_DBUS_SERVICE);
-    if (reply.isValid() && reply.value()) {
-        connectToDash();
-    } else {
-        /* The dash is not running: monitor its registration on the bus so we
-           can connect to it when it comes up. */
-        QDBusServiceWatcher* watcher = new QDBusServiceWatcher(DASH_DBUS_SERVICE,
-                                                               QDBusConnection::sessionBus(),
-                                                               QDBusServiceWatcher::WatchForRegistration,
-                                                               this);
-        connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(connectToDash()));
-    }
+    connect(DashClient::instance(), SIGNAL(activePageChanged(const QString&)),
+        SLOT(slotActivePageChanged(const QString&)));
 }
 
 PlaceEntry::PlaceEntry(const PlaceEntry& other) :
@@ -752,59 +729,12 @@
     Q_EMIT globalRendererHintsChanged();
 }
 
-void
-PlaceEntry::connectToDash()
-{
-    if (m_dashDbusIface != NULL) {
-        return;
-    }
-
-    m_dashDbusIface = new QDBusInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE,
-                                         QDBusConnection::sessionBus(), this);
-    connect(m_dashDbusIface, SIGNAL(activeChanged(bool)),
-            SLOT(slotDashActiveChanged(bool)));
-    connect(m_dashDbusIface, SIGNAL(activePlaceEntryChanged(const QString&)),
-            SLOT(slotDashActivePlaceEntryChanged(const QString&)));
-
-    QVariant value = m_dashDbusIface->property("active");
-    if (value.isValid()) {
-        m_dashActive = value.toBool();
-    } else {
-        UQ_WARNING << "Fetching Dash.active property failed";
-    }
-    value = m_dashDbusIface->property("activePlaceEntry");
-    if (value.isValid()) {
-        m_dashActivePlaceEntry = value.toString();
-    } else {
-        UQ_WARNING << "Fetching Dash.activePlaceEntry property failed";
-    }
-
-    updateActiveState();
-}
-
-void
-PlaceEntry::slotDashActiveChanged(bool value)
-{
-    if (m_dashActive != value) {
-        m_dashActive = value;
-        updateActiveState();
-    }
-}
-
-void
-PlaceEntry::slotDashActivePlaceEntryChanged(const QString& entry)
-{
-    if (m_dashActivePlaceEntry != entry) {
-        m_dashActivePlaceEntry = entry;
-        updateActiveState();
-    }
-}
-
-void
-PlaceEntry::updateActiveState()
+
+void
+PlaceEntry::slotActivePageChanged(const QString& page)
 {
     bool active = false;
-    if (m_dashActive && !m_dbusObjectPath.isEmpty() && (m_dashActivePlaceEntry == m_dbusObjectPath)) {
+    if (!m_dbusObjectPath.isEmpty() && page == m_dbusObjectPath) {
         active = true;
     }
 
@@ -827,8 +757,12 @@
         startRemotePlaceOnDemand();
     }
 
-    QDBusInterface iface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
-    iface.asyncCall(QLatin1String("activatePlaceEntry"), m_fileName, m_groupName, section);
+    if (m_active) {
+        DashClient::instance()->setActivePage(QString());
+    } else {
+        /* FIXME: DashClient::setActivePage has changed but PlaceEntry is deprecated anyway */
+        //DashClient::instance()->setActivePage(m_dbusObjectPath, m_fileName, m_groupName, section);
+    }
 }
 
 void
 
=== modified file 'libunity-2d-private/src/placeentry.h'
--- libunity-2d-private/src/placeentry.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/placeentry.h	2011-08-16 09:38:07 +0000
@@ -261,9 +261,6 @@
     QMap<QString, QVariant> m_globalRendererHints;
 
     QDBusInterface* m_dbusIface;
-    QDBusInterface* m_dashDbusIface;
-    bool m_dashActive;
-    QString m_dashActivePlaceEntry;
 
     void setSection(const QString&);
     void activateEntry(const int section);
@@ -273,15 +270,12 @@
 private Q_SLOTS:
     void onRendererInfoChanged(const RendererInfoStruct&);
 
-    void connectToDash();
-    void updateActiveState();
-    void slotDashActiveChanged(bool);
-    void slotDashActivePlaceEntryChanged(const QString&);
-
     void startMonitoringSections();
     void stopMonitoringSections();
     void slotSectionsChanged();
 
+    void slotActivePageChanged(const QString& page);
+
     /* Contextual menu callbacks */
     void onSectionTriggered();
 };
 
=== added file 'libunity-2d-private/src/ratingsfilter.cpp'
--- libunity-2d-private/src/ratingsfilter.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/ratingsfilter.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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/>.
+ */
+
+// Self
+#include "ratingsfilter.h"
+
+RatingsFilter::RatingsFilter(QObject *parent) :
+    Filter(parent)
+{
+}
+
+float RatingsFilter::rating() const
+{
+    return m_unityRatingsFilter->rating();
+}
+
+void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
+{
+    if (m_unityFilter != NULL) {
+        // FIXME: should disconnect from m_unityFilter's signals
+    }
+
+    Filter::setUnityFilter(filter);
+    m_unityRatingsFilter = std::dynamic_pointer_cast<unity::dash::RatingsFilter>(m_unityFilter);
+
+    /* Property change signals */
+    m_unityRatingsFilter->rating.changed.connect(sigc::mem_fun(this, &RatingsFilter::ratingChanged));
+}
+
+#include "ratingsfilter.moc"
 
=== added file 'libunity-2d-private/src/ratingsfilter.h'
--- libunity-2d-private/src/ratingsfilter.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/ratingsfilter.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,56 @@
+/*
+ * 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 RATINGSFILTER_H
+#define RATINGSFILTER_H
+
+// Qt
+#include <QObject>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/RatingsFilter.h>
+
+// Local
+#include "filter.h"
+
+class RatingsFilter : public Filter
+{
+    Q_OBJECT
+
+    Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)
+
+public:
+    explicit RatingsFilter(QObject *parent = 0);
+
+    /* getters */
+    float rating() const;
+
+    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+
+Q_SIGNALS:
+    void ratingChanged(float);
+
+private:
+    unity::dash::RatingsFilter::Ptr m_unityRatingsFilter;
+};
+
+Q_DECLARE_METATYPE(RatingsFilter*)
+
+#endif // RATINGSFILTER_H
 
=== modified file 'libunity-2d-private/src/screeninfo.cpp'
--- libunity-2d-private/src/screeninfo.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/screeninfo.cpp	2011-08-16 09:38:07 +0000
@@ -1,7 +1,5 @@
 extern "C" {
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 }
 
 #include "bamf-matcher.h"
 
=== modified file 'libunity-2d-private/src/unity-2d-private.pc.cmake'
--- libunity-2d-private/src/unity-2d-private.pc.cmake	2011-08-05 10:52:31 +0000
+++ libunity-2d-private/src/unity-2d-private.pc.cmake	2011-08-16 09:38:07 +0000
@@ -9,4 +9,4 @@
 Version: @VERSION@
 Libs: -L@LIBDIR@ -lunity-2d-private
 Cflags: -I@INCLUDEDIR@/unity-2d-private
-Requires: glib-2.0, gtk+-2.0, libwnck-1.0
+Requires: glib-2.0, gtk+-3.0, libwnck-3.0, pango
 
=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-07-27 11:42:46 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2011-08-16 09:38:07 +0000
@@ -25,14 +25,62 @@
 
 // libunity-2d
 #include <debug_p.h>
+#include <gconnector.h>
+#include <gscopedpointer.h>
 #include <unity2ddebug.h>
 
 // Qt
+#include <QFont>
 #include <QWindowsStyle>
+#include <QAccessible>
+#include <QAccessibleWidget>
+#include <QWidget>
 
 // GTK
 #include <gtk/gtk.h>
-
+#include <pango/pango.h>
+
+///////////////////////////////
+class PlatformFontTracker
+{
+public:
+    PlatformFontTracker()
+    {
+        m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-font-name",
+            G_CALLBACK(PlatformFontTracker::onFontChanged), this);
+
+        updateFont();
+    }
+
+private:
+    void updateFont()
+    {
+        gchar* fontName = 0;
+        g_object_get(gtk_settings_get_default(), "gtk-font-name", &fontName, NULL);
+        GScopedPointer<PangoFontDescription, pango_font_description_free> fontDescription(
+            pango_font_description_from_string(fontName)
+            );
+        g_free(fontName);
+
+        int size = pango_font_description_get_size(fontDescription.data());
+
+        QFont font = QFont(
+            pango_font_description_get_family(fontDescription.data()),
+            size / PANGO_SCALE
+            );
+
+        QApplication::setFont(font);
+    }
+
+    static void onFontChanged(GObject*, GParamSpec*, PlatformFontTracker* obj)
+    {
+        obj->updateFont();
+    }
+
+    GConnector m_gConnector;
+};
+
+///////////////////////////////
 AbstractX11EventFilter::~AbstractX11EventFilter()
 {
     Unity2dApplication* application = Unity2dApplication::instance();
@@ -41,6 +89,28 @@
     }
 }
 
+///////////////////////////////
+static bool arrayContains(char** begin, char** end, const char* string)
+{
+    for (char** ptr = begin; ptr != end; ++ptr) {
+        if (strcmp(*ptr, string) == 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
+QAccessibleInterface *panelFactory(const QString &classname, QObject *object)
+{
+    QAccessibleInterface *interface = 0;
+
+    if (classname == "Unity2dPanel" && object && object->isWidgetType()) {
+        interface = new QAccessibleWidget(static_cast<QWidget *>(object), QAccessible::ToolBar);
+    }
+
+    return interface;
+}
+
 void Unity2dApplication::earlySetup(int& argc, char** argv)
 {
     // Parts of unity-2d uses GTK so it needs to be initialized
@@ -61,10 +131,19 @@
     if(getenv("QT_GRAPHICSSYSTEM") == 0) {
         QApplication::setGraphicsSystem("raster");
     }
+
+    /* Unless style has been specified in args, set default Qt style to
+     * QWindowStyle to avoid loading QGtkStyle. We don't want to load QGtkStyle
+     * because it uses libgtk2, which causes conflicts with our gtk3 code.
+     */
+    if (!arrayContains(argv, argv + argc, "-style")) {
+        QApplication::setStyle(new QWindowsStyle);
+    }
 }
 
 Unity2dApplication::Unity2dApplication(int& argc, char** argv)
 : QApplication(argc, argv)
+, m_platformFontTracker(new PlatformFontTracker)
 {
     /* Allow developers to run Unity 2D uninstalled by telling dconf-qt
        where to look for Unity 2D's schemas.
@@ -73,11 +152,14 @@
     if (!isRunningInstalled()) {
         qputenv("GSETTINGS_SCHEMA_DIR", unity2dDirectory().toLocal8Bit() + "/data");
     }
+
+    QAccessible::installFactory(panelFactory);
 }
 
 Unity2dApplication::~Unity2dApplication()
 {
     qDeleteAll(m_x11EventFilters);
+    delete m_platformFontTracker;
 }
 
 Unity2dApplication* Unity2dApplication::instance()
 
=== modified file 'libunity-2d-private/src/unity2dapplication.h'
--- libunity-2d-private/src/unity2dapplication.h	2011-07-18 13:47:29 +0000
+++ libunity-2d-private/src/unity2dapplication.h	2011-08-16 09:38:07 +0000
@@ -27,6 +27,8 @@
 
 class Unity2dApplication;
 
+class PlatformFontTracker;
+
 class AbstractX11EventFilter
 {
 public:
@@ -65,6 +67,7 @@
 
 private:
     QList<AbstractX11EventFilter*> m_x11EventFilters;
+    PlatformFontTracker* m_platformFontTracker;
 };
 
 #endif // UNITY2DAPPLICATION_H
 
=== modified file 'libunity-2d-private/src/windowinfo.cpp'
--- libunity-2d-private/src/windowinfo.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/windowinfo.cpp	2011-08-16 09:38:07 +0000
@@ -14,9 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 
 #include <glib-2.0/glib.h>
 
 
=== modified file 'libunity-2d-private/src/workspacesinfo.cpp'
--- libunity-2d-private/src/workspacesinfo.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/workspacesinfo.cpp	2011-08-16 09:38:07 +0000
@@ -4,9 +4,7 @@
 #include <debug_p.h>
 
 extern "C" {
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 }
 
 #include <QAbstractEventDispatcher>
 
=== modified file 'panel/CMakeLists.txt'
--- panel/CMakeLists.txt	2011-06-27 13:40:51 +0000
+++ panel/CMakeLists.txt	2011-08-16 09:38:07 +0000
@@ -1,5 +1,8 @@
 project(unity-2d-panel)
 
+# Dependencies
+pkg_check_modules(UNITYCORE REQUIRED unity-core-4.0)
+
 # Source
 include_directories(
     ${libunity-2d-private_SOURCE_DIR}/src
@@ -8,8 +11,3 @@
 add_subdirectory(applets)
 add_subdirectory(app)
 add_subdirectory(tests)
-
-# Install
-install(DIRECTORY artwork
-    DESTINATION ${UNITY_2D_DIR}/panel
-    )
 
=== modified file 'panel/app/CMakeLists.txt'
--- panel/app/CMakeLists.txt	2011-04-04 16:41:15 +0000
+++ panel/app/CMakeLists.txt	2011-08-16 09:38:07 +0000
@@ -1,7 +1,6 @@
 set(panel_SRCS
     main.cpp
     panelmanager.cpp
-    unity2dstyle.cpp
     )
 
 qt4_automoc(${panel_SRCS})
@@ -10,14 +9,17 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GTK_INCLUDE_DIRS}
     ${uqapplets_SOURCE_DIR}
     ${uqapplets_SOURCE_DIR}/common
+    ${UNITYCORE_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
 target_link_libraries(unity-2d-panel
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
+    ${GTK_LDFLAGS}
     uqapplets
     unity-2d-private
     )
 
=== modified file 'panel/app/main.cpp'
--- panel/app/main.cpp	2011-07-18 13:47:29 +0000
+++ panel/app/main.cpp	2011-08-16 09:38:07 +0000
@@ -22,12 +22,12 @@
 // Local
 #include <config.h>
 #include <panelmanager.h>
+#include <panelstyle.h>
 
 // Unity
 #include <gnomesessionclient.h>
 #include <unity2ddebug.h>
 #include <unity2dapplication.h>
-#include <unity2dstyle.h>
 #include <unity2dtr.h>
 
 // Qt
@@ -54,7 +54,10 @@
     ThemeEngineHandler handler;
     Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication app(argc, argv);
-    QApplication::setStyle(new Unity2dStyle);
+    app.setApplicationName("Unity 2D Panel");
+
+    // Instantiate a PanelStyle so that it configures QApplication
+    PanelStyle::instance();
 
     GnomeSessionClient client(INSTALL_PREFIX "/share/applications/unity-2d-panel.desktop");
     client.connectToSessionManager();
 
=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp	2011-06-12 23:01:35 +0000
+++ panel/app/panelmanager.cpp	2011-08-16 09:38:07 +0000
@@ -24,11 +24,12 @@
 
 // Local
 #include <config.h>
+#include <panelstyle.h>
+#include <indicatorsmanager.h>
 
 // Applets
 #include <appindicator/appindicatorapplet.h>
 #include <appname/appnameapplet.h>
-#include <homebutton/homebuttonapplet.h>
 #include <indicator/indicatorapplet.h>
 #include <legacytray/legacytrayapplet.h>
 
@@ -42,54 +43,8 @@
 
 using namespace Unity2d;
 
-static QPalette getPalette()
-{
-    QPalette palette;
-
-    /* Should use the panel's background provided by Unity but it turns
-       out not to be good. It would look like:
-
-         QBrush bg(QPixmap("theme:/panel_background.png"));
-    */
-    QBrush bg(QPixmap(unity2dDirectory() + "/panel/artwork/background.png"));
-    palette.setBrush(QPalette::Window, bg);
-    palette.setBrush(QPalette::Button, bg);
-    return palette;
-}
-
-static QLabel* createSeparator()
-{
-    QLabel* label = new QLabel;
-    QPixmap pix(unity2dDirectory() + "/panel/artwork/divider.png");
-    label->setPixmap(pix);
-    label->setFixedSize(pix.size());
-    return label;
-}
-
-static Unity2dPanel* instantiatePanel(int screen)
-{
-    Unity2dPanel* panel = new Unity2dPanel;
-    panel->setEdge(Unity2dPanel::TopEdge);
-    panel->setPalette(getPalette());
-    panel->setFixedHeight(24);
-
-    int leftmost = QApplication::desktop()->screenNumber(QPoint());
-    if (screen == leftmost) {
-        panel->addWidget(new HomeButtonApplet);
-        panel->addWidget(createSeparator());
-    }
-    panel->addWidget(new AppNameApplet);
-    if (screen == leftmost) {
-        /* It doesn’t make sense to have more than one instance of the systray,
-           XEmbed’ed windows can be displayed only once anyway. */
-        panel->addWidget(new LegacyTrayApplet);
-    }
-    panel->addWidget(new IndicatorApplet);
-    return panel;
-}
-
 PanelManager::PanelManager(QObject* parent)
-    : QObject(parent)
+: QObject(parent)
 {
     QDesktopWidget* desktop = QApplication::desktop();
     for(int i = 0; i < desktop->screenCount(); ++i) {
@@ -106,6 +61,26 @@
     qDeleteAll(m_panels);
 }
 
+Unity2dPanel* PanelManager::instantiatePanel(int screen)
+{
+    Unity2dPanel* panel = new Unity2dPanel;
+    panel->setAccessibleName("Top Panel");
+    panel->setEdge(Unity2dPanel::TopEdge);
+    panel->setFixedHeight(24);
+
+    IndicatorsManager* indicatorsManager = new IndicatorsManager(panel);
+
+    panel->addWidget(new AppNameApplet(indicatorsManager));
+    int leftmost = QApplication::desktop()->screenNumber(QPoint());
+    if (screen == leftmost) {
+        /* It doesn’t make sense to have more than one instance of the systray,
+           XEmbed’ed windows can be displayed only once anyway. */
+        panel->addWidget(new LegacyTrayApplet);
+    }
+    panel->addWidget(new IndicatorApplet(indicatorsManager));
+    return panel;
+}
+
 void
 PanelManager::onScreenCountChanged(int newCount)
 {
 
=== modified file 'panel/app/panelmanager.h'
--- panel/app/panelmanager.h	2011-04-04 16:41:15 +0000
+++ panel/app/panelmanager.h	2011-08-16 09:38:07 +0000
@@ -40,6 +40,8 @@
     Q_DISABLE_COPY(PanelManager)
     QList<Unity2dPanel*> m_panels;
 
+    Unity2dPanel* instantiatePanel(int screen);
+
 private Q_SLOTS:
     void onScreenCountChanged(int newCount);
 };
 
=== removed file 'panel/app/unity2dstyle.cpp'
--- panel/app/unity2dstyle.cpp	2011-03-28 12:16:02 +0000
+++ panel/app/unity2dstyle.cpp	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/*
- * Plasma applet to display DBus global menu
- *
- * Copyright 2009 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[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/>
- */
-
-// Self
-#include "unity2dstyle.h"
-
-// Local
-
-// libunity-2d-private
-#include <debug_p.h>
-#include <keyboardmodifiersmonitor.h>
-
-// Qt
-#include <QGtkStyle>
-#include <QMenu>
-#include <QPainter>
-#include <QStyleOptionFrame>
-#include <QWidget>
-
-Unity2dStyle::Unity2dStyle()
-: QProxyStyle(new QGtkStyle)
-{
-}
-
-void Unity2dStyle::drawControl(QStyle::ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget) const
-{
-    if (element == QStyle::CE_MenuBarItem && widget) {
-        QStyleOptionMenuItem opt = *qstyleoption_cast<const QStyleOptionMenuItem*>(option);
-        if (!(opt.state & QStyle::State_Enabled) && (opt.state & QStyle::State_Sunken)) {
-            // Reset State_Sunken flag to avoid drawing a frame on a disabled menu item
-            // See https://bugs.launchpad.net/unity-2d/+bug/717744
-            opt.state ^= QStyle::State_Sunken;
-        }
-        // Skip "widget" parameter to avoid solid gray background behind the menubar items
-        QProxyStyle::drawControl(element, &opt, painter, 0);
-    } else if (element == QStyle::CE_MenuBarEmptyArea) {
-        // Avoid gray borders around the menubar items
-    } else {
-        QProxyStyle::drawControl(element, option, painter, widget);
-    }
-}
-
-int Unity2dStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption* option, const QWidget* widget) const
-{
-    if (metric == QStyle::PM_MenuBarVMargin) {
-        // Avoid one-pixel gap above menuitem
-        return 0;
-    } else {
-        return QProxyStyle::pixelMetric(metric, option, widget);
-    }
-}
-
-QSize Unity2dStyle::sizeFromContents(QStyle::ContentsType type, const QStyleOption* option, const QSize& contentsSize, const QWidget* widget) const
-{
-    QSize size = QProxyStyle::sizeFromContents(type, option, contentsSize, widget);
-    if (type == QStyle::CT_MenuBarItem && widget) {
-        // Avoid three-pixel gap below menuitem
-        size.setHeight(widget->height());
-    }
-    return size;
-}
-
-int Unity2dStyle::styleHint(StyleHint hint, const QStyleOption* option, const QWidget* widget, QStyleHintReturn* returnData) const
-{
-    if (hint == QStyle::SH_UnderlineShortcut) {
-        // The shortcut of an opened menu can be triggered without holding Alt
-        // down, so we always show the underline. For all other widgets we only
-        // show the underlines if alt is down.
-        // Note that this is a bit hackish: it only works reliably if the
-        // widget repaints itself when alt is pressed or released. For now only
-        // the MenuBarWidget from the AppNameApplets does this.
-        if (qobject_cast<const QMenu*>(widget)) {
-            return true;
-        } else {
-            return KeyboardModifiersMonitor::instance()->keyboardModifiers() == Qt::AltModifier;
-        }
-    } else {
-        return QProxyStyle::styleHint(hint, option, widget, returnData);
-    }
-}
 
=== removed file 'panel/app/unity2dstyle.h'
--- panel/app/unity2dstyle.h	2011-01-26 15:50:26 +0000
+++ panel/app/unity2dstyle.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[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 UNITY2DSTYLE_H
-#define UNITY2DSTYLE_H
-
-// Local
-
-// Qt
-#include <QProxyStyle>
-
-class Unity2dStyle : public QProxyStyle
-{
-public:
-    Unity2dStyle();
-
-    virtual void drawControl(ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget = 0) const;
-
-    virtual int pixelMetric(PixelMetric metric, const QStyleOption* option = 0, const QWidget* widget = 0) const;
-
-    virtual QSize sizeFromContents(ContentsType type, const QStyleOption* option, const QSize& contentsSize, const QWidget* widget = 0) const;
-
-    virtual int styleHint(StyleHint hint, const QStyleOption* option = 0, const QWidget* widget = 0, QStyleHintReturn* returnData = 0) const;
-};
-
-#endif /* UNITY2DSTYLE_H */
 
=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-07-18 10:33:35 +0000
+++ panel/applets/CMakeLists.txt	2011-08-16 09:38:07 +0000
@@ -1,42 +1,26 @@
 project(uqapplets)
 
-macro(read_pkg_variable cmake_var pkg pkg_var)
-    execute_process(
-        COMMAND pkg-config --variable=${pkg_var} ${pkg}
-        OUTPUT_VARIABLE tmp
-        )
-    # Remove trailing newline from ${tmp}
-    string(STRIP "${tmp}" ${cmake_var})
-endmacro(read_pkg_variable)
-
 # Dependencies
 include(FindPkgConfig)
 
 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
-pkg_check_modules(INDICATOR REQUIRED indicator)
-
-# Get indicator dirs from pkgconfig
-read_pkg_variable(INDICATOR_DIR       indicator indicatordir)
-read_pkg_variable(INDICATOR_ICONS_DIR indicator iconsdir)
-configure_file(indicator-config.h.in indicator-config.h)
 
 # Sources
 set(uqapplets_SRCS
     appindicator/appindicatorapplet.cpp
     appindicator/sniitem.cpp
     appname/appnameapplet.cpp
+    appname/croppedlabel.cpp
     appname/menubarwidget.cpp
-    appname/registrar.cpp
     appname/windowhelper.cpp
     common/applet.cpp
-    homebutton/homebuttonapplet.cpp
-    homebutton/homebutton.cpp
-    indicator/abstractindicator.cpp
-    indicator/datetimeindicator.cpp
+    common/indicatorentrywidget.cpp
+    common/indicatorsmanager.cpp
+    common/indicatorwidget.cpp
+    common/cairoutils.cpp
+    common/panelstyle.cpp
     indicator/indicatorapplet.cpp
-    indicator/indicatorservicemanager.cpp
-    indicator/indicator.c
     legacytray/legacytrayapplet.cpp
     legacytray/fdoselectionmanager.cpp
     legacytray/fdotask.cpp
@@ -45,10 +29,6 @@
     legacytray/x11embedpainter.cpp
     )
 
-qt4_add_dbus_adaptor(uqapplets_SRCS appname/com.canonical.AppMenu.Registrar.xml
-    registrar.h Registrar
-    )
-
 qt4_automoc(${uqapplets_SRCS})
 
 # Build
@@ -56,15 +36,18 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/appindicator
     ${CMAKE_CURRENT_SOURCE_DIR}/appname
     ${CMAKE_CURRENT_SOURCE_DIR}/common
-    ${CMAKE_CURRENT_SOURCE_DIR}/homebutton
     ${CMAKE_CURRENT_SOURCE_DIR}/indicator
+    ${CMAKE_CURRENT_SOURCE_DIR}/unitycore
     ${QTBAMF_INCLUDE_DIRS}
+    ${QTGCONF_INCLUDE_DIRS}
     ${DBUSMENUQT_INCLUDE_DIRS}
     ${GTK_INCLUDE_DIRS}
-    ${INDICATOR_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${X11_INCLUDE_DIR}
+    ${UNITYCORE_INCLUDE_DIRS}
+    ${NUXCORE_INCLUDE_DIRS}
+    ${PANGO_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -75,13 +58,16 @@
     ${QT_QTCORE_LIBRARIES}
     ${DBUSMENUQT_LDFLAGS}
     ${QTBAMF_LDFLAGS}
+    ${QTGCONF_LDFLAGS}
     ${GTK_LDFLAGS}
-    ${INDICATOR_LDFLAGS}
     ${WNCK_LDFLAGS}
     ${X11_LIBRARIES}
     ${X11_Xrender_LIB}
     ${X11_Xcomposite_LIB}
     ${X11_Xdamage_LIB}
     ${X11_Xfixes_LIB}
+    ${UNITYCORE_LDFLAGS}
+    ${NUXCORE_LDFLAGS}
+    ${PANGO_LDFLAGS}
     unity-2d-private
     )
 
=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-07-26 09:36:41 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-08-16 09:38:07 +0000
@@ -23,12 +23,15 @@
 #include "appnameapplet.h"
 
 // Local
+#include "croppedlabel.h"
 #include "menubarwidget.h"
+#include "panelstyle.h"
 #include "windowhelper.h"
 
 // Unity-2d
 #include <debug_p.h>
 #include <keyboardmodifiersmonitor.h>
+#include <launcherclient.h>
 
 // Bamf
 #include <bamf-application.h>
@@ -45,13 +48,7 @@
 #include <QApplication>
 #include <QDesktopWidget>
 
-static const char* METACITY_DIR = "/usr/share/themes/Ambiance/metacity-1";
-
-static const int WINDOW_BUTTONS_RIGHT_MARGIN = 4;
-
-static const int APPNAME_LABEL_LEFT_MARGIN = 12;
-
-static const int FADEOUT_WIDTH = 16;
+static const int APPNAME_LABEL_LEFT_MARGIN = 6;
 
 namespace Unity2d
 {
@@ -59,14 +56,16 @@
 class WindowButton : public QAbstractButton
 {
 public:
-    WindowButton(const QString& prefix, QWidget* parent = 0)
+    WindowButton(const PanelStyle::WindowButtonType& buttonType, QWidget* parent = 0)
     : QAbstractButton(parent)
-    , m_prefix(prefix)
-    , m_normalPix(loadPix("normal"))
-    , m_hoverPix(loadPix("prelight"))
-    , m_downPix(loadPix("pressed"))
+    , m_buttonType(buttonType)
     {
-        setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+        loadPixmaps();
+        if (buttonType == PanelStyle::MinimizeWindowButton) {
+            setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+        } else {
+            setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+        }
         setAttribute(Qt::WA_Hover);
     }
 
@@ -76,6 +75,14 @@
     }
 
 protected:
+    bool event(QEvent* ev)
+    {
+        if (ev->type() == QEvent::PaletteChange) {
+            loadPixmaps();
+        }
+        return QAbstractButton::event(ev);
+    }
+
     void paintEvent(QPaintEvent*)
     {
         QPainter painter(this);
@@ -87,66 +94,27 @@
         } else {
             pix = m_normalPix;
         }
-        painter.drawPixmap((width() - pix.width()) / 2, (height() - pix.height()) / 2, pix);
+        int posX;
+        if (m_buttonType == PanelStyle::CloseWindowButton) {
+            posX = width() - pix.width();
+        } else {
+            posX = 0;
+        }
+        painter.drawPixmap(posX, (height() - pix.height()) / 2, pix);
     }
 
 private:
-    QString m_prefix;
+    PanelStyle::WindowButtonType m_buttonType;
     QPixmap m_normalPix;
     QPixmap m_hoverPix;
     QPixmap m_downPix;
 
-    QPixmap loadPix(const QString& name)
-    {
-        QString path = QString("%1/%2_focused_%3.png")
-            .arg(METACITY_DIR)
-            .arg(m_prefix)
-            .arg(name);
-        return QPixmap(path);
-    }
-};
-
-/**
- * This label makes sure minimumSizeHint() is not set. This ensures the applet
- * does not get wider if a window title is very long
- */
-class CroppedLabel : public QLabel
-{
-public:
-    CroppedLabel(QWidget* parent = 0)
-    : QLabel(parent)
-    {}
-
-    QSize minimumSizeHint() const
-    {
-        return QWidget::minimumSizeHint();
-    }
-
-protected:
-    void paintEvent(QPaintEvent* event)
-    {
-        QImage image(width(), height(), QImage::Format_ARGB32_Premultiplied);
-        {
-            QPainter painter(&image);
-            painter.initFrom(this);
-            painter.setCompositionMode(QPainter::CompositionMode_Source);
-            painter.fillRect(rect(), Qt::transparent);
-
-            painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-            painter.drawText(contentsRect(), Qt::AlignLeft | Qt::AlignVCenter, text());
-
-            if (QLabel::minimumSizeHint().width() > contentsRect().width()) {
-                // Text does not fit, fade the end
-                painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-                QRect gradientRect(width() - FADEOUT_WIDTH, 0, FADEOUT_WIDTH, height());
-                QLinearGradient gradient(gradientRect.topLeft(), gradientRect.topRight());
-                gradient.setColorAt(0, Qt::white);
-                gradient.setColorAt(1, Qt::transparent);
-                painter.fillRect(gradientRect, gradient);
-            }
-        }
-        QPainter painter(this);
-        painter.drawImage(0, 0, image);
+    void loadPixmaps()
+    {
+        PanelStyle* style = PanelStyle::instance();
+        m_normalPix = style->windowButtonPixmap(m_buttonType, PanelStyle::NormalState);
+        m_hoverPix = style->windowButtonPixmap(m_buttonType, PanelStyle::PrelightState);
+        m_downPix = style->windowButtonPixmap(m_buttonType, PanelStyle::PressedState);
     }
 };
 
@@ -178,14 +146,15 @@
         m_windowButtonWidget = new QWidget;
         m_windowButtonWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
         QHBoxLayout* layout = new QHBoxLayout(m_windowButtonWidget);
-        layout->setContentsMargins(0, 0, WINDOW_BUTTONS_RIGHT_MARGIN, 0);
+        layout->setMargin(0);
         layout->setSpacing(0);
-        m_closeButton = new WindowButton("close");
-        m_minimizeButton = new WindowButton("minimize");
-        m_maximizeButton = new WindowButton("unmaximize");
+        m_closeButton = new WindowButton(PanelStyle::CloseWindowButton);
+        m_minimizeButton = new WindowButton(PanelStyle::MinimizeWindowButton);
+        m_maximizeButton = new WindowButton(PanelStyle::UnmaximizeWindowButton);
         layout->addWidget(m_closeButton);
         layout->addWidget(m_minimizeButton);
         layout->addWidget(m_maximizeButton);
+        m_windowButtonWidget->setFixedWidth(LauncherClient::MaximumWidth);
         QObject::connect(m_closeButton, SIGNAL(clicked()), m_windowHelper, SLOT(close()));
         QObject::connect(m_minimizeButton, SIGNAL(clicked()), m_windowHelper, SLOT(minimize()));
         QObject::connect(m_maximizeButton, SIGNAL(clicked()), m_windowHelper, SLOT(unmaximize()));
@@ -200,10 +169,10 @@
             q, SLOT(updateWidgets()));
     }
 
-    void setupMenuBarWidget()
+    void setupMenuBarWidget(IndicatorsManager* manager)
     {
-        m_menuBarWidget = new MenuBarWidget(0 /* Window menu */);
-        QObject::connect(m_menuBarWidget, SIGNAL(menuBarClosed()),
+        m_menuBarWidget = new MenuBarWidget(manager);
+        QObject::connect(m_menuBarWidget, SIGNAL(isOpenedChanged()),
             q, SLOT(updateWidgets()));
         QObject::connect(m_menuBarWidget, SIGNAL(isEmptyChanged()),
             q, SLOT(updateWidgets()));
@@ -216,27 +185,22 @@
     }
 };
 
-AppNameApplet::AppNameApplet()
+AppNameApplet::AppNameApplet(IndicatorsManager* indicatorsManager)
 : d(new AppNameAppletPrivate)
 {
     d->q = this;
     setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
 
-    QPalette palette;
-    palette.setColor(QPalette::WindowText, Qt::white);
-    palette.setColor(QPalette::ButtonText, Qt::white);
-    setPalette(palette);
-
     d->setupWindowHelper();
     d->setupLabel();
     d->setupWindowButtonWidget();
-    d->setupMenuBarWidget();
+    d->setupMenuBarWidget(indicatorsManager);
     d->setupKeyboardModifiersMonitor();
 
     QHBoxLayout* layout = new QHBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
-    layout->addWidget(d->m_windowButtonWidget, 0, Qt::AlignLeft);
+    layout->addWidget(d->m_windowButtonWidget);
     layout->addWidget(d->m_label);
     layout->addWidget(d->m_menuBarWidget);
 
@@ -255,14 +219,15 @@
     bool isMaximized = d->m_windowHelper->isMaximized();
     bool isUserVisibleApp = app ? app->user_visible() : false;
     bool isOnSameScreen = d->m_windowHelper->isMostlyOnScreen(QApplication::desktop()->screenNumber(this));
+    bool isUnderMouse = rect().contains(mapFromGlobal(QCursor::pos()));
     bool showMenu = (!d->m_menuBarWidget->isEmpty() && isUserVisibleApp && isOnSameScreen)
-        && (rect().contains(mapFromGlobal(QCursor::pos()))
+        && (isUnderMouse
         || KeyboardModifiersMonitor::instance()->keyboardModifiers() == Qt::AltModifier
         || d->m_menuBarWidget->isOpened()
         );
     bool showLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
 
-    d->m_windowButtonWidget->setVisible(isOnSameScreen && isMaximized);
+    d->m_windowButtonWidget->setVisible(isOnSameScreen && isMaximized && isUnderMouse);
 
     d->m_label->setVisible(showLabel);
     if (showLabel) {
@@ -284,7 +249,7 @@
 
         // Define width
         if (!isMaximized && showMenu) {
-            d->m_label->setMaximumWidth(d->m_windowButtonWidget->sizeHint().width());
+            d->m_label->setMaximumWidth(LauncherClient::MaximumWidth);
         } else {
             d->m_label->setMaximumWidth(QWIDGETSIZE_MAX);
         }
 
=== modified file 'panel/applets/appname/appnameapplet.h'
--- panel/applets/appname/appnameapplet.h	2011-06-06 09:06:55 +0000
+++ panel/applets/appname/appnameapplet.h	2011-08-16 09:38:07 +0000
@@ -29,6 +29,8 @@
 
 class QEvent;
 
+class IndicatorsManager;
+
 namespace Unity2d
 {
 
@@ -37,7 +39,7 @@
 {
 Q_OBJECT
 public:
-    AppNameApplet();
+    AppNameApplet(IndicatorsManager*);
     ~AppNameApplet();
 
 protected:
 
=== removed file 'panel/applets/appname/com.canonical.AppMenu.Registrar.xml'
--- panel/applets/appname/com.canonical.AppMenu.Registrar.xml	2011-02-10 01:10:19 +0000
+++ panel/applets/appname/com.canonical.AppMenu.Registrar.xml	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
-	<dox:d><![CDATA[
-	  @mainpage
-	 
-	  An interface to register menus that are associated with a window in an application.  The
-	  main interface is docuemented here: @ref com::canonical::AppMenu::Registrar.
-	    
-	  The actual menus are transported using the dbusmenu protocol which is available
-	  here: @ref com::canonical::dbusmenu.
-	]]></dox:d>
-	<interface name="com.canonical.AppMenu.Registrar" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
-		<dox:d>
-		  An interface to register a menu from an application's window to be displayed in another
-		  window.  This manages that association between XWindow Window IDs and the dbus
-		  address and object that provides the menu using the dbusmenu dbus interface.
-		</dox:d>
-		<method name="RegisterWindow">
-			<dox:d><![CDATA[
-			  Associates a dbusmenu with a window
-	     
-			  /note this method assumes that the connection from the caller is the DBus connection
-			    to use for the object.  Applications that use multiple DBus connections will need to
-			    ensure this method is called with the same connection that implmenets the object.
-			]]></dox:d>
-			<arg name="windowId" type="u" direction="in">
-				<dox:d>The XWindow ID of the window</dox:d>
-			</arg>
-			<arg name="menuObjectPath" type="o" direction="in">
-				<dox:d>The object on the dbus interface implementing the dbusmenu interface</dox:d>
-			</arg>
-		</method>
-		<method name="UnregisterWindow">
-			<dox:d>
-			  A method to allow removing a window from the database.  Windows will also be removed
-			  when the client drops off DBus so this is not required.  It is polite though.  And
-			  important for testing.
-			</dox:d>
-			<arg name="windowId" type="u" direction="in">
-				<dox:d>The XWindow ID of the window</dox:d>
-			</arg>
-		</method>
-		<method name="GetMenuForWindow">
-			<dox:d>Gets the registered menu for a given window ID.</dox:d>
-			<arg name="windowId" type="u" direction="in">
-				<dox:d>The XWindow ID of the window to get</dox:d>
-			</arg>
-			<arg name="service" type="s" direction="out">
-				<dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
-			</arg>
-			<arg name="menuObjectPath" type="o" direction="out">
-				<dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
-			</arg>
-		</method>
-		<method name="GetMenus">
-			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MenuInfoList"/>
-			<dox:d>Gets the information on all menus that the registrar knows about.  This
-			  is useful for debugging or bringing up a new renderer.</dox:d>
-			<arg name="menus" type="a(uso)" direction="out">
-				<dox:d>An array of structures containing the same parameters as @GetMenuForWindow.  Window ID, Service and ObjectPath.</dox:d>
-			</arg>
-		</method>
-		<signal name="WindowRegistered">
-			<dox:d>Signals when the registrar gets a new menu registered</dox:d>
-			<arg name="windowId" type="u" direction="out">
-				<dox:d>The XWindow ID of the window</dox:d>
-			</arg>
-			<arg name="service" type="s" direction="out">
-				<dox:d>The address of the connection on DBus (e.g. :1.23 or org.example.service)</dox:d>
-			</arg>
-			<arg name="menuObjectPath" type="o" direction="out">
-				<dox:d>The path to the object which implements the com.canonical.dbusmenu interface.</dox:d>
-			</arg>
-		</signal>
-		<signal name="WindowUnregistered">
-			<dox:d>Signals when the registrar removes a menu registration</dox:d>
-			<arg name="windowId" type="u" direction="out">
-				<dox:d>The XWindow ID of the window</dox:d>
-			</arg>
-		</signal>
-	</interface>
-</node>
 
=== added file 'panel/applets/appname/croppedlabel.cpp'
--- panel/applets/appname/croppedlabel.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/croppedlabel.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,140 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[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/>.
+ */
+// Self
+#include "croppedlabel.h"
+
+// Local
+#include <cairoutils.h>
+#include <panelstyle.h>
+
+// unity-2d
+#include <debug_p.h>
+
+// libqtgconf
+#include <gconfitem-qml-wrapper.h>
+
+// Qt
+#include <QImage>
+#include <QPainter>
+
+// GTK
+#include <gtk/gtk.h>
+
+static const int FADEOUT_WIDTH = 30;
+
+static const char* WINDOW_TITLE_FONT_KEY = "/apps/metacity/general/titlebar_font";
+
+CroppedLabel::CroppedLabel(QWidget* parent)
+: QLabel(parent)
+{
+}
+
+QSize CroppedLabel::minimumSizeHint() const
+{
+    return QWidget::minimumSizeHint();
+}
+
+static void paintFadeoutGradient(QImage* image)
+{
+    QPainter painter(image);
+    painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    QRect gradientRect(image->width() - FADEOUT_WIDTH, 0, FADEOUT_WIDTH, image->height());
+    QLinearGradient gradient(gradientRect.topLeft(), gradientRect.topRight());
+    gradient.setColorAt(0, Qt::white);
+    gradient.setColorAt(1, Qt::transparent);
+    painter.fillRect(gradientRect, gradient);
+}
+
+static QString getWindowTitleFontName()
+{
+    GConfItemQmlWrapper client;
+    client.setKey(WINDOW_TITLE_FONT_KEY);
+    return client.getValue().toString();
+}
+
+void CroppedLabel::paintEvent(QPaintEvent* event)
+{
+    // Create an image filled with background brush (to avoid subpixel hinting
+    // artefacts around text)
+    QImage image(width(), height(), QImage::Format_ARGB32_Premultiplied);
+    {
+        QPainter painter(&image);
+        painter.initFrom(this);
+        painter.eraseRect(rect());
+    }
+
+    // Create a pango layout
+    GObjectScopedPointer<PangoContext> pangoContext(gdk_pango_context_get());
+    GObjectScopedPointer<PangoLayout> layout(pango_layout_new(pangoContext.data()));
+
+    // Set font
+    QByteArray fontName = getWindowTitleFontName().toUtf8();
+    PangoFontDescription* desc = pango_font_description_from_string(fontName.data());
+    pango_layout_set_font_description(layout.data(), desc);
+    pango_font_description_free(desc);
+
+    // Set text
+    QByteArray utf8Text = text().toUtf8();
+    pango_layout_set_text (layout.data(), utf8Text.data(), -1);
+
+    // Get text size
+    int textWidth = 0;
+    int textHeight = 0;
+    pango_layout_get_pixel_size(layout.data(), &textWidth, &textHeight);
+
+    // Draw text
+    CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(&image));
+    CairoUtils::Pointer cr(cairo_create(surface.data()));
+
+    PanelStyle* style = PanelStyle::instance();
+    GtkStyleContext* style_context = style->styleContext();
+
+    gtk_style_context_save(style_context);
+
+    GtkWidgetPath* widget_path = gtk_widget_path_new();
+    gtk_widget_path_append_type(widget_path, GTK_TYPE_MENU_BAR);
+    gtk_widget_path_append_type(widget_path, GTK_TYPE_MENU_ITEM);
+    gtk_widget_path_iter_set_name(widget_path, -1 , "UnityPanelWidget");
+
+    gtk_style_context_set_path(style_context, widget_path);
+    gtk_style_context_add_class(style_context, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class(style_context, GTK_STYLE_CLASS_MENUITEM);
+
+    gtk_render_layout(style_context, cr.data(),
+        contentsRect().left(),
+        contentsRect().top() + (height() - textHeight) / 2,
+        layout.data());
+
+    gtk_widget_path_free(widget_path);
+
+    gtk_style_context_restore(style_context);
+
+    // Fade if necessary
+    if (textWidth > contentsRect().width()) {
+        paintFadeoutGradient(&image);
+    }
+
+    // Paint on our widget
+    QPainter painter(this);
+    painter.drawImage(0, 0, image);
+}
+
+#include "croppedlabel.moc"
 
=== added file 'panel/applets/appname/croppedlabel.h'
--- panel/applets/appname/croppedlabel.h	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/croppedlabel.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,45 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[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 CROPPEDLABEL_H
+#define CROPPEDLABEL_H
+
+// Local
+
+// Qt
+#include <QLabel>
+
+/**
+ * This label makes sure minimumSizeHint() is not set. This ensures the applet
+ * does not get wider if a window title is very long
+ */
+class CroppedLabel : public QLabel
+{
+    Q_OBJECT
+public:
+    CroppedLabel(QWidget* parent = 0);
+
+    QSize minimumSizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent*);
+};
+
+#endif /* CROPPEDLABEL_H */
 
=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp	2011-07-26 09:36:41 +0000
+++ panel/applets/appname/menubarwidget.cpp	2011-08-16 09:38:07 +0000
@@ -20,299 +20,98 @@
  */
 
 // Self
-#include "menubarwidget.h"
+#include <menubarwidget.h>
 
 // Local
-#include "config.h"
-#include "debug_p.h"
-#include "keyboardmodifiersmonitor.h"
-#include "registrar.h"
-
-// dbusmenu-qt
-#include <dbusmenuimporter.h>
-
-// bamf
-#include <bamf-matcher.h>
-#include <bamf-window.h>
+#include <debug_p.h>
+#include <indicatorentrywidget.h>
+#include <indicatorsmanager.h>
 
 // Qt
-#include <QActionEvent>
 #include <QHBoxLayout>
-#include <QLabel>
-#include <QMenuBar>
-#include <QTimer>
-
-class MyDBusMenuImporter : public DBusMenuImporter
-{
-public:
-    MyDBusMenuImporter(const QString &service, const QString &path, QObject *parent)
-    : DBusMenuImporter(service, path, parent)
-    , m_service(service)
-    , m_path(path)
-    {}
-
-    QString service() const { return m_service; }
-    QString path() const { return m_path; }
-
-private:
-    QString m_service;
-    QString m_path;
-};
-
-MenuBarWidget::MenuBarWidget(QMenu* windowMenu, QWidget* parent)
+
+static const int MENU_ITEM_PADDING = 6;
+
+MenuBarWidget::MenuBarWidget(IndicatorsManager* indicatorsManager, QWidget* parent)
 : QWidget(parent)
-, m_windowMenu(windowMenu)
-{
-    m_activeWinId = 0;
-    setupRegistrar();
-    setupMenuBar();
-
-    connect(&BamfMatcher::get_default(), SIGNAL(ActiveWindowChanged(BamfWindow*, BamfWindow*)),
-        SLOT(slotActiveWindowChanged(BamfWindow*, BamfWindow*)));
-    /* Work around a bug in BAMF: the ActiveWindowChanged signal is not emitted
-       for some windows that open maximized. This is for example the case of the
-       LibreOffice startcenter. */
-    connect(&BamfMatcher::get_default(), SIGNAL(ViewOpened(BamfView*)),
-        SLOT(slotViewOpened()));
-    updateActiveWinId(BamfMatcher::get_default().active_window());
-}
-
-void MenuBarWidget::setupRegistrar()
-{
-    m_registrar = Registrar::instance();
-    if (!m_registrar->connectToBus()) {
-        UQ_WARNING << "could not connect registrar to DBus";
-    }
-
-    connect(m_registrar, SIGNAL(WindowRegistered(WId, const QString&, const QDBusObjectPath&)),
-        SLOT(slotWindowRegistered(WId, const QString&, const QDBusObjectPath&)));
-    connect(m_registrar, SIGNAL(WindowUnregistered(WId)),
-        SLOT(slotWindowUnregistered(WId)));
-}
-
-void MenuBarWidget::setupMenuBar()
-{
-    m_menuBar = new QMenuBar;
-    new MenuBarClosedHelper(this);
-
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setMargin(0);
-    layout->setSpacing(0);
-    layout->addWidget(m_menuBar);
-    m_menuBar->setNativeMenuBar(false);
-
-    m_updateMenuBarTimer = new QTimer(this);
-    m_updateMenuBarTimer->setSingleShot(true);
-    m_updateMenuBarTimer->setInterval(0);
-    connect(m_updateMenuBarTimer, SIGNAL(timeout()),
-        SLOT(updateMenuBar()));
-
-    // Repaint the menubar when modifiers change so that the shortcut underline
-    // is drawn or not
-    connect(KeyboardModifiersMonitor::instance(), SIGNAL(keyboardModifiersChanged(Qt::KeyboardModifiers)),
-        m_menuBar, SLOT(update()));
-}
-
-void MenuBarWidget::slotActiveWindowChanged(BamfWindow* /*former*/, BamfWindow* current)
-{
-    if (current) {
-        updateActiveWinId(current);
-    }
-}
-
-void MenuBarWidget::slotViewOpened()
-{
-    BamfWindow* active = BamfMatcher::get_default().active_window();
-    if (active != NULL) {
-        if (active->xid() != m_activeWinId) {
-            /* This shouldn’t be needed as BAMF should have emitted the
-               ActiveWindowChanged signal, but it sometimes doesn’t (e.g. when
-               LibreOffice startcenter starts automatically maximized). */
-            updateActiveWinId(active);
-        }
-    }
-}
-
-void MenuBarWidget::slotWindowRegistered(WId wid, const QString& service, const QDBusObjectPath& menuObjectPath)
-{
-    MyDBusMenuImporter* importer = new MyDBusMenuImporter(service, menuObjectPath.path(), this);
-    delete m_importers.take(wid);
-    m_importers.insert(wid, importer);
-    connect(importer, SIGNAL(menuUpdated()), SLOT(slotMenuUpdated()));
-    connect(importer, SIGNAL(actionActivationRequested(QAction*)), SLOT(slotActionActivationRequested(QAction*)));
-    QMetaObject::invokeMethod(importer, "updateMenu", Qt::QueuedConnection);
-}
-
-void MenuBarWidget::slotWindowUnregistered(WId wid)
-{
-    MyDBusMenuImporter* importer = m_importers.take(wid);
-    if (importer) {
-        importer->deleteLater();
-    }
-    if (wid == m_activeWinId) {
-        m_activeWinId = 0;
-        updateMenuBar();
-    }
-}
-
-void MenuBarWidget::slotMenuUpdated()
-{
-    DBusMenuImporter* importer = static_cast<DBusMenuImporter*>(sender());
-
-    if (m_importers.value(m_activeWinId) == importer) {
-        updateMenuBar();
-    }
-}
-
-void MenuBarWidget::slotActionActivationRequested(QAction* action)
-{
-    DBusMenuImporter* importer = static_cast<DBusMenuImporter*>(sender());
-
-    if (m_importers.value(m_activeWinId) == importer) {
-        m_menuBar->setActiveAction(action);
-    }
-}
-
-QMenu* MenuBarWidget::menuForWinId(WId wid) const
-{
-    MyDBusMenuImporter* importer = m_importers.value(wid);
-    return importer ? importer->menu() : 0;
-}
-
-void MenuBarWidget::updateActiveWinId(BamfWindow* bamfWindow)
-{
-    WId id = bamfWindow ? bamfWindow->xid() : 0;
-    if (id == m_activeWinId) {
-        return;
-    }
-    if (id == window()->winId()) {
-        // Do not update id if the active window is the one hosting this applet
-        return;
-    }
-    m_activeWinId = id;
-    updateMenuBar();
-}
-
-void MenuBarWidget::updateMenuBar()
-{
-    WId winId = m_activeWinId;
-    QMenu* menu = menuForWinId(winId);
-
-    if (!menu) {
-        if (winId) {
-            menu = m_windowMenu;
-        } else {
-            // No active window, show a desktop menubar
-            // FIXME: Empty menu
-            /*
-            menu = mEmptyMenu;
-            */
-        }
-    }
-
-    m_menuBar->clear();
-    // FIXME: Empty menu
-    if (!menu) {
-        return;
-    }
-    menu->installEventFilter(this);
-    Q_FOREACH(QAction* action, menu->actions()) {
-        if (action->isSeparator()) {
-            continue;
-        }
-        m_menuBar->addAction(action);
-    }
-}
-
-bool MenuBarWidget::eventFilter(QObject* object, QEvent* event)
-{
-    switch (event->type()) {
-    case QEvent::ActionAdded:
-    case QEvent::ActionRemoved:
-    case QEvent::ActionChanged:
-        m_updateMenuBarTimer->start();
-        break;
-    default:
-        break;
-    }
-    return false;
+, m_indicatorsManager(indicatorsManager)
+, m_layout(new QHBoxLayout(this))
+, m_isEmpty(true)
+, m_isOpened(false)
+{
+    m_layout->setMargin(0);
+    m_layout->setSpacing(0);
+    indicatorsManager->indicators()->on_object_added.connect(
+        sigc::mem_fun(this, &MenuBarWidget::onObjectAdded)
+        );
+    indicatorsManager->indicators()->on_entry_activated.connect(
+        sigc::mem_fun(this, &MenuBarWidget::onEntryActivated)
+        );
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+    m_layout->addStretch();
 }
 
 bool MenuBarWidget::isEmpty() const
 {
-    return m_menuBar->actions().isEmpty();
+    return m_isEmpty;
 }
 
 bool MenuBarWidget::isOpened() const
 {
-    return m_menuBar->activeAction();
-}
-
-// MenuBarClosedHelper ----------------------------------------
-MenuBarClosedHelper::MenuBarClosedHelper(MenuBarWidget* widget)
-: QObject(widget)
-, m_widget(widget)
-{
-    widget->m_menuBar->installEventFilter(this);
-}
-
-bool MenuBarClosedHelper::eventFilter(QObject* object, QEvent* event)
-{
-    if (object == m_widget->m_menuBar) {
-        switch (event->type()) {
-            case QEvent::ActionAdded:
-            case QEvent::ActionRemoved:
-            case QEvent::ActionChanged:
-                menuBarActionEvent(static_cast<QActionEvent*>(event));
-                break;
-            default:
-                break;
-        }
-    } else {
-        // Top-level menus
-        if (event->type() == QEvent::Hide) {
-            // menu hide themselves when the menubar is closed but also when
-            // one goes from one menu to another. The way to know this is to
-            // check the value of QMenuBar::activeAction(), but at this point
-            // it has not been updated yet, so we check in a delayed method.
-            QMetaObject::invokeMethod(this, "emitMenuBarClosed", Qt::QueuedConnection);
-        }
-    }
-    return false;
-}
-
-void MenuBarClosedHelper::emitMenuBarClosed()
-{
-    if (!m_widget->m_menuBar->activeAction()) {
-        QMetaObject::invokeMethod(m_widget, "menuBarClosed");
-    }
-}
-
-void MenuBarClosedHelper::menuBarActionEvent(QActionEvent* event)
-{
-    QMenu* menu = event->action()->menu();
-    if (menu) {
-        // Install/remove event filters on top level menus so that know when
-        // they hide themselves and can emit menuBarClosed()
-        switch (event->type()) {
-        case QEvent::ActionAdded:
-        case QEvent::ActionChanged:
-            menu->installEventFilter(this);
-            break;
-        case QEvent::ActionRemoved:
-            menu->removeEventFilter(this);
-            break;
-        default:
-            break;
-        }
-    }
-
-    // Emit isEmptyChanged() if necessary
-    QList<QAction*> actions = m_widget->m_menuBar->actions();
-    if (event->type() == QEvent::ActionAdded && actions.count() == 1) {
-        QMetaObject::invokeMethod(m_widget, "isEmptyChanged");
-    } else if (event->type() == QEvent::ActionRemoved && actions.isEmpty()) {
-        QMetaObject::invokeMethod(m_widget, "isEmptyChanged");
+    return m_isOpened;
+}
+
+void MenuBarWidget::onObjectAdded(const unity::indicator::Indicator::Ptr& indicator)
+{
+    QString name = QString::fromStdString(indicator->name());
+    if (name == "libappmenu.so") {
+        indicator->on_entry_added.connect(sigc::mem_fun(this, &MenuBarWidget::onEntryAdded));
+    }
+}
+
+void MenuBarWidget::onEntryAdded(const unity::indicator::Entry::Ptr& entry)
+{
+    IndicatorEntryWidget* widget = new IndicatorEntryWidget(entry);
+    widget->setPadding(MENU_ITEM_PADDING);
+    connect(widget, SIGNAL(isEmptyChanged()), SLOT(updateIsEmpty()));
+
+    m_widgetList.append(widget);
+    m_indicatorsManager->addIndicatorEntryWidget(widget);
+
+    // Insert *before* stretch
+    m_layout->insertWidget(m_layout->count() - 1, widget);
+}
+
+void MenuBarWidget::updateIsEmpty()
+{
+    bool empty = true;
+    Q_FOREACH(IndicatorEntryWidget* widget, m_widgetList) {
+        if (!widget->isEmpty()) {
+            empty = false;
+            break;
+        }
+    }
+    if (m_isEmpty != empty) {
+        m_isEmpty = empty;
+        isEmptyChanged();
+    }
+}
+
+void MenuBarWidget::onEntryActivated(const std::string& id)
+{
+    bool isOpened = false;
+    if (!id.empty()) {
+        // We only cares about menubar entries
+        Q_FOREACH(IndicatorEntryWidget* widget, m_widgetList) {
+            if (widget->entry()->id() == id) {
+                isOpened = true;
+                break;
+            }
+        }
+    }
+    if (m_isOpened != isOpened) {
+        m_isOpened = isOpened;
+        isOpenedChanged();
     }
 }
 
 
=== modified file 'panel/applets/appname/menubarwidget.h'
--- panel/applets/appname/menubarwidget.h	2011-07-26 09:36:41 +0000
+++ panel/applets/appname/menubarwidget.h	2011-08-16 09:38:07 +0000
@@ -23,86 +23,45 @@
 #define MENUBARWIDGET_H
 
 // Qt
-#include <QHash>
 #include <QWidget>
 
-class BamfWindow;
-
-class QActionEvent;
-class QDBusObjectPath;
-class QMenu;
-class QMenuBar;
-class QTimer;
-
-class MyDBusMenuImporter;
-class Registrar;
-
-typedef QHash<WId, MyDBusMenuImporter*> ImporterForWId;
-
-class MenuBarWidget;
-
-/**
- * An helper class which monitors the menubar and emits MenuBarWidget::menuBarClosed()
- * when necessary
- */
-class MenuBarClosedHelper : public QObject
-{
-Q_OBJECT
-public:
-    MenuBarClosedHelper(MenuBarWidget*);
-
-protected:
-    bool eventFilter(QObject*, QEvent*); //reimp
-
-private Q_SLOTS:
-    void emitMenuBarClosed();
-
-private:
-    MenuBarWidget* m_widget;
-    void menuBarActionEvent(QActionEvent*);
-};
-
-class MenuBarWidget : public QWidget
-{
-Q_OBJECT
-public:
-    MenuBarWidget(QMenu* windowMenu, QWidget* parent = 0);
+// libunity-core
+#include <UnityCore/Indicator.h>
+#include <UnityCore/IndicatorEntry.h>
+
+class QHBoxLayout;
+
+class IndicatorEntryWidget;
+class IndicatorsManager;
+
+class MenuBarWidget : public QWidget, public sigc::trackable
+{
+Q_OBJECT
+public:
+    MenuBarWidget(IndicatorsManager*, QWidget* parent = 0);
 
     bool isEmpty() const;
     bool isOpened() const;
 
 Q_SIGNALS:
-    void menuBarClosed();
+    void isOpenedChanged();
     void isEmptyChanged();
 
-protected:
-    bool eventFilter(QObject*, QEvent*); // reimp
-
 private Q_SLOTS:
-    void slotActiveWindowChanged(BamfWindow*, BamfWindow*);
-    void slotViewOpened();
-    void slotWindowRegistered(WId, const QString& service, const QDBusObjectPath& menuObjectPath);
-    void slotWindowUnregistered(WId);
-    void slotMenuUpdated();
-    void slotActionActivationRequested(QAction* action);
-    void updateMenuBar();
+    void updateIsEmpty();
 
 private:
     Q_DISABLE_COPY(MenuBarWidget)
 
-    QMenuBar* m_menuBar;
-    Registrar* m_registrar;
-    ImporterForWId m_importers;
-    WId m_activeWinId;
-    QMenu* m_windowMenu;
-    QTimer* m_updateMenuBarTimer;
-
-    void setupRegistrar();
-    void setupMenuBar();
-    QMenu* menuForWinId(WId) const;
-    void updateActiveWinId(BamfWindow*);
-
-    friend class MenuBarClosedHelper;
+    IndicatorsManager* m_indicatorsManager;
+    QHBoxLayout* m_layout;
+    bool m_isEmpty;
+    bool m_isOpened;
+    QList<IndicatorEntryWidget*> m_widgetList;
+
+    void onObjectAdded(const unity::indicator::Indicator::Ptr&);
+    void onEntryAdded(const unity::indicator::Entry::Ptr&);
+    void onEntryActivated(const std::string&);
 };
 
 #endif /* MENUBARWIDGET_H */
 
=== removed file 'panel/applets/appname/registrar.cpp'
--- panel/applets/appname/registrar.cpp	2011-04-04 16:46:14 +0000
+++ panel/applets/appname/registrar.cpp	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
-/*
- * Plasma applet to display application window menus
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[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/>.
- */
-
-// Self
-#include "registrar.h"
-
-// Qt
-#include <QApplication>
-#include <QDBusMessage>
-#include <QDBusObjectPath>
-#include <QDBusServiceWatcher>
-
-// Local
-#include "registraradaptor.h"
-
-static const char* DBUS_SERVICE = "com.canonical.AppMenu.Registrar";
-static const char* DBUS_OBJECT_PATH = "/com/canonical/AppMenu/Registrar";
-
-// Marshalling code for MenuInfo
-QDBusArgument& operator<<(QDBusArgument& argument, const MenuInfo& info)
-{
-    argument.beginStructure();
-    argument << info.winId << info.service << info.path;
-    argument.endStructure();
-    return argument;
-}
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, MenuInfo& info)
-{
-    argument.beginStructure();
-    argument >> info.winId >> info.service >> info.path;
-    argument.endStructure();
-    return argument;
-}
-
-Registrar::Registrar()
-: QObject()
-, mServiceWatcher(new QDBusServiceWatcher(this))
-{
-    qDBusRegisterMetaType<MenuInfo>();
-    qDBusRegisterMetaType<MenuInfoList>();
-    mServiceWatcher->setConnection(QDBusConnection::sessionBus());
-    mServiceWatcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
-    connect(mServiceWatcher, SIGNAL(serviceUnregistered(const QString&)), SLOT(slotServiceUnregistered(const QString&)));
-}
-
-Registrar::~Registrar()
-{
-    QDBusConnection::sessionBus().unregisterService(mService);
-}
-
-Registrar* Registrar::instance()
-{
-    static Registrar singleton;
-    return &singleton;
-}
-
-bool Registrar::connectToBus(const QString& _service, const QString& _path)
-{
-    mService = _service.isEmpty() ? DBUS_SERVICE : _service;
-    QString path = _path.isEmpty() ? DBUS_OBJECT_PATH : _path;
-
-    bool ok = QDBusConnection::sessionBus().registerService(mService);
-    if (!ok) {
-        return false;
-    }
-    new RegistrarAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(path, this);
-
-    return true;
-}
-
-void Registrar::RegisterWindow(WId wid, const QDBusObjectPath& menuObjectPath)
-{
-    MenuInfo info;
-    info.winId = wid;
-    info.service = message().service();
-    info.path = menuObjectPath;
-    mDb.insert(wid, info);
-    mServiceWatcher->addWatchedService(info.service);
-    WindowRegistered(wid, info.service, info.path);
-}
-
-void Registrar::UnregisterWindow(WId wid)
-{
-    mDb.remove(wid);
-    WindowUnregistered(wid);
-}
-
-QString Registrar::GetMenuForWindow(WId winId, QDBusObjectPath& menuObjectPath)
-{
-    MenuInfo info = mDb.value(winId);
-    QString service = info.service;
-    menuObjectPath = info.path;
-    return service;
-}
-
-MenuInfoList Registrar::GetMenus()
-{
-    return mDb.values();
-}
-
-void Registrar::slotServiceUnregistered(const QString& service)
-{
-    MenuInfoDb::Iterator
-        it = mDb.begin(),
-        end = mDb.end();
-    for (;it != end;) {
-        if (it.value().service == service) {
-            WId id = it.key();
-            it = mDb.erase(it);
-            WindowUnregistered(id);
-        } else {
-            ++it;
-        }
-    }
-    mServiceWatcher->removeWatchedService(service);
-}
-
-#include "registrar.moc"
 
=== removed file 'panel/applets/appname/registrar.h'
--- panel/applets/appname/registrar.h	2011-04-04 16:47:28 +0000
+++ panel/applets/appname/registrar.h	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * Plasma applet to display application window menus
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[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 REGISTRAR_H
-#define REGISTRAR_H
-
-// Qt
-#include <QDBusContext>
-#include <QDBusObjectPath>
-#include <QObject>
-#include <QWidget> // For WId
-
-class QDBusObjectPath;
-class QDBusServiceWatcher;
-class QMenu;
-
-struct MenuInfo
-{
-    MenuInfo()
-    : winId(0)
-    , path("/")
-    {}
-
-    uint winId;
-    QString service;
-    QDBusObjectPath path;
-};
-Q_DECLARE_METATYPE(MenuInfo)
-
-typedef QList<MenuInfo> MenuInfoList;
-Q_DECLARE_METATYPE(MenuInfoList)
-
-class Registrar : public QObject, protected QDBusContext
-{
-    Q_OBJECT
-
-public:
-    /* The registrar is a singleton shared between all instances of MenuBarWidget. */
-    static Registrar* instance();
-
-    bool connectToBus(const QString& service = QString(), const QString& objectPath = QString());
-
-Q_SIGNALS:
-    void WindowRegistered(WId wid, const QString& service, const QDBusObjectPath&);
-    void WindowUnregistered(WId wid);
-
-public Q_SLOTS:
-    Q_NOREPLY void RegisterWindow(WId wid, const QDBusObjectPath& menuObjectPath);
-    Q_NOREPLY void UnregisterWindow(WId wid);
-    QString GetMenuForWindow(WId wid, QDBusObjectPath& menuObjectPath);
-    MenuInfoList GetMenus();
-
-private Q_SLOTS:
-    void slotServiceUnregistered(const QString& service);
-
-private:
-    Registrar();
-    Q_DISABLE_COPY(Registrar)
-    ~Registrar();
-
-    QDBusServiceWatcher* mServiceWatcher;
-    typedef QHash<WId, MenuInfo> MenuInfoDb;
-    MenuInfoDb mDb;
-    QString mService;
-};
-
-#endif /* REGISTRAR_H */
 
=== added file 'panel/applets/common/cairoutils.cpp'
--- panel/applets/common/cairoutils.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/common/cairoutils.cpp	2011-08-16 09:38:07 +0000
@@ -0,0 +1,42 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[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/>.
+ */
+// Self
+#include "cairoutils.h"
+
+// Local
+
+// Qt
+#include <QImage>
+
+namespace CairoUtils {
+
+cairo_surface_t* createSurfaceForQImage(QImage* image)
+{
+    return cairo_image_surface_create_for_data(
+        image->bits(),
+        CAIRO_FORMAT_ARGB32,
+        image->width(),
+        image->height(),
+        image->bytesPerLine()
+        );
+}
+
+} // namespace
 
=== added file 'panel/applets/common/cairoutils.h'
--- panel/applets/common/cairoutils.h	1970-01-01 00:00:00 +0000
+++ panel/applets/common/cairoutils.h	2011-08-16 09:38:07 +0000
@@ -0,0 +1,47 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[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 CAIROUTILS_H
+#define CAIROUTILS_H
+
+// Local
+#include <gscopedpointer.h>
+
+// Qt
+
+// Cairo