Bump version to 3.0.2

Update NEWS

.gitignore

@@ -7,7 +7,6 @@ ChangeLog
 INSTALL
 Makefile
 Makefile.in
-NEWS
 aclocal.m4
 autom4te.cache
 config.h
@@ -18,6 +17,10 @@ config
 configure
 data/gnome-shell.desktop
 data/gnome-shell.desktop.in
+data/gschemas.compiled
+data/org.gnome.shell.gschema.xml
+data/org.gnome.shell.gschema.valid
+js/misc/config.js
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
@@ -36,14 +39,23 @@ src/*-enum-types.[ch]
 src/*-marshal.[ch]
 src/Makefile
 src/Makefile.in
-src/gnomeshell-taskpanel
+src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
+src/gnome-shell-calendar-server
+src/gnome-shell-extension-tool
+src/gnome-shell-jhbuild
+src/gnome-shell-perf-helper
+src/gnome-shell-real
+src/run-js-test
 src/test-recorder
 src/test-recorder.ogg
 src/test-theme
 src/st.h
+src/stamp-st.h
+src/stamp-st.h.tmp
 stamp-h1
 tests/run-test.sh
 xmldocs.make
 *~
 *.patch
+*.sw?

NEWS

@@ -0,0 +1,183 @@
+3.0.2
+=====
+* Network Menu [Dan Williams
+  - Fix connecting to WPA2 Enterprise access points
+    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648171
+  - Show the mobile broadband wizard when selecting 3G network
+    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=649318
+  - Miscellaneous bug fixes
+    648648, 650124
+* Fix duplicate icons in the application browser [Owen]
+  https://bugzilla.gnome.org/show_bug.cgi?id=648739
+* Make clicking anywhere on the volume icon slider work [Giovanni]
+  https://bugzilla.gnome.org/show_bug.cgi?id=646660
+* Fix a case where activating and clicking the hot corner
+  at the same time could result in immediately leaving the
+  overview [Rui]
+  https://bugzilla.gnome.org/show_bug.cgi?id=649427
+* Fix a case where applications became misordered in Alt-Tab [Jasper]
+  https://bugzilla.gnome.org/show_bug.cgi?id=643302
+* Fix a bug where messages you send could show up in
+  notifications as if someone else sent them [Jonny]
+  https://bugzilla.gnome.org/show_bug.cgi?id=650219
+* Memory leak fixes [Colin, Maxim]
+  642652, 649508, 649497
+* Miscellaneous minor bug fixes [Adel, Christopher, Jasper]
+  649596,648765, 648983, 649632
+
+Contributors:
+ Christopher Aillon, Giovanni Campagna, Maxim Ermilov,
+ Adel Gadllah, Jonny Lamb, Rui Matos, Jasper St. Pierre,
+ Owen Taylor, Colin Walters, Dan Williams
+
+Translations:
+ Arash Mousavi [fa], Seán de Búrca [ga], Timo Jyrinki [fi],
+ Sigurd Gartmann [nb], Daniel Nylander [se], Peter Mráz [sl],
+ Abduxukur Abdurixit [ug], Nguyễn Thái Ngọc Duy [vi]
+
+3.0.1
+=====
+
+* Network menu
+  - Fix problems updating the menu for mobile broadband devices [Giovanni]
+    https://bugzilla.gnome.org/show_bug.cgi?id=646395
+  - Fix missing device descriptions with multiple devices of the
+    same type [Giovanni]
+    https://bugzilla.gnome.org/show_bug.cgi?id=646074
+  - Label ad-hoc neworks with an appropriate icon [Dan]
+    https://bugzilla.gnome.org/show_bug.cgi?id=646141
+  - Fix displaying some devices states as "invalid" [Dan]
+    https://bugzilla.gnome.org/show_bug.cgi?id=646946
+  - Fix problems with access points that don't report a SSID [Giovanni]
+    https://bugzilla.gnome.org/show_bug.cgi?id=647040
+  - Miscellaneous minor bug fixes [Dan, Giovanni, Owen]
+    645981, 646558, 646443, 646708, 646968
+* Application menu and icon
+  - Fix bug where application menu icon was missing at GNOME Shell
+    startup. [Florian]
+    https://bugzilla.gnome.org/show_bug.cgi?id=644122
+  - Fix missing application menu for dialog windows [Colin]
+    https://bugzilla.gnome.org/show_bug.cgi?id=647082
+ -  When launching an application through an alternate launcher
+    (like for a System Settings pane), association the windows with
+    the application, not the launcher. [Colin]
+    https://bugzilla.gnome.org/show_bug.cgi?id=646689
+* Activities overview
+  - Load the applications view incrementally to avoid potentially freezing
+    for multiple seconds [Colin]
+    https://bugzilla.gnome.org/show_bug.cgi?id=647778
+  - Fix bug where package installation while the overview
+    was up could result in a corrupted application display. [Giovanni]
+    https://bugzilla.gnome.org/show_bug.cgi?id=645801
+  - Fix dragging from the search results to launch apps and docs [Florian]
+    https://bugzilla.gnome.org/show_bug.cgi?id=645990
+  - Fix flickering of selection when searching in the overview [Florian]
+    https://bugzilla.gnome.org/show_bug.cgi?id=646019
+  - Fix bug when typing into the search box when text was already
+    selected [Nohemi]
+    https://bugzilla.gnome.org/show_bug.cgi?id=636341
+* Fix layout of notifications for right-to-left languages [Florian]
+  https://bugzilla.gnome.org/show_bug.cgi?id=646921
+* Remove a confusing special case where Alt-Tab sometimes switched
+  to a different window of the same application rather than to
+  a different application. [Rui]
+  https://bugzilla.gnome.org/show_bug.cgi?id=648132
+* Fix a crash that could happen when a window was opened on a
+  workspace that was immediately removed [Dan]
+  https://bugzilla.gnome.org/show_bug.cgi?id=648132
+* Fix keyboard navigation in logout/reboot dialogs [Dan]
+  https://bugzilla.gnome.org/show_bug.cgi?id=646740
+* Fix missing inspector icon in Looking Glass console [Dan]
+* Miscellaneous minor bug fixes [Adel, Colin, Dan, Florian, Nohemi]
+  645648, 646205, 646257, 646855, 647098, 646730
+
+Contributors:
+ Giovanni Campagna, Nohemi Fernandez, Adel Gadllah, Rui Matos, Florian Müllner,
+ Owen Taylor, Colin Walters, Dan Winship
+
+Translations:
+ Hendrik Richter [de], Jorge González [es], Arash Mousavi [fa],
+ Fran Diéguez [gl], Jiro Matsuzawa [ja], Piotr Drąg [pl], Daniel Nylander [sv],
+ Sira Nokyoongtong [th], Muhammet Kara [tr], Nguyễn Thái Ngọc Duy [vi],
+ Aron Xu [zh_CN], Chao-Hsiung Liao [zh_HK, zh_TW]
+
+3.0.0.2
+=======
+
+* Fix missing import that was preventing extensions from loading.
+  [Maxim Ermilov]
+  https://bugzilla.gnome.org/show_bug.cgi?id=646333
+
+Translations:
+ Timo Jyrinki [fi]
+
+3.0.0.1
+=======
+
+* Fix problem with stuck event handling if network menu pops down while
+  user is using the scrollbar. [Owen Taylor]
+  https://bugzilla.gnome.org/show_bug.cgi?id=646825
+
+Contributors to GNOME Shell 3.0
+===============================
+
+Code:
+
+ Josh Adams, Kiyoshi Aman, Nuno Araujo, Emmanuele Bassi, Dirk-Jan C. Binnema,
+ Wouter Bolsterlee, Raphael Bosshard, Milan Bouchet-Valat, Christina Boumpouka,
+ Mathieu Bridon, Alban Browaeys, Phil Bull, Micro Cai, Giovanni Campagna,
+ Cosimo Cecchi, Tor-björn Claesson, Matthias Clasen, Jason D. Clinton,
+ Frederic Crozat, Guillaume Desmottes, Sander Dijkhuis, Neha Doijode,
+ Maxim Ermilov, Diego Escalante Urrelo, Luca Ferretti, Steve Frécinaux,
+ Takao Fujiwara, Adel Gadllah, Vadim Girlin, Nick Glynn, Guido Günther,
+ Leon Handreke, Lex Hider, Richard Hughes, Javier Jardón, Abderrahim Kitouni,
+ Andre Klapper, Alexander Larsson, Nickolas Lloyd, Ryan Lortie, Kjartan Maraas,
+ Koop Mast, Rui Matos, Jonathan Matthew, William Jon McCann, Morten Mjelva,
+ Federico Mena Quintero, Florian Müllner, Jon Nettleton, Hellyna Ng,
+ Discardi Nicola, Carlos Martín Nieto, Bastien Nocera, Bill Nottingham,
+ Matt Novenstern, Marc-Antoine Perennou, Neil Perry, Frédéric Péters,
+ Alejandro Piñeiro, Siegfried-Angel Gevatter Pujals, "res", Neil Roberts,
+ "Sardem FF7", Florian Scandella, Joseph Scheuhammer, Christian Schramm,
+ Gustavo Noronha Silva, Jasper St. Pierre, Eric Springer, Jakub Steiner,
+ Jonathan Strander, Ray Strode, Owen Taylor, Rico Tzschichholz,
+ Sergey V. Udaltsov, Daiki Ueno, Vincent Untz, Marcelo Jorge Vieira,
+ Mads Villadsen, Colin Walters, Dan Winship, William Wolf, Thomas Wood,
+ Pierre Yager, David Zeuthen, Marina Zhurakhinskaya
+
+Design:
+
+ Allan Day, William Jon McCann, Jeremy Perry, Jakub Steiner
+ 2008 Boston GNOME design hackfest participants (especially Neil J. Patel
+ for turning the resulting sketches into our first mockups.)
+ Everybody on irc.gnome.org:#gnome-design
+
+Translations:
+
+ Friedel Wolff (af), Khaled Hosny (ar), Ivaylo Valkov (bg), Jamil Ahmed (bn)
+ Runa Bhattacharjee (bn_IN), Gil Forcada, Siegfried-Angel Gevatter Pujals,
+ Jordi Serratosa (ca), Andre Klapper, Petr Kovar (cs), Kenneth Nielsen,
+ Kris Thomsen (da), Mario Blättermann, Hendrik Brandt, Christian Kirbach,
+ Hendrik Richter, Wolfgang Stöggl (de), Michael Kotsarinis, Kostas Papadimas,
+ Jennie Petoumenou, Sterios Prosiniklis, Fotis Tsamis, Simos Xenitellis (el),
+ Bruce Cowan, Philip Withnall (en_GB), Jorge Gonzalez, Daniel Mustieles (es),
+ Mattias Põldaru, Ivar Smolin (et), Inaki Larranaga Murgoitio (eu),
+ Mahyar Moghimi (fa), Timo Jyrinki (fi), Cyril Arnaud, Bruno Brouard,
+ Pablo Martin-Gomez, Claude Paroz, Frédéric Peters (fr), Seán de Búrca (ga)
+ Francisco Diéguez, Antón Méixome (gl), Sweta Kothari (gu), Liel Fridman,
+ Yaron Shahrabani (he), Rajesh Ranjan (hi), Gabor Kelemen (hu), Milo Casagrande,
+ Luca Ferretti (it), Dirgita, Andika Triwidada (id), Takayuki KUSANO,
+ Takayoshi OKANO, Kiyotaka NISHIBORI, Futoshi NISHIO (ja), Shankar Prasad (kn),
+ Young-Ho Cha, Changwoo Ryu (ko), Žygimantas Beručka, Gintautas Miliauskas (lt),
+ Rudolfs Mazurs (lv), Sandeep Shedmake (mr), Kjartan Maraas (nb),
+ Wouter Bolsterlee, Sander Dijkhuis, Reinout van Schouwen (nl),
+ Torstein Winterseth (nn), A S Alam (pa), Tomasz Dominikowski, Piotr Drąg (pl),
+ Duarte Loreto (pt), Felipe Borges, Rodrigo Padula de Oliveira,
+ Rodrigo L. M. Flores, Amanda Magalhães, Og B. Maciel, Gabriel F. Vilar,
+ Jonh Wendell (pt_BR), Lucian Adrian Grijincu, Daniel Șerbănescu (ro),
+ Sergey V. Kovylov, Andrey Korzinev, Yuri Myasoedov, Marina Zhurakhinskaya (ru),
+ Daniel Nylander (se), Matej Urbančič, Andrej Žnidaršič (sl),
+ Miloš Popović (sr, sr@latin), Miroslav Nikolić (sr), Tirumurti Vasudevan (ta),
+ Sira Nokyoongtong (th), Baris Cicek (tr), Abduxukur Abdurixit,
+ Gheyret T. Kenji (ug), Maxim V. Dziumanenko, Daniel Korostil (uk),
+ Nguyễn Thái Ngọc Duy (vi), Jessica Ban, 'jiero', Wei Li, YunQiang Su, Ray Wang,
+ Aron Xu (zh_CN), Chao-Hsiung Liao (zh_HK, zh_TW)

configure.ac

@@ -1,11 +1,14 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[2.29.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.0.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
 
+AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])
+AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])
+
 AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign])
 AM_MAINTAINER_MODE
 
@@ -33,6 +36,8 @@ PKG_PROG_PKG_CONFIG([0.22])
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_GCONF_SOURCE_2
 
+GLIB_GSETTINGS
+
 # Get a value to substitute into gnome-shell.in
 AM_PATH_PYTHON([2.5])
 AC_SUBST(PYTHON)
@@ -47,49 +52,110 @@ AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
 if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
    AC_MSG_RESULT(yes)
    build_recorder=true
-   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes"
-   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0)
+   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
 else
    AC_MSG_RESULT(no)
 fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-CLUTTER_MIN_VERSION=1.2.0
-GOBJECT_INTROSPECTION_MIN_VERSION=0.6.9
-GJS_MIN_VERSION=0.6
-MUTTER_MIN_VERSION=2.29.1
+CLUTTER_MIN_VERSION=1.5.15
+GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
+GJS_MIN_VERSION=0.7.11
+MUTTER_MIN_VERSION=3.0.0
+GTK_MIN_VERSION=3.0.0
+GIO_MIN_VERSION=2.25.9
+LIBECAL_MIN_VERSION=2.32.0
+LIBEDATASERVER_MIN_VERSION=1.2.0
+LIBEDATASERVERUI2_MIN_VERSION=1.2.0
+LIBEDATASERVERUI3_MIN_VERSION=2.91.6
+TELEPATHY_GLIB_MIN_VERSION=0.13.12
+TELEPATHY_LOGGER_MIN_VERSION=0.2.4
+POLKIT_MIN_VERSION=0.100
 
 # Collect more than 20 libraries for a prize!
-PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1
-                                 mutter-plugins >= $MUTTER_MIN_VERSION
-                                 gjs-gi-1.0 >= $GJS_MIN_VERSION
-				 libgnome-menu $recorder_modules gconf-2.0
-                                 gdk-x11-2.0
-				 clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
-				 clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
-                                 libstartup-notification-1.0
-                                 gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION)
-PKG_CHECK_MODULES(TIDY, clutter-1.0)
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-2.0 libcroco-0.6 gnome-desktop-2.0 >= 2.26)
-PKG_CHECK_MODULES(BIG, clutter-1.0 gtk+-2.0 librsvg-2.0)
-PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0)
-PKG_CHECK_MODULES(TRAY, gtk+-2.0)
+PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
+                               gio-unix-2.0 dbus-glib-1 libxml-2.0
+                               gtk+-3.0 >= $GTK_MIN_VERSION
+                               libmutter >= $MUTTER_MIN_VERSION
+                               gjs-internals-1.0 >= $GJS_MIN_VERSION
+			       libgnome-menu $recorder_modules gconf-2.0
+                               gdk-x11-3.0
+			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
+			       clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
+                               libstartup-notification-1.0
+                               gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+			       libcanberra
+                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
+                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
 
-MUTTER_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix mutter-plugins`/bin
-# FIXME: metacity-plugins.pc should point directly to its .gir file
-MUTTER_LIB_DIR=`$PKG_CONFIG --variable=libdir mutter-plugins`
-MUTTER_PLUGIN_DIR=`$PKG_CONFIG --variable=plugindir mutter-plugins`
-AC_SUBST(MUTTER_BIN_DIR)
-AC_SUBST(MUTTER_LIB_DIR)
-AC_SUBST(MUTTER_PLUGIN_DIR)
+PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
 
-GJS_JS_DIR=`$PKG_CONFIG --variable=jsdir gjs-1.0`
-GJS_JS_NATIVE_DIR=`$PKG_CONFIG --variable=jsnativedir gjs-1.0`
-AC_SUBST(GJS_JS_DIR)
-AC_SUBST(GJS_JS_NATIVE_DIR)
+GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
+AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
+AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
+
+GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
+JHBUILD_TYPELIBDIR="$INTROSPECTION_TYPELIBDIR"
+# NM is the only typelib we use that we don't jhbuild
+PKG_CHECK_EXISTS([libnm-glib >= 0.8.999],
+        [NM_TYPELIBDIR=`$PKG_CONFIG --variable=libdir libnm-glib`/girepository-1.0
+	 if test "$INTROSPECTION_TYPELIBDIR" != "$NM_TYPELIBDIR"; then
+	     JHBUILD_TYPELIBDIR="$JHBUILD_TYPELIBDIR:$NM_TYPELIBDIR"
+	 fi])
+AC_SUBST(JHBUILD_TYPELIBDIR)
+
+saved_CFLAGS=$CFLAGS
+saved_LIBS=$LIBS
+CFLAGS=$GNOME_SHELL_CFLAGS
+LIBS=$GNOME_SHELL_LIBS
+# sn_startup_sequence_get_application_id, we can replace with a version check later
+AC_CHECK_FUNCS(JS_NewGlobalObject sn_startup_sequence_get_application_id XFixesCreatePointerBarrier)
+CFLAGS=$saved_CFLAGS
+LIBS=$saved_LIBS
+
+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 gnome-desktop-3.0 >= 2.90.0 x11)
+PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
+PKG_CHECK_MODULES(TRAY, gtk+-3.0)
+PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+PKG_CHECK_MODULES(JS_TEST, clutter-x11-1.0 gjs-1.0 gobject-introspection-1.0 gtk+-3.0)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
+
+AC_MSG_CHECKING([for bluetooth support])
+PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
+        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=libdir gnome-bluetooth-1.0`/gnome-bluetooth
+	 BLUETOOTH_LIBS="-L'$BLUETOOTH_DIR' -lgnome-bluetooth-applet"
+	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
+	 AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
+	 AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
+	 AC_SUBST([HAVE_BLUETOOTH],[1])
+	 AC_MSG_RESULT([yes])],
+	[AC_DEFINE([HAVE_BLUETOOTH],[0])
+	 AC_SUBST([HAVE_BLUETOOTH],[0])
+	 AC_MSG_RESULT([no])])
+
+# Default to libedataserverui-3.0, but allow falling back to 1.2
+PKG_CHECK_EXISTS(libedataserverui-3.0,
+                 [EDS_API=3.0
+                  LIBEDATASERVERUI_MIN_VERSION=$LIBEDATASERVERUI3_MIN_VERSION],
+                 [EDS_API=1.2
+                  LIBEDATASERVERUI_MIN_VERSION=$LIBEDATASERVERUI2_MIN_VERSION])
+PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-$EDS_API >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
+AC_SUBST(CALENDAR_SERVER_CFLAGS)
+AC_SUBST(CALENDAR_SERVER_LIBS)
+
+MUTTER_GIR_DIR=`$PKG_CONFIG --variable=girdir libmutter`
+MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter`
+AC_SUBST(MUTTER_GIR_DIR)
+AC_SUBST(MUTTER_TYPELIB_DIR)
+
+GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
+AC_SUBST(GJS_CONSOLE)
 
 AC_CHECK_FUNCS(fdwalk)
+AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_HEADERS([sys/resource.h])
 
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
@@ -132,15 +198,15 @@ if test "$enable_compile_warnings" != no ; then
 fi
 changequote([,])dnl
 
-AC_PATH_PROG(mutter, [mutter])
-AC_SUBST(mutter)
+AC_ARG_ENABLE(jhbuild-wrapper-script,
+  AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
+AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)
 
 AC_CONFIG_FILES([
   Makefile
   data/Makefile
   js/Makefile
-  js/misc/Makefile
-  js/ui/Makefile
+  js/misc/config.js
   src/Makefile
   tests/Makefile
   po/Makefile.in

data/Makefile.am

@@ -3,58 +3,97 @@ desktop_DATA = gnome-shell.desktop
 
 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
-gnome-shell.desktop.in: gnome-shell.desktop.in.in
+%.desktop.in:%.desktop.in.in
 	$(AM_V_GEN) sed -e "s|@bindir[@]|$(bindir)|" \
 	    -e "s|@VERSION[@]|$(VERSION)|" \
 	    $< > $@ || rm $@
 
 # Placeholder until we add intltool
-gnome-shell.desktop: gnome-shell.desktop.in
+%.desktop:%.desktop.in
 	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
 
-imagesdir = $(pkgdatadir)/images
-dist_images_DATA =				\
-	close-black.svg				\
-	magnifier.svg
+searchprovidersdir = $(pkgdatadir)/search_providers
+dist_searchproviders_DATA =				\
+	search_providers/google.xml				\
+	search_providers/wikipedia.xml
 
 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
-	theme/add-workspace.svg			\
+	theme/calendar-arrow-left.svg		\
+	theme/calendar-arrow-right.svg		\
+	theme/calendar-today.svg		\
 	theme/close-window.svg			\
-	theme/close.svg                 \
-	theme/corner-ripple.png			\
-	theme/dialog-error.svg			\
+	theme/close.svg				\
+	theme/corner-ripple-ltr.png		\
+	theme/corner-ripple-rtl.png		\
+	theme/dash-placeholder.svg		\
+	theme/filter-selected-ltr.svg		\
+	theme/filter-selected-rtl.svg		\
 	theme/gnome-shell.css			\
-	theme/mosaic-view-active.svg          \
-	theme/mosaic-view.svg          \
-	theme/move-window-on-new.svg          \
-	theme/remove-workspace.svg          \
+	theme/mosaic-view-active.svg		\
+	theme/mosaic-view.svg			\
+	theme/move-window-on-new.svg		\
+	theme/panel-border.svg			\
+	theme/panel-button-border.svg		\
+	theme/panel-button-highlight-narrow.svg	\
+	theme/panel-button-highlight-wide.svg	\
+	theme/process-working.svg		\
+	theme/running-indicator.svg		\
 	theme/scroll-button-down-hover.png	\
 	theme/scroll-button-down.png		\
 	theme/scroll-button-up-hover.png	\
 	theme/scroll-button-up.png		\
-	theme/scroll-hhandle.svg        \
-	theme/scroll-vhandle.svg        \
-	theme/section-back.svg          \
-	theme/section-more.svg          \
-	theme/section-more-open.svg          \
-	theme/single-view-active.svg          \
-	theme/single-view.svg          \
-	theme/ws-switch-arrow-left.svg		\
-	theme/ws-switch-arrow-right.svg
+	theme/scroll-hhandle.svg		\
+	theme/scroll-vhandle.svg		\
+	theme/section-more.svg			\
+	theme/section-more-open.svg		\
+	theme/separator-white.png		\
+	theme/single-view-active.svg		\
+	theme/single-view.svg			\
+	theme/source-button-border.svg		\
+	theme/toggle-off-us.svg			\
+	theme/toggle-off-intl.svg		\
+	theme/toggle-on-us.svg			\
+	theme/toggle-on-intl.svg		\
+	theme/ws-switch-arrow-up.svg		\
+	theme/ws-switch-arrow-down.svg
+
+gsettings_SCHEMAS = org.gnome.shell.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
+
+# We need to compile schemas at make time
+# to run from source tree
+gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
+
+all-local: gschemas.compiled
 
 
-schemadir  = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = gnome-shell.schemas
+# GConf schemas: provide defaults for keys from Metacity we are overriding
+gconfschemadir  = @GCONF_SCHEMA_FILE_DIR@
+gconfschema_DATA = gnome-shell.schemas
+
+shadersdir = $(pkgdatadir)/shaders
+shaders_DATA = \
+	shaders/dim-window.glsl
 
 install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(gconfschema_DATA)
 
-EXTRA_DIST =					\
-	gnome-shell.desktop.in.in		\
-	$(schema_DATA)
 
-CLEANFILES =					\
-	gnome-shell.desktop.in			\
-	$(desktop_DATA)
+
+EXTRA_DIST =						\
+	gnome-shell.desktop.in.in			\
+	$(menu_DATA)					\
+	$(gconfschema_DATA)				\
+	$(shaders_DATA)					\
+	org.gnome.shell.gschema.xml.in
+
+CLEANFILES =						\
+	gnome-shell.desktop.in				\
+	$(desktop_DATA)					\
+	$(gsettings_SCHEMAS)				\
+	gschemas.compiled
 

data/close-black.svg

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Foreground"
-   x="0px"
-   y="0px"
-   width="16px"
-   height="16px"
-   viewBox="0 0 16 16"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="close-black.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata2399"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs2397"><linearGradient
-     id="linearGradient3173"><stop
-       style="stop-color:#c4c4c4;stop-opacity:1;"
-       offset="0"
-       id="stop3175" /><stop
-       style="stop-color:#ffffff;stop-opacity:1;"
-       offset="1"
-       id="stop3177" /></linearGradient><inkscape:perspective
-     sodipodi:type="inkscape:persp3d"
-     inkscape:vp_x="0 : 8 : 1"
-     inkscape:vp_y="0 : 1000 : 0"
-     inkscape:vp_z="16 : 8 : 1"
-     inkscape:persp3d-origin="8 : 5.3333333 : 1"
-     id="perspective2401" /></defs><sodipodi:namedview
-   inkscape:window-height="811"
-   inkscape:window-width="1272"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   showgrid="false"
-   inkscape:zoom="32.125"
-   inkscape:cx="8"
-   inkscape:cy="10.440056"
-   inkscape:window-x="40"
-   inkscape:window-y="40"
-   inkscape:current-layer="Foreground" />
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   d="M10.5,3.5l2,2L10,8l2.5,2.5l-2,2L8,10l-2.5,2.5l-2-2L6,8L3.5,5.5l2-2L8,6L10.5,3.5  z M0,8c0-4.418,3.582-8,8-8s8,3.582,8,8s-3.582,8-8,8S0,12.418,0,8z"
-   id="path2394"
-   style="fill-opacity:1;fill:#545454" />
-</svg>

data/gnome-shell.desktop.in.in

@@ -7,9 +7,10 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;Utility;Core;
+Categories=GNOME;GTK;Core;
 OnlyShowIn=GNOME;
 NoDisplay=true
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true

data/gnome-shell.schemas

@@ -1,196 +1,100 @@
 <gconfschemafile>
     <schemalist>
 
+      <!-- Metacity overrides -->
       <schema>
-        <key>/schemas/desktop/gnome/shell/development_tools</key>
-        <applyto>/desktop/gnome/shell/development_tools</applyto>
+        <key>/schemas/desktop/gnome/shell/windows/attach_modal_dialogs</key>
+        <applyto>/desktop/gnome/shell/windows/attach_modal_dialogs</applyto>
         <owner>gnome-shell</owner>
         <type>bool</type>
         <default>true</default>
         <locale name="C">
-            <short>Enable internal tools useful for developers and testers from Alt-F2</short>
-            <long>
-                Allows access to internal debugging and monitoring tools using
-                the Alt-F2 dialog.
-            </long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/app_monitor/enable_monitoring</key>
-	<applyto>/desktop/gnome/shell/app_monitor/enable_monitoring</applyto>
-	<owner>gnome-shell</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short>Whether to collect stats about applications usage</short>
-	  <long>
-	    The shell normally monitors active applications in order to present the most used ones (e.g. in launchers). While this data will be kept private, you may want to disable this for privacy reasons. Please note that doing so won't remove already saved data.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/favorite_apps</key>
-	<applyto>/desktop/gnome/shell/favorite_apps</applyto>
-	<owner>gnome-shell</owner>
-	<type>list</type>
-	<list_type>string</list_type>
-	<default>[mozilla-firefox.desktop,evolution.desktop,openoffice.org-writer.desktop]</default>
-	<locale name="C">
-	  <short>List of desktop file IDs for favorite applications</short>
-	  <long>
-        The applications corresponding to these identifiers will be displayed in the favorites area.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/run_dialog/history</key>
-	<applyto>/desktop/gnome/shell/run_dialog/history</applyto>
-	<owner>gnome-shell</owner>
-	<type>list</type>
-	<list_type>string</list_type>
-	<default>[]</default>
-	<locale name="C">
-	  <short>History for command (Alt-F2) dialog</short>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/sidebar/visible</key>
-	<applyto>/desktop/gnome/shell/sidebar/visible</applyto>
-	<owner>gnome-shell</owner>
-	<type>bool</type>
-	<default>false</default>
-	<locale name="C">
-	  <short>Whether or not to display the sidebar</short>
-	  <long>
-	    Determines whether or not the sidebar is visible.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/sidebar/expanded</key>
-	<applyto>/desktop/gnome/shell/sidebar/expanded</applyto>
-	<owner>gnome-shell</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short>Whether the sidebar should be in the expanded (wide) mode</short>
-	  <long>
-	    Controls the expanded/collapsed state of the sidebar.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/sidebar/autohide</key>
-	<applyto>/desktop/gnome/shell/sidebar/autohide</applyto>
-	<owner>gnome-shell</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short>Whether the sidebar should automatically hide itself in compact mode</short>
-	  <long>
-	    Controls the autohide state of the sidebar.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/sidebar/widgets</key>
-	<applyto>/desktop/gnome/shell/sidebar/widgets</applyto>
-	<owner>gnome-shell</owner>
-	<type>list</type>
-	<list_type>string</list_type>
-	<default>[imports.ui.widget.ClockWidget,imports.ui.widget.AppsWidget,imports.ui.widget.RecentDocsWidget]</default>
-	<locale name="C">
-	  <short>The widgets to display in the sidebar</short>
-	  <long>
-	    The widgets to display in the sidebar, in order from top to bottom. Each widget "name" is actually a JavaScript expression referring to a widget constructor object.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/disabled_extensions</key>
-        <applyto>/desktop/gnome/shell/disabled_extensions</applyto>
-        <owner>gnome-shell</owner>
-        <type>list</type>
-        <list_type>string</list_type>
-        <default>[]</default>
-        <locale name="C">
-          <short>Uuids of extensions to disable</short>
+          <short>Attach modal dialog to the parent window</short>
           <long>
-            GNOME Shell extensions have a uuid property; this key lists extensions which should not be loaded.
-         </long>
+             This key overrides /apps/mutter/general/attach_modal_dialogs when
+             running GNOME Shell.
+          </long>
         </locale>
       </schema>
 
       <schema>
-        <key>/schemas/desktop/gnome/shell/recorder/framerate</key>
-        <applyto>/desktop/gnome/shell/recorder/framerate</applyto>
-        <owner>gnome-shell</owner>
-        <type>int</type>
-        <default>15</default>
-        <locale name="C">
-          <short>Framerate used for recording screencasts.</short>
-          <long>
-            The framerate of the resulting screencast recordered by GNOME Shell's screencast recorder in frames-per-second.
-         </long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/recorder/pipeline</key>
-        <applyto>/desktop/gnome/shell/recorder/pipeline</applyto>
+        <key>/schemas/desktop/gnome/shell/windows/button_layout</key>
+        <applyto>/desktop/gnome/shell/windows/button_layout</applyto>
         <owner>gnome-shell</owner>
         <type>string</type>
-        <default></default>
+        <default>:close</default>
         <locale name="C">
-          <short>The gstreamer pipeline used to encode the screencast</short>
-          <long>
-            Sets the GStreamer pipeline used to encode recordings. It follows the syntax used for gst-launch.
-            The pipeline should have an unconnected sink pad where the recorded video is recorded. It will
-            normally have a unconnected source pad; output from that pad will be written into the output file.
-            However the pipeline can also take care of its own output - this might be used to send the output to an icecast server via shout2send or similar.
-            When unset or set to an empty value, the default pipeline will be used. This is currently 'videorate ! theoraenc ! oggmux' and records to Ogg Theora.
-         </long>
+           <short>Arrangement of buttons on the titlebar</short>
+           <long>
+             Arrangement of buttons on the titlebar. The
+             value should be a string, such as
+             "menu:minimize,maximize,spacer,close"; the colon separates the
+             left corner of the window from the right corner, and
+             the button names are comma-separated. Duplicate buttons
+             are not allowed. Unknown button names are silently ignored
+             so that buttons can be added in future gnome-shell versions
+             without breaking older versions.
+             A special spacer tag can be used to insert some space between
+             two adjacent buttons.
+
+             This key overrides /apps/metacity/general/button_layout when
+             running GNOME Shell.
+           </long>
         </locale>
       </schema>
 
       <schema>
-        <key>/schemas/desktop/gnome/shell/recorder/file_extension</key>
-        <applyto>/desktop/gnome/shell/recorder/file_extension</applyto>
+        <key>/schemas/desktop/gnome/shell/windows/edge_tiling</key>
+        <applyto>/desktop/gnome/shell/windows/edge_tiling</applyto>
         <owner>gnome-shell</owner>
-        <type>string</type>
-        <default>ogv</default>
+        <type>bool</type>
+        <default>true</default>
         <locale name="C">
-          <short>File extension used for storing the screencast</short>
+          <short>enable edge tiling when dropping windows on screen edges</short>
           <long>
-            The filename for recorded screencasts will be a unique filename based on the current date, and use this extension.
-            It should be changed when recording to a different container format.
-         </long>
+             If enabled, dropping windows on vertical screen edges maximizes them
+             vertically and resizes them horizontally to cover half of the
+             available area. Dropping windows on the top screen edge maximizes them
+             completely.
+
+             This key overrides /apps/metacity/general/edge_tiling when
+             running GNOME Shell.
+          </long>
         </locale>
       </schema>
 
       <schema>
-        <key>/schemas/desktop/gnome/shell/overview/workspaces_view</key>
-        <applyto>/desktop/gnome/shell/overview/workspaces_view</applyto>
+        <key>/schemas/desktop/gnome/shell/windows/theme</key>
+        <applyto>/desktop/gnome/shell/windows/theme</applyto>
         <owner>gnome-shell</owner>
         <type>string</type>
-        <default>single</default>
+        <default>Adwaita</default>
         <locale name="C">
-          <short>Overview workspace view mode</short>
+          <short>Current theme</short>
           <long>
-            The selected workspace view mode in the overview.
-            Supported values are "single" and "grid".
+            The theme determines the appearance of window borders,
+            titlebar, and so forth.
+
+            This key overrides /apps/metacity/general/theme when
+            running GNOME Shell.
+          </long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/desktop/gnome/shell/windows/workspaces_only_on_primary</key>
+        <applyto>/desktop/gnome/shell/windows/workspaces_only_on_primary</applyto>
+        <owner>gnome-shell</owner>
+        <type>bool</type>
+        <default>true</default>
+        <locale name="C">
+          <short>Workspaces only on primary monitor</short>
+          <long>
+             This key overrides /apps/mutter/general/workspaces_only_on_primary when
+             running GNOME Shell.
           </long>
         </locale>
       </schema>
 
   </schemalist>
-
 </gconfschemafile>

data/magnifier.svg

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Foreground"
-   x="0px"
-   y="0px"
-   width="18"
-   height="18"
-   viewBox="0 0 18 18"
-   enable-background="new 0 0 29 18"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="magnifier.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata16"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-   id="defs14"><inkscape:perspective
-     sodipodi:type="inkscape:persp3d"
-     inkscape:vp_x="0 : 9 : 1"
-     inkscape:vp_y="0 : 1000 : 0"
-     inkscape:vp_z="29 : 9 : 1"
-     inkscape:persp3d-origin="14.5 : 6 : 1"
-     id="perspective18" /></defs><sodipodi:namedview
-   inkscape:window-height="728"
-   inkscape:window-width="1103"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="1"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#000000"
-   id="base"
-   showgrid="true"
-   inkscape:zoom="27.260185"
-   inkscape:cx="9.5844061"
-   inkscape:cy="9.4435574"
-   inkscape:window-x="142"
-   inkscape:window-y="26"
-   inkscape:current-layer="Foreground"
-   inkscape:snap-global="true"
-   showguides="false"><inkscape:grid
-     type="xygrid"
-     id="grid2391"
-     empspacing="5"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
-
-<g
-   id="g5"
-   style="fill:#ffffff;fill-opacity:1"
-   transform="translate(-4,-0.023114)">
-	<path
-   d="m 6.246,13.98 c -0.319,-0.319 -0.319,-0.837 0,-1.157 L 9.963,9.106 c 0.319,-0.319 0.837,-0.319 1.157,0 l 0.786,0.787 c 0.32,0.319 0.32,0.837 0,1.157 l -3.717,3.717 c -0.32,0.319 -0.838,0.319 -1.157,0 l -0.786,-0.787 0,0 z"
-   id="path7"
-   style="fill:#ffffff;fill-opacity:1" />
-	<path
-   d="M 9.076,11.937"
-   id="path9"
-   style="fill:#ffffff;fill-opacity:1" />
-</g>
-<path
-   clip-rule="evenodd"
-   d="m 7.25,7.476886 c 0,-1.243 1.007,-2.25 2.2499998,-2.25 1.2430002,0 2.2500002,1.007 2.2500002,2.25 0,1.243 -1.007,2.25 -2.2500002,2.25 C 8.257,9.726886 7.25,8.719886 7.25,7.476886 z m -2.25,0 c 0,-2.485 2.015,-4.5 4.4999998,-4.5 2.4850002,0 4.5000002,2.015 4.5000002,4.5 0,2.4849998 -2.015,4.5 -4.5000002,4.5 C 7.015,11.976886 5,9.9618858 5,7.476886 z"
-   id="path11"
-   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
-</svg>

data/org.gnome.shell.gschema.xml.in

@@ -0,0 +1,123 @@
+<schemalist>
+  <schema id="org.gnome.shell" path="/org/gnome/shell/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="development-tools" type="b">
+      <default>true</default>
+      <_summary>
+        Enable internal tools useful for developers and testers from Alt-F2
+      </_summary>
+      <_description>
+        Allows access to internal debugging and monitoring tools
+        using the Alt-F2 dialog.
+      </_description>
+    </key>
+    <key name="disabled-extensions" type="as">
+      <default>[]</default>
+      <_summary>Uuids of extensions to disable</_summary>
+      <_description>
+        GNOME Shell extensions have a uuid property;
+        this key lists extensions which should not be loaded.
+      </_description>
+    </key>
+    <key name="enable-app-monitoring" type="b">
+      <default>true</default>
+      <_summary>Whether to collect stats about applications usage</_summary>
+      <_description>
+        The shell normally monitors active applications in order to present
+        the most used ones (e.g. in launchers). While this data will be
+        kept private, you may want to disable this for privacy reasons.
+        Please note that doing so won't remove already saved data.
+      </_description>
+    </key>
+    <key name="favorite-apps" type="as">
+      <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
+      <_summary>List of desktop file IDs for favorite applications</_summary>
+      <_description>
+        The applications corresponding to these identifiers
+        will be displayed in the favorites area.
+      </_description>
+    </key>
+    <key name="disabled-open-search-providers" type="as">
+      <default>[]</default>
+      <_summary>disabled OpenSearch providers</_summary>
+    </key>
+    <key name="command-history" type="as">
+      <default>[]</default>
+      <_summary>History for command (Alt-F2) dialog</_summary>
+    </key>
+    <key name="looking-glass-history" type="as">
+      <default>[]</default>
+      <_summary>History for the looking glass dialog</_summary>
+    </key>
+    <child name="clock" schema="org.gnome.shell.clock"/>
+    <child name="calendar" schema="org.gnome.shell.calendar"/>
+    <child name="recorder" schema="org.gnome.shell.recorder"/>
+  </schema>
+
+  <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-weekdate" type="b">
+      <default>false</default>
+      <_summary>Show the week date in the calendar</_summary>
+      <_description>
+        If true, display the ISO week date in the calendar.
+      </_description>
+      </key>
+  </schema>
+
+  <schema id="org.gnome.shell.clock" path="/org/gnome/shell/clock/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-seconds" type="b">
+      <default>false</default>
+      <_summary>Show time with seconds</_summary>
+      <_description>
+        If true, display seconds in time.
+      </_description>
+    </key>
+    <key name="show-date" type="b">
+      <default>false</default>
+      <_summary>Show date in clock</_summary>
+      <_description>
+        If true, display date in the clock, in addition to time.
+      </_description>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.shell.recorder" path="/org/gnome/shell/recorder/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="framerate" type="i">
+      <default>15</default>
+      <_summary>Framerate used for recording screencasts.</_summary>
+      <_description>
+        The framerate of the resulting screencast recordered
+        by GNOME Shell's screencast recorder in frames-per-second.
+      </_description>
+    </key>
+    <key name="pipeline" type="s">
+      <default>''</default>
+      <_summary>The gstreamer pipeline used to encode the screencast</_summary>
+      <_description>
+        Sets the GStreamer pipeline used to encode recordings.
+        It follows the syntax used for gst-launch. The pipeline should have
+        an unconnected sink pad where the recorded video is recorded. It will
+        normally have a unconnected source pad; output from that pad
+        will be written into the output file. However the pipeline can also
+        take care of its own output - this might be used to send the output
+        to an icecast server via shout2send or similar. When unset or set
+        to an empty value, the default pipeline will be used. This is currently
+        'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux'
+        and records to WEBM using the VP8 codec. %T is used as a placeholder
+        for a guess at the optimal thread count on the system.
+      </_description>
+    </key>
+    <key name="file-extension" type="s">
+      <default>'webm'</default>
+      <_summary>File extension used for storing the screencast</_summary>
+      <_description>
+        The filename for recorded screencasts will be a unique filename
+        based on the current date, and use this extension. It should be
+        changed when recording to a different container format.
+      </_description>
+    </key>
+  </schema>
+</schemalist>

data/search_providers/google.xml

@@ -0,0 +1,7 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+<ShortName>Google</ShortName>
+<Description>Google Search</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
+<Url type="text/html" method="GET" template="http://www.google.com/search?q={searchTerms}"/>
+</OpenSearchDescription>

data/search_providers/wikipedia.xml

@@ -0,0 +1,44 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+<ShortName>Wikipedia</ShortName>
+<Description>Wikipedia, the free encyclopedia</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
+<Url type="text/html" method="GET" template="http://{language}.wikipedia.org/wiki/Special:Search?search={searchTerms}"/>
+<!-- The criterion for being below is being listed with more than 100,000
+articles on http://meta.wikimedia.org/wiki/List_of_Wikipedias -->
+<Language>ar</Language>
+<Language>bg</Language>
+<Language>ca</Language>
+<Language>cs</Language>
+<Language>da</Language>
+<Language>de</Language>
+<Language>en</Language>
+<Language>eo</Language>
+<Language>es</Language>
+<Language>fa</Language>
+<Language>fi</Language>
+<Language>fr</Language>
+<Language>he</Language>
+<Language>hu</Language>
+<Language>id</Language>
+<Language>it</Language>
+<Language>ja</Language>
+<Language>ko</Language>
+<Language>lt</Language>
+<Language>nl</Language>
+<Language>no</Language>
+<Language>pl</Language>
+<Language>pt</Language>
+<Language>ro</Language>
+<Language>ru</Language>
+<Language>sk</Language>
+<Language>sl</Language>
+<Language>sr</Language>
+<Language>sv</Language>
+<Language>tr</Language>
+<Language>uk</Language>
+<Language>vi</Language>
+<Language>vo</Language>
+<Language>war</Language>
+<Language>zh</Language>
+</OpenSearchDescription>

data/shaders/dim-window.glsl

@@ -0,0 +1,26 @@
+#version 110
+uniform sampler2D sampler0;
+uniform float fraction;
+uniform float height;
+const float c = -0.2;
+const float border_max_height = 60.0;
+
+mat4 contrast = mat4 (1.0 + c, 0.0, 0.0, 0.0,
+                      0.0, 1.0 + c, 0.0, 0.0,
+                      0.0, 0.0, 1.0 + c, 0.0,
+                      0.0, 0.0, 0.0, 1.0);
+vec4 off = vec4(0.633, 0.633, 0.633, 0);
+void main()
+{
+  vec4 color = texture2D(sampler0, gl_TexCoord[0].st);
+  float y = height * gl_TexCoord[0][1];
+
+  // To reduce contrast, blend with a mid gray
+  gl_FragColor = color * contrast - off * c;
+
+  // We only fully dim at a distance of BORDER_MAX_HEIGHT from the edge and
+  // when the fraction is 1.0. For other locations and fractions we linearly
+  // interpolate back to the original undimmed color.
+  gl_FragColor = color + (gl_FragColor - color) * min(y / border_max_height, 1.0);
+  gl_FragColor = color + (gl_FragColor - color) * fraction;
+}

data/theme/add-workspace.svg

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="23"
-   height="15"
-   id="svg6375"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="New document 13">
-  <defs
-     id="defs6377">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective6383" />
-    <inkscape:perspective
-       id="perspective6366"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="16"
-     inkscape:cy="16"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1680"
-     inkscape:window-height="997"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata6380">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-17)">
-    <g
-       style="display:inline"
-       id="g6243"
-       transform="translate(-986.28859,-658.2796)">
-      <rect
-         style="fill:#000000;fill-opacity:0.98770495;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="rect5318"
-         width="22"
-         height="14"
-         x="986.89801"
-         y="675.86743"
-         rx="0.49999979"
-         ry="0.5" />
-      <g
-         id="g5320"
-         transform="translate(402.77304,-12.882544)">
-        <path
-           id="path5322"
-           d="m 595.125,692.53048 0,6.43903"
-           style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path
-           id="path5324"
-           d="m 598.34451,695.75 -6.43902,0"
-           style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      </g>
-    </g>
-  </g>
-</svg>

data/theme/calendar-arrow-left.svg

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r9942 custom"
+   sodipodi:docname="New document 4">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="8.984481"
+     inkscape:cy="5.6224906"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="930"
+     inkscape:window-height="681"
+     inkscape:window-x="1892"
+     inkscape:window-y="272"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid17403"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       sodipodi:type="star"
+       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.43015847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="path18028"
+       sodipodi:sides="3"
+       sodipodi:cx="84.5"
+       sodipodi:cy="337.5"
+       sodipodi:r1="5"
+       sodipodi:r2="2.5"
+       sodipodi:arg1="0.52359878"
+       sodipodi:arg2="1.5707963"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 88.830127,340 80.169873,340 84.5,332.5 z"
+       transform="matrix(0,1.3621708,0.99186247,0,-325.48222,929.32667)" />
+  </g>
+</svg>

data/theme/calendar-arrow-right.svg

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r9942 custom"
+   sodipodi:docname="arrow-left.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="7.7366092"
+     inkscape:cy="6.4536271"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="930"
+     inkscape:window-height="681"
+     inkscape:window-x="1892"
+     inkscape:window-y="272"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid17403"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       sodipodi:type="star"
+       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.43015847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="path18028"
+       sodipodi:sides="3"
+       sodipodi:cx="84.5"
+       sodipodi:cy="337.5"
+       sodipodi:r1="5"
+       sodipodi:r2="2.5"
+       sodipodi:arg1="0.52359878"
+       sodipodi:arg2="1.5707963"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 88.830127,340 80.169873,340 84.5,332.5 z"
+       transform="matrix(0,1.3621708,-0.99186247,0,342.48324,929.32667)" />
+  </g>
+</svg>

data/theme/calendar-today.svg

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="28"
+   height="25"
+   id="svg10621"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="calendar-today.svg">
+  <defs
+     id="defs10623">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient99561-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient34508-1-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop34510-1-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop34512-4-5" />
+    </linearGradient>
+    <radialGradient
+       r="42"
+       fy="30"
+       fx="51"
+       cy="30"
+       cx="51"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10592"
+       xlink:href="#linearGradient34508-1-3"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3007"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3067"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3072"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient2997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="8.3750933"
+     inkscape:cy="8.0837211"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1440"
+     inkscape:window-height="843"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata10626">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-469.08263,-536.99307)">
+    <g
+       id="g3003">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
+         transform="matrix(0.43692393,0,0,1.3783114,460.60467,517.48289)"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
+         sodipodi:ry="16"
+         sodipodi:rx="42"
+         sodipodi:cy="30"
+         sodipodi:cx="51"
+         id="path34506-3"
+         style="opacity:0.4625;color:#000000;fill:url(#radialGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="558.85046"
+         x="468.96878"
+         height="3.1425927"
+         width="28.149134"
+         id="rect2996"
+         style="fill:#ffffff;fill-opacity:0.50196078;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>

data/theme/close-window.svg

@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    id="Foreground"
    x="0px"
    y="0px"
-   width="22"
-   height="22"
-   viewBox="0 0 16 16"
+   width="32"
+   height="32"
+   viewBox="0 0 23.272727 23.272727"
    enable-background="new 0 0 16 16"
    xml:space="preserve"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48+devel r10081 custom"
    sodipodi:docname="close-window.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
    id="metadata2399"><rdf:RDF><cc:Work
@@ -37,11 +39,49 @@
      inkscape:vp_y="0 : 1000 : 0"
      inkscape:vp_z="16 : 8 : 1"
      inkscape:persp3d-origin="8 : 5.3333333 : 1"
-     id="perspective2401" /></defs><sodipodi:namedview
-   inkscape:window-height="999"
-   inkscape:window-width="1680"
+     id="perspective2401" /><filter
+     color-interpolation-filters="sRGB"
+     inkscape:collect="always"
+     id="filter16494-4"
+     x="-0.20989846"
+     width="1.4197969"
+     y="-0.20903821"
+     height="1.4180764"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="1.3282637"
+       id="feGaussianBlur16496-8" /></filter><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient16498-6"
+     id="radialGradient16504-1"
+     cx="7.6582627"
+     cy="5.8191104"
+     fx="7.6582627"
+     fy="5.8191104"
+     r="8.6928644"
+     gradientTransform="matrix(1.0474339,0,0,1.0517402,-0.3632615,-0.42032492)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient16498-6"><stop
+       style="stop-color:#7b7b7b;stop-opacity:1"
+       offset="0"
+       id="stop16500-8" /><stop
+       style="stop-color:#101010;stop-opacity:1"
+       offset="1"
+       id="stop16502-0" /></linearGradient><filter
+     color-interpolation-filters="sRGB"
+     inkscape:collect="always"
+     id="filter16524-9"
+     x="-0.212979"
+     width="1.425958"
+     y="-0.21305652"
+     height="1.426113"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.71020915"
+       id="feGaussianBlur16526-0" /></filter></defs><sodipodi:namedview
+   inkscape:window-height="1114"
+   inkscape:window-width="1463"
    inkscape:pageshadow="2"
-   inkscape:pageopacity="1"
+   inkscape:pageopacity="0"
    guidetolerance="10.0"
    gridtolerance="10.0"
    objecttolerance="10.0"
@@ -50,27 +90,63 @@
    pagecolor="#000000"
    id="base"
    showgrid="false"
-   inkscape:zoom="25.648691"
-   inkscape:cx="8.8097603"
-   inkscape:cy="9.0472789"
+   inkscape:zoom="1"
+   inkscape:cx="10.720189"
+   inkscape:cy="13.739577"
    inkscape:window-x="0"
    inkscape:window-y="26"
    inkscape:current-layer="Foreground"
    showguides="true"
-   inkscape:guide-bbox="true" />
+   inkscape:guide-bbox="true"
+   borderlayer="true"
+   inkscape:showpageshadow="false"
+   inkscape:window-maximized="0"><inkscape:grid
+     type="xygrid"
+     id="grid11246"
+     empspacing="5"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
 
 <g
-   id="g3175"><path
-     sodipodi:nodetypes="csssc"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.59217799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path2394"
-     d="M 0.83987936,8.0425327 C 0.83987936,4.0805265 4.0712155,0.86823453 8.0567103,0.86823453 C 12.042205,0.86823453 15.273542,4.0805265 15.273542,8.0425327 C 15.273542,12.004539 12.042205,15.216831 8.0567103,15.216831 C 4.0712155,15.216831 0.83987936,12.004539 0.83987936,8.0425327 z"
-     clip-rule="evenodd" /><g
-     id="g3172"><path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.67127273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 5.4242673,5.3313047 L 10.515414,10.421272 L 10.714004,10.646491"
-       id="path3152" /></g></g><path
-   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.67127273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-   d="M 5.4402527,10.650392 L 10.688082,5.3573033"
-   id="path3154"
-   sodipodi:nodetypes="cc" /></svg>
+   style="display:inline"
+   id="g16402-8"
+   transform="translate(4.7533483,2.8238929)"><g
+     id="g3175-4"><path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0"
+       inkscape:original="M 7.65625 0.125 C 3.2589349 0.125 -0.3125 3.7070002 -0.3125 8.125 C -0.3125 12.543001 3.2589349 16.125 7.65625 16.125 C 12.053566 16.125 15.625 12.543001 15.625 8.125 C 15.625 3.7070002 12.053566 0.125 7.65625 0.125 z "
+       xlink:href="#path2394-32"
+       style="opacity:0.52994014;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.18181825;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16494-4);enable-background:accumulate"
+       id="path16480-5"
+       inkscape:href="#path2394-32"
+       d="m 7.65625,0.125 c -4.3973151,0 -7.96875,3.5820002 -7.96875,8 0,4.418001 3.5714349,8 7.96875,8 4.397316,0 7.96875,-3.581999 7.96875,-8 0,-4.4179998 -3.571434,-8 -7.96875,-8 z"
+       transform="translate(0,1.028519)" /><path
+       clip-rule="evenodd"
+       d="m -0.30428257,8.1237596 c 0,-4.4179998 3.56522987,-7.9999996 7.96254497,-7.9999996 4.3973156,0 7.9625456,3.5819998 7.9625456,7.9999996 0,4.4180014 -3.56523,8.0000004 -7.9625456,8.0000004 -4.3973151,0 -7.96254497,-3.581999 -7.96254497,-8.0000004 z"
+       id="path2394-32"
+       style="color:#000000;fill:url(#radialGradient16504-1);fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1.4545455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="csssc"
+       inkscape:connector-curvature="0" /><g
+       id="g3172-6" /></g><g
+     transform="matrix(0.72727273,0,0,0.72727273,2.368236,2.1803254)"
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g27275-6-6"
+     inkscape:label="window-close"><g
+       style="fill:#ffffff;fill-opacity:1;display:inline"
+       id="g27277-1-1"
+       transform="translate(-41,-760)"><path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0"
+         inkscape:original="M 44.21875 764.1875 L 44.21875 765.1875 C 44.19684 765.46825 44.289258 765.74287 44.5 765.9375 L 46.78125 768.21875 L 44.5 770.46875 C 44.31181 770.65692 44.218747 770.92221 44.21875 771.1875 L 44.21875 772.1875 L 45.21875 772.1875 C 45.48404 772.1875 45.749336 772.09444 45.9375 771.90625 L 48.21875 769.625 L 50.5 771.90625 C 50.688164 772.0944 50.953449 772.18749 51.21875 772.1875 L 52.21875 772.1875 L 52.21875 771.1875 C 52.218742 770.9222 52.125688 770.65692 51.9375 770.46875 L 49.6875 768.21875 L 51.96875 765.9375 C 52.18441 765.73815 52.21875 765.47397 52.21875 765.1875 L 52.21875 764.1875 L 51.21875 764.1875 C 50.977922 764.1945 50.796875 764.2695 50.53125 764.5 L 48.21875 766.78125 L 45.9375 764.5 C 45.75987 764.31608 45.504951 764.1987 45.25 764.1875 C 45.23954 764.18704 45.22912 764.18738 45.21875 764.1875 L 44.21875 764.1875 z "
+         xlink:href="#path27279-0-5"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16524-9);enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+         id="path16506-5"
+         inkscape:href="#path27279-0-5"
+         d="m 44.21875,764.1875 0,1 c -0.02191,0.28075 0.07051,0.55537 0.28125,0.75 l 2.28125,2.28125 -2.28125,2.25 c -0.18819,0.18817 -0.281253,0.45346 -0.28125,0.71875 l 0,1 1,0 c 0.26529,0 0.530586,-0.0931 0.71875,-0.28125 L 48.21875,769.625 50.5,771.90625 c 0.188164,0.18815 0.453449,0.28124 0.71875,0.28125 l 1,0 0,-1 c -8e-6,-0.2653 -0.09306,-0.53058 -0.28125,-0.71875 l -2.25,-2.25 2.28125,-2.28125 c 0.21566,-0.19935 0.25,-0.46353 0.25,-0.75 l 0,-1 -1,0 c -0.240828,0.007 -0.421875,0.082 -0.6875,0.3125 l -2.3125,2.28125 L 45.9375,764.5 c -0.17763,-0.18392 -0.432549,-0.3013 -0.6875,-0.3125 -0.01046,-4.6e-4 -0.02088,-1.2e-4 -0.03125,0 l -1,0 z"
+         transform="translate(0,1.3535534)" /><path
+         sodipodi:nodetypes="ccsccccccccccccccccccccccc"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
+         id="path27279-0-5"
+         inkscape:connector-curvature="0"
+         d="m 44.226475,764.17222 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 l 2.28125,2.28125 2.3125,-2.28125 c 0.265625,-0.2305 0.446672,-0.3055 0.6875,-0.3125 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 c 0.188188,0.18817 0.281242,0.45345 0.28125,0.71875 l 0,1 -1,0 c -0.265301,-1e-5 -0.530586,-0.0931 -0.71875,-0.28125 l -2.28125,-2.28125 -2.28125,2.28125 c -0.188164,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 -2.28125,-2.28125 c -0.210742,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 l 0,-1 z" /></g></g></g></svg>

data/theme/dash-placeholder.svg

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="76"
+   height="27"
+   id="svg11252"
+   version="1.1">
+  <defs
+     id="defs11254">
+    <radialGradient
+       xlink:href="#linearGradient39563-4-2"
+       id="radialGradient68155-2-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.3486842,0,317.8421)"
+       cx="49"
+       cy="488"
+       fx="49"
+       fy="488"
+       r="38" />
+    <linearGradient
+       id="linearGradient39563-4-2">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop39565-1-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop39567-7-9" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient39573-6-1"
+       id="radialGradient68157-0-8"
+       gradientUnits="userSpaceOnUse"
+       cx="50.5"
+       cy="487.5"
+       fx="50.5"
+       fy="487.5"
+       r="10.5" />
+    <linearGradient
+       id="linearGradient39573-6-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop39575-5-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop39577-1-2" />
+    </linearGradient>
+  </defs>
+  <g
+     id="layer1"
+     transform="translate(-337,-518.86218)">
+    <g
+       id="g99967"
+       style="display:inline"
+       transform="translate(326,44.862171)">
+      <rect
+         style="opacity:0.49375;color:#000000;fill:url(#radialGradient68155-2-3);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect99969"
+         width="76"
+         height="2"
+         x="11"
+         y="487"
+         rx="0"
+         ry="0" />
+      <path
+         style="opacity:0.43125;color:#000000;fill:url(#radialGradient68157-0-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path99971"
+         d="M 61,487.5 C 61,493.29899 56.29899,498 50.5,498 44.70101,498 40,493.29899 40,487.5 40,481.70101 44.70101,477 50.5,477 c 5.79899,0 10.5,4.70101 10.5,10.5 z"
+         transform="matrix(1.2857143,0,0,1.2857143,-14.428572,-139.28571)" />
+      <path
+         transform="matrix(0.43589747,0,0,0.43589747,28.487179,275)"
+         d="M 61,487.5 C 61,493.29899 56.29899,498 50.5,498 44.70101,498 40,493.29899 40,487.5 40,481.70101 44.70101,477 50.5,477 c 5.79899,0 10.5,4.70101 10.5,10.5 z"
+         id="path99973"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

data/theme/dialog-error.svg

@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg4908"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="dialog-error.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gnome-icon-theme/scalable/actions/process-stop.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   version="1.0">
-  <defs
-     id="defs4910">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective25" />
-    <radialGradient
-       gradientTransform="matrix(1.349881,0,0,1.349881,-3.498814,-1.810859)"
-       gradientUnits="userSpaceOnUse"
-       r="9.7183542"
-       fy="4.9892726"
-       fx="9.6893959"
-       cy="4.9892726"
-       cx="9.6893959"
-       id="radialGradient5177"
-       xlink:href="#linearGradient5171"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(2.417917,0,0,2.417917,-14.17917,-4.903184)"
-       gradientUnits="userSpaceOnUse"
-       r="9.7785711"
-       fy="3.458019"
-       fx="10"
-       cy="3.458019"
-       cx="10"
-       id="radialGradient5157"
-       xlink:href="#linearGradient5151"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.928125,0,0,0.3143011,0.7718789,12.358015)"
-       r="9.0598059"
-       fy="18.022524"
-       fx="10.739184"
-       cy="18.022524"
-       cx="10.739184"
-       id="radialGradient5145"
-       xlink:href="#linearGradient5139"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient5139"
-       inkscape:collect="always">
-      <stop
-         id="stop5141"
-         offset="0"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         id="stop5143"
-         offset="1"
-         style="stop-color:black;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5151"
-       inkscape:collect="always">
-      <stop
-         id="stop5153"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5155"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5171">
-      <stop
-         id="stop5173"
-         offset="0"
-         style="stop-color:#fe3a00;stop-opacity:1" />
-      <stop
-         id="stop5175"
-         offset="1"
-         style="stop-color:#c00;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="24.442987"
-     inkscape:cy="10.142308"
-     inkscape:current-layer="g7001"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1674"
-     inkscape:window-height="970"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     width="48px"
-     height="48px"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4913">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Stop Process</dc:title>
-        <dc:date>December 2006</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>stop</rdf:li>
-            <rdf:li>halt</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-24)">
-    <g
-       inkscape:label="Layer 1"
-       id="g7001"
-       transform="matrix(1.4566048,0,0,1.4455352,0.4112881,1.2324709)">
-      <path
-         transform="matrix(0.91468137,0,0,0.70055266,-1.8812476,17.474032)"
-         d="m 19.79899,18.022524 a 9.0598059,3.0935922 0 1 1 -18.1196115,0 9.0598059,3.0935922 0 1 1 18.1196115,0 z"
-         sodipodi:ry="3.0935922"
-         sodipodi:rx="9.0598059"
-         sodipodi:cy="18.022524"
-         sodipodi:cx="10.739184"
-         id="path5137"
-         style="color:#000000;fill:url(#radialGradient5145);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.87347736,0,0,0.83068052,-0.79308842,15.602788)"
-         d="m 19.25,9.625 a 9.25,9.25 0 1 1 -18.5,0 9.25,9.25 0 1 1 18.5,0 z"
-         sodipodi:ry="9.25"
-         sodipodi:rx="9.25"
-         sodipodi:cy="9.625"
-         sodipodi:cx="10"
-         id="path4262"
-         style="color:#000000;fill:url(#radialGradient5177);fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:0.47435912;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.35393258;color:#000000;fill:none;stroke:url(#radialGradient5157);stroke-width:0.49999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         id="path5149"
-         sodipodi:cx="10"
-         sodipodi:cy="9.625"
-         sodipodi:rx="9.25"
-         sodipodi:ry="9.25"
-         d="m 19.25,9.625 a 9.25,9.25 0 1 1 -18.5,0 9.25,9.25 0 1 1 18.5,0 z"
-         transform="matrix(0.82868359,0,0,0.78808147,-0.34515141,16.012803)" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path5159"
-         d="m 4.834121,20.642783 6.215127,5.91061"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.21219134;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.21219146;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         d="M 11.04925,20.622826 4.8159529,26.553393"
-         id="path5161"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>

data/theme/filter-selected-ltr.svg

@@ -9,23 +9,23 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="23"
-   height="15"
-   id="svg5501"
+   width="10"
+   height="20"
+   id="svg10003"
    version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="add-workspace.svg">
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="filter-selected.svg">
   <defs
-     id="defs5503">
+     id="defs10005">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_x="0 : 32 : 1"
        inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective5509" />
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective10011" />
     <inkscape:perspective
-       id="perspective5314"
+       id="perspective9998"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
        inkscape:vp_z="1 : 0.5 : 1"
        inkscape:vp_y="0 : 1000 : 0"
@@ -39,29 +39,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="-0.074583208"
-     inkscape:cy="16"
+     inkscape:zoom="5.5"
+     inkscape:cx="32"
+     inkscape:cy="10.181818"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:grid-bbox="true"
      inkscape:document-units="px"
+     inkscape:grid-bbox="true"
      inkscape:window-width="1680"
-     inkscape:window-height="997"
+     inkscape:window-height="994"
      inkscape:window-x="0"
      inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox="true" />
+     inkscape:window-maximized="1" />
   <metadata
-     id="metadata5506">
+     id="metadata10008">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -69,24 +67,15 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     transform="translate(0,-17)">
-    <g
-       style="display:inline"
-       id="g6239"
-       transform="translate(-953.97989,-657.32287)">
-      <rect
-         style="fill:#000000;fill-opacity:0.98770495;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="rect5318-6"
-         width="22"
-         height="14"
-         x="954.5"
-         y="675"
-         rx="0.49999979"
-         ry="0.5" />
-      <path
-         style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         d="m 968.71951,682 -6.43902,0"
-         id="path5324-5" />
-    </g>
+     transform="translate(0,-44)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/app-picker.png"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="rect34320"
+       d="m -0.18726572,54.181804 10.55634072,10.55636 10e-6,-21.11269 z"
+       style="opacity:0.21000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
 </svg>

data/theme/filter-selected-rtl.svg

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="20"
+   id="svg10003"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="filter-selected-ltr.svg">
+  <defs
+     id="defs10005">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective10011" />
+    <inkscape:perspective
+       id="perspective9998"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="32.363636"
+     inkscape:cy="10.181818"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="839"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata10008">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-44)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/app-picker.png"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="rect34320"
+       d="m 10.369085,54.181804 -10.55634072,10.55636 -1e-5,-21.11269 z"
+       style="opacity:0.21000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>

data/theme/panel-border.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="3"
+   height="10"
+   id="svg2"
+   version="1.1">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke-width:0.43599999000000000;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3779"
+       width="3"
+       height="10"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#536272;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3796"
+       width="3"
+       height="1"
+       x="0"
+       y="9" />
+  </g>
+</svg>

data/theme/panel-button-border.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="panel-button-border.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="44.8"
+     inkscape:cx="8.6594891"
+     inkscape:cy="5.7029946"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="843"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     guidetolerance="10000"
+     objecttolerance="10000">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3792"
+       empspacing="10"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3796"
+       width="3"
+       height="2"
+       x="9"
+       y="8" />
+  </g>
+</svg>

data/theme/panel-button-highlight-narrow.svg

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="30"
+   height="25"
+   id="svg10621"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="panel-button-highlight-narrow.svg">
+  <defs
+     id="defs10623">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient99561-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient34508-1-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop34510-1-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop34512-4-5" />
+    </linearGradient>
+    <radialGradient
+       r="42"
+       fy="30"
+       fx="51"
+       cy="30"
+       cx="51"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10592"
+       xlink:href="#linearGradient34508-1-3"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="-171.36384"
+     inkscape:cy="-53.255157"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1440"
+     inkscape:window-height="843"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata10626">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-468.08632,-537.03477)">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.4625;color:#000000;fill:url(#radialGradient10592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path34506-3"
+       sodipodi:cx="51"
+       sodipodi:cy="30"
+       sodipodi:rx="42"
+       sodipodi:ry="16"
+       d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
+       sodipodi:start="3.1415927"
+       sodipodi:end="6.2831853"
+       transform="matrix(0.35714286,0,0,1.5625,464.87203,515.15977)"
+       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>

data/theme/panel-button-highlight-wide.svg

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="84"
+   height="25"
+   id="svg10621"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="panel-button-highlight-wide.svg">
+  <defs
+     id="defs10623">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient99561-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient34508-1-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop34510-1-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop34512-4-5" />
+    </linearGradient>
+    <radialGradient
+       r="42"
+       fy="30"
+       fx="51"
+       cy="30"
+       cx="51"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10592"
+       xlink:href="#linearGradient34508-1-3"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="-118.50071"
+     inkscape:cy="27.304508"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1440"
+     inkscape:window-height="843"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata10626">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-441.08632,-537.03477)">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.4625;color:#000000;fill:url(#radialGradient10592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path34506-3"
+       sodipodi:cx="51"
+       sodipodi:cy="30"
+       sodipodi:rx="42"
+       sodipodi:ry="16"
+       d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
+       sodipodi:start="3.1415927"
+       sodipodi:end="6.2831853"
+       transform="matrix(1,0,0,1.5625,432.08632,515.15977)"
+       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>

data/theme/process-working.svg

@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg5369"
+   version="1.1"
+   inkscape:version="0.48+devel r10053 custom"
+   width="96"
+   height="48"
+   sodipodi:docname="process-working.svg"
+   style="display:inline">
+  <metadata
+     id="metadata5375">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5373" />
+  <sodipodi:namedview
+     pagecolor="#808080"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1975"
+     inkscape:window-height="1098"
+     id="namedview5371"
+     showgrid="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:zoom="16"
+     inkscape:cx="53.997662"
+     inkscape:cy="22.367695"
+     inkscape:window-x="1600"
+     inkscape:window-y="33"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11933"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="tiles"
+     style="display:none">
+    <rect
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12451"
+       width="24"
+       height="24"
+       x="0"
+       y="0" />
+    <rect
+       y="24"
+       x="0"
+       height="24"
+       width="24"
+       id="rect12453"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       y="0"
+       x="24"
+       height="24"
+       width="24"
+       id="rect12455"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12457"
+       width="24"
+       height="24"
+       x="24"
+       y="24" />
+    <rect
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12459"
+       width="24"
+       height="24"
+       x="48"
+       y="0" />
+    <rect
+       y="24"
+       x="48"
+       height="24"
+       width="24"
+       id="rect12461"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       y="0"
+       x="72"
+       height="24"
+       width="24"
+       id="rect12463"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12465"
+       width="24"
+       height="24"
+       x="72"
+       y="24" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="spinner">
+    <g
+       transform="matrix(0.28240106,0,0,0.28240106,146.92015,-382.52444)"
+       id="g10450-5"
+       style="display:inline">
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:0.6;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -477.76072,1373.3569 0,9.4717"
+         id="path18768"
+         sodipodi:nodetypes="cc"
+         inkscape:transform-center-y="-4.6808838" />
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:transform-center-y="-3.3099227"
+         sodipodi:nodetypes="cc"
+         id="path18770"
+         d="m -461.0171,1380.2922 -7.23427,7.3824"
+         style="opacity:0.7;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="-3.3098966" />
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:transform-center-x="-4.6808962"
+         style="opacity:0.8;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -454.08163,1397.0359 -9.47165,0"
+         id="path18772"
+         sodipodi:nodetypes="cc"
+         inkscape:transform-center-y="-2.6596956e-05" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path18774"
+         d="m -461.01709,1413.7796 -6.93831,-7.0864"
+         style="opacity:0.9;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="-3.3098966"
+         inkscape:transform-center-y="3.3098652" />
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:transform-center-y="4.6808757"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -477.76074,1420.715 9e-5,-9.4716"
+         id="path18776"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path18778"
+         d="m -494.50442,1413.7796 6.79048,-6.9384"
+         style="opacity:0.3;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-y="3.3098769"
+         inkscape:transform-center-x="3.3098883" />
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:transform-center-x="4.6808941"
+         style="opacity:0.4;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -501.43987,1397.0359 9.47174,0"
+         id="path18780"
+         sodipodi:nodetypes="cc"
+         inkscape:transform-center-y="-2.6596956e-05" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path18782"
+         d="m -494.5044,1380.2922 6.64243,6.9384"
+         style="opacity:0.5;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="3.3098902"
+         inkscape:transform-center-y="-3.3099302" />
+    </g>
+    <use
+       style="display:inline"
+       x="0"
+       y="0"
+       xlink:href="#g10450-5"
+       id="use4981"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,36,-4.9705636)"
+       width="400"
+       height="400" />
+    <use
+       style="display:inline"
+       x="0"
+       y="0"
+       xlink:href="#use4981"
+       id="use4983"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,43.032478,-21.909695)"
+       width="400"
+       height="400" />
+    <use
+       style="display:inline"
+       x="0"
+       y="0"
+       xlink:href="#use4983"
+       id="use4985"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,50.081986,-38.904617)"
+       width="400"
+       height="400" />
+    <use
+       style="display:inline"
+       x="0"
+       y="0"
+       xlink:href="#use4985"
+       id="use4987"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,-38.919996,-31.872139)"
+       width="400"
+       height="400" />
+    <use
+       style="display:inline"
+       x="0"
+       y="0"
+       xlink:href="#use4987"
+       id="use4989"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,52.986628,2.0890543)"
+       width="400"
+       height="400" />
+    <use
+       style="display:inline"
+       x="0"
+       y="0"
+       xlink:href="#use4989"
+       id="use4991"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,60.013026,-14.912936)"
+       width="400"
+       height="400" />
+    <use
+       style="display:inline"
+       x="0"
+       y="0"
+       xlink:href="#use4991"
+       id="use4993"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,67.022396,-31.859127)"
+       width="400"
+       height="400" />
+  </g>
+</svg>

data/theme/running-indicator.svg

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="119.97824"
+   height="119.97824"
+   id="svg7355"
+   version="1.1">
+  <defs
+     id="defs7357">
+    <radialGradient
+       xlink:href="#linearGradient36429"
+       id="radialGradient7461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0525552,0,0,1.0525552,-2.5162753,-9.0000838)"
+       cx="47.878681"
+       cy="171.25"
+       fx="47.878681"
+       fy="171.25"
+       r="37" />
+    <linearGradient
+       id="linearGradient36429">
+      <stop
+         id="stop36431"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop36433"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient36471"
+       id="radialGradient7463"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891549,0,0,0.55513246,-9.281289,36.12653)"
+       cx="49.067139"
+       cy="242.50381"
+       fx="49.067139"
+       fy="242.50381"
+       r="37.00671" />
+    <linearGradient
+       id="linearGradient36471">
+      <stop
+         id="stop36473"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop36475"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="37.00671"
+       fy="242.50381"
+       fx="49.067139"
+       cy="242.50381"
+       cx="49.067139"
+       gradientTransform="matrix(1.1891549,0,0,0.55513246,-9.281289,36.12653)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7488"
+       xlink:href="#linearGradient36471" />
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(1.6213276,0,0,1.6213276,-431.6347,-272.5745)">
+    <g
+       style="display:inline"
+       id="g30864"
+       transform="translate(255.223,70.118091)">
+      <rect
+         ry="3.5996203"
+         rx="3.5996203"
+         y="98"
+         x="11"
+         height="74"
+         width="74"
+         id="rect14000"
+         style="opacity:0.371875;fill:url(#radialGradient7461);fill-opacity:1;stroke:none" />
+      <path
+         id="rect34520"
+         d="m 84.506708,167.95508 c 6e-6,1.96759 -1.584022,3.55162 -3.551629,3.55163 l -65.910146,0 c -1.967608,-1e-5 -3.551648,-1.58402 -3.551643,-3.55164"
+         style="opacity:0.2;fill:none;stroke:url(#radialGradient7488);stroke-width:1;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

data/theme/section-back.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" id="Foreground" x="0px" y="0px" width="12" height="16" viewBox="0 0 12 16" enable-background="new 0 0 29 18" xml:space="preserve" sodipodi:version="0.32" inkscape:version="0.46+devel" sodipodi:docname="back.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata id="metadata16"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs id="defs14"><inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 9 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="29 : 9 : 1" inkscape:persp3d-origin="14.5 : 6 : 1" id="perspective18"/></defs><sodipodi:namedview inkscape:window-height="728" inkscape:window-width="1103" inkscape:pageshadow="2" inkscape:pageopacity="1" guidetolerance="10.0" gridtolerance="10.0" objecttolerance="10.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#000000" id="base" showgrid="true" inkscape:zoom="27.260185" inkscape:cx="12.592456" inkscape:cy="8.2696842" inkscape:window-x="145" inkscape:window-y="38" inkscape:current-layer="Foreground" inkscape:snap-global="true" showguides="false"><inkscape:grid type="xygrid" id="grid2391" empspacing="5" visible="true" enabled="true" snapvisiblegridlinesonly="true"/></sodipodi:namedview>
-
-
-
-<path style="fill: rgb(255, 255, 255); fill-opacity: 1; stroke: none;" d="M 10,2 10,14 2,8 10,2 z" id="path43"/></svg>

data/theme/source-button-border.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="source-button-border.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="44.8"
+     inkscape:cx="8.704132"
+     inkscape:cy="5.7029946"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="1145"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     guidetolerance="10000"
+     objecttolerance="10000">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3792"
+       empspacing="10"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3796"
+       width="19"
+       height="2"
+       x="1"
+       y="8" />
+  </g>
+</svg>

data/theme/toggle-off-intl.svg

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="22"
+   id="svg3273"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 14">
+  <defs
+     id="defs3275">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3281" />
+    <inkscape:perspective
+       id="perspective3261"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="32.000004"
+     inkscape:cy="10.999997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3278">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-343,-521.36218)">
+    <g
+       id="g17454"
+       transform="translate(-453,448.36218)"
+       style="display:inline">
+      <rect
+         transform="scale(-1,1)"
+         ry="4"
+         rx="4"
+         y="74.5"
+         x="-859.5"
+         height="19"
+         width="63.000004"
+         id="rect17456"
+         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         transform="scale(-1,1)"
+         ry="4"
+         rx="4"
+         y="74"
+         x="-828"
+         height="20"
+         width="31"
+         id="rect17458"
+         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+      <g
+         transform="matrix(-1,0,0,1,1619.1239,-33.986291)"
+         id="g17460"
+         style="display:inline">
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 803.6322,115.48629 0,4.29495"
+           id="path17462"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="m 806.62805,115.48629 0,4.29495"
+           id="path17464"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="m 809.6239,115.48629 0,4.29495"
+           id="path17466"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.96875012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path18722"
+         sodipodi:cx="47.6875"
+         sodipodi:cy="11.5625"
+         sodipodi:rx="3.9375"
+         sodipodi:ry="3.9375"
+         d="m 51.625,11.5625 c 0,2.174621 -1.762879,3.9375 -3.9375,3.9375 -2.174621,0 -3.9375,-1.762879 -3.9375,-3.9375 0,-2.1746212 1.762879,-3.9375 3.9375,-3.9375 2.174621,0 3.9375,1.7628788 3.9375,3.9375 z"
+         transform="matrix(1.0158729,0,0,1.0158729,795.55556,72.25399)" />
+    </g>
+  </g>
+</svg>

data/theme/toggle-off-us.svg

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="22"
+   id="svg3012"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 6">
+  <defs
+     id="defs3014">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3020" />
+    <inkscape:perspective
+       id="perspective2997"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="32.000004"
+     inkscape:cy="10.999997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3017">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-343,-521.36218)">
+    <g
+       id="g17454"
+       transform="translate(-453,448.36218)"
+       style="display:inline">
+      <rect
+         transform="scale(-1,1)"
+         ry="4"
+         rx="4"
+         y="74.5"
+         x="-859.5"
+         height="19"
+         width="63.000004"
+         id="rect17456"
+         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         transform="scale(-1,1)"
+         ry="4"
+         rx="4"
+         y="74"
+         x="-828"
+         height="20"
+         width="31"
+         id="rect17458"
+         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+      <g
+         transform="matrix(-1,0,0,1,1619.1239,-33.986291)"
+         id="g17460"
+         style="display:inline">
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 803.6322,115.48629 0,4.29495"
+           id="path17462"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="m 806.62805,115.48629 0,4.29495"
+           id="path17464"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="m 809.6239,115.48629 0,4.29495"
+           id="path17466"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="font-size:8.95877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         id="text17468"
+         transform="translate(0.34375,0)">
+        <path
+           d="m 837.28518,80.750726 c 0.63282,6e-6 1.19566,0.123947 1.68852,0.371824 0.49284,0.247888 0.8807,0.609505 1.16359,1.084851 0.28287,0.472439 0.42431,1.022155 0.42431,1.649149 0,0.635748 -0.13853,1.200045 -0.41556,1.692892 -0.27706,0.489934 -0.66638,0.870507 -1.16797,1.141719 -0.5016,0.271213 -1.07756,0.406819 -1.72789,0.406819 -0.42869,0 -0.83551,-0.06562 -1.22045,-0.196848 -0.38495,-0.134148 -0.73053,-0.32808 -1.03674,-0.581795 -0.30329,-0.256631 -0.54534,-0.589085 -0.72615,-0.997363 -0.17789,-0.408276 -0.26684,-0.869045 -0.26683,-1.382311 -10e-6,-0.638658 0.13997,-1.200039 0.41994,-1.684144 0.27996,-0.487011 0.66782,-0.858835 1.16359,-1.115472 0.49576,-0.259541 1.06297,-0.389315 1.70164,-0.389321 m 0.57305,1.089225 c -0.20123,-0.05249 -0.40683,-0.07873 -0.61679,-0.07874 -0.20998,5e-6 -0.41412,0.02625 -0.61242,0.07874 -0.19831,0.04958 -0.38933,0.129779 -0.57305,0.240592 -0.18081,0.107907 -0.33974,0.242055 -0.47681,0.402445 -0.13706,0.160399 -0.24642,0.358705 -0.32808,0.594918 -0.0816,0.233306 -0.12248,0.491395 -0.12248,0.774269 0,0.67366 0.20851,1.214627 0.62554,1.622903 0.41702,0.408278 0.93758,0.612416 1.56166,0.612416 0.25954,0 0.51034,-0.04229 0.7524,-0.126858 0.24496,-0.08457 0.47097,-0.20997 0.67803,-0.376198 0.20705,-0.166226 0.37328,-0.392236 0.49868,-0.678032 0.12539,-0.285792 0.18809,-0.610956 0.1881,-0.975492 -10e-6,-0.297455 -0.0437,-0.568668 -0.13123,-0.813638 -0.0875,-0.247878 -0.20415,-0.453475 -0.34995,-0.61679 -0.14291,-0.163307 -0.31059,-0.301829 -0.50306,-0.415568 -0.18956,-0.11373 -0.38641,-0.195385 -0.59054,-0.244967"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18599"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 843.5362,81.831203 0,1.17917 2.94834,0 0,1.014861 -2.94834,0 0,3.00713 -1.10673,0 0,-6.216022 4.31754,0 0,1.014861 -3.21081,0"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18601"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc" />
+        <path
+           d="m 849.71285,81.831203 0,1.17917 2.94834,0 0,1.014861 -2.94834,0 0,3.00713 -1.10672,0 0,-6.216022 4.31753,0 0,1.014861 -3.21081,0"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18603"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc" />
+      </g>
+    </g>
+  </g>
+</svg>

data/theme/toggle-on-intl.svg

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg3199"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 11">
+  <defs
+     id="defs3201">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3207" />
+    <inkscape:perspective
+       id="perspective3187"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="32.500004"
+     inkscape:cy="10.999997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3204">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-342.5,-521.36218)">
+    <g
+       style="display:inline"
+       transform="translate(-453.5,448.36218)"
+       id="g16453">
+      <rect
+         style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect16256-9-4"
+         width="63.000004"
+         height="19"
+         x="-859.5"
+         y="74.5"
+         rx="4"
+         ry="4"
+         transform="scale(-1,1)" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+         id="rect16258-5-4"
+         width="31"
+         height="20"
+         x="-860"
+         y="74"
+         rx="4"
+         ry="4"
+         transform="scale(-1,1)" />
+      <g
+         style="display:inline"
+         id="g16298-3-6"
+         transform="matrix(-1,0,0,1,1651.1322,-33.986291)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-3-5"
+           d="m 803.6322,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-0-2-0"
+           d="m 806.62805,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-8-7-1"
+           d="m 809.6239,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+      </g>
+      <path
+         style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 16,27.9375 0,10.125"
+         id="path19232"
+         inkscape:connector-curvature="0"
+         transform="translate(796,51.00002)" />
+    </g>
+  </g>
+</svg>

data/theme/toggle-on-us.svg

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg2857"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs2859">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2865" />
+    <inkscape:perspective
+       id="perspective2843"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-69.642856"
+     inkscape:cy="42.428569"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2862">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-444.64286,-781.36218)">
+    <g
+       style="display:inline"
+       transform="translate(-351.35714,708.36218)"
+       id="g16453">
+      <rect
+         style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect16256-9-4"
+         width="63.000004"
+         height="19"
+         x="-859.5"
+         y="74.5"
+         rx="4"
+         ry="4"
+         transform="scale(-1,1)" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+         id="rect16258-5-4"
+         width="31"
+         height="20"
+         x="-860"
+         y="74"
+         rx="4"
+         ry="4"
+         transform="scale(-1,1)" />
+      <g
+         style="display:inline"
+         id="g16298-3-6"
+         transform="matrix(-1,0,0,1,1651.1322,-33.986291)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-3-5"
+           d="m 803.6322,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-0-2-0"
+           d="m 806.62805,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-8-7-1"
+           d="m 809.6239,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+      </g>
+      <g
+         style="font-size:8.95877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         id="text42229-3-0">
+        <path
+           d="m 808.01473,80.573953 c 0.63283,6e-6 1.19567,0.123947 1.68852,0.371824 0.49284,0.247888 0.88071,0.609505 1.16359,1.084851 0.28287,0.472439 0.42431,1.022155 0.42432,1.649149 -10e-6,0.635748 -0.13853,1.200045 -0.41557,1.692892 -0.27705,0.489934 -0.66637,0.870506 -1.16796,1.141719 -0.50161,0.271212 -1.07757,0.406819 -1.72789,0.406819 -0.4287,0 -0.83552,-0.06562 -1.22046,-0.196848 -0.38495,-0.134148 -0.73053,-0.32808 -1.03673,-0.581795 -0.3033,-0.256631 -0.54535,-0.589085 -0.72615,-0.997363 -0.1779,-0.408276 -0.26684,-0.869045 -0.26684,-1.382311 0,-0.638658 0.13998,-1.200039 0.41994,-1.684144 0.27996,-0.487011 0.66782,-0.858835 1.16359,-1.115472 0.49576,-0.259541 1.06298,-0.389315 1.70164,-0.389321 m 0.57305,1.089225 c -0.20123,-0.05249 -0.40682,-0.07873 -0.61679,-0.07874 -0.20998,5e-6 -0.41411,0.02625 -0.61242,0.07874 -0.19831,0.04958 -0.38932,0.129779 -0.57304,0.240592 -0.18081,0.107907 -0.33975,0.242055 -0.47681,0.402445 -0.13707,0.160399 -0.24643,0.358705 -0.32808,0.594918 -0.0817,0.233305 -0.12249,0.491395 -0.12249,0.774269 0,0.67366 0.20851,1.214627 0.62554,1.622902 0.41703,0.408279 0.93758,0.612417 1.56166,0.612416 0.25955,10e-7 0.51035,-0.04228 0.7524,-0.126857 0.24496,-0.08457 0.47097,-0.20997 0.67803,-0.376199 0.20705,-0.166225 0.37328,-0.392236 0.49868,-0.678031 0.1254,-0.285792 0.1881,-0.610956 0.1881,-0.975492 0,-0.297455 -0.0437,-0.568668 -0.13123,-0.813638 -0.0875,-0.247878 -0.20414,-0.453475 -0.34995,-0.61679 -0.1429,-0.163307 -0.31059,-0.301829 -0.50306,-0.415568 -0.18956,-0.11373 -0.38641,-0.195385 -0.59054,-0.244967"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18606" />
+        <path
+           d="m 813.15903,80.639569 1.21608,0 3.4689,4.776844 0,-4.776844 1.10235,0 0,6.216022 -1.22921,0 -3.45577,-4.785594 0,4.785594 -1.10235,0 0,-6.216022"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18608" />
+      </g>
+    </g>
+  </g>
+</svg>

data/theme/ws-switch-arrow-down.svg

@@ -2,13 +2,51 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="96"
    height="96"
-   id="svg25070">
+   id="svg25070"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="ws-switch-arrow-down.svg">
+  <metadata
+     id="metadata3353">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="718"
+     inkscape:window-height="480"
+     id="namedview3351"
+     showgrid="false"
+     inkscape:zoom="2.6979167"
+     inkscape:cx="48"
+     inkscape:cy="48"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg25070" />
   <defs
      id="defs25072">
     <linearGradient
@@ -288,7 +326,7 @@
     </filter>
   </defs>
   <g
-     transform="translate(0,48)"
+     transform="matrix(0,1,-1,0,48.0003,4.1307112e-7)"
      id="layer1">
     <g
        transform="matrix(-2,0,0,2,-97.2497,-374.967)"
@@ -297,35 +335,42 @@
       <path
          d="m -72.5,173.5 -14,14 14,14"
          id="path3165-7-3"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
     </g>
     <path
        d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
        transform="matrix(-3.34328,0,0,3.34328,-89.2797,-623.176)"
        id="path4050-2-7-9-4"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible" />
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
     <path
        d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
        transform="matrix(-3.34328,0,0,3.34328,-111.2797,-623.176)"
        id="path4050-2-7-9-4-8"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible" />
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
     <path
        d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
        transform="matrix(-2.86565,0,0,2.86565,-70.8457,-534.143)"
        id="path4050-2-7-9-4-0"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
     <path
        d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
        transform="matrix(-2.86565,0,0,2.86565,-92.8457,-534.143)"
        id="path4050-2-7-9-4-0-9"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
     <path
        d="m 47.87528,-34.0295 c 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25 -32.25,32.25 c -2.2253,2.2253 -6.2747,2.2253 -8.5,0 -2.2253,-2.22528 -2.2253,-6.2747 0,-8.5 l 23.75,-23.75 -23.75,-23.75 c -1.73168,-1.6731 -2.295,-4.44228 -1.3546,-6.65894 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 z"
        id="path3165-7-3-1"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
+       inkscape:connector-curvature="0" />
     <path
        d="m 41.8316,28.09418 c -0.014,-1.58898 0.54158,-3.18406 1.66868,-4.31118 l 23.75,-23.75 m -25.1046,-30.40894 c 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25"
        id="path3165-7-3-1-9"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>

data/theme/ws-switch-arrow-left.svg

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="96" height="96" id="svg25070" version="1.1" inkscape:version="0.47 r22583" sodipodi:docname="dark-arrow-larger.svg">
-  <defs id="defs25072">
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 24 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="48 : 24 : 1" inkscape:persp3d-origin="24 : 16 : 1" id="perspective25078"/>
-    <inkscape:perspective id="perspective24985" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4034-0-4" id="linearGradient24957" gradientUnits="userSpaceOnUse" gradientTransform="translate(6)" x1="-86.552246" y1="185.439" x2="-83.37072" y2="197.31261"/>
-    <linearGradient inkscape:collect="always" id="linearGradient4034-0-4">
-      <stop style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" offset="0" id="stop4036-5-7"/>
-      <stop style="stop-color: rgb(186, 189, 182); stop-opacity: 1;" offset="1" id="stop4038-9-6"/>
-    </linearGradient>
-    <filter id="filter24765" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
-      <feColorMatrix id="feColorMatrix24767" type="saturate" values="1" result="fbSourceGraphic"/>
-      <feColorMatrix id="feColorMatrix24769" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
-    </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4632-1-3-9-3-2" id="linearGradient24955" gradientUnits="userSpaceOnUse" gradientTransform="translate(-5)" x1="-74.520325" y1="169.06032" x2="-74.520325" y2="205.94189"/>
-    <linearGradient id="linearGradient4632-1-3-9-3-2">
-      <stop style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" offset="0" id="stop4634-1-8-3-9-0"/>
-      <stop id="stop4636-1-9-9-8-8" offset="0.0274937" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
-      <stop id="stop4638-8-3-9-6-6" offset="0.274937" style="stop-color: rgb(242, 242, 242); stop-opacity: 1;"/>
-      <stop id="stop4640-8-5-7-8-9" offset="0.38707438" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
-      <stop id="stop4642-5-41-9-6-9" offset="0.66528589" style="stop-color: rgb(217, 218, 216); stop-opacity: 1;"/>
-      <stop id="stop4644-5-2-7-9-2" offset="0.76745707" style="stop-color: rgb(223, 224, 221); stop-opacity: 1;"/>
-      <stop style="stop-color: rgb(240, 240, 240); stop-opacity: 1;" offset="1" id="stop4646-3-2-3-7-3"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4869-4-1" id="radialGradient24959" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)" cx="-33.412369" cy="185.74171" fx="-33.412369" fy="185.74171" r="2.3554697"/>
-    <linearGradient id="linearGradient4869-4-1">
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4871-6-2"/>
-      <stop id="stop4879-7-4" offset="0.31807542" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
-      <stop id="stop4877-6-1" offset="0.74691135" style="stop-color: rgb(200, 201, 198); stop-opacity: 1;"/>
-      <stop style="stop-color: rgb(211, 215, 207); stop-opacity: 1;" offset="1" id="stop4873-1-0"/>
-    </linearGradient>
-    <filter id="filter25011" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
-      <feColorMatrix id="feColorMatrix25013" type="saturate" values="1" result="fbSourceGraphic"/>
-      <feColorMatrix id="feColorMatrix25015" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
-    </filter>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4869-4-0" id="radialGradient24961" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)" cx="-33.412369" cy="185.74171" fx="-33.412369" fy="185.74171" r="2.3554697"/>
-    <linearGradient id="linearGradient4869-4-0">
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4871-6-8"/>
-      <stop id="stop4879-7-5" offset="0.31807542" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
-      <stop id="stop4877-6-5" offset="0.74691135" style="stop-color: rgb(200, 201, 198); stop-opacity: 1;"/>
-      <stop style="stop-color: rgb(211, 215, 207); stop-opacity: 1;" offset="1" id="stop4873-1-4"/>
-    </linearGradient>
-    <filter id="filter25023" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
-      <feColorMatrix id="feColorMatrix25025" type="saturate" values="1" result="fbSourceGraphic"/>
-      <feColorMatrix id="feColorMatrix25027" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
-    </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4941" id="linearGradient24963" gradientUnits="userSpaceOnUse" x1="-39.858727" y1="184.61784" x2="-38.244785" y2="188.84898"/>
-    <linearGradient inkscape:collect="always" id="linearGradient4941">
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4943"/>
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1" id="stop4945"/>
-    </linearGradient>
-    <filter id="filter25033" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
-      <feColorMatrix id="feColorMatrix25035" type="saturate" values="1" result="fbSourceGraphic"/>
-      <feColorMatrix id="feColorMatrix25037" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
-    </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4941-7" id="linearGradient24965" gradientUnits="userSpaceOnUse" x1="-39.858727" y1="184.61784" x2="-38.244785" y2="188.84898"/>
-    <linearGradient inkscape:collect="always" id="linearGradient4941-7">
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4943-2"/>
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1" id="stop4945-5"/>
-    </linearGradient>
-    <filter id="filter25043" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
-      <feColorMatrix id="feColorMatrix25045" type="saturate" values="1" result="fbSourceGraphic"/>
-      <feColorMatrix id="feColorMatrix25047" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
-    </filter>
-    <filter id="filter25049" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
-      <feColorMatrix id="feColorMatrix25051" type="saturate" values="1" result="fbSourceGraphic"/>
-      <feColorMatrix id="feColorMatrix25053" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
-    </filter>
-    <filter id="filter25055" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
-      <feColorMatrix id="feColorMatrix25057" type="saturate" values="1" result="fbSourceGraphic"/>
-      <feColorMatrix id="feColorMatrix25059" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
-    </filter>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8284271" inkscape:cx="48.631638" inkscape:cy="57.536221" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="1200" inkscape:window-height="851" inkscape:window-x="0" inkscape:window-y="52" inkscape:window-maximized="0"/>
-  <metadata id="metadata25075">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" transform="translate(0, 48)">
-    <g id="g4030-1-8" transform="matrix(2, 0, 0, 2, 193.25, -374.967)" style="stroke: rgb(0, 0, 0); display: inline; stroke-opacity: 1;">
-      <path sodipodi:nodetypes="ccc" id="path3165-7-3" d="m -72.5,173.5 -14,14 14,14" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 7; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;"/>
-    </g>
-    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 0.523439; visibility: visible; display: inline;" id="path4050-2-7-9-4" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(3.34328, 0, 0, 3.34328, 185.28, -623.176)"/>
-    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 0.523439; visibility: visible; display: inline;" id="path4050-2-7-9-4-8" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(3.34328, 0, 0, 3.34328, 207.28, -623.176)"/>
-    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 0.697921; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;" id="path4050-2-7-9-4-0" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(2.86565, 0, 0, 2.86565, 166.846, -534.143)"/>
-    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 0.697921; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;" id="path4050-2-7-9-4-0-9" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(2.86565, 0, 0, 2.86565, 188.846, -534.143)"/>
-    <path style="overflow: visible; marker: none; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-indent: 0pt; text-align: start; text-decoration: none; line-height: normal; letter-spacing: normal; word-spacing: normal; text-transform: none; direction: ltr; text-anchor: start; opacity: 0.35; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 1; stroke-miterlimit: 4; stroke-dasharray: none; visibility: visible; display: inline; font-family: Bitstream Vera Sans; stroke-opacity: 1;" d="m 317.06251,365.96875 c -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 l -16.125,16.125 16.125,16.125 c 1.11265,1.11265 3.13735,1.11265 4.25,0 1.11265,-1.11264 1.11265,-3.13735 0,-4.25 l -11.875,-11.875 11.875,-11.875 c 0.86584,-0.83655 1.1475,-2.22114 0.6773,-3.32947 -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 z" id="path3165-7-3-1" sodipodi:nodetypes="ccccscccsc" transform="matrix(2, 0, 0, 2, -586, -765.967)"/>
-    <path style="overflow: visible; marker: none; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-indent: 0pt; text-align: start; text-decoration: none; line-height: normal; letter-spacing: normal; word-spacing: normal; text-transform: none; direction: ltr; text-anchor: start; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 1; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; visibility: visible; display: inline; font-family: Bitstream Vera Sans; stroke-opacity: 1;" d="m 320.08435,397.03059 c 0.007,-0.79449 -0.27079,-1.59203 -0.83434,-2.15559 L 307.37501,383 m 12.5523,-15.20447 c -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 L 298.87501,383" id="path3165-7-3-1-9" sodipodi:nodetypes="ccccccc" transform="matrix(2, 0, 0, 2, -586, -765.967)"/>
-  </g>
-</svg>

data/theme/ws-switch-arrow-up.svg

@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg25070"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="ws-switch-arrow-up.svg">
+  <defs
+     id="defs25072">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective25078" />
+    <inkscape:perspective
+       id="perspective24985"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4034-0-4"
+       id="linearGradient24957"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(6)"
+       x1="-86.552246"
+       y1="185.439"
+       x2="-83.37072"
+       y2="197.31261" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4034-0-4">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4036-5-7" />
+      <stop
+         style="stop-color: rgb(186, 189, 182); stop-opacity: 1;"
+         offset="1"
+         id="stop4038-9-6" />
+    </linearGradient>
+    <filter
+       id="filter24765"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix24767"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix24769"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4632-1-3-9-3-2"
+       id="linearGradient24955"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5)"
+       x1="-74.520325"
+       y1="169.06032"
+       x2="-74.520325"
+       y2="205.94189" />
+    <linearGradient
+       id="linearGradient4632-1-3-9-3-2">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4634-1-8-3-9-0" />
+      <stop
+         id="stop4636-1-9-9-8-8"
+         offset="0.0274937"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         id="stop4638-8-3-9-6-6"
+         offset="0.274937"
+         style="stop-color: rgb(242, 242, 242); stop-opacity: 1;" />
+      <stop
+         id="stop4640-8-5-7-8-9"
+         offset="0.38707438"
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
+      <stop
+         id="stop4642-5-41-9-6-9"
+         offset="0.66528589"
+         style="stop-color: rgb(217, 218, 216); stop-opacity: 1;" />
+      <stop
+         id="stop4644-5-2-7-9-2"
+         offset="0.76745707"
+         style="stop-color: rgb(223, 224, 221); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(240, 240, 240); stop-opacity: 1;"
+         offset="1"
+         id="stop4646-3-2-3-7-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4869-4-1"
+       id="radialGradient24959"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
+       cx="-33.412369"
+       cy="185.74171"
+       fx="-33.412369"
+       fy="185.74171"
+       r="2.3554697" />
+    <linearGradient
+       id="linearGradient4869-4-1">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4871-6-2" />
+      <stop
+         id="stop4879-7-4"
+         offset="0.31807542"
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
+      <stop
+         id="stop4877-6-1"
+         offset="0.74691135"
+         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4873-1-0" />
+    </linearGradient>
+    <filter
+       id="filter25011"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25013"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25015"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4869-4-0"
+       id="radialGradient24961"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
+       cx="-33.412369"
+       cy="185.74171"
+       fx="-33.412369"
+       fy="185.74171"
+       r="2.3554697" />
+    <linearGradient
+       id="linearGradient4869-4-0">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4871-6-8" />
+      <stop
+         id="stop4879-7-5"
+         offset="0.31807542"
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
+      <stop
+         id="stop4877-6-5"
+         offset="0.74691135"
+         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4873-1-4" />
+    </linearGradient>
+    <filter
+       id="filter25023"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25025"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25027"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4941"
+       id="linearGradient24963"
+       gradientUnits="userSpaceOnUse"
+       x1="-39.858727"
+       y1="184.61784"
+       x2="-38.244785"
+       y2="188.84898" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4941">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4943" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4945" />
+    </linearGradient>
+    <filter
+       id="filter25033"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25035"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25037"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4941-7"
+       id="linearGradient24965"
+       gradientUnits="userSpaceOnUse"
+       x1="-39.858727"
+       y1="184.61784"
+       x2="-38.244785"
+       y2="188.84898" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4941-7">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4943-2" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4945-5" />
+    </linearGradient>
+    <filter
+       id="filter25043"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25045"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25047"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <filter
+       id="filter25049"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25051"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25053"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <filter
+       id="filter25055"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25057"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25059"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="-12.356322"
+     inkscape:cy="57.536221"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1200"
+     inkscape:window-height="840"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata25075">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0, 48)">
+    <g
+       id="g3181"
+       transform="matrix(0,1,-1,0,48.0003,-48)">
+      <g
+         style="stroke:#000000;stroke-opacity:1;display:inline"
+         transform="matrix(2,0,0,2,193.25,-374.967)"
+         id="g4030-1-8">
+        <path
+           style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+           d="m -72.5,173.5 -14,14 14,14"
+           id="path3165-7-3"
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         transform="matrix(3.34328,0,0,3.34328,185.28,-623.176)"
+         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
+         sodipodi:ry="2.09375"
+         sodipodi:rx="2.09375"
+         sodipodi:cy="186.40625"
+         sodipodi:cx="-38.59375"
+         id="path4050-2-7-9-4"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(3.34328,0,0,3.34328,207.28,-623.176)"
+         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
+         sodipodi:ry="2.09375"
+         sodipodi:rx="2.09375"
+         sodipodi:cy="186.40625"
+         sodipodi:cx="-38.59375"
+         id="path4050-2-7-9-4-8"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(2.86565,0,0,2.86565,166.846,-534.143)"
+         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
+         sodipodi:ry="2.09375"
+         sodipodi:rx="2.09375"
+         sodipodi:cy="186.40625"
+         sodipodi:cx="-38.59375"
+         id="path4050-2-7-9-4-0"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(2.86565,0,0,2.86565,188.846,-534.143)"
+         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
+         sodipodi:ry="2.09375"
+         sodipodi:rx="2.09375"
+         sodipodi:cy="186.40625"
+         sodipodi:cx="-38.59375"
+         id="path4050-2-7-9-4-0-9"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(2,0,0,2,-586,-765.967)"
+         sodipodi:nodetypes="ccccscccsc"
+         id="path3165-7-3-1"
+         d="m 317.06251,365.96875 c -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 l -16.125,16.125 16.125,16.125 c 1.11265,1.11265 3.13735,1.11265 4.25,0 1.11265,-1.11264 1.11265,-3.13735 0,-4.25 l -11.875,-11.875 11.875,-11.875 c 0.86584,-0.83655 1.1475,-2.22114 0.6773,-3.32947 -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(2,0,0,2,-586,-765.967)"
+         sodipodi:nodetypes="ccccccc"
+         id="path3165-7-3-1-9"
+         d="m 320.08435,397.03059 c 0.007,-0.79449 -0.27079,-1.59203 -0.83434,-2.15559 L 307.37501,383 m 12.5523,-15.20447 c -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 L 298.87501,383"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

gnome-shell.doap

@@ -6,6 +6,22 @@
 
   <name xml:lang="en">GNOME Shell</name>
   <shortdesc xml:lang="en">Next generation GNOME desktop shell</shortdesc>
+  <description>GNOME Shell provides core user interface functions for the GNOME 3
+desktop, like switching to windows and launching applications.
+GNOME Shell takes advantage of the capabilities of modern graphics
+hardware and introduces innovative user interface concepts to
+provide a visually attractive and easy to use experience.
+
+Tarball releases are provided largely for distributions to build
+packages. If you are interested in building GNOME Shell from source,
+we would recommend building from version control using the build
+script described at:
+
+ http://live.gnome.org/GnomeShell
+
+Not only will that give you the very latest version of this rapidly
+changing project, it will be much easier than get GNOME Shell and
+its dependencies to build from tarballs.</description>
   <!--
   <homepage rdf:resource="http://live.gnome.org/GnomeShell" />
   -->
@@ -33,7 +49,7 @@
     <foaf:Person>
       <foaf:name>Colin Walters</foaf:name>
       <foaf:mbox rdf:resource="mailto:walters@verbum.org" />
-      <gnome:userid>cwalters</gnome:userid>
+      <gnome:userid>walters</gnome:userid>
     </foaf:Person>
   </maintainer>
   <maintainer>

js/Makefile.am

@@ -1 +1,67 @@
-SUBDIRS = misc ui
+
+jsdir = $(pkgdatadir)/js
+
+nobase_dist_js_DATA = 	\
+	misc/config.js		\
+	misc/docInfo.js		\
+	misc/fileUtils.js	\
+	misc/format.js		\
+	misc/gnomeSession.js	\
+	misc/history.js		\
+	misc/modemManager.js	\
+	misc/params.js		\
+	misc/util.js		\
+	perf/core.js		\
+	ui/altTab.js		\
+	ui/appDisplay.js	\
+	ui/appFavorites.js	\
+	ui/boxpointer.js	\
+	ui/calendar.js		\
+	ui/chrome.js		\
+	ui/ctrlAltTab.js	\
+	ui/dash.js		\
+	ui/dateMenu.js		\
+	ui/dnd.js		\
+	ui/docDisplay.js	\
+	ui/endSessionDialog.js	\
+	ui/environment.js	\
+	ui/extensionSystem.js	\
+	ui/iconGrid.js		\
+	ui/lightbox.js		\
+	ui/link.js		\
+	ui/lookingGlass.js	\
+	ui/magnifier.js		\
+	ui/magnifierDBus.js	\
+	ui/main.js		\
+	ui/messageTray.js	\
+	ui/modalDialog.js	\
+	ui/notificationDaemon.js \
+	ui/overview.js		\
+	ui/panel.js		\
+	ui/panelMenu.js		\
+	ui/placeDisplay.js	\
+	ui/polkitAuthenticationAgent.js \
+	ui/popupMenu.js		\
+	ui/runDialog.js		\
+	ui/scripting.js		\
+	ui/search.js		\
+	ui/searchDisplay.js	\
+	ui/shellDBus.js		\
+	ui/statusIconDispatcher.js	\
+	ui/statusMenu.js	\
+	ui/status/accessibility.js	\
+	ui/status/keyboard.js	\
+	ui/status/network.js	\
+	ui/status/power.js	\
+	ui/status/volume.js	\
+	ui/status/bluetooth.js	\
+	ui/telepathyClient.js	\
+	ui/tweener.js		\
+	ui/viewSelector.js	\
+	ui/windowAttentionHandler.js	\
+	ui/windowManager.js	\
+	ui/workspace.js		\
+	ui/workspaceThumbnail.js	\
+	ui/workspacesView.js	\
+	ui/workspaceSwitcherPopup.js    \
+	ui/xdndHandler.js

js/misc/Makefile.am

@@ -1,6 +0,0 @@
-jsmiscdir = $(pkgdatadir)/js/misc
-
-dist_jsmisc_DATA =		\
-	docInfo.js		\
-	format.js		\
-	params.js

js/misc/config.js.in

@@ -0,0 +1,10 @@
+/* mode: js2; indent-tabs-mode: nil; tab-size: 4 */
+/* The name of this package (not localized) */
+const PACKAGE_NAME = '@PACKAGE_NAME@';
+/* The version of this package */
+const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+/* The version of GJS we're linking to */
+const GJS_VERSION = '@GJS_VERSION@';
+/* 1 if gnome-bluetooth is available, 0 otherwise */
+const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
+

js/misc/docInfo.js

@@ -1,15 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const Search = imports.ui.search;
-const Main = imports.ui.main;
 
 const THUMBNAIL_ICON_MARGIN = 2;
 
@@ -23,7 +18,7 @@ DocInfo.prototype = {
         // We actually used get_modified() instead of get_visited()
         // here, as GtkRecentInfo doesn't updated get_visited()
         // correctly. See http://bugzilla.gnome.org/show_bug.cgi?id=567094
-        this.timestamp = recentInfo.get_modified().getTime() / 1000;
+        this.timestamp = recentInfo.get_modified();
         this.name = recentInfo.get_display_name();
         this._lowerName = this.name.toLowerCase();
         this.uri = recentInfo.get_uri();
@@ -34,8 +29,8 @@ DocInfo.prototype = {
         return St.TextureCache.get_default().load_recent_thumbnail(size, this.recentInfo);
     },
 
-    launch : function() {
-        Shell.DocSystem.get_default().open(this.recentInfo);
+    launch : function(workspaceIndex) {
+        Shell.DocSystem.get_default().open(this.recentInfo, workspaceIndex);
     },
 
     matchTerms: function(terms) {
@@ -44,15 +39,12 @@ DocInfo.prototype = {
             let term = terms[i];
             let idx = this._lowerName.indexOf(term);
             if (idx == 0) {
-                if (mtype != Search.MatchType.NONE)
-                    return Search.MatchType.MULTIPLE;
                 mtype = Search.MatchType.PREFIX;
             } else if (idx > 0) {
-                if (mtype != Search.MatchType.NONE)
-                    return Search.MatchType.MULTIPLE;
-                mtype = Search.MatchType.SUBSTRING;
+                if (mtype == Search.MatchType.NONE)
+                    mtype = Search.MatchType.SUBSTRING;
             } else {
-                continue;
+                return Search.MatchType.NONE;
             }
         }
         return mtype;
@@ -68,8 +60,7 @@ function getDocManager() {
 }
 
 /**
- * DocManager wraps the DocSystem, primarily to expose DocInfo objects
- * which conform to the GenericDisplay item API.
+ * DocManager wraps the DocSystem, primarily to expose DocInfo objects.
  */
 function DocManager() {
     this._init();
@@ -114,40 +105,36 @@ DocManager.prototype = {
         return this._docSystem.queue_existence_check(count);
     },
 
-    initialSearch: function(terms) {
-        let multipleMatches = [];
+    _searchDocs: function(items, terms) {
+        let multiplePrefixMatches = [];
         let prefixMatches = [];
+        let multipleSubtringMatches = [];
         let substringMatches = [];
-        for (let i = 0; i < this._infosByTimestamp.length; i++) {
-            let item = this._infosByTimestamp[i];
+        for (let i = 0; i < items.length; i++) {
+            let item = items[i];
             let mtype = item.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleMatches.push(item.uri);
+            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
+                multiplePrefixMatches.push(item.uri);
             else if (mtype == Search.MatchType.PREFIX)
                 prefixMatches.push(item.uri);
+            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
+                multipleSubtringMatches.push(item.uri);
             else if (mtype == Search.MatchType.SUBSTRING)
                 substringMatches.push(item.uri);
          }
-        return multipleMatches.concat(prefixMatches.concat(substringMatches));
+        return multiplePrefixMatches.concat(prefixMatches.concat(multipleSubtringMatches.concat(substringMatches)));
+    },
+
+    initialSearch: function(terms) {
+        return this._searchDocs(this._infosByTimestamp, terms);
     },
 
     subsearch: function(previousResults, terms) {
-        let multipleMatches = [];
-        let prefixMatches = [];
-        let substringMatches = [];
-        for (let i = 0; i < previousResults.length; i++) {
-            let uri = previousResults[i];
-            let item = this._infosByUri[uri];
-            let mtype = item.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleMatches.push(uri);
-            else if (mtype == Search.MatchType.PREFIX)
-                prefixMatches.push(uri);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringMatches.push(uri);
-        }
-        return multipleMatches.concat(prefixMatches.concat(substringMatches));
+        return this._searchDocs(previousResults.map(Lang.bind(this,
+            function(url) {
+                return this._infosByUri[url];
+            })), terms);
     }
-}
+};
 
 Signals.addSignalMethods(DocManager.prototype);

js/misc/fileUtils.js

@@ -0,0 +1,22 @@
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+
+function listDirAsync(file, callback) {
+    let allFiles = [];
+    file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME,
+                                  Gio.FileQueryInfoFlags.NONE,
+                                  GLib.PRIORITY_LOW, null, function (obj, res) {
+        let enumerator = obj.enumerate_children_finish(res);
+        function onNextFileComplete(obj, res) {
+            let files = obj.next_files_finish(res);
+            if (files.length) {
+                allFiles = allFiles.concat(files);
+                enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, onNextFileComplete);
+            } else {
+                enumerator.close(null);
+                callback(allFiles);
+            }
+        }
+        enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, onNextFileComplete);
+    });
+}

js/misc/format.js

@@ -6,8 +6,10 @@
  * It has to be set up using String.prototype.format = Format.format;
  * Usage:
  * "somestring %s %d".format('hello', 5);
- * It supports %s, %d and %f, for %f it also support precisions like
- * "%.2f".format(1.526)
+ * It supports %s, %d, %x and %f, for %f it also support precisions like
+ * "%.2f".format(1.526). All specifiers can be prefixed with a minimum
+ * field width, e.g. "%5s".format("foo"). Unless the width is prefixed
+ * with '0', the formatted string will be padded with spaces.
  */
 
 function format() {
@@ -15,30 +17,44 @@ function format() {
     let i = 0;
     let args = arguments;
 
-    return str.replace(/%(?:\.([0-9]+))?(.)/g, function (str, precisionGroup, genericGroup) {
+    return str.replace(/%([0-9]+)?(?:\.([0-9]+))?(.)/g, function (str, widthGroup, precisionGroup, genericGroup) {
 
                     if (precisionGroup != '' && genericGroup != 'f')
                         throw new Error("Precision can only be specified for 'f'");
 
+                    let fillChar = (widthGroup[0] == '0') ? '0' : ' ';
+                    let width = parseInt(widthGroup, 10) || 0;
+
+                    function fillWidth(s, c, w) {
+                        let fill = '';
+                        for (let i = 0; i < w; i++)
+                            fill += c;
+                        return fill.substr(s.length) + s;
+                    }
+
+                    let s = '';
                     switch (genericGroup) {
                         case '%':
                             return '%';
                             break;
                         case 's':
-                            return args[i++].toString();
+                            s = args[i++].toString();
                             break;
                         case 'd':
-                            return parseInt(args[i++]);
+                            s = parseInt(args[i++]).toString();
+                            break;
+                        case 'x':
+                            s = parseInt(args[i++]).toString(16);
                             break;
                         case 'f':
                             if (precisionGroup == '')
-                                return parseFloat(args[i++]);
+                                s = parseFloat(args[i++]).toString();
                             else
-                                return parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
+                                s = parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
                             break;
                         default:
                             throw new Error('Unsupported conversion character %' + genericGroup);
                     }
-                    return ""; // Suppress warning
+                    return fillWidth(s, fillChar, width);
                 });
 }

js/misc/gnomeSession.js

@@ -0,0 +1,125 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const Lang = imports.lang;
+const Signals = imports.signals;
+
+const PresenceIface = {
+    name: 'org.gnome.SessionManager.Presence',
+    methods: [{ name: 'SetStatus',
+                inSignature: 'u',
+                outSignature: '' }],
+    properties: [{ name: 'status',
+                   signature: 'u',
+                   access: 'readwrite' }],
+    signals: [{ name: 'StatusChanged',
+                inSignature: 'u' }]
+};
+
+const PresenceStatus = {
+    AVAILABLE: 0,
+    INVISIBLE: 1,
+    BUSY: 2,
+    IDLE: 3
+};
+
+function Presence() {
+    this._init();
+}
+
+Presence.prototype = {
+    _init: function() {
+        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
+    },
+
+    getStatus: function(callback) {
+        this.GetRemote('status', Lang.bind(this,
+            function(status, ex) {
+                if (!ex)
+                    callback(this, status);
+            }));
+    },
+
+    setStatus: function(status) {
+        this.SetStatusRemote(status);
+    }
+};
+DBus.proxifyPrototype(Presence.prototype, PresenceIface);
+
+// Note inhibitors are immutable objects, so they don't
+// change at runtime (changes always come in the form
+// of new inhibitors)
+const InhibitorIface = {
+    name: 'org.gnome.SessionManager.Inhibitor',
+    properties: [{ name: 'app_id',
+                   signature: 's',
+                   access: 'readonly' },
+                 { name: 'client_id',
+                   signature: 's',
+                   access: 'readonly' },
+                 { name: 'reason',
+                   signature: 's',
+                   access: 'readonly' },
+                 { name: 'flags',
+                   signature: 'u',
+                   access: 'readonly' },
+                 { name: 'toplevel_xid',
+                   signature: 'u',
+                   access: 'readonly' },
+                 { name: 'cookie',
+                   signature: 'u',
+                   access: 'readonly' }],
+};
+
+function Inhibitor(objectPath) {
+    this._init(objectPath);
+}
+
+Inhibitor.prototype = {
+    _init: function(objectPath) {
+        DBus.session.proxifyObject(this,
+                                   "org.gnome.SessionManager",
+                                   objectPath);
+        this.isLoaded = false;
+        this._loadingPropertiesCount = InhibitorIface.properties.length;
+        for (let i = 0; i < InhibitorIface.properties.length; i++) {
+            let propertyName = InhibitorIface.properties[i].name;
+            this.GetRemote(propertyName, Lang.bind(this,
+                function(value, exception) {
+                    if (exception)
+                        return;
+
+                    this[propertyName] = value;
+                    this._loadingPropertiesCount--;
+
+                    if (this._loadingPropertiesCount == 0) {
+                        this.isLoaded = true;
+                        this.emit("is-loaded");
+                    }
+                }));
+        }
+    },
+};
+DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface);
+Signals.addSignalMethods(Inhibitor.prototype);
+
+
+// Not the full interface, only the methods we use
+const SessionManagerIface = {
+    name: 'org.gnome.SessionManager',
+    methods: [
+        { name: 'Logout', inSignature: 'u', outSignature: '' },
+        { name: 'Shutdown', inSignature: '', outSignature: '' }
+    ]
+};
+
+function SessionManager() {
+    this._init();
+}
+
+SessionManager.prototype = {
+    _init: function() {
+        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager');
+    }
+};
+DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface);

js/misc/history.js

@@ -0,0 +1,115 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Lang = imports.lang;
+const Signals = imports.signals;
+const Clutter = imports.gi.Clutter;
+const Params = imports.misc.params;
+
+const DEFAULT_LIMIT = 512;
+
+function HistoryManager(params) {
+    this._init(params);
+}
+
+HistoryManager.prototype = {
+    _init: function(params) {
+        params = Params.parse(params, { gsettingsKey: null,
+                                        limit: DEFAULT_LIMIT,
+                                        entry: null });
+
+        this._key = params.gsettingsKey;
+        this._limit = params.limit;
+
+        this._historyIndex = 0;
+        if (this._key) {
+            this._history = global.settings.get_strv(this._key);
+            global.settings.connect('changed::' + this._key,
+                                    Lang.bind(this, this._historyChanged));
+
+        } else {
+            this._history = [];
+        }
+
+        this._entry = params.entry;
+
+        if (this._entry) {
+            this._entry.connect('key-press-event', 
+                                Lang.bind(this, this._onEntryKeyPress));
+        }
+    },
+
+    _historyChanged: function() {
+        this._history = global.settings.get_strv(this._key);
+        this._historyIndex = this._history.length;
+    },
+
+    prevItem: function(text) {
+        if (this._historyIndex <= 0)
+            return text;
+
+        if (text)
+            this._history[this._historyIndex] = text;
+        this._historyIndex--;
+        return this._indexChanged();
+    },
+
+    nextItem: function(text) {
+        if (this._historyIndex >= this._history.length)
+            return text;
+
+        if (text)
+            this._history[this._historyIndex] = text;
+        this._historyIndex++;
+        return this._indexChanged();
+    },
+
+    lastItem: function() {
+        if (this._historyIndex != this._history.length) {
+            this._historyIndex = this._history.length;
+            this._indexChanged();
+        }
+
+        return this._historyIndex[this._history.length];
+    },
+
+    addItem: function(input) {
+        if (this._history.length == 0 ||
+            this._history[this._history.length - 1] != input) {
+
+            this._history.push(input);
+            this._save();
+        }
+        this._historyIndex = this._history.length;
+    },
+
+    _onEntryKeyPress: function(entry, event) {
+        let symbol = event.get_key_symbol();
+        if (symbol == Clutter.KEY_Up) {
+            this.prevItem(entry.get_text());
+            return true;
+        } else if (symbol == Clutter.KEY_Down) {
+            this.nextItem(entry.get_text());
+            return true;
+        }
+        return false;
+    },
+
+    _indexChanged: function() {
+        let current = this._history[this._historyIndex] || '';
+        this.emit('changed', current);
+
+        if (this._entry)
+            this._entry.set_text(current);
+
+        return current;
+    },
+
+    _save: function() {
+        if (this._history.length > this._limit)
+            this._history.splice(0, this._history.length - this._limit);
+
+        if (this._key)
+            global.settings.set_strv(this._key, this._history);
+    }
+};
+Signals.addSignalMethods(HistoryManager.prototype);

js/misc/modemManager.js

@@ -0,0 +1,225 @@
+// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+
+const DBus = imports.dbus;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+
+// The following are not the complete interfaces, just the methods we need
+// (or may need in the future)
+
+const ModemGsmNetworkInterface = {
+    name: 'org.freedesktop.ModemManager.Modem.Gsm.Network',
+    methods: [
+        { name: 'GetRegistrationInfo', inSignature: '', outSignature: 'uss' },
+        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' }
+    ],
+    properties: [
+        { name: 'AccessTechnology', signature: 'u', access: 'read' }
+    ],
+    signals: [
+        { name: 'SignalQuality', inSignature: 'u' },
+        { name: 'RegistrationInfo', inSignature: 'uss' }
+    ]
+};
+const ModemGsmNetworkProxy = DBus.makeProxyClass(ModemGsmNetworkInterface);
+
+const ModemCdmaInterface = {
+    name: 'org.freedesktop.ModemManager.Modem.Cdma',
+    methods: [
+        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' },
+        { name: 'GetServingSystem', inSignature: '', outSignature: 'usu' }
+    ],
+    signals: [
+        { name: 'SignalQuality', inSignature: 'u' }
+    ]
+};
+const ModemCdmaProxy = DBus.makeProxyClass(ModemCdmaInterface);
+
+let _providersTable;
+function _getProvidersTable() {
+    if (_providersTable)
+        return _providersTable;
+    let [providers, countryCodes] = Shell.mobile_providers_parse();
+    return _providersTable = providers;
+}
+
+function ModemGsm() {
+    this._init.apply(this, arguments);
+}
+
+ModemGsm.prototype = {
+    _init: function(path) {
+        this._proxy = new ModemGsmNetworkProxy(DBus.system, 'org.freedesktop.ModemManager', path);
+
+        this.signal_quality = 0;
+        this.operator_name = null;
+
+        // Code is duplicated because the function have different signatures
+        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
+            this.signal_quality = quality;
+            this.emit('notify::signal-quality');
+        }));
+        this._proxy.connect('RegistrationInfo', Lang.bind(this, function(proxy, status, code, name) {
+            this.operator_name = this._findOperatorName(name, code);
+            this.emit('notify::operator-name');
+        }));
+        this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function(result, err) {
+            if (err) {
+                log(err);
+                return;
+            }
+
+            let [status, code, name] = result;
+            this.operator_name = this._findOperatorName(name, code);
+            this.emit('notify::operator-name');
+        }));
+        this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
+            if (err) {
+                // it will return an error if the device is not connected
+                this.signal_quality = 0;
+            } else {
+                let [quality] = result;
+                this.signal_quality = quality;
+            }
+            this.emit('notify::signal-quality');
+        }));
+    },
+
+    _findOperatorName: function(name, opCode) {
+        if (name.length != 0 && (name.length > 6 || name.length < 5)) {
+            // this looks like a valid name, i.e. not an MCCMNC (that some
+            // devices return when not yet connected
+            return name;
+        }
+        if (isNaN(parseInt(name))) {
+            // name is definitely not a MCCMNC, so it may be a name
+            // after all; return that
+            return name;
+        }
+
+        let needle;
+        if (name.length == 0 && opCode)
+            needle = opCode;
+        else if (name.length == 6 || name.length == 5)
+            needle = name;
+        else // nothing to search
+            return null;
+
+        return this._findProviderForMCCMNC(needle);
+    },
+
+    _findProviderForMCCMNC: function(needle) {
+        let table = _getProvidersTable();
+        let needlemcc = needle.substring(0, 3);
+        let needlemnc = needle.substring(3, needle.length);
+
+        let name2, name3;
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+
+                // Search through MCC/MNC list
+                let list = provider.get_gsm_mcc_mnc();
+                for (let j = 0; j < list.length; j++) {
+                    let mccmnc = list[j];
+
+                    // Match both 2-digit and 3-digit MNC; prefer a
+                    // 3-digit match if found, otherwise a 2-digit one.
+                    if (mccmnc.mcc != needlemcc)
+                        continue;  // MCC was wrong
+
+                    if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
+                        name3 = provider.name;
+
+                    if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
+                        name2 = provider.name;
+
+                    if (name2 && name3)
+                        break;
+                }
+            }
+        }
+
+        return name3 || name2 || null;
+    }
+}
+Signals.addSignalMethods(ModemGsm.prototype);
+
+function ModemCdma() {
+    this._init.apply(this, arguments);
+}
+
+ModemCdma.prototype = {
+    _init: function(path) {
+        this._proxy = new ModemCdmaProxy(DBus.system, 'org.freedesktop.ModemManager', path);
+
+        this.signal_quality = 0;
+        this.operator_name = null;
+        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
+            this.signal_quality = quality;
+            this.emit('notify::signal-quality');
+
+            // receiving this signal means the device got activated
+            // and we can finally call GetServingSystem
+            if (this.operator_name == null)
+                this._refreshServingSystem();
+        }));
+        this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
+            if (err) {
+                // it will return an error if the device is not connected
+                this.signal_quality = 0;
+            } else {
+                let [quality] = result;
+                this.signal_quality = quality;
+            }
+            this.emit('notify::signal-quality');
+        }));
+    },
+
+    _refreshServingSystem: function() {
+        this._proxy.GetServingSystemRemote(Lang.bind(this, function(result, err) {
+            if (err) {
+                // it will return an error if the device is not connected
+                this.operator_name = null;
+            } else {
+                let [bandClass, band, id] = result;
+                if (name.length > 0)
+                    this.operator_name = this._findProviderForSid(id);
+                else
+                    this.operator_name = null;
+            }
+            this.emit('notify::operator-name');
+        }));
+    },
+
+    _findProviderForSid: function(sid) {
+        if (sid == 0)
+            return null;
+
+        let table = _getProvidersTable();
+
+        // Search through each country
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+                let cdma_sid = provider.get_cdma_sid();
+
+                // Search through CDMA SID list
+                for (let j = 0; j < cdma_sid.length; j++) {
+                    if (cdma_sid[j] == sid)
+                        return provider.name;
+                }
+            }
+        }
+
+        return null;
+    }
+};
+Signals.addSignalMethods(ModemCdma.prototype);

js/misc/params.js

@@ -2,7 +2,7 @@
 
 // parse:
 // @params: caller-provided parameter object, or %null
-// @default: function-provided defaults object
+// @defaults: function-provided defaults object
 // @allowExtras: whether or not to allow properties not in @default
 //
 // Examines @params and fills in default values from @defaults for
@@ -10,24 +10,26 @@
 // @allowExtras is not %true, it will throw an error if @params
 // contains any properties that aren't in @defaults.
 //
-// If @params is %null, this returns @defaults.
+// If @params is %null, this returns the values from @defaults.
 //
-// Return value: the updated params
+// Return value: a new object, containing the merged parameters from
+// @params and @defaults
 function parse(params, defaults, allowExtras) {
+    let ret = {}, prop;
+
     if (!params)
-        return defaults;
+        params = {};
 
-    if (!allowExtras) {
-        for (let prop in params) {
-            if (!(prop in defaults))
-                throw new Error('Unrecognized parameter "' + prop + '"');
-        }
+    for (prop in params) {
+        if (!(prop in defaults) && !allowExtras)
+            throw new Error('Unrecognized parameter "' + prop + '"');
+        ret[prop] = params[prop];
     }
 
-    for (let prop in defaults) {
+    for (prop in defaults) {
         if (!(prop in params))
-            params[prop] = defaults[prop];
+            ret[prop] = defaults[prop];
     }
 
-    return params;
+    return ret;
 }

js/misc/util.js

@@ -0,0 +1,213 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gdk = imports.gi.Gdk;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
+
+const Main = imports.ui.main;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+/* http://daringfireball.net/2010/07/improved_regex_for_matching_urls */
+const _urlRegexp = new RegExp('\\b(([a-z][\\w-]+:(/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}/)([^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:\'\\".,<>?«»“”‘’]))', 'gi');
+
+// findUrls:
+// @str: string to find URLs in
+//
+// Searches @str for URLs and returns an array of objects with %url
+// properties showing the matched URL string, and %pos properties indicating
+// the position within @str where the URL was found.
+//
+// Return value: the list of match objects, as described above
+function findUrls(str) {
+    let res = [], match;
+    while ((match = _urlRegexp.exec(str)))
+        res.push({ url: match[0], pos: match.index });
+    return res;
+}
+
+// spawn:
+// @argv: an argv array
+//
+// Runs @argv in the background, handling any errors that occur
+// when trying to start the program.
+function spawn(argv) {
+    try {
+        trySpawn(argv);
+    } catch (err) {
+        _handleSpawnError(argv[0], err);
+    }
+}
+
+// spawnCommandLine:
+// @command_line: a command line
+//
+// Runs @command_line in the background, handling any errors that
+// occur when trying to parse or start the program.
+function spawnCommandLine(command_line) {
+    try {
+        let [success, argc, argv] = GLib.shell_parse_argv(command_line);
+        trySpawn(argv);
+    } catch (err) {
+        _handleSpawnError(command_line, err);
+    }
+}
+
+// trySpawn:
+// @argv: an argv array
+//
+// Runs @argv in the background. If launching @argv fails,
+// this will throw an error.
+function trySpawn(argv)
+{
+    try {
+        GLib.spawn_async(null, argv, null,
+                         GLib.SpawnFlags.SEARCH_PATH,
+                         null, null);
+    } catch (err) {
+        if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
+            err.message = _("Command not found");
+        } else {
+            // The exception from gjs contains an error string like:
+            //   Error invoking GLib.spawn_command_line_async: Failed to
+            //   execute child process "foo" (No such file or directory)
+            // We are only interested in the part in the parentheses. (And
+            // we can't pattern match the text, since it gets localized.)
+            err.message = err.message.replace(/.*\((.+)\)/, '$1');
+        }
+
+        throw err;
+    }
+}
+
+// trySpawnCommandLine:
+// @command_line: a command line
+//
+// Runs @command_line in the background. If launching @command_line
+// fails, this will throw an error.
+function trySpawnCommandLine(command_line) {
+    let success, argc, argv;
+
+    try {
+        [success, argc, argv] = GLib.shell_parse_argv(command_line);
+    } catch (err) {
+        // Replace "Error invoking GLib.shell_parse_argv: " with
+        // something nicer
+        err.message = err.message.replace(/[^:]*: /, _("Could not parse command:") + "\n");
+        throw err;
+    }
+
+    trySpawn(argv);
+}
+
+function _handleSpawnError(command, err) {
+    let title = _("Execution of '%s' failed:").format(command);
+    Main.notifyError(title, err.message);
+}
+
+// killall:
+// @processName: a process name
+//
+// Kills @processName. If no process with the given name is found,
+// this will fail silently.
+function killall(processName) {
+    try {
+        // pkill is more portable than killall, but on Linux at least
+        // it won't match if you pass more than 15 characters of the
+        // process name... However, if you use the '-f' flag to match
+        // the entire command line, it will work, but we have to be
+        // careful in that case that we can match
+        // '/usr/bin/processName' but not 'gedit processName.c' or
+        // whatever...
+
+        let argv = ['pkill', '-f', '^([^ ]*/)?' + processName + '($| )'];
+        GLib.spawn_sync(null, argv, null, GLib.SpawnFlags.SEARCH_PATH, null, null);
+        // It might be useful to return success/failure, but we'd need
+        // a wrapper around WIFEXITED and WEXITSTATUS. Since none of
+        // the current callers care, we don't bother.
+    } catch (e) {
+        logError(e, 'Failed to kill ' + processName);
+    }
+}
+
+// This was ported from network-manager-applet
+// Copyright 2007 - 2011 Red Hat, Inc.
+// Author: Dan Williams <dcbw@redhat.com>
+
+const _IGNORED_WORDS = [
+        'Semiconductor',
+        'Components',
+        'Corporation',
+        'Communications',
+        'Company',
+        'Corp.',
+        'Corp',
+        'Co.',
+        'Inc.',
+        'Inc',
+        'Incorporated',
+        'Ltd.',
+        'Limited.',
+        'Intel',
+        'chipset',
+        'adapter',
+        '[hex]',
+        'NDIS',
+        'Module'
+];
+
+const _IGNORED_PHRASES = [
+        'Multiprotocol MAC/baseband processor',
+        'Wireless LAN Controller',
+        'Wireless LAN Adapter',
+        'Wireless Adapter',
+        'Network Connection',
+        'Wireless Cardbus Adapter',
+        'Wireless CardBus Adapter',
+        '54 Mbps Wireless PC Card',
+        'Wireless PC Card',
+        'Wireless PC',
+        'PC Card with XJACK(r) Antenna',
+        'Wireless cardbus',
+        'Wireless LAN PC Card',
+        'Technology Group Ltd.',
+        'Communication S.p.A.',
+        'Business Mobile Networks BV',
+        'Mobile Broadband Minicard Composite Device',
+        'Mobile Communications AB',
+        '(PC-Suite Mode)'
+];
+
+function fixupPCIDescription(desc) {
+    desc = desc.replace(/[_,]/, ' ');
+
+    /* Attempt to shorten ID by ignoring certain phrases */
+    for (let i = 0; i < _IGNORED_PHRASES.length; i++) {
+        let item = _IGNORED_PHRASES[i];
+        let pos = desc.indexOf(item);
+        if (pos != -1) {
+            let before = desc.substring(0, pos);
+            let after = desc.substring(pos + item.length, desc.length);
+            desc = before + after;
+        }
+    }
+
+    /* Attmept to shorten ID by ignoring certain individual words */
+    let words = desc.split(' ');
+    let out = [ ];
+    for (let i = 0; i < words.length; i++) {
+        let item = words[i];
+
+        // skip empty items (that come out from consecutive spaces)
+        if (item.length == 0)
+            continue;
+
+        if (_IGNORED_WORDS.indexOf(item) == -1) {
+            out.push(item);
+        }
+    }
+
+    return out.join(' ');
+}

js/perf/core.js

@@ -0,0 +1,226 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Main = imports.ui.main;
+const Scripting = imports.ui.scripting;
+
+// This performance script measure the most important (core) performance
+// metrics for the shell. By looking at the output metrics of this script
+// someone should be able to get an idea of how well the shell is performing
+// on a particular system.
+
+let METRICS = {
+    overviewLatencyFirst:
+    { description: "Time to first frame after triggering overview, first time",
+      units: "us" },
+    overviewFpsFirst:
+    { description: "Frame rate when going to the overview, first time",
+      units: "frames / s" },
+    overviewLatencySubsequent:
+    { description: "Time to first frame after triggering overview, second time",
+      units: "us"},
+    overviewFpsSubsequent:
+    { description: "Frames rate when going to the overview, second time",
+      units: "frames / s" },
+    overviewFps5Windows:
+    { description: "Frames rate when going to the overview, 5 windows open",
+      units: "frames / s" },
+    overviewFps10Windows:
+    { description: "Frames rate when going to the overview, 10 windows open",
+      units: "frames / s" },
+    overviewFps5Maximized:
+    { description: "Frames rate when going to the overview, 5 maximized windows open",
+      units: "frames / s" },
+    overviewFps10Maximized:
+    { description: "Frames rate when going to the overview, 10 maximized windows open",
+      units: "frames / s" },
+    overviewFps5Alpha:
+    { description: "Frames rate when going to the overview, 5 alpha-transparent windows open",
+      units: "frames / s" },
+    overviewFps10Alpha:
+    { description: "Frames rate when going to the overview, 10 alpha-transparent windows open",
+      units: "frames / s" },
+    usedAfterOverview:
+    { description: "Malloc'ed bytes after the overview is shown once",
+      units: "B" },
+    leakedAfterOverview:
+    { description: "Additional malloc'ed bytes the second time the overview is shown",
+      units: "B" },
+    applicationsShowTimeFirst:
+    { description: "Time to switch to applications view, first time",
+      units: "us" },
+    applicationsShowTimeSubsequent:
+    { description: "Time to switch to applications view, second time",
+      units: "us"}
+};
+
+let WINDOW_CONFIGS = [
+    { width: 640, height: 480, alpha: false, maximized: false, count: 1,  metric: 'overviewFpsSubsequent' },
+    { width: 640, height: 480, alpha: false, maximized: false, count: 5,  metric: 'overviewFps5Windows'  },
+    { width: 640, height: 480, alpha: false, maximized: false, count: 10, metric: 'overviewFps10Windows'  },
+    { width: 640, height: 480, alpha: false, maximized: true,  count: 5,  metric: 'overviewFps5Maximized' },
+    { width: 640, height: 480, alpha: false, maximized: true,  count: 10, metric: 'overviewFps10Maximized' },
+    { width: 640, height: 480, alpha: true,  maximized: false, count: 5,  metric: 'overviewFps5Alpha' },
+    { width: 640, height: 480, alpha: true,  maximized: false, count: 10, metric: 'overviewFps10Alpha' }
+];
+
+function run() {
+    Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
+    Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
+    Scripting.defineScriptEvent("afterShowHide", "After a show/hide cycle for the overview");
+    Scripting.defineScriptEvent("applicationsShowStart", "Starting to switch to applications view");
+    Scripting.defineScriptEvent("applicationsShowDone", "Done switching to applications view");
+
+    Main.overview.connect('shown', function() {
+                              Scripting.scriptEvent('overviewShowDone');
+                          });
+
+    yield Scripting.sleep(1000);
+
+    for (let i = 0; i < 2 * WINDOW_CONFIGS.length; i++) {
+        // We go to the overview twice for each configuration; the first time
+        // to calculate the mipmaps for the windows, the second time to get
+        // a clean set of numbers.
+        if ((i % 2) == 0) {
+            let config = WINDOW_CONFIGS[i / 2];
+            yield Scripting.destroyTestWindows();
+
+            for (let k = 0; k < config.count; k++)
+                yield Scripting.createTestWindow(config.width, config.height, config.alpha, config.maximized);
+
+            yield Scripting.waitTestWindows();
+            yield Scripting.sleep(1000);
+            yield Scripting.waitLeisure();
+        }
+
+        Scripting.scriptEvent('overviewShowStart');
+        Main.overview.show();
+
+        yield Scripting.waitLeisure();
+        Main.overview.hide();
+        yield Scripting.waitLeisure();
+
+        global.gc();
+        yield Scripting.sleep(1000);
+        Scripting.collectStatistics();
+        Scripting.scriptEvent('afterShowHide');
+    }
+
+    yield Scripting.destroyTestWindows();
+    yield Scripting.sleep(1000);
+
+    Main.overview.show();
+    yield Scripting.waitLeisure();
+
+    for (let i = 0; i < 2; i++) {
+        Scripting.scriptEvent('applicationsShowStart');
+        Main.overview.viewSelector.switchTab('applications');
+        yield Scripting.waitLeisure();
+        Scripting.scriptEvent('applicationsShowDone');
+        Main.overview.viewSelector.switchTab('windows');
+        yield Scripting.waitLeisure();
+    }
+}
+
+let showingOverview = false;
+let finishedShowingOverview = false;
+let overviewShowStart;
+let overviewFrames;
+let overviewLatency;
+let mallocUsedSize = 0;
+let overviewShowCount = 0;
+let firstOverviewUsedSize;
+let haveSwapComplete = false;
+let applicationsShowStart;
+let applicationsShowCount = 0;
+
+function script_overviewShowStart(time) {
+    showingOverview = true;
+    finishedShowingOverview = false;
+    overviewShowStart = time;
+    overviewFrames = 0;
+}
+
+function script_overviewShowDone(time) {
+    // We've set up the state at the end of the zoom out, but we
+    // need to wait for one more frame to paint before we count
+    // ourselves as done.
+    finishedShowingOverview = true;
+}
+
+function script_applicationsShowStart(time) {
+    applicationsShowStart = time;
+}
+
+function script_applicationsShowDone(time) {
+    applicationsShowCount++;
+    if (applicationsShowCount == 1)
+        METRICS.applicationsShowTimeFirst.value = time - applicationsShowStart;
+    else
+        METRICS.applicationsShowTimeSubsequent.value = time - applicationsShowStart;
+}
+
+function script_afterShowHide(time) {
+    if (overviewShowCount == 1) {
+        METRICS.usedAfterOverview.value = mallocUsedSize;
+    } else {
+        METRICS.leakedAfterOverview.value = mallocUsedSize - METRICS.usedAfterOverview.value;
+    }
+}
+
+function malloc_usedSize(time, bytes) {
+    mallocUsedSize = bytes;
+}
+
+function _frameDone(time) {
+    if (showingOverview) {
+        if (overviewFrames == 0)
+            overviewLatency = time - overviewShowStart;
+
+        overviewFrames++;
+    }
+
+    if (finishedShowingOverview) {
+        showingOverview = false;
+        finishedShowingOverview = false;
+        overviewShowCount++;
+
+        let dt = (time - (overviewShowStart + overviewLatency)) / 1000000;
+
+        // If we see a start frame and an end frame, that would
+        // be 1 frame for a FPS computation, hence the '- 1'
+        let fps = (overviewFrames - 1) / dt;
+
+        if (overviewShowCount == 1) {
+            METRICS.overviewLatencyFirst.value = overviewLatency;
+            METRICS.overviewFpsFirst.value = fps;
+        } else if (overviewShowCount == 2) {
+            METRICS.overviewLatencySubsequent.value = overviewLatency;
+        }
+
+        // Other than overviewFpsFirst, we collect FPS metrics the second
+        // we show each window configuration. overviewShowCount is 1,2,3...
+        if (overviewShowCount % 2 == 0) {
+            let config = WINDOW_CONFIGS[(overviewShowCount / 2) - 1];
+            METRICS[config.metric].value = fps;
+        }
+    }
+}
+
+function glx_swapComplete(time, swapTime) {
+    haveSwapComplete = true;
+
+    _frameDone(swapTime);
+}
+
+function clutter_stagePaintDone(time) {
+    // If we aren't receiving GLXBufferSwapComplete events, then we approximate
+    // the time the user sees a frame with the time we finished doing drawing
+    // commands for the frame. This doesn't take into account the time for
+    // the GPU to finish painting, and the time for waiting for the buffer
+    // swap, but if this are uniform - every frame takes the same time to draw -
+    // then it won't upset our FPS calculation, though the latency value
+    // will be slightly too low.
+
+    if (!haveSwapComplete)
+        _frameDone(time);
+}

js/ui/Makefile.am

@@ -1,36 +0,0 @@
-jsuidir = $(pkgdatadir)/js/ui
-
-dist_jsui_DATA =		\
-	altTab.js		\
-	appDisplay.js		\
-	appFavorites.js		\
-	calendar.js		\
-	chrome.js		\
-	dash.js			\
-	dnd.js			\
-	docDisplay.js		\
-	environment.js		\
-	extensionSystem.js  \
-	genericDisplay.js	\
-	lightbox.js		\
-	link.js			\
-	lookingGlass.js		\
-	main.js			\
-	messageTray.js          \
-	notificationDaemon.js   \
-	overview.js		\
-	panel.js		\
-	placeDisplay.js		\
-	runDialog.js		\
-	search.js           \
-	shellDBus.js		\
-	sidebar.js		\
-	statusMenu.js		\
-	tweener.js		\
-	widget.js		\
-	widgetBox.js		\
-	windowAttentionHandler.js      \
-	windowManager.js	\
-	workspacesView.js	\
-	workspaceSwitcherPopup.js	\
-	workspace.js

js/ui/altTab.js

@@ -1,12 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -14,22 +12,17 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
-const POPUP_ARROW_COLOR = new Clutter.Color();
-POPUP_ARROW_COLOR.from_pixel(0xffffffff);
-const POPUP_UNFOCUSED_ARROW_COLOR = new Clutter.Color();
-POPUP_UNFOCUSED_ARROW_COLOR.from_pixel(0x808080ff);
-const TRANSPARENT_COLOR = new Clutter.Color();
-TRANSPARENT_COLOR.from_pixel(0x00000000);
-
 const POPUP_APPICON_SIZE = 96;
-const POPUP_LIST_SPACING = 8;
 const POPUP_SCROLL_TIME = 0.10; // seconds
+const POPUP_FADE_TIME = 0.1; // seconds
+
+const APP_ICON_HOVER_TIMEOUT = 200; // milliseconds
 
 const DISABLE_HOVER_TIMEOUT = 500; // milliseconds
 
 const THUMBNAIL_DEFAULT_SIZE = 256;
 const THUMBNAIL_POPUP_TIME = 500; // milliseconds
-const THUMBNAIL_FADE_TIME = 0.2; // seconds
+const THUMBNAIL_FADE_TIME = 0.1; // seconds
 
 const iconSizes = [96, 64, 48, 32, 22];
 
@@ -43,7 +36,9 @@ function AltTabPopup() {
 
 AltTabPopup.prototype = {
     _init : function() {
-        this.actor = new Shell.GenericContainer({ reactive: true });
+        this.actor = new Shell.GenericContainer({ name: 'altTabPopup',
+                                                  reactive: true,
+                                                  visible: false });
 
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
@@ -54,15 +49,17 @@ AltTabPopup.prototype = {
         this._haveModal = false;
 
         this._currentApp = 0;
-        this._currentWindow = 0;
+        this._currentWindow = -1;
         this._thumbnailTimeoutId = 0;
         this._motionTimeoutId = 0;
 
+        this.thumbnailsVisible = false;
+
         // Initially disable hover so we ignore the enter-event if
         // the switcher appears underneath the current pointer location
         this._disableHover();
 
-        global.stage.add_actor(this.actor);
+        Main.uiGroup.add_actor(this.actor);
     },
 
     _getPreferredWidth: function (actor, forHeight, alloc) {
@@ -77,15 +74,21 @@ AltTabPopup.prototype = {
 
     _allocate: function (actor, box, flags) {
         let childBox = new Clutter.ActorBox();
-        let focus = global.get_focus_monitor();
+        let primary = global.get_primary_monitor();
+
+        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
+        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
+        let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
+        let vPadding = this.actor.get_theme_node().get_vertical_padding();
+        let hPadding = leftPadding + rightPadding;
 
         // Allocate the appSwitcher
         // We select a size based on an icon size that does not overflow the screen
-        let [childMinHeight, childNaturalHeight] = this._appSwitcher.actor.get_preferred_height(focus.width - POPUP_LIST_SPACING * 2);
+        let [childMinHeight, childNaturalHeight] = this._appSwitcher.actor.get_preferred_height(primary.width - hPadding);
         let [childMinWidth, childNaturalWidth] = this._appSwitcher.actor.get_preferred_width(childNaturalHeight);
-        childBox.x1 = Math.max(POPUP_LIST_SPACING, focus.x + Math.floor((focus.width - childNaturalWidth) / 2));
-        childBox.x2 = Math.min(childBox.x1 + focus.width - POPUP_LIST_SPACING * 2, childBox.x1 + childNaturalWidth);
-        childBox.y1 = focus.y + Math.floor((focus.height - childNaturalHeight) / 2);
+        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
+        childBox.x2 = Math.min(primary.x + primary.width - hPadding, childBox.x1 + childNaturalWidth);
+        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
         childBox.y2 = childBox.y1 + childNaturalHeight;
         this._appSwitcher.actor.allocate(childBox, flags);
 
@@ -94,29 +97,33 @@ AltTabPopup.prototype = {
         // those calculations
         if (this._thumbnails) {
             let icon = this._appIcons[this._currentApp].actor;
+            // Force a stage relayout to make sure we get the correct position
+            global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, 0, 0);
             let [posX, posY] = icon.get_transformed_position();
             let thumbnailCenter = posX + icon.width / 2;
             let [childMinWidth, childNaturalWidth] = this._thumbnails.actor.get_preferred_width(-1);
-            childBox.x1 = Math.max(POPUP_LIST_SPACING, Math.floor(thumbnailCenter - childNaturalWidth / 2));
-            if (childBox.x1 + childNaturalWidth > focus.width - POPUP_LIST_SPACING * 2) {
-                let offset = childBox.x1 + childNaturalWidth - focus.width + POPUP_LIST_SPACING * 2;
-                childBox.x1 = Math.max(POPUP_LIST_SPACING, childBox.x1 - offset - POPUP_LIST_SPACING * 2);
+            childBox.x1 = Math.max(primary.x + leftPadding, Math.floor(thumbnailCenter - childNaturalWidth / 2));
+            if (childBox.x1 + childNaturalWidth > primary.x + primary.width - hPadding) {
+                let offset = childBox.x1 + childNaturalWidth - primary.width + hPadding;
+                childBox.x1 = Math.max(primary.x + leftPadding, childBox.x1 - offset - hPadding);
             }
 
+            let spacing = this.actor.get_theme_node().get_length('spacing');
+
             childBox.x2 = childBox.x1 +  childNaturalWidth;
-            if (childBox.x2 > focus.width - POPUP_LIST_SPACING)
-                childBox.x2 = focus.width - POPUP_LIST_SPACING;
-            childBox.y1 = this._appSwitcher.actor.allocation.y2 + POPUP_LIST_SPACING * 2;
-            this._thumbnails.addClones(focus.height - POPUP_LIST_SPACING - childBox.y1);
+            if (childBox.x2 > primary.x + primary.width - rightPadding)
+                childBox.x2 = primary.x + primary.width - rightPadding;
+            childBox.y1 = this._appSwitcher.actor.allocation.y2 + spacing;
+            this._thumbnails.addClones(primary.height - bottomPadding - childBox.y1);
             let [childMinHeight, childNaturalHeight] = this._thumbnails.actor.get_preferred_height(-1);
             childBox.y2 = childBox.y1 + childNaturalHeight;
             this._thumbnails.actor.allocate(childBox, flags);
         }
     },
 
-    show : function(backward) {
+    show : function(backward, switch_group) {
         let tracker = Shell.WindowTracker.get_default();
-        let apps = tracker.get_running_apps ("");
+        let apps = tracker.get_running_apps ('');
 
         if (!apps.length)
             return false;
@@ -125,13 +132,13 @@ AltTabPopup.prototype = {
             return false;
         this._haveModal = true;
 
-        this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
+        this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
+        this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
 
         this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
         this.actor.connect('scroll-event', Lang.bind(this, this._onScroll));
 
-        this._appSwitcher = new AppSwitcher(apps);
+        this._appSwitcher = new AppSwitcher(apps, this);
         this.actor.add_actor(this._appSwitcher.actor);
         this._appSwitcher.connect('item-activated', Lang.bind(this, this._appActivated));
         this._appSwitcher.connect('item-entered', Lang.bind(this, this._appEntered));
@@ -139,29 +146,21 @@ AltTabPopup.prototype = {
         this._appIcons = this._appSwitcher.icons;
 
         // Make the initial selection
-        if (this._appIcons.length == 1) {
-            if (!backward && this._appIcons[0].cachedWindows.length > 1) {
-                // For compatibility with the multi-app case below
-                this._select(0, 1, true);
-            } else
-                this._select(0);
+        if (switch_group) {
+            if (backward) {
+                this._select(0, this._appIcons[0].cachedWindows.length - 1);
+            } else {
+                if (this._appIcons[0].cachedWindows.length > 1)
+                    this._select(0, 1);
+                else
+                    this._select(0, 0);
+            }
+        } else if (this._appIcons.length == 1) {
+            this._select(0);
         } else if (backward) {
             this._select(this._appIcons.length - 1);
         } else {
-            let firstWindows = this._appIcons[0].cachedWindows;
-            if (firstWindows.length > 1) {
-                let curAppNextWindow = firstWindows[1];
-                let nextAppWindow = this._appIcons[1].cachedWindows[0];
-
-                // If the next window of the current app is more-recently-used
-                // than the first window of the next app, then select it.
-                if (curAppNextWindow.get_workspace() == global.screen.get_active_workspace() &&
-                    curAppNextWindow.get_user_time() > nextAppWindow.get_user_time())
-                    this._select(0, 1, true);
-                else
-                    this._select(1);
-            } else
-                this._select(1);
+            this._select(1);
         }
 
         // There's a race condition; if the user released Alt before
@@ -169,12 +168,20 @@ AltTabPopup.prototype = {
         // https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
         // details.) So we check now. (Have to do this after updating
         // selection.)
-        let mods = global.get_modifier_keys();
+        let [x, y, mods] = global.get_pointer();
         if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
             this._finish();
             return false;
         }
 
+        this.actor.opacity = 0;
+        this.actor.show();
+        Tweener.addTween(this.actor,
+                         { opacity: 255,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad'
+                         });
+
         return true;
     },
 
@@ -186,59 +193,70 @@ AltTabPopup.prototype = {
     },
 
     _nextWindow : function() {
+        // We actually want the second window if we're in the unset state
+        if (this._currentWindow == -1)
+            this._currentWindow = 0;
         return mod(this._currentWindow + 1,
                    this._appIcons[this._currentApp].cachedWindows.length);
     },
     _previousWindow : function() {
+        // Also assume second window here
+        if (this._currentWindow == -1)
+            this._currentWindow = 1;
         return mod(this._currentWindow - 1,
                    this._appIcons[this._currentApp].cachedWindows.length);
     },
 
     _keyPressEvent : function(actor, event) {
         let keysym = event.get_key_symbol();
-        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
+        let event_state = Shell.get_event_state(event);
+        let backwards = event_state & Clutter.ModifierType.SHIFT_MASK;
+        let action = global.screen.get_display().get_keybinding_action(event.get_key_code(), event_state);
 
         this._disableHover();
 
-        // The WASD stuff is for debugging in Xephyr, where the arrow
-        // keys aren't mapped correctly
-
-        if (keysym == Clutter.grave)
-            this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow());
+        if (action == Meta.KeyBindingAction.SWITCH_GROUP)
+            this._select(this._currentApp, backwards ? this._previousWindow() : this._nextWindow());
         else if (keysym == Clutter.Escape)
             this.destroy();
         else if (this._thumbnailsFocused) {
-            if (keysym == Clutter.Tab) {
-                if (shift && this._currentWindow == 0)
-                    this._select(this._previousApp());
-                else if (!shift && this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
-                    this._select(this._nextApp());
-                else
-                    this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow());
-            } else if (keysym == Clutter.Left || keysym == Clutter.a)
+            if (action == Meta.KeyBindingAction.SWITCH_WINDOWS)
+                if (backwards) {
+                    if (this._currentWindow == 0 || this._currentWindow == -1)
+                        this._select(this._previousApp());
+                    else
+                        this._select(this._currentApp, this._previousWindow());
+                } else {
+                    if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
+                        this._select(this._nextApp());
+                    else
+                        this._select(this._currentApp, this._nextWindow());
+                }
+            else if (keysym == Clutter.Left)
                 this._select(this._currentApp, this._previousWindow());
-            else if (keysym == Clutter.Right || keysym == Clutter.d)
+            else if (keysym == Clutter.Right)
                 this._select(this._currentApp, this._nextWindow());
-            else if (keysym == Clutter.Up || keysym == Clutter.w)
+            else if (keysym == Clutter.Up)
                 this._select(this._currentApp, null, true);
         } else {
-            if (keysym == Clutter.Tab)
-                this._select(shift ? this._previousApp() : this._nextApp());
-            else if (keysym == Clutter.Left || keysym == Clutter.a)
+            if (action == Meta.KeyBindingAction.SWITCH_WINDOWS)
+                this._select(backwards ? this._previousApp() : this._nextApp());
+            else if (keysym == Clutter.Left)
                 this._select(this._previousApp());
-            else if (keysym == Clutter.Right || keysym == Clutter.d)
+            else if (keysym == Clutter.Right)
                 this._select(this._nextApp());
-            else if (keysym == Clutter.Down || keysym == Clutter.s)
-                this._select(this._currentApp, this._currentWindow);
+            else if (keysym == Clutter.Down)
+                this._select(this._currentApp, 0);
         }
 
         return true;
     },
 
     _keyReleaseEvent : function(actor, event) {
-        let keysym = event.get_key_symbol();
+        let [x, y, mods] = global.get_pointer();
+        let state = mods & Clutter.ModifierType.MOD1_MASK;
 
-        if (keysym == Clutter.Alt_L || keysym == Clutter.Alt_R)
+        if (state == 0)
             this._finish();
 
         return true;
@@ -248,7 +266,7 @@ AltTabPopup.prototype = {
         let direction = event.get_scroll_direction();
         if (direction == Clutter.ScrollDirection.UP) {
             if (this._thumbnailsFocused) {
-                if (this._currentWindow == 0)
+                if (this._currentWindow == 0 || this._currentWindow == -1)
                     this._select(this._previousApp());
                 else
                     this._select(this._currentApp, this._previousWindow());
@@ -282,10 +300,17 @@ AltTabPopup.prototype = {
     _appActivated : function(appSwitcher, n) {
         // If the user clicks on the selected app, activate the
         // selected window; otherwise (eg, they click on an app while
-        // !mouseActive) activate the first window of the clicked-on
-        // app.
-        let window = (n == this._currentApp) ? this._currentWindow : 0;
-        Main.activateWindow(this._appIcons[n].cachedWindows[window]);
+        // !mouseActive) activate the the clicked-on app.
+        if (n == this._currentApp) {
+            let window;
+            if (this._currentWindow >= 0)
+                window = this._appIcons[this._currentApp].cachedWindows[this._currentWindow];
+            else
+                window = null;
+            this._appIcons[this._currentApp].app.activate_window(window, global.get_current_time());
+        } else {
+            this._appIcons[n].app.activate_window(null, global.get_current_time());
+        }
         this.destroy();
     },
 
@@ -297,7 +322,8 @@ AltTabPopup.prototype = {
     },
 
     _windowActivated : function(thumbnailList, n) {
-        Main.activateWindow(this._appIcons[this._currentApp].cachedWindows[n]);
+        let appIcon = this._appIcons[this._currentApp];
+        Main.activateWindow(appIcon.cachedWindows[n]);
         this.destroy();
     },
 
@@ -324,27 +350,43 @@ AltTabPopup.prototype = {
 
     _finish : function() {
         let app = this._appIcons[this._currentApp];
-        let window = app.cachedWindows[this._currentWindow];
-        Main.activateWindow(window);
+        if (this._currentWindow >= 0) {
+            Main.activateWindow(app.cachedWindows[this._currentWindow]);
+        } else {
+            app.app.activate_window(null, global.get_current_time());
+        }
         this.destroy();
     },
 
+    _popModal: function() {
+        if (this._haveModal) {
+            Main.popModal(this.actor);
+            this._haveModal = false;
+        }
+    },
+
     destroy : function() {
-        this.actor.destroy();
+        this._popModal();
+        if (this.actor.visible) {
+            Tweener.addTween(this.actor,
+                             { opacity: 0,
+                               time: POPUP_FADE_TIME,
+                               transition: 'easeOutQuad',
+                               onComplete: Lang.bind(this,
+                                   function() {
+                                       this.actor.destroy();
+                                   })
+                             });
+        } else
+            this.actor.destroy();
     },
 
     _onDestroy : function() {
-        if (this._haveModal)
-            Main.popModal(this.actor);
+        this._popModal();
 
         if (this._thumbnails)
             this._destroyThumbnails();
 
-        if (this._keyPressEventId)
-            global.stage.disconnect(this._keyPressEventId);
-        if (this._keyReleaseEventId)
-            global.stage.disconnect(this._keyReleaseEventId);
-
         if (this._motionTimeoutId != 0)
             Mainloop.source_remove(this._motionTimeoutId);
         if (this._thumbnailTimeoutId != 0)
@@ -390,7 +432,7 @@ AltTabPopup.prototype = {
         this._thumbnailsFocused = (window != null) && !forceAppFocus;
 
         this._currentApp = app;
-        this._currentWindow = window ? window : 0;
+        this._currentWindow = window ? window : -1;
         this._appSwitcher.highlight(app, this._thumbnailsFocused);
 
         if (window != null) {
@@ -402,19 +444,28 @@ AltTabPopup.prototype = {
                    !forceAppFocus) {
             this._thumbnailTimeoutId = Mainloop.timeout_add (
                 THUMBNAIL_POPUP_TIME,
-                Lang.bind(this, function () {
-                              this._select(this._currentApp, 0, true);
-                              return false;
-                          }));
+                Lang.bind(this, this._timeoutPopupThumbnails));
         }
     },
 
+    _timeoutPopupThumbnails: function() {
+        if (!this._thumbnails)
+            this._createThumbnails();
+        this._thumbnailTimeoutId = 0;
+        this._thumbnailsFocused = false;
+        return false;
+    },
+
     _destroyThumbnails : function() {
-        Tweener.addTween(this._thumbnails.actor,
+        let thumbnailsActor = this._thumbnails.actor;
+        Tweener.addTween(thumbnailsActor,
                          { opacity: 0,
                            time: THUMBNAIL_FADE_TIME,
-                           transition: "easeOutQuad",
-                           onComplete: function() { this.destroy(); }
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function() {
+                                                            thumbnailsActor.destroy();
+                                                            this.thumbnailsVisible = false;
+                                                        })
                          });
         this._thumbnails = null;
     },
@@ -430,7 +481,8 @@ AltTabPopup.prototype = {
         Tweener.addTween(this._thumbnails.actor,
                          { opacity: 255,
                            time: THUMBNAIL_FADE_TIME,
-                           transition: "easeOutQuad"
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function () { this.thumbnailsVisible = true; })
                          });
     }
 };
@@ -441,12 +493,18 @@ function SwitcherList(squareItems) {
 
 SwitcherList.prototype = {
     _init : function(squareItems) {
-        this.actor = new St.BoxLayout({ style_class: 'switcher-list' });
+        this.actor = new Shell.GenericContainer({ style_class: 'switcher-list' });
+        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate', Lang.bind(this, this._allocateTop));
 
         // Here we use a GenericContainer so that we can force all the
         // children except the separator to have the same width.
-        this._list = new Shell.GenericContainer();
-        this._list.spacing = POPUP_LIST_SPACING;
+        this._list = new Shell.GenericContainer({ style_class: 'switcher-list-item-container' });
+        this._list.spacing = 0;
+        this._list.connect('style-changed', Lang.bind(this, function() {
+                                                        this._list.spacing = this._list.get_theme_node().get_length('spacing');
+                                                     }));
 
         this._list.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
@@ -462,46 +520,91 @@ SwitcherList.prototype = {
         this.actor.add_actor(this._rightGradient);
 
         // Those arrows indicate whether scrolling in one direction is possible
-        this._leftArrow = new St.DrawingArea();
+        this._leftArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
+                                               pseudo_class: 'highlighted' });
         this._leftArrow.connect('repaint', Lang.bind(this,
-                                            function (area) {
-                                                Shell.draw_box_pointer(area, Shell.PointerDirection.LEFT, TRANSPARENT_COLOR, POPUP_ARROW_COLOR);
-                                            }));
-
-        this._rightArrow = new St.DrawingArea();
+            function() { _drawArrow(this._leftArrow, St.Side.LEFT); }));
+        this._rightArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
+                                                pseudo_class: 'highlighted' });
         this._rightArrow.connect('repaint', Lang.bind(this,
-                                            function (area) {
-                                                Shell.draw_box_pointer(area, Shell.PointerDirection.RIGHT, TRANSPARENT_COLOR, POPUP_ARROW_COLOR);
-                                            }));
+            function() { _drawArrow(this._rightArrow, St.Side.RIGHT); }));
 
-        this._leftGradient.add_actor(this._leftArrow);
-        this._rightGradient.add_actor(this._rightArrow);
+        this.actor.add_actor(this._leftArrow);
+        this.actor.add_actor(this._rightArrow);
 
         this._items = [];
         this._highlighted = -1;
         this._separator = null;
         this._squareItems = squareItems;
-        this._scrollable = false;
+        this._minSize = 0;
+        this._scrollableRight = true;
+        this._scrollableLeft = false;
+    },
+
+    _allocateTop: function(actor, box, flags) {
+        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
+        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
+
+        let childBox = new Clutter.ActorBox();
+        let scrollable = this._minSize > box.x2 - box.x1;
+
+        this._clipBin.allocate(box, flags);
+
+        childBox.x1 = 0;
+        childBox.y1 = 0;
+        childBox.x2 = this._leftGradient.width;
+        childBox.y2 = this.actor.height;
+        this._leftGradient.allocate(childBox, flags);
+        this._leftGradient.opacity = (this._scrollableLeft && scrollable) ? 255 : 0;
+
+        childBox.x1 = (this.actor.allocation.x2 - this.actor.allocation.x1) - this._rightGradient.width;
+        childBox.y1 = 0;
+        childBox.x2 = childBox.x1 + this._rightGradient.width;
+        childBox.y2 = this.actor.height;
+        this._rightGradient.allocate(childBox, flags);
+        this._rightGradient.opacity = (this._scrollableRight && scrollable) ? 255 : 0;
+
+        let arrowWidth = Math.floor(leftPadding / 3);
+        let arrowHeight = arrowWidth * 2;
+        childBox.x1 = leftPadding / 2;
+        childBox.y1 = this.actor.height / 2 - arrowWidth;
+        childBox.x2 = childBox.x1 + arrowWidth;
+        childBox.y2 = childBox.y1 + arrowHeight;
+        this._leftArrow.allocate(childBox, flags);
+        this._leftArrow.opacity = this._leftGradient.opacity;
+
+        arrowWidth = Math.floor(rightPadding / 3);
+        arrowHeight = arrowWidth * 2;
+        childBox.x1 = this.actor.width - arrowWidth - rightPadding / 2;
+        childBox.y1 = this.actor.height / 2 - arrowWidth;
+        childBox.x2 = childBox.x1 + arrowWidth;
+        childBox.y2 = childBox.y1 + arrowHeight;
+        this._rightArrow.allocate(childBox, flags);
+        this._rightArrow.opacity = this._rightGradient.opacity;
     },
 
     addItem : function(item) {
-        let bbox = new St.Clickable({ style_class: 'item-box',
-                                      reactive: true });
+        let bbox = new St.Button({ style_class: 'item-box',
+                                   reactive: true });
 
         bbox.set_child(item);
         this._list.add_actor(bbox);
 
         let n = this._items.length;
-        bbox.connect('clicked', Lang.bind(this, function () {
-                                               this._itemActivated(n);
-                                          }));
-        bbox.connect('enter-event', Lang.bind(this, function () {
-                                                  this._itemEntered(n);
-                                              }));
+        bbox.connect('clicked', Lang.bind(this, function() { this._onItemClicked(n); }));
+        bbox.connect('enter-event', Lang.bind(this, function() { this._onItemEnter(n); }));
 
         this._items.push(bbox);
     },
 
+    _onItemClicked: function (index) {
+        this._itemActivated(index);
+    },
+
+    _onItemEnter: function (index) {
+        this._itemEntered(index);
+    },
+
     addSeparator: function () {
         let box = new St.Bin({ style_class: 'separator' });
         this._separator = box;
@@ -509,24 +612,25 @@ SwitcherList.prototype = {
     },
 
     highlight: function(index, justOutline) {
-        if (this._highlighted != -1)
-            this._items[this._highlighted].style_class = 'item-box';
+        if (this._highlighted != -1) {
+            this._items[this._highlighted].remove_style_pseudo_class('outlined');
+            this._items[this._highlighted].remove_style_pseudo_class('selected');
+        }
 
         this._highlighted = index;
 
         if (this._highlighted != -1) {
             if (justOutline)
-                this._items[this._highlighted].style_class = 'outlined-item-box';
+                this._items[this._highlighted].add_style_pseudo_class('outlined');
             else
-                this._items[this._highlighted].style_class = 'selected-item-box';
+                this._items[this._highlighted].add_style_pseudo_class('selected');
         }
 
-        let monitor = global.get_focus_monitor();
+        let monitor = global.get_primary_monitor();
         let itemSize = this._items[index].allocation.x2 - this._items[index].allocation.x1;
         let [posX, posY] = this._items[index].get_transformed_position();
         posX += this.actor.x;
-
-        if (posX + itemSize > monitor.width)
+        if (posX + itemSize > monitor.width + monitor.x)
             this._scrollToRight();
         else if (posX < 0)
             this._scrollToLeft();
@@ -535,28 +639,33 @@ SwitcherList.prototype = {
 
     _scrollToLeft : function() {
         let x = this._items[this._highlighted].allocation.x1;
-        this._rightGradient.show();
+        this._scrollableRight = true;
         Tweener.addTween(this._list, { anchor_x: x,
                                         time: POPUP_SCROLL_TIME,
                                         transition: 'easeOutQuad',
                                         onComplete: Lang.bind(this, function () {
-                                                                        if (this._highlighted == 0)
-                                                                            this._leftGradient.hide();
+                                                                        if (this._highlighted == 0) {
+                                                                            this._scrollableLeft = false;
+                                                                            this.actor.queue_relayout();
+                                                                        }
                                                              })
                         });
     },
 
     _scrollToRight : function() {
-        let monitor = global.get_focus_monitor();
+        this._scrollableLeft = true;
+        let monitor = global.get_primary_monitor();
         let padding = this.actor.get_theme_node().get_horizontal_padding();
-        let x = this._items[this._highlighted].allocation.x2 - monitor.width + padding + POPUP_LIST_SPACING * 2;
-        this._leftGradient.show();
+        let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
+        let x = this._items[this._highlighted].allocation.x2 - monitor.width + padding + parentPadding;
         Tweener.addTween(this._list, { anchor_x: x,
                                         time: POPUP_SCROLL_TIME,
                                         transition: 'easeOutQuad',
                                         onComplete: Lang.bind(this, function () {
-                                                                        if (this._highlighted == this._items.length - 1)
-                                                                            this._rightGradient.hide();
+                                                                        if (this._highlighted == this._items.length - 1) {
+                                                                            this._scrollableRight = false;
+                                                                            this.actor.queue_relayout();
+                                                                        }
                                                              })
                         });
     },
@@ -600,6 +709,7 @@ SwitcherList.prototype = {
         let totalSpacing = this._list.spacing * (this._items.length - 1);
         alloc.min_size = this._items.length * maxChildMin + separatorWidth + totalSpacing;
         alloc.natural_size = alloc.min_size;
+        this._minSize = alloc.min_size;
     },
 
     _getPreferredHeight: function (actor, forWidth, alloc) {
@@ -641,12 +751,15 @@ SwitcherList.prototype = {
         let children = this._list.get_children();
         let childBox = new Clutter.ActorBox();
 
-        let focus = global.get_focus_monitor();
-        if (this.actor.allocation.x2 == focus.width - POPUP_LIST_SPACING) {
+        let primary = global.get_primary_monitor();
+        let parentRightPadding = this.actor.get_parent().get_theme_node().get_padding(St.Side.RIGHT);
+        if (this.actor.allocation.x2 == primary.x + primary.width - parentRightPadding) {
             if (this._squareItems)
                 childWidth = childHeight;
-            else
-                childWidth = children[0].get_preferred_width(childHeight)[0];
+            else {
+                let [childMin, childNat] = children[0].get_preferred_width(childHeight);
+                childWidth = childMin;
+            }
         }
 
         for (let i = 0; i < children.length; i++) {
@@ -679,36 +792,6 @@ SwitcherList.prototype = {
         let topPadding = this.actor.get_theme_node().get_padding(St.Side.TOP);
         let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
 
-        // Show the arrows and gradients when scrolling is needed
-        if (children[children.length - 1].allocation.x2 > this.actor.width - leftPadding - rightPadding && !this._scrollable) {
-            this._leftGradient.set_height(this.actor.height);
-            this._leftGradient.x = this.actor.x;
-            this._leftGradient.y = this.actor.y;
-
-            this._rightGradient.set_height(this.actor.height);
-            this._rightGradient.x = this.actor.x + (this.actor.allocation.x2 - this.actor.allocation.x1) - this._rightGradient.width;
-            this._rightGradient.y = this.actor.y;
-
-            let arrowWidth = Math.floor(leftPadding / 3);
-            let arrowHeight = arrowWidth * 2;
-            this._leftArrow.set_size(arrowWidth, arrowHeight);
-            this._leftArrow.set_position(POPUP_LIST_SPACING, this.actor.height / 2 - arrowWidth);
-
-            arrowWidth = Math.floor(rightPadding / 3);
-            arrowHeight = arrowWidth * 2;
-            this._rightArrow.set_size(arrowWidth, arrowHeight);
-            this._rightArrow.set_position(this._rightGradient.width - arrowHeight, this.actor.height / 2 - arrowWidth);
-
-            this._scrollable = true;
-
-            this._leftGradient.hide();
-            this._rightGradient.show();
-        }
-        else if (!this._scrollable){
-            this._leftGradient.hide();
-            this._rightGradient.hide();
-        }
-
         // Clip the area for scrolling
         this._clipBin.set_clip(0, -topPadding, (this.actor.allocation.x2 - this.actor.allocation.x1) - leftPadding - rightPadding, this.actor.height + bottomPadding);
     }
@@ -723,10 +806,10 @@ function AppIcon(app) {
 AppIcon.prototype = {
     _init: function(app) {
         this.app = app;
-        this.actor = new St.BoxLayout({ style_class: "alt-tab-app",
+        this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
                                          vertical: true });
         this.icon = null;
-        this._iconBin = new St.Bin();
+        this._iconBin = new St.Bin({ x_fill: true, y_fill: true });
 
         this.actor.add(this._iconBin, { x_fill: false, y_fill: false } );
         this.label = new St.Label({ text: this.app.get_name() });
@@ -740,14 +823,14 @@ AppIcon.prototype = {
     }
 };
 
-function AppSwitcher(apps) {
-    this._init(apps);
+function AppSwitcher(apps, altTabPopup) {
+    this._init(apps, altTabPopup);
 }
 
 AppSwitcher.prototype = {
     __proto__ : SwitcherList.prototype,
 
-    _init : function(apps) {
+    _init : function(apps, altTabPopup) {
         SwitcherList.prototype._init.call(this, true);
 
         // Construct the AppIcons, sort by time, add to the popup
@@ -779,6 +862,8 @@ AppSwitcher.prototype = {
 
         this._curApp = -1;
         this._iconSize = 0;
+        this._altTabPopup = altTabPopup;
+        this._mouseTimeOutId = 0;
     },
 
     _getPreferredHeight: function (actor, forWidth, alloc) {
@@ -786,16 +871,19 @@ AppSwitcher.prototype = {
         while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
                 j++;
         }
-        let iconPadding = this._items[j].get_theme_node().get_horizontal_padding();
+        let themeNode = this._items[j].get_theme_node();
+        let iconPadding = themeNode.get_horizontal_padding();
+        let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
         let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
-        let iconSpacing = iconNaturalHeight + iconPadding;
+        let iconSpacing = iconNaturalHeight + iconPadding + iconBorder;
         let totalSpacing = this._list.spacing * (this._items.length - 1);
         if (this._separator)
            totalSpacing += this._separator.width + this._list.spacing;
 
         // We just assume the whole screen here due to weirdness happing with the passed width
-        let focus = global.get_focus_monitor();
-        let availWidth = focus.width - POPUP_LIST_SPACING * 2 - this.actor.get_theme_node().get_horizontal_padding();
+        let primary = global.get_primary_monitor();
+        let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
+        let availWidth = primary.width - parentPadding - this.actor.get_theme_node().get_horizontal_padding();
         let height = 0;
 
         for(let i =  0; i < iconSizes.length; i++) {
@@ -811,17 +899,17 @@ AppSwitcher.prototype = {
             height = iconSizes[0] + iconSpacing;
         }
 
-        alloc.min_size = height;
-        alloc.natural_size = height;
-    },
-
-    _allocate: function (actor, box, flags) {
         for(let i = 0; i < this.icons.length; i++) {
             if (this.icons[i].icon != null)
                 break;
             this.icons[i].set_size(this._iconSize);
         }
 
+        alloc.min_size = height;
+        alloc.natural_size = height;
+    },
+
+    _allocate: function (actor, box, flags) {
         // Allocate the main list items
         SwitcherList.prototype._allocate.call(this, actor, box, flags);
 
@@ -840,22 +928,42 @@ AppSwitcher.prototype = {
         }
     },
 
+    // We override SwitcherList's _onItemEnter method to delay
+    // activation when the thumbnail list is open
+    _onItemEnter: function (index) {
+        if (this._mouseTimeOutId != 0)
+            Mainloop.source_remove(this._mouseTimeOutId);
+        if (this._altTabPopup.thumbnailsVisible) {
+            this._mouseTimeOutId = Mainloop.timeout_add(APP_ICON_HOVER_TIMEOUT,
+                                                        Lang.bind(this, function () {
+                                                                            this._enterItem(index);
+                                                                            this._mouseTimeOutId = 0;
+                                                                            return false;
+                                                        }));
+        } else
+           this._itemEntered(index);
+    },
+
+    _enterItem: function(index) {
+        let [x, y, mask] = global.get_pointer();
+        let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
+        if (this._items[index].contains(pickedActor))
+            this._itemEntered(index);
+    },
+
     // We override SwitcherList's highlight() method to also deal with
     // the AppSwitcher->ThumbnailList arrows. Apps with only 1 window
     // will hide their arrows by default, but show them when their
     // thumbnails are visible (ie, when the app icon is supposed to be
     // in justOutline mode). Apps with multiple windows will normally
     // show a dim arrow, but show a bright arrow when they are
-    // highlighted; their redraw handler will use the right color
-    // based on this._curApp; we just need to do a queue_relayout() to
-    // force it to redraw. (queue_redraw() doesn't work because
-    // ShellDrawingArea only redraws on allocate.)
+    // highlighted.
     highlight : function(n, justOutline) {
         if (this._curApp != -1) {
             if (this.icons[this._curApp].cachedWindows.length == 1)
                 this._arrows[this._curApp].hide();
             else
-                this._arrows[this._curApp].queue_relayout();
+                this._arrows[this._curApp].remove_style_pseudo_class('highlighted');
         }
 
         SwitcherList.prototype.highlight.call(this, n, justOutline);
@@ -865,7 +973,7 @@ AppSwitcher.prototype = {
             if (justOutline && this.icons[this._curApp].cachedWindows.length == 1)
                 this._arrows[this._curApp].show();
             else
-                this._arrows[this._curApp].queue_relayout();
+                this._arrows[this._curApp].add_style_pseudo_class('highlighted');
         }
     },
 
@@ -874,13 +982,8 @@ AppSwitcher.prototype = {
         this.addItem(appIcon.actor);
 
         let n = this._arrows.length;
-        let arrow = new St.DrawingArea();
-        arrow.connect('repaint', Lang.bind(this,
-            function (area) {
-                Shell.draw_box_pointer(area, Shell.PointerDirection.DOWN,
-                                       TRANSPARENT_COLOR,
-                                       this._curApp == n ? POPUP_ARROW_COLOR : POPUP_UNFOCUSED_ARROW_COLOR);
-            }));
+        let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
+        arrow.connect('repaint', function() { _drawArrow(arrow, St.Side.BOTTOM); });
         this._list.add_actor(arrow);
         this._arrows.push(arrow);
 
@@ -914,7 +1017,7 @@ ThumbnailList.prototype = {
 
         let activeWorkspace = global.screen.get_active_workspace();
 
-        // We fake the value of "separatorAdded" when the app has no window
+        // We fake the value of 'separatorAdded' when the app has no window
         // on the current workspace, to avoid displaying a useless separator in
         // that case.
         let separatorAdded = windows.length == 0 || windows[0].get_workspace() != activeWorkspace;
@@ -930,10 +1033,10 @@ ThumbnailList.prototype = {
               separatorAdded = true;
             }
 
-            let box = new St.BoxLayout({ style_class: "thumbnail-box",
+            let box = new St.BoxLayout({ style_class: 'thumbnail-box',
                                          vertical: true });
 
-            let bin = new St.Bin({ style_class: "thumbnail" });
+            let bin = new St.Bin({ style_class: 'thumbnail' });
 
             box.add_actor(bin);
             this._thumbnailBins.push(bin);
@@ -958,9 +1061,7 @@ ThumbnailList.prototype = {
         let totalPadding = this._items[0].get_theme_node().get_horizontal_padding() + this._items[0].get_theme_node().get_vertical_padding();
         totalPadding += this.actor.get_theme_node().get_horizontal_padding() + this.actor.get_theme_node().get_vertical_padding();
         let [labelMinHeight, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
-        let [found, spacing] = this._items[0].child.get_theme_node().get_length('spacing', false);
-        if (!found)
-            spacing = 0;
+        let spacing = this._items[0].child.get_theme_node().get_length('spacing');
 
         availHeight = Math.min(availHeight - labelNaturalHeight - totalPadding - spacing, THUMBNAIL_DEFAULT_SIZE);
         let binHeight = availHeight + this._items[0].get_theme_node().get_vertical_padding() + this.actor.get_theme_node().get_vertical_padding() - spacing;
@@ -968,6 +1069,9 @@ ThumbnailList.prototype = {
 
         for (let i = 0; i < this._thumbnailBins.length; i++) {
             let mutterWindow = this._windows[i].get_compositor_private();
+            if (!mutterWindow)
+                continue;
+
             let windowTexture = mutterWindow.get_texture ();
             let [width, height] = windowTexture.get_size();
             let scale = Math.min(1.0, THUMBNAIL_DEFAULT_SIZE / width, availHeight / height);
@@ -985,3 +1089,46 @@ ThumbnailList.prototype = {
         this._thumbnailBins = new Array();
     }
 };
+
+function _drawArrow(area, side) {
+    let themeNode = area.get_theme_node();
+    let borderColor = themeNode.get_border_color(side);
+    let bodyColor = themeNode.get_foreground_color();
+
+    let [width, height] = area.get_surface_size ();
+    let cr = area.get_context();
+
+    cr.setLineWidth(1.0);
+    Clutter.cairo_set_source_color(cr, borderColor);
+
+    switch (side) {
+    case St.Side.TOP:
+        cr.moveTo(0, height);
+        cr.lineTo(Math.floor(width * 0.5), 0);
+        cr.lineTo(width, height);
+        break;
+
+    case St.Side.BOTTOM:
+        cr.moveTo(width, 0);
+        cr.lineTo(Math.floor(width * 0.5), height);
+        cr.lineTo(0, 0);
+        break;
+
+    case St.Side.LEFT:
+        cr.moveTo(width, height);
+        cr.lineTo(0, Math.floor(height * 0.5));
+        cr.lineTo(width, 0);
+        break;
+
+    case St.Side.RIGHT:
+        cr.moveTo(0, 0);
+        cr.lineTo(width, Math.floor(height * 0.5));
+        cr.lineTo(0, height);
+        break;
+    }
+
+    cr.strokePreserve();
+
+    Clutter.cairo_set_source_color(cr, bodyColor);
+    cr.fill();
+}

js/ui/appFavorites.js

@@ -13,12 +13,11 @@ function AppFavorites() {
 }
 
 AppFavorites.prototype = {
-    FAVORITE_APPS_KEY: 'favorite_apps',
+    FAVORITE_APPS_KEY: 'favorite-apps',
 
     _init: function() {
         this._favorites = {};
-        this._gconf = Shell.GConf.get_default();
-        this._gconf.connect('changed::' + this.FAVORITE_APPS_KEY, Lang.bind(this, this._onFavsChanged));
+        global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, Lang.bind(this, this._onFavsChanged));
         this._reload();
     },
 
@@ -28,7 +27,7 @@ AppFavorites.prototype = {
     },
 
     _reload: function() {
-        let ids = Shell.GConf.get_default().get_string_list('favorite_apps');
+        let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
         let appSys = Shell.AppSystem.get_default();
         let apps = ids.map(function (id) {
                 return appSys.get_app(id);
@@ -64,7 +63,7 @@ AppFavorites.prototype = {
         return appId in this._favorites;
     },
 
-    _addFavorite: function(appId) {
+    _addFavorite: function(appId, pos) {
         if (appId in this._favorites)
             return false;
 
@@ -74,39 +73,55 @@ AppFavorites.prototype = {
             return false;
 
         let ids = this._getIds();
-        ids.push(appId);
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
+        if (pos == -1)
+            ids.push(appId);
+        else
+            ids.splice(pos, 0, appId);
+        global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
         this._favorites[appId] = app;
         return true;
     },
 
-    addFavorite: function(appId) {
-        if (!this._addFavorite(appId))
+    addFavoriteAtPos: function(appId, pos) {
+        if (!this._addFavorite(appId, pos))
             return;
 
         let app = Shell.AppSystem.get_default().get_app(appId);
 
-        Main.overview.infoBar.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
+        Main.overview.shellInfo.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
             this._removeFavorite(appId);
         }));
     },
 
+    addFavorite: function(appId) {
+        this.addFavoriteAtPos(appId, -1);
+    },
+
+    moveFavoriteToPos: function(appId, pos) {
+        this._removeFavorite(appId);
+        this._addFavorite(appId, pos);
+    },
+
     _removeFavorite: function(appId) {
         if (!appId in this._favorites)
             return false;
 
         let ids = this._getIds().filter(function (id) { return id != appId; });
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
+        global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
         return true;
     },
 
     removeFavorite: function(appId) {
+        let ids = this._getIds();
+        let pos = ids.indexOf(appId);
+
+        let app = this._favorites[appId];
         if (!this._removeFavorite(appId))
             return;
 
-        Main.overview.infoBar.setMessage(_("%s has been removed from your favorites.").format(this._favorites[appId].get_name()),
+        Main.overview.shellInfo.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
                                          Lang.bind(this, function () {
-            this._addFavorite(appId);
+            this._addFavorite(appId, pos);
         }));
     }
 };

js/ui/boxpointer.js

@@ -0,0 +1,438 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const Tweener = imports.ui.tweener;
+
+const POPUP_ANIMATION_TIME = 0.15;
+
+/**
+ * BoxPointer:
+ * @side: side to draw the arrow on
+ * @binProperties: Properties to set on contained bin
+ *
+ * An actor which displays a triangle "arrow" pointing to a given
+ * side.  The .bin property is a container in which content can be
+ * placed.  The arrow position may be controlled via setArrowOrigin().
+ *
+ */
+function BoxPointer(side, binProperties) {
+    this._init(side, binProperties);
+}
+
+BoxPointer.prototype = {
+    _init: function(arrowSide, binProperties) {
+        this._arrowSide = arrowSide;
+        this._arrowOrigin = 0;
+        this.actor = new St.Bin({ x_fill: true,
+                                  y_fill: true });
+        this._container = new Shell.GenericContainer();
+        this.actor.set_child(this._container);
+        this._container.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this._container.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this._container.connect('allocate', Lang.bind(this, this._allocate));
+        this.bin = new St.Bin(binProperties);
+        this._container.add_actor(this.bin);
+        this._border = new St.DrawingArea();
+        this._border.connect('repaint', Lang.bind(this, this._drawBorder));
+        this._container.add_actor(this._border);
+        this.bin.raise(this._border);
+        this._xOffset = 0;
+        this._yOffset = 0;
+        this._xPosition = 0;
+        this._yPosition = 0;
+    },
+
+    show: function(animate, onComplete) {
+        let themeNode = this.actor.get_theme_node();
+        let rise = themeNode.get_length('-arrow-rise');
+
+        this.opacity = 0;
+        this.actor.show();
+
+        if (animate) {
+            switch (this._arrowSide) {
+                case St.Side.TOP:
+                    this.yOffset = -rise;
+                    break;
+                case St.Side.BOTTOM:
+                    this.yOffset = rise;
+                    break;
+                case St.Side.LEFT:
+                    this.xOffset = -rise;
+                    break;
+                case St.Side.RIGHT:
+                    this.xOffset = rise;
+                    break;
+            }
+        }
+
+        Tweener.addTween(this, { opacity: 255,
+                                 xOffset: 0,
+                                 yOffset: 0,
+                                 transition: "linear",
+                                 onComplete: onComplete,
+                                 time: POPUP_ANIMATION_TIME });
+    },
+
+    hide: function(animate, onComplete) {
+        let xOffset = 0;
+        let yOffset = 0;
+        let themeNode = this.actor.get_theme_node();
+        let rise = themeNode.get_length('-arrow-rise');
+
+        if (animate) {
+            switch (this._arrowSide) {
+                case St.Side.TOP:
+                    yOffset = rise;
+                    break;
+                case St.Side.BOTTOM:
+                    yOffset = -rise;
+                    break;
+                case St.Side.LEFT:
+                    xOffset = rise;
+                    break;
+                case St.Side.RIGHT:
+                    xOffset = -rise;
+                    break;
+            }
+        }
+
+        Tweener.addTween(this, { opacity: 0,
+                                 xOffset: xOffset,
+                                 yOffset: yOffset,
+                                 transition: "linear",
+                                 time: POPUP_ANIMATION_TIME,
+                                 onComplete: Lang.bind(this, function () {
+                                     this.actor.hide();
+                                     this.xOffset = 0;
+                                     this.yOffset = 0;
+                                     if (onComplete)
+                                         onComplete();
+                                 })
+                               });
+    },
+
+    _adjustAllocationForArrow: function(isWidth, alloc) {
+        let themeNode = this.actor.get_theme_node();
+        let borderWidth = themeNode.get_length('-arrow-border-width');
+        alloc.min_size += borderWidth * 2;
+        alloc.natural_size += borderWidth * 2;
+        if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM))
+            || (isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
+            let rise = themeNode.get_length('-arrow-rise');
+            alloc.min_size += rise;
+            alloc.natural_size += rise;
+        }
+    },
+
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        let [minInternalSize, natInternalSize] = this.bin.get_preferred_width(forHeight);
+        alloc.min_size = minInternalSize;
+        alloc.natural_size = natInternalSize;
+        this._adjustAllocationForArrow(true, alloc);
+    },
+
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth);
+        alloc.min_size = minSize;
+        alloc.natural_size = naturalSize;
+        this._adjustAllocationForArrow(false, alloc);
+    },
+
+    _allocate: function(actor, box, flags) {
+        let themeNode = this.actor.get_theme_node();
+        let borderWidth = themeNode.get_length('-arrow-border-width');
+        let rise = themeNode.get_length('-arrow-rise');
+        let childBox = new Clutter.ActorBox();
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        childBox.x1 = 0;
+        childBox.y1 = 0;
+        childBox.x2 = availWidth;
+        childBox.y2 = availHeight;
+        this._border.allocate(childBox, flags);
+
+        childBox.x1 = borderWidth;
+        childBox.y1 = borderWidth;
+        childBox.x2 = availWidth - borderWidth;
+        childBox.y2 = availHeight - borderWidth;
+        switch (this._arrowSide) {
+            case St.Side.TOP:
+                childBox.y1 += rise;
+                break;
+            case St.Side.BOTTOM:
+                childBox.y2 -= rise;
+                break;
+            case St.Side.LEFT:
+                childBox.x1 += rise;
+                break;
+            case St.Side.RIGHT:
+                childBox.x2 -= rise;
+                break;
+        }
+        this.bin.allocate(childBox, flags);
+
+        if (this._sourceActor && this._sourceActor.mapped)
+            this._reposition(this._sourceActor, this._gap, this._alignment);
+    },
+
+    _drawBorder: function(area) {
+        let themeNode = this.actor.get_theme_node();
+
+        let borderWidth = themeNode.get_length('-arrow-border-width');
+        let base = themeNode.get_length('-arrow-base');
+        let rise = themeNode.get_length('-arrow-rise');
+        let borderRadius = themeNode.get_length('-arrow-border-radius');
+
+        let halfBorder = borderWidth / 2;
+        let halfBase = Math.floor(base/2);
+
+        let borderColor = themeNode.get_color('-arrow-border-color');
+        let backgroundColor = themeNode.get_color('-arrow-background-color');
+
+        let [width, height] = area.get_surface_size();
+        let [boxWidth, boxHeight] = [width, height];
+        if (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM) {
+            boxHeight -= rise;
+        } else {
+            boxWidth -= rise;
+        }
+        let cr = area.get_context();
+        Clutter.cairo_set_source_color(cr, borderColor);
+
+        // Translate so that box goes from 0,0 to boxWidth,boxHeight,
+        // with the arrow poking out of that
+        if (this._arrowSide == St.Side.TOP) {
+            cr.translate(0, rise);
+        } else if (this._arrowSide == St.Side.LEFT) {
+            cr.translate(rise, 0);
+        }
+
+        let [x1, y1] = [halfBorder, halfBorder];
+        let [x2, y2] = [boxWidth - halfBorder, boxHeight - halfBorder];
+
+        cr.moveTo(x1 + borderRadius, y1);
+        if (this._arrowSide == St.Side.TOP) {
+            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
+                cr.lineTo(this._arrowOrigin, y1 - rise);
+                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y1);
+            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
+                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y1);
+                cr.lineTo(this._arrowOrigin, y1 - rise);
+            } else {
+                cr.lineTo(this._arrowOrigin - halfBase, y1);
+                cr.lineTo(this._arrowOrigin, y1 - rise);
+                cr.lineTo(this._arrowOrigin + halfBase, y1);
+            }
+        }
+
+        cr.lineTo(x2 - borderRadius, y1);
+
+        // top-right corner
+        cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
+               3*Math.PI/2, Math.PI*2);
+
+        if (this._arrowSide == St.Side.RIGHT) {
+            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+                cr.lineTo(x2 + rise, this._arrowOrigin);
+                cr.lineTo(x2, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
+            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
+                cr.lineTo(x2, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
+                cr.lineTo(x2 + rise, this._arrowOrigin);
+            } else {
+                cr.lineTo(x2, this._arrowOrigin - halfBase);
+                cr.lineTo(x2 + rise, this._arrowOrigin);
+                cr.lineTo(x2, this._arrowOrigin + halfBase);
+            }
+        }
+
+        cr.lineTo(x2, y2 - borderRadius);
+
+        // bottom-right corner
+        cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
+               0, Math.PI/2);
+
+        if (this._arrowSide == St.Side.BOTTOM) {
+            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
+                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y2);
+                cr.lineTo(this._arrowOrigin, y2 + rise);
+            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
+                cr.lineTo(this._arrowOrigin, y2 + rise);
+                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y2);
+            } else {
+                cr.lineTo(this._arrowOrigin + halfBase, y2);
+                cr.lineTo(this._arrowOrigin, y2 + rise);
+                cr.lineTo(this._arrowOrigin - halfBase, y2);
+            }
+        }
+
+        cr.lineTo(x1 + borderRadius, y2);
+
+        // bottom-left corner
+        cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
+               Math.PI/2, Math.PI);
+
+        if (this._arrowSide == St.Side.LEFT) {
+            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+                cr.lineTo(x1, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
+                cr.lineTo(x1 - rise, this._arrowOrigin);
+            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
+                cr.lineTo(x1 - rise, this._arrowOrigin);
+                cr.lineTo(x1, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
+            } else {
+                cr.lineTo(x1, this._arrowOrigin + halfBase);
+                cr.lineTo(x1 - rise, this._arrowOrigin);
+                cr.lineTo(x1, this._arrowOrigin - halfBase);
+            }
+        }
+
+        cr.lineTo(x1, y1 + borderRadius);
+
+        // top-left corner
+        cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
+               Math.PI, 3*Math.PI/2);
+
+        Clutter.cairo_set_source_color(cr, backgroundColor);
+        cr.fillPreserve();
+        Clutter.cairo_set_source_color(cr, borderColor);
+        cr.setLineWidth(borderWidth);
+        cr.stroke();
+    },
+
+    setPosition: function(sourceActor, gap, alignment) {
+        // We need to show it now to force an allocation,
+        // so that we can query the correct size.
+        this.actor.show();
+
+        this._sourceActor = sourceActor;
+        this._gap = gap;
+        this._alignment = alignment;
+
+        this._reposition(sourceActor, gap, alignment);
+    },
+
+    _reposition: function(sourceActor, gap, alignment) {
+        // Position correctly relative to the sourceActor
+        let sourceNode = sourceActor.get_theme_node();
+        let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
+        let sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
+        let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) / 2;
+        let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) / 2;
+        let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();
+
+        // We also want to keep it onscreen, and separated from the
+        // edge by the same distance as the main part of the box is
+        // separated from its sourceActor
+        let primary = global.get_primary_monitor();
+        let themeNode = this.actor.get_theme_node();
+        let borderWidth = themeNode.get_length('-arrow-border-width');
+        let arrowBase = themeNode.get_length('-arrow-base');
+        let borderRadius = themeNode.get_length('-arrow-border-radius');
+        let margin = (4 * borderRadius + borderWidth + arrowBase);
+        let halfMargin = margin / 2;
+
+        let resX, resY;
+
+        switch (this._arrowSide) {
+        case St.Side.TOP:
+            resY = sourceAllocation.y2 + gap;
+            break;
+        case St.Side.BOTTOM:
+            resY = sourceAllocation.y1 - natHeight - gap;
+            break;
+        case St.Side.LEFT:
+            resX = sourceAllocation.x2 + gap;
+            break;
+        case St.Side.RIGHT:
+            resX = sourceAllocation.x1 - natWidth - gap;
+            break;
+        }
+
+        // Now align and position the pointing axis, making sure
+        // it fits on screen
+        switch (this._arrowSide) {
+        case St.Side.TOP:
+        case St.Side.BOTTOM:
+            resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
+
+            resX = Math.max(resX, primary.x + 10);
+            resX = Math.min(resX, primary.x + primary.width - (10 + natWidth));
+            this.setArrowOrigin(sourceCenterX - resX);
+            break;
+
+        case St.Side.LEFT:
+        case St.Side.RIGHT:
+            resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
+
+            resY = Math.max(resY, primary.y + 10);
+            resY = Math.min(resY, primary.y + primary.height - (10 + natHeight));
+
+            this.setArrowOrigin(sourceCenterY - resY);
+            break;
+        }
+
+        let parent = this.actor.get_parent();
+        let success, x, y;
+        while (!success) {
+            [success, x, y] = parent.transform_stage_point(resX, resY);
+            parent = parent.get_parent();
+        }
+
+        this._xPosition = Math.floor(x);
+        this._yPosition = Math.floor(y);
+        this._shiftActor();
+    },
+
+    // @origin: Coordinate specifying middle of the arrow, along
+    // the Y axis for St.Side.LEFT, St.Side.RIGHT from the top and X axis from
+    // the left for St.Side.TOP and St.Side.BOTTOM.
+    setArrowOrigin: function(origin) {
+        if (this._arrowOrigin != origin) {
+            this._arrowOrigin = origin;
+            this._border.queue_repaint();
+        }
+    },
+
+    _shiftActor : function() {
+        // Since the position of the BoxPointer depends on the allocated size
+        // of the BoxPointer and the position of the source actor, trying
+        // to position the BoxPoiner via the x/y properties will result in
+        // allocation loops and warnings. Instead we do the positioning via
+        // the anchor point, which is independent of allocation, and leave
+        // x == y == 0.
+        this.actor.set_anchor_point(-(this._xPosition + this._xOffset),
+                                    -(this._yPosition + this._yOffset));
+    },
+
+    set xOffset(offset) {
+        this._xOffset = offset;
+        this._shiftActor();
+    },
+
+    get xOffset() {
+        return this._xOffset;
+    },
+
+    set yOffset(offset) {
+        this._yOffset = offset;
+        this._shiftActor();
+    },
+
+    get yOffset() {
+        return this._yOffset;
+    },
+
+    set opacity(opacity) {
+        this.actor.opacity = opacity;
+    },
+
+    get opacity() {
+        return this.actor.opacity;
+    }
+};

js/ui/calendar.js

@@ -1,12 +1,25 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
+const DBus = imports.dbus;
 const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
-
-const Gettext_gtk20 = imports.gettext.domain('gtk20');
+const Signals = imports.signals;
+const Pango = imports.gi.Pango;
+const Gettext_gtk30 = imports.gettext.domain('gtk30');
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+const C_ = Gettext.pgettext;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
 
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
+const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
+const SHOW_WEEKDATE_KEY = 'show-weekdate';
+
+// in org.gnome.desktop.interface
+const CLOCK_FORMAT_KEY        = 'clock-format';
 
 function _sameDay(dateA, dateB) {
     return (dateA.getDate() == dateB.getDate() &&
@@ -14,96 +27,457 @@ function _sameDay(dateA, dateB) {
             dateA.getYear() == dateB.getYear());
 }
 
-function Calendar() {
+function _sameYear(dateA, dateB) {
+    return (dateA.getYear() == dateB.getYear());
+}
+
+/* TODO: maybe needs config - right now we assume that Saturday and
+ * Sunday are non-work days (not true in e.g. Israel, it's Sunday and
+ * Monday there)
+ */
+function _isWorkDay(date) {
+    return date.getDay() != 0 && date.getDay() != 6;
+}
+
+function _getBeginningOfDay(date) {
+    let ret = new Date(date.getTime());
+    ret.setHours(0);
+    ret.setMinutes(0);
+    ret.setSeconds(0);
+    ret.setMilliseconds(0);
+    return ret;
+}
+
+function _getEndOfDay(date) {
+    let ret = new Date(date.getTime());
+    ret.setHours(23);
+    ret.setMinutes(59);
+    ret.setSeconds(59);
+    ret.setMilliseconds(999);
+    return ret;
+}
+
+function _formatEventTime(event, clockFormat) {
+    let ret;
+    if (event.allDay) {
+        /* Translators: Shown in calendar event list for all day events
+         * Keep it short, best if you can use less then 10 characters
+         */
+        ret = C_("event list time", "All Day");
+    } else {
+        switch (clockFormat) {
+        case '24h':
+            /* Translators: Shown in calendar event list, if 24h format */
+            ret = event.date.toLocaleFormat(C_("event list time", "%H:%M"));
+            break;
+
+        default:
+            /* explicit fall-through */
+        case '12h':
+            /* Transators: Shown in calendar event list, if 12h format */
+            ret = event.date.toLocaleFormat(C_("event list time", "%l:%M %p"));
+            break;
+        }
+    }
+    return ret;
+}
+
+function _getCalendarWeekForDate(date) {
+    // Based on the algorithms found here:
+    // http://en.wikipedia.org/wiki/Talk:ISO_week_date
+    let midnightDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+    // Need to get Monday to be 1 ... Sunday to be 7
+    let dayOfWeek = 1 + ((midnightDate.getDay() + 6) % 7);
+    let nearestThursday = new Date(midnightDate.getFullYear(), midnightDate.getMonth(),
+                                   midnightDate.getDate() + (4 - dayOfWeek));
+
+    let jan1st = new Date(nearestThursday.getFullYear(), 0, 1);
+    let diffDate = nearestThursday - jan1st;
+    let dayNumber = Math.floor(Math.abs(diffDate) / MSECS_IN_DAY);
+    let weekNumber = Math.floor(dayNumber / 7) + 1;
+
+    return weekNumber;
+}
+
+function _getDigitWidth(actor){
+    let context = actor.get_pango_context();
+    let themeNode = actor.get_theme_node();
+    let font = themeNode.get_font();
+    let metrics = context.get_metrics(font, context.get_language());
+    let width = metrics.get_approximate_digit_width();
+    return width;
+}
+
+function _getCalendarDayAbbreviation(dayNumber) {
+    let abbreviations = [
+        /* Translators: Calendar grid abbreviation for Sunday.
+         *
+         * NOTE: These grid abbreviations are always shown together
+         * and in order, e.g. "S M T W T F S".
+         */
+        C_("grid sunday", "S"),
+        /* Translators: Calendar grid abbreviation for Monday */
+        C_("grid monday", "M"),
+        /* Translators: Calendar grid abbreviation for Tuesday */
+        C_("grid tuesday", "T"),
+        /* Translators: Calendar grid abbreviation for Wednesday */
+        C_("grid wednesday", "W"),
+        /* Translators: Calendar grid abbreviation for Thursday */
+        C_("grid thursday", "T"),
+        /* Translators: Calendar grid abbreviation for Friday */
+        C_("grid friday", "F"),
+        /* Translators: Calendar grid abbreviation for Saturday */
+        C_("grid saturday", "S")
+    ];
+    return abbreviations[dayNumber];
+}
+
+function _getEventDayAbbreviation(dayNumber) {
+    let abbreviations = [
+        /* Translators: Event list abbreviation for Sunday.
+         *
+         * NOTE: These list abbreviations are normally not shown together
+         * so they need to be unique (e.g. Tuesday and Thursday cannot
+         * both be 'T').
+         */
+        C_("list sunday", "Su"),
+        /* Translators: Event list abbreviation for Monday */
+        C_("list monday", "M"),
+        /* Translators: Event list abbreviation for Tuesday */
+        C_("list tuesday", "T"),
+        /* Translators: Event list abbreviation for Wednesday */
+        C_("list wednesday", "W"),
+        /* Translators: Event list abbreviation for Thursday */
+        C_("list thursday", "Th"),
+        /* Translators: Event list abbreviation for Friday */
+        C_("list friday", "F"),
+        /* Translators: Event list abbreviation for Saturday */
+        C_("list saturday", "S")
+    ];
+    return abbreviations[dayNumber];
+}
+
+// Abstraction for an appointment/event in a calendar
+
+function CalendarEvent(date, end, summary, allDay) {
+    this._init(date, end, summary, allDay);
+}
+
+CalendarEvent.prototype = {
+    _init: function(date, end, summary, allDay) {
+        this.date = date;
+        this.end = end;
+        this.summary = summary;
+        this.allDay = allDay;
+    }
+};
+
+// Interface for appointments/events - e.g. the contents of a calendar
+//
+
+// First, an implementation with no events
+function EmptyEventSource() {
     this._init();
 }
 
-Calendar.prototype = {
+EmptyEventSource.prototype = {
     _init: function() {
+    },
+
+    requestRange: function(begin, end) {
+    },
+
+    getEvents: function(begin, end) {
+        let result = [];
+        return result;
+    },
+
+    hasEvents: function(day) {
+        return false;
+    }
+};
+Signals.addSignalMethods(EmptyEventSource.prototype);
+
+const CalendarServerIface = {
+    name: 'org.gnome.Shell.CalendarServer',
+    methods: [{ name: 'GetEvents',
+                inSignature: 'xxb',
+                outSignature: 'a(sssbxxa{sv})' }],
+    signals: [{ name: 'Changed',
+                inSignature: '' }]
+};
+
+const CalendarServer = function () {
+    this._init();
+};
+
+CalendarServer.prototype = {
+     _init: function() {
+         DBus.session.proxifyObject(this, 'org.gnome.Shell.CalendarServer', '/org/gnome/Shell/CalendarServer');
+     }
+};
+
+DBus.proxifyPrototype(CalendarServer.prototype, CalendarServerIface);
+
+// an implementation that reads data from a session bus service
+function DBusEventSource(owner) {
+    this._init(owner);
+}
+
+function _datesEqual(a, b) {
+    if (a < b)
+        return false;
+    else if (a > b)
+        return false;
+    return true;
+}
+
+function _dateIntervalsOverlap(a0, a1, b0, b1)
+{
+    if (a1 <= b0)
+        return false;
+    else if (b1 <= a0)
+        return false;
+    else
+        return true;
+}
+
+
+DBusEventSource.prototype = {
+    _init: function(owner) {
+        this._resetCache();
+
+        this._dbusProxy = new CalendarServer(owner);
+        this._dbusProxy.connect('Changed', Lang.bind(this, this._onChanged));
+
+        DBus.session.watch_name('org.gnome.Shell.CalendarServer',
+                                false, // do not launch a name-owner if none exists
+                                Lang.bind(this, this._onNameAppeared),
+                                Lang.bind(this, this._onNameVanished));
+    },
+
+    _resetCache: function() {
+        this._events = [];
+        this._lastRequestBegin = null;
+        this._lastRequestEnd = null;
+    },
+
+    _onNameAppeared: function(owner) {
+        this._resetCache();
+        this._loadEvents(true);
+    },
+
+    _onNameVanished: function(oldOwner) {
+        this._resetCache();
+        this.emit('changed');
+    },
+
+    _onChanged: function() {
+        this._loadEvents(false);
+    },
+
+    _onEventsReceived: function(appointments) {
+        let newEvents = [];
+        if (appointments != null) {
+            for (let n = 0; n < appointments.length; n++) {
+                let a = appointments[n];
+                let date = new Date(a[4] * 1000);
+                let end = new Date(a[5] * 1000);
+                let summary = a[1];
+                let allDay = a[3];
+                let event = new CalendarEvent(date, end, summary, allDay);
+                newEvents.push(event);
+            }
+            newEvents.sort(function(event1, event2) {
+                return event1.date.getTime() - event2.date.getTime();
+            });
+        }
+
+        this._events = newEvents;
+        this.emit('changed');
+    },
+
+    _loadEvents: function(forceReload) {
+        if (this._curRequestBegin && this._curRequestEnd){
+            let callFlags = 0;
+            if (forceReload)
+                callFlags |= DBus.CALL_FLAG_START;
+            this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
+                                            this._curRequestEnd.getTime() / 1000,
+                                            forceReload,
+                                            Lang.bind(this, this._onEventsReceived),
+                                            callFlags);
+        }
+    },
+
+    requestRange: function(begin, end, forceReload) {
+        if (forceReload || !(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
+            this._lastRequestBegin = begin;
+            this._lastRequestEnd = end;
+            this._curRequestBegin = begin;
+            this._curRequestEnd = end;
+            this._loadEvents(forceReload);
+        }
+    },
+
+    getEvents: function(begin, end) {
+        let result = [];
+        for(let n = 0; n < this._events.length; n++) {
+            let event = this._events[n];
+            if (_dateIntervalsOverlap (event.date, event.end, begin, end)) {
+                result.push(event);
+            }
+        }
+        return result;
+    },
+
+    hasEvents: function(day) {
+        let dayBegin = _getBeginningOfDay(day);
+        let dayEnd = _getEndOfDay(day);
+
+        let events = this.getEvents(dayBegin, dayEnd);
+
+        if (events.length == 0)
+            return false;
+
+        return true;
+    }
+};
+Signals.addSignalMethods(DBusEventSource.prototype);
+
+// Calendar:
+// @eventSource: is an object implementing the EventSource API, e.g. the
+// requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
+function Calendar(eventSource) {
+    this._init(eventSource);
+}
+
+Calendar.prototype = {
+    _init: function(eventSource) {
+        this._eventSource = eventSource;
+
+        this._eventSource.connect('changed', Lang.bind(this,
+                                                       function() {
+                                                           this._update(false);
+                                                       }));
+
         // FIXME: This is actually the fallback method for GTK+ for the week start;
         // GTK+ by preference uses nl_langinfo (NL_TIME_FIRST_WEEKDAY). We probably
         // should add a C function so we can do the full handling.
         this._weekStart = NaN;
-        let weekStartString = Gettext_gtk20.gettext("calendar:week_start:0");
-        if (weekStartString.indexOf("calendar:week_start:") == 0) {
+        this._weekdate = NaN;
+        this._digitWidth = NaN;
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.calendar' });
+
+        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
+        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
+
+        let weekStartString = Gettext_gtk30.gettext('calendar:week_start:0');
+        if (weekStartString.indexOf('calendar:week_start:') == 0) {
             this._weekStart = parseInt(weekStartString.substring(20));
         }
 
         if (isNaN(this._weekStart) || this._weekStart < 0 || this._weekStart > 6) {
-            log("Translation of 'calendar:week_start:0' in GTK+ is not correct");
+            log('Translation of "calendar:week_start:0" in GTK+ is not correct');
             this._weekStart = 0;
         }
 
         // Find the ordering for month/year in the calendar heading
-        switch (Gettext_gtk20.gettext("calendar:MY")) {
-        case "calendar:MY":
-            this._headerFormat = "%B %Y";
+        this._headerFormatWithoutYear = '%B';
+        switch (Gettext_gtk30.gettext('calendar:MY')) {
+        case 'calendar:MY':
+            this._headerFormat = '%B %Y';
             break;
-        case "calendar:YM":
-            this._headerFormat = "%Y %B";
+        case 'calendar:YM':
+            this._headerFormat = '%Y %B';
             break;
         default:
-            log("Translation of 'calendar:MY' in GTK+ is not correct");
-            this._headerFormat = "%B %Y";
+            log('Translation of "calendar:MY" in GTK+ is not correct');
+            this._headerFormat = '%B %Y';
             break;
         }
 
         // Start off with the current date
-        this.date = new Date();
+        this._selectedDate = new Date();
 
         this.actor = new St.Table({ homogeneous: false,
-                                    style_class: "calendar",
+                                    style_class: 'calendar',
                                     reactive: true });
 
         this.actor.connect('scroll-event',
                            Lang.bind(this, this._onScroll));
 
+        this._buildHeader ();
+    },
+
+    // Sets the calendar to show a specific date
+    setDate: function(date, forceReload) {
+        if (!_sameDay(date, this._selectedDate)) {
+            this._selectedDate = date;
+            this._update(forceReload);
+            this.emit('selected-date-changed', new Date(this._selectedDate));
+        } else {
+            if (forceReload)
+                this._update(forceReload);
+        }
+    },
+
+    _buildHeader: function() {
+        let offsetCols = this._useWeekdate ? 1 : 0;
+        this.actor.destroy_children();
+
         // Top line of the calendar '<| September 2009 |>'
         this._topBox = new St.BoxLayout();
         this.actor.add(this._topBox,
-                       { row: 0, col: 0, col_span: 7 });
+                       { row: 0, col: 0, col_span: offsetCols + 7 });
 
-        let [backlabel, forwardlabel] = ["&lt;", "&gt;"];
-        if (St.Widget.get_default_direction () == St.TextDirection.RTL) {
-            [backlabel, forwardlabel] = [forwardlabel, backlabel];
-        }
+        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChange));
 
-        let back = new St.Button({ label: backlabel, style_class: 'calendar-change-month'  });
+        let back = new St.Button({ style_class: 'calendar-change-month-back' });
         this._topBox.add(back);
-        back.connect("clicked", Lang.bind(this, this._prevMonth));
+        back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
 
-        this._dateLabel = new St.Label();
-        this._topBox.add(this._dateLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
+        this._monthLabel = new St.Label({style_class: 'calendar-month-label'});
+        this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
 
-        let forward = new St.Button({ label: forwardlabel, style_class: 'calendar-change-month' });
+        let forward = new St.Button({ style_class: 'calendar-change-month-forward' });
         this._topBox.add(forward);
-        forward.connect("clicked", Lang.bind(this, this._nextMonth));
+        forward.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
 
+        // Add weekday labels...
+        //
         // We need to figure out the abbreviated localized names for the days of the week;
         // we do this by just getting the next 7 days starting from right now and then putting
         // them in the right cell in the table. It doesn't matter if we add them in order
-        let iter = new Date(this.date);
+        let iter = new Date(this._selectedDate);
         iter.setSeconds(0); // Leap second protection. Hah!
         iter.setHours(12);
         for (let i = 0; i < 7; i++) {
-            this.actor.add(new St.Label({ text: iter.toLocaleFormat("%a") }),
+            // Could use iter.toLocaleFormat('%a') but that normally gives three characters
+            // and we want, ideally, a single character for e.g. S M T W T F S
+            let customDayAbbrev = _getCalendarDayAbbreviation(iter.getDay());
+            let label = new St.Label({ style_class: 'calendar-day-base calendar-day-heading',
+                                       text: customDayAbbrev });
+            this.actor.add(label,
                            { row: 1,
-                             col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: St.Align.END });
+                             col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7,
+                             x_fill: false, x_align: St.Align.MIDDLE });
             iter.setTime(iter.getTime() + MSECS_IN_DAY);
         }
 
         // All the children after this are days, and get removed when we update the calendar
         this._firstDayIndex = this.actor.get_children().length;
-
-        this._update();
     },
 
-    // Sets the calendar to show a specific date
-    setDate: function(date) {
-        if (!_sameDay(date, this.date)) {
-            this.date = date;
-            this._update();
+    _onStyleChange: function(actor, event) {
+        // width of a digit in pango units
+        this._digitWidth = _getDigitWidth(this.actor) / Pango.SCALE;
+        this._setWeekdateHeaderWidth();
+    },
+
+    _setWeekdateHeaderWidth: function() {
+        if (this.digitWidth != NaN && this._useWeekdate && this._weekdateHeader) {
+            this._weekdateHeader.set_width (this._digitWidth * WEEKDATE_HEADER_WIDTH_DIGITS);
         }
     },
 
@@ -111,37 +485,72 @@ Calendar.prototype = {
         switch (event.get_scroll_direction()) {
         case Clutter.ScrollDirection.UP:
         case Clutter.ScrollDirection.LEFT:
-            this._prevMonth();
+            this._onPrevMonthButtonClicked();
             break;
         case Clutter.ScrollDirection.DOWN:
         case Clutter.ScrollDirection.RIGHT:
-            this._nextMonth();
+            this._onNextMonthButtonClicked();
             break;
         }
     },
 
-    _prevMonth: function() {
-        if (this.date.getMonth() == 0) {
-            this.date.setMonth(11);
-            this.date.setFullYear(this.date.getFullYear() - 1);
-        } else {
-            this.date.setMonth(this.date.getMonth() - 1);
+    _onPrevMonthButtonClicked: function() {
+        let newDate = new Date(this._selectedDate);
+        let oldMonth = newDate.getMonth();
+        if (oldMonth == 0) {
+            newDate.setMonth(11);
+            newDate.setFullYear(newDate.getFullYear() - 1);
+            if (newDate.getMonth() != 11) {
+                let day = 32 - new Date(newDate.getFullYear() - 1, 11, 32).getDate();
+                newDate = new Date(newDate.getFullYear() - 1, 11, day);
+            }
         }
-        this._update();
+        else {
+            newDate.setMonth(oldMonth - 1);
+            if (newDate.getMonth() != oldMonth - 1) {
+                let day = 32 - new Date(newDate.getFullYear(), oldMonth - 1, 32).getDate();
+                newDate = new Date(newDate.getFullYear(), oldMonth - 1, day);
+            }
+        }
+
+        this.setDate(newDate, false);
    },
 
-    _nextMonth: function() {
-        if (this.date.getMonth() == 11) {
-            this.date.setMonth(0);
-            this.date.setFullYear(this.date.getFullYear() + 1);
-        } else {
-            this.date.setMonth(this.date.getMonth() + 1);
+   _onNextMonthButtonClicked: function() {
+        let newDate = new Date(this._selectedDate);
+        let oldMonth = newDate.getMonth();
+        if (oldMonth == 11) {
+            newDate.setMonth(0);
+            newDate.setFullYear(newDate.getFullYear() + 1);
+            if (newDate.getMonth() != 0) {
+                let day = 32 - new Date(newDate.getFullYear() + 1, 0, 32).getDate();
+                newDate = new Date(newDate.getFullYear() + 1, 0, day);
+            }
         }
-        this._update();
+        else {
+            newDate.setMonth(oldMonth + 1);
+            if (newDate.getMonth() != oldMonth + 1) {
+                let day = 32 - new Date(newDate.getFullYear(), oldMonth + 1, 32).getDate();
+                newDate = new Date(newDate.getFullYear(), oldMonth + 1, day);
+            }
+        }
+
+       this.setDate(newDate, false);
     },
 
-    _update: function() {
-        this._dateLabel.text = this.date.toLocaleFormat(this._headerFormat);
+    _onSettingsChange: function() {
+        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
+        this._buildHeader();
+        this._update(false);
+    },
+
+    _update: function(forceReload) {
+        let now = new Date();
+
+        if (_sameYear(this._selectedDate, now))
+            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormatWithoutYear);
+        else
+            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);
 
         // Remove everything but the topBox and the weekday labels
         let children = this.actor.get_children();
@@ -149,34 +558,217 @@ Calendar.prototype = {
             children[i].destroy();
 
         // Start at the beginning of the week before the start of the month
-        let iter = new Date(this.date);
-        iter.setDate(1);
-        iter.setSeconds(0);
-        iter.setHours(12);
-        iter.setTime(iter.getTime() - (iter.getDay() - this._weekStart) * MSECS_IN_DAY);
-
-        let now = new Date();
+        let beginDate = new Date(this._selectedDate);
+        beginDate.setDate(1);
+        beginDate.setSeconds(0);
+        beginDate.setHours(12);
+        let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
+        beginDate.setTime(beginDate.getTime() - daysToWeekStart * MSECS_IN_DAY);
 
+        let iter = new Date(beginDate);
         let row = 2;
         while (true) {
-            let label = new St.Label({ text: iter.getDate().toString() });
-            if (_sameDay(now, iter))
-                label.style_class = "calendar-day calendar-today";
-            else if (iter.getMonth() != this.date.getMonth())
-                label.style_class = "calendar-day calendar-other-month-day";
+            let button = new St.Button({ label: iter.getDate().toString() });
+
+            let iterStr = iter.toUTCString();
+            button.connect('clicked', Lang.bind(this, function() {
+                let newlySelectedDate = new Date(iterStr);
+                this.setDate(newlySelectedDate, false);
+            }));
+
+            let hasEvents = this._eventSource.hasEvents(iter);
+            let styleClass = 'calendar-day-base calendar-day';
+            if (_isWorkDay(iter))
+                styleClass += ' calendar-work-day'
             else
-                label.style_class = "calendar-day";
-            this.actor.add(label,
-                           { row: row, col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: St.Align.END });
+                styleClass += ' calendar-nonwork-day'
+
+            // Hack used in lieu of border-collapse - see gnome-shell.css
+            if (row == 2)
+                styleClass = 'calendar-day-top ' + styleClass;
+            if (iter.getDay() == this._weekStart)
+                styleClass = 'calendar-day-left ' + styleClass;
+
+            if (_sameDay(now, iter))
+                styleClass += ' calendar-today';
+            else if (iter.getMonth() != this._selectedDate.getMonth())
+                styleClass += ' calendar-other-month-day';
+
+            if (_sameDay(this._selectedDate, iter))
+                button.add_style_pseudo_class('active');
+
+            if (hasEvents)
+                styleClass += ' calendar-day-with-events'
+
+            button.style_class = styleClass;
+
+            let offsetCols = this._useWeekdate ? 1 : 0;
+            this.actor.add(button,
+                           { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 });
+
+            if (this._useWeekdate && iter.getDay() == 4) {
+                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
+                                           style_class: 'calendar-day-base calendar-week-number'});
+                this.actor.add(label,
+                               { row: row, col: 0, y_align: St.Align.MIDDLE });
+            }
 
             iter.setTime(iter.getTime() + MSECS_IN_DAY);
             if (iter.getDay() == this._weekStart) {
                 // We stop on the first "first day of the week" after the month we are displaying
-                if (iter.getMonth() > this.date.getMonth() || iter.getYear() > this.date.getYear())
+                if (iter.getMonth() > this._selectedDate.getMonth() || iter.getYear() > this._selectedDate.getYear())
                     break;
                 row++;
             }
         }
+        // Signal to the event source that we are interested in events
+        // only from this date range
+        this._eventSource.requestRange(beginDate, iter, forceReload);
+    }
+};
+
+Signals.addSignalMethods(Calendar.prototype);
+
+function EventsList(eventSource) {
+    this._init(eventSource);
+}
+
+EventsList.prototype = {
+    _init: function(eventSource) {
+        this.actor = new St.BoxLayout({ vertical: true, style_class: 'events-header-vbox'});
+        this._date = new Date();
+        this._eventSource = eventSource;
+        this._eventSource.connect('changed', Lang.bind(this, this._update));
+        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        this._desktopSettings.connect('changed', Lang.bind(this, this._update));
+        let weekStartString = Gettext_gtk30.gettext('calendar:week_start:0');
+        if (weekStartString.indexOf('calendar:week_start:') == 0) {
+            this._weekStart = parseInt(weekStartString.substring(20));
+        }
+
+        if (isNaN(this._weekStart) ||
+                  this._weekStart < 0 ||
+                  this._weekStart > 6) {
+            log('Translation of "calendar:week_start:0" in GTK+ is not correct');
+            this._weekStart = 0;
+        }
+
+        this._update();
+    },
+
+    _addEvent: function(dayNameBox, timeBox, eventTitleBox, includeDayName, day, time, desc) {
+        if (includeDayName) {
+            dayNameBox.add(new St.Label( { style_class: 'events-day-dayname',
+                                           text: day } ),
+                           { x_fill: true } );
+        }
+        timeBox.add(new St.Label( { style_class: 'events-day-time',
+                                    text: time} ),
+                    { x_fill: true } );
+        eventTitleBox.add(new St.Label( { style_class: 'events-day-task',
+                                          text: desc} ));
+    },
+
+    _addPeriod: function(header, begin, end, includeDayName, showNothingScheduled) {
+        let events = this._eventSource.getEvents(begin, end);
+
+        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);;
+
+        if (events.length == 0 && !showNothingScheduled)
+            return;
+
+        let vbox = new St.BoxLayout( {vertical: true} );
+        this.actor.add(vbox);
+
+        vbox.add(new St.Label({ style_class: 'events-day-header', text: header }));
+        let box = new St.BoxLayout({style_class: 'events-header-hbox'});
+        let dayNameBox = new St.BoxLayout({ vertical: true, style_class: 'events-day-name-box' });
+        let timeBox = new St.BoxLayout({ vertical: true, style_class: 'events-time-box' });
+        let eventTitleBox = new St.BoxLayout({ vertical: true, style_class: 'events-event-box' });
+        box.add(dayNameBox, {x_fill: false});
+        box.add(timeBox, {x_fill: false});
+        box.add(eventTitleBox, {expand: true});
+        vbox.add(box);
+
+        for (let n = 0; n < events.length; n++) {
+            let event = events[n];
+            let dayString = _getEventDayAbbreviation(event.date.getDay());
+            let timeString = _formatEventTime(event, clockFormat);
+            let summaryString = event.summary;
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, includeDayName, dayString, timeString, summaryString);
+        }
+
+        if (events.length == 0 && showNothingScheduled) {
+            let now = new Date();
+            /* Translators: Text to show if there are no events */
+            let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
+            let timeString = _formatEventTime(nothingEvent, clockFormat);
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingEvent.summary);
+        }
+    },
+
+    _showOtherDay: function(day) {
+        this.actor.destroy_children();
+
+        let dayBegin = _getBeginningOfDay(day);
+        let dayEnd = _getEndOfDay(day);
+
+        let dayString;
+        let now = new Date();
+        if (_sameYear(day, now))
+            /* Translators: Shown on calendar heading when selected day occurs on current year */
+            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d"));
+        else
+            /* Translators: Shown on calendar heading when selected day occurs on different year */
+            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
+        this._addPeriod(dayString, dayBegin, dayEnd, false, true);
+    },
+
+    _showToday: function() {
+        this.actor.destroy_children();
+
+        let now = new Date();
+        let dayBegin = _getBeginningOfDay(now);
+        let dayEnd = _getEndOfDay(now);
+        this._addPeriod(_("Today"), dayBegin, dayEnd, false, true);
+
+        let tomorrowBegin = new Date(dayBegin.getTime() + 86400 * 1000);
+        let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
+        this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);
+
+        if (dayEnd.getDay() <= 4 + this._weekStart) {
+            /* If now is within the first 5 days we show "This week" and
+             * include events up until and including Saturday/Sunday
+             * (depending on whether a week starts on Sunday/Monday).
+             */
+            let thisWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
+            let thisWeekEnd = new Date(dayEnd.getTime() + (6 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            this._addPeriod(_("This week"), thisWeekBegin, thisWeekEnd, true, false);
+        } else {
+            /* otherwise it's one of the two last days of the week ... show
+             * "Next week" and include events up until and including *next*
+             * Saturday/Sunday
+             */
+            let nextWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
+            let nextWeekEnd = new Date(dayEnd.getTime() + (13 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
+        }
+    },
+
+    // Sets the event list to show events from a specific date
+    setDate: function(date) {
+        if (!_sameDay(date, this._date)) {
+            this._date = date;
+            this._update();
+        }
+    },
+
+    _update: function() {
+        let today = new Date();
+        if (_sameDay (this._date, today)) {
+            this._showToday();
+        } else {
+            this._showOtherDay(this._date);
+        }
     }
 };

js/ui/chrome.js

@@ -1,10 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
+const Signals = imports.signals;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;
@@ -13,6 +13,13 @@ const Params = imports.misc.params;
 // normal mode (ie, outside the Overview), that surrounds the main
 // workspace content.
 
+const defaultParams = {
+    visibleInOverview: false,
+    visibleInFullscreen: false,
+    affectsStruts: true,
+    affectsInputRegion: true
+};
+
 function Chrome() {
     this._init();
 }
@@ -20,15 +27,17 @@ function Chrome() {
 Chrome.prototype = {
     _init: function() {
         // The group itself has zero size so it doesn't interfere with DND
-        this.actor = new Clutter.Group({ width: 0, height: 0 });
-        global.stage.add_actor(this.actor);
-        this.nonOverviewActor = new Clutter.Group();
-        this.actor.add_actor(this.nonOverviewActor);
+        this.actor = new Shell.GenericContainer({ width: 0, height: 0 });
+        Main.uiGroup.add_actor(this.actor);
+        this.actor.connect('allocate', Lang.bind(this, this._allocated));
 
-        this._obscuredByFullscreen = false;
+        this._monitors = [];
+        this._inOverview = false;
 
         this._trackedActors = [];
 
+        global.screen.connect('monitors-changed',
+                              Lang.bind(this, this._monitorsChanged));
         global.screen.connect('restacked',
                               Lang.bind(this, this._windowsRestacked));
 
@@ -41,16 +50,15 @@ Chrome.prototype = {
         Main.overview.connect('hidden',
                              Lang.bind(this, this._overviewHidden));
 
+        this._updateMonitors();
+        this._updateFullscreen();
         this._queueUpdateRegions();
     },
 
-    _verifyAncestry: function(actor, ancestor) {
-        while (actor) {
-            if (actor == ancestor)
-                return true;
-            actor = actor.get_parent();
-        }
-        return false;
+    _allocated: function(actor, box, flags) {
+        let children = this.actor.get_children();
+        for (let i = 0; i < children.length; i++)
+            children[i].allocate_preferred_size(flags);
     },
 
     // addActor:
@@ -67,19 +75,15 @@ Chrome.prototype = {
     //
     // If %visibleInOverview is %true in @params, @actor will remain
     // visible when the overview is brought up. Otherwise it will
-    // automatically be hidden. If %affectsStruts or %affectsInputRegion
-    // is %false, the actor will not have the indicated effect.
+    // automatically be hidden. Likewise, if %visibleInFullscreen is
+    // %true, the actor will be visible even when a fullscreen window
+    // should be covering it.
+    //
+    // If %affectsStruts or %affectsInputRegion is %false, the actor
+    // will not have the indicated effect.
     addActor: function(actor, params) {
-        params = Params.parse(params, { visibleInOverview: false,
-                                        affectsStruts: true,
-                                        affectsInputRegion: true });
-
-        if (params.visibleInOverview)
-            this.actor.add_actor(actor);
-        else
-            this.nonOverviewActor.add_actor(actor);
-
-        this._trackActor(actor, params.affectsInputRegion, params.affectsStruts);
+        this.actor.add_actor(actor);
+        this._trackActor(actor, params);
     },
 
     // trackActor:
@@ -89,13 +93,32 @@ Chrome.prototype = {
     // Tells the chrome to track @actor, which must be a descendant
     // of an actor added via addActor(). This can be used to extend the
     // struts or input region to cover specific children.
+    //
+    // @params can have any of the same values as in addActor(), though
+    // some possibilities don't make sense (eg, trying to have a
+    // %visibleInOverview child of a non-%visibleInOverview parent).
+    // By default, @actor has the same params as its chrome ancestor.
     trackActor: function(actor, params) {
-        if (!this._verifyAncestry(actor, this.actor))
+        let ancestor = actor.get_parent();
+        let index = this._findActor(ancestor);
+        while (ancestor && index == -1) {
+            ancestor = ancestor.get_parent();
+            index = this._findActor(ancestor);
+        }
+        if (!ancestor)
             throw new Error('actor is not a descendent of the chrome layer');
 
-        params = Params.parse(params, { affectsStruts: true,
-                                        affectsInputRegion: true });
-        this._trackActor(actor, params.affectsInputRegion, params.affectsStruts);
+        let ancestorData = this._trackedActors[index];
+        if (!params)
+            params = {};
+        // We can't use Params.parse here because we want to drop
+        // the extra values like ancestorData.actor
+        for (let prop in defaultParams) {
+            if (!params[prop])
+                params[prop] = ancestorData[prop];
+        }
+
+        this._trackActor(actor, params);
     },
 
     // untrackActor:
@@ -111,10 +134,7 @@ Chrome.prototype = {
     //
     // Removes @actor from the chrome layer
     removeActor: function(actor) {
-        if (actor.get_parent() == this.nonOverviewActor)
-            this.nonOverviewActor.remove_actor(actor);
-        else
-            this.actor.remove_actor(actor);
+        this.actor.remove_actor(actor);
         this._untrackActor(actor);
     },
 
@@ -127,16 +147,12 @@ Chrome.prototype = {
         return -1;
     },
 
-    _trackActor: function(actor, inputRegion, strut) {
-        let actorData;
-
+    _trackActor: function(actor, params) {
         if (this._findActor(actor) != -1)
             throw new Error('trying to re-track existing chrome actor');
 
-        actorData = { actor: actor,
-                      inputRegion: inputRegion,
-                      strut: strut };
-
+        let actorData = Params.parse(params, defaultParams);
+        actorData.actor = actor;
         actorData.visibleId = actor.connect('notify::visible',
                                             Lang.bind(this, this._queueUpdateRegions));
         actorData.allocationId = actor.connect('notify::allocation',
@@ -166,20 +182,91 @@ Chrome.prototype = {
     },
 
     _actorReparented: function(actor, oldParent) {
-        if (!this._verifyAncestry(actor, this.actor))
+        if (!this.actor.contains(actor))
             this._untrackActor(actor);
     },
 
+    _updateVisibility: function() {
+        for (let i = 0; i < this._trackedActors.length; i++) {
+            let actorData = this._trackedActors[i];
+            if (this._inOverview && !actorData.visibleInOverview)
+                this.actor.set_skip_paint(actorData.actor, true);
+            else if (!this._inOverview && !actorData.visibleInFullscreen &&
+                     this._findMonitorForActor(actorData.actor).inFullscreen)
+                this.actor.set_skip_paint(actorData.actor, true);
+            else
+                this.actor.set_skip_paint(actorData.actor, false);
+        }
+    },
+
     _overviewShowing: function() {
-        this.actor.show();
-        this.nonOverviewActor.hide();
+        this._inOverview = true;
+        this._updateVisibility();
         this._queueUpdateRegions();
     },
 
     _overviewHidden: function() {
-        if (this._obscuredByFullscreen)
-            this.actor.hide();
-        this.nonOverviewActor.show();
+        this._inOverview = false;
+        this._updateVisibility();
+        this._queueUpdateRegions();
+    },
+
+    _updateMonitors: function() {
+        let monitors = global.get_monitors();
+        let primary = global.get_primary_monitor();
+        this._monitors = monitors;
+        for (let i = 0; i < monitors.length; i++) {
+            let monitor = monitors[i];
+            if (monitor.x == primary.x &&
+                monitor.y == primary.y &&
+                monitor.width == primary.width &&
+                monitor.height == primary.height)
+                this._primaryMonitor = monitor;
+        }
+    },
+
+    _findMonitorForRect: function(x, y, w, h) {
+        // First look at what monitor the center of the rectangle is at
+        let cx = x + w/2;
+        let cy = y + h/2;
+        for (let i = 0; i < this._monitors.length; i++) {
+            let monitor = this._monitors[i];
+            if (cx >= monitor.x && cx < monitor.x + monitor.width &&
+                cy >= monitor.y && cy < monitor.y + monitor.height)
+                return monitor;
+        }
+        // If the center is not on a monitor, return the first overlapping monitor
+        for (let i = 0; i < this._monitors.length; i++) {
+            let monitor = this._monitors[i];
+            if (x + w > monitor.x && x < monitor.x + monitor.width &&
+                y + h > monitor.y && y < monitor.y + monitor.height)
+                return monitor;
+        }
+        // otherwise on no monitor
+        return null;
+    },
+
+    _findMonitorForWindow: function(window) {
+        return this._findMonitorForRect(window.x, window.y, window.width, window.height);
+    },
+
+    // This call guarantees that we return some monitor to simplify usage of it
+    // In practice all tracked actors should be visible on some monitor anyway
+    _findMonitorForActor: function(actor) {
+        let [x, y] = actor.get_transformed_position();
+        let [w, h] = actor.get_transformed_size();
+        let monitor = this._findMonitorForRect(x, y, w, h);
+        if (monitor)
+            return monitor;
+        return this._primaryMonitor; // Not on any monitor, pretend its on the primary
+    },
+
+    _monitorsChanged: function() {
+        this._updateMonitors();
+
+        // Update everything that depends on monitor positions
+        this._updateFullscreen();
+        this._updateVisibility();
         this._queueUpdateRegions();
     },
 
@@ -189,14 +276,17 @@ Chrome.prototype = {
                                                        Meta.PRIORITY_BEFORE_REDRAW);
     },
 
-    _windowsRestacked: function() {
-        let windows = global.get_windows();
-        let primary = global.get_primary_monitor();
+    _updateFullscreen: function() {
+        let windows = Main.getWindowActorsForWorkspace(global.screen.get_active_workspace_index());
+
+        // Reset all monitors to not fullscreen
+        for (let i = 0; i < this._monitors.length; i++)
+            this._monitors[i].inFullscreen = false;
 
         // The chrome layer should be visible unless there is a window
         // with layer FULLSCREEN, or a window with layer
         // OVERRIDE_REDIRECT that covers the whole screen.
-        // ("override_redirect" is not actually a layer above all
+        // ('override_redirect' is not actually a layer above all
         // other windows, but this seems to be how mutter treats it
         // currently...) If we wanted to be extra clever, we could
         // figure out when an OVERRIDE_REDIRECT window was trying to
@@ -205,33 +295,51 @@ Chrome.prototype = {
 
         // @windows is sorted bottom to top.
 
-        this._obscuredByFullscreen = false;
         for (let i = windows.length - 1; i > -1; i--) {
-            let layer = windows[i].get_meta_window().get_layer();
+            let window = windows[i];
+            let layer = window.get_meta_window().get_layer();
+
             if (layer == Meta.StackLayer.FULLSCREEN) {
-                if (windows[i].x >= primary.x && windows[i].x <= primary.x + primary.width &&
-                    windows[i].y >= primary.y && windows[i].y <= primary.y + primary.height) {
-                        this._obscuredByFullscreen = true;
-                        break;
-                }
+                let monitor = this._findMonitorForWindow(window);
+                if (monitor)
+                    monitor.inFullscreen = true;
             }
             if (layer == Meta.StackLayer.OVERRIDE_REDIRECT) {
-                if (windows[i].x <= primary.x &&
-                    windows[i].x + windows[i].width >= primary.x + primary.width &&
-                    windows[i].y <= primary.y &&
-                    windows[i].y + windows[i].height >= primary.y + primary.height) {
-                    this._obscuredByFullscreen = true;
-                    break;
-                }
+                let monitor = this._findMonitorForWindow(window);
+                if (monitor &&
+                    window.x <= monitor.x &&
+                    window.x + window.width >= monitor.x + monitor.width &&
+                    window.y <= monitor.y &&
+                    window.y + window.height >= monitor.y + monitor.height)
+                    monitor.inFullscreen = true;
             } else
                 break;
         }
+    },
 
-        let shouldBeVisible = !this._obscuredByFullscreen || Main.overview.visible;
-        if (this.actor.visible != shouldBeVisible) {
-            this.actor.visible = shouldBeVisible;
+    _windowsRestacked: function() {
+        let wasInFullscreen = [];
+        for (let i = 0; i < this._monitors.length; i++)
+            wasInFullscreen[i] = this._monitors[i].inFullscreen;
+
+        this._updateFullscreen();
+
+        let changed = false;
+        for (let i = 0; i < wasInFullscreen.length; i++) {
+            if (wasInFullscreen[i] != this._monitors[i].inFullscreen) {
+                changed = true;
+                break;
+            }
+        }
+        if (changed) {
+            this._updateVisibility();
             this._queueUpdateRegions();
         }
+
+        // Figure out where the pointer is in case we lost track of
+        // it during a grab. (In particular, if a trayicon popup menu
+        // is dismissed, see if we need to close the message tray.)
+        global.sync_pointer();
     },
 
     _updateRegions: function() {
@@ -241,7 +349,7 @@ Chrome.prototype = {
 
         for (i = 0; i < this._trackedActors.length; i++) {
             let actorData = this._trackedActors[i];
-            if (!actorData.inputRegion && !actorData.strut)
+            if (!actorData.affectsInputRegion && !actorData.affectsStruts)
                 continue;
 
             let [x, y] = actorData.actor.get_transformed_position();
@@ -252,47 +360,83 @@ Chrome.prototype = {
             h = Math.round(h);
             let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h});
 
-            if (actorData.inputRegion && actorData.actor.get_paint_visibility())
+            if (actorData.affectsInputRegion &&
+                actorData.actor.get_paint_visibility() &&
+                !this.actor.get_skip_paint(actorData.actor))
                 rects.push(rect);
 
-            if (!actorData.strut)
+            if (!actorData.affectsStruts)
                 continue;
 
+            // Limit struts to the size of the screen
+            let x1 = Math.max(x, 0);
+            let x2 = Math.min(x + w, global.screen_width);
+            let y1 = Math.max(y, 0);
+            let y2 = Math.min(y + h, global.screen_height);
+
+            // NetWM struts are not really powerful enought to handle
+            // a multi-monitor scenario, they only describe what happens
+            // around the outer sides of the full display region. However
+            // it can describe a partial region along each side, so
+            // we can support having the struts only affect the
+            // primary monitor. This should be enough as we only have
+            // chrome affecting the struts on the primary monitor so
+            // far.
+            //
             // Metacity wants to know what side of the screen the
             // strut is considered to be attached to. If the actor is
             // only touching one edge, or is touching the entire
-            // width/height of one edge, then it's obvious which side
-            // to call it. If it's in a corner, we pick a side
+            // border of the primary monitor, then it's obvious which
+            // side to call it. If it's in a corner, we pick a side
             // arbitrarily. If it doesn't touch any edges, or it spans
             // the width/height across the middle of the screen, then
             // we don't create a strut for it at all.
             let side;
-            if (w >= global.screen_width) {
-                if (y <= 0)
+            let primary = this._primaryMonitor;
+            if (x1 <= primary.x && x2 >= primary.x + primary.width) {
+                if (y1 <= primary.y)
                     side = Meta.Side.TOP;
-                else if (y + h >= global.screen_height)
+                else if (y2 >= primary.y + primary.height)
                     side = Meta.Side.BOTTOM;
                 else
                     continue;
-            } else if (h >= global.screen_height) {
-                if (x <= 0)
+            } else if (y1 <= primary.y && y2 >= primary.y + primary.height) {
+                if (x1 <= 0)
                     side = Meta.Side.LEFT;
-                else if (x + w >= global.screen_width)
+                else if (x2 >= global.screen_width)
                     side = Meta.Side.RIGHT;
                 else
                     continue;
-            } else if (x <= 0)
+            } else if (x1 <= 0)
                 side = Meta.Side.LEFT;
-            else if (y <= 0)
+            else if (y1 <= 0)
                 side = Meta.Side.TOP;
-            else if (x + w >= global.screen_width)
+            else if (x2 >= global.screen_width)
                 side = Meta.Side.RIGHT;
-            else if (y + h >= global.screen_height)
+            else if (y2 >= global.screen_height)
                 side = Meta.Side.BOTTOM;
             else
                 continue;
 
-            let strut = new Meta.Strut({ rect: rect, side: side });
+            // Ensure that the strut rects goes all the way to the screen edge,
+            // as this really what mutter expects.
+            switch (side) {
+            case Meta.Side.TOP:
+                y1 = 0;
+                break;
+            case Meta.Side.BOTTOM:
+                y2 = global.screen_height;
+                break;
+            case Meta.Side.LEFT:
+                x1 = 0;
+                break;
+            case Meta.Side.RIGHT:
+                x2 = global.screen_width;
+                break;
+            }
+
+            let strutRect = new Meta.Rectangle({ x: x1, y: y1, width: x2 - x1, height: y2 - y1});
+            let strut = new Meta.Strut({ rect: strutRect, side: side });
             struts.push(strut);
         }
 
@@ -307,3 +451,4 @@ Chrome.prototype = {
         return false;
     }
 };
+Signals.addSignalMethods(Chrome.prototype);

js/ui/ctrlAltTab.js

@@ -0,0 +1,328 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const AltTab = imports.ui.altTab;
+const Main = imports.ui.main;
+const Params = imports.misc.params;
+const Tweener = imports.ui.tweener;
+
+const POPUP_APPICON_SIZE = 96;
+const POPUP_FADE_TIME = 0.1; // seconds
+
+const SortGroup = {
+    TOP:    0,
+    MIDDLE: 1,
+    BOTTOM: 2
+};
+
+function CtrlAltTabManager() {
+    this._init();
+}
+
+CtrlAltTabManager.prototype = {
+    _init: function() {
+        this._items = [];
+        this._focusManager = St.FocusManager.get_for_stage(global.stage);
+    },
+
+    addGroup: function(root, name, icon, params) {
+        let item = Params.parse(params, { sortGroup: SortGroup.MIDDLE,
+                                          proxy: root,
+                                          focusCallback: null });
+
+        item.root = root;
+        item.name = name;
+        item.iconName = icon;
+
+        this._items.push(item);
+        root.connect('destroy', Lang.bind(this, function() { this.removeGroup(root); }));
+        this._focusManager.add_group(root);
+    },
+
+    removeGroup: function(root) {
+        this._focusManager.remove_group(root);
+        for (let i = 0; i < this._items.length; i++) {
+            if (this._items[i].root == root) {
+                this._items.splice(i, 1);
+                return;
+            }
+        }
+    },
+
+    focusGroup: function(item) {
+        if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
+            global.stage_input_mode == Shell.StageInputMode.NORMAL)
+            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+
+        if (item.window)
+            Main.activateWindow(item.window);
+        else if (item.focusCallback)
+            item.focusCallback();
+        else
+            item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+    },
+
+    // Sort the items into a consistent order; panel first, tray last,
+    // and everything else in between, sorted by X coordinate, so that
+    // they will have the same left-to-right ordering in the
+    // Ctrl-Alt-Tab dialog as they do onscreen.
+    _sortItems: function(a, b) {
+        if (a.sortGroup != b.sortGroup)
+            return a.sortGroup - b.sortGroup;
+
+        let y;
+        if (a.x == undefined) {
+            if (a.window)
+                a.x = a.window.get_compositor_private().x;
+            else
+                [a.x, y] = a.proxy.get_transformed_position();
+        }
+        if (b.x == undefined) {
+            if (b.window)
+                b.x = b.window.get_compositor_private().x;
+            else
+                [b.x, y] = b.proxy.get_transformed_position();
+        }
+
+        return a.x - b.x;
+    },
+
+    popup: function(backwards) {
+        // Start with the set of focus groups that are currently mapped
+        let items = this._items.filter(function (item) { return item.proxy.mapped; });
+
+        // And add the windows metacity would show in its Ctrl-Alt-Tab list
+        if (!Main.overview.visible) {
+            let screen = global.screen;
+            let display = screen.get_display();
+            let windows = display.get_tab_list(Meta.TabList.DOCKS, screen, screen.get_active_workspace ());
+            let windowTracker = Shell.WindowTracker.get_default();
+            let textureCache = St.TextureCache.get_default();
+            for (let i = 0; i < windows.length; i++) {
+                let icon;
+                let app = windowTracker.get_window_app(windows[i]);
+                if (app)
+                    icon = app.create_icon_texture(POPUP_APPICON_SIZE);
+                else
+                    icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
+                items.push({ window: windows[i],
+                             name: windows[i].title,
+                             iconActor: icon,
+                             sortGroup: SortGroup.MIDDLE });
+            }
+        }
+
+        if (!items.length)
+            return;
+
+        items.sort(Lang.bind(this, this._sortItems));
+        new CtrlAltTabPopup().show(items, backwards);
+    }
+};
+
+function mod(a, b) {
+    return (a + b) % b;
+}
+
+function CtrlAltTabPopup() {
+    this._init();
+}
+
+CtrlAltTabPopup.prototype = {
+    _init : function() {
+        this.actor = new Shell.GenericContainer({ name: 'ctrlAltTabPopup',
+                                                  reactive: true });
+
+        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+
+        this._haveModal = false;
+        this._selection = 0;
+
+        Main.uiGroup.add_actor(this.actor);
+    },
+
+    _getPreferredWidth: function (actor, forHeight, alloc) {
+        let primary = global.get_primary_monitor();
+
+        alloc.min_size = primary.width;
+        alloc.natural_size = primary.width;
+    },
+
+    _getPreferredHeight: function (actor, forWidth, alloc) {
+        let primary = global.get_primary_monitor();
+
+        alloc.min_size = primary.height;
+        alloc.natural_size = primary.height;
+    },
+
+    _allocate: function (actor, box, flags) {
+        let childBox = new Clutter.ActorBox();
+        let primary = global.get_primary_monitor();
+
+        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
+        let vPadding = this.actor.get_theme_node().get_vertical_padding();
+        let hPadding = this.actor.get_theme_node().get_horizontal_padding();
+
+        let [childMinHeight, childNaturalHeight] = this._switcher.actor.get_preferred_height(primary.width - hPadding);
+        let [childMinWidth, childNaturalWidth] = this._switcher.actor.get_preferred_width(childNaturalHeight);
+        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
+        childBox.x2 = Math.min(primary.width - hPadding, childBox.x1 + childNaturalWidth);
+        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
+        childBox.y2 = childBox.y1 + childNaturalHeight;
+        this._switcher.actor.allocate(childBox, flags);
+    },
+
+    show : function(items, startBackwards) {
+        if (!Main.pushModal(this.actor))
+            return false;
+        this._haveModal = true;
+
+        this._keyPressEventId = this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
+        this._keyReleaseEventId = this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
+
+        this._items = items;
+        this._switcher = new CtrlAltTabSwitcher(items);
+        this.actor.add_actor(this._switcher.actor);
+
+        if (startBackwards)
+            this._selection = this._items.length - 1;
+        this._select(this._selection);
+
+        let [x, y, mods] = global.get_pointer();
+        if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
+            this._finish();
+            return false;
+        }
+
+        this.actor.opacity = 0;
+        this.actor.show();
+        Tweener.addTween(this.actor,
+                         { opacity: 255,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad'
+                         });
+
+        return true;
+    },
+
+    _next : function() {
+        return mod(this._selection + 1, this._items.length);
+    },
+
+    _previous : function() {
+        return mod(this._selection - 1, this._items.length);
+    },
+
+    _keyPressEvent : function(actor, event) {
+        let keysym = event.get_key_symbol();
+        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
+        if (shift && keysym == Clutter.KEY_Tab)
+            keysym = Clutter.ISO_Left_Tab;
+
+        if (keysym == Clutter.KEY_Escape)
+            this.destroy();
+        else if (keysym == Clutter.KEY_Tab)
+            this._select(this._next());
+        else if (keysym == Clutter.KEY_ISO_Left_Tab)
+            this._select(this._previous());
+        else if (keysym == Clutter.KEY_Left)
+            this._select(this._previous());
+        else if (keysym == Clutter.KEY_Right)
+            this._select(this._next());
+
+        return true;
+    },
+
+    _keyReleaseEvent : function(actor, event) {
+        let [x, y, mods] = global.get_pointer();
+        let state = mods & Clutter.ModifierType.MOD1_MASK;
+
+        if (state == 0)
+            this._finish();
+
+        return true;
+    },
+
+    _finish : function() {
+        this.destroy();
+
+        Main.ctrlAltTabManager.focusGroup(this._items[this._selection]);
+    },
+
+    _popModal: function() {
+        if (this._haveModal) {
+            Main.popModal(this.actor);
+            this._haveModal = false;
+        }
+    },
+
+    destroy : function() {
+        this._popModal();
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.actor.destroy();
+                               })
+                         });
+    },
+
+    _onDestroy : function() {
+        this._popModal();
+        if (this._keyPressEventId)
+            this.actor.disconnect(this._keyPressEventId);
+        if (this._keyReleaseEventId)
+            this.actor.disconnect(this._keyReleaseEventId);
+    },
+
+    _select : function(num) {
+        this._selection = num;
+        this._switcher.highlight(num);
+    }
+};
+
+function CtrlAltTabSwitcher(items) {
+    this._init(items);
+}
+
+CtrlAltTabSwitcher.prototype = {
+    __proto__ : AltTab.SwitcherList.prototype,
+
+    _init : function(items) {
+        AltTab.SwitcherList.prototype._init.call(this, true);
+
+        for (let i = 0; i < items.length; i++)
+            this._addIcon(items[i]);
+    },
+
+    _addIcon : function(item) {
+        let box = new St.BoxLayout({ style_class: 'alt-tab-app',
+                                     vertical: true });
+
+        let icon = item.iconActor;
+        if (!icon) {
+            icon = new St.Icon({ icon_name: item.iconName,
+                                 icon_type: St.IconType.SYMBOLIC,
+                                 icon_size: POPUP_APPICON_SIZE });
+        }
+        box.add(icon, { x_fill: false, y_fill: false } );
+
+        let text = new St.Label({ text: item.name });
+        box.add(text, { x_fill: false });
+
+        this.addItem(box);
+    }
+};

js/ui/dateMenu.js

@@ -0,0 +1,212 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Cairo = imports.cairo;
+const Clutter = imports.gi.Clutter;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const Util = imports.misc.util;
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Calendar = imports.ui.calendar;
+
+// in org.gnome.desktop.interface
+const CLOCK_FORMAT_KEY        = 'clock-format';
+
+// in org.gnome.shell.clock
+const CLOCK_SHOW_DATE_KEY     = 'show-date';
+const CLOCK_SHOW_SECONDS_KEY  = 'show-seconds';
+
+function _onVertSepRepaint (area)
+{
+    let cr = area.get_context();
+    let themeNode = area.get_theme_node();
+    let [width, height] = area.get_surface_size();
+    let stippleColor = themeNode.get_color('-stipple-color');
+    let stippleWidth = themeNode.get_length('-stipple-width');
+    let x = Math.floor(width/2) + 0.5;
+    cr.moveTo(x, 0);
+    cr.lineTo(x, height);
+    Clutter.cairo_set_source_color(cr, stippleColor);
+    cr.setDash([1, 3], 1); // Hard-code for now
+    cr.setLineWidth(stippleWidth);
+    cr.stroke();
+};
+
+function DateMenuButton() {
+    this._init();
+}
+
+DateMenuButton.prototype = {
+    __proto__: PanelMenu.Button.prototype,
+
+    _init: function() {
+        let item;
+        let hbox;
+        let vbox;
+
+        this._eventSource = new Calendar.DBusEventSource();
+
+        let menuAlignment = 0.25;
+        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+            menuAlignment = 1.0 - menuAlignment;
+        PanelMenu.Button.prototype._init.call(this, menuAlignment);
+
+        this._clock = new St.Label();
+        this.actor.set_child(this._clock);
+
+        hbox = new St.BoxLayout({name: 'calendarArea'});
+        this.menu.addActor(hbox);
+
+        // Fill up the first column
+
+        vbox = new St.BoxLayout({vertical: true});
+        hbox.add(vbox);
+
+        // Date
+        this._date = new St.Label();
+        this._date.style_class = 'datemenu-date-label';
+        vbox.add(this._date);
+
+        this._eventList = new Calendar.EventsList(this._eventSource);
+
+        // Calendar
+        this._calendar = new Calendar.Calendar(this._eventSource);
+        this._calendar.connect('selected-date-changed',
+                               Lang.bind(this, function(calendar, date) {
+                                   this._eventList.setDate(date);
+                               }));
+        vbox.add(this._calendar.actor);
+
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        item.setColumnWidths(1);
+        vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+        item = new PopupMenu.PopupMenuItem(_("Date and Time Settings"));
+        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
+        item.actor.can_focus = false;
+        vbox.add(item.actor);
+
+        // Add vertical separator
+
+        item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
+                                    pseudo_class: 'highlighted' });
+        item.connect('repaint', Lang.bind(this, _onVertSepRepaint));
+        hbox.add(item);
+
+        // Fill up the second column
+
+        vbox = new St.BoxLayout({vertical: true});
+        hbox.add(vbox, { expand: true });
+
+        // Event list
+        vbox.add(this._eventList.actor, { expand: true });
+
+        item = new PopupMenu.PopupMenuItem(_("Open Calendar"));
+        item.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
+        item.actor.can_focus = false;
+        vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+
+        // Whenever the menu is opened, select today
+        this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
+            if (isOpen) {
+                let now = new Date();
+                /* Passing true to setDate() forces events to be reloaded. We
+                 * want this behavior, because
+                 *
+                 *   o It will cause activation of the calendar server which is
+                 *     useful if it has crashed
+                 *
+                 *   o It will cause the calendar server to reload events which
+                 *     is useful if dynamic updates are not supported or not
+                 *     properly working
+                 *
+                 * Since this only happens when the menu is opened, the cost
+                 * isn't very big.
+                 */
+                this._calendar.setDate(now, true);
+                // No need to update this._eventList as ::selected-date-changed
+                // signal will fire
+            }
+        }));
+
+        // Done with hbox for calendar and event list
+
+        // Track changes to clock settings
+        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        this._clockSettings = new Gio.Settings({ schema: 'org.gnome.shell.clock' });
+        this._desktopSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
+        this._clockSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
+
+        // Start the clock
+        this._updateClockAndDate();
+    },
+
+    _updateClockAndDate: function() {
+        let format = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
+        let showDate = this._clockSettings.get_boolean(CLOCK_SHOW_DATE_KEY);
+        let showSeconds = this._clockSettings.get_boolean(CLOCK_SHOW_SECONDS_KEY);
+
+        let clockFormat;
+        let dateFormat;
+
+        switch (format) {
+            case '24h':
+                if (showDate)
+	            /* Translators: This is the time format with date used
+                       in 24-hour mode. */
+                    clockFormat = showSeconds ? _("%a %b %e, %R:%S")
+                                              : _("%a %b %e, %R");
+                else
+	            /* Translators: This is the time format without date used
+                       in 24-hour mode. */
+                    clockFormat = showSeconds ? _("%a %R:%S")
+                                              : _("%a %R");
+                break;
+            case '12h':
+            default:
+                if (showDate)
+	            /* Translators: This is a time format with date used
+                       for AM/PM. */
+                    clockFormat = showSeconds ? _("%a %b %e, %l:%M:%S %p")
+                                              : _("%a %b %e, %l:%M %p");
+                else
+	            /* Translators: This is a time format without date used
+                       for AM/PM. */
+                    clockFormat = showSeconds ? _("%a %l:%M:%S %p")
+                                              : _("%a %l:%M %p");
+                break;
+        }
+
+        let displayDate = new Date();
+
+        this._clock.set_text(displayDate.toLocaleFormat(clockFormat));
+
+        /* Translators: This is the date format to use when the calendar popup is
+         * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
+         */
+        dateFormat = _("%A %B %e, %Y");
+        this._date.set_text(displayDate.toLocaleFormat(dateFormat));
+
+        Mainloop.timeout_add_seconds(1, Lang.bind(this, this._updateClockAndDate));
+        return false;
+    },
+
+    _onPreferencesActivate: function() {
+        this.menu.close();
+        let app = Shell.AppSystem.get_default().get_app('gnome-datetime-panel.desktop');
+        app.activate(-1);
+    },
+
+    _onOpenCalendarActivate: function() {
+        this.menu.close();
+        // TODO: pass the selected day
+        Util.spawn(['evolution', '-c', 'calendar']);
+    }
+};

js/ui/dnd.js

@@ -1,10 +1,13 @@
-/* -*- mode: js2; js2-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
+const St = imports.gi.St;
 const Lang = imports.lang;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const Tweener = imports.ui.tweener;
+const Main = imports.ui.main;
 
 const Params = imports.misc.params;
 
@@ -12,16 +15,38 @@ const Params = imports.misc.params;
 const SCALE_ANIMATION_TIME = 0.25;
 // Time to animate to original position on cancel
 const SNAP_BACK_ANIMATION_TIME = 0.25;
+// Time to animate to original position on success
+const REVERT_ANIMATION_TIME = 0.75;
+
+const DragMotionResult = {
+    NO_DROP:   0,
+    COPY_DROP: 1,
+    MOVE_DROP: 2,
+    CONTINUE:  3
+};
+
+const DRAG_CURSOR_MAP = {
+    0: Shell.Cursor.DND_UNSUPPORTED_TARGET,
+    1: Shell.Cursor.DND_COPY,
+    2: Shell.Cursor.DND_MOVE
+};
+
+const DragDropResult = {
+    FAILURE:  0,
+    SUCCESS:  1,
+    CONTINUE: 2
+};
 
 let eventHandlerActor = null;
 let currentDraggable = null;
+let dragMonitors = [];
 
 function _getEventHandlerActor() {
     if (!eventHandlerActor) {
         eventHandlerActor = new Clutter.Rectangle();
         eventHandlerActor.width = 0;
         eventHandlerActor.height = 0;
-        global.stage.add_actor(eventHandlerActor);
+        Main.uiGroup.add_actor(eventHandlerActor);
         // We connect to 'event' rather than 'captured-event' because the capturing phase doesn't happen
         // when you've grabbed the pointer.
         eventHandlerActor.connect('event',
@@ -32,6 +57,18 @@ function _getEventHandlerActor() {
     return eventHandlerActor;
 }
 
+function addDragMonitor(monitor) {
+    dragMonitors.push(monitor);
+}
+
+function removeMonitor(monitor) {
+    for (let i = 0; i < dragMonitors.length; i++)
+        if (dragMonitors[i] == monitor) {
+            dragMonitors.splice(i, 1);
+            return;
+        }
+}
+
 function _Draggable(actor, params) {
     this._init(actor, params);
 }
@@ -39,6 +76,7 @@ function _Draggable(actor, params) {
 _Draggable.prototype = {
     _init : function(actor, params) {
         params = Params.parse(params, { manualMode: false,
+                                        restoreOnSuccess: false,
                                         dragActorMaxSize: undefined,
                                         dragActorOpacity: undefined });
 
@@ -48,26 +86,49 @@ _Draggable.prototype = {
                                Lang.bind(this, this._onButtonPress));
 
         this.actor.connect('destroy', Lang.bind(this, function() {
+            this._actorDestroyed = true;
+            // If the drag actor is destroyed and we were going to fix
+            // up its hover state, fix up the parent hover state instead
+            if (this.actor == this._firstLeaveActor)
+                this._firstLeaveActor = this._dragOrigParent;
+            if (this._dragInProgress)
+                this._cancelDrag(global.get_current_time());
             this.disconnectAll();
         }));
         this._onEventId = null;
 
+        this._restoreOnSuccess = params.restoreOnSuccess;
         this._dragActorMaxSize = params.dragActorMaxSize;
         this._dragActorOpacity = params.dragActorOpacity;
 
         this._buttonDown = false; // The mouse button has been pressed and has not yet been released.
         this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet.
-        this._snapBackInProgress = false; // The drag has been cancelled and the item is in the process of snapping back.
+        this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).
+
+        // During the drag, we eat enter/leave events so that actors don't prelight or show
+        // tooltips. But we remember the actors that we first left/last entered so we can
+        // fix up the hover state after the drag ends.
+        this._firstLeaveActor = null;
+        this._lastEnterActor = null;
+
+        this._eventsGrabbed = false;
     },
 
     _onButtonPress : function (actor, event) {
-        // FIXME: we should make sure it's button 1, but we can't currently
-        // check that from JavaScript
+        if (event.get_button() != 1)
+            return false;
+
         if (Tweener.getTweenCount(actor))
             return false;
 
         this._buttonDown = true;
-        this._grabActor();
+        // special case St.Button: grabbing the pointer would mess up the
+        // internal state, so we start the drag manually on hover change
+        if (this.actor instanceof St.Button)
+            this.actor.connect('notify::hover',
+                               Lang.bind(this, this._onButtonHoverChanged));
+        else
+            this._grabActor();
 
         let [stageX, stageY] = event.get_coords();
         this._dragStartX = stageX;
@@ -76,6 +137,15 @@ _Draggable.prototype = {
         return false;
     },
 
+    _onButtonHoverChanged: function(button) {
+        if (button.hover || !button.pressed)
+            return;
+
+        button.fake_release();
+        this.startDrag(this._dragStartX, this._dragStartY,
+                       global.get_current_time());
+    },
+
     _grabActor: function() {
         Clutter.grab_pointer(this.actor);
         this._onEventId = this.actor.connect('event',
@@ -84,18 +154,26 @@ _Draggable.prototype = {
 
     _ungrabActor: function() {
         Clutter.ungrab_pointer();
+        if (!this._onEventId)
+            return;
         this.actor.disconnect(this._onEventId);
         this._onEventId = null;
     },
 
     _grabEvents: function() {
-        Clutter.grab_pointer(_getEventHandlerActor());
-        Clutter.grab_keyboard(_getEventHandlerActor());
+        if (!this._eventsGrabbed) {
+            Clutter.grab_pointer(_getEventHandlerActor());
+            Clutter.grab_keyboard(_getEventHandlerActor());
+            this._eventsGrabbed = true;
+        }
     },
 
     _ungrabEvents: function() {
-        Clutter.ungrab_pointer();
-        Clutter.ungrab_keyboard();
+        if (this._eventsGrabbed) {
+            Clutter.ungrab_pointer();
+            Clutter.ungrab_keyboard();
+            this._eventsGrabbed = false;
+        }
     },
 
     _onEvent: function(actor, event) {
@@ -107,7 +185,7 @@ _Draggable.prototype = {
             this._buttonDown = false;
             if (this._dragInProgress) {
                 return this._dragActorDropped(event);
-            } else if (this._dragActor != null && !this._snapBackInProgress) {
+            } else if (this._dragActor != null && !this._animationInProgress) {
                 // Drag must have been cancelled with Esc.
                 this._dragComplete();
                 return true;
@@ -132,6 +210,11 @@ _Draggable.prototype = {
                 this._cancelDrag(event.get_time());
                 return true;
             }
+        } else if (event.type() == Clutter.EventType.LEAVE) {
+            if (this._firstLeaveActor == null)
+                this._firstLeaveActor = event.get_source();
+        } else if (event.type() == Clutter.EventType.ENTER) {
+            this._lastEnterActor = event.get_source();
         }
 
         return false;
@@ -155,6 +238,7 @@ _Draggable.prototype = {
         if (this._onEventId)
             this._ungrabActor();
         this._grabEvents();
+        global.set_cursor(Shell.Cursor.DND_IN_DRAG);
 
         this._dragX = this._dragStartX = stageX;
         this._dragY = this._dragStartY = stageY;
@@ -208,6 +292,7 @@ _Draggable.prototype = {
 
         this._dragActor.reparent(this.actor.get_stage());
         this._dragActor.raise_top();
+        Shell.util_set_hidden_from_pick(this._dragActor, true);
 
         this._dragOrigOpacity = this._dragActor.opacity;
         if (this._dragActorOpacity != undefined)
@@ -236,7 +321,7 @@ _Draggable.prototype = {
                                  { scale_x: scale * origScale,
                                    scale_y: scale * origScale,
                                    time: SCALE_ANIMATION_TIME,
-                                   transition: "easeOutQuad",
+                                   transition: 'easeOutQuad',
                                    onUpdate: function() {
                                        let currentScale = this._dragActor.scale_x / origScale;
                                        this._dragOffsetX = currentScale * origDragOffsetX;
@@ -272,51 +357,101 @@ _Draggable.prototype = {
         if (this._dragActor) {
             this._dragActor.set_position(stageX + this._dragOffsetX,
                                          stageY + this._dragOffsetY);
-            // Because we want to find out what other actor is located at the current position of this._dragActor,
-            // we have to temporarily hide this._dragActor.
-            this._dragActor.hide();
+
             let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
                                                                       stageX, stageY);
-            this._dragActor.show();
+
+            // We call observers only once per motion with the innermost
+            // target actor. If necessary, the observer can walk the
+            // parent itself.
+            let dragEvent = {
+                x: stageX,
+                y: stageY,
+                dragActor: this._dragActor,
+                source: this.actor._delegate,
+                targetActor: target
+            };
+            for (let i = 0; i < dragMonitors.length; i++) {
+                let motionFunc = dragMonitors[i].dragMotion;
+                if (motionFunc) {
+                    let result = motionFunc(dragEvent);
+                    if (result != DragMotionResult.CONTINUE) {
+                        global.set_cursor(DRAG_CURSOR_MAP[result]);
+                        return true;
+                    }
+                }
+            }
             while (target) {
                 if (target._delegate && target._delegate.handleDragOver) {
-                    let [targX, targY] = target.get_transformed_position();
+                    let [r, targX, targY] = target.transform_stage_point(stageX, stageY);
                     // We currently loop through all parents on drag-over even if one of the children has handled it.
                     // We can check the return value of the function and break the loop if it's true if we don't want
                     // to continue checking the parents.
-                    target._delegate.handleDragOver(this.actor._delegate, this._dragActor,
-                                                    (stageX - targX) / target.scale_x,
-                                                    (stageY - targY) / target.scale_y,
-                                                    event.get_time());
+                    let result = target._delegate.handleDragOver(this.actor._delegate,
+                                                                 this._dragActor,
+                                                                 targX,
+                                                                 targY,
+                                                                 event.get_time());
+                    if (result != DragMotionResult.CONTINUE) {
+                        global.set_cursor(DRAG_CURSOR_MAP[result]);
+                        return true;
+                    }
                 }
                 target = target.get_parent();
             }
+            global.set_cursor(Shell.Cursor.DND_IN_DRAG);
         }
 
         return true;
     },
 
     _dragActorDropped: function(event) {
-        // Find a drop target. Because we want to find out what other actor is located at
-        // the current position of this._dragActor, we have to temporarily hide this._dragActor.
-        this._dragActor.hide();
         let [dropX, dropY] = event.get_coords();
         let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
                                                                   dropX, dropY);
-        this._dragActor.show();
+
+        // We call observers only once per motion with the innermost
+        // target actor. If necessary, the observer can walk the
+        // parent itself.
+        let dropEvent = {
+            dropActor: this._dragActor,
+            targetActor: target,
+            clutterEvent: event
+        };
+        for (let i = 0; i < dragMonitors.length; i++) {
+            let dropFunc = dragMonitors[i].dragDrop;
+            if (dropFunc)
+                switch (dropFunc(dropEvent)) {
+                    case DragDropResult.FAILURE:
+                    case DragDropResult.SUCCESS:
+                        return true;
+                    case DragDropResult.CONTINUE:
+                        continue;
+                }
+        }
+
         while (target) {
             if (target._delegate && target._delegate.acceptDrop) {
-                let [targX, targY] = target.get_transformed_position();
-                if (target._delegate.acceptDrop(this.actor._delegate, this._dragActor,
-                                                (dropX - targX) / target.scale_x,
-                                                (dropY - targY) / target.scale_y,
+                let [r, targX, targY] = target.transform_stage_point(dropX, dropY);
+                if (target._delegate.acceptDrop(this.actor._delegate,
+                                                this._dragActor,
+                                                targX,
+                                                targY,
                                                 event.get_time())) {
+                    if (this._actorDestroyed)
+                        return true;
                     // If it accepted the drop without taking the actor,
-                    // destroy it.
-                    if (this._dragActor.get_parent() == this._dragActor.get_stage())
-                        this._dragActor.destroy();
+                    // handle it ourselves.
+                    if (this._dragActor.get_parent() == this._dragActor.get_stage()) {
+                        if (this._restoreOnSuccess) {
+                            this._restoreDragActor(event.get_time());
+                            return true;
+                        } else
+                            this._dragActor.destroy();
+                    }
 
                     this._dragInProgress = false;
+                    global.unset_cursor();
                     this.emit('drag-end', event.get_time(), true);
                     this._dragComplete();
                     return true;
@@ -330,34 +465,91 @@ _Draggable.prototype = {
         return true;
     },
 
-    _cancelDrag: function(eventTime) {
-        this._dragInProgress = false;
-        // Snap back to the actor source if the source is still around, snap back 
-        // to the original location if the actor itself was being dragged or the
-        // source is no longer around.
-        let snapBackX = this._snapBackX;
-        let snapBackY = this._snapBackY;
+    _getRestoreLocation: function() {
+        let x, y, scale;
+
         if (this._dragActorSource && this._dragActorSource.visible) {
-            [snapBackX, snapBackY] = this._dragActorSource.get_transformed_position();
+            // Snap the clone back to its source
+            [x, y] = this._dragActorSource.get_transformed_position();
+            let [sourceScaledWidth, sourceScaledHeight] = this._dragActorSource.get_transformed_size();
+            scale = this._dragActor.width / sourceScaledWidth;
+        } else if (this._dragOrigParent) {
+            // Snap the actor back to its original position within
+            // its parent, adjusting for the fact that the parent
+            // may have been moved or scaled
+            let [parentX, parentY] = this._dragOrigParent.get_transformed_position();
+            let [parentWidth, parentHeight] = this._dragOrigParent.get_size();
+            let [parentScaledWidth, parentScaledHeight] = this._dragOrigParent.get_transformed_size();
+            let parentScale = 1.0;
+            if (parentWidth != 0)
+                parentScale = parentScaledWidth / parentWidth;
+
+            x = parentX + parentScale * this._dragOrigX;
+            y = parentY + parentScale * this._dragOrigY;
+            scale = this._dragOrigScale * parentScale;
+        } else {
+            // Snap back actor to its original stage position
+            x = this._snapBackX;
+            y = this._snapBackY;
+            scale = this._snapBackScale;
         }
 
-        this._snapBackInProgress = true;
+        return [x, y, scale];
+    },
+
+    _cancelDrag: function(eventTime) {
+        this.emit('drag-cancelled', eventTime);
+        this._dragInProgress = false;
+        let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();
+
+        if (this._actorDestroyed) {
+            global.unset_cursor();
+            if (!this._buttonDown)
+                this._dragComplete();
+            this.emit('drag-end', eventTime, false);
+            if (!this._dragOrigParent)
+                this._dragActor.destroy();
+
+            return;
+        }
+
+        this._animationInProgress = true;
         // No target, so snap back
         Tweener.addTween(this._dragActor,
                          { x: snapBackX,
                            y: snapBackY,
-                           scale_x: this._snapBackScale,
-                           scale_y: this._snapBackScale,
+                           scale_x: snapBackScale,
+                           scale_y: snapBackScale,
                            opacity: this._dragOrigOpacity,
                            time: SNAP_BACK_ANIMATION_TIME,
-                           transition: "easeOutQuad",
-                           onComplete: this._onSnapBackComplete,
+                           transition: 'easeOutQuad',
+                           onComplete: this._onAnimationComplete,
                            onCompleteScope: this,
                            onCompleteParams: [this._dragActor, eventTime]
                          });
     },
 
-    _onSnapBackComplete : function (dragActor, eventTime) {
+    _restoreDragActor: function(eventTime) {
+        this._dragInProgress = false;
+        [restoreX, restoreY, restoreScale] = this._getRestoreLocation();
+
+        // fade the actor back in at its original location
+        this._dragActor.set_position(restoreX, restoreY);
+        this._dragActor.set_scale(restoreScale, restoreScale);
+        this._dragActor.opacity = 0;
+
+        this._animationInProgress = true;
+        Tweener.addTween(this._dragActor,
+                         { opacity: this._dragOrigOpacity,
+                           time: REVERT_ANIMATION_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: this._onAnimationComplete,
+                           onCompleteScope: this,
+                           onCompleteParams: [this._dragActor, eventTime]
+                         });
+    },
+
+    _onAnimationComplete : function (dragActor, eventTime) {
         if (this._dragOrigParent) {
             dragActor.reparent(this._dragOrigParent);
             dragActor.set_scale(this._dragOrigScale, this._dragOrigScale);
@@ -365,17 +557,44 @@ _Draggable.prototype = {
         } else {
             dragActor.destroy();
         }
+        global.unset_cursor();
         this.emit('drag-end', eventTime, false);
 
-        this._snapBackInProgress = false;
+        this._animationInProgress = false;
         if (!this._buttonDown)
             this._dragComplete();
     },
 
+    // Actor is an actor we have entered or left during the drag; call
+    // st_widget_sync_hover on all StWidget ancestors
+    _syncHover: function(actor) {
+        while (actor) {
+            let parent = actor.get_parent();
+            if (actor instanceof St.Widget)
+                actor.sync_hover();
+
+            actor = parent;
+        }
+    },
+
     _dragComplete: function() {
+        if (!this._actorDestroyed)
+            Shell.util_set_hidden_from_pick(this._dragActor, false);
+
+        this._ungrabEvents();
+
+        if (this._firstLeaveActor) {
+            this._syncHover(this._firstLeaveActor);
+            this._firstLeaveActor = null;
+        }
+
+        if (this._lastEnterActor) {
+            this._syncHover(this._lastEnterActor);
+            this._lastEnterActor = null;
+        }
+
         this._dragActor = undefined;
         currentDraggable = null;
-        this._ungrabEvents();
     }
 };
 

js/ui/docDisplay.js

@@ -1,481 +1,12 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-const Mainloop = imports.mainloop;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
 const DocInfo = imports.misc.docInfo;
-const DND = imports.ui.dnd;
-const GenericDisplay = imports.ui.genericDisplay;
-const Main = imports.ui.main;
+const Params = imports.misc.params;
 const Search = imports.ui.search;
 
-const MAX_DASH_DOCS = 50;
-const DASH_DOCS_ICON_SIZE = 16;
-
-const DEFAULT_SPACING = 4;
-
-/* This class represents a single display item containing information about a document.
- * We take the current number of seconds in the constructor to avoid looking up the current
- * time for every item when they are created in a batch.
- *
- * docInfo - DocInfo object containing information about the document
- * currentSeconds - current number of seconds since the epoch
- */
-function DocDisplayItem(docInfo, currentSecs) {
-    this._init(docInfo, currentSecs);
-}
-
-DocDisplayItem.prototype = {
-    __proto__:  GenericDisplay.GenericDisplayItem.prototype,
-
-    _init : function(docInfo, currentSecs) {
-        GenericDisplay.GenericDisplayItem.prototype._init.call(this);
-        this._docInfo = docInfo;
-
-        this._setItemInfo(docInfo.name, "");
-
-        this._timeoutTime = -1;
-        this._resetTimeDisplay(currentSecs);
-    },
-
-    //// Public methods ////
-
-    getUpdateTimeoutTime: function() {
-        return this._timeoutTime;
-    },
-
-    // Update any relative-time based displays for this item.
-    redisplay: function(currentSecs) {
-        this._resetTimeDisplay(currentSecs);
-    },
-
-    //// Public method overrides ////
-
-    // Opens a document represented by this display item.
-    launch : function() {
-        this._docInfo.launch();
-    },
-
-    //// Protected method overrides ////
-
-    // Returns an icon for the item.
-    _createIcon : function() {
-        return this._docInfo.createIcon(GenericDisplay.ITEM_DISPLAY_ICON_SIZE);
-    },
-
-    // Returns a preview icon for the item.
-    _createPreviewIcon : function() {
-        return this._docInfo.createIcon(GenericDisplay.PREVIEW_ICON_SIZE);
-    },
-
-    // Creates and returns a large preview icon, but only if this._docInfo is an image file
-    // and we were able to generate a pixbuf from it successfully.
-    _createLargePreviewIcon : function() {
-        if (this._docInfo.mimeType == null || this._docInfo.mimeType.indexOf("image/") != 0)
-            return null;
-
-        try {
-            return St.TextureCache.get_default().load_uri_sync(St.TextureCachePolicy.NONE,
-                                                               this._docInfo.uri, -1, -1);
-        } catch (e) {
-            // An exception will be raised when the image format isn't know
-            /* FIXME: http://bugzilla.gnome.org/show_bug.cgi?id=591480: should
-             *        only ignore GDK_PIXBUF_ERROR_UNKNOWN_TYPE. */
-            return null;
-        }
-    },
-
-    //// Drag and Drop ////
-
-    shellWorkspaceLaunch: function() {
-        this.launch();
-    },
-
-    //// Private Methods ////
-
-    // Updates the last visited time displayed in the description text for the item.
-    _resetTimeDisplay: function(currentSecs) {
-        let lastSecs = this._docInfo.timestamp;
-        let timeDelta = currentSecs - lastSecs;
-        let [text, nextUpdate] = global.format_time_relative_pretty(timeDelta);
-        this._timeoutTime = currentSecs + nextUpdate;
-        this._setDescriptionText(text);
-    }
-};
-
-/* This class represents a display containing a collection of document items.
- * The documents are sorted by how recently they were last visited.
- */
-function DocDisplay(flags) {
-    this._init(flags);
-}
-
-DocDisplay.prototype = {
-    __proto__:  GenericDisplay.GenericDisplay.prototype,
-
-    _init : function(flags) {
-        GenericDisplay.GenericDisplay.prototype._init.call(this, flags);
-        // We keep a single timeout callback for updating last visited times
-        // for all the items in the display. This avoids creating individual
-        // callbacks for each item in the display. So proper time updates
-        // for individual items and item details depend on the item being
-        // associated with one of the displays.
-        this._updateTimeoutTargetTime = -1;
-        this._updateTimeoutId = 0;
-
-        this._docManager = DocInfo.getDocManager();
-        this._docsStale = true;
-        this._docManager.connect('changed', Lang.bind(this, function(mgr, userData) {
-            this._docsStale = true;
-            // Changes in local recent files should not happen when we are in the Overview mode,
-            // but redisplaying right away is cool when we use Zephyr.
-            // Also, we might be displaying remote documents, like Google Docs, in the future
-            // which might be edited by someone else.
-            this._redisplay(GenericDisplay.RedisplayFlags.NONE);
-        }));
-
-        this.connect('destroy', Lang.bind(this, function (o) {
-            if (this._updateTimeoutId > 0)
-                Mainloop.source_remove(this._updateTimeoutId);
-        }));
-    },
-
-    //// Protected method overrides ////
-
-    // Gets the list of recent items from the recent items manager.
-    _refreshCache : function() {
-        if (!this._docsStale)
-            return true;
-        this._allItems = {};
-        Lang.copyProperties(this._docManager.getInfosByUri(), this._allItems);
-        this._docsStale = false;
-        return false;
-    },
-
-    // Sets the list of the displayed items based on how recently they were last visited.
-    _setDefaultList : function() {
-        // It seems to be an implementation detail of the Mozilla JavaScript that object
-        // properties are returned during the iteration in the same order in which they were
-        // defined, but it is not a guarantee according to this 
-        // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Statements/for...in
-        // While this._allItems associative array seems to always be ordered by last added,
-        // as the results of this._recentManager.get_items() based on which it is constructed are,
-        // we should do the sorting manually because we want the order to be based on last visited.
-        //
-        // This function is called each time the search string is set back to '' or we display
-        // the Overview, so we are doing the sorting over the same items multiple times if the list
-        // of recent items didn't change. We could store an additional array of doc ids and sort
-        // them once when they are returned by this._recentManager.get_items() to avoid having to do 
-        // this sorting each time, but the sorting seems to be very fast anyway, so there is no need
-        // to introduce an additional class variable.
-        this._matchedItems = {};
-        this._matchedItemKeys = [];
-        let docIdsToRemove = [];
-        for (docId in this._allItems) {
-            this._matchedItems[docId] = 1;
-            this._matchedItemKeys.push(docId);
-        }
-
-        for (docId in docIdsToRemove) {
-            delete this._allItems[docId];
-        }
-
-        this._matchedItemKeys.sort(Lang.bind(this, this._compareItems));
-    },
-
-    // Compares items associated with the item ids based on how recently the items
-    // were last visited.
-    // Returns an integer value indicating the result of the comparison.
-   _compareItems : function(itemIdA, itemIdB) {
-        let docA = this._allItems[itemIdA];
-        let docB = this._allItems[itemIdB];
-
-        return docB.timestamp - docA.timestamp;
-    },
-
-    // Checks if the item info can be a match for the search string by checking
-    // the name of the document. Item info is expected to be GtkRecentInfo.
-    // Returns a boolean flag indicating if itemInfo is a match.
-    _isInfoMatching : function(itemInfo, search) {
-        if (!itemInfo.exists())
-            return false;
- 
-        if (search == null || search == '')
-            return true;
-
-        let name = itemInfo.name.toLowerCase();
-        if (name.indexOf(search) >= 0)
-            return true;
-        // TODO: we can also check doc URIs, so that
-        // if you search for a directory name, we display recent files from it
-        return false;
-    },
-
-    // Creates a DocDisplayItem based on itemInfo, which is expected to be a DocInfo object.
-    _createDisplayItem: function(itemInfo) {
-        let currentSecs = new Date().getTime() / 1000;
-        let docDisplayItem = new DocDisplayItem(itemInfo, currentSecs);
-        this._updateTimeoutCallback(docDisplayItem, currentSecs);
-        return docDisplayItem;
-    },
-
-    //// Private Methods ////
-
-    // A callback function that redisplays the items, updating their descriptions,
-    // and sets up a new timeout callback.
-    _docTimeout: function () {
-        let currentSecs = new Date().getTime() / 1000;
-        this._updateTimeoutId = 0;
-        this._updateTimeoutTargetTime = -1;
-        for (let docId in this._displayedItems) {
-            let docDisplayItem = this._displayedItems[docId];
-            docDisplayItem.redisplay(currentSecs);          
-            this._updateTimeoutCallback(docDisplayItem, currentSecs);
-        }
-        return false;
-    },
-
-    // Updates the timeout callback if the timeout time for the docDisplayItem 
-    // is earlier than the target time for the current timeout callback.
-    _updateTimeoutCallback: function (docDisplayItem, currentSecs) {
-        let timeoutTime = docDisplayItem.getUpdateTimeoutTime();
-        if (this._updateTimeoutTargetTime < 0 || timeoutTime < this._updateTimeoutTargetTime) {
-            if (this._updateTimeoutId > 0)
-                Mainloop.source_remove(this._updateTimeoutId);
-            this._updateTimeoutId = Mainloop.timeout_add_seconds(timeoutTime - currentSecs, Lang.bind(this, this._docTimeout));
-            this._updateTimeoutTargetTime = timeoutTime;
-        }
-    }
-};
-
-Signals.addSignalMethods(DocDisplay.prototype);
-
-function DashDocDisplayItem(docInfo) {
-    this._init(docInfo);
-}
-
-DashDocDisplayItem.prototype = {
-    _init: function(docInfo) {
-        this._info = docInfo;
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   spacing: DEFAULT_SPACING,
-                                   reactive: true });
-        this.actor.connect('button-release-event', Lang.bind(this, function () {
-            docInfo.launch();
-            Main.overview.hide();
-        }));
-
-        this.actor._delegate = this;
-
-        this._icon = docInfo.createIcon(DASH_DOCS_ICON_SIZE);
-        let iconBox = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
-        iconBox.append(this._icon, Big.BoxPackFlags.NONE);
-        this.actor.append(iconBox, Big.BoxPackFlags.NONE);
-        let name = new St.Label({ style_class: 'dash-recent-docs-item',
-                                   text: docInfo.name });
-        this.actor.append(name, Big.BoxPackFlags.EXPAND);
-
-        let draggable = DND.makeDraggable(this.actor);
-    },
-
-    getUri: function() {
-        return this._info.uri;
-    },
-
-    getDragActorSource: function() {
-        return this._icon;
-    },
-
-    getDragActor: function(stageX, stageY) {
-        this.dragActor = this._info.createIcon(DASH_DOCS_ICON_SIZE);
-        return this.dragActor;
-    },
-
-    //// Drag and drop functions ////
-
-    shellWorkspaceLaunch: function () {
-        this._info.launch();
-    }
-};
-
-/**
- * Class used to display two column recent documents in the dash
- */
-function DashDocDisplay() {
-    this._init();
-}
-
-DashDocDisplay.prototype = {
-    _init: function() {
-        this.actor = new Shell.GenericContainer();
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-        this._workId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._redisplay));
-
-        this._actorsByUri = {};
-
-        this._docManager = DocInfo.getDocManager();
-        this._docManager.connect('changed', Lang.bind(this, this._onDocsChanged));
-        this._pendingDocsChange = true;
-        this._checkDocExistence = false;
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let children = actor.get_children();
-
-        // We use two columns maximum.  Just take the min and natural size of the
-        // first two items, even though strictly speaking it's not correct; we'd
-        // need to calculate how many items we could fit for the height, then
-        // take the biggest preferred width for each column.
-        // In practice the dash gets a fixed width anyways.
-
-        // If we have one child, add its minimum and natural size
-        if (children.length > 0) {
-            let [minSize, naturalSize] = children[0].get_preferred_width(forHeight);
-            alloc.min_size += minSize;
-            alloc.natural_size += naturalSize;
-        }
-        // If we have two, add its size, plus DEFAULT_SPACING
-        if (children.length > 1) {
-            let [minSize, naturalSize] = children[1].get_preferred_width(forHeight);
-            alloc.min_size += DEFAULT_SPACING + minSize;
-            alloc.natural_size += DEFAULT_SPACING + naturalSize;
-        }
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let children = actor.get_children();
-
-        // The width of an item is our allocated width, minus spacing, divided in half.
-        this._itemWidth = Math.floor((forWidth - DEFAULT_SPACING) / 2);
-
-        let maxNatural = 0;
-        for (let i = 0; i < children.length; i++) {
-            let child = children[i];
-            let [minSize, naturalSize] = child.get_preferred_height(this._itemWidth);
-            maxNatural = Math.max(maxNatural, naturalSize);
-        }
-
-        this._itemHeight = maxNatural;
-
-        let firstColumnChildren = Math.ceil(children.length / 2);
-        alloc.natural_size = (firstColumnChildren * maxNatural +
-                              (firstColumnChildren - 1) * DEFAULT_SPACING);
-    },
-
-    _allocate: function(actor, box, flags) {
-        let width = box.x2 - box.x1;
-        let height = box.y2 - box.y1;
-
-        // Make sure this._itemWidth/Height have been computed, even
-        // if the parent actor didn't check our size before allocating.
-        // (Not clear if that is required or not as a Clutter
-        // invariant; this is safe and cheap because of caching.)
-        actor.get_preferred_height(width);
-
-        let children = actor.get_children();
-
-        let x = 0;
-        let y = 0;
-        let columnIndex = 0;
-        let i = 0;
-        // Loop over the children, going vertically down first.  When we run
-        // out of vertical space (our y variable is bigger than box.y2), switch
-        // to the second column.
-        while (i < children.length) {
-            let child = children[i];
-
-            if (y + this._itemHeight > box.y2) {
-                // Is this the second column, or we're in
-                // the first column and can't even fit one
-                // item?  In that case, break.
-                if (columnIndex == 1 || i == 0) {
-                    break;
-                }
-                // Set x to the halfway point.
-                columnIndex += 1;
-                x = x + this._itemWidth + DEFAULT_SPACING;
-                // And y is back to the top.
-                y = 0;
-                // Retry this same item, now that we're in the second column.
-                // By looping back to the top here, we re-test the size
-                // again for the second column.
-                continue;
-            }
-
-            let childBox = new Clutter.ActorBox();
-            childBox.x1 = x;
-            childBox.y1 = y;
-            childBox.x2 = childBox.x1 + this._itemWidth;
-            childBox.y2 = y + this._itemHeight;
-
-            y = childBox.y2 + DEFAULT_SPACING;
-
-            child.allocate(childBox, flags);
-            this.actor.set_skip_paint(child, false);
-
-            i++;
-        }
-
-        if (this._checkDocExistence) {
-            // Now we know how many docs we are displaying, queue a check to see if any of them
-            // have been deleted. If they are deleted, then we'll get a 'changed' signal; since
-            // we'll now be displaying items we weren't previously, we'll check again to see
-            // if they were deleted, and so forth and so on.
-            // TODO: We should change this to ask for as many as we can fit in the given space:
-            // https://bugzilla.gnome.org/show_bug.cgi?id=603522#c23
-            this._docManager.queueExistenceCheck(i);
-            this._checkDocExistence = false;
-        }
-
-        for (; i < children.length; i++)
-            this.actor.set_skip_paint(children[i], true);
-    },
-
-    _onDocsChanged: function() {
-        this._checkDocExistence = true;
-        Main.queueDeferredWork(this._workId);
-    },
-
-    _redisplay: function() {
-        // Should be kept alive by the _actorsByUri
-        this.actor.remove_all();
-        let docs = this._docManager.getTimestampOrderedInfos();
-        for (let i = 0; i < docs.length && i < MAX_DASH_DOCS; i++) {
-            let doc = docs[i];
-            let display = this._actorsByUri[doc.uri];
-            if (display) {
-                this.actor.add_actor(display.actor);
-            } else {
-                let display = new DashDocDisplayItem(doc);
-                this.actor.add_actor(display.actor);
-                this._actorsByUri[doc.uri] = display;
-            }
-        }
-        // Any unparented actors must have been deleted
-        for (let uri in this._actorsByUri) {
-            let display = this._actorsByUri[uri];
-            if (display.actor.get_parent() == null) {
-                display.actor.destroy();
-                delete this._actorsByUri[uri];
-            }
-        }
-        this.emit('changed');
-    }
-};
-
-Signals.addSignalMethods(DashDocDisplay.prototype);
 
 function DocSearchProvider() {
     this._init();
@@ -495,12 +26,18 @@ DocSearchProvider.prototype = {
             return null;
         return { 'id': resultId,
                  'name': docInfo.name,
-                 'icon': docInfo.createIcon(Search.RESULT_ICON_SIZE)};
+                 'createIcon': function(size) {
+                                   return docInfo.createIcon(size);
+                               }
+               };
     },
 
-    activateResult: function(id) {
+    activateResult: function(id, params) {
+        params = Params.parse(params, { workspace: null,
+                                        timestamp: null });
+
         let docInfo = this._docManager.lookupByUri(id);
-        docInfo.launch();
+        docInfo.launch(params.workspace ? params.workspace.index() : -1);
     },
 
     getInitialResultSet: function(terms) {
@@ -509,9 +46,5 @@ DocSearchProvider.prototype = {
 
     getSubsearchResultSet: function(previousResults, terms) {
         return this._docManager.subsearch(previousResults, terms);
-    },
-
-    expandSearch: function(terms) {
-        log("TODO expand docs search");
     }
 };

js/ui/endSessionDialog.js

@@ -0,0 +1,535 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
+ *
+ * Copyright 2010 Red Hat, Inc
+ *
+ * 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; either version 2, or (at your option)
+ * any later version.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+const DBus = imports.dbus;
+const Lang = imports.lang;
+const Signals = imports.signals;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const GnomeSession = imports.misc.gnomeSession
+const Lightbox = imports.ui.lightbox;
+const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
+const Tweener = imports.ui.tweener;
+
+let _endSessionDialog = null;
+
+const _ITEM_ICON_SIZE = 48;
+const _DIALOG_ICON_SIZE = 32;
+
+const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
+
+const EndSessionDialogIface = {
+    name: 'org.gnome.SessionManager.EndSessionDialog',
+    methods: [{ name: 'Open',
+                inSignature: 'uuuao',
+                outSignature: ''
+              }
+             ],
+    signals: [{ name: 'Canceled',
+                inSignature: '',
+              }],
+    properties: []
+};
+
+const logoutDialogContent = {
+    subjectWithUser: _("Log Out %s"),
+    subject: _("Log Out"),
+    inhibitedDescription: _("Click Log Out to quit these applications and log out of the system."),
+    uninhibitedDescriptionWithUser: _("%s will be logged out automatically in %d seconds."),
+    uninhibitedDescription: _("You will be logged out automatically in %d seconds."),
+    endDescription: _("Logging out of the system."),
+    confirmButtons: [{ signal: 'ConfirmedLogout',
+                       label:  _("Log Out") }],
+    iconStyleClass: 'end-session-dialog-logout-icon'
+};
+
+const shutdownDialogContent = {
+    subject: _("Power Off"),
+    inhibitedDescription: _("Click Power Off to quit these applications and power off the system."),
+    uninhibitedDescription: _("The system will power off automatically in %d seconds."),
+    endDescription: _("Powering off the system."),
+    confirmButtons: [{ signal: 'ConfirmedReboot',
+                       label:  _("Restart") },
+                     { signal: 'ConfirmedShutdown',
+                       label:  _("Power Off") }],
+    iconName: 'system-shutdown',
+    iconStyleClass: 'end-session-dialog-shutdown-icon'
+};
+
+const restartDialogContent = {
+    subject: _("Restart"),
+    inhibitedDescription: _("Click Restart to quit these applications and restart the system."),
+    uninhibitedDescription: _("The system will restart automatically in %d seconds."),
+    endDescription: _("Restarting the system."),
+    confirmButtons: [{ signal: 'ConfirmedReboot',
+                       label:  _("Restart") }],
+    iconName: 'system-shutdown',
+    iconStyleClass: 'end-session-dialog-shutdown-icon'
+};
+
+const DialogContent = {
+    0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */: logoutDialogContent,
+    1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */: shutdownDialogContent,
+    2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */: restartDialogContent
+};
+
+function findAppFromInhibitor(inhibitor) {
+    let desktopFile = inhibitor.app_id;
+
+    if (!GLib.str_has_suffix(desktopFile, '.desktop'))
+      desktopFile += '.desktop';
+
+    let candidateDesktopFiles = [];
+
+    candidateDesktopFiles.push(desktopFile);
+    candidateDesktopFiles.push('gnome-' + desktopFile);
+
+    let appSystem = Shell.AppSystem.get_default();
+    let app = null;
+    for (let i = 0; i < candidateDesktopFiles.length; i++) {
+        try {
+            app = appSystem.get_app(candidateDesktopFiles[i]);
+
+            if (app)
+                break;
+        } catch(e) {
+            // ignore errors
+        }
+    }
+
+    return app;
+}
+
+function ListItem(app, reason) {
+    this._init(app, reason);
+}
+
+ListItem.prototype = {
+    _init: function(app, reason) {
+        this._app = app;
+        this._reason = reason;
+
+        if (this._reason == null)
+          this._reason = '';
+
+        let layout = new St.BoxLayout({ vertical: false});
+
+        this.actor = new St.Button({ style_class: 'end-session-dialog-app-list-item',
+                                     can_focus:   true,
+                                     child:       layout,
+                                     reactive:    true,
+                                     x_align:     St.Align.START,
+                                     x_fill:      true });
+
+        this._icon = this._app.create_icon_texture(_ITEM_ICON_SIZE);
+
+        let iconBin = new St.Bin({ style_class: 'end-session-dialog-app-list-item-icon',
+                                   child:       this._icon });
+        layout.add(iconBin);
+
+        let textLayout = new St.BoxLayout({ style_class: 'end-session-dialog-app-list-item-text-box',
+                                            vertical:    true });
+        layout.add(textLayout);
+
+        this._nameLabel = new St.Label({ text:        this._app.get_name(),
+                                         style_class: 'end-session-dialog-app-list-item-name' });
+        textLayout.add(this._nameLabel,
+                       { expand: false,
+                         x_fill: true });
+
+        this._descriptionLabel = new St.Label({ text:        this._reason,
+                                                style_class: 'end-session-dialog-app-list-item-description' });
+        textLayout.add(this._descriptionLabel,
+                       { expand: true,
+                         x_fill: true });
+
+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+    },
+
+    _onClicked: function() {
+        this.emit('activate');
+        this._app.activate(-1);
+    }
+};
+Signals.addSignalMethods(ListItem.prototype);
+
+// The logout timer only shows updates every 10 seconds
+// until the last 10 seconds, then it shows updates every
+// second.  This function takes a given time and returns
+// what we should show to the user for that time.
+function _roundSecondsToInterval(totalSeconds, secondsLeft, interval) {
+    let time;
+
+    time = Math.ceil(secondsLeft);
+
+    // Final count down is in decrements of 1
+    if (time <= interval)
+        return time;
+
+    // Round up higher than last displayable time interval
+    time += interval - 1;
+
+    // Then round down to that time interval
+    if (time > totalSeconds)
+        time = Math.ceil(totalSeconds);
+    else
+        time -= time % interval;
+
+    return time;
+}
+
+function _setLabelText(label, text) {
+    if (text) {
+        label.set_text(text);
+        label.show();
+    } else {
+        label.set_text('');
+        label.hide();
+    }
+}
+
+function EndSessionDialog() {
+    if (_endSessionDialog == null) {
+        this._init();
+        DBus.session.exportObject('/org/gnome/SessionManager/EndSessionDialog',
+                                  this);
+        _endSessionDialog = this;
+    }
+
+    return _endSessionDialog;
+}
+
+function init() {
+    // This always returns the same singleton object
+    // By instantiating it initially, we register the
+    // bus object, etc.
+    let dialog = new EndSessionDialog();
+}
+
+EndSessionDialog.prototype = {
+    __proto__: ModalDialog.ModalDialog.prototype,
+
+    _init: function() {
+        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'end-session-dialog' });
+
+        this._user = Gdm.UserManager.ref_default().get_user(GLib.get_user_name());
+
+        this._secondsLeft = 0;
+        this._totalSecondsToStayOpen = 0;
+        this._inhibitors = [];
+
+        this.connect('destroy',
+                     Lang.bind(this, this._onDestroy));
+        this.connect('opened',
+                     Lang.bind(this, this._onOpened));
+
+        this._userLoadedId = this._user.connect('notify::is_loaded',
+                                                Lang.bind(this, this._updateContent));
+
+        this._userChangedId = this._user.connect('changed',
+                                                 Lang.bind(this, this._updateContent));
+
+        let mainContentLayout = new St.BoxLayout({ vertical: false });
+        this.contentLayout.add(mainContentLayout,
+                               { x_fill: true,
+                                 y_fill: false });
+
+        this._iconBin = new St.Bin();
+        mainContentLayout.add(this._iconBin,
+                              { x_fill:  true,
+                                y_fill:  false,
+                                x_align: St.Align.END,
+                                y_align: St.Align.START });
+
+        let messageLayout = new St.BoxLayout({ vertical: true });
+        mainContentLayout.add(messageLayout,
+                              { y_align: St.Align.START });
+
+        this._subjectLabel = new St.Label({ style_class: 'end-session-dialog-subject' });
+
+        messageLayout.add(this._subjectLabel,
+                          { y_fill:  false,
+                            y_align: St.Align.START });
+
+        this._descriptionLabel = new St.Label({ style_class: 'end-session-dialog-description' });
+        this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this._descriptionLabel.clutter_text.line_wrap = true;
+
+        messageLayout.add(this._descriptionLabel,
+                          { y_fill:  true,
+                            y_align: St.Align.START });
+
+        let scrollView = new St.ScrollView({ style_class: 'end-session-dialog-app-list'});
+        scrollView.set_policy(Gtk.PolicyType.NEVER,
+                              Gtk.PolicyType.AUTOMATIC);
+        this.contentLayout.add(scrollView,
+                               { x_fill: true,
+                                 y_fill: true });
+        scrollView.hide();
+
+        this._applicationList = new St.BoxLayout({ vertical: true });
+        scrollView.add_actor(this._applicationList,
+                             { x_fill:  true,
+                               y_fill:  true,
+                               x_align: St.Align.START,
+                               y_align: St.Align.MIDDLE });
+
+        this._applicationList.connect('actor-added',
+                                      Lang.bind(this, function() {
+                                          if (this._applicationList.get_children().length == 1)
+                                              scrollView.show();
+                                      }));
+
+        this._applicationList.connect('actor-removed',
+                                      Lang.bind(this, function() {
+                                          if (this._applicationList.get_children().length == 0)
+                                              scrollView.hide();
+                                      }));
+    },
+
+    _onDestroy: function() {
+        this._user.disconnect(this._userLoadedId);
+        this._user.disconnect(this._userChangedId);
+    },
+
+    _setIconFromFile: function(iconFile, styleClass) {
+        if (styleClass)
+            this._iconBin.set_style_class_name(styleClass);
+        this._iconBin.set_style(null);
+
+        this._iconBin.child = null;
+        if (iconFile) {
+            this._iconBin.show();
+            this._iconBin.set_style('background-image: url("' + iconFile + '");');
+        } else {
+            this._iconBin.hide();
+        }
+    },
+
+    _setIconFromName: function(iconName, styleClass) {
+        if (styleClass)
+            this._iconBin.set_style_class_name(styleClass);
+        this._iconBin.set_style(null);
+
+        if (iconName != null) {
+            let textureCache = St.TextureCache.get_default();
+            let icon = textureCache.load_icon_name(this._iconBin.get_theme_node(),
+                                                   iconName,
+                                                   St.IconType.SYMBOLIC,
+                                                   _DIALOG_ICON_SIZE);
+
+            this._iconBin.child = icon;
+            this._iconBin.show();
+        } else {
+            this._iconBin.child = null;
+            this._iconBin.hide();
+        }
+    },
+
+    _updateContent: function() {
+        if (this.state != ModalDialog.State.OPENING &&
+            this.state != ModalDialog.State.OPENED)
+            return;
+
+        let dialogContent = DialogContent[this._type];
+
+        let subject = dialogContent.subject;
+        let description;
+
+        if (this._user.is_loaded && !dialogContent.iconName) {
+            let iconFile = this._user.get_icon_file();
+            if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
+                this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
+            else
+                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
+        } else if (dialogContent.iconName) {
+            this._setIconFromName(dialogContent.iconName,
+                                  dialogContent.iconStyleClass);
+        }
+
+        if (this._inhibitors.length > 0) {
+            this._stopTimer();
+            description = dialogContent.inhibitedDescription;
+        } else if (this._secondsLeft > 0 && this._inhibitors.length == 0) {
+            let displayTime = _roundSecondsToInterval(this._totalSecondsToStayOpen,
+                                                      this._secondsLeft,
+                                                      10);
+
+            if (this._user.is_loaded) {
+                let realName = this._user.get_real_name();
+
+                if (realName != null) {
+                    if (dialogContent.subjectWithUser)
+                        subject = dialogContent.subjectWithUser.format(realName);
+
+                    if (dialogContent.uninhibitedDescriptionWithUser)
+                        description = dialogContent.uninhibitedDescriptionWithUser.format(realName, displayTime);
+                    else
+                        description = dialogContent.uninhibitedDescription.format(displayTime);
+                }
+            }
+
+            if (!description)
+                description = dialogContent.uninhibitedDescription.format(displayTime);
+        } else {
+            description = dialogContent.endDescription;
+        }
+
+        _setLabelText(this._subjectLabel, subject);
+        _setLabelText(this._descriptionLabel, description);
+    },
+
+    _updateButtons: function() {
+        let dialogContent = DialogContent[this._type];
+        let buttons = [{ action: Lang.bind(this, this.cancel),
+                         label:  _("Cancel"),
+                         key:    Clutter.Escape }];
+
+        for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
+            let signal = dialogContent.confirmButtons[i].signal;
+            let label = dialogContent.confirmButtons[i].label;
+            buttons.push({ action: Lang.bind(this, function() {
+                                       this._confirm(signal);
+                                   }),
+                           label: label });
+        }
+
+        this.setButtons(buttons);
+    },
+
+    close: function() {
+        ModalDialog.ModalDialog.prototype.close.call(this);
+        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+                                 'org.gnome.SessionManager.EndSessionDialog',
+                                 'Closed', '', []);
+    },
+
+    cancel: function() {
+        this._stopTimer();
+        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+                                 'org.gnome.SessionManager.EndSessionDialog',
+                                 'Canceled', '', []);
+        this.close(global.get_current_time());
+    },
+
+    _confirm: function(signal) {
+        this._fadeOutDialog();
+        this._stopTimer();
+        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+                                 'org.gnome.SessionManager.EndSessionDialog',
+                                 signal, '', []);
+    },
+
+    _onOpened: function() {
+        if (this._inhibitors.length == 0)
+            this._startTimer();
+    },
+
+    _startTimer: function() {
+        this._secondsLeft = this._totalSecondsToStayOpen;
+        Tweener.addTween(this,
+                         { _secondsLeft: 0,
+                           time: this._secondsLeft,
+                           transition: 'linear',
+                           onUpdate: Lang.bind(this, this._updateContent),
+                           onComplete: Lang.bind(this, function() {
+                                           let dialogContent = DialogContent[this._type];
+                                           let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
+                                           this._confirm(button.signal);
+                                       }),
+                         });
+    },
+
+    _stopTimer: function() {
+        Tweener.removeTweens(this);
+        this._secondsLeft = 0;
+    },
+
+    _onInhibitorLoaded: function(inhibitor) {
+        if (this._inhibitors.indexOf(inhibitor) < 0) {
+            // Stale inhibitor
+            return;
+        }
+
+        let app = findAppFromInhibitor(inhibitor);
+
+        if (app) {
+            let item = new ListItem(app, inhibitor.reason);
+            item.connect('activate',
+                         Lang.bind(this, function() {
+                             this.close(global.get_current_time());
+                         }));
+            this._applicationList.add(item.actor, { x_fill: true });
+            this._stopTimer();
+        } else {
+            // inhibiting app is a service, not an application
+            this._inhibitors.splice(this._inhibitors.indexOf(inhibitor), 1);
+        }
+
+        this._updateContent();
+    },
+
+    OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) {
+        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
+        this._inhibitors = [];
+        this._applicationList.destroy_children();
+        this._type = type;
+
+        if (!(this._type in DialogContent))
+            throw new DBus.DBusError('org.gnome.Shell.ModalDialog.TypeError',
+                                     "Unknown dialog type requested");
+
+        for (let i = 0; i < inhibitorObjectPaths.length; i++) {
+            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]);
+
+            inhibitor.connect('is-loaded',
+                              Lang.bind(this, function() {
+                                  this._onInhibitorLoaded(inhibitor);
+                              }));
+            this._inhibitors.push(inhibitor);
+        }
+
+        this._updateButtons();
+
+        if (!this.open(timestamp))
+            throw new DBus.DBusError('org.gnome.Shell.ModalDialog.GrabError',
+                                     "Cannot grab pointer and keyboard");
+
+        this._updateContent();
+
+        let signalId = this.connect('opened',
+                                    Lang.bind(this, function() {
+                                        callback();
+                                        this.disconnect(signalId);
+                                    }));
+    }
+};
+DBus.conformExport(EndSessionDialog.prototype, EndSessionDialogIface);

js/ui/environment.js

@@ -1,7 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
+const Clutter = imports.gi.Clutter;;
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Gettext_gtk20 = imports.gettext.domain('gtk20');
+const Gettext_gtk30 = imports.gettext.domain('gtk30');
 
 const Tweener = imports.ui.tweener;
 
@@ -14,7 +17,7 @@ function _patchContainerClass(containerClass) {
     // This one is a straightforward mapping of the C method
     containerClass.prototype.child_set = function(actor, props) {
         let meta = this.get_child_meta(actor);
-        for (prop in props)
+        for (let prop in props)
             meta[prop] = props[prop];
     };
 
@@ -28,15 +31,74 @@ function _patchContainerClass(containerClass) {
     };
 }
 
-_patchContainerClass(St.BoxLayout);
-_patchContainerClass(St.Table);
+// Replace @method with something that throws an error instead
+function _blockMethod(method, replacement, reason) {
+    let match = method.match(/^(.+)\.([^.]+)$/);
+    if (!match)
+        throw new Error('Bad method name "' + method + '"');
+    let proto = 'imports.gi.' + match[1] + '.prototype';
+    let property = match[2];
+
+    if (!global.set_property_mutable(proto, property, true))
+        throw new Error('Bad method name "' + method + '"');
+
+    // eval() is evil in general, but we know it's safe here since
+    // set_property_mutable() would have failed if proto was
+    // malformed.
+    let node = eval(proto);
+
+    let msg = 'Do not use "' + method + '".';
+    if (replacement)
+        msg += ' Use "' + replacement + '" instead.';
+    if (reason)
+        msg += ' (' + reason + ')';
+
+    node[property] = function() {
+        throw new Error(msg);
+    };
+
+    global.set_property_mutable(proto, property, false);
+}
 
 function init() {
     Tweener.init();
     String.prototype.format = Format.format;
 
+    // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783
+    Date.prototype.toLocaleFormat = function(format) {
+        return Shell.util_format_date(format, this.getTime());
+    };
+
     // Set the default direction for St widgets (this needs to be done before any use of St)
-    if (Gettext_gtk20.gettext("default:LTR") == "default:RTL") {
+    if (Gettext_gtk30.gettext('default:LTR') == 'default:RTL') {
         St.Widget.set_default_direction(St.TextDirection.RTL);
     }
+
+    let slowdownEnv = GLib.getenv('GNOME_SHELL_SLOWDOWN_FACTOR');
+    if (slowdownEnv) {
+        let factor = parseFloat(slowdownEnv);
+        if (!isNaN(factor) && factor > 0.0)
+            St.set_slow_down_factor(factor);
+    }
+
+    _patchContainerClass(St.BoxLayout);
+    _patchContainerClass(St.Table);
+
+    Clutter.Actor.prototype.toString = function() {
+        return St.describe_actor(this);
+    };
+
+    if (window.global === undefined) // test environment
+        return;
+
+    _blockMethod('Clutter.Event.get_state', 'Shell.get_event_state',
+                 'gjs\'s handling of Clutter.ModifierType is broken. See bug 597292.');
+    _blockMethod('Gdk.Window.get_device_position', 'global.get_pointer',
+                 'gjs\'s handling of Gdk.ModifierType is broken. See bug 597292.');
+
+    // Now close the back door to prevent extensions from trying to
+    // abuse it. We can't actually delete it since
+    // Shell.Global.prototype itself is read-only.
+    global.set_property_mutable('imports.gi.Shell.Global.prototype', 'set_property_mutable', true);
+    Shell.Global.prototype.set_property_mutable = undefined;
 }

js/ui/extensionSystem.js

@@ -5,6 +5,8 @@ const Gio = imports.gi.Gio;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
+const Config = imports.misc.config;
+
 const ExtensionState = {
     ENABLED: 1,
     DISABLED: 2,
@@ -26,6 +28,36 @@ var disabledExtensions;
 // GFile for user extensions
 var userExtensionsDir = null;
 
+/**
+ * versionCheck:
+ * @required: an array of versions we're compatible with
+ * @current: the version we have
+ *
+ * Check if a component is compatible for an extension.
+ * @required is an array, and at least one version must match.
+ * @current must be in the format <major>.<minor>.<point>.<micro>
+ * <micro> is always ignored
+ * <point> is ignored if <minor> is even (so you can target the
+ * whole stable release)
+ * <minor> and <major> must match
+ * Each target version must be at least <major> and <minor>
+ */
+function versionCheck(required, current) {
+    let currentArray = current.split('.');
+    let major = currentArray[0];
+    let minor = currentArray[1];
+    let point = currentArray[2];
+    for (let i = 0; i < required.length; i++) {
+        let requiredArray = required[i].split('.');
+        if (requiredArray[0] == major &&
+            requiredArray[1] == minor &&
+            (requiredArray[2] == point ||
+             (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
+            return true;
+    }
+    return false;
+}
+
 function loadExtension(dir, enabled, type) {
     let info;
     let baseErrorString = 'While loading extension from "' + dir.get_parse_name() + '": ';
@@ -36,7 +68,13 @@ function loadExtension(dir, enabled, type) {
         return;
     }
 
-    let [success, metadataContents, len, etag] = metadataFile.load_contents(null);
+    let metadataContents;
+    try {
+        metadataContents = Shell.get_file_contents_utf8_sync(metadataFile.get_path());
+    } catch (e) {
+        global.logError(baseErrorString + 'Failed to load metadata.json: ' + e);
+        return;
+    }
     let meta;
     try {
         meta = JSON.parse(metadataContents);
@@ -44,14 +82,20 @@ function loadExtension(dir, enabled, type) {
         global.logError(baseErrorString + 'Failed to parse metadata.json: ' + e);
         return;
     }
-    let requiredProperties = ['uuid', 'name', 'description'];
-    for (let i = 0; i < requiredProperties; i++) {
+    let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
+    for (let i = 0; i < requiredProperties.length; i++) {
         let prop = requiredProperties[i];
         if (!meta[prop]) {
             global.logError(baseErrorString + 'missing "' + prop + '" property in metadata.json');
             return;
         }
     }
+
+    if (extensions[meta.uuid] != undefined) {
+        global.logError(baseErrorString + "extension already loaded");
+        return;
+    }
+
     // Encourage people to add this
     if (!meta['url']) {
         global.log(baseErrorString + 'Warning: Missing "url" property in metadata.json');
@@ -63,6 +107,12 @@ function loadExtension(dir, enabled, type) {
         return;
     }
 
+    if (!versionCheck(meta['shell-version'], Config.PACKAGE_VERSION) ||
+        (meta['js-version'] && !versionCheck(meta['js-version'], Config.GJS_VERSION))) {
+        global.logError(baseErrorString + 'extension is not compatible with current GNOME Shell and/or GJS version');
+        return;
+    }
+
     extensionMeta[meta.uuid] = meta;
     extensionMeta[meta.uuid].type = type;
     extensionMeta[meta.uuid].path = dir.get_path();
@@ -107,7 +157,7 @@ function loadExtension(dir, enabled, type) {
         return;
     }
     try {
-        extensionModule.main();
+        extensionModule.main(meta);
     } catch (e) {
         if (stylesheetPath != null)
             theme.unload_stylesheet(stylesheetPath);
@@ -119,21 +169,27 @@ function loadExtension(dir, enabled, type) {
 }
 
 function init() {
-    let userConfigPath = GLib.get_user_config_dir();
-    let userExtensionsPath = GLib.build_filenamev([userConfigPath, 'gnome-shell', 'extensions']);
+    let userExtensionsPath = GLib.build_filenamev([global.userdatadir, 'extensions']);
     userExtensionsDir = Gio.file_new_for_path(userExtensionsPath);
     try {
         userExtensionsDir.make_directory_with_parents(null);
     } catch (e) {
-        global.logError(""+e);
+        global.logError('' + e);
     }
 
-    disabledExtensions = Shell.GConf.get_default().get_string_list('disabled_extensions');
+    disabledExtensions = global.settings.get_strv('disabled-extensions', -1);
 }
 
 function _loadExtensionsIn(dir, type) {
-    let fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
+    let fileEnum;
     let file, info;
+    try {
+        fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
+    } catch (e) {
+        global.logError('' + e);
+       return;
+    }
+
     while ((info = fileEnum.next_file(null)) != null) {
         let fileType = info.get_file_type();
         if (fileType != Gio.FileType.DIRECTORY)

js/ui/genericDisplay.js

@@ -1,726 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gdk = imports.gi.Gdk;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const DND = imports.ui.dnd;
-const Main = imports.ui.main;
-
-const RedisplayFlags = { NONE: 0,
-                         FULL: 1 << 1,
-                         SUBSEARCH: 1 << 2,
-                         IMMEDIATE: 1 << 3 };
-
-const ITEM_DISPLAY_DESCRIPTION_COLOR = new Clutter.Color();
-ITEM_DISPLAY_DESCRIPTION_COLOR.from_pixel(0xffffffbb);
-const DISPLAY_CONTROL_SELECTED_COLOR = new Clutter.Color();
-DISPLAY_CONTROL_SELECTED_COLOR.from_pixel(0x112288ff);
-const PREVIEW_BOX_BACKGROUND_COLOR = new Clutter.Color();
-PREVIEW_BOX_BACKGROUND_COLOR.from_pixel(0xADADADf0);
-
-const DEFAULT_PADDING = 4;
-
-const ITEM_DISPLAY_ICON_SIZE = 48;
-const DEFAULT_COLUMN_GAP = 6;
-
-const PREVIEW_ICON_SIZE = 96;
-const PREVIEW_BOX_PADDING = 6;
-const PREVIEW_BOX_SPACING = DEFAULT_PADDING;
-const PREVIEW_BOX_CORNER_RADIUS = 10;
-// how far relative to the full item width the preview box should be placed
-const PREVIEW_PLACING = 3/4;
-const PREVIEW_DETAILS_MIN_WIDTH = PREVIEW_ICON_SIZE * 2;
-
-/* This is a virtual class that represents a single display item containing
- * a name, a description, and an icon. It allows selecting an item and represents
- * it by highlighting it with a different background color than the default.
- */
-function GenericDisplayItem() {
-    this._init();
-}
-
-GenericDisplayItem.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout({ style_class: "generic-display-item",
-                                         reactive: true });
-
-        this.actor._delegate = this;
-        this.actor.connect('button-release-event',
-                           Lang.bind(this,
-                                     function() {
-                                         // Activates the item by launching it
-                                         this.emit('activate');
-                                         return true;  
-                                     }));
-
-        let draggable = DND.makeDraggable(this.actor);
-
-        this._iconBin = new St.Bin();
-        this.actor.add(this._iconBin);
-
-        this._infoText = new St.BoxLayout({ style_class: 'generic-display-item-text',
-                                             vertical: true });
-        this.actor.add(this._infoText, { expand: true, y_fill: false });
-
-        this._name = null;
-        this._description = null;
-        this._icon = null;
-
-        this._initialLoadComplete = false;
-
-        // An array of details description actors that we create over time for the item.
-        // It is used for updating the description text inside the details actor when
-        // the description text for the item is updated.
-        this._detailsDescriptions = [];
-    },
-
-    //// Draggable object interface ////
-
-    // Returns a cloned texture of the item's icon to represent the item as it 
-    // is being dragged. 
-    getDragActor: function(stageX, stageY) {
-        return this._createIcon();
-    },
-
-    // Returns the item icon, a separate copy of which is used to
-    // represent the item as it is being dragged. This is used to
-    // determine a snap-back location for the drag icon if it does
-    // not get accepted by any drop target.
-    getDragActorSource: function() {
-        return this._icon;
-    },
-
-    //// Public methods ////
-
-    // Highlights the item by setting a different background color than the default 
-    // if isSelected is true, removes the highlighting otherwise.
-    markSelected: function(isSelected) {
-        this.actor.set_style_pseudo_class(isSelected ? "selected" : null);
-    },
-
-    /*
-     * Returns an actor containing item details. In the future details can have more information than what
-     * the preview pop-up has and be item-type specific.
-     */
-    createDetailsActor: function() {
-
-        let details = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                    spacing: PREVIEW_BOX_SPACING });
-
-        let mainDetails = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                        spacing: PREVIEW_BOX_SPACING });
-
-        // Inner box with name and description
-        let textDetails = new St.BoxLayout({ style_class: 'generic-display-details',
-                                             vertical: true });
-        let detailsName = new St.Label({ style_class: 'generic-display-details-name',
-                                          text: this._name.text });
-        textDetails.add(detailsName);
-
-        let detailsDescription = new St.Label({ text: this._description.text });
-        textDetails.add(detailsDescription);
-
-        this._detailsDescriptions.push(detailsDescription);
-
-        mainDetails.append(textDetails, Big.BoxPackFlags.EXPAND);
-
-        let previewIcon = this._createPreviewIcon();
-        let largePreviewIcon = this._createLargePreviewIcon();
-
-        if (previewIcon != null && largePreviewIcon == null) {
-            mainDetails.prepend(previewIcon, Big.BoxPackFlags.NONE);
-        }
-
-        details.append(mainDetails, Big.BoxPackFlags.NONE);
-
-        if (largePreviewIcon != null) {
-            let largePreview = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
-            largePreview.append(largePreviewIcon, Big.BoxPackFlags.NONE);
-            details.append(largePreview, Big.BoxPackFlags.NONE);
-        }
-   
-        return details;
-    },
-
-    // Destroys the item.
-    destroy: function() {
-        this.actor.destroy();
-    },
-
-    //// Pure virtual public methods ////
-
-    // Performes an action associated with launching this item, such as opening a file or an application.
-    launch: function() {
-        throw new Error("Not implemented");
-    },
-
-    //// Protected methods ////
-
-    /*
-     * Creates the graphical elements for the item based on the item information.
-     *
-     * nameText - name of the item
-     * descriptionText - short description of the item
-     */
-    _setItemInfo: function(nameText, descriptionText) {
-        if (this._name != null) {
-            // this also removes this._name from the parent container,
-            // so we don't need to call this.actor.remove_actor(this._name) directly
-            this._name.destroy();
-            this._name = null;
-        } 
-        if (this._description != null) {
-            this._description.destroy();
-            this._description = null;
-        } 
-        if (this._icon != null) {
-            // though we get the icon from elsewhere, we assume its ownership here,
-            // and therefore should be responsible for distroying it
-            this._icon.destroy();
-            this._icon = null;
-        }
-
-        this._icon = this._createIcon();
-        this._iconBin.set_child(this._icon);
-
-        this._name = new St.Label({ style_class: "generic-display-item-name",
-                                     text: nameText });
-        this._infoText.add(this._name);
-
-        this._description = new St.Label({ style_class: "generic-display-item-description",
-                                            text: descriptionText ? descriptionText : "" });
-        this._infoText.add(this._description);
-    },
-
-    // Sets the description text for the item, including the description text
-    // in the details actors that have been created for the item.
-    _setDescriptionText: function(text) {
-        this._description.text = text;
-        for (let i = 0; i < this._detailsDescriptions.length; i++) {
-            let detailsDescription = this._detailsDescriptions[i];
-            if (detailsDescription != null) {
-                detailsDescription.text = text;
-            }
-        }
-    },
-
-    //// Virtual protected methods ////
-
-    // Creates and returns a large preview icon, but only if we have a detailed image.
-    _createLargePreviewIcon : function() {
-        return null;
-    },
-
-    //// Pure virtual protected methods ////
-
-    // Returns an icon for the item.
-    _createIcon: function() {
-        throw new Error("Not implemented");
-    },
-
-    // Returns a preview icon for the item.
-    _createPreviewIcon: function() {
-        throw new Error("Not implemented");
-    }
-
-    //// Private methods ////
-};
-
-Signals.addSignalMethods(GenericDisplayItem.prototype);
-
-const GenericDisplayFlags = {
-    DISABLE_VSCROLLING: 1 << 0
-};
-
-/* This is a virtual class that represents a display containing a collection of items
- * that can be filtered with a search string.
- */
-function GenericDisplay(flags) {
-    this._init(flags);
-}
-
-GenericDisplay.prototype = {
-    _init : function(flags) {
-        let disableVScrolling = (flags & GenericDisplayFlags.DISABLE_VSCROLLING) != 0;
-        this._search = '';
-        this._expanded = false;
-
-        if (disableVScrolling) {
-            this.actor = this._list = new Shell.OverflowList({ spacing: 6,
-                                                               item_height: 50 });
-        } else {
-            this.actor = new St.ScrollView({ x_fill: true,
-                                             y_fill: false,
-                                             vshadows: true });
-            this._list = new St.BoxLayout({ style_class: 'generic-display-container',
-                                             vertical: true });
-            this.actor.add_actor(this._list);
-            this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        }
-
-        this._pendingRedisplay = RedisplayFlags.NONE;
-        this.actor.connect('notify::mapped', Lang.bind(this, this._onMappedNotify));
-
-        // map<itemId, Object> where Object represents the item info
-        this._allItems = {};
-        // set<itemId>
-        this._matchedItems = {};
-        // sorted array of items matched by search
-        this._matchedItemKeys = [];
-        // map<itemId, GenericDisplayItem>
-        this._displayedItems = {};
-        this._openDetailIndex = -1;
-        this._selectedIndex = -1;
-    },
-
-    //// Public methods ////
-
-    // Sets the search string and displays the matching items.
-    setSearch: function(text) {
-        let lowertext = text.toLowerCase();
-        if (lowertext == this._search) {
-            return;
-        }
-        let flags = RedisplayFlags.IMMEDIATE;
-        if (this._search != '') {
-            // Because we combine search terms with OR, we have to be sure that no new term
-            // was introduced before deciding that the new search results will be a subset of
-            // the existing search results.
-            if (lowertext.indexOf(this._search) == 0 &&
-                lowertext.split(/\s+/).length == this._search.split(/\s+/).length) {
-                flags |= RedisplayFlags.SUBSEARCH;
-            }
-        }
-        this._search = lowertext;
-        this._redisplay(flags);
-    },
-
-    // Launches the item that is currently selected, closing the Overview
-    activateSelected: function() {
-        if (this._selectedIndex != -1) {
-            let selected = this._findDisplayedByIndex(this._selectedIndex);
-            selected.launch();
-            this.unsetSelected();
-            Main.overview.hide();
-        }
-    },
-
-    // Moves the selection one up. If the selection was already on the top item, it's moved
-    // to the bottom one. Returns true if the selection actually moved up, false if it wrapped 
-    // around to the bottom.
-    selectUp: function() {
-        let count = this._getVisibleCount();
-        let selectedUp = true;
-        let prev = this._selectedIndex - 1;
-        if (this._selectedIndex <= 0) {
-            prev = count - 1;
-            selectedUp = false; 
-        }
-        this._selectIndex(prev);
-        return selectedUp;
-    },
-
-    // Moves the selection one down. If the selection was already on the bottom item, it's moved
-    // to the top one. Returns true if the selection actually moved down, false if it wrapped 
-    // around to the top.
-    selectDown: function() {
-        let count = this._getVisibleCount();
-        let selectedDown = true;
-        let next = this._selectedIndex + 1;
-        if (this._selectedIndex == count - 1) {
-            next = 0;
-            selectedDown = false;
-        }
-        this._selectIndex(next);
-        return selectedDown;
-    },
-
-    // Selects the first item among the displayed items.
-    selectFirstItem: function() {
-        if (this.hasItems())
-            this._selectIndex(0);
-    },
-
-    // Selects the last item among the displayed items.
-    selectLastItem: function() {
-        let count = this._getVisibleCount();
-        if (this.hasItems())
-            this._selectIndex(count - 1);
-    },
-
-    // Returns true if the display has some item selected.
-    hasSelected: function() {
-        return this._selectedIndex != -1;
-    },
-
-    // Removes selection if some display item is selected.
-    unsetSelected: function() {
-        this._selectIndex(-1);
-    },
-
-    // Returns true if the display has any displayed items.
-    hasItems: function() {
-        // TODO: figure out why this._list.displayedCount is returning a
-        // positive number when this._mathedItems.length is 0
-        // This can be triggered if a search string is entered for which there are no matches.
-        // log("this._mathedItems.length: " + this._matchedItems.length + " this._list.displayedCount " + this._list.displayedCount);
-        return this._matchedItemKeys.length > 0;
-    },
-
-    getMatchedItemsCount: function() {
-        return this._matchedItemKeys.length;
-    },
-
-    // Load the initial state
-    load: function() {
-        this._redisplay(RedisplayFlags.FULL);
-    },
-
-    // Should be called when the display is closed
-    resetState: function() {
-        this._filterReset();
-        this._openDetailIndex = -1;
-        if (!(this.actor instanceof Shell.OverflowList))
-            this.actor.get_vscroll_bar().get_adjustment().value = 0;
-    },
-
-    // Returns an actor which acts as a sidebar; this is used for
-    // the applications category view
-    getNavigationArea: function () {
-        return null;
-    },
-
-    createDetailsForIndex: function(index) {
-        let item = this._findDisplayedByIndex(index);
-        return item.createDetailsActor();
-    },
-
-    //// Protected methods ////
-
-    _recreateDisplayItems: function() {
-        this._removeAllDisplayItems();
-        this._setDefaultList();
-        for (let itemId in this._allItems) {
-            this._addDisplayItem(itemId);
-        }
-    },
-
-    // Creates a display item based on the information associated with itemId
-    // and adds it to the list of displayed items, but does not yet display it.
-    _addDisplayItem : function(itemId) {
-        if (this._displayedItems.hasOwnProperty(itemId)) {
-            log("Tried adding a display item for " + itemId + ", but an item with this item id is already among displayed items.");
-            return;
-        }
-
-        let itemInfo = this._allItems[itemId];
-        let displayItem = this._createDisplayItem(itemInfo);
-
-        displayItem.connect('activate',
-                            Lang.bind(this,
-                                      function() {
-                                          // update the selection
-                                          this._selectIndex(this._list.get_children().indexOf(displayItem.actor));
-                                          this.activateSelected();
-                                      }));
-
-        displayItem.connect('show-details',
-                            Lang.bind(this,
-                                      function() {
-                                          let index = this._list.get_children().indexOf(displayItem.actor);
-                                          /* Close the details pane if already open */
-                                          if (index == this._openDetailIndex) {
-                                              this._openDetailIndex = -1;
-                                              this.emit('show-details', -1);
-                                          } else {
-                                              this._openDetailIndex = index;
-                                              this.emit('show-details', index);
-                                          }
-                                      }));
-        this._displayedItems[itemId] = displayItem;
-    },
-
-    // Removes an item identifed by the itemId from the displayed items.
-    _removeDisplayItem: function(itemId) {
-        let children = this._list.get_children();
-        let count = children.length;
-        let displayItem = this._displayedItems[itemId];
-        let displayItemIndex = children.indexOf(displayItem.actor);
-
-        if (this.hasSelected() && count == 1) {
-            this.unsetSelected();
-        } else if (this.hasSelected() && displayItemIndex < this._selectedIndex) {
-            this.selectUp();
-        }
-
-        displayItem.destroy();
-
-        delete this._displayedItems[itemId];
-    },
-
-    // Removes all displayed items.
-    _removeAllDisplayItems: function() {
-        this.unsetSelected();
-        for (itemId in this._displayedItems)
-            this._removeDisplayItem(itemId);
-     },
-
-    // Return true if there's an active search or other constraint
-    // on the list
-    _filterActive: function() {
-        return this._search != "";
-    },
-
-    // Called when we are resetting state
-    _filterReset: function() {
-        this.unsetSelected();
-    },
-
-    _compareSearchMatch: function(a, b) {
-        let countA = this._matchedItems[a];
-        let countB = this._matchedItems[b];
-        if (countA > countB)
-            return -1;
-        else if (countA < countB)
-            return 1;
-        else
-            return this._compareItems(a, b);
-    },
-
-    _setMatches: function(matches) {
-        this._matchedItems = matches;
-        this._matchedItemKeys = [];
-        for (let itemId in this._matchedItems) {
-            this._matchedItemKeys.push(itemId);
-        }
-        this._matchedItemKeys.sort(Lang.bind(this, this._compareSearchMatch));
-    },
-
-    /**
-     * _redisplaySubSearch:
-     * A somewhat more optimized function called when we know
-     * that we're going to be displaying a subset of the items
-     * we already had, in the same order.  In that case, we can
-     * just hide the actors that shouldn't be shown.
-     */
-    _redisplaySubSearch: function() {
-        let matches = this._getSearchMatchedItems(true);
-
-        // Just hide all from the old set,
-        // we'll show the ones we want below
-        for (let itemId in this._displayedItems) {
-            let item = this._displayedItems[itemId];
-            item.actor.hide();
-        }
-
-        this._setMatches(matches);
-
-        for (let itemId in matches) {
-            let item = this._displayedItems[itemId];
-            item.actor.show();
-        }
-        this._list.queue_relayout();
-    },
-
-    _redisplayReordering: function() {
-        if (!this._filterActive()) {
-            this._setDefaultList();
-        } else {
-            this._setMatches(this._getSearchMatchedItems(false));
-        }
-        this._list.remove_all();
-        for (let i = 0; i < this._matchedItemKeys.length; i++) {
-            let itemId = this._matchedItemKeys[i];
-            let item = this._displayedItems[itemId];
-            item.actor.show();
-            this._list.add_actor(item.actor);
-       }
-    },
-
-    /*
-     * Updates the displayed items, applying the search string if one exists.
-     * @flags: Flags controlling redisplay behavior as follows:
-     *  SUBSEARCH - Indicates that the current _search is a superstring of the previous
-     *  one, which implies we only need to re-search through previous results.
-     *  FULL - Indicates that we need recreate all displayed items.
-     *  IMMEDIATE - Do the full redisplay even if we're not mapped.  This is useful
-     *  if you want to get the number of matched items and show/hide a section based on
-     *  that number.
-     */
-    _redisplay: function(flags) {
-        let immediate = (flags & RedisplayFlags.IMMEDIATE) != 0;
-        if (!immediate && !this.actor.mapped) {
-            this._pendingRedisplay |= flags;
-            return;
-        }
-
-        let isSubSearch = (flags & RedisplayFlags.SUBSEARCH) != 0;
-        let fullReload = (flags & RedisplayFlags.FULL) != 0;
-
-        let hadSelected = this.hasSelected();
-        this.unsetSelected();
-
-        if (!this._initialLoadComplete)
-            fullReload = true;
-
-        if (!this._refreshCache())
-            fullReload = true;
-
-        if (fullReload) {
-            this._recreateDisplayItems();
-            this._initialLoadComplete = true;
-        }
-
-        if (isSubSearch) {
-            this._redisplaySubSearch();
-        } else {
-            this._redisplayReordering();
-        }
-
-        if (hadSelected) {
-            this._selectedIndex = -1;
-            this.selectFirstItem();
-        }
-
-        this.emit('redisplayed');
-    },
-
-    //// Pure virtual protected methods ////
-
-    // Performs the steps needed to have the latest information about the items.
-    // Implementation should return %true if we are up to date, and %false
-    // if a full reload occurred.
-    _refreshCache: function() {
-        throw new Error("Not implemented");
-    },
-
-    // Sets the list of the displayed items based on the default sorting order.
-    // The default sorting order is specific to each implementing class.
-    _setDefaultList: function() {
-        throw new Error("Not implemented");
-    },
-
-    // Compares items associated with the item ids based on the order in which the
-    // items should be displayed.
-    // Intended to be used as a compareFunction for array.sort().
-    // Returns an integer value indicating the result of the comparison.
-    _compareItems: function(itemIdA, itemIdB) {
-        throw new Error("Not implemented");
-    },
-
-    // Checks if the item info can be a match for the search string. 
-    // Returns a boolean flag indicating if that's the case.
-    _isInfoMatching: function(itemInfo, search) {
-        throw new Error("Not implemented");
-    },
-
-    // Creates a display item based on itemInfo.
-    _createDisplayItem: function(itemInfo) {
-        throw new Error("Not implemented");
-    },
-
-    //// Private methods ////
-
-    _getItemSearchScore: function(itemId, terms) {
-        let item = this._allItems[itemId];
-        let score = 0;
-        for (let i = 0; i < terms.length; i++) {
-            let term = terms[i];
-            if (this._isInfoMatching(item, term)) {
-                score++;
-            }
-        }
-        return score;
-    },
-
-    _getSearchMatchedItems: function(isSubSearch) {
-        // Break the search up into terms, and search for each
-        // individual term.  Keep track of the number of terms
-        // each item matched.
-        let terms = this._search.split(/\s+/);
-        let matchScores = {};
-
-        if (isSubSearch) {
-            for (let i = 0; i < this._matchedItemKeys.length; i++) {
-                let itemId = this._matchedItemKeys[i];
-                let score = this._getItemSearchScore(itemId, terms);
-                if (score > 0)
-                    matchScores[itemId] = score;
-            }
-        } else {
-            for (let itemId in this._displayedItems) {
-                let score = this._getItemSearchScore(itemId, terms);
-                if (score > 0)
-                    matchScores[itemId] = score;
-            }
-        }
-        return matchScores;
-    },
-
-    // Returns a display item based on its index in the ordering of the
-    // display children.
-    _findDisplayedByIndex: function(index) {
-        let actor;
-        if (this.actor instanceof Shell.OverflowList)
-            actor = this.actor.get_displayed_actor(index);
-        else
-            actor = this._list.get_children()[index];
-        return this._findDisplayedByActor(actor);
-    },
-
-    // Returns a display item based on the actor that represents it in 
-    // the display.
-    _findDisplayedByActor: function(actor) {
-        for (itemId in this._displayedItems) {
-            let item = this._displayedItems[itemId];
-            if (item.actor == actor) {
-                return item;
-            }
-        }
-        return null;
-    },
-
-    // Selects (e.g. highlights) a display item at the provided index,
-    // updates this.selectedItemDetails actor, and emits 'selected' signal.
-    _selectIndex: function(index) {
-        // Cleanup from the previous item
-        if (this.hasSelected()) {
-            this._findDisplayedByIndex(this._selectedIndex).markSelected(false);
-        }
-
-        this._selectedIndex = index;
-        if (index < 0)
-            return;
-
-        // Mark the new item as selected and create its details pane
-        let item = this._findDisplayedByIndex(index);
-        item.markSelected(true);
-        this.emit('selected');
-    },
-
-    _getVisibleCount: function() {
-        if (this.actor instanceof Shell.OverflowList)
-            return this._list.displayed_count;
-        return this._list.get_n_children();
-    },
-
-    _onMappedNotify: function () {
-        let mapped = this.actor.mapped;
-        if (mapped && this._pendingRedisplay > RedisplayFlags.NONE)
-            this._redisplay(this._pendingRedisplay);
-
-        this._pendingRedisplay = RedisplayFlags.NONE;
-    }
-};
-
-Signals.addSignalMethods(GenericDisplay.prototype);

js/ui/iconGrid.js

@@ -0,0 +1,327 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const Lang = imports.lang;
+const Params = imports.misc.params;
+
+const ICON_SIZE = 48;
+
+
+function BaseIcon(label, createIcon) {
+    this._init(label, createIcon);
+}
+
+BaseIcon.prototype = {
+    _init : function(label, params) {
+        params = Params.parse(params, { createIcon: null,
+                                        setSizeManually: false,
+                                        showLabel: true });
+        this.actor = new St.Bin({ style_class: 'overview-icon',
+                                  x_fill: true,
+                                  y_fill: true });
+        this.actor._delegate = this;
+        this.actor.connect('style-changed',
+                           Lang.bind(this, this._onStyleChanged));
+
+        this._spacing = 0;
+
+        let box = new Shell.GenericContainer();
+        box.connect('allocate', Lang.bind(this, this._allocate));
+        box.connect('get-preferred-width',
+                    Lang.bind(this, this._getPreferredWidth));
+        box.connect('get-preferred-height',
+                    Lang.bind(this, this._getPreferredHeight));
+        this.actor.set_child(box);
+
+        this.iconSize = ICON_SIZE;
+        this._iconBin = new St.Bin();
+
+        box.add_actor(this._iconBin);
+
+        if (params.showLabel) {
+            this._name = new St.Label({ text: label });
+            box.add_actor(this._name);
+        } else {
+            this._name = null;
+        }
+
+        if (params.createIcon)
+            this.createIcon = params.createIcon;
+        this._setSizeManually = params.setSizeManually;
+
+        this.icon = null;
+    },
+
+    _allocate: function(actor, box, flags) {
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        let iconSize = availHeight;
+
+        let [iconMinHeight, iconNatHeight] = this._iconBin.get_preferred_height(-1);
+        let [iconMinWidth, iconNatWidth] = this._iconBin.get_preferred_width(-1);
+        let preferredHeight = iconNatHeight;
+
+        let childBox = new Clutter.ActorBox();
+
+        if (this._name) {
+            let [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(-1);
+            preferredHeight += this._spacing + labelNatHeight;
+
+            let labelHeight = availHeight >= preferredHeight ? labelNatHeight
+                                                             : labelMinHeight;
+            iconSize -= this._spacing + labelHeight;
+
+            childBox.x1 = 0;
+            childBox.x2 = availWidth;
+            childBox.y1 = iconSize + this._spacing;
+            childBox.y2 = childBox.y1 + labelHeight;
+            this._name.allocate(childBox, flags);
+        }
+
+        childBox.x1 = Math.floor((availWidth - iconNatWidth) / 2);
+        childBox.y1 = Math.floor((iconSize - iconNatHeight) / 2);
+        childBox.x2 = childBox.x1 + iconNatWidth;
+        childBox.y2 = childBox.y1 + iconNatHeight;
+        this._iconBin.allocate(childBox, flags);
+    },
+
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        this._getPreferredHeight(actor, -1, alloc);
+    },
+
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        let [iconMinHeight, iconNatHeight] = this._iconBin.get_preferred_height(forWidth);
+        alloc.min_size = iconMinHeight;
+        alloc.natural_size = iconNatHeight;
+
+        if (this._name) {
+            let [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(forWidth);
+            alloc.min_size += this._spacing + labelMinHeight;
+            alloc.natural_size += this._spacing + labelNatHeight;
+        }
+    },
+
+    // This can be overridden by a subclass, or by the createIcon
+    // parameter to _init()
+    createIcon: function(size) {
+        throw new Error('no implementation of createIcon in ' + this);
+    },
+
+    setIconSize: function(size) {
+        if (!this._setSizeManually)
+            throw new Error('setSizeManually has to be set to use setIconsize');
+
+        if (size == this.iconSize)
+            return;
+
+        this._createIconTexture(size);
+    },
+
+    _createIconTexture: function(size) {
+        if (this.icon)
+            this.icon.destroy();
+        this.iconSize = size;
+        this.icon = this.createIcon(this.iconSize);
+
+        // The icon returned by createIcon() might actually be smaller than
+        // the requested icon size (for instance StTextureCache does this
+        // for fallback icons), so set the size explicitly.
+        this.icon.set_size(this.iconSize, this.iconSize);
+
+        this._iconBin.child = this.icon;
+    },
+
+    _onStyleChanged: function() {
+        let node = this.actor.get_theme_node();
+        this._spacing = node.get_length('spacing');
+
+        let size;
+        if (this._setSizeManually) {
+            size = this.iconSize;
+        } else {
+            let [found, len] = node.lookup_length('icon-size', false);
+            size = found ? len : ICON_SIZE;
+        }
+
+        this._createIconTexture(size);
+    }
+};
+
+function IconGrid(params) {
+    this._init(params);
+}
+
+IconGrid.prototype = {
+    _init: function(params) {
+        params = Params.parse(params, { rowLimit: null,
+                                        columnLimit: null,
+                                        xAlign: St.Align.MIDDLE });
+        this._rowLimit = params.rowLimit;
+        this._colLimit = params.columnLimit;
+        this._xAlign = params.xAlign;
+
+        this.actor = new St.BoxLayout({ style_class: 'icon-grid',
+                                        vertical: true });
+        // Pulled from CSS, but hardcode some defaults here
+        this._spacing = 0;
+        this._item_size = ICON_SIZE;
+        this._grid = new Shell.GenericContainer();
+        this.actor.add(this._grid, { expand: true, y_align: St.Align.START });
+        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
+
+        this._grid.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this._grid.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this._grid.connect('allocate', Lang.bind(this, this._allocate));
+    },
+
+    _getPreferredWidth: function (grid, forHeight, alloc) {
+        let children = this._grid.get_children();
+        let nColumns = this._colLimit ? Math.min(this._colLimit,
+                                                 children.length)
+                                      : children.length;
+        let totalSpacing = Math.max(0, nColumns - 1) * this._spacing;
+        // Kind of a lie, but not really an issue right now.  If
+        // we wanted to support some sort of hidden/overflow that would
+        // need higher level design
+        alloc.min_size = this._item_size;
+        alloc.natural_size = nColumns * this._item_size + totalSpacing;
+    },
+
+    _getVisibleChildren: function() {
+        let children = this._grid.get_children();
+        children = children.filter(function(actor) {
+            return actor.visible;
+        });
+        return children;
+    },
+
+    _getPreferredHeight: function (grid, forWidth, alloc) {
+        let children = this._getVisibleChildren();
+        let [nColumns, usedWidth] = this._computeLayout(forWidth);
+        let nRows;
+        if (nColumns > 0)
+            nRows = Math.ceil(children.length / nColumns);
+        else
+            nRows = 0;
+        if (this._rowLimit)
+            nRows = Math.min(nRows, this._rowLimit);
+        let totalSpacing = Math.max(0, nRows - 1) * this._spacing;
+        let height = nRows * this._item_size + totalSpacing;
+        alloc.min_size = height;
+        alloc.natural_size = height;
+    },
+
+    _allocate: function (grid, box, flags) {
+        let children = this._getVisibleChildren();
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        let [nColumns, usedWidth] = this._computeLayout(availWidth);
+
+        let leftPadding;
+        switch(this._xAlign) {
+            case St.Align.START:
+                leftPadding = 0;
+                break;
+            case St.Align.MIDDLE:
+                leftPadding = Math.floor((availWidth - usedWidth) / 2);
+                break;
+            case St.Align.END:
+                leftPadding = availWidth - usedWidth;
+        }
+
+        let x = box.x1 + leftPadding;
+        let y = box.y1;
+        let columnIndex = 0;
+        let rowIndex = 0;
+        for (let i = 0; i < children.length; i++) {
+            let [childMinWidth, childMinHeight, childNaturalWidth, childNaturalHeight]
+                = children[i].get_preferred_size();
+
+            /* Center the item in its allocation horizontally */
+            let width = Math.min(this._item_size, childNaturalWidth);
+            let childXSpacing = Math.max(0, width - childNaturalWidth) / 2;
+            let height = Math.min(this._item_size, childNaturalHeight);
+            let childYSpacing = Math.max(0, height - childNaturalHeight) / 2;
+
+            let childBox = new Clutter.ActorBox();
+            if (St.Widget.get_default_direction() == St.TextDirection.RTL) {
+                let _x = box.x2 - (x + width);
+                childBox.x1 = Math.floor(_x - childXSpacing);
+            } else {
+                childBox.x1 = Math.floor(x + childXSpacing);
+            }
+            childBox.y1 = Math.floor(y + childYSpacing);
+            childBox.x2 = childBox.x1 + width;
+            childBox.y2 = childBox.y1 + height;
+
+            if (this._rowLimit && rowIndex >= this._rowLimit) {
+                this._grid.set_skip_paint(children[i], true);
+            } else {
+                children[i].allocate(childBox, flags);
+                this._grid.set_skip_paint(children[i], false);
+            }
+
+            columnIndex++;
+            if (columnIndex == nColumns) {
+                columnIndex = 0;
+                rowIndex++;
+            }
+
+            if (columnIndex == 0) {
+                y += this._item_size + this._spacing;
+                x = box.x1 + leftPadding;
+            } else {
+                x += this._item_size + this._spacing;
+            }
+        }
+    },
+
+    childrenInRow: function(rowWidth) {
+        return this._computeLayout(rowWidth)[0];
+    },
+
+    _computeLayout: function (forWidth) {
+        let nColumns = 0;
+        let usedWidth = 0;
+        while ((this._colLimit == null || nColumns < this._colLimit) &&
+               (usedWidth + this._item_size <= forWidth)) {
+            usedWidth += this._item_size + this._spacing;
+            nColumns += 1;
+        }
+
+        if (nColumns > 0)
+            usedWidth -= this._spacing;
+
+        return [nColumns, usedWidth];
+    },
+
+    _onStyleChanged: function() {
+        let themeNode = this.actor.get_theme_node();
+        this._spacing = themeNode.get_length('spacing');
+        this._item_size = themeNode.get_length('-shell-grid-item-size');
+        this._grid.queue_relayout();
+    },
+
+    removeAll: function () {
+        this._grid.get_children().forEach(Lang.bind(this, function (child) {
+            child.destroy();
+        }));
+    },
+
+    addItem: function(actor) {
+        this._grid.add_actor(actor);
+    },
+
+    getItemAtIndex: function(index) {
+        return this._grid.get_children()[index];
+    },
+
+    visibleItemsCount: function() {
+        return this._grid.get_children().length - this._grid.get_n_skip_paint();
+    }
+};

js/ui/lightbox.js

@@ -1,15 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
+const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 
+const Params = imports.misc.params;
+const Tweener = imports.ui.tweener;
+
 /**
  * Lightbox:
  * @container: parent Clutter.Container
- * @inhibitEvents: whether to inhibit events for @container
- * @width: (optional) shade actor width
- * @height: (optional) shade actor height
+ * @params: (optional) additional parameters:
+ *           - inhibitEvents: whether to inhibit events for @container
+ *           - width: shade actor width
+ *           - height: shade actor height
+ *           - fadeTime: seconds used to fade in/out
  *
  * Lightbox creates a dark translucent "shade" actor to hide the
  * contents of @container, and allows you to specify particular actors
@@ -23,29 +28,37 @@ const St = imports.gi.St;
  *
  * By default, the shade window will have the height and width of
  * @container and will track any changes in its size. You can override
- * this by passing an explicit width and height
+ * this by passing an explicit width and height in @params.
  */
-function Lightbox(container, inhibitEvents, width, height) {
-    this._init(container, inhibitEvents, width, height);
+function Lightbox(container, params) {
+    this._init(container, params);
 }
 
 Lightbox.prototype = {
-    _init : function(container, inhibitEvents, width, height) {
+    _init : function(container, params) {
+        params = Params.parse(params, { inhibitEvents: false,
+                                        width: null,
+                                        height: null,
+                                        fadeTime: null
+                                      });
+
         this._container = container;
         this._children = container.get_children();
+        this._fadeTime = params.fadeTime;
         this.actor = new St.Bin({ x: 0,
                                   y: 0,
                                   style_class: 'lightbox',
-                                  reactive: inhibitEvents });
+                                  reactive: params.inhibitEvents });
 
         container.add_actor(this.actor);
         this.actor.raise_top();
+        this.actor.hide();
 
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
-        if (width && height) {
-            this.actor.width = width;
-            this.actor.height = height;
+        if (params.width && params.height) {
+            this.actor.width = params.width;
+            this.actor.height = params.height;
             this._allocationChangedSignalId = 0;
         } else {
             this.actor.width = container.width;
@@ -60,8 +73,13 @@ Lightbox.prototype = {
     },
 
     _allocationChanged : function(container, box, flags) {
-        this.actor.width = this._container.width;
-        this.actor.height = this._container.height;
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+            this.actor.width = this.width;
+            this.actor.height = this.height;
+            return false;
+        }));
+        this.width = this._container.width;
+        this.height = this._container.height;
     },
 
     _actorAdded : function(container, newChild) {
@@ -86,6 +104,35 @@ Lightbox.prototype = {
         }
     },
 
+    show: function() {
+        if (this._fadeTime) {
+            this.actor.opacity = 0;
+            Tweener.addTween(this.actor,
+                             { opacity: 255,
+                               time: this._fadeTime,
+                               transition: 'easeOutQuad'
+                             });
+        } else {
+            this.actor.opacity = 255;
+        }
+        this.actor.show();
+    },
+
+    hide: function() {
+        if (this._fadeTime) {
+            Tweener.addTween(this.actor,
+                             { opacity: 0,
+                               time: this._fadeTime,
+                               transition: 'easeOutQuad',
+                               onComplete: Lang.bind(this, function() {
+                                   this.actor.hide();
+                               })
+                             });
+        } else {
+            this.actor.hide();
+        }
+    },
+
     _actorRemoved : function(container, child) {
         let index = this._children.indexOf(child);
         if (index != -1) // paranoia

js/ui/link.js

@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -12,6 +11,7 @@ function Link(props) {
 Link.prototype = {
     _init : function(props) {
         let realProps = { reactive: true,
+                          track_hover: true,
                           style_class: 'shell-link' };
         // The user can pass in reactive: false to override the above and get
         // a non-reactive link (a link to the current page, perhaps)

js/ui/lookingGlass.js

@@ -1,7 +1,9 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
+const Cogl = imports.gi.Cogl;
+const GConf = imports.gi.GConf;
+const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Pango = imports.gi.Pango;
 const St = imports.gi.St;
@@ -12,28 +14,32 @@ const Mainloop = imports.mainloop;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
+const History = imports.misc.history;
 const ExtensionSystem = imports.ui.extensionSystem;
 const Link = imports.ui.link;
 const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;
 
 /* Imports...feel free to add here as needed */
-var commandHeader = "const Clutter = imports.gi.Clutter; " +
-                    "const GLib = imports.gi.GLib; " +
-                    "const Gtk = imports.gi.Gtk; " +
-                    "const Mainloop = imports.mainloop; " +
-                    "const Meta = imports.gi.Meta; " +
-                    "const Shell = imports.gi.Shell; " +
-                    "const Main = imports.ui.main; " +
-                    "const Lang = imports.lang; " +
-                    "const Tweener = imports.ui.tweener; " +
+var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
+                    'const GLib = imports.gi.GLib; ' +
+                    'const Gtk = imports.gi.Gtk; ' +
+                    'const Mainloop = imports.mainloop; ' +
+                    'const Meta = imports.gi.Meta; ' +
+                    'const Shell = imports.gi.Shell; ' +
+                    'const Tp = imports.gi.TelepathyGLib; ' +
+                    'const Main = imports.ui.main; ' +
+                    'const Lang = imports.lang; ' +
+                    'const Tweener = imports.ui.tweener; ' +
                     /* Utility functions...we should probably be able to use these
                      * in the shell core code too. */
-                    "const stage = global.stage; " +
-                    "const color = function(pixel) { let c= new Clutter.Color(); c.from_pixel(pixel); return c; }; " +
+                    'const stage = global.stage; ' +
+                    'const color = function(pixel) { let c= new Clutter.Color(); c.from_pixel(pixel); return c; }; ' +
                     /* Special lookingGlass functions */
-                       "const it = Main.lookingGlass.getIt(); " +
-                    "const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ";
+                       'const it = Main.lookingGlass.getIt(); ' +
+                    'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';
+
+const HISTORY_KEY = 'looking-glass-history';
 
 function Notebook() {
     this._init();
@@ -43,14 +49,16 @@ Notebook.prototype = {
     _init: function() {
         this.actor = new St.BoxLayout({ vertical: true });
 
-        this.tabControls = new St.BoxLayout({ style_class: "labels" });
+        this.tabControls = new St.BoxLayout({ style_class: 'labels' });
 
         this._selectedIndex = -1;
         this._tabs = [];
     },
 
     appendPage: function(name, child) {
-        let labelBox = new St.BoxLayout({ style_class: "notebook-tab" });
+        let labelBox = new St.BoxLayout({ style_class: 'notebook-tab',
+                                          reactive: true,
+                                          track_hover: true });
         let label = new St.Button({ label: name });
         label.connect('clicked', Lang.bind(this, function () {
             this.selectChild(child);
@@ -84,7 +92,7 @@ Notebook.prototype = {
         if (this._selectedIndex < 0)
             return;
         let tabData = this._tabs[this._selectedIndex];
-        tabData.labelBox.set_style_pseudo_class(null);
+        tabData.labelBox.remove_style_pseudo_class('selected');
         tabData.scrollView.hide();
         this._selectedIndex = -1;
     },
@@ -98,7 +106,7 @@ Notebook.prototype = {
             return;
         }
         let tabData = this._tabs[index];
-        tabData.labelBox.set_style_pseudo_class('selected');
+        tabData.labelBox.add_style_pseudo_class('selected');
         tabData.scrollView.show();
         this._selectedIndex = index;
         this.emit('selection', tabData.child);
@@ -139,6 +147,40 @@ Notebook.prototype = {
 };
 Signals.addSignalMethods(Notebook.prototype);
 
+function objectToString(o) {
+    if (typeof(o) == typeof(objectToString)) {
+        // special case this since the default is way, way too verbose
+        return "<js function>";
+    } else {
+        return "" + o;
+    }
+}
+
+function ObjLink(o, title) {
+    this._init(o, title);
+}
+
+ObjLink.prototype = {
+    __proto__: Link.Link,
+
+    _init: function(o, title) {
+        let text;
+        if (title)
+            text = title;
+        else
+            text = objectToString(o);
+        text = GLib.markup_escape_text(text, -1);
+        this._obj = o;
+        Link.Link.prototype._init.call(this, { label: text });
+        this.actor.get_child().single_line_mode = true;
+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+    },
+
+    _onClicked: function (link) {
+        Main.lookingGlass.inspectObject(this._obj, this.actor);
+    }
+};
+
 function Result(command, o, index) {
     this._init(command, o, index);
 }
@@ -148,108 +190,203 @@ Result.prototype = {
         this.index = index;
         this.o = o;
 
-        this.actor = new Big.Box();
+        this.actor = new St.BoxLayout({ vertical: true });
 
         let cmdTxt = new St.Label({ text: command });
-        cmdTxt.ellipsize = Pango.EllipsizeMode.END;
-
-        this.actor.append(cmdTxt, Big.BoxPackFlags.NONE);
-        let resultTxt = new St.Label({ text: "r(" + index + ") = " + o });
-        resultTxt.ellipsize = Pango.EllipsizeMode.END;
-
-        this.actor.append(resultTxt, Big.BoxPackFlags.NONE);
-        let line = new Clutter.Rectangle({ name: "Separator",
-                                           height: 1 });
-        let padBin = new St.Bin({ name: "Separator", x_fill: true, y_fill: true });
+        cmdTxt.clutter_text.ellipsize = Pango.EllipsizeMode.END;
+        this.actor.add(cmdTxt);
+        let box = new St.BoxLayout({});
+        this.actor.add(box);
+        let resultTxt = new St.Label({ text: 'r(' + index + ') = ' });
+        resultTxt.clutter_text.ellipsize = Pango.EllipsizeMode.END;
+        box.add(resultTxt);
+        let objLink = new ObjLink(o);
+        box.add(objLink.actor);
+        let line = new Clutter.Rectangle({ name: 'Separator' });
+        let padBin = new St.Bin({ name: 'Separator', x_fill: true, y_fill: true });
         padBin.add_actor(line);
-        this.actor.append(padBin, Big.BoxPackFlags.NONE);
+        this.actor.add(padBin);
     }
 };
 
-function ActorHierarchy() {
+function WindowList() {
     this._init();
 }
 
-ActorHierarchy.prototype = {
+WindowList.prototype = {
     _init : function () {
-        this._previousTarget = null;
-        this._target = null;
-
-        this._parentList = [];
-
-        this.actor = new St.BoxLayout({ name: "ActorHierarchy", vertical: true });
+        this.actor = new St.BoxLayout({ name: 'Windows', vertical: true, style: 'spacing: 8px' });
+        let display = global.screen.get_display();
+        let tracker = Shell.WindowTracker.get_default();
+        this._updateId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._updateWindowList));
+        display.connect('window-created', Lang.bind(this, this._updateWindowList));
+        tracker.connect('tracked-windows-changed', Lang.bind(this, this._updateWindowList));
     },
 
-    setTarget: function(actor) {
-        this._previousTarget = this._target;
-        this.target = actor;
-
-        this.actor.get_children().forEach(function (child) { child.destroy(); });
-
-        if (!(actor instanceof Clutter.Actor))
-            return;
-
-        if (this.target == null)
-            return;
-
-        this._parentList = [];
-        let parent = actor;
-        while ((parent = parent.get_parent()) != null) {
-            this._parentList.push(parent);
-
-            let link = new St.Label({ reactive: true,
-                                      text: "" + parent });
-            this.actor.add_actor(link);
-            let parentTarget = parent;
-            link.connect('button-press-event', Lang.bind(this, function () {
-                this._selectByActor(parentTarget);
-                return true;
-            }));
-        }
-        this.emit('selection', actor);
-    },
-
-    _selectByActor: function(actor) {
-        let idx = this._parentList.indexOf(actor);
-        let children = this.actor.get_children();
-        let link = children[idx];
-        this.emit('selection', actor);
-    }
-};
-Signals.addSignalMethods(ActorHierarchy.prototype);
-
-function PropertyInspector() {
-    this._init();
-}
-
-PropertyInspector.prototype = {
-    _init : function () {
-        this._target = null;
-
-        this._parentList = [];
-
-        this.actor = new St.BoxLayout({ name: "PropertyInspector", vertical: true });
-    },
-
-    setTarget: function(actor) {
-        this.target = actor;
-
-        this.actor.get_children().forEach(function (child) { child.destroy(); });
-
-        for (let propName in actor) {
-            let valueStr;
-            try {
-                valueStr = "" + actor[propName];
-            } catch (e) {
-                valueStr = '<error>';
+    _updateWindowList: function() {
+        this.actor.get_children().forEach(function (actor) { actor.destroy(); });
+        let windows = global.get_window_actors();
+        let tracker = Shell.WindowTracker.get_default();
+        for (let i = 0; i < windows.length; i++) {
+            let metaWindow = windows[i].metaWindow;
+            // Avoid multiple connections
+            if (!metaWindow._lookingGlassManaged) {
+                metaWindow.connect('unmanaged', Lang.bind(this, this._updateWindowList));
+                metaWindow._lookingGlassManaged = true;
+            }
+            let box = new St.BoxLayout({ vertical: true });
+            this.actor.add(box);
+            let windowLink = new ObjLink(metaWindow, metaWindow.title);
+            box.add(windowLink.actor, { x_align: St.Align.START, x_fill: false });
+            let propsBox = new St.BoxLayout({ vertical: true, style: 'padding-left: 6px;' });
+            box.add(propsBox);
+            propsBox.add(new St.Label({ text: 'wmclass: ' + metaWindow.get_wm_class() }));
+            let app = tracker.get_window_app(metaWindow);
+            if (app != null && !app.is_transient()) {
+                let icon = app.create_icon_texture(22);
+                let propBox = new St.BoxLayout({ style: 'spacing: 6px; ' });
+                propsBox.add(propBox);
+                propBox.add(new St.Label({ text: 'app: ' }), { y_fill: false });
+                let appLink = new ObjLink(app, app.get_id());
+                propBox.add(appLink.actor, { y_fill: false });
+                propBox.add(icon, { y_fill: false });
+            } else {
+                propsBox.add(new St.Label({ text: '<untracked>' }));
             }
-            let propText = propName + ": " + valueStr;
-            let propDisplay = new St.Label({ reactive: true,
-                                             text: propText });
-            this.actor.add_actor(propDisplay);
         }
     }
 };
+Signals.addSignalMethods(WindowList.prototype);
+
+function ObjInspector() {
+    this._init();
+}
+
+ObjInspector.prototype = {
+    _init : function () {
+        this._obj = null;
+        this._previousObj = null;
+
+        this._parentList = [];
+
+        this.actor = new St.ScrollView({ x_fill: true, y_fill: true });
+        this.actor.get_hscroll_bar().hide();
+        this._container = new St.BoxLayout({ name: 'LookingGlassPropertyInspector',
+                                             style_class: 'lg-dialog',
+                                             vertical: true });
+        this.actor.add_actor(this._container);
+    },
+
+    selectObject: function(obj, skipPrevious) {
+        if (!skipPrevious)
+            this._previousObj = this._obj;
+        else
+            this._previousObj = null;
+        this._obj = obj;
+
+        this._container.get_children().forEach(function (child) { child.destroy(); });
+
+        let hbox = new St.BoxLayout({ style_class: 'lg-obj-inspector-title' });
+        this._container.add_actor(hbox);
+        let label = new St.Label({ text: 'Inspecting: %s: %s'.format(typeof(obj),
+                                                                     objectToString(obj)) });
+        label.single_line_mode = true;
+        hbox.add(label, { expand: true, y_fill: false });
+        let button = new St.Button({ label: 'Insert', style_class: 'lg-obj-inspector-button' });
+        button.connect('clicked', Lang.bind(this, this._onInsert));
+        hbox.add(button);
+
+        if (this._previousObj != null) {
+            button = new St.Button({ label: 'Back', style_class: 'lg-obj-inspector-button' });
+            button.connect('clicked', Lang.bind(this, this._onBack));
+            hbox.add(button);
+        }
+
+        button = new St.Button({ style_class: 'window-close' });
+        button.connect('clicked', Lang.bind(this, this.close));
+        hbox.add(button);
+        if (typeof(obj) == typeof({})) {
+            for (let propName in obj) {
+                let valueStr;
+                let link;
+                try {
+                    let prop = obj[propName];
+                    link = new ObjLink(prop).actor;
+                } catch (e) {
+                    link = new St.Label({ text: '<error>' });
+                }
+                let hbox = new St.BoxLayout();
+                let propText = propName + ": " + valueStr;
+                hbox.add(new St.Label({ text: propName + ': ' }));
+                hbox.add(link);
+                this._container.add_actor(hbox);
+            }
+        }
+    },
+
+    open: function(sourceActor) {
+        if (this._open)
+            return;
+        this._previousObj = null;
+        this._open = true;
+        this.actor.show();
+        if (sourceActor) {
+            this.actor.set_scale(0, 0);
+            let [sourceX, sourceY] = sourceActor.get_transformed_position();
+            let [sourceWidth, sourceHeight] = sourceActor.get_transformed_size();
+            this.actor.move_anchor_point(Math.floor(sourceX + sourceWidth / 2),
+                                         Math.floor(sourceY + sourceHeight / 2));
+            Tweener.addTween(this.actor, { scale_x: 1, scale_y: 1,
+                                           transition: "easeOutQuad",
+                                           time: 0.2 });
+        } else {
+            this.actor.set_scale(1, 1);
+        }
+    },
+
+    close: function() {
+        if (!this._open)
+            return;
+        this._open = false;
+        this.actor.hide();
+        this._previousObj = null;
+        this._obj = null;
+    },
+
+    _onInsert: function() {
+        let obj = this._obj;
+        this.close();
+        Main.lookingGlass.insertObject(obj);
+    },
+
+    _onBack: function() {
+        this.selectObject(this._previousObj, true);
+    }
+};
+
+function addBorderPaintHook(actor) {
+    let signalId = actor.connect_after('paint',
+        function () {
+            let color = new Cogl.Color();
+            color.init_from_4ub(0xff, 0, 0, 0xc4);
+            Cogl.set_source_color(color);
+
+            let geom = actor.get_allocation_geometry();
+            let width = 2;
+
+            // clockwise order
+            Cogl.rectangle(0, 0, geom.width, width);
+            Cogl.rectangle(geom.width - width, width,
+                           geom.width, geom.height);
+            Cogl.rectangle(0, geom.height,
+                           geom.width - width, geom.height - width);
+            Cogl.rectangle(0, geom.height - width,
+                           width, width);
+        });
+
+    actor.queue_redraw();
+    return signalId;
+}
 
 function Inspector() {
     this._init();
@@ -257,59 +394,142 @@ function Inspector() {
 
 Inspector.prototype = {
     _init: function() {
-        let width = 150;
-        let primary = global.get_primary_monitor();
-        let eventHandler = new St.BoxLayout({ name: "LookingGlassDialog",
+        let container = new Shell.GenericContainer({ width: 0,
+                                                     height: 0 });
+        container.connect('allocate', Lang.bind(this, this._allocate));
+        Main.uiGroup.add_actor(container);
+
+        let eventHandler = new St.BoxLayout({ name: 'LookingGlassDialog',
                                               vertical: false,
-                                              y: primary.y + Math.floor(primary.height / 2),
                                               reactive: true });
-        eventHandler.connect('notify::allocation', Lang.bind(this, function () {
-            eventHandler.x = primary.x + Math.floor((primary.width - eventHandler.width) / 2);
-        }));
-        global.stage.add_actor(eventHandler);
-        let displayText = new St.Label();
-        eventHandler.add(displayText, { expand: true });
+        this._eventHandler = eventHandler;
+        container.add_actor(eventHandler);
+        this._displayText = new St.Label();
+        eventHandler.add(this._displayText, { expand: true });
 
-        let borderPaintTarget = null;
-        let borderPaintId = null;
-        eventHandler.connect('destroy', Lang.bind(this, function() {
-            if (borderPaintTarget != null)
-                borderPaintTarget.disconnect(borderPaintId);
-        }));
-
-        eventHandler.connect('button-press-event', Lang.bind(this, function (actor, event) {
-            Clutter.ungrab_pointer(eventHandler);
-
-            let [stageX, stageY] = event.get_coords();
-            let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
-                                                       stageX,
-                                                       stageY);
-            this.emit('target', target, stageX, stageY);
-            eventHandler.destroy();
-            this.emit('closed');
-            return true;
-        }));
-
-        eventHandler.connect('motion-event', Lang.bind(this, function (actor, event) {
-            let [stageX, stageY] = event.get_coords();
-            let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
-                                                       stageX,
-                                                       stageY);
-            let id, style_class;
-            if (target instanceof St.Widget) {
-                id = target.get_theme_node().get_element_id();
-                style_class = target.get_theme_node().get_element_class();
-            }
-            let position = '<inspect x: ' + stageX + ' y: ' + stageY + '>';
-            let style = '<style id: ' + id  + ' class: ' + style_class + '>';
-            displayText.text = position + ' ' + style + ' ' + target;
-            if (borderPaintTarget != null)
-                borderPaintTarget.disconnect(borderPaintId);
-            borderPaintTarget = target;
-            borderPaintId = Shell.add_hook_paint_red_border(target);
-            return true;
-        }));
+        this._borderPaintTarget = null;
+        this._borderPaintId = null;
+        eventHandler.connect('destroy', Lang.bind(this, this._onDestroy));
+        eventHandler.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
+        eventHandler.connect('button-press-event', Lang.bind(this, this._onButtonPressEvent));
+        eventHandler.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        eventHandler.connect('motion-event', Lang.bind(this, this._onMotionEvent));
         Clutter.grab_pointer(eventHandler);
+        Clutter.grab_keyboard(eventHandler);
+
+        // this._target is the actor currently shown by the inspector.
+        // this._pointerTarget is the actor directly under the pointer.
+        // Normally these are the same, but if you use the scroll wheel
+        // to drill down, they'll diverge until you either scroll back
+        // out, or move the pointer outside of _pointerTarget.
+        this._target = null;
+        this._pointerTarget = null;
+    },
+
+    _allocate: function(actor, box, flags) {
+        if (!this._eventHandler)
+            return;
+
+        let primary = global.get_primary_monitor();
+
+        let [minWidth, minHeight, natWidth, natHeight] =
+            this._eventHandler.get_preferred_size();
+
+        let childBox = new Clutter.ActorBox();
+        childBox.x1 = primary.x + Math.floor((primary.width - natWidth) / 2);
+        childBox.x2 = childBox.x1 + natWidth;
+        childBox.y1 = primary.y + Math.floor((primary.height - natHeight) / 2);
+        childBox.y2 = childBox.y1 + natHeight;
+        this._eventHandler.allocate(childBox, flags);
+    },
+
+    _close: function() {
+        Clutter.ungrab_pointer(this._eventHandler);
+        Clutter.ungrab_keyboard(this._eventHandler);
+        this._eventHandler.destroy();
+        this._eventHandler = null;
+        this.emit('closed');
+    },
+
+    _onDestroy: function() {
+        if (this._borderPaintTarget != null)
+            this._borderPaintTarget.disconnect(this._borderPaintId);
+    },
+
+    _onKeyPressEvent: function (actor, event) {
+        if (event.get_key_symbol() == Clutter.Escape)
+            this._close();
+        return true;
+    },
+
+    _onButtonPressEvent: function (actor, event) {
+        if (this._target) {
+            let [stageX, stageY] = event.get_coords();
+            this.emit('target', this._target, stageX, stageY);
+        }
+        this._close();
+        return true;
+    },
+
+    _onScrollEvent: function (actor, event) {
+        switch (event.get_scroll_direction()) {
+        case Clutter.ScrollDirection.UP:
+            // select parent
+            let parent = this._target.get_parent();
+            if (parent != null) {
+                this._target = parent;
+                this._update(event);
+            }
+            break;
+
+        case Clutter.ScrollDirection.DOWN:
+            // select child
+            if (this._target != this._pointerTarget) {
+                let child = this._pointerTarget;
+                while (child) {
+                    let parent = child.get_parent();
+                    if (parent == this._target)
+                        break;
+                    child = parent;
+                }
+                if (child) {
+                    this._target = child;
+                    this._update(event);
+                }
+            }
+            break;
+
+        default:
+            break;
+        }
+        return true;
+    },
+
+    _onMotionEvent: function (actor, event) {
+        this._update(event);
+        return true;
+    },
+
+    _update: function(event) {
+        let [stageX, stageY] = event.get_coords();
+        let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
+                                                   stageX,
+                                                   stageY);
+
+        if (target != this._pointerTarget)
+            this._target = target;
+        this._pointerTarget = target;
+
+        let position = '[inspect x: ' + stageX + ' y: ' + stageY + ']';
+        this._displayText.text = '';
+        this._displayText.text = position + ' ' + this._target;
+
+        if (this._borderPaintTarget != this._target) {
+            if (this._borderPaintTarget != null)
+                this._borderPaintTarget.disconnect(this._borderPaintId);
+            this._borderPaintTarget = this._target;
+            this._borderPaintId = addBorderPaintHook(this._target);
+        }
     }
 };
 
@@ -324,6 +544,11 @@ ErrorLog.prototype = {
         this.actor = new St.BoxLayout();
         this.text = new St.Label();
         this.actor.add(this.text);
+        // We need to override StLabel's default ellipsization when
+        // using line_wrap; otherwise ClutterText's layout is going
+        // to constrain both the width and height, which prevents
+        // scrolling.
+        this.text.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this.text.clutter_text.line_wrap = true;
         this.actor.connect('notify::mapped', Lang.bind(this, this._renderText));
     },
@@ -345,7 +570,7 @@ ErrorLog.prototype = {
         let stack = Main._getAndClearErrorStack();
         for (let i = 0; i < stack.length; i++) {
             let logItem = stack[i];
-            text += logItem.category + " t=" + this._formatTime(new Date(logItem.timestamp)) + " " + logItem.message + "\n";
+            text += logItem.category + ' t=' + this._formatTime(new Date(logItem.timestamp)) + ' ' + logItem.message + '\n';
         }
         this.text.text = text;
     }
@@ -405,7 +630,7 @@ Extensions.prototype = {
             case ExtensionSystem.ExtensionState.OUT_OF_DATE:
                 return _("Out of date");
         }
-        return "Unknown"; // Not translated, shouldn't appear
+        return 'Unknown'; // Not translated, shouldn't appear
     },
 
     _createExtensionDisplay: function(meta) {
@@ -450,18 +675,10 @@ function LookingGlass() {
 
 LookingGlass.prototype = {
     _init : function() {
-        this._idleHistorySaveId = 0;
-        let historyPath = global.configdir + "/lookingglass-history.txt";
-        this._historyFile = Gio.file_new_for_path(historyPath);
-        this._savedText = null;
-        this._historyNavIndex = -1;
-        this._history = [];
         this._borderPaintTarget = null;
         this._borderPaintId = 0;
         this._borderDestroyId = 0;
 
-        this._readHistory();
-
         this._open = false;
 
         this._offset = 0;
@@ -470,22 +687,28 @@ LookingGlass.prototype = {
         // Sort of magic, but...eh.
         this._maxItems = 150;
 
-        this.actor = new St.BoxLayout({ name: "LookingGlassDialog",
+        this.actor = new St.BoxLayout({ name: 'LookingGlassDialog',
+                                        style_class: 'lg-dialog',
                                         vertical: true,
                                         visible: false });
+        this.actor.connect('key-press-event', Lang.bind(this, this._globalKeyPressEvent));
 
-        let gconf = Shell.GConf.get_default();
-        gconf.watch_directory("/desktop/gnome/interface");
-        gconf.connect("changed::/desktop/gnome/interface/monospace_font_name",
-                      Lang.bind(this, this._updateFont));
+        this._interfaceSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        this._interfaceSettings.connect('changed::monospace-font-name',
+                                        Lang.bind(this, this._updateFont));
         this._updateFont();
 
-        global.stage.add_actor(this.actor);
+        Main.uiGroup.add_actor(this.actor);
 
-        let toolbar = new St.BoxLayout({ name: "Toolbar" });
+        this._objInspector = new ObjInspector();
+        Main.uiGroup.add_actor(this._objInspector.actor);
+        this._objInspector.actor.hide();
+
+        let toolbar = new St.BoxLayout({ name: 'Toolbar' });
         this.actor.add_actor(toolbar);
-        let inspectIcon = St.TextureCache.get_default().load_gicon(new Gio.ThemedIcon({ name: 'gtk-color-picker' }),
-                                                                   24);
+        let inspectIcon = new St.Icon({ icon_name: 'gtk-color-picker',
+                                        icon_type: St.IconType.FULLCOLOR,
+                                        icon_size: 24 });
         toolbar.add_actor(inspectIcon);
         inspectIcon.reactive = true;
         inspectIcon.connect('button-press-event', Lang.bind(this, function () {
@@ -493,7 +716,6 @@ LookingGlass.prototype = {
             inspector.connect('target', Lang.bind(this, function(i, target, stageX, stageY) {
                 this._pushResult('<inspect x:' + stageX + ' y:' + stageY + '>',
                                  target);
-                this._hierarchy.setTarget(target);
             }));
             inspector.connect('closed', Lang.bind(this, function() {
                 this.actor.show();
@@ -511,18 +733,17 @@ LookingGlass.prototype = {
         toolbar.add(emptyBox, { expand: true });
         toolbar.add_actor(notebook.tabControls);
 
-        this._evalBox = new St.BoxLayout({ name: "EvalBox", vertical: true });
+        this._evalBox = new St.BoxLayout({ name: 'EvalBox', vertical: true });
         notebook.appendPage('Evaluator', this._evalBox);
 
-        this._resultsArea = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                          spacing: 4 });
+        this._resultsArea = new St.BoxLayout({ name: 'ResultsArea', vertical: true });
         this._evalBox.add(this._resultsArea, { expand: true });
 
-        let entryArea = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
+        let entryArea = new St.BoxLayout({ name: 'EntryArea' });
         this._evalBox.add_actor(entryArea);
 
         let label = new St.Label({ text: 'js>>> ' });
-        entryArea.append(label, Big.BoxPackFlags.NONE);
+        entryArea.add(label);
 
         this._entry = new St.Entry();
         /* unmapping the edit box will un-focus it, undo that */
@@ -530,17 +751,14 @@ LookingGlass.prototype = {
             if (child == this._evalBox)
                 global.stage.set_key_focus(this._entry);
         }));
-        entryArea.append(this._entry, Big.BoxPackFlags.EXPAND);
+        entryArea.add(this._entry, { expand: true });
 
-        this._hierarchy = new ActorHierarchy();
-        notebook.appendPage('Hierarchy', this._hierarchy.actor);
-
-        this._propInspector = new PropertyInspector();
-        notebook.appendPage('Properties', this._propInspector.actor);
-        this._hierarchy.connect('selection', Lang.bind(this, function (h, actor) {
-            this._pushResult('<parent selection>', actor);
+        this._windowList = new WindowList();
+        this._windowList.connect('selected', Lang.bind(this, function(list, window) {
             notebook.selectIndex(0);
+            this._pushResult('<window selection>', window);
         }));
+        notebook.appendPage('Windows', this._windowList.actor);
 
         this._errorLog = new ErrorLog();
         notebook.appendPage('Errors', this._errorLog.actor);
@@ -554,46 +772,22 @@ LookingGlass.prototype = {
             // newline-separated.
             text.replace('\n', ' ');
             // Strip leading and trailing whitespace
-            text = text.replace(/^\s+/g, "").replace(/\s+$/g, "");
+            text = text.replace(/^\s+/g, '').replace(/\s+$/g, '');
             if (text == '')
                 return true;
             this._evaluate(text);
-            this._historyNavIndex = -1;
             return true;
         }));
-        this._entry.clutter_text.connect('key-press-event', Lang.bind(this, function(o, e) {
-            let symbol = e.get_key_symbol();
-            if (symbol == Clutter.Up) {
-                if (this._historyNavIndex >= this._history.length - 1)
-                    return true;
-                this._historyNavIndex++;
-                if (this._historyNavIndex == 0)
-                    this._savedText = this._entry.text;
-                this._entry.text = this._history[this._history.length - this._historyNavIndex - 1];
-                return true;
-            } else if (symbol == Clutter.Down) {
-                if (this._historyNavIndex <= 0)
-                    return true;
-                this._historyNavIndex--;
-                if (this._historyNavIndex < 0)
-                    this._entry.text = this._savedText;
-                else
-                    this._entry.text = this._history[this._history.length - this._historyNavIndex - 1];
-                return true;
-            } else {
-                this._historyNavIndex = -1;
-                this._savedText = null;
-                return false;
-            }
-        }));
+
+        this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY, 
+                                                     entry: this._entry.clutter_text });
     },
 
     _updateFont: function() {
-        let gconf = Shell.GConf.get_default();
-        let fontName = gconf.get_string("/desktop/gnome/interface/monospace_font_name");
+        let fontName = this._interfaceSettings.get_string('monospace-font-name');
         // This is mishandled by the scanner - should by Pango.FontDescription_from_string(fontName);
         // https://bugzilla.gnome.org/show_bug.cgi?id=595889
-        let fontDesc = Pango.Font.description_from_string(fontName);
+        let fontDesc = Pango.font_description_from_string(fontName);
         // We ignore everything but size and style; you'd be crazy to set your system-wide
         // monospace font to be bold/oblique/etc. Could easily be added here.
         this.actor.style =
@@ -601,42 +795,18 @@ LookingGlass.prototype = {
             + 'font-family: "' + fontDesc.get_family() + '";';
     },
 
-    _readHistory: function () {
-        if (!this._historyFile.query_exists(null))
-            return;
-        let [result, contents, length, etag] = this._historyFile.load_contents(null);
-        this._history = contents.split('\n').filter(function (e) { return e != ''; });
-    },
-
-    _queueHistorySave: function() {
-        if (this._idleHistorySaveId > 0)
-            return;
-        this._idleHistorySaveId = Mainloop.timeout_add_seconds(5, Lang.bind(this, this._doSaveHistory));
-    },
-
-    _doSaveHistory: function () {
-        this._idleHistorySaveId = false;
-        let output = this._historyFile.replace(null, true, Gio.FileCreateFlags.NONE, null);
-        let dataOut = new Gio.DataOutputStream({ base_stream: output });
-        dataOut.put_string(this._history.join('\n'), null);
-        dataOut.put_string('\n', null);
-        dataOut.close(null);
-        return false;
-    },
-
     _pushResult: function(command, obj) {
         let index = this._results.length + this._offset;
         let result = new Result('>>> ' + command, obj, index);
         this._results.push(result);
-        this._resultsArea.append(result.actor, Big.BoxPackFlags.NONE);
-        this._propInspector.setTarget(obj);
+        this._resultsArea.add(result.actor);
         if (this._borderPaintTarget != null) {
             this._borderPaintTarget.disconnect(this._borderPaintId);
             this._borderPaintTarget = null;
         }
         if (obj instanceof Clutter.Actor) {
             this._borderPaintTarget = obj;
-            this._borderPaintId = Shell.add_hook_paint_red_border(obj);
+            this._borderPaintId = addBorderPaintHook(obj);
             this._borderDestroyId = obj.connect('destroy', Lang.bind(this, function () {
                 this._borderDestroyId = 0;
                 this._borderPaintTarget = null;
@@ -655,8 +825,7 @@ LookingGlass.prototype = {
     },
 
     _evaluate : function(command) {
-        this._history.push(command);
-        this._queueHistorySave();
+        this._history.addItem(command);
 
         let fullCmd = commandHeader + command;
 
@@ -664,11 +833,10 @@ LookingGlass.prototype = {
         try {
             resultObj = eval(fullCmd);
         } catch (e) {
-            resultObj = "<exception " + e + ">";
+            resultObj = '<exception ' + e + '>';
         }
 
         this._pushResult(command, resultObj);
-        this._hierarchy.setTarget(null);
         this._entry.text = '';
     },
 
@@ -698,6 +866,9 @@ LookingGlass.prototype = {
         this.actor.y = this._hiddenY;
         this.actor.width = myWidth;
         this.actor.height = myHeight;
+        this._objInspector.actor.set_size(Math.floor(myWidth * 0.8), Math.floor(myHeight * 0.8));
+        this._objInspector.actor.set_position(this.actor.x + Math.floor(myWidth * 0.1),
+                                              this._targetY + Math.floor(myHeight * 0.1));
     },
 
     slaveTo: function(actor) {
@@ -708,11 +879,24 @@ LookingGlass.prototype = {
         this._resizeTo(actor);
     },
 
+    insertObject: function(obj) {
+        this._pushResult('<insert>', obj);
+    },
+
+    inspectObject: function(obj, sourceActor) {
+        this._objInspector.open(sourceActor);
+        this._objInspector.selectObject(obj);
+    },
+
     // Handle key events which are relevant for all tabs of the LookingGlass
     _globalKeyPressEvent : function(actor, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.Escape) {
-            this.close();
+            if (this._objInspector.actor.visible) {
+                this._objInspector.close();
+            } else {
+                this.close();
+            }
             return true;
         }
         return false;
@@ -722,22 +906,20 @@ LookingGlass.prototype = {
         if (this._open)
             return;
 
-        if (!Main.pushModal(this.actor))
+        if (!Main.pushModal(this._entry))
             return;
 
-        this._keyPressEventId = global.stage.connect('key-press-event',
-            Lang.bind(this, this._globalKeyPressEvent));
-
         this.actor.show();
         this.actor.lower(Main.chrome.actor);
         this._open = true;
+        this._history.lastItem();
 
         Tweener.removeTweens(this.actor);
 
-        global.stage.set_key_focus(this._entry);
-
-        Tweener.addTween(this.actor, { time: 0.5,
-                                       transition: "easeOutQuad",
+        // We inverse compensate for the slow-down so you can change the factor
+        // through LookingGlass without long waits.
+        Tweener.addTween(this.actor, { time: 0.5 / St.get_slow_down_factor(),
+                                       transition: 'easeOutQuad',
                                        y: this._targetY
                                      });
     },
@@ -746,10 +928,8 @@ LookingGlass.prototype = {
         if (!this._open)
             return;
 
-        if (this._keyPressEventId)
-            global.stage.disconnect(this._keyPressEventId);
+        this._objInspector.actor.hide();
 
-        this._historyNavIndex = -1;
         this._open = false;
         Tweener.removeTweens(this.actor);
 
@@ -759,10 +939,10 @@ LookingGlass.prototype = {
             this._borderPaintTarget = null;
         }
 
-        Main.popModal(this.actor);
+        Main.popModal(this._entry);
 
-        Tweener.addTween(this.actor, { time: 0.5,
-                                       transition: "easeOutQuad",
+        Tweener.addTween(this.actor, { time: 0.5 / St.get_slow_down_factor(),
+                                       transition: 'easeOutQuad',
                                        y: this._hiddenY,
                                        onComplete: Lang.bind(this, function () {
                                            this.actor.hide();

js/ui/magnifierDBus.js

@@ -0,0 +1,383 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const Main = imports.ui.main;
+
+const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
+const MAG_SERVICE_PATH = '/org/gnome/Magnifier';
+const ZOOM_SERVICE_NAME = 'org.gnome.Magnifier.ZoomRegion';
+const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
+
+// Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
+// http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
+const MagnifierIface = {
+    name: MAG_SERVICE_NAME,
+    methods: [
+                { name: 'setActive', inSignature: 'b', outSignature: '' },
+                { name: 'isActive', inSignature: '', outSignature: 'b' },
+                { name: 'showCursor', inSignature: '', outSignature: '' },
+                { name: 'hideCursor', inSignature: '', outSignature: ''  },
+                { name: 'createZoomRegion', inSignature: 'ddaiai', outSignature: 'o' },
+                { name: 'addZoomRegion', inSignature: 'o', outSignature: 'b' },
+                { name: 'getZoomRegions', inSignature: '', outSignature: 'ao' },
+                { name: 'clearAllZoomRegions', inSignature: '', outSignature: '' },
+                { name: 'fullScreenCapable', inSignature: '', outSignature: 'b' },
+
+                { name: 'setCrosswireSize', inSignature: 'i', outSignature: '' },
+                { name: 'getCrosswireSize', inSignature: '', outSignature: 'i' },
+                { name: 'setCrosswireLength', inSignature: 'i', outSignature: '' },
+                { name: 'getCrosswireLength', inSignature: '', outSignature: 'i' },
+                { name: 'setCrosswireClip', inSignature: 'b', outSignature: '' },
+                { name: 'getCrosswireClip', inSignature: '', outSignature: 'b' },
+                { name: 'setCrosswireColor', inSignature: 'u', outSignature: '' },
+                { name: 'getCrosswireColor', inSignature: '', outSignature: 'u' }
+             ],
+    signals: [],
+    properties: []
+};
+
+// Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
+// http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
+const ZoomRegionIface = {
+    name: ZOOM_SERVICE_NAME,
+    methods: [
+                { name: 'setMagFactor', inSignature: 'dd', outSignature: ''},
+                { name: 'getMagFactor', inSignature: '', outSignature: 'dd' },
+                { name: 'setRoi', inSignature: 'ai', outSignature: '' },
+                { name: 'getRoi', inSignature: '', outSignature: 'ai' },
+                { name: 'shiftContentsTo', inSignature: 'ii', outSignature: 'b' },
+                { name: 'moveResize', inSignature: 'ai', outSignature: '' }
+             ],
+    signals: [],
+    properties: []
+};
+
+// For making unique ZoomRegion DBus proxy object paths of the form:
+// '/org/gnome/Magnifier/ZoomRegion/zoomer0',
+// '/org/gnome/Magnifier/ZoomRegion/zoomer1', etc.
+let _zoomRegionInstanceCount = 0;
+
+function ShellMagnifier() {
+    this._init();
+}
+
+ShellMagnifier.prototype = {
+    _init: function() {
+        this._zoomers = {};
+        DBus.session.exportObject(MAG_SERVICE_PATH, this);
+    },
+
+    /**
+     * setActive:
+     * @activate:   Boolean to activate or de-activate the magnifier.
+     */
+    setActive: function(activate) {
+        Main.magnifier.setActive(activate);
+    },
+
+    /**
+     * isActive:
+     * @return  Whether the magnifier is active (boolean).
+     */
+    isActive: function() {
+        return Main.magnifier.isActive();
+    },
+
+    /**
+     * showCursor:
+     * Show the system mouse pointer.
+     */
+    showCursor: function() {
+        Main.magnifier.showSystemCursor();
+    },
+
+    /**
+     * hideCursor:
+     * Hide the system mouse pointer.
+     */
+    hideCursor: function() {
+        Main.magnifier.hideSystemCursor();
+    },
+
+    /**
+     * createZoomRegion:
+     * Create a new ZoomRegion and return its object path.
+     * @xMagFactor:     The power to set horizontal magnification of the
+     *                  ZoomRegion.  A value of 1.0 means no magnification.  A
+     *                  value of 2.0 doubles the size.
+     * @yMagFactor:     The power to set the vertical magnification of the
+     *                  ZoomRegion.
+     * @roi             Array of integers defining the region of the
+     *                  screen/desktop to magnify.  The array has the form
+     *                  [left, top, right, bottom].
+     * @viewPort        Array of integers, [left, top, right, bottom] that defines
+     *                  the position of the ZoomRegion on screen.
+     *
+     * FIXME: The arguments here are redundant, since the width and height of
+     *   the ROI are determined by the viewport and magnification factors.
+     *   We ignore the passed in width and height.
+     *
+     * @return          The newly created ZoomRegion.
+     */
+    createZoomRegion: function(xMagFactor, yMagFactor, roi, viewPort) {
+        let ROI = { x: roi[0], y: roi[1], width: roi[2] - roi[0], height: roi[3] - roi[1] };
+        let viewBox = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
+        let realZoomRegion = Main.magnifier.createZoomRegion(xMagFactor, yMagFactor, ROI, viewBox);
+        let objectPath = ZOOM_SERVICE_PATH + '/zoomer' + _zoomRegionInstanceCount;
+        _zoomRegionInstanceCount++;
+
+        let zoomRegionProxy = new ShellMagnifierZoomRegion(objectPath, realZoomRegion);
+        let proxyAndZoomRegion = {};
+        proxyAndZoomRegion.proxy = zoomRegionProxy;
+        proxyAndZoomRegion.zoomRegion = realZoomRegion;
+        this._zoomers[objectPath] = proxyAndZoomRegion;
+        return objectPath;
+    },
+
+    /**
+     * addZoomRegion:
+     * Append the given ZoomRegion to the magnifier's list of ZoomRegions.
+     * @zoomerObjectPath:   The object path for the zoom region proxy.
+     */
+    addZoomRegion: function(zoomerObjectPath) {
+        let proxyAndZoomRegion = this._zoomers[zoomerObjectPath];
+        if (proxyAndZoomRegion && proxyAndZoomRegion.zoomRegion) {
+            Main.magnifier.addZoomRegion(proxyAndZoomRegion.zoomRegion);
+            return true;
+        }
+        else
+            return false;
+    },
+
+    /**
+     * getZoomRegions:
+     * Return a list of ZoomRegion object paths for this Magnifier.
+     * @return:     The Magnifier's zoom region list as an array of DBus object
+     *              paths.
+     */
+    getZoomRegions: function() {
+        // There may be more ZoomRegions in the magnifier itself than have
+        // been added through dbus.  Make sure all of them are associated with
+        // an object path and proxy.
+        let zoomRegions = Main.magnifier.getZoomRegions();
+        let objectPaths = [];
+        let thoseZoomers = this._zoomers;
+        zoomRegions.forEach (function(aZoomRegion, index, array) {
+            let found = false;
+            for (let objectPath in thoseZoomers) {
+                let proxyAndZoomRegion = thoseZoomers[objectPath];
+                if (proxyAndZoomRegion.zoomRegion === aZoomRegion) {
+                    objectPaths.push(objectPath);
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                // Got a ZoomRegion with no DBus proxy, make one.
+                let newPath =  ZOOM_SERVICE_PATH + '/zoomer' + _zoomRegionInstanceCount;
+                _zoomRegionInstanceCount++;
+                let zoomRegionProxy = new ShellMagnifierZoomRegion(newPath, aZoomRegion);
+                let proxyAndZoomer = {};
+                proxyAndZoomer.proxy = zoomRegionProxy;
+                proxyAndZoomer.zoomRegion = aZoomRegion;
+                thoseZoomers[newPath] = proxyAndZoomer;
+                objectPaths.push(newPath);
+            }
+        });
+        return objectPaths;
+    },
+
+    /**
+     * clearAllZoomRegions:
+     * Remove all the zoom regions from this Magnfier's ZoomRegion list.
+     */
+    clearAllZoomRegions: function() {
+        Main.magnifier.clearAllZoomRegions();
+        for (let objectPath in this._zoomers) {
+            let proxyAndZoomer = this._zoomers[objectPath];
+            proxyAndZoomer.proxy = null;
+            proxyAndZoomer.zoomRegion = null;
+            delete this._zoomers[objectPath];
+            DBus.session.unexportObject(proxyAndZoomer);
+        }
+        this._zoomers = {};
+    },
+
+    /**
+     * fullScreenCapable:
+     * Consult if the Magnifier can magnify in full-screen mode.
+     * @return  Always return true.
+     */
+    fullScreenCapable: function() {
+        return true;
+    },
+
+    /**
+     * setCrosswireSize:
+     * Set the crosswire size of all ZoomRegions.
+     * @size:   The thickness of each line in the cross wire.
+     */
+     setCrosswireSize: function(size) {
+        Main.magnifier.setCrosshairsThickness(size);
+     },
+
+    /**
+     * getCrosswireSize:
+     * Get the crosswire size of all ZoomRegions.
+     * @return:   The thickness of each line in the cross wire.
+     */
+     getCrosswireSize: function() {
+        return Main.magnifier.getCrosshairsThickness();
+     },
+
+    /**
+     * setCrosswireLength:
+     * Set the crosswire length of all zoom-regions..
+     * @size:   The length of each line in the cross wire.
+     */
+     setCrosswireLength: function(length) {
+        Main.magnifier.setCrosshairsLength(length);
+     },
+
+    /**
+     * setCrosswireSize:
+     * Set the crosswire size of all zoom-regions.
+     * @size:   The thickness of each line in the cross wire.
+     */
+     getCrosswireLength: function() {
+        return Main.magnifier.getCrosshairsLength();
+     },
+
+    /**
+     * setCrosswireClip:
+     * Set if the crosswire will be clipped by the cursor image..
+     * @clip:   Flag to indicate whether to clip the crosswire.
+     */
+     setCrosswireClip: function(clip) {
+        Main.magnifier.setCrosshairsClip(clip);
+     },
+
+    /**
+     * getCrosswireClip:
+     * Get the crosswire clip value.
+     * @return:   Whether the crosswire is clipped by the cursor image.
+     */
+     getCrosswireClip: function() {
+        return Main.magnifier.getCrosshairsClip();
+     },
+
+    /**
+     * setCrosswireColor:
+     * Set the crosswire color of all ZoomRegions.
+     * @color:   Unsigned int of the form rrggbbaa.
+     */
+     setCrosswireColor: function(color) {
+        Main.magnifier.setCrosshairsColor('#%08x'.format(color));
+     },
+
+    /**
+     * getCrosswireClip:
+     * Get the crosswire color of all ZoomRegions.
+     * @return:   The crosswire color as an unsigned int in the form rrggbbaa.
+     */
+     getCrosswireColor: function() {
+        let colorString = Main.magnifier.getCrosshairsColor();
+        // Drop the leading '#'.
+        return parseInt(colorString.slice(1), 16);
+     }
+};
+
+/**
+ * ShellMagnifierZoomRegion:
+ * Object that implements the DBus ZoomRegion interface.
+ * @zoomerObjectPath:   String that is the path to a DBus ZoomRegion.
+ * @zoomRegion:         The actual zoom region associated with the object path.
+ */
+function ShellMagnifierZoomRegion(zoomerObjectPath, zoomRegion) {
+    this._init(zoomerObjectPath, zoomRegion);
+}
+
+ShellMagnifierZoomRegion.prototype = {
+    _init: function(zoomerObjectPath, zoomRegion) {
+        this._zoomRegion = zoomRegion;
+        DBus.session.proxifyObject(this, ZOOM_SERVICE_NAME, zoomerObjectPath);
+        DBus.session.exportObject(zoomerObjectPath, this);
+    },
+
+    /**
+     * setMagFactor:
+     * @xMagFactor:     The power to set the horizontal magnification factor to
+     *                  of the magnified view.  A value of 1.0 means no
+     *                  magnification.  A value of 2.0 doubles the size.
+     * @yMagFactor:     The power to set the vertical magnification factor to
+     *                  of the magnified view.
+     */
+    setMagFactor: function(xMagFactor, yMagFactor) {
+        this._zoomRegion.setMagFactor(xMagFactor, yMagFactor);
+    },
+
+    /**
+     * getMagFactor:
+     * @return  an array, [xMagFactor, yMagFactor], containing the horizontal
+     *          and vertical magnification powers.  A value of 1.0 means no
+     *          magnification.  A value of 2.0 means the contents are doubled
+     *          in size, and so on.
+     */
+    getMagFactor: function() {
+        return this._zoomRegion.getMagFactor();
+    },
+
+    /**
+     * setRoi:
+     * Sets the "region of interest" that the ZoomRegion is magnifying.
+     * @roi     Array, [left, top, right, bottom], defining the region of the
+     *          screen to magnify. The values are in screen (unmagnified)
+     *          coordinate space.
+     */
+    setRoi: function(roi) {
+        let roiObject = { x: roi[0], y: roi[1], width: roi[2] - roi[0], height: roi[3] - roi[1] };
+        this._zoomRegion.setROI(roiObject);
+    },
+
+    /**
+     * getRoi:
+     * Retrieves the "region of interest" -- the rectangular bounds of that part
+     * of the desktop that the magnified view is showing (x, y, width, height).
+     * The bounds are given in non-magnified coordinates.
+     * @return  an array, [left, top, right, bottom], representing the bounding
+     *          rectangle of what is shown in the magnified view.
+     */
+    getRoi: function() {
+        let roi = this._zoomRegion.getROI();
+        roi[2] += roi[0];
+        roi[3] += roi[1];
+        return roi;
+    },
+
+    /**
+     * Set the "region of interest" by centering the given screen coordinate
+     * within the zoom region.
+     * @x       The x-coord of the point to place at the center of the zoom region.
+     * @y       The y-coord.
+     * @return  Whether the shift was successful (for GS-mag, this is always
+     *          true).
+     */
+    shiftContentsTo: function(x, y) {
+        this._zoomRegion.scrollContentsTo(x, y);
+        return true;
+    },
+
+    /**
+     * moveResize
+     * Sets the position and size of the ZoomRegion on screen.
+     * @viewPort    Array, [left, top, right, bottom], defining the position and
+     *              size on screen to place the zoom region.
+     */
+    moveResize: function(viewPort) {
+        let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
+        this._zoomRegion.setViewPort(viewRect);
+    }
+};
+
+DBus.conformExport(ShellMagnifier.prototype, MagnifierIface);
+DBus.conformExport(ShellMagnifierZoomRegion.prototype, ZoomRegionIface);

js/ui/main.js

@@ -1,18 +1,29 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
+imports.gi.versions.Clutter = '1.0';
+imports.gi.versions.Gio = '2.0';
+imports.gi.versions.Gdk = '3.0';
+imports.gi.versions.GdkPixbuf = '2.0';
+imports.gi.versions.Gtk = '3.0';
+
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const GConf = imports.gi.GConf;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
 
 const Chrome = imports.ui.chrome;
+const CtrlAltTab = imports.ui.ctrlAltTab;
+const EndSessionDialog = imports.ui.endSessionDialog;
+const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
 const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
 const MessageTray = imports.ui.messageTray;
@@ -23,37 +34,50 @@ const RunDialog = imports.ui.runDialog;
 const LookingGlass = imports.ui.lookingGlass;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
+const Scripting = imports.ui.scripting;
 const ShellDBus = imports.ui.shellDBus;
-const Sidebar = imports.ui.sidebar;
+const TelepathyClient = imports.ui.telepathyClient;
 const WindowManager = imports.ui.windowManager;
+const Magnifier = imports.ui.magnifier;
+const XdndHandler = imports.ui.xdndHandler;
+const StatusIconDispatcher = imports.ui.statusIconDispatcher;
+const Util = imports.misc.util;
 
 const DEFAULT_BACKGROUND_COLOR = new Clutter.Color();
 DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);
 
 let chrome = null;
 let panel = null;
-let sidebar = null;
+let hotCorners = [];
 let placesManager = null;
 let overview = null;
 let runDialog = null;
 let lookingGlass = null;
 let wm = null;
-let notificationDaemon = null;
 let messageTray = null;
+let notificationDaemon = null;
 let windowAttentionHandler = null;
+let telepathyClient = null;
+let ctrlAltTabManager = null;
 let recorder = null;
 let shellDBusService = null;
 let modalCount = 0;
 let modalActorFocusStack = [];
+let uiGroup = null;
+let magnifier = null;
+let xdndHandler = null;
+let statusIconDispatcher = null;
 let _errorLogStack = [];
 let _startDate;
+let _defaultCssStylesheet = null;
+let _cssStylesheet = null;
 
 let background = null;
 
 function start() {
-    // Add a binding for "global" in the global JS namespace; (gjs
+    // Add a binding for 'global' in the global JS namespace; (gjs
     // keeps the web browser convention of having that namespace be
-    // called "window".)
+    // called 'window'.)
     window.global = Shell.Global.get();
 
     // Now monkey patch utility functions into the global proxy;
@@ -62,9 +86,11 @@ function start() {
     global.logError = _logError;
     global.log = _logDebug;
 
-    Gio.DesktopAppInfo.set_desktop_env("GNOME");
+    // Chain up async errors reported from C
+    global.connect('notify-error', function (global, msg, detail) { notifyError(msg, detail); });
+
+    Gio.DesktopAppInfo.set_desktop_env('GNOME');
 
-    global.grab_dbus_service();
     shellDBusService = new ShellDBus.GnomeShell();
     // Force a connection now; dbus.js will do this internally
     // if we use its name acquisition stuff but we aren't right
@@ -72,6 +98,10 @@ function start() {
     // back into sync ones.
     DBus.session.flush();
 
+    // Load the calendar server. Note that we are careful about
+    // not loading any events until the user presses the clock
+    global.launch_calendar_server();
+
     Environment.init();
 
     // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
@@ -85,38 +115,53 @@ function start() {
     Shell.WindowTracker.get_default();
     Shell.AppUsage.get_default();
 
-    // The background color really only matters if there is no desktop
-    // window (say, nautilus) running. We set it mostly so things look good
-    // when we are running inside Xephyr.
+    // The stage is always covered so Clutter doesn't need to clear it; however
+    // the color is used as the default contents for the Mutter root background
+    // actor so set it anyways.
     global.stage.color = DEFAULT_BACKGROUND_COLOR;
+    global.stage.no_clear_hint = true;
 
-    let themeContext = St.ThemeContext.get_for_stage (global.stage);
-    let stylesheetPath = global.datadir + "/theme/gnome-shell.css";
-    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
-    themeContext.set_theme (theme);
+    _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
+    loadTheme();
 
     let shellwm = global.window_manager;
-    shellwm.takeover_keybinding("panel_main_menu");
-    shellwm.connect("keybinding::panel_main_menu", function () {
+    shellwm.takeover_keybinding('panel_main_menu');
+    shellwm.connect('keybinding::panel_main_menu', function () {
         overview.toggle();
     });
-    shellwm.takeover_keybinding("panel_run_dialog");
-    shellwm.connect("keybinding::panel_run_dialog", function () {
+    shellwm.takeover_keybinding('panel_run_dialog');
+    shellwm.connect('keybinding::panel_run_dialog', function () {
        getRunDialog().open();
     });
 
+    // Set up stage hierarchy to group all UI actors under one container.
+    uiGroup = new Clutter.Group();
+    St.set_ui_root(global.stage, uiGroup);
+    global.window_group.reparent(uiGroup);
+    global.overlay_group.reparent(uiGroup);
+    global.stage.add_actor(uiGroup);
+
     placesManager = new PlaceDisplay.PlacesManager();
+    xdndHandler = new XdndHandler.XdndHandler();
+    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
     overview = new Overview.Overview();
     chrome = new Chrome.Chrome();
+    magnifier = new Magnifier.Magnifier();
+    statusIconDispatcher = new StatusIconDispatcher.StatusIconDispatcher();
     panel = new Panel.Panel();
-    sidebar = new Sidebar.Sidebar();
     wm = new WindowManager.WindowManager();
+    messageTray = new MessageTray.MessageTray();
     notificationDaemon = new NotificationDaemon.NotificationDaemon();
     windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
-    messageTray = new MessageTray.MessageTray();
+    telepathyClient = new TelepathyClient.Client();
+
+    overview.init();
+    statusIconDispatcher.start(messageTray.actor);
 
     _startDate = new Date();
 
+    let recorderSettings = new Gio.Settings({ schema: 'org.gnome.shell.recorder' });
+
     global.screen.connect('toggle-recording', function() {
         if (recorder == null) {
             recorder = new Shell.Recorder({ stage: global.stage });
@@ -125,11 +170,11 @@ function start() {
         if (recorder.is_recording()) {
             recorder.pause();
         } else {
-            //read the parameters from GConf always in case they have changed
-            let gconf = Shell.GConf.get_default();
-            recorder.set_framerate(gconf.get_int("recorder/framerate"));
-            recorder.set_filename("shell-%d%u-%c." + gconf.get_string("recorder/file_extension"));
-            let pipeline = gconf.get_string("recorder/pipeline");
+            // read the parameters from GSettings always in case they have changed
+            recorder.set_framerate(recorderSettings.get_int('framerate'));
+            recorder.set_filename('shell-%d%u-%c.' + recorderSettings.get_string('file-extension'));
+            let pipeline = recorderSettings.get_string('pipeline');
+
             if (!pipeline.match(/^\s*$/))
                 recorder.set_pipeline(pipeline);
             else
@@ -139,15 +184,24 @@ function start() {
         }
     });
 
-    background = global.create_root_pixmap_actor();
-    global.stage.add_actor(background);
-    background.lower_bottom();
+    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT, false, -1, 1);
 
-    global.connect('screen-size-changed', _relayout);
+    // Provide the bus object for gnome-session to
+    // initiate logouts.
+    EndSessionDialog.init();
+
+    // Attempt to become a PolicyKit authentication agent
+    PolkitAuthenticationAgent.init()
+
+    global.screen.connect('monitors-changed', _relayout);
 
     ExtensionSystem.init();
     ExtensionSystem.loadExtensions();
 
+    // Perform initial relayout here
+    _relayout();
+
+    panel.startStatusArea();
     panel.startupAnimation();
 
     let display = global.screen.get_display();
@@ -158,7 +212,230 @@ function start() {
     _log('info', 'loaded at ' + _startDate);
     log('GNOME Shell started at ' + _startDate);
 
-    Mainloop.idle_add(_removeUnusedWorkspaces);
+    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
+    if (perfModuleName) {
+        let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
+        let module = eval('imports.perf.' + perfModuleName + ';');
+        Scripting.runPerfScript(module, perfOutput);
+    }
+
+    global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
+
+    global.screen.connect('window-entered-monitor', _windowEnteredMonitor);
+    global.screen.connect('window-left-monitor', _windowLeftMonitor);
+
+    _nWorkspacesChanged();
+}
+
+let _workspaces = [];
+let _checkWorkspacesId = 0;
+
+/*
+ * When the last window closed on a workspace is a dialog or splash
+ * screen, we assume that it might be an initial window shown before
+ * the main window of an application, and give the app a grace period
+ * where it can map another window before we remove the workspace.
+ */
+const LAST_WINDOW_GRACE_TIME = 1000;
+
+function _checkWorkspaces() {
+    let i;
+    let emptyWorkspaces = [];
+
+    for (i = 0; i < _workspaces.length; i++) {
+        let lastRemoved = _workspaces[i]._lastRemovedWindow;
+        if (lastRemoved &&
+            (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+             lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
+             lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG))
+                emptyWorkspaces[i] = false;
+        else
+            emptyWorkspaces[i] = true;
+    }
+
+    let windows = global.get_window_actors();
+    for (i = 0; i < windows.length; i++) {
+        let win = windows[i];
+
+        if (win.get_meta_window().is_on_all_workspaces())
+            continue;
+
+        let workspaceIndex = win.get_workspace();
+        emptyWorkspaces[workspaceIndex] = false;
+    }
+
+    // If we don't have an empty workspace at the end, add one
+    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
+        global.screen.append_new_workspace(false, global.get_current_time());
+        emptyWorkspaces.push(false);
+    }
+
+    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+    let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
+                                    activeWorkspaceIndex < emptyWorkspaces.length - 1);
+    // Don't enter the overview when removing multiple empty workspaces at startup
+    let showOverview  = (removingCurrentWorkspace &&
+                         !emptyWorkspaces.every(function(x) { return x; }));
+
+    if (removingCurrentWorkspace) {
+        // "Merge" the empty workspace we are removing with the one at the end
+        wm.blockAnimations();
+    }
+
+    // Delete other empty workspaces; do it from the end to avoid index changes
+    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
+        if (emptyWorkspaces[i])
+            global.screen.remove_workspace(_workspaces[i], global.get_current_time());
+    }
+
+    if (removingCurrentWorkspace) {
+        global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
+        wm.unblockAnimations();
+
+        if (!overview.visible && showOverview)
+            overview.show();
+    }
+
+    _checkWorkspacesId = 0;
+    return false;
+}
+
+function _windowRemoved(workspace, window) {
+    workspace._lastRemovedWindow = window;
+    _queueCheckWorkspaces();
+    Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, function() {
+        if (workspace._lastRemovedWindow == window) {
+            workspace._lastRemovedWindow = null;
+            _queueCheckWorkspaces();
+        }
+    });
+}
+
+function _windowLeftMonitor(metaScreen, monitorIndex, metaWin) {
+    // If the window left the primary monitor, that
+    // might make that workspace empty
+    if (monitorIndex == global.get_primary_monitor_index())
+        _queueCheckWorkspaces();
+}
+
+function _windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
+    // If the window entered the primary monitor, that
+    // might make that workspace non-empty
+    if (monitorIndex == global.get_primary_monitor_index())
+        _queueCheckWorkspaces();
+}
+
+function _queueCheckWorkspaces() {
+    if (_checkWorkspacesId == 0)
+        _checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, _checkWorkspaces);
+}
+
+function _nWorkspacesChanged() {
+    let oldNumWorkspaces = _workspaces.length;
+    let newNumWorkspaces = global.screen.n_workspaces;
+
+    if (oldNumWorkspaces == newNumWorkspaces)
+        return false;
+
+    let lostWorkspaces = [];
+    if (newNumWorkspaces > oldNumWorkspaces) {
+        let w;
+
+        // Assume workspaces are only added at the end
+        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
+            _workspaces[w] = global.screen.get_workspace_by_index(w);
+
+        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
+            let workspace = _workspaces[w];
+            workspace._windowAddedId = workspace.connect('window-added', _queueCheckWorkspaces);
+            workspace._windowRemovedId = workspace.connect('window-removed', _windowRemoved);
+        }
+
+    } else {
+        // Assume workspaces are only removed sequentially
+        // (e.g. 2,3,4 - not 2,4,7)
+        let removedIndex;
+        let removedNum = oldNumWorkspaces - newNumWorkspaces;
+        for (let w = 0; w < oldNumWorkspaces; w++) {
+            let workspace = global.screen.get_workspace_by_index(w);
+            if (_workspaces[w] != workspace) {
+                removedIndex = w;
+                break;
+            }
+        }
+
+        let lostWorkspaces = _workspaces.splice(removedIndex, removedNum);
+        lostWorkspaces.forEach(function(workspace) {
+                                   workspace.disconnect(workspace._windowAddedId);
+                                   workspace.disconnect(workspace._windowRemovedId);
+                               });
+    }
+
+    _queueCheckWorkspaces();
+
+    return false;
+}
+
+/**
+ * getThemeStylesheet:
+ *
+ * Get the theme CSS file that the shell will load
+ *
+ * Returns: A file path that contains the theme CSS,
+ *          null if using the default
+ */
+function getThemeStylesheet()
+{
+    return _cssStylesheet;
+}
+
+/**
+ * setThemeStylesheet:
+ * @cssStylesheet: A file path that contains the theme CSS,
+ *                  set it to null to use the default
+ *
+ * Set the theme CSS file that the shell will load
+ */
+function setThemeStylesheet(cssStylesheet)
+{
+    _cssStylesheet = cssStylesheet;
+}
+
+/**
+ * loadTheme:
+ *
+ * Reloads the theme CSS file
+ */
+function loadTheme() {
+    let themeContext = St.ThemeContext.get_for_stage (global.stage);
+
+    let cssStylesheet = _defaultCssStylesheet;
+    if (_cssStylesheet != null)
+        cssStylesheet = _cssStylesheet;
+
+    let theme = new St.Theme ({ application_stylesheet: cssStylesheet });
+    themeContext.set_theme (theme);
+}
+
+/**
+ * notifyError:
+ * @msg: An error message
+ * @details: Additional information
+ *
+ * See shell_global_notify_problem().
+ */
+function notifyError(msg, details) {
+    // Also print to stderr so it's logged somewhere
+    if (details)
+        log("error: " + msg + ": " + details);
+    else
+        log("error: " + msg)
+
+    let source = new MessageTray.SystemNotificationSource();
+    messageTray.add(source);
+    let notification = new MessageTray.Notification(source, msg, details);
+    notification.setTransient(true);
+    source.notify(notification);
 }
 
 /**
@@ -179,7 +456,7 @@ function _log(category, msg) {
         for (let i = 2; i < arguments.length; i++) {
             text += JSON.stringify(arguments[i]);
             if (i < arguments.length - 1)
-                text += " ";
+                text += ' ';
         }
     }
     _errorLogStack.push({timestamp: new Date().getTime(),
@@ -203,47 +480,90 @@ function _getAndClearErrorStack() {
 }
 
 function _relayout() {
-    let primary = global.get_primary_monitor();
-    panel.actor.set_position(primary.x, primary.y);
-    panel.actor.set_size(primary.width, Panel.PANEL_HEIGHT);
-    overview.relayout();
+    let monitors = global.get_monitors();
+    // destroy old corners
+    for (let i = 0; i < hotCorners.length; i++)
+        hotCorners[i].destroy();
+    hotCorners = [];
 
-    background.set_size(global.screen_width, global.screen_height);
+
+    let primary = global.get_primary_monitor();
+    for (let i = 0; i < monitors.length; i++) {
+        let monitor = monitors[i];
+        let isPrimary = (monitor.x == primary.x &&
+                         monitor.y == primary.y &&
+                         monitor.width == primary.width &&
+                         monitor.height == primary.height);
+
+        let cornerX = monitor.x;
+        let cornerY = monitor.y;
+        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+            cornerX += monitor.width;
+
+
+        let haveTopLeftCorner = true;
+
+        /* Check if we have a top left (right for RTL) corner.
+         * I.e. if there is no monitor directly above or to the left(right) */
+        let besideX;
+        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+            besideX = monitor.x + 1;
+        else
+            besideX = cornerX - 1;
+        let besideY = cornerY;
+        let aboveX = cornerX;
+        let aboveY = cornerY - 1;
+
+        for (let j = 0; j < monitors.length; j++) {
+            if (i == j)
+                continue;
+            let otherMonitor = monitors[j];
+            if (besideX >= otherMonitor.x &&
+                besideX < otherMonitor.x + otherMonitor.width &&
+                besideY >= otherMonitor.y &&
+                besideY < otherMonitor.y + otherMonitor.height) {
+                haveTopLeftCorner = false;
+                break;
+            }
+            if (aboveX >= otherMonitor.x &&
+                aboveX < otherMonitor.x + otherMonitor.width &&
+                aboveY >= otherMonitor.y &&
+                aboveY < otherMonitor.y + otherMonitor.height) {
+                haveTopLeftCorner = false;
+                break;
+            }
+        }
+
+        /* We only want hot corners where there is a natural top-left
+         * corner, and on the primary monitor */
+        if (!isPrimary && !haveTopLeftCorner)
+            continue;
+
+        let corner = new Panel.HotCorner(isPrimary ? panel.button : null);
+        hotCorners.push(corner);
+        corner.actor.set_position(cornerX, cornerY);
+        if (isPrimary)
+            panel.setHotCorner(corner);
+    }
+
+    panel.relayout();
+    overview.relayout();
 
     // To avoid updating the position and size of the workspaces
     // in the overview, we just hide the overview. The positions
-    // will be updated when it is next shown. We do the same for
-    // the calendar popdown.
+    // will be updated when it is next shown.
     overview.hide();
-    panel.hideCalendar();
 }
 
-// metacity-clutter currently uses the same prefs as plain metacity,
-// which probably means we'll be starting out with multiple workspaces;
-// remove any unused ones. (We do this from an idle handler, because
-// global.get_windows() still returns NULL at the point when start()
-// is called.)
-function _removeUnusedWorkspaces() {
+function isWindowActorDisplayedOnWorkspace(win, workspaceIndex) {
+    return win.get_workspace() == workspaceIndex ||
+        (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
+}
 
-    let windows = global.get_windows();
-    let maxWorkspace = 0;
-    for (let i = 0; i < windows.length; i++) {
-        let win = windows[i];
-
-        if (!win.get_meta_window().is_on_all_workspaces() &&
-            win.get_workspace() > maxWorkspace) {
-            maxWorkspace = win.get_workspace();
-        }
-    }
-    let screen = global.screen;
-    if (screen.n_workspaces > maxWorkspace) {
-        for (let w = screen.n_workspaces - 1; w > maxWorkspace; w--) {
-            let workspace = screen.get_workspace_by_index(w);
-            screen.remove_workspace(workspace, 0);
-        }
-    }
-
-    return false;
+function getWindowActorsForWorkspace(workspaceIndex) {
+    return global.get_window_actors().filter(function (win) {
+        return isWindowActorDisplayedOnWorkspace(win, workspaceIndex);
+    });
 }
 
 // This function encapsulates hacks to make certain global keybindings
@@ -251,64 +571,67 @@ function _removeUnusedWorkspaces() {
 // are disabled with a global grab. (When there is a global grab, then
 // all key events will be delivered to the stage, so ::captured-event
 // on the stage can be used for global keybindings.)
-//
-// We expect to need to conditionally enable just a few keybindings
-// depending on circumstance; the main hackiness here is that we are
-// assuming that keybindings have their default values; really we
-// should be asking Mutter to resolve the key into an action and then
-// base our handling based on the action.
 function _globalKeyPressHandler(actor, event) {
     if (modalCount == 0)
         return false;
+    if (event.type() != Clutter.EventType.KEY_PRESS)
+        return false;
 
-    let type = event.type();
+    let symbol = event.get_key_symbol();
+    let keyCode = event.get_key_code();
+    let modifierState = Shell.get_event_state(event);
 
-    if (type == Clutter.EventType.KEY_PRESS) {
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.Print) {
-            // We want to be able to take screenshots of the shell at all times
-            let gconf = Shell.GConf.get_default();
-            let command = gconf.get_string("/apps/metacity/keybinding_commands/command_screenshot");
-            if (command != null && command != "") {
-                let [ok, len, args] = GLib.shell_parse_argv(command);
-                let p = new Shell.Process({'args' : args});
-                p.run();
-            }
+    let display = global.screen.get_display();
+    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
+    let action = display.get_keybinding_action(keyCode, modifierState);
 
+    // The screenshot action should always be available (even if a
+    // modal dialog is present)
+    if (action == Meta.KeyBindingAction.COMMAND_SCREENSHOT) {
+        let gconf = GConf.Client.get_default();
+        let command = gconf.get_string('/apps/metacity/keybinding_commands/command_screenshot');
+        if (command != null && command != '')
+            Util.spawnCommandLine(command);
+        return true;
+    }
+
+    // Other bindings are only available when the overview is up and
+    // no modal dialog is present.
+    if (!overview.visible || modalCount > 1)
+        return false;
+
+    // This isn't a Meta.KeyBindingAction yet
+    if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
+        overview.hide();
+        return true;
+    }
+
+    switch (action) {
+        // left/right would effectively act as synonyms for up/down if we enabled them;
+        // but that could be considered confusing; we also disable them in the main view.
+        //
+        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
+        //     wm.actionMoveWorkspaceLeft();
+        //     return true;
+        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+        //     wm.actionMoveWorkspaceRight();
+        //     return true;
+        case Meta.KeyBindingAction.WORKSPACE_UP:
+            wm.actionMoveWorkspaceUp();
             return true;
-        }
-    } else if (type == Clutter.EventType.KEY_RELEASE) {
-        let symbol = event.get_key_symbol();
-        let keyCode = event.get_key_code();
-        let modifierState = Shell.get_event_state(event);
-        // Check the overview key first, this isn't a Meta.KeyBindingAction yet
-        if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
-            // The super key is the default for triggering the overview, and should
-            // get us out of the overview when we are already in it.
-            if (overview.visible)
-                overview.hide();
-
+        case Meta.KeyBindingAction.WORKSPACE_DOWN:
+            wm.actionMoveWorkspaceDown();
+            return true;
+        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
+        case Meta.KeyBindingAction.COMMAND_2:
+            getRunDialog().open();
+            return true;
+        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
+            overview.hide();
+            return true;
+        case Meta.KeyBindingAction.SWITCH_PANELS:
+            ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK);
             return true;
-        }
-
-        // Whitelist some of the Metacity actions
-        let display = global.screen.get_display();
-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-
-        // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
-        let action = display.get_keybinding_action(symbol, keyCode, modifierState);
-        switch (action) {
-            case Meta.KeyBindingAction.WORKSPACE_LEFT:
-                wm.actionMoveWorkspaceLeft();
-                return true;
-            case Meta.KeyBindingAction.WORKSPACE_RIGHT:
-                wm.actionMoveWorkspaceRight();
-                return true;
-            case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
-            case Meta.KeyBindingAction.COMMAND_2:
-                getRunDialog().open();
-                return true;
-        }
     }
 
     return false;
@@ -316,10 +639,8 @@ function _globalKeyPressHandler(actor, event) {
 
 function _findModal(actor) {
     for (let i = 0; i < modalActorFocusStack.length; i++) {
-        let [stackActor, stackFocus] = modalActorFocusStack[i];
-        if (stackActor == actor) {
+        if (modalActorFocusStack[i].actor == actor)
             return i;
-        }
     }
     return -1;
 }
@@ -327,22 +648,30 @@ function _findModal(actor) {
 /**
  * pushModal:
  * @actor: #ClutterActor which will be given keyboard focus
+ * @timestamp: optional timestamp
  *
  * Ensure we are in a mode where all keyboard and mouse input goes to
- * the stage.  Multiple calls to this function act in a stacking fashion;
- * the effect will be undone when an equal number of popModal() invocations
- * have been made.
+ * the stage, and focus @actor. Multiple calls to this function act in
+ * a stacking fashion; the effect will be undone when an equal number
+ * of popModal() invocations have been made.
  *
- * Next, record the current Clutter keyboard focus on a stack.  If the modal stack
- * returns to this actor, reset the focus to the actor which was focused
- * at the time pushModal() was invoked.
+ * Next, record the current Clutter keyboard focus on a stack. If the
+ * modal stack returns to this actor, reset the focus to the actor
+ * which was focused at the time pushModal() was invoked.
+ *
+ * @timestamp is optionally used to associate the call with a specific user
+ * initiated event.  If not provided then the value of
+ * global.get_current_time() is assumed.
  *
  * Returns: true iff we successfully acquired a grab or already had one
  */
-function pushModal(actor) {
+function pushModal(actor, timestamp) {
+    if (timestamp == undefined)
+        timestamp = global.get_current_time();
+
     if (modalCount == 0) {
-        if (!global.begin_modal(global.get_current_time())) {
-            log("pushModal: invocation of begin_modal failed");
+        if (!global.begin_modal(timestamp)) {
+            log('pushModal: invocation of begin_modal failed');
             return false;
         }
     }
@@ -350,51 +679,80 @@ function pushModal(actor) {
     global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
 
     modalCount += 1;
-    actor.connect('destroy', function() {
+    let actorDestroyId = actor.connect('destroy', function() {
         let index = _findModal(actor);
         if (index >= 0)
             modalActorFocusStack.splice(index, 1);
     });
     let curFocus = global.stage.get_key_focus();
+    let curFocusDestroyId;
     if (curFocus != null) {
-        curFocus.connect('destroy', function() {
+        curFocusDestroyId = curFocus.connect('destroy', function() {
             let index = _findModal(actor);
             if (index >= 0)
-                modalActorFocusStack[index][1] = null;
+                modalActorFocusStack[index].actor = null;
         });
     }
-    modalActorFocusStack.push([actor, curFocus]);
+    modalActorFocusStack.push({ actor: actor,
+                                focus: curFocus,
+                                destroyId: actorDestroyId,
+                                focusDestroyId: curFocusDestroyId });
 
+    global.stage.set_key_focus(actor);
     return true;
 }
 
 /**
  * popModal:
  * @actor: #ClutterActor passed to original invocation of pushModal().
+ * @timestamp: optional timestamp
  *
  * Reverse the effect of pushModal().  If this invocation is undoing
  * the topmost invocation, then the focus will be restored to the
  * previous focus at the time when pushModal() was invoked.
+ *
+ * @timestamp is optionally used to associate the call with a specific user
+ * initiated event.  If not provided then the value of
+ * global.get_current_time() is assumed.
  */
-function popModal(actor) {
-    modalCount -= 1;
+function popModal(actor, timestamp) {
+    if (timestamp == undefined)
+        timestamp = global.get_current_time();
+
     let focusIndex = _findModal(actor);
-    if (focusIndex >= 0) {
-        if (focusIndex == modalActorFocusStack.length - 1) {
-            let [stackActor, stackFocus] = modalActorFocusStack[focusIndex];
-            global.stage.set_key_focus(stackFocus);
-        } else {
-            // Remove from the middle, shift the focus chain up
-            for (let i = focusIndex; i < modalActorFocusStack.length - 1; i++) {
-                modalActorFocusStack[i + 1][1] = modalActorFocusStack[i][1];
-            }
-        }
-        modalActorFocusStack.splice(focusIndex, 1);
+    if (focusIndex < 0) {
+        global.stage.set_key_focus(null);
+        global.end_modal(timestamp);
+        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
+
+        throw new Error('incorrect pop');
     }
+
+    modalCount -= 1;
+
+    let record = modalActorFocusStack[focusIndex];
+    record.actor.disconnect(record.destroyId);
+
+    if (focusIndex == modalActorFocusStack.length - 1) {
+        if (record.focus)
+            record.focus.disconnect(record.focusDestroyId);
+        global.stage.set_key_focus(record.focus);
+    } else {
+        let t = modalActorFocusStack[modalActorFocusStack.length - 1];
+        if (t.focus)
+            t.focus.disconnect(t.focusDestroyId);
+        // Remove from the middle, shift the focus chain up
+        for (let i = modalActorFocusStack.length - 1; i > focusIndex; i--) {
+            modalActorFocusStack[i].focus = modalActorFocusStack[i - 1].focus;
+            modalActorFocusStack[i].focusDestroyId = modalActorFocusStack[i - 1].focusDestroyId;
+        }
+    }
+    modalActorFocusStack.splice(focusIndex, 1);
+
     if (modalCount > 0)
         return;
 
-    global.end_modal(global.get_current_time());
+    global.end_modal(timestamp);
     global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
 }
 
@@ -485,7 +843,7 @@ function _queueBeforeRedraw(workId) {
         Meta.later_add(Meta.LaterType.BEFORE_REDRAW, function () {
             _runBeforeRedrawQueue();
             return false;
-        }, null);
+        });
     }
 }
 
@@ -509,7 +867,7 @@ function _queueBeforeRedraw(workId) {
  */
 function initializeDeferredWork(actor, callback, props) {
     // Turn into a string so we can use as an object property
-    let workId = "" + (++_deferredWorkSequence);
+    let workId = '' + (++_deferredWorkSequence);
     _deferredWorkData[workId] = { 'actor': actor,
                                   'callback': callback };
     actor.connect('notify::mapped', function () {
@@ -539,7 +897,7 @@ function initializeDeferredWork(actor, callback, props) {
 function queueDeferredWork(workId) {
     let data = _deferredWorkData[workId];
     if (!data) {
-        global.logError("invalid work id ", workId);
+        global.logError('invalid work id ', workId);
         return;
     }
     if (_deferredWorkQueue.indexOf(workId) < 0)

js/ui/modalDialog.js

@@ -0,0 +1,278 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const Params = imports.misc.params;
+
+const Lightbox = imports.ui.lightbox;
+const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;
+
+const OPEN_AND_CLOSE_TIME = 0.1;
+const FADE_OUT_DIALOG_TIME = 1.0;
+
+const State = {
+    OPENED: 0,
+    CLOSED: 1,
+    OPENING: 2,
+    CLOSING: 3,
+    FADED_OUT: 4
+};
+
+function ModalDialog() {
+    this._init();
+}
+
+ModalDialog.prototype = {
+    _init: function(params) {
+        params = Params.parse(params, { styleClass: null });
+
+        this.state = State.CLOSED;
+        this._hasModal = false;
+
+        this._group = new St.Group({ visible: false,
+                                     x: 0,
+                                     y: 0 });
+        Main.uiGroup.add_actor(this._group);
+
+        let constraint = new Clutter.BindConstraint({ source: global.stage,
+                                                      coordinate: Clutter.BindCoordinate.POSITION | Clutter.BindCoordinate.SIZE });
+        this._group.add_constraint(constraint);
+
+        this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));
+
+        this._actionKeys = {};
+        this._group.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
+
+        this._lightbox = new Lightbox.Lightbox(this._group,
+                                               { inhibitEvents: true });
+
+        this._backgroundBin = new St.Bin();
+
+        this._group.add_actor(this._backgroundBin);
+        this._lightbox.highlight(this._backgroundBin);
+
+        this._backgroundStack = new Shell.Stack();
+        this._backgroundBin.child = this._backgroundStack;
+
+        this._eventBlocker = new Clutter.Group({ reactive: true });
+        this._backgroundStack.add_actor(this._eventBlocker);
+
+        this._dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
+                                                vertical:    true });
+        if (params.styleClass != null) {
+            this._dialogLayout.add_style_class_name(params.styleClass);
+        }
+        this._backgroundStack.add_actor(this._dialogLayout);
+
+        this.contentLayout = new St.BoxLayout({ vertical: true });
+        this._dialogLayout.add(this.contentLayout,
+                               { x_fill:  true,
+                                 y_fill:  true,
+                                 x_align: St.Align.MIDDLE,
+                                 y_align: St.Align.START });
+
+        this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
+                                                opacity:     220,
+                                                vertical:    false });
+        this._dialogLayout.add(this._buttonLayout,
+                               { expand:  true,
+                                 x_align: St.Align.MIDDLE,
+                                 y_align: St.Align.END });
+
+        global.focus_manager.add_group(this._dialogLayout);
+        this._initialKeyFocus = this._dialogLayout;
+        this._savedKeyFocus = null;
+    },
+
+    setButtons: function(buttons) {
+        this._buttonLayout.destroy_children();
+        this._actionKeys = {};
+
+        let i = 0;
+        for (let index in buttons) {
+            let buttonInfo = buttons[index];
+            let label = buttonInfo['label'];
+            let action = buttonInfo['action'];
+            let key = buttonInfo['key'];
+
+            let button = new St.Button({ style_class: 'modal-dialog-button',
+                                         reactive:    true,
+                                         can_focus:   true,
+                                         label:       label });
+
+            let x_alignment;
+            if (buttons.length == 1)
+                x_alignment = St.Align.END;
+            else if (i == 0)
+                x_alignment = St.Align.START;
+            else if (i == buttons.length - 1)
+                x_alignment = St.Align.END;
+            else
+                x_alignment = St.Align.MIDDLE;
+
+            this._initialKeyFocus = button;
+            this._buttonLayout.add(button,
+                                   { expand: true,
+                                     x_fill: false,
+                                     y_fill: false,
+                                     x_align: x_alignment,
+                                     y_align: St.Align.MIDDLE });
+
+            button.connect('clicked', action);
+
+            if (key)
+                this._actionKeys[key] = action;
+            i++;
+        }
+    },
+
+    _onKeyPressEvent: function(object, keyPressEvent) {
+        let symbol = keyPressEvent.get_key_symbol();
+        let action = this._actionKeys[symbol];
+
+        if (action)
+            action();
+    },
+
+    _onGroupDestroy: function() {
+        this.emit('destroy');
+    },
+
+    _fadeOpen: function() {
+        let monitor = global.get_focus_monitor();
+
+        this._backgroundBin.set_position(monitor.x, monitor.y);
+        this._backgroundBin.set_size(monitor.width, monitor.height);
+
+        this.state = State.OPENING;
+
+        this._dialogLayout.opacity = 255;
+        this._lightbox.show();
+        this._group.opacity = 0;
+        this._group.show();
+        Tweener.addTween(this._group,
+                         { opacity: 255,
+                           time: OPEN_AND_CLOSE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.state = State.OPENED;
+                                   this.emit('opened');
+                               })
+                         });
+    },
+
+    setInitialKeyFocus: function(actor) {
+        this._initialKeyFocus = actor;
+    },
+
+    open: function(timestamp) {
+        if (this.state == State.OPENED || this.state == State.OPENING)
+            return true;
+
+        if (!this.pushModal(timestamp))
+            return false;
+
+        this._fadeOpen();
+        return true;
+    },
+
+    close: function(timestamp) {
+        if (this.state == State.CLOSED || this.state == State.CLOSING)
+            return;
+
+        this.state = State.CLOSING;
+        this.popModal(timestamp);
+        this._savedKeyFocus = null;
+
+        Tweener.addTween(this._group,
+                         { opacity: 0,
+                           time: OPEN_AND_CLOSE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.state = State.CLOSED;
+                                   this._group.hide();
+                               })
+                         });
+    },
+
+    // Drop modal status without closing the dialog; this makes the
+    // dialog insensitive as well, so it needs to be followed shortly
+    // by either a close() or a pushModal()
+    popModal: function(timestamp) {
+        if (!this._hasModal)
+            return;
+
+        let focus = global.stage.key_focus;
+        if (focus && this._group.contains(focus))
+            this._savedKeyFocus = focus;
+        else
+            this._savedKeyFocus = null;
+        Main.popModal(this._group, timestamp);
+        global.gdk_screen.get_display().sync();
+        this._hasModal = false;
+
+        this._eventBlocker.raise_top();
+    },
+
+    pushModal: function (timestamp) {
+        if (this._hasModal)
+            return true;
+        if (!Main.pushModal(this._group, timestamp))
+            return false;
+
+        this._hasModal = true;
+        if (this._savedKeyFocus) {
+            this._savedKeyFocus.grab_key_focus();
+            this._savedKeyFocus = null;
+        } else
+            this._initialKeyFocus.grab_key_focus();
+
+        this._eventBlocker.lower_bottom();
+        return true;
+    },
+
+    // This method is like close, but fades the dialog out much slower,
+    // and leaves the lightbox in place. Once in the faded out state,
+    // the dialog can be brought back by an open call, or the lightbox
+    // can be dismissed by a close call.
+    //
+    // The main point of this method is to give some indication to the user
+    // that the dialog reponse has been acknowledged but will take a few
+    // moments before being processed.
+    // e.g., if a user clicked "Log Out" then the dialog should go away
+    // imediately, but the lightbox should remain until the logout is
+    // complete.
+    _fadeOutDialog: function(timestamp) {
+        if (this.state == State.CLOSED || this.state == State.CLOSING)
+            return;
+
+        if (this.state == State.FADED_OUT)
+            return;
+
+        this.popModal(timestamp);
+        Tweener.addTween(this._dialogLayout,
+                         { opacity: 0,
+                           time:    FADE_OUT_DIALOG_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.state = State.FADED_OUT;
+                               })
+                         });
+    }
+};
+Signals.addSignalMethods(ModalDialog.prototype);

js/ui/notificationDaemon.js

@@ -1,17 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
+const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Mainloop = imports.mainloop;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
 
+const Config = imports.misc.config;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
-
-const EMPATHY = 'Empathy';
+const Util = imports.misc.util;
 
 let nextNotificationId = 1;
 
@@ -75,13 +78,14 @@ const Urgency = {
 const rewriteRules = {
     'XChat': [
         { pattern:     /^XChat: Private message from: (\S*) \(.*\)$/,
-          replacement: '<$1>' },
+          replacement: '<$1>' },
         { pattern:     /^XChat: New public message from: (\S*) \((.*)\)$/,
-          replacement: '$2 &lt;$1&gt;' },
+          replacement: '$2 <$1>' },
         { pattern:     /^XChat: Highlighted message from: (\S*) \((.*)\)$/,
-          replacement: '$2 &lt;$1&gt;' }
+          replacement: '$2 <$1>' }
     ]
 };
+
 function NotificationDaemon() {
     this._init();
 }
@@ -90,17 +94,13 @@ NotificationDaemon.prototype = {
     _init: function() {
         DBus.session.exportObject('/org/freedesktop/Notifications', this);
 
-        this._everAcquiredName = false;
-        DBus.session.acquire_name('org.freedesktop.Notifications',
-                                  // We pass MANY_INSTANCES so that if
-                                  // notification-daemon is running, we'll
-                                  // get queued behind it and then get the
-                                  // name after killing it below
-                                  DBus.MANY_INSTANCES,
-                                  Lang.bind(this, this._acquiredName),
-                                  Lang.bind(this, this._lostName));
+        this._sources = {};
+        this._senderToPid = {};
+        this._notifications = {};
+        this._busProxy = new Bus();
 
-        this._currentNotifications = {};
+        Main.statusIconDispatcher.connect('message-icon-added', Lang.bind(this, this._onTrayIconAdded));
+        Main.statusIconDispatcher.connect('message-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
 
         Shell.WindowTracker.get_default().connect('notify::focus-app',
             Lang.bind(this, this._onFocusAppChanged));
@@ -108,96 +108,102 @@ NotificationDaemon.prototype = {
             Lang.bind(this, this._onFocusAppChanged));
     },
 
-    _acquiredName: function() {
-        this._everAcquiredName = true;
-    },
+    _iconForNotificationData: function(icon, hints, size) {
+        let textureCache = St.TextureCache.get_default();
 
-    _lostName: function() {
-        if (this._everAcquiredName)
-            log('Lost name org.freedesktop.Notifications!');
-        else if (GLib.getenv('GNOME_SHELL_NO_REPLACE'))
-            log('Failed to acquire org.freedesktop.Notifications');
-        else {
-            log('Failed to acquire org.freedesktop.Notifications; trying again');
-
-            // kill the notification-daemon. pkill is more portable
-            // than killall, but on Linux at least it won't match if
-            // you pass more than 15 characters of the process name...
-            // However, if you use the "-f" flag to match the entire
-            // command line, it will work, but we have to be careful
-            // in that case that we don't match "gedit
-            // notification-daemon.c" or whatever...
-            let p = new Shell.Process({ args: ['pkill', '-f',
-                                               '^([^ ]*/)?(notification-daemon|notify-osd)$']});
-            p.run();
+        if (icon) {
+            if (icon.substr(0, 7) == 'file://')
+                return textureCache.load_uri_async(icon, size, size);
+            else if (icon[0] == '/') {
+                let uri = GLib.filename_to_uri(icon, null);
+                return textureCache.load_uri_async(uri, size, size);
+            } else
+                return new St.Icon({ icon_name: icon,
+                                     icon_type: St.IconType.FULLCOLOR,
+                                     icon_size: size });
+        } else if (hints['image-data']) {
+            let [width, height, rowStride, hasAlpha,
+                 bitsPerSample, nChannels, data] = hints['image-data'];
+            return textureCache.load_from_raw(data, data.length, hasAlpha,
+                                              width, height, rowStride, size);
+        } else {
+            let stockIcon;
+            switch (hints.urgency) {
+                case Urgency.LOW:
+                case Urgency.NORMAL:
+                    stockIcon = 'gtk-dialog-info';
+                    break;
+                case Urgency.CRITICAL:
+                    stockIcon = 'gtk-dialog-error';
+                    break;
+            }
+            return new St.Icon({ icon_name: stockIcon,
+                                 icon_type: St.IconType.FULLCOLOR,
+                                 icon_size: size });
         }
     },
 
-    _sourceId: function(id) {
-        return 'source-' + id;
+    // Returns the source associated with ndata.notification if it is set.
+    // Otherwise, returns the source associated with the pid if one is
+    // stored in this._sources and the notification is not transient.
+    // Otherwise, creates a new source as long as pid is provided.
+    //
+    // Either a pid or ndata.notification is needed to retrieve or
+    // create a source.
+    _getSource: function(title, pid, ndata) {
+        if (!pid && !(ndata && ndata.notification))
+            return null;
+
+        // We use notification's source for the notifications we still have
+        // around that are getting replaced because we don't keep sources
+        // for transient notifications in this._sources, but we still want
+        // the notification associated with them to get replaced correctly.
+        if (ndata && ndata.notification)
+            return ndata.notification.source;
+
+        let isForTransientNotification = (ndata && ndata.hints['transient'] == true);
+
+        // We don't want to override a persistent notification
+        // with a transient one from the same sender, so we
+        // always create a new source object for new transient notifications
+        // and never add it to this._sources .
+        if (!isForTransientNotification && this._sources[pid])
+            return this._sources[pid];
+
+        let source = new Source(title, pid);
+        source.setTransient(isForTransientNotification);
+
+        if (!isForTransientNotification) {
+            this._sources[pid] = source;
+            source.connect('destroy', Lang.bind(this,
+                function() {
+                    delete this._sources[pid];
+                }));
+        }
+
+        Main.messageTray.add(source);
+        return source;
     },
 
     Notify: function(appName, replacesId, icon, summary, body,
                      actions, hints, timeout) {
-        let notification, id;
-        // We associate each application with a source and set the source id to be based on
-        // the appName. We support application updates by creating a new Notification object
-        // only if replacesId was not specified or if we no longer have the notification with
-        // the specified replacesId.
-        //
-        // We are planning to add Empathy-specific features in the message tray, but in the
-        // meantime we handle Empathy notifications received through the notification daemon
-        // differently from other notifications.
-        // 1) We display different people sending messages as different sources. So we use
-        //    notification id instead of the appName when creating id for the source.
-        // 2) We queue notification with different messages to show them one after another,
-        //    rather than replace the notification on the spot. So we create a new Notification
-        //    object each time, disregarding the fact that we might already have another
-        //    notification with the same replacesId.
-        // Empathy uses replacesId for all the notifications from the same window until the
-        // notification with that id is dismissed. Notifications from different people in
-        // different tabs have the same replacesId. So while being closer to the eventual design,
-        // our special-handling of Empathy notifications is somewhat buggy. The user might end up
-        // with multiple icons for the same person if the user dismisses the window for that person
-        // (which doesn't result in removing the icon) or the user might not get the icon for
-        // the person after a new notification in one of the tabs of the chat window for which
-        // another person's icon is already displayed.
+        let id;
 
-        let isEmpathy = appName == EMPATHY;
-        if (replacesId != 0) {
-            id = replacesId;
-            if (!isEmpathy)
-                notification = this._currentNotifications[id];
-        } else {
+        // Filter out chat and presence notifications from Empathy, since we
+        // handle that information from telepathyClient.js
+        if (appName == 'Empathy' && (hints['category'] == 'im.received' ||
+              hints['category'] == 'presence.online' ||
+              hints['category'] == 'presence.offline')) {
+            // Ignore replacesId since we already sent back a
+            // NotificationClosed for that id.
             id = nextNotificationId++;
+            Mainloop.idle_add(Lang.bind(this,
+                                        function () {
+                                            this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
+                                        }));
+            return id;
         }
 
-        let sourceId = this._sourceId(isEmpathy ? id : appName);
-        let source = Main.messageTray.getSource(sourceId);
-
-        // Source may be null if we have never received a notification from
-        // this app or if all notifications from this app have been acknowledged.
-        if (source == null) {
-            source = new Source(sourceId, icon, hints);
-            Main.messageTray.add(source);
-
-            source.connect('clicked', Lang.bind(this,
-                function() {
-                    source.destroy();
-                }));
-
-            let sender = DBus.getCurrentMessageContext().sender;
-            let busProxy = new Bus();
-            busProxy.GetConnectionUnixProcessIDRemote(sender, function (result, excp) {
-                let app = Shell.WindowTracker.get_default().get_app_from_pid(result);
-                source.setApp(app);
-            });
-        } else {
-            source.update(icon, hints);
-        }
-
-        summary = GLib.markup_escape_text(summary, -1);
-
         let rewrites = rewriteRules[appName];
         if (rewrites) {
             for (let i = 0; i < rewrites.length; i++) {
@@ -207,77 +213,192 @@ NotificationDaemon.prototype = {
             }
         }
 
-        if (notification == null) {
-            notification = new MessageTray.Notification(id, source, summary, body, true);
-            // This will result in us keeping only the latest Empathy notification with the given
-            // id in this._currentNotifications, which will only affect not being able to close all
-            // the Empathy notifications with a given id in CloseNotification(). Since this not a
-            // a likely scenario and this special-casing of Empathy in the notification daemon is
-            // temporary, it doesn't seem worthwhile to change this._currentNotifications to
-            // {id, [array of notifications]} just for that case.
-            this._currentNotifications[id] = notification;
-            notification.connect('dismissed', Lang.bind(this,
-                function(n) {
-                    n.destroy();
-                    this._emitNotificationClosed(n.id, NotificationClosedReason.DISMISSED);
-                }));
+        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
+
+        // Be compatible with the various hints for image data
+        // 'image-data' is the latest name of this hint, introduced in 1.2
+        if (!hints['image-data']) {
+            if (hints['image_data'])
+                hints['image-data'] = hints['image_data']; // version 1.1 of the spec
+            else if (hints['icon_data'])
+                hints['image-data'] = hints['icon_data']; // previous versions of the spec
+        }
+
+        let ndata = { appName: appName,
+                      icon: icon,
+                      summary: summary,
+                      body: body,
+                      actions: actions,
+                      hints: hints,
+                      timeout: timeout };
+        if (replacesId != 0 && this._notifications[replacesId]) {
+            ndata.id = id = replacesId;
+            ndata.notification = this._notifications[replacesId].notification;
         } else {
-            // passing in true as the last parameter will clear out extra actors,
-            // such as actions
-            notification.update(summary, body, true);
+            replacesId = 0;
+            ndata.id = id = nextNotificationId++;
+        }
+        this._notifications[id] = ndata;
+
+        let sender = DBus.getCurrentMessageContext().sender;
+        let pid = this._senderToPid[sender];
+
+        let source = this._getSource(appName, pid, ndata);
+
+        if (source) {
+            this._notifyForSource(source, ndata);
+            return id;
         }
 
-        if (actions.length) {
-            for (let i = 0; i < actions.length - 1; i += 2)
-                notification.addAction(actions[i], actions[i + 1]);
-            notification.connect('action-invoked', Lang.bind(this, this._actionInvoked, source, id));
+        if (replacesId) {
+            // There's already a pending call to GetConnectionUnixProcessID,
+            // which will see the new notification data when it finishes,
+            // so we don't have to do anything.
+            return id;
         }
 
-        source.notify(notification);
+        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this,
+            function (pid, ex) {
+                // The app may have updated or removed the notification
+                ndata = this._notifications[id];
+                if (!ndata)
+                    return;
+
+                source = this._getSource(appName, pid, ndata);
+
+                // We only store sender-pid entries for persistent sources.
+                // Removing the entries once the source is destroyed
+                // would result in the entries associated with transient
+                // sources removed once the notification is shown anyway.
+                // However, keeping these pairs would mean that we would
+                // possibly remove an entry associated with a persistent
+                // source when a transient source for the same sender is
+                // distroyed.
+                if (!source.isTransient) {
+                    this._senderToPid[sender] = pid;
+                    source.connect('destroy', Lang.bind(this,
+                        function() {
+                            delete this._senderToPid[sender];
+                        }));
+                }
+                this._notifyForSource(source, ndata);
+            }));
+
         return id;
     },
 
+    _notifyForSource: function(source, ndata) {
+        let [id, icon, summary, body, actions, hints, notification] =
+            [ndata.id, ndata.icon, ndata.summary, ndata.body,
+             ndata.actions, ndata.hints, ndata.notification];
+
+        let iconActor = this._iconForNotificationData(icon, hints, source.ICON_SIZE);
+
+        if (notification == null) {
+            notification = new MessageTray.Notification(source, summary, body,
+                                                        { icon: iconActor,
+                                                          bannerMarkup: true });
+            ndata.notification = notification;
+            notification.connect('destroy', Lang.bind(this,
+                function(n, reason) {
+                    delete this._notifications[id];
+                    let notificationClosedReason;
+                    switch (reason) {
+                        case MessageTray.NotificationDestroyedReason.EXPIRED:
+                            notificationClosedReason = NotificationClosedReason.EXPIRED;
+                            break;
+                        case MessageTray.NotificationDestroyedReason.DISMISSED:
+                            notificationClosedReason = NotificationClosedReason.DISMISSED;
+                            break;
+                        case MessageTray.NotificationDestroyedReason.SOURCE_CLOSED:
+                            notificationClosedReason = NotificationClosedReason.APP_CLOSED;
+                            break;
+                    }
+                    this._emitNotificationClosed(id, notificationClosedReason);
+                }));
+            notification.connect('action-invoked', Lang.bind(this,
+                function(n, actionId) {
+                    this._emitActionInvoked(id, actionId);
+                }));
+        } else {
+            notification.update(summary, body, { icon: iconActor,
+                                                 bannerMarkup: true,
+                                                 clear: true });
+        }
+
+        if (actions.length) {
+            notification.setUseActionIcons(hints['action-icons'] == true);
+            for (let i = 0; i < actions.length - 1; i += 2)
+                notification.addButton(actions[i], actions[i + 1]);
+        }
+        switch (hints.urgency) {
+            case Urgency.LOW:
+                notification.setUrgency(MessageTray.Urgency.LOW);
+                break;
+            case Urgency.NORMAL:
+                notification.setUrgency(MessageTray.Urgency.NORMAL);
+                break;
+            case Urgency.CRITICAL:
+                notification.setUrgency(MessageTray.Urgency.CRITICAL);
+                break;
+        }
+        notification.setResident(hints.resident == true);
+        // 'transient' is a reserved keyword in JS, so we have to retrieve the value
+        // of the 'transient' hint with hints['transient'] rather than hints.transient
+        notification.setTransient(hints['transient'] == true);
+
+        let sourceIconActor = source.useNotificationIcon ? this._iconForNotificationData(icon, hints, source.ICON_SIZE) : null;
+        source.processNotification(notification, sourceIconActor);
+    },
+
     CloseNotification: function(id) {
-        let notification = this._currentNotifications[id];
-        if (notification)
-            notification.destroy();
-        this._emitNotificationClosed(id, NotificationClosedReason.APP_CLOSED);
+        let ndata = this._notifications[id];
+        if (ndata) {
+            if (ndata.notification)
+                ndata.notification.destroy(MessageTray.NotificationDestroyedReason.SOURCE_CLOSED);
+            delete this._notifications[id];
+        }
     },
 
     GetCapabilities: function() {
         return [
             'actions',
+            'action-icons',
             'body',
             // 'body-hyperlinks',
             // 'body-images',
             'body-markup',
             // 'icon-multi',
-            'icon-static'
+            'icon-static',
+            'persistence',
             // 'sound',
         ];
     },
 
     GetServerInformation: function() {
         return [
-            'GNOME Shell',
+            Config.PACKAGE_NAME,
             'GNOME',
-            '0.1', // FIXME, get this from somewhere
-            '1.0'
+            Config.PACKAGE_VERSION,
+            '1.2'
         ];
     },
 
     _onFocusAppChanged: function() {
         let tracker = Shell.WindowTracker.get_default();
-        Main.messageTray.removeSourceByApp(tracker.focus_app);
-    },
+        if (!tracker.focus_app)
+            return;
 
-    _actionInvoked: function(notification, action, source, id) {
-        this._emitActionInvoked(id, action);
-        source.destroy();
+        for (let id in this._sources) {
+            let source = this._sources[id];
+            if (source.app == tracker.focus_app) {
+                source.destroyNonResidentNotifications();
+                return;
+            }
+        }
     },
 
     _emitNotificationClosed: function(id, reason) {
-        delete this._currentNotifications[id];
         DBus.session.emit_signal('/org/freedesktop/Notifications',
                                  'org.freedesktop.Notifications',
                                  'NotificationClosed', 'uu',
@@ -289,90 +410,151 @@ NotificationDaemon.prototype = {
                                  'org.freedesktop.Notifications',
                                  'ActionInvoked', 'us',
                                  [id, action]);
+    },
+
+    _onTrayIconAdded: function(o, icon) {
+        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null);
+        source.setTrayIcon(icon);
+    },
+
+    _onTrayIconRemoved: function(o, icon) {
+        let source = this._sources[icon.pid];
+        if (source)
+            source.destroy();
     }
 };
 
 DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
 
-function Source(sourceId, icon, hints) {
-    this._init(sourceId, icon, hints);
+function Source(title, pid) {
+    this._init(title, pid);
 }
 
 Source.prototype = {
     __proto__:  MessageTray.Source.prototype,
 
-    _init: function(sourceId, icon, hints) {
-        MessageTray.Source.prototype._init.call(this, sourceId);
+    _init: function(title, pid) {
+        MessageTray.Source.prototype._init.call(this, title);
 
-        this.app = null;
-        this._openAppRequested = false;
-
-        this.update(icon, hints);
+        this._pid = pid;
+        this._appStateChangedId = 0;
+        this._setApp();
+        if (this.app)
+            this.title = this.app.get_name();
+        else
+            this.useNotificationIcon = true;
+        this._trayIcon = null;
     },
 
-    update: function(icon, hints) {
-        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
+    processNotification: function(notification, icon) {
+        if (!this.app)
+            this._setApp();
+        if (!this.app && icon)
+            this._setSummaryIcon(icon);
 
-        this._icon = icon;
-        this._iconData = hints.icon_data;
-        this._urgency = hints.urgency;
+        let tracker = Shell.WindowTracker.get_default();
+        if (notification.resident && this.app && tracker.focus_app == this.app)
+            this.pushNotification(notification);
+        else
+            this.notify(notification);
     },
 
-    createIcon: function(size) {
-        let textureCache = St.TextureCache.get_default();
+    handleSummaryClick: function() {
+        if (!this._trayIcon)
+            return false;
 
-        if (this._icon) {
-            if (this._icon.substr(0, 7) == 'file://')
-                return textureCache.load_uri_async(this._icon, size, size);
-            else if (this._icon[0] == '/') {
-                let uri = GLib.filename_to_uri(this._icon, null);
-                return textureCache.load_uri_async(uri, size, size);
-            } else
-                return textureCache.load_icon_name(this._icon, size);
-        } else if (this._iconData) {
-            let [width, height, rowStride, hasAlpha,
-                 bitsPerSample, nChannels, data] = this._iconData;
-            return textureCache.load_from_raw(data, data.length, hasAlpha,
-                                              width, height, rowStride, size);
+        let event = Clutter.get_current_event();
+        if (event.type() != Clutter.EventType.BUTTON_RELEASE)
+            return false;
+
+        // Left clicks are passed through only where there aren't unacknowledged
+        // notifications, so it possible to open them in summary mode; right
+        // clicks are always forwarded, as the right click menu is not useful for
+        // tray icons
+        if (event.get_button() == 1 &&
+            this.notifications.length > 0)
+            return false;
+
+        if (Main.overview.visible) {
+            // We can't just connect to Main.overview's 'hidden' signal,
+            // because it's emitted *before* it calls popModal()...
+            let id = global.connect('notify::stage-input-mode', Lang.bind(this,
+                function () {
+                    global.disconnect(id);
+                    this._trayIcon.click(event);
+                }));
+            Main.overview.hide();
         } else {
-            let stockIcon;
-            switch (this._urgency) {
-                case Urgency.LOW:
-                case Urgency.NORMAL:
-                    stockIcon = 'gtk-dialog-info';
-                    break;
-                case Urgency.CRITICAL:
-                    stockIcon = 'gtk-dialog-error';
-                    break;
-            }
-            return textureCache.load_icon_name(stockIcon, size);
+            this._trayIcon.click(event);
+        }
+        return true;
+    },
+
+    _setApp: function() {
+        if (this.app)
+            return;
+
+        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this._pid);
+        if (!this.app)
+            return;
+
+        // We only update the app if this.app is null, so we can't disconnect the old this._appStateChangedId
+        // even if it were non-zero for some reason.
+        this._appStateChangedId = this.app.connect('notify::state', Lang.bind(this,  this._appStateChanged));
+
+        // Only override the icon if we were previously using
+        // notification-based icons (ie, not a trayicon) or if it was unset before
+        if (!this._trayIcon) {
+            this.useNotificationIcon = false;
+            this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE));
         }
     },
 
-    clicked: function() {
-        this.openApp();
-        MessageTray.Source.prototype.clicked.call(this);
+    setTrayIcon: function(icon) {
+        this._setSummaryIcon(icon);
+        this.useNotificationIcon = false;
+        this._trayIcon = icon;
     },
 
-    setApp: function(app) {
-        this.app = app;
-        if (this._openAppRequested)
-            this.openApp();
+    open: function(notification) {
+        this.destroyNonResidentNotifications();
+        this.openApp();
+    },
 
-        if (app.get_name() == EMPATHY)
-            this.handleReplacing = false;
+    _lastNotificationRemoved: function() {
+        if (!this._trayIcon)
+            this.destroy();
+    },
+
+    _appStateChanged: function() {
+        // Destroy notification sources when their apps exit.
+        // The app exiting would normally result in a tray icon being removed,
+        // so the associated source would be destroyed through the code path
+        // that handles the tray icon being removed. We should not destroy
+        // the source associated with a tray icon when the application state
+        // is Shell.AppState.STOPPED because running applications that have
+        // no open windows would also have that state. This is often the case
+        // for applications that use tray icons.
+        if (!this._trayIcon && this.app.get_state() == Shell.AppState.STOPPED)
+            this.destroy();
     },
 
     openApp: function() {
-        if (this.app == null) {
-            this._openAppRequested = true;
+        if (this.app == null)
             return;
-        }
+
         let windows = this.app.get_windows();
         if (windows.length > 0) {
             let mostRecentWindow = windows[0];
             Main.activateWindow(mostRecentWindow);
         }
-        this._openAppRequested = false;
+    },
+
+    destroy: function() {
+        if (this.app && this._appStateChangedId) {
+            this.app.disconnect(this._appStateChangedId);
+            this._appStateChangedId = 0;
+        }
+        MessageTray.Source.prototype.destroy.call(this);
     }
 };

js/ui/panelMenu.js

@@ -0,0 +1,126 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Gtk = imports.gi.Gtk;
+const St = imports.gi.St;
+
+const Lang = imports.lang;
+const PopupMenu = imports.ui.popupMenu;
+const Main = imports.ui.main;
+
+function Button(menuAlignment) {
+    this._init(menuAlignment);
+}
+
+Button.prototype = {
+    _init: function(menuAlignment) {
+        this.actor = new St.Bin({ style_class: 'panel-button',
+                                  reactive: true,
+                                  can_focus: true,
+                                  x_fill: true,
+                                  y_fill: false,
+                                  track_hover: true });
+        this.actor._delegate = this;
+        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
+        this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
+        this.menu = new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0);
+        this.menu.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
+        this.menu.actor.connect('key-press-event', Lang.bind(this, this._onMenuKeyPress));
+        Main.chrome.addActor(this.menu.actor, { visibleInOverview: true,
+                                                affectsStruts: false });
+        this.menu.actor.hide();
+    },
+
+    _onButtonPress: function(actor, event) {
+        if (!this.menu.isOpen) {
+            // Setting the max-height won't do any good if the minimum height of the
+            // menu is higher then the screen; it's useful if part of the menu is
+            // scrollable so the minimum height is smaller than the natural height
+            let monitor = global.get_primary_monitor();
+            this.menu.actor.style = ('max-height: ' +
+                                     Math.round(monitor.height - Main.panel.actor.height) +
+                                     'px;');
+        }
+        this.menu.toggle();
+    },
+
+    _onSourceKeyPress: function(actor, event) {
+        let symbol = event.get_key_symbol();
+        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
+            this.menu.toggle();
+            return true;
+        } else if (symbol == Clutter.KEY_Escape && this.menu.isOpen) {
+            this.menu.close();
+            return true;
+        } else if (symbol == Clutter.KEY_Down) {
+            if (!this.menu.isOpen)
+                this.menu.toggle();
+            this.menu.actor.navigate_focus(this.actor, Gtk.DirectionType.DOWN, false);
+            return true;
+        } else
+            return false;
+    },
+
+    _onMenuKeyPress: function(actor, event) {
+        let symbol = event.get_key_symbol();
+        if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
+            let focusManager = St.FocusManager.get_for_stage(global.stage);
+            let group = focusManager.get_group(this.actor);
+            if (group) {
+                let direction = (symbol == Clutter.KEY_Left) ? Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
+                group.navigate_focus(this.actor, direction, false);
+                return true;
+            }
+        }
+        return false;
+    },
+
+    _onOpenStateChanged: function(menu, open) {
+        if (open)
+            this.actor.add_style_pseudo_class('active');
+        else
+            this.actor.remove_style_pseudo_class('active');
+    }
+};
+
+/* SystemStatusButton:
+ *
+ * This class manages one System Status indicator (network, keyboard,
+ * volume, bluetooth...), which is just a PanelMenuButton with an
+ * icon and a tooltip
+ */
+function SystemStatusButton() {
+    this._init.apply(this, arguments);
+}
+
+SystemStatusButton.prototype = {
+    __proto__: Button.prototype,
+
+    _init: function(iconName,tooltipText) {
+        Button.prototype._init.call(this, 0.0);
+        this._iconActor = new St.Icon({ icon_name: iconName,
+                                        icon_type: St.IconType.SYMBOLIC,
+                                        style_class: 'system-status-icon' });
+        this.actor.set_child(this._iconActor);
+        this.setTooltip(tooltipText);
+    },
+
+    setIcon: function(iconName) {
+        this._iconActor.icon_name = iconName;
+    },
+
+    setGIcon: function(gicon) {
+        this._iconActor.gicon = gicon;
+    },
+
+    setTooltip: function(text) {
+        if (text != null) {
+            this.tooltip = text;
+            this.actor.has_tooltip = true;
+            this.actor.tooltip_text = text;
+        } else {
+            this.actor.has_tooltip = false;
+            this.tooltip = null;
+        }
+    }
+};

js/ui/placeDisplay.js

@@ -1,8 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Shell = imports.gi.Shell;
@@ -15,12 +12,9 @@ const _ = Gettext.gettext;
 
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
+const Params = imports.misc.params;
 const Search = imports.ui.search;
-
-const NAUTILUS_PREFS_DIR = '/apps/nautilus/preferences';
-const DESKTOP_IS_HOME_KEY = NAUTILUS_PREFS_DIR + '/desktop_is_home_dir';
-
-const PLACES_ICON_SIZE = 16;
+const Util = imports.misc.util;
 
 /**
  * Represents a place object, which is most normally a bookmark entry,
@@ -48,10 +42,14 @@ PlaceInfo.prototype = {
         for (let i = 0; i < terms.length; i++) {
             let term = terms[i];
             let idx = this._lowerName.indexOf(term);
-            if (idx == 0)
-                return Search.MatchType.PREFIX;
-            else if (idx > 0)
-                mtype = Search.MatchType.SUBSTRING;
+            if (idx == 0) {
+                mtype = Search.MatchType.PREFIX;
+            } else if (idx > 0) {
+                if (mtype == Search.MatchType.NONE)
+                    mtype = Search.MatchType.SUBSTRING;
+            } else {
+                return Search.MatchType.NONE;
+            }
         }
         return mtype;
     },
@@ -61,6 +59,21 @@ PlaceInfo.prototype = {
     }
 };
 
+// Helper function to translate launch parameters into a GAppLaunchContext
+function _makeLaunchContext(params)
+{
+    params = Params.parse(params, { workspace: null,
+                                    timestamp: null });
+
+    let launchContext = global.create_app_launch_context();
+    if (params.workspace != null)
+        launchContext.set_desktop(params.workspace.index());
+    if (params.timestamp != null)
+        launchContext.set_timestamp(params.timestamp);
+
+    return launchContext;
+}
+
 function PlaceDeviceInfo(mount) {
     this._init(mount);
 }
@@ -72,17 +85,17 @@ PlaceDeviceInfo.prototype = {
         this._mount = mount;
         this.name = mount.get_name();
         this._lowerName = this.name.toLowerCase();
-        this.id = "mount:" + mount.get_root().get_uri();
+        this.id = 'mount:' + mount.get_root().get_uri();
     },
 
     iconFactory: function(size) {
         let icon = this._mount.get_icon();
-        return St.TextureCache.get_default().load_gicon(icon, size);
+        return St.TextureCache.get_default().load_gicon(null, icon, size);
     },
 
-    launch: function() {
+    launch: function(params) {
         Gio.app_info_launch_default_for_uri(this._mount.get_root().get_uri(),
-                                            global.create_app_launch_context());
+                                            _makeLaunchContext(params));
     },
 
     isRemovable: function() {
@@ -93,35 +106,36 @@ PlaceDeviceInfo.prototype = {
         if (!this.isRemovable())
             return;
 
-        this._mount.unmount(0, null, Lang.bind(this, this._removeFinish));
+        if (this._mount.can_eject())
+            this._mount.eject(0, null, Lang.bind(this, this._removeFinish));
+        else
+            this._mount.unmount(0, null, Lang.bind(this, this._removeFinish));
     },
 
     _removeFinish: function(o, res, data) {
         try {
-            this._mount.unmount_finish(res);
+            if (this._mount.can_eject())
+                this._mount.eject_finish(res);
+            else
+                this._mount.unmount_finish(res);
         } catch (e) {
             let message = _("Failed to unmount '%s'").format(o.get_name());
-            Main.overview.infoBar.setMessage(message,
+            Main.overview.shellInfo.setMessage(message,
                                              Lang.bind(this, this.remove),
                                              _("Retry"));
         }
     }
 };
 
-
 function PlacesManager() {
     this._init();
 }
 
 PlacesManager.prototype = {
     _init: function() {
-        let gconf = Shell.GConf.get_default();
-        gconf.watch_directory(NAUTILUS_PREFS_DIR);
-
         this._defaultPlaces = [];
         this._mounts = [];
         this._bookmarks = [];
-        this._isDesktopHome = gconf.get_boolean(DESKTOP_IS_HOME_KEY);
 
         let homeFile = Gio.file_new_for_path (GLib.get_home_dir());
         let homeUri = homeFile.get_uri();
@@ -129,10 +143,10 @@ PlacesManager.prototype = {
         let homeIcon = Shell.util_get_icon_for_uri (homeUri);
         this._home = new PlaceInfo('special:home', homeLabel,
             function(size) {
-                return St.TextureCache.get_default().load_gicon(homeIcon, size);
+                return St.TextureCache.get_default().load_gicon(null, homeIcon, size);
             },
-            function() {
-                Gio.app_info_launch_default_for_uri(homeUri, global.create_app_launch_context());
+            function(params) {
+                Gio.app_info_launch_default_for_uri(homeUri, _makeLaunchContext(params));
             });
 
         let desktopPath = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
@@ -142,50 +156,28 @@ PlacesManager.prototype = {
         let desktopIcon = Shell.util_get_icon_for_uri (desktopUri);
         this._desktopMenu = new PlaceInfo('special:desktop', desktopLabel,
             function(size) {
-                return St.TextureCache.get_default().load_gicon(desktopIcon, size);
+                return St.TextureCache.get_default().load_gicon(null, desktopIcon, size);
             },
-            function() {
-                Gio.app_info_launch_default_for_uri(desktopUri, global.create_app_launch_context());
+            function(params) {
+                Gio.app_info_launch_default_for_uri(desktopUri, _makeLaunchContext(params));
             });
 
         this._connect = new PlaceInfo('special:connect', _("Connect to..."),
             function (size) {
-                return St.TextureCache.get_default().load_icon_name("applications-internet", size);
+                return new St.Icon({ icon_name: 'applications-internet',
+                                     icon_type: St.IconType.FULLCOLOR,
+                                     icon_size: size });
             },
-            function () {
-                new Shell.Process({ args: ['nautilus-connect-server'] }).run();
+            function (params) {
+                // BUG: nautilus-connect-server doesn't have a desktop file, so we can't
+                // launch it with the workspace from params. It's probably pretty rare
+                // and odd to drag this place onto a workspace in any case
+
+                Util.spawn(['nautilus-connect-server']);
             });
 
-        let networkApp = null;
-        try {
-            networkApp = Shell.AppSystem.get_default().load_from_desktop_file('gnome-network-scheme.desktop');
-        } catch(e) {
-            try {
-                networkApp = Shell.AppSystem.get_default().load_from_desktop_file('network-scheme.desktop');
-            } catch(e) {
-                log("Cannot create \"Network\" item, .desktop file not found or corrupt.");
-            }
-        }
-
-        if (networkApp != null) {
-            this._network = new PlaceInfo('special:network', networkApp.get_name(),
-                function(size) {
-                    return networkApp.create_icon_texture(size);
-                },
-                function () {
-                    networkApp.launch();
-                });
-        }
-
         this._defaultPlaces.push(this._home);
-
-        this._desktopMenuIndex = this._defaultPlaces.length;
-        if (!this._isDesktopHome)
-            this._defaultPlaces.push(this._desktopMenu);
-
-        if (this._network)
-            this._defaultPlaces.push(this._network);
-
+        this._defaultPlaces.push(this._desktopMenu);
         this._defaultPlaces.push(this._connect);
 
         /*
@@ -203,7 +195,7 @@ PlacesManager.prototype = {
         this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
         this._updateDevices();
 
-        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), ".gtk-bookmarks"]);
+        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']);
         this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
         let monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
         this._bookmarkTimeoutId = 0;
@@ -219,9 +211,6 @@ PlacesManager.prototype = {
         }));
 
         this._reloadBookmarks();
-
-        gconf.connect('changed::' + DESKTOP_IS_HOME_KEY, Lang.bind(this, this._updateDesktopMenuVisibility));
-
     },
 
     _updateDevices: function() {
@@ -317,10 +306,10 @@ PlacesManager.prototype = {
 
             let item = new PlaceInfo('bookmark:' + bookmark, label,
                 function(size) {
-                    return St.TextureCache.get_default().load_gicon(icon, size);
+                    return St.TextureCache.get_default().load_gicon(null, icon, size);
                 },
-                function() {
-                    Gio.app_info_launch_default_for_uri(bookmark, global.create_app_launch_context());
+                function(params) {
+                    Gio.app_info_launch_default_for_uri(bookmark, _makeLaunchContext(params));
                 });
             this._bookmarks.push(item);
         }
@@ -330,21 +319,6 @@ PlacesManager.prototype = {
         this.emit('places-updated');
     },
 
-    _updateDesktopMenuVisibility: function() {
-        let gconf = Shell.GConf.get_default();
-        this._isDesktopHome = gconf.get_boolean(DESKTOP_IS_HOME_KEY);
-
-        if (this._isDesktopHome)
-            this._removeById(this._defaultPlaces, "special:desktop");
-        else
-            this._defaultPlaces.splice(this._desktopMenuIndex, 0,
-                                       this._desktopMenu);
-
-        /* See comment in _updateDevices for explanation why there are two signals. */
-        this.emit('defaults-updated');
-        this.emit('places-updated');
-    },
-
     _addMount: function(mount) {
         let devItem = new PlaceDeviceInfo(mount);
         this._mounts.push(devItem);
@@ -392,182 +366,8 @@ PlacesManager.prototype = {
         sourceArray.splice(this._lookupIndexById(sourceArray, id), 1);
     }
 };
-
 Signals.addSignalMethods(PlacesManager.prototype);
 
-/**
- * An entry in the places menu.
- * @info The corresponding PlaceInfo to populate this entry.
- */
-function DashPlaceDisplayItem(info) {
-    this._init(info);
-}
-
-DashPlaceDisplayItem.prototype = {
-    _init: function(info) {
-        this.name = info.name;
-        this._info = info;
-        this._icon = info.iconFactory(PLACES_ICON_SIZE);
-
-        this.actor = new St.Clickable({ style_class: 'places-item',
-                                        reactive: true,
-                                        x_align: St.Align.START,
-                                        x_fill: true });
-
-        let box = new St.BoxLayout({ style_class: 'places-item-box' });
-        this.actor.set_child(box);
-
-        let bin = new St.Bin({ child: this._icon });
-        box.add(bin);
-
-        let text = new St.Label({ text: info.name });
-        box.add(text, { expand: true, x_fill: true });
-
-        if (info.isRemovable()) {
-            let removeIcon = St.TextureCache.get_default().load_icon_name ('media-eject', PLACES_ICON_SIZE);
-            let removeIconBox = new St.Clickable({ child: removeIcon,
-                                                   reactive: true });
-            box.add(removeIconBox);
-            removeIconBox.connect('clicked',
-                                  Lang.bind(this, function() {
-                                                  this._info.remove();
-                                            }));
-        }
-
-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-        this.actor.connect('notify::hover',
-                           Lang.bind(this, this._onHoverChanged));
-        this.actor.connect('button-press-event',
-                           Lang.bind(this, this._onButtonPress));
-        this.actor.connect('button-release-event',
-                           Lang.bind(this, this._onButtonRelease));
-
-        this.actor._delegate = this;
-        this._dragStartX = null;
-        this._dragStartY = null;
-        this._draggable = DND.makeDraggable(this.actor,
-                                            { manualMode: true });
-    },
-
-    _onClicked: function(b) {
-        this._info.launch();
-        Main.overview.hide();
-    },
-
-    _onButtonPress: function(actor, event) {
-        if (event.get_button() != 1)
-            return false;
-
-        let [stageX, stageY] = event.get_coords();
-        this._dragStartX = stageX;
-        this._dragStartY = stageY;
-        return false;
-    },
-
-    _onButtonRelease: function(actor, event) {
-        if (event.get_button() != 1)
-            return false;
-
-        this._dragStartX = null;
-        this._dragStartY = null;
-        return false;
-    },
-
-    _onHoverChanged: function(button) {
-        let hover = button.hover;
-        if (!hover) {
-            if (button.pressed && this._dragStartX != null) {
-                button.fake_release();
-                this._draggable.startDrag(this._dragStartX, this._dragStartY,
-                                          global.get_current_time());
-            }
-        }
-    },
-
-    getDragActorSource: function() {
-        return this._icon;
-    },
-
-    getDragActor: function(stageX, stageY) {
-        return this._info.iconFactory(PLACES_ICON_SIZE);
-    },
-
-    //// Drag and drop methods ////
-
-    shellWorkspaceLaunch: function() {
-        this._info.launch();
-    }
-};
-
-function DashPlaceDisplay() {
-    this._init();
-}
-
-DashPlaceDisplay.prototype = {
-    _init: function() {
-
-        // Places is divided semi-arbitrarily into left and right; a grid would
-        // look better in that there would be an even number of items left+right,
-        // but it seems like we want some sort of differentiation between actions
-        // like "Connect to server..." and regular folders
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   spacing: 4 });
-        this._leftBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL });
-        this.actor.append(this._leftBox, Big.BoxPackFlags.EXPAND);
-        this._rightBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL });
-        this.actor.append(this._rightBox, Big.BoxPackFlags.EXPAND);
-
-        // Subdivide left into actions and devices
-        this._actionsBox = new St.BoxLayout({ style_class: 'places-actions',
-                                               vertical: true });
-
-        this._devBox = new St.BoxLayout({ style_class: 'places-actions',
-                                           name: 'placesDevices',
-                                           vertical: true });
-
-        this._dirsBox = new St.BoxLayout({ style_class: 'places-actions',
-                                            vertical: true });
-
-        this._leftBox.append(this._actionsBox, Big.BoxPackFlags.NONE);
-        this._leftBox.append(this._devBox, Big.BoxPackFlags.NONE);
-
-        this._rightBox.append(this._dirsBox, Big.BoxPackFlags.NONE);
-
-        Main.placesManager.connect('defaults-updated', Lang.bind(this, this._updateDefaults));
-        Main.placesManager.connect('bookmarks-updated', Lang.bind(this, this._updateBookmarks));
-        Main.placesManager.connect('mounts-updated', Lang.bind(this, this._updateMounts));
-
-        this._updateDefaults();
-        this._updateMounts();
-        this._updateBookmarks();
-    },
-
-    _updateDefaults: function() {
-        this._actionsBox.destroy_children();
-
-        let places = Main.placesManager.getDefaultPlaces();
-        for (let i = 0; i < places.length; i++)
-            this._actionsBox.add(new DashPlaceDisplayItem(places[i]).actor);
-    },
-
-    _updateMounts: function() {
-        this._devBox.destroy_children();
-
-        let places = Main.placesManager.getMounts();
-        for (let i = 0; i < places.length; i++)
-            this._devBox.add(new DashPlaceDisplayItem(places[i]).actor);
-    },
-
-    _updateBookmarks: function() {
-        this._dirsBox.destroy_children();
-
-        let places = Main.placesManager.getBookmarks();
-        for (let i = 0; i < places.length; i ++)
-            this._dirsBox.add(new DashPlaceDisplayItem(places[i]).actor);
-    }
-};
-
-Signals.addSignalMethods(DashPlaceDisplay.prototype);
 
 function PlaceSearchProvider() {
     this._init();
@@ -586,12 +386,15 @@ PlaceSearchProvider.prototype = {
             return null;
         return { 'id': resultId,
                  'name': placeInfo.name,
-                 'icon': placeInfo.iconFactory(Search.RESULT_ICON_SIZE) };
+                 'createIcon': function(size) {
+                                   return placeInfo.iconFactory(size);
+                               }
+               };
     },
 
-    activateResult: function(id) {
+    activateResult: function(id, params) {
         let placeInfo = Main.placesManager.lookupPlaceById(id);
-        placeInfo.launch();
+        placeInfo.launch(params);
     },
 
     _compareResultMeta: function (idA, idB) {
@@ -601,8 +404,9 @@ PlaceSearchProvider.prototype = {
     },
 
     _searchPlaces: function(places, terms) {
-        let multipleResults = [];
+        let multiplePrefixResults = [];
         let prefixResults = [];
+        let multipleSubstringResults = [];
         let substringResults = [];
 
         terms = terms.map(String.toLowerCase);
@@ -610,17 +414,20 @@ PlaceSearchProvider.prototype = {
         for (let i = 0; i < places.length; i++) {
             let place = places[i];
             let mtype = place.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleResults.push(place.id);
+            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
+                multiplePrefixResults.push(place.id);
             else if (mtype == Search.MatchType.PREFIX)
                 prefixResults.push(place.id);
+            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
+                multipleSubstringResults.push(place.id);
             else if (mtype == Search.MatchType.SUBSTRING)
                 substringResults.push(place.id);
         }
-        multipleResults.sort(this._compareResultMeta);
+        multiplePrefixResults.sort(this._compareResultMeta);
         prefixResults.sort(this._compareResultMeta);
+        multipleSubstringResults.sort(this._compareResultMeta);
         substringResults.sort(this._compareResultMeta);
-        return multipleResults.concat(prefixResults.concat(substringResults));
+        return multiplePrefixResults.concat(prefixResults.concat(multipleSubstringResults.concat(substringResults)));
     },
 
     getInitialResultSet: function(terms) {

js/ui/polkitAuthenticationAgent.js

@@ -0,0 +1,412 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
+ *
+ * Copyright 2010 Red Hat, Inc
+ *
+ * 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; either version 2, or (at your option)
+ * any later version.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+*
+ * Author: David Zeuthen <davidz@redhat.com>
+ */
+
+const Lang = imports.lang;
+const Signals = imports.signals;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+const Shell = imports.gi.Shell;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+const Pango = imports.gi.Pango;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const Mainloop = imports.mainloop;
+const Polkit = imports.gi.Polkit;
+const PolkitAgent = imports.gi.PolkitAgent;
+
+const ModalDialog = imports.ui.modalDialog;
+
+function AuthenticationDialog(actionId, message, cookie, userNames) {
+    this._init(actionId, message, cookie, userNames);
+}
+
+AuthenticationDialog.prototype = {
+    __proto__: ModalDialog.ModalDialog.prototype,
+
+    _init: function(actionId, message, cookie, userNames) {
+        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'polkit-dialog' });
+
+        this.actionId = actionId;
+        this.message = message;
+        this.userNames = userNames;
+        this._wasDismissed = false;
+        this._completed = false;
+
+        let mainContentBox = new St.BoxLayout({ style_class: 'polkit-dialog-main-layout',
+                                                vertical: false });
+        this.contentLayout.add(mainContentBox,
+                               { x_fill: true,
+                                 y_fill: true });
+
+        let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' });
+        mainContentBox.add(icon,
+                           { x_fill:  true,
+                             y_fill:  false,
+                             x_align: St.Align.END,
+                             y_align: St.Align.START });
+
+        let messageBox = new St.BoxLayout({ style_class: 'polkit-dialog-message-layout',
+                                            vertical: true });
+        mainContentBox.add(messageBox,
+                           { y_align: St.Align.START });
+
+        this._subjectLabel = new St.Label({ style_class: 'polkit-dialog-headline',
+                                            text: _("Authentication Required") });
+
+        messageBox.add(this._subjectLabel,
+                       { y_fill:  false,
+                         y_align: St.Align.START });
+
+        this._descriptionLabel = new St.Label({ style_class: 'polkit-dialog-description',
+                                                text: message });
+        this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this._descriptionLabel.clutter_text.line_wrap = true;
+
+        messageBox.add(this._descriptionLabel,
+                       { y_fill:  true,
+                         y_align: St.Align.START });
+
+        if (userNames.length > 1) {
+            log('polkitAuthenticationAgent: Received ' + userNames.length +
+                ' identities that can be used for authentication. Only ' +
+                'considering the first one.');
+        }
+
+        let userName = userNames[0];
+
+        this._user = Gdm.UserManager.ref_default().get_user(userName);
+        let userRealName = this._user.get_real_name()
+        this._userLoadedId = this._user.connect('notify::is_loaded',
+                                                Lang.bind(this, this._onUserChanged));
+        this._userChangedId = this._user.connect('changed',
+                                                 Lang.bind(this, this._onUserChanged));
+
+        // Special case 'root'
+        let userIsRoot = false;
+        if (userName == 'root') {
+            userIsRoot = true;
+            userRealName = _("Administrator");
+        }
+
+        if (userIsRoot) {
+            let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-root-label',
+                                            text: userRealName }));
+            messageBox.add(userLabel);
+        } else {
+            let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
+                                             vertical: false });
+            messageBox.add(userBox);
+            this._userIcon = new St.Icon();
+            this._userIcon.hide();
+            userBox.add(this._userIcon,
+                        { x_fill:  true,
+                          y_fill:  false,
+                          x_align: St.Align.END,
+                          y_align: St.Align.START });
+            let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label',
+                                            text: userRealName }));
+            userBox.add(userLabel,
+                        { x_fill:  true,
+                          y_fill:  false,
+                          x_align: St.Align.END,
+                          y_align: St.Align.MIDDLE });
+        }
+
+        this._onUserChanged();
+
+        this._passwordBox = new St.BoxLayout({ vertical: false });
+        messageBox.add(this._passwordBox);
+        this._passwordLabel = new St.Label(({ style_class: 'polkit-dialog-password-label' }));
+        this._passwordBox.add(this._passwordLabel);
+        this._passwordEntry = new St.Entry({ style_class: 'polkit-dialog-password-entry',
+                                             text: "",
+                                             can_focus: true});
+        this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivate));
+        this._passwordBox.add(this._passwordEntry,
+                              {expand: true });
+        this._passwordBox.hide();
+
+        this._errorMessageLabel = new St.Label({ style_class: 'polkit-dialog-error-label' });
+        this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this._errorMessageLabel.clutter_text.line_wrap = true;
+        messageBox.add(this._errorMessageLabel);
+        this._errorMessageLabel.hide();
+
+        this._infoMessageLabel = new St.Label({ style_class: 'polkit-dialog-info-label' });
+        this._infoMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this._infoMessageLabel.clutter_text.line_wrap = true;
+        messageBox.add(this._infoMessageLabel);
+        this._infoMessageLabel.hide();
+
+        /* text is intentionally non-blank otherwise the height is not the same as for
+         * infoMessage and errorMessageLabel - but it is still invisible because
+         * gnome-shell.css sets the color to be transparent
+         */
+        this._nullMessageLabel = new St.Label({ style_class: 'polkit-dialog-null-label',
+                                                text: 'abc'});
+        this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this._nullMessageLabel.clutter_text.line_wrap = true;
+        messageBox.add(this._nullMessageLabel);
+        this._nullMessageLabel.show();
+
+        this.setButtons([{ label: _("Cancel"),
+                           action: Lang.bind(this, this.cancel),
+                           key:    Clutter.Escape
+                         },
+                         { label:  _("Authenticate"),
+                           action: Lang.bind(this, this._onAuthenticateButtonPressed)
+                         }]);
+
+        this._doneEmitted = false;
+
+        this._identityToAuth = Polkit.UnixUser.new_for_name(userName);
+        this._cookie = cookie;
+
+        this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
+                                                  cookie: this._cookie });
+        this._session.connect('completed', Lang.bind(this, this._onSessionCompleted));
+        this._session.connect('request', Lang.bind(this, this._onSessionRequest));
+        this._session.connect('show-error', Lang.bind(this, this._onSessionShowError));
+        this._session.connect('show-info', Lang.bind(this, this._onSessionShowInfo));
+
+        // Delay focus grab to avoid ModalDialog stealing focus with
+        // its buttons
+        this.connect('opened',
+                     Lang.bind(this, function() {
+                         this._passwordEntry.grab_key_focus();
+                     }));
+    },
+
+    startAuthentication: function() {
+        this._session.initiate();
+    },
+
+    _ensureOpen: function() {
+        // NOTE: ModalDialog.open() is safe to call if the dialog is
+        // already open - it just returns true without side-effects
+        if (!this.open(global.get_current_time())) {
+            // This can fail if e.g. unable to get input grab
+            //
+            // In an ideal world this wouldn't happen (because the
+            // Shell is in complete control of the session) but that's
+            // just not how things work right now.
+            //
+            // One way to make this happen is by running 'sleep 3;
+            // pkexec bash' and then opening a popup menu.
+            //
+            // We could add retrying if this turns out to be a problem
+
+            log('polkitAuthenticationAgent: Failed to show modal dialog.' +
+                ' Dismissing authentication request for action-id ' + this.actionId +
+                ' cookie ' + this._cookie);
+            this._emitDone(false, true);
+        }
+    },
+
+    _emitDone: function(keepVisible, dismissed) {
+        if (!this._doneEmitted) {
+            this._doneEmitted = true;
+            this.emit('done', keepVisible, dismissed);
+        }
+    },
+
+    _onEntryActivate: function() {
+        let response = this._passwordEntry.get_text();
+        this._session.response(response);
+        // When the user responds, dismiss already shown info and
+        // error texts (if any)
+        this._errorMessageLabel.hide();
+        this._infoMessageLabel.hide();
+        this._nullMessageLabel.show();
+    },
+
+    _onAuthenticateButtonPressed: function() {
+        this._onEntryActivate();
+    },
+
+    _onSessionCompleted: function(session, gainedAuthorization) {
+        if (this._completed)
+            return;
+
+        this._completed = true;
+
+        if (!gainedAuthorization) {
+            /* Unless we are showing an existing error message from the PAM
+             * module (the PAM module could be reporting the authentication
+             * error providing authentication-method specific information),
+             * show "Sorry, that didn't work. Please try again."
+             */
+            if (!this._errorMessageLabel.visible && !this._wasDismissed) {
+                /* Translators: "that didn't work" refers to the fact that the
+                 * requested authentication was not gained; this can happen
+                 * because of an authentication error (like invalid password),
+                 * for instance. */
+                this._errorMessageLabel.set_text(_("Sorry, that didn\'t work. Please try again."));
+                this._errorMessageLabel.show();
+                this._infoMessageLabel.hide();
+                this._nullMessageLabel.hide();
+            }
+        }
+        this._emitDone(!gainedAuthorization, false);
+    },
+
+    _onSessionRequest: function(session, request, echo_on) {
+        // Cheap localization trick
+        if (request == 'Password:')
+            this._passwordLabel.set_text(_("Password:"));
+        else
+            this._passwordLabel.set_text(request);
+
+        if (echo_on)
+            this._passwordEntry.clutter_text.set_password_char('');
+        else
+            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
+
+        this._passwordBox.show();
+        this._passwordEntry.set_text('');
+        this._passwordEntry.grab_key_focus();
+        this._ensureOpen();
+    },
+
+    _onSessionShowError: function(session, text) {
+        this._passwordEntry.set_text('');
+        this._errorMessageLabel.set_text(text);
+        this._errorMessageLabel.show();
+        this._infoMessageLabel.hide();
+        this._nullMessageLabel.hide();
+        this._ensureOpen();
+    },
+
+    _onSessionShowInfo: function(session, text) {
+        this._passwordEntry.set_text('');
+        this._infoMessageLabel.set_text(text);
+        this._infoMessageLabel.show();
+        this._errorMessageLabel.hide();
+        this._nullMessageLabel.hide();
+        this._ensureOpen();
+    },
+
+    destroySession: function() {
+        if (this._session) {
+            if (!this._completed)
+                this._session.cancel();
+            this._session = null;
+        }
+    },
+
+    _onUserChanged: function() {
+        if (this._user.is_loaded) {
+            if (this._userIcon) {
+                let iconFileName = this._user.get_icon_file();
+                let iconFile = Gio.file_new_for_path(iconFileName);
+                let icon;
+                if (iconFile.query_exists(null)) {
+                    icon = new Gio.FileIcon({file: iconFile});
+                } else {
+                    icon = new Gio.ThemedIcon({name: 'avatar-default'});
+                }
+                this._userIcon.set_gicon (icon);
+                this._userIcon.show();
+            }
+        }
+    },
+
+    cancel: function() {
+        this._wasDismissed = true;
+        this.close(global.get_current_time());
+        this._emitDone(false, true);
+    },
+
+};
+Signals.addSignalMethods(AuthenticationDialog.prototype);
+
+function AuthenticationAgent() {
+    this._init();
+}
+
+AuthenticationAgent.prototype = {
+    _init: function() {
+        this._native = new Shell.PolkitAuthenticationAgent();
+        this._native.connect('initiate', Lang.bind(this, this._onInitiate));
+        this._native.connect('cancel', Lang.bind(this, this._onCancel));
+        this._currentDialog = null;
+        this._isCompleting = false;
+    },
+
+    _onInitiate: function(nativeAgent, actionId, message, iconName, cookie, userNames) {
+        this._currentDialog = new AuthenticationDialog(actionId, message, cookie, userNames);
+
+        // We actually don't want to open the dialog until we know for
+        // sure that we're going to interact with the user. For
+        // example, if the password for the identity to auth is blank
+        // (which it will be on a live CD) then there will be no
+        // conversation at all... of course, we don't *know* that
+        // until we actually try it.
+        //
+        // See https://bugzilla.gnome.org/show_bug.cgi?id=643062 for more
+        // discussion.
+
+        this._currentDialog.connect('done', Lang.bind(this, this._onDialogDone));
+        this._currentDialog.startAuthentication();
+    },
+
+    _onCancel: function(nativeAgent) {
+        this._completeRequest(false, false);
+    },
+
+    _onDialogDone: function(dialog, keepVisible, dismissed) {
+        this._completeRequest(keepVisible, dismissed);
+    },
+
+    _reallyCompleteRequest: function(dismissed) {
+        this._currentDialog.close();
+        this._currentDialog.destroySession();
+        this._currentDialog = null;
+        this._isCompleting = false;
+
+        this._native.complete(dismissed)
+    },
+
+    _completeRequest: function(keepVisible, wasDismissed) {
+        if (this._isCompleting)
+            return;
+
+        this._isCompleting = true;
+
+        if (keepVisible) {
+            // Give the user 2 seconds to read 'Authentication Failure' before
+            // dismissing the dialog
+            Mainloop.timeout_add(2000,
+                                 Lang.bind(this,
+                                           function() {
+                                               this._reallyCompleteRequest(wasDismissed);
+                                           }));
+        } else {
+            this._reallyCompleteRequest(wasDismissed);
+        }
+    }
+}
+
+function init() {
+    let agent = new AuthenticationAgent();
+}

js/ui/runDialog.js

@@ -1,11 +1,9 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
@@ -13,13 +11,21 @@ const Signals = imports.signals;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
-const Lightbox = imports.ui.lightbox;
+const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
+const Tweener = imports.ui.tweener;
+const Util = imports.misc.util;
+const History = imports.misc.history;
 
 const MAX_FILE_DELETED_BEFORE_INVALID = 10;
 
-const HISTORY_KEY = 'run_dialog/history';
-const HISTORY_LIMIT = 512;
+const HISTORY_KEY = 'command-history';
+
+const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
+const DISABLE_COMMAND_LINE_KEY = 'disable-command-line';
+
+const DIALOG_GROW_TIME = 0.1;
 
 function CommandCompleter() {
     this._init();
@@ -52,7 +58,7 @@ CommandCompleter.prototype = {
             this._paths[i] = file.get_path();
             this._monitors[i] = file.monitor_directory(Gio.FileMonitorFlags.NONE, null);
             if (this._monitors[i] != null) {
-                this._monitors[i].connect("changed", Lang.bind(this, this._onChanged));
+                this._monitors[i].connect('changed', Lang.bind(this, this._onChanged));
             }
         }
         this._paths = this._paths.filter(function(a) {
@@ -61,25 +67,6 @@ CommandCompleter.prototype = {
         this._update(0);
     },
 
-    _onGetEnumerateComplete : function(obj, res) {
-        this._enumerator = obj.enumerate_children_finish(res);
-        this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete));
-    },
-
-    _onNextFileComplete : function(obj, res) {
-        let files = obj.next_files_finish(res);
-        for (let i = 0; i < files.length; i++) {
-            this._childs[this._i].push(files[i].get_name());
-        }
-        if (files.length) {
-            this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete));
-        } else {
-            this._enumerator.close(null);
-            this._enumerator = null;
-            this._update(this._i + 1);
-        }
-    },
-
     update : function() {
         if (this._valid)
             return;
@@ -99,7 +86,12 @@ CommandCompleter.prototype = {
         }
         let file = Gio.file_new_for_path(this._paths[i]);
         this._childs[this._i] = [];
-        file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME, Gio.FileQueryInfoFlags.NONE, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onGetEnumerateComplete));
+        FileUtils.listDirAsync(file, Lang.bind(this, function (files) {
+            for (let i = 0; i < files.length; i++) {
+                this._childs[this._i].push(files[i].get_name());
+            }
+            this._update(this._i + 1);
+        }));
     },
 
     _onChanged : function(m, f, of, type) {
@@ -133,7 +125,7 @@ CommandCompleter.prototype = {
     },
 
     getCompletion: function(text) {
-        let common = "";
+        let common = '';
         let notInit = true;
         if (!this._valid) {
             this._update(0);
@@ -146,7 +138,7 @@ CommandCompleter.prototype = {
                     break;
             }
             if (k == 0)
-                return "";
+                return '';
             return s1.substr(0, k);
         }
         function _hasPrefix(s1, prefix) {
@@ -174,22 +166,15 @@ function RunDialog() {
 }
 
 RunDialog.prototype = {
+__proto__: ModalDialog.ModalDialog.prototype,
     _init : function() {
-        this._isOpen = false;
+        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'run-dialog' });
 
-        this._gconf = Shell.GConf.get_default();
-        this._gconf.connect('changed::development_tools', Lang.bind(this, function () {
-            this._enableInternalCommands = this._gconf.get_boolean('development_tools');
-        }));
-        this._enableInternalCommands = this._gconf.get_boolean('development_tools');
-
-        this._history = this._gconf.get_string_list(HISTORY_KEY);
-        this._historyIndex = -1;
-
-        this._gconf.connect('changed::' + HISTORY_KEY, Lang.bind(this, function() {
-            this._history = this._gconf.get_string_list(HISTORY_KEY);
-            this._historyIndex = this._history.length;
+        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
+        global.settings.connect('changed::development-tools', Lang.bind(this, function () {
+            this._enableInternalCommands = global.settings.get_boolean('development-tools');
         }));
+        this._enableInternalCommands = global.settings.get_boolean('development-tools');
 
         this._internalCommands = { 'lg':
                                    Lang.bind(this, function() {
@@ -207,74 +192,66 @@ RunDialog.prototype = {
 
                                    'debugexit': Lang.bind(this, function() {
                                        Meta.exit(Meta.ExitCode.ERROR);
+                                   }),
+
+                                   // rt is short for "reload theme"
+                                   'rt': Lang.bind(this, function() {
+                                       Main.loadTheme();
                                    })
                                  };
 
-        // All actors are inside _group. We create it initially
-        // hidden then show it in show()
-        this._group = new Clutter.Group({ visible: false,
-                                          x: 0, y: 0 });
-        global.stage.add_actor(this._group);
-
-        let lightbox = new Lightbox.Lightbox(this._group, true);
-
-        this._box = new St.Bin({ x_align: St.Align.MIDDLE,
-                                 y_align: St.Align.MIDDLE });
-
-        this._group.add_actor(this._box);
-        lightbox.highlight(this._box);
-
-        let dialogBox = new St.BoxLayout({ style_class: 'run-dialog', vertical: true });
-
-        this._box.set_child(dialogBox);
 
         let label = new St.Label({ style_class: 'run-dialog-label',
                                    text: _("Please enter a command:") });
 
-        dialogBox.add(label, { expand: true, y_fill: false });
+        this.contentLayout.add(label, { y_align: St.Align.START });
 
         let entry = new St.Entry({ style_class: 'run-dialog-entry' });
 
         this._entryText = entry.clutter_text;
-        dialogBox.add(entry, { expand: true });
+        this.contentLayout.add(entry, { y_align: St.Align.START });
+        this.setInitialKeyFocus(this._entryText);
 
-        this._errorBox = new St.BoxLayout();
+        this._errorBox = new St.BoxLayout({ style_class: 'run-dialog-error-box' });
 
-        dialogBox.add(this._errorBox, { expand: true });
+        this.contentLayout.add(this._errorBox, { expand: true });
 
-        let errorIcon = new St.Button({ style_class: 'run-dialog-error-icon' });
+        let errorIcon = new St.Icon({ icon_name: 'dialog-error', icon_size: 24, style_class: 'run-dialog-error-icon' });
 
-        this._errorBox.add(errorIcon);
+        this._errorBox.add(errorIcon, { y_align: St.Align.MIDDLE });
 
         this._commandError = false;
 
         this._errorMessage = new St.Label({ style_class: 'run-dialog-error-label' });
         this._errorMessage.clutter_text.line_wrap = true;
 
-        this._errorBox.add(this._errorMessage, { expand: true });
+        this._errorBox.add(this._errorMessage, { expand: true,
+                                                 y_align: St.Align.MIDDLE,
+                                                 y_fill: false });
 
         this._errorBox.hide();
 
         this._pathCompleter = new Gio.FilenameCompleter();
         this._commandCompleter = new CommandCompleter();
         this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
+
+        this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
+                                                     entry: this._entryText });
         this._entryText.connect('key-press-event', Lang.bind(this, function(o, e) {
             let symbol = e.get_key_symbol();
-            if (symbol == Clutter.Down) {
-                this._setCommandFromHistory(this._historyIndex++);
-                return true;
-            }
-            if (symbol == Clutter.Up) {
-                this._setCommandFromHistory(this._historyIndex--);
-                return true;
-            }
-            if (symbol == Clutter.Return) {
-                if (e.get_state() & Clutter.ModifierType.CONTROL_MASK)
+            if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
+                this.popModal();
+                if (Shell.get_event_state(e) & Clutter.ModifierType.CONTROL_MASK)
                     this._run(o.get_text(), true);
                 else
                     this._run(o.get_text(), false);
                 if (!this._commandError)
                     this.close();
+                else {
+                    if (!this.pushModal())
+                        this.close();
+                }
+                return true;
             }
             if (symbol == Clutter.Escape) {
                 this.close();
@@ -320,19 +297,10 @@ RunDialog.prototype = {
         }
     },
 
-    _saveHistory : function() {
-        if (this._history.length > HISTORY_LIMIT) {
-            this._history.splice(0, this._history.length - HISTORY_LIMIT);
-        }
-        this._gconf.set_string_list(HISTORY_KEY, this._history);
-    },
-
     _run : function(input, inTerminal) {
         let command = input;
 
-        this._history.push(input);
-        this._saveHistory();
-
+        this._history.addItem(input);
         this._commandError = false;
         let f;
         if (this._enableInternalCommands)
@@ -345,9 +313,7 @@ RunDialog.prototype = {
             try {
                 if (inTerminal)
                     command = 'gnome-terminal -x ' + input;
-                let [ok, len, args] = GLib.shell_parse_argv(command);
-                let p = new Shell.Process({ 'args' : args });
-                p.run();
+                Util.trySpawnCommandLine(command);
             } catch (e) {
                 // Mmmh, that failed - see if @input matches an existing file
                 let path = null;
@@ -365,71 +331,40 @@ RunDialog.prototype = {
                                                         global.create_app_launch_context());
                 } else {
                     this._commandError = true;
-                    // The exception contains an error string like:
-                    // Error invoking Shell.run: Failed to execute child
-                    // process "foo" (No such file or directory)
-                    // We are only interested in the actual error, so parse
-                    //that out.
-                    let m = /.+\((.+)\)/.exec(e);
-                    let errorStr = _("Execution of '%s' failed:").format(command) + "\n" + m[1];
-                    this._errorMessage.set_text(errorStr);
 
-                    this._errorBox.show();
+                    this._errorMessage.set_text(e.message);
+
+                    if (!this._errorBox.visible) {
+                        let [errorBoxMinHeight, errorBoxNaturalHeight] = this._errorBox.get_preferred_height(-1);
+
+                        let parentActor = this._errorBox.get_parent();
+                        Tweener.addTween(parentActor,
+                                         { height: parentActor.height + errorBoxNaturalHeight,
+                                           time: DIALOG_GROW_TIME,
+                                           transition: 'easeOutQuad',
+                                           onComplete: Lang.bind(this,
+                                               function() {
+                                                    parentActor.set_height(-1);
+                                                    this._errorBox.show();
+                                               })
+                                         });
+                    }
                 }
             }
         }
     },
 
-    _setCommandFromHistory: function(lastI) {
-        if (this._historyIndex < 0)
-            this._historyIndex = 0;
-        if (this._historyIndex > this._history.length)
-            this._historyIndex = this._history.length;
-
-        let text = this._entryText.get_text();
-        if (text) {
-            this._history[lastI] = text;
-        }
-        if (this._history[this._historyIndex]) {
-            this._entryText.set_text(this._history[this._historyIndex]);
-        } else
-            this._entryText.set_text('');
-    },
-
-    open : function() {
-        if (this._isOpen) // Already shown
-            return;
-
-        if (!Main.pushModal(this._group))
-            return;
-
-        // Position the dialog on the current monitor
-        let monitor = global.get_focus_monitor();
-
-        this._historyIndex = this._history.length;
-
-        this._box.set_position(monitor.x, monitor.y);
-        this._box.set_size(monitor.width, monitor.height);
-
-        this._isOpen = true;
-        this._group.show();
-
-        global.stage.set_key_focus(this._entryText);
-    },
-
-    close : function() {
-        if (!this._isOpen)
-            return;
-
-        this._isOpen = false;
-
+    open: function() {
+        this._history.lastItem();
         this._errorBox.hide();
+        this._entryText.set_text('');
         this._commandError = false;
 
-        this._group.hide();
-        this._entryText.set_text('');
+        if (this._lockdownSettings.get_boolean(DISABLE_COMMAND_LINE_KEY))
+            return;
+
+        ModalDialog.ModalDialog.prototype.open.call(this);
+    },
 
-        Main.popModal(this._group);
-    }
 };
 Signals.addSignalMethods(RunDialog.prototype);

js/ui/scripting.js

@@ -0,0 +1,373 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const Gio = imports.gi.Gio;
+const Mainloop = imports.mainloop;
+
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+
+// This module provides functionality for driving the shell user interface
+// in an automated fashion. The primary current use case for this is
+// automated performance testing (see runPerfScript()), but it could
+// be applied to other forms of automation, such as testing for
+// correctness as well.
+//
+// When scripting an automated test we want to make a series of calls
+// in a linear fashion, but we also want to be able to let the main
+// loop run so actions can finish. For this reason we write the script
+// as a generator function that yields when it want to let the main
+// loop run.
+//
+//    yield Scripting.sleep(1000);
+//    main.overview.show();
+//    yield Scripting.waitLeisure();
+//
+// While it isn't important to the person writing the script, the actual
+// yielded result is a function that the caller uses to provide the
+// callback for resuming the script.
+
+/**
+ * sleep:
+ * @milliseconds: number of milliseconds to wait
+ *
+ * Used within an automation script to pause the the execution of the
+ * current script for the specified amount of time. Use as
+ * 'yield Scripting.sleep(500);'
+ */
+function sleep(milliseconds) {
+    let cb;
+
+    Mainloop.timeout_add(milliseconds, function() {
+                             if (cb)
+                                 cb();
+                             return false;
+                         });
+
+    return function(callback) {
+        cb = callback;
+    };
+}
+
+/**
+ * waitLeisure:
+ *
+ * Used within an automation script to pause the the execution of the
+ * current script until the shell is completely idle. Use as
+ * 'yield Scripting.waitLeisure();'
+ */
+function waitLeisure() {
+    let cb;
+
+    global.run_at_leisure(function() {
+                             if (cb)
+                                 cb();
+                          });
+
+    return function(callback) {
+        cb = callback;
+    };
+}
+
+const PerfHelperIface = {
+    name: 'org.gnome.Shell.PerfHelper',
+    methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' },
+              { name: 'WaitWindows', inSignature: '', outSignature: '' },
+              { name: 'DestroyWindows', inSignature: '', outSignature: ''}]
+};
+
+const PerfHelper = function () {
+    this._init();
+};
+
+PerfHelper.prototype = {
+     _init: function() {
+         DBus.session.proxifyObject(this, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper');
+     }
+};
+
+DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface);
+
+let _perfHelper = null;
+function _getPerfHelper() {
+    if (_perfHelper == null)
+        _perfHelper = new PerfHelper();
+
+    return _perfHelper;
+}
+
+/**
+ * createTestWindow:
+ * @width: width of window, in pixels
+ * @height: height of window, in pixels
+ * @alpha: whether the window should be alpha transparent
+ * @maximized: whethe the window should be created maximized
+ *
+ * Creates a window using gnome-shell-perf-helper for testing purposes.
+ * While this function can be used with yield in an automation
+ * script to pause until the D-Bus call to the helper process returns,
+ * because of the normal X asynchronous mapping process, to actually wait
+ * until the window has been mapped and exposed, use waitTestWindows().
+ */
+function createTestWindow(width, height, alpha, maximized) {
+    let cb;
+    let perfHelper = _getPerfHelper();
+
+    perfHelper.CreateWindowRemote(width, height, alpha, maximized,
+                                  function(result, excp) {
+                                      if (cb)
+                                          cb();
+                                  });
+
+    return function(callback) {
+        cb = callback;
+    };
+}
+
+/**
+ * waitTestWindows:
+ *
+ * Used within an automation script to pause until all windows previously
+ * created with createTestWindow have been mapped and exposed.
+ */
+function waitTestWindows() {
+    let cb;
+    let perfHelper = _getPerfHelper();
+
+    perfHelper.WaitWindowsRemote(function(result, excp) {
+                                     if (cb)
+                                         cb();
+                                 });
+
+    return function(callback) {
+        cb = callback;
+    };
+}
+
+/**
+ * destroyTestWindows:
+ *
+ * Destroys all windows previously created with createTestWindow().
+ * While this function can be used with yield in an automation
+ * script to pause until the D-Bus call to the helper process returns,
+ * this doesn't guarantee that Mutter has actually finished the destroy
+ * process because of normal X asynchronicity.
+ */
+function destroyTestWindows() {
+    let cb;
+    let perfHelper = _getPerfHelper();
+
+    perfHelper.DestroyWindowsRemote(function(result, excp) {
+                                        if (cb)
+                                            cb();
+                                    });
+
+    return function(callback) {
+        cb = callback;
+    };
+}
+
+/**
+ * defineScriptEvent
+ * @name: The event will be called script.<name>
+ * @description: Short human-readable description of the event
+ *
+ * Convenience function to define a zero-argument performance event
+ * within the 'script' namespace that is reserved for events defined locally
+ * within a performance automation script
+ */
+function defineScriptEvent(name, description) {
+    Shell.PerfLog.get_default().define_event("script." + name,
+                                             description,
+                                             "");
+}
+
+/**
+ * scriptEvent
+ * @name: Name registered with defineScriptEvent()
+ *
+ * Convenience function to record a script-local performance event
+ * previously defined with defineScriptEvent
+ */
+function scriptEvent(name) {
+    Shell.PerfLog.get_default().event("script." + name);
+}
+
+/**
+ * collectStatistics
+ *
+ * Convenience function to trigger statistics collection
+ */
+function collectStatistics() {
+    Shell.PerfLog.get_default().collect_statistics();
+}
+
+function _step(g, finish, onError) {
+    try {
+        let waitFunction = g.next();
+        waitFunction(function() {
+                         _step(g, finish, onError);
+                     });
+    } catch (err if err instanceof StopIteration) {
+        if (finish)
+            finish();
+    } catch (err) {
+        if (onError)
+            onError(err);
+    }
+}
+
+function _collect(scriptModule, outputFile) {
+    let eventHandlers = {};
+
+    for (let f in scriptModule) {
+        let m = /([A-Za-z]+)_([A-Za-z]+)/.exec(f);
+        if (m)
+            eventHandlers[m[1] + "." + m[2]] = scriptModule[f];
+    }
+
+    Shell.PerfLog.get_default().replay(
+        function(time, eventName, signature, arg) {
+            if (eventName in eventHandlers)
+                eventHandlers[eventName](time, arg);
+        });
+
+    if ('finish' in scriptModule)
+        scriptModule.finish();
+
+    if (outputFile) {
+        let f = Gio.file_new_for_path(outputFile);
+        let raw = f.replace(null, false,
+                            Gio.FileCreateFlags.NONE,
+                            null);
+        let out = Gio.BufferedOutputStream.new_sized (raw, 4096);
+        Shell.write_string_to_stream (out, "{\n");
+
+        Shell.write_string_to_stream(out, '"events":\n');
+        Shell.PerfLog.get_default().dump_events(out);
+
+        let monitors = global.get_monitors();
+        let primary = global.get_primary_monitor();
+        Shell.write_string_to_stream(out, ',\n"monitors":\n[');
+        for (let i = 0; i < monitors.length; i++) {
+            let monitor = monitors[i];
+            let is_primary = (monitor.x == primary.x &&
+                              monitor.y == primary.y &&
+                              monitor.width == primary.width &&
+                              monitor.height == primary.height);
+            if (i != 0)
+                Shell.write_string_to_stream(out, ', ');
+            Shell.write_string_to_stream(out, '"%s%dx%d+%d+%d"'.format(is_primary ? "*" : "",
+                                                                       monitor.width, monitor.height,
+                                                                       monitor.x, monitor.y));
+        }
+        Shell.write_string_to_stream(out, ' ]');
+
+        Shell.write_string_to_stream(out, ',\n"metrics":\n[ ');
+        let first = true;
+        for (let name in scriptModule.METRICS) {
+            let metric = scriptModule.METRICS[name];
+            // Extra checks here because JSON.stringify generates
+            // invalid JSON for undefined values
+            if (metric.description == null) {
+                log("Error: No description found for metric " + name);
+                continue;
+            }
+            if (metric.units == null) {
+                log("Error: No units found for metric " + name);
+                continue;
+            }
+            if (metric.value == null) {
+                log("Error: No value found for metric " + name);
+                continue;
+            }
+
+            if (!first)
+                Shell.write_string_to_stream(out, ',\n  ');
+            first = false;
+
+            Shell.write_string_to_stream(out,
+                                         '{ "name": ' + JSON.stringify(name) + ',\n' +
+                                         '    "description": ' + JSON.stringify(metric.description) + ',\n' +
+                                         '    "units": ' + JSON.stringify(metric.units) + ',\n' +
+                                         '    "value": ' + JSON.stringify(metric.value) + ' }');
+        }
+        Shell.write_string_to_stream(out, ' ]');
+
+        Shell.write_string_to_stream (out, ',\n"log":\n');
+        Shell.PerfLog.get_default().dump_log(out);
+
+        Shell.write_string_to_stream (out, '\n}\n');
+        out.close(null);
+    } else {
+        let metrics = [];
+        for (let metric in scriptModule.METRICS)
+            metrics.push(metric);
+
+        metrics.sort();
+
+        print ('------------------------------------------------------------');
+        for (let i = 0; i < metrics.length; i++) {
+            let metric = metrics[i];
+            print ('# ' + scriptModule.METRIC_DESCRIPTIONS[metric]);
+            print (metric + ': ' +  scriptModule.METRICS[metric]);
+        }
+        print ('------------------------------------------------------------');
+    }
+}
+
+/**
+ * runPerfScript
+ * @scriptModule: module object with run and finish functions
+ *    and event handlers
+ *
+ * Runs a script for automated collection of performance data. The
+ * script is defined as a Javascript module with specified contents.
+ *
+ * First the run() function within the module will be called as a
+ * generator to automate a series of actions. These actions will
+ * trigger performance events and the script can also record its
+ * own performance events.
+ *
+ * Then the recorded event log is replayed using handler functions
+ * within the module. The handler for the event 'foo.bar' is called
+ * foo_bar().
+ *
+ * Finally if the module has a function called finish(), that will
+ * be called.
+ *
+ * The event handler and finish functions are expected to fill in
+ * metrics to an object within the module called METRICS. Each
+ * property of this object represents an individual metric. The
+ * name of the property is the name of the metric, the value
+ * of the property is an object with the following properties:
+ *
+ *  description: human readable description of the metric
+ *  units: a string representing the units of the metric. It has
+ *   the form '<unit> <unit> ... / <unit> / <unit> ...'. Certain
+ *   unit values are recognized: s, ms, us, B, KiB, MiB. Other
+ *   values can appear but are uninterpreted. Examples 's',
+ *   '/ s', 'frames', 'frames / s', 'MiB / s / frame'
+ *  value: computed value of the metric
+ *
+ * The resulting metrics will be written to @outputFile as JSON, or,
+ * if @outputFile is not provided, logged.
+ *
+ * After running the script and collecting statistics from the
+ * event log, GNOME Shell will exit.
+ **/
+function runPerfScript(scriptModule, outputFile) {
+    Shell.PerfLog.get_default().set_enabled(true);
+
+    let g = scriptModule.run();
+
+    _step(g,
+          function() {
+              _collect(scriptModule, outputFile);
+              Meta.exit(Meta.ExitCode.SUCCESS);
+          },
+         function(err) {
+             log("Script failed: " + err + "\n" + err.stack);
+             Meta.exit(Meta.ExitCode.ERROR);
+         });
+}

js/ui/search.js

@@ -1,18 +1,29 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
 const Signals = imports.signals;
-const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+const Util = imports.misc.util;
 
-const RESULT_ICON_SIZE = 24;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const FileUtils = imports.misc.fileUtils;
+const Main = imports.ui.main;
+
+const DISABLED_OPEN_SEARCH_PROVIDERS_KEY = 'disabled-open-search-providers';
 
 // Not currently referenced by the search API, but
 // this enumeration can be useful for provider
 // implementations.
 const MatchType = {
     NONE: 0,
-    MULTIPLE: 1,
-    PREFIX: 2,
-    SUBSTRING: 3
+    SUBSTRING: 1,
+    MULTIPLE_SUBSTRING: 2,
+    PREFIX: 3,
+    MULTIPLE_PREFIX: 4
 };
 
 function SearchResultDisplay(provider) {
@@ -40,7 +51,7 @@ SearchResultDisplay.prototype = {
      * The terms are useful for search match highlighting.
      */
     renderResults: function(results, terms) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
     },
 
     /**
@@ -67,7 +78,7 @@ SearchResultDisplay.prototype = {
      * Returns: The number of actors visible.
      */
     getVisibleResultCount: function() {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
     },
 
     /**
@@ -79,14 +90,14 @@ SearchResultDisplay.prototype = {
      * available.
      */
     selectIndex: function() {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
     },
 
     /**
      * Activate the currently selected search result.
      */
     activateSelected: function() {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
     }
 };
 
@@ -108,7 +119,7 @@ SearchProvider.prototype = {
 
     /**
      * getInitialResultSet:
-     * @terms: Array of search terms, treated as logical OR
+     * @terms: Array of search terms, treated as logical AND
      *
      * Called when the user first begins a search (most likely
      * therefore a single term of length one or two), or when
@@ -120,14 +131,15 @@ SearchProvider.prototype = {
      * item.  Ordering of returned results is up to the discretion of the provider,
      * but you should follow these heruistics:
      *
-     *  * Put items which match multiple search terms before single matches
+     *  * Put items where the term matches multiple criteria (e.g. name and
+     *    description) before single matches
      *  * Put items which match on a prefix before non-prefix substring matches
      *
      * This function should be fast; do not perform unindexed full-text searches
      * or network queries.
      */
     getInitialResultSet: function(terms) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
     },
 
     /**
@@ -144,18 +156,19 @@ SearchProvider.prototype = {
      * result set, rather than possibly performing a full re-query.
      */
     getSubsearchResultSet: function(previousResults, newTerms) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
     },
 
     /**
      * getResultInfo:
      * @id: Result identifier string
      *
-     * Return an object with 'id', 'name', (both strings) and 'icon' (Clutter.Texture)
-     * properties which describe the given search result.
+     * Return an object with 'id', 'name', (both strings) and 'createIcon'
+     * (function(size) returning a Clutter.Texture) properties which describe
+     * the given search result.
      */
     getResultMeta: function(id) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
     },
 
     /**
@@ -181,7 +194,7 @@ SearchProvider.prototype = {
      * implementation will show the icon next to the name.
      *
      * The actor should be an instance of St.Widget, with the style class
-     * 'dash-search-result-content'.
+     * 'search-result-content'.
      */
     createResultActor: function(resultMeta, terms) {
         return null;
@@ -194,22 +207,106 @@ SearchProvider.prototype = {
      * Called when the user chooses a given result.
      */
     activateResult: function(id) {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * expandSearch:
-     *
-     * Called when the user clicks on the header for this
-     * search section.  Should typically launch an external program
-     * displaying search results for that item type.
-     */
-    expandSearch: function(terms) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
     }
 };
 Signals.addSignalMethods(SearchProvider.prototype);
 
+function OpenSearchSystem() {
+    this._init();
+}
+
+OpenSearchSystem.prototype = {
+    _init: function() {
+        this._providers = [];
+        global.settings.connect('changed::' + DISABLED_OPEN_SEARCH_PROVIDERS_KEY, Lang.bind(this, this._refresh));
+        this._refresh();
+    },
+
+    getProviders: function() {
+        let res = [];
+        for (let i = 0; i < this._providers.length; i++)
+            res.push({ id: i, name: this._providers[i].name });
+
+        return res;
+    },
+
+    setSearchTerms: function(terms) {
+        this._terms = terms;
+    },
+
+    _checkSupportedProviderLanguage: function(provider) {
+        if (provider.url.search(/{language}/) == -1)
+            return true;
+
+        let langs = GLib.get_language_names();
+
+        langs.push('en');
+        let lang = null;
+        for (let i = 0; i < langs.length; i++) {
+            for (let k = 0; k < provider.langs.length; k++) {
+                if (langs[i] == provider.langs[k])
+                    lang = langs[i];
+            }
+            if (lang)
+                break;
+        }
+        provider.lang = lang;
+        return lang != null;
+    },
+
+    activateResult: function(id, params) {
+        let searchTerms = this._terms.join(' ');
+
+        let url = this._providers[id].url.replace('{searchTerms}', encodeURIComponent(searchTerms));
+        if (url.match('{language}'))
+            url = url.replace('{language}', this._providers[id].lang);
+
+        try {
+            Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
+        } catch (e) {
+            // TODO: remove this after glib will be removed from moduleset
+            // In the default jhbuild, gio is in our prefix but gvfs is not
+            Util.spawn(['gvfs-open', url])
+        }
+
+        Main.overview.hide();
+    },
+
+    _addProvider: function(fileName) {
+        let path = global.datadir + '/search_providers/' + fileName;
+        let source = Shell.get_file_contents_utf8_sync(path);
+        let [success, name, url, langs, icon_uri] = global.parse_search_provider(source);
+        let provider ={ name: name,
+                        url: url,
+                        id: this._providers.length,
+                        icon_uri: icon_uri,
+                        langs: langs };
+        if (this._checkSupportedProviderLanguage(provider)) {
+            this._providers.push(provider);
+            this.emit('changed');
+        }
+    },
+
+    _refresh: function() {
+        this._providers = [];
+        let names = global.settings.get_strv(DISABLED_OPEN_SEARCH_PROVIDERS_KEY);
+        let file = Gio.file_new_for_path(global.datadir + '/search_providers');
+        FileUtils.listDirAsync(file, Lang.bind(this, function(files) {
+            for (let i = 0; i < files.length; i++) {
+                let enabled = true;
+                let name = files[i].get_name();
+                for (let k = 0; k < names.length; k++)
+                    if (names[k] == name)
+                        enabled = false;
+                if (enabled)
+                    this._addProvider(name);
+            }
+        }));
+    }
+}
+Signals.addSignalMethods(OpenSearchSystem.prototype);
+
 function SearchSystem() {
     this._init();
 }
@@ -238,9 +335,9 @@ SearchSystem.prototype = {
     },
 
     updateSearch: function(searchString) {
-        searchString = searchString.replace(/^\s+/g, "").replace(/\s+$/g, "");
+        searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
         if (searchString == '')
-            return null;
+            return [];
 
         let terms = searchString.split(/\s+/);
         let isSubSearch = terms.length == this._previousTerms.length;
@@ -257,16 +354,24 @@ SearchSystem.prototype = {
         if (isSubSearch) {
             for (let i = 0; i < this._previousResults.length; i++) {
                 let [provider, previousResults] = this._previousResults[i];
-                let providerResults = provider.getSubsearchResultSet(previousResults, terms);
-                if (providerResults.length > 0)
-                    results.push([provider, providerResults]);
+                try {
+                    let providerResults = provider.getSubsearchResultSet(previousResults, terms);
+                    if (providerResults.length > 0)
+                        results.push([provider, providerResults]);
+                } catch (error) {
+                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                }
             }
         } else {
             for (let i = 0; i < this._providers.length; i++) {
                 let provider = this._providers[i];
-                let providerResults = provider.getInitialResultSet(terms);
-                if (providerResults.length > 0)
-                    results.push([provider, providerResults]);
+                try {
+                    let providerResults = provider.getInitialResultSet(terms);
+                    if (providerResults.length > 0)
+                        results.push([provider, providerResults]);
+                } catch (error) {
+                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                }
             }
         }
 

js/ui/searchDisplay.js

@@ -0,0 +1,445 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+const Gtk = imports.gi.Gtk;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
+
+const DND = imports.ui.dnd;
+const IconGrid = imports.ui.iconGrid;
+const Main = imports.ui.main;
+const Overview = imports.ui.overview;
+const Search = imports.ui.search;
+
+const MAX_SEARCH_RESULTS_ROWS = 1;
+
+
+function SearchResult(provider, metaInfo, terms) {
+    this._init(provider, metaInfo, terms);
+}
+
+SearchResult.prototype = {
+    _init: function(provider, metaInfo, terms) {
+        this.provider = provider;
+        this.metaInfo = metaInfo;
+        this.actor = new St.Button({ style_class: 'search-result',
+                                     reactive: true,
+                                     x_align: St.Align.START,
+                                     y_fill: true });
+        this.actor._delegate = this;
+
+        let content = provider.createResultActor(metaInfo, terms);
+        if (content == null) {
+            content = new St.Bin({ style_class: 'search-result-content',
+                                   reactive: true,
+                                   track_hover: true });
+            let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
+                                             { createIcon: this.metaInfo['createIcon'] });
+            content.set_child(icon.actor);
+        }
+        this._content = content;
+        this.actor.set_child(content);
+
+        this.actor.connect('clicked', Lang.bind(this, this._onResultClicked));
+
+        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin',
+                          Lang.bind(this, function() {
+                              Main.overview.beginItemDrag(this);
+                          }));
+        draggable.connect('drag-cancelled',
+                          Lang.bind(this, function() {
+                              Main.overview.cancelledItemDrag(this);
+                          }));
+        draggable.connect('drag-end',
+                          Lang.bind(this, function() {
+                              Main.overview.endItemDrag(this);
+                          }));
+    },
+
+    setSelected: function(selected) {
+        if (selected)
+            this._content.add_style_pseudo_class('selected');
+        else
+            this._content.remove_style_pseudo_class('selected');
+    },
+
+    activate: function() {
+        this.provider.activateResult(this.metaInfo.id);
+        Main.overview.toggle();
+    },
+
+    _onResultClicked: function(actor) {
+        this.activate();
+    },
+
+    getDragActorSource: function() {
+        // not exactly right, but alignment problems are hard to notice
+        return this._content;
+    },
+
+    getDragActor: function(stageX, stageY) {
+        return this.metaInfo['createIcon'](Main.overview.dash.iconSize);
+    },
+
+    shellWorkspaceLaunch: function(params) {
+        if (this.provider.dragActivateResult)
+            this.provider.dragActivateResult(this.metaInfo.id, params);
+        else
+            this.provider.activateResult(this.metaInfo.id, params);
+    }
+};
+
+
+function GridSearchResults(provider) {
+    this._init(provider);
+}
+
+GridSearchResults.prototype = {
+    __proto__: Search.SearchResultDisplay.prototype,
+
+    _init: function(provider) {
+        Search.SearchResultDisplay.prototype._init.call(this, provider);
+        this._grid = new IconGrid.IconGrid({ rowLimit: MAX_SEARCH_RESULTS_ROWS,
+                                             xAlign: St.Align.START });
+        this.actor = new St.Bin({ x_align: St.Align.START });
+
+        this.actor.set_child(this._grid.actor);
+        this.selectionIndex = -1;
+        this._width = 0;
+        this.actor.connect('notify::width', Lang.bind(this, function() {
+            this._width = this.actor.width;
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+                this._tryAddResults();
+            }));
+        }));
+        this._notDisplayedResult = [];
+        this._terms = [];
+    },
+
+    _tryAddResults: function() {
+        let canDisplay = this._grid.childrenInRow(this._width) * MAX_SEARCH_RESULTS_ROWS
+                         - this._grid.visibleItemsCount();
+
+        for (let i = Math.min(this._notDisplayedResult.length, canDisplay); i > 0; i--) {
+            let result = this._notDisplayedResult.shift();
+            let meta = this.provider.getResultMeta(result);
+            let display = new SearchResult(this.provider, meta, this._terms);
+            this._grid.addItem(display.actor);
+        }
+    },
+
+    getVisibleResultCount: function() {
+        return this._grid.visibleItemsCount();
+    },
+
+    renderResults: function(results, terms) {
+        // copy the lists
+        this._notDisplayedResult = results.slice(0);
+        this._terms = terms.slice(0);
+        this._tryAddResults();
+    },
+
+    clear: function () {
+        this._terms = [];
+        this._notDisplayedResult = [];
+        this._grid.removeAll();
+        this.selectionIndex = -1;
+    },
+
+    selectIndex: function (index) {
+        let nVisible = this.getVisibleResultCount();
+        if (this.selectionIndex >= 0) {
+            let prevActor = this._grid.getItemAtIndex(this.selectionIndex);
+            prevActor._delegate.setSelected(false);
+        }
+        this.selectionIndex = -1;
+        if (index >= nVisible)
+            return false;
+        else if (index < 0)
+            return false;
+        let targetActor = this._grid.getItemAtIndex(index);
+        targetActor._delegate.setSelected(true);
+        this.selectionIndex = index;
+        return true;
+    },
+
+    activateSelected: function() {
+        if (this.selectionIndex < 0)
+            return;
+        let targetActor = this._grid.getItemAtIndex(this.selectionIndex);
+        targetActor._delegate.activate();
+    }
+};
+
+
+function SearchResults(searchSystem, openSearchSystem) {
+    this._init(searchSystem, openSearchSystem);
+}
+
+SearchResults.prototype = {
+    _init: function(searchSystem, openSearchSystem) {
+        this._searchSystem = searchSystem;
+        this._openSearchSystem = openSearchSystem;
+
+        this.actor = new St.BoxLayout({ name: 'searchResults',
+                                        vertical: true });
+
+        this._content = new St.BoxLayout({ name: 'searchResultsContent',
+                                           vertical: true });
+
+        let scrollView = new St.ScrollView({ x_fill: true,
+                                             y_fill: false,
+                                             vfade: true });
+        scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        scrollView.add_actor(this._content);
+
+        this.actor.add(scrollView, { x_fill: true,
+                                     y_fill: false,
+                                     expand: true,
+                                     x_align: St.Align.START,
+                                     y_align: St.Align.START });
+        this.actor.connect('notify::mapped', Lang.bind(this,
+            function() {
+                if (!this.actor.mapped)
+                    return;
+
+                let adjustment = scrollView.vscroll.adjustment;
+                let direction = Overview.SwipeScrollDirection.VERTICAL;
+                Main.overview.setScrollAdjustment(adjustment, direction);
+            }));
+
+        this._statusText = new St.Label({ style_class: 'search-statustext' });
+        this._content.add(this._statusText);
+        this._selectedProvider = -1;
+        this._providers = this._searchSystem.getProviders();
+        this._providerMeta = [];
+        for (let i = 0; i < this._providers.length; i++)
+            this.createProviderMeta(this._providers[i]);
+
+        this._searchProvidersBox = new St.BoxLayout({ style_class: 'search-providers-box' });
+        this.actor.add(this._searchProvidersBox);
+
+        this._openSearchProviders = [];
+        this._openSearchSystem.connect('changed', Lang.bind(this, this._updateOpenSearchProviderButtons));
+        this._updateOpenSearchProviderButtons();
+    },
+
+    _updateOpenSearchProviderButtons: function() {
+        this._selectedOpenSearchButton = -1;
+        for (let i = 0; i < this._openSearchProviders.length; i++)
+            this._openSearchProviders[i].actor.destroy();
+        this._openSearchProviders = this._openSearchSystem.getProviders();
+        for (let i = 0; i < this._openSearchProviders.length; i++)
+            this._createOpenSearchProviderButton(this._openSearchProviders[i]);
+    },
+
+    _updateOpenSearchButtonState: function() {
+         for (let i = 0; i < this._openSearchProviders.length; i++) {
+             if (i == this._selectedOpenSearchButton)
+                 this._openSearchProviders[i].actor.add_style_pseudo_class('selected');
+             else
+                 this._openSearchProviders[i].actor.remove_style_pseudo_class('selected');
+         }
+    },
+
+    _createOpenSearchProviderButton: function(provider) {
+        let button = new St.Button({ style_class: 'dash-search-button',
+                                     reactive: true,
+                                     x_fill: true,
+                                     y_align: St.Align.MIDDLE });
+        let bin = new St.Bin({ x_fill: false,
+                               x_align:St.Align.MIDDLE });
+        button.connect('clicked', Lang.bind(this, function() {
+            this._openSearchSystem.activateResult(provider.id);
+        }));
+        let title = new St.Label({ text: provider.name,
+                                   style_class: 'dash-search-button-label' });
+
+        bin.set_child(title);
+        button.set_child(bin);
+        provider.actor = button;
+
+        this._searchProvidersBox.add(button);
+    },
+
+    createProviderMeta: function(provider) {
+        let providerBox = new St.BoxLayout({ style_class: 'search-section',
+                                             vertical: true });
+        let title = new St.Label({ style_class: 'search-section-header',
+                                   text: provider.title });
+        providerBox.add(title);
+
+        let resultDisplayBin = new St.Bin({ style_class: 'search-section-results',
+                                            x_fill: true,
+                                            y_fill: true });
+        providerBox.add(resultDisplayBin, { expand: true });
+        let resultDisplay = provider.createResultContainerActor();
+        if (resultDisplay == null) {
+            resultDisplay = new GridSearchResults(provider);
+        }
+        resultDisplayBin.set_child(resultDisplay.actor);
+
+        this._providerMeta.push({ actor: providerBox,
+                                  resultDisplay: resultDisplay });
+        this._content.add(providerBox);
+    },
+
+    _clearDisplay: function() {
+        this._selectedProvider = -1;
+        this._visibleResultsCount = 0;
+        for (let i = 0; i < this._providerMeta.length; i++) {
+            let meta = this._providerMeta[i];
+            meta.resultDisplay.clear();
+            meta.actor.hide();
+        }
+    },
+
+    reset: function() {
+        this._searchSystem.reset();
+        this._statusText.hide();
+        this._clearDisplay();
+        this._selectedOpenSearchButton = -1;
+        this._updateOpenSearchButtonState();
+    },
+
+    startingSearch: function() {
+        this.reset();
+        this._statusText.set_text(_("Searching..."));
+        this._statusText.show();
+    },
+
+    _metaForProvider: function(provider) {
+        return this._providerMeta[this._providers.indexOf(provider)];
+    },
+
+    updateSearch: function (searchString) {
+        let results = this._searchSystem.updateSearch(searchString);
+
+        this._clearDisplay();
+
+        if (results.length == 0) {
+            this._statusText.set_text(_("No matching results."));
+            this._statusText.show();
+        } else {
+            this._selectedOpenSearchButton = -1;
+            this._updateOpenSearchButtonState();
+            this._statusText.hide();
+        }
+
+        let terms = this._searchSystem.getTerms();
+        this._openSearchSystem.setSearchTerms(terms);
+
+        // To avoid CSS transitions causing flickering
+        // of the selection when the first search result
+        // stays the same, we hide the content while
+        // filling in the results and setting the initial
+        // selection.
+        this._content.hide();
+
+        for (let i = 0; i < results.length; i++) {
+            let [provider, providerResults] = results[i];
+            let meta = this._metaForProvider(provider);
+            meta.actor.show();
+            meta.resultDisplay.renderResults(providerResults, terms);
+        }
+
+        if (this._selectedOpenSearchButton == -1)
+            this.selectDown(false);
+
+        this._content.show();
+
+        return true;
+    },
+
+    _modifyActorSelection: function(resultDisplay, up) {
+        let success;
+        let index = resultDisplay.getSelectionIndex();
+        if (up && index == -1)
+            index = resultDisplay.getVisibleResultCount() - 1;
+        else if (up)
+            index = index - 1;
+        else
+            index = index + 1;
+        return resultDisplay.selectIndex(index);
+    },
+
+    selectUp: function(recursing) {
+        if (this._selectedOpenSearchButton == -1) {
+            for (let i = this._selectedProvider; i >= 0; i--) {
+                let meta = this._providerMeta[i];
+                if (!meta.actor.visible)
+                    continue;
+                let success = this._modifyActorSelection(meta.resultDisplay, true);
+                if (success) {
+                    this._selectedProvider = i;
+                    return;
+                }
+            }
+        }
+
+        if (this._selectedOpenSearchButton == -1)
+            this._selectedOpenSearchButton = this._openSearchProviders.length;
+        this._selectedOpenSearchButton--;
+        this._updateOpenSearchButtonState();
+        if (this._selectedOpenSearchButton >= 0)
+            return;
+
+        if (this._providerMeta.length > 0 && !recursing) {
+            this._selectedProvider = this._providerMeta.length - 1;
+            this.selectUp(true);
+        }
+    },
+
+    selectDown: function(recursing) {
+        let current = this._selectedProvider;
+        if (this._selectedOpenSearchButton == -1) {
+            if (current == -1)
+                current = 0;
+            for (let i = current; i < this._providerMeta.length; i++) {
+                let meta = this._providerMeta[i];
+                if (!meta.actor.visible)
+                    continue;
+                 let success = this._modifyActorSelection(meta.resultDisplay, false);
+                 if (success) {
+                    this._selectedProvider = i;
+                    return;
+                 }
+            }
+        }
+        this._selectedOpenSearchButton++;
+
+        if (this._selectedOpenSearchButton < this._openSearchProviders.length) {
+            this._updateOpenSearchButtonState();
+            return;
+        }
+
+        this._selectedOpenSearchButton = -1;
+        this._updateOpenSearchButtonState();
+
+        if (this._providerMeta.length > 0 && !recursing) {
+            this._selectedProvider = 0;
+            this.selectDown(true);
+        }
+    },
+
+    activateSelected: function() {
+        if (this._selectedOpenSearchButton != -1) {
+            let provider = this._openSearchProviders[this._selectedOpenSearchButton];
+            this._openSearchSystem.activateResult(provider.id);
+            Main.overview.hide();
+            return;
+        }
+
+        let current = this._selectedProvider;
+        if (current < 0)
+            return;
+        let meta = this._providerMeta[current];
+        let resultDisplay = meta.resultDisplay;
+        resultDisplay.activateSelected();
+        Main.overview.hide();
+    }
+};

js/ui/shellDBus.js

@@ -1,23 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const DBus = imports.dbus;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Mainloop = imports.mainloop;
 
 const Main = imports.ui.main;
 
 const GnomeShellIface = {
-    name: "org.gnome.Shell",
-    methods: [{ name: "Eval",
-                inSignature: "s",
-                outSignature: "bs"
+    name: 'org.gnome.Shell',
+    methods: [{ name: 'Eval',
+                inSignature: 's',
+                outSignature: 'bs'
               }
              ],
     signals: [],
-    properties: [{ name: "OverviewActive",
-                   signature: "b",
-                   access: "readwrite" }]
+    properties: [{ name: 'OverviewActive',
+                   signature: 'b',
+                   access: 'readwrite' }]
 };
 
 function GnomeShell() {
@@ -50,7 +47,7 @@ GnomeShell.prototype = {
             returnValue = JSON.stringify(eval(code));
             // A hack; DBus doesn't have null/undefined
             if (returnValue == undefined)
-                returnValue = "";
+                returnValue = '';
             success = true;
         } catch (e) {
             returnValue = JSON.stringify(e);

js/ui/sidebar.js

@@ -1,264 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-
-const Main = imports.ui.main;
-const Panel = imports.ui.panel;
-const Tweener = imports.ui.tweener;
-const Widget = imports.ui.widget;
-const WidgetBox = imports.ui.widgetBox;
-
-const SIDEBAR_SPACING = 4;
-const SIDEBAR_PADDING = 4;
-
-// The total sidebar width is the widget width plus the widget padding
-// (counted twice for the widget box, and once again for the
-// out-of-screen padding), plus the empty space between the border of
-// the bar and of the windows
-const SIDEBAR_COLLAPSED_WIDTH = Widget.COLLAPSED_WIDTH + 3 * WidgetBox.WIDGETBOX_PADDING + SIDEBAR_PADDING;
-const SIDEBAR_EXPANDED_WIDTH = Widget.EXPANDED_WIDTH + 3 * WidgetBox.WIDGETBOX_PADDING + SIDEBAR_PADDING;
-
-function Sidebar() {
-    this._init();
-}
-
-Sidebar.prototype = {
-    _init : function() {
-        // The top-left corner of the sidebar is fixed at:
-        // x = -WidgetBox.WIDGETBOX_PADDING, y = Panel.PANEL_HEIGHT.
-        // (The negative X is so that we don't see the rounded
-        // WidgetBox corners on the screen edge side.)
-        this.actor = new Clutter.Group({ x: -WidgetBox.WIDGETBOX_PADDING,
-                                         y: Panel.PANEL_HEIGHT,
-                                         width: SIDEBAR_EXPANDED_WIDTH });
-
-        // The actual widgets go into a Big.Box inside this.actor. The
-        // box's width will vary during the expand/collapse animations,
-        // but this.actor's width will remain constant until we adjust
-        // it at the end of the animation, because we don't want the
-        // wm strut to move and cause windows to move multiple times
-        // during the animation.
-        this.box = new Big.Box ({ padding_top: SIDEBAR_PADDING,
-                                  padding_bottom: SIDEBAR_PADDING,
-                                  padding_right: 0,
-                                  padding_left: 0,
-                                  spacing: SIDEBAR_SPACING });
-        this.actor.add_actor(this.box);
-
-        this._gconf = Shell.GConf.get_default();
-
-        this._expanded = this._gconf.get_boolean ("sidebar/expanded");
-        if (!this._expanded)
-            this.actor.width = SIDEBAR_COLLAPSED_WIDTH;
-
-        this._visible = this._gconf.get_boolean ("sidebar/visible");
-        if (this._visible)
-            Main.chrome.addActor(this.actor);
-
-        this._hidden = false;
-        this._hideTimeoutId = 0;
-        this._widgets = [];
-        this.addWidget(new ToggleWidget());
-
-        let default_widgets = this._gconf.get_string_list("sidebar/widgets");
-        for (let i = 0; i < default_widgets.length; i++)
-            this.addWidget(default_widgets[i]);
-
-        this._gconf.connect('changed::sidebar/expanded',
-                            Lang.bind(this, this._expandedChanged));
-        this._gconf.connect('changed::sidebar/visible',
-                            Lang.bind(this, this._visibleChanged));
-        this._gconf.connect('changed::sidebar/autohide',
-                            Lang.bind(this, this._autohideChanged));
-
-        this.actor.connect('enter-event',Lang.bind(this,this._restoreHidden));
-        this.actor.connect('leave-event',Lang.bind(this,this._startHideTimeout));
-
-        this._adjustPosition();
-        this._autohideChanged();
-    },
-
-    addWidget: function(widget) {
-        let widgetBox;
-        try {
-            widgetBox = new WidgetBox.WidgetBox(widget, this._expanded);
-        } catch(e) {
-            logError(e, "Failed to add widget '" + widget + "'");
-            return;
-        }
-
-        this.box.append(widgetBox.actor, Big.BoxPackFlags.NONE);
-        this._widgets.push(widgetBox);
-        this._adjustPosition();
-    },
-
-    _adjustPosition: function() {
-        let primary=global.get_primary_monitor();
-
-        this.actor.y = Math.floor(Math.max(primary.y + Panel.PANEL_HEIGHT,primary.height/2 - this.actor.height/2));
-        this.actor.x = primary.x;
-    },
-
-    _visibleChanged: function() {
-        let visible = this._gconf.get_boolean("sidebar/visible");
-        if (visible == this._visible)
-            return;
-
-        this._visible = visible;
-        if (visible)
-            Main.chrome.addActor(this.actor);
-        else
-            Main.chrome.removeActor(this.actor);
-    },
-
-    _expandedChanged: function() {
-        let expanded = this._gconf.get_boolean("sidebar/expanded");
-        if (expanded == this._expanded)
-            return;
-
-        this._expanded = expanded;
-        if (expanded)
-            this._expand();
-        else
-            this._collapse();
-    },
-
-    _autohideChanged: function() {
-        let autohide = this._gconf.get_boolean("sidebar/autohide");
-        if (autohide == this._autohide)
-            return;
-
-        this._autohide = autohide;
-        if (autohide) {
-            this.actor.set_reactive(true);
-            this._hide();
-        } else {
-            this.actor.set_reactive(false);
-            this._restore();
-        }
-    },
-
-    _expand: function() {
-        this._expanded = true;
-        for (let i = 0; i < this._widgets.length; i++)
-            this._widgets[i].expand();
-
-        // Updated the strut/stage area after the animation completes
-        Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME,
-                                 onComplete: function () {
-                                     this.actor.width = SIDEBAR_EXPANDED_WIDTH;
-                                 } });
-    },
-
-    _collapse: function() {
-        this._expanded = false;
-        for (let i = 0; i < this._widgets.length; i++)
-            this._widgets[i].collapse();
-
-        // Update the strut/stage area after the animation completes
-        Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME,
-                                 onComplete: Lang.bind(this, function () {
-                                     this.actor.width = SIDEBAR_COLLAPSED_WIDTH;
-                                 }) });
-    },
-
-    _hide: function() {
-        if (!this._expanded) {
-            this._hidden = true;
-            for (let i = 0; i < this._widgets.length; i++)
-                this._widgets[i].hide();
-
-            // Update the strut/stage area after the animation completes
-            Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME / 2,
-                                     onComplete: Lang.bind(this, function () {
-                                         this.actor.width = Math.floor(WidgetBox.WIDGETBOX_PADDING * 2 + SIDEBAR_PADDING);
-                                     }) });
-        }
-    },
-
-    _restore: function() {
-        if (!this._expanded) {
-            this._hidden = false;
-            for (let i = 0; i < this._widgets.length; i++)
-                this._widgets[i].restore();
-
-            // Updated the strut/stage area after the animation completes
-            Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME / 2,
-                                     onComplete: function () {
-                                         this.actor.width = SIDEBAR_COLLAPSED_WIDTH;
-                                     } });
-        }
-    },
-
-    _restoreHidden: function(actor, event) {
-        this._cancelHideTimeout();
-        if (this._hidden)
-            this._restore();
-        return false;
-    },
-
-    _startHideTimeout: function(actor, event) {
-        if (!this._expanded) {
-            this._cancelHideTimeout();
-            this._hideTimeoutId = Mainloop.timeout_add_seconds(2, Lang.bind(this,this._hideTimeoutFunc));
-        }
-        return false;
-    },
-
-    _cancelHideTimeout: function() {
-        if (this._hideTimeoutId != 0) {
-            Mainloop.source_remove(this._hideTimeoutId);
-            this._hideTimeoutId = 0;
-        }
-    },
-
-    _hideTimeoutFunc: function() {
-        this._hide();
-        return false;
-    },
-
-    destroy: function() {
-        this.hide();
-        for (let i = 0; i < this._widgets.length; i++)
-            this._widgets[i].destroy();
-        this.actor.destroy();
-    }
-};
-
-const LEFT_DOUBLE_ARROW = "\u00AB";
-const RIGHT_DOUBLE_ARROW = "\u00BB";
-
-function ToggleWidget() {
-    this._init();
-}
-
-ToggleWidget.prototype = {
-    __proto__ : Widget.Widget.prototype,
-
-    _init : function() {
-        this._gconf = Shell.GConf.get_default();
-
-        this.actor = new Clutter.Text({ font_name: "Sans Bold 16px",
-                                        text: LEFT_DOUBLE_ARROW,
-                                        reactive: true });
-        this.actor.connect('button-release-event',
-                           Lang.bind(this, this._collapse));
-        this.collapsedActor = new Clutter.Text({ font_name: "Sans Bold 16px",
-                                                 text: RIGHT_DOUBLE_ARROW,
-                                                 reactive: true });
-        this.collapsedActor.connect('button-release-event',
-                                    Lang.bind(this, this._expand));
-    },
-
-    _collapse : function () {
-        this._gconf.set_boolean ("sidebar/expanded", false);
-    },
-
-    _expand : function () {
-        this._gconf.set_boolean ("sidebar/expanded", true);
-    }
-};

js/ui/status/accessibility.js

@@ -0,0 +1,205 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const GConf = imports.gi.GConf;
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const St = imports.gi.St;
+
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Util = imports.misc.util;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
+const KEY_STICKY_KEYS_ENABLED = 'stickykeys-enable';
+const KEY_BOUNCE_KEYS_ENABLED = 'bouncekeys-enable';
+const KEY_SLOW_KEYS_ENABLED   = 'slowkeys-enable';
+const KEY_MOUSE_KEYS_ENABLED  = 'mousekeys-enable';
+
+const APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
+
+const DPI_LOW_REASONABLE_VALUE  = 50;
+const DPI_HIGH_REASONABLE_VALUE = 500;
+
+const DPI_FACTOR_LARGE   = 1.25;
+const DPI_FACTOR_LARGER  = 1.5;
+const DPI_FACTOR_LARGEST = 2.0;
+
+const KEY_META_DIR       = '/apps/metacity/general';
+const KEY_VISUAL_BELL = KEY_META_DIR + '/visual_bell';
+
+const DESKTOP_INTERFACE_SCHEMA = 'org.gnome.desktop.interface';
+const KEY_GTK_THEME      = 'gtk-theme';
+const KEY_ICON_THEME     = 'icon-theme';
+const KEY_TEXT_SCALING_FACTOR = 'text-scaling-factor';
+
+const HIGH_CONTRAST_THEME = 'HighContrast';
+
+function ATIndicator() {
+    this._init.apply(this, arguments);
+}
+
+ATIndicator.prototype = {
+    __proto__: PanelMenu.SystemStatusButton.prototype,
+
+    _init: function() {
+        PanelMenu.SystemStatusButton.prototype._init.call(this, 'preferences-desktop-accessibility', null);
+
+        let client = GConf.Client.get_default();
+        client.add_dir(KEY_META_DIR, GConf.ClientPreloadType.PRELOAD_ONELEVEL, null);
+        client.notify_add(KEY_META_DIR, Lang.bind(this, this._keyChanged), null, null);
+
+        let highContrast = this._buildHCItem();
+        this.menu.addMenuItem(highContrast);
+
+        let magnifier = this._buildItem(_("Zoom"), APPLICATIONS_SCHEMA,
+                                                   'screen-magnifier-enabled');
+        this.menu.addMenuItem(magnifier);
+
+        let textZoom = this._buildFontItem();
+        this.menu.addMenuItem(textZoom);
+
+//        let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
+//                                                               'screen-reader-enabled');
+//        this.menu.addMenuItem(screenReader);
+
+//        let screenKeyboard = this._buildItem(_("Screen Keyboard"), APPLICATIONS_SCHEMA,
+//                                                                   'screen-keyboard-enabled');
+//        this.menu.addMenuItem(screenKeyboard);
+
+        let visualBell = this._buildItemGConf(_("Visual Alerts"), client, KEY_VISUAL_BELL);
+        this.menu.addMenuItem(visualBell);
+
+        let stickyKeys = this._buildItem(_("Sticky Keys"), A11Y_SCHEMA, KEY_STICKY_KEYS_ENABLED);
+        this.menu.addMenuItem(stickyKeys);
+
+        let slowKeys = this._buildItem(_("Slow Keys"), A11Y_SCHEMA, KEY_SLOW_KEYS_ENABLED);
+        this.menu.addMenuItem(slowKeys);
+
+        let bounceKeys = this._buildItem(_("Bounce Keys"), A11Y_SCHEMA, KEY_BOUNCE_KEYS_ENABLED);
+        this.menu.addMenuItem(bounceKeys);
+
+        let mouseKeys = this._buildItem(_("Mouse Keys"), A11Y_SCHEMA, KEY_MOUSE_KEYS_ENABLED);
+        this.menu.addMenuItem(mouseKeys);
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addAction(_("Universal Access Settings"), function() {
+            let app = Shell.AppSystem.get_default().get_app('gnome-universal-access-panel.desktop');
+            app.activate(-1);
+        });
+    },
+
+    _buildItemExtended: function(string, initial_value, writable, on_set) {
+        let widget = new PopupMenu.PopupSwitchMenuItem(string, initial_value);
+        if (!writable)
+            widget.actor.reactive = false;
+        else
+            widget.connect('toggled', function(item) {
+                on_set(item.state);
+            });
+        return widget;
+    },
+
+    _buildItemGConf: function(string, client, key) {
+        function on_get() {
+            return client.get_bool(key);
+        }
+        let widget = this._buildItemExtended(string,
+            client.get_bool(key),
+            client.key_is_writable(key),
+            function(enabled) {
+                client.set_bool(key, enabled);
+            });
+        this.connect('gconf-changed', function() {
+            widget.setToggleState(client.get_bool(key));
+        });
+        return widget;
+    },
+
+    _buildItem: function(string, schema, key) {
+        let settings = new Gio.Settings({ schema: schema });
+        let widget = this._buildItemExtended(string,
+            settings.get_boolean(key),
+            settings.is_writable(key),
+            function(enabled) {
+                return settings.set_boolean(key, enabled);
+            });
+        settings.connect('changed::'+key, function() {
+            widget.setToggleState(settings.get_boolean(key));
+        });
+        return widget;
+    },
+
+    _buildHCItem: function() {
+        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
+        let gtkTheme = settings.get_string(KEY_GTK_THEME);
+        let iconTheme = settings.get_string(KEY_ICON_THEME);
+        let hasHC = (gtkTheme == HIGH_CONTRAST_THEME);
+        let highContrast = this._buildItemExtended(
+            _("High Contrast"),
+            hasHC,
+            settings.is_writable(KEY_GTK_THEME) && settings.is_writable(KEY_ICON_THEME),
+            function (enabled) {
+                if (enabled) {
+                    settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
+                    settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
+                } else if(!hasHC) {
+                    settings.set_string(KEY_GTK_THEME, gtkTheme);
+                    settings.set_string(KEY_ICON_THEME, iconTheme);
+                } else {
+                    settings.reset(KEY_GTK_THEME);
+                    settings.reset(KEY_ICON_THEME);
+                }
+            });
+        settings.connect('changed::' + KEY_GTK_THEME, function() {
+            let value = settings.get_string(KEY_GTK_THEME);
+            if (value == HIGH_CONTRAST_THEME) {
+                highContrast.setToggleState(true);
+            } else {
+                highContrast.setToggleState(false);
+                gtkTheme = value;
+            }
+        });
+        settings.connect('changed::' + KEY_ICON_THEME, function() {
+            let value = settings.get_string(KEY_ICON_THEME);
+            if (value != HIGH_CONTRAST_THEME)
+                iconTheme = value;
+        });
+        return highContrast;
+    },
+
+    _buildFontItem: function() {
+        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
+
+        let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
+        let initial_setting = (factor > 1.0);
+        let widget = this._buildItemExtended(_("Large Text"),
+            initial_setting,
+            settings.is_writable(KEY_TEXT_SCALING_FACTOR),
+            function (enabled) {
+                if (enabled)
+                    settings.set_double(KEY_TEXT_SCALING_FACTOR,
+                                        DPI_FACTOR_LARGE);
+                else
+                    settings.reset(KEY_TEXT_SCALING_FACTOR);
+            });
+        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, function() {
+            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
+            let active = (factor > 1.0);
+            widget.setToggleState(active);
+        });
+        return widget;
+    },
+
+    _keyChanged: function() {
+        this.emit('gconf-changed');
+    }
+};
+Signals.addSignalMethods(ATIndicator.prototype);

js/ui/status/bluetooth.js

@@ -0,0 +1,494 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const GnomeBluetoothApplet = imports.gi.GnomeBluetoothApplet;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const ConnectionState = {
+    DISCONNECTED: 0,
+    CONNECTED: 1,
+    DISCONNECTING: 2,
+    CONNECTING: 3
+}
+
+function Indicator() {
+    this._init.apply(this, arguments);
+}
+
+Indicator.prototype = {
+    __proto__: PanelMenu.SystemStatusButton.prototype,
+
+    _init: function() {
+        PanelMenu.SystemStatusButton.prototype._init.call(this, 'bluetooth-disabled', null);
+
+        GLib.spawn_command_line_sync ('pkill -f "^bluetooth-applet$"');
+        this._applet = new GnomeBluetoothApplet.Applet();
+
+        this._killswitch = new PopupMenu.PopupSwitchMenuItem(_("Bluetooth"), false);
+        this._applet.connect('notify::killswitch-state', Lang.bind(this, this._updateKillswitch));
+        this._killswitch.connect('toggled', Lang.bind(this, function() {
+            let current_state = this._applet.killswitch_state;
+            if (current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED &&
+                current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER) {
+                this._applet.killswitch_state = this._killswitch.state ?
+                    GnomeBluetoothApplet.KillswitchState.UNBLOCKED:
+                    GnomeBluetoothApplet.KillswitchState.SOFT_BLOCKED;
+            } else
+                this._killswitch.setToggleState(false);
+        }));
+
+        this._discoverable = new PopupMenu.PopupSwitchMenuItem(_("Visibility"), this._applet.discoverable);
+        this._applet.connect('notify::discoverable', Lang.bind(this, function() {
+            this._discoverable.setToggleState(this._applet.discoverable);
+        }));
+        this._discoverable.connect('toggled', Lang.bind(this, function() {
+            this._applet.discoverable = this._discoverable.state;
+        }));
+
+        this._updateKillswitch();
+        this.menu.addMenuItem(this._killswitch);
+        this.menu.addMenuItem(this._discoverable);
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        this._fullMenuItems = [new PopupMenu.PopupSeparatorMenuItem(),
+                               new PopupMenu.PopupMenuItem(_("Send Files to Device...")),
+                               new PopupMenu.PopupMenuItem(_("Setup a New Device...")),
+                               new PopupMenu.PopupSeparatorMenuItem()];
+        this._hasDevices = false;
+        this._deviceSep = this._fullMenuItems[0]; // hidden if no device exists
+
+        this._fullMenuItems[1].connect('activate', function() {
+            GLib.spawn_command_line_async('bluetooth-sendto');
+        });
+        this._fullMenuItems[2].connect('activate', function() {
+            GLib.spawn_command_line_async('bluetooth-wizard');
+        });
+
+        for (let i = 0; i < this._fullMenuItems.length; i++) {
+            let item = this._fullMenuItems[i];
+            this.menu.addMenuItem(item);
+        }
+
+        this._deviceItemPosition = 3;
+        this._deviceItems = [];
+        this._applet.connect('devices-changed', Lang.bind(this, this._updateDevices));
+        this._updateDevices();
+
+        this._applet.connect('notify::show-full-menu', Lang.bind(this, this._updateFullMenu));
+        this._updateFullMenu();
+
+        this.menu.addAction(_("Bluetooth Settings"), function() {
+            let app = Shell.AppSystem.get_default().get_app('bluetooth-properties.desktop');
+            app.activate(-1);
+        });
+
+        this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
+        this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
+        this._applet.connect('auth-request', Lang.bind(this, this._authRequest));
+        this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest));
+    },
+
+    _updateKillswitch: function() {
+        let current_state = this._applet.killswitch_state;
+        let on = current_state == GnomeBluetoothApplet.KillswitchState.UNBLOCKED;
+        let has_adapter = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER;
+        let can_toggle = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER &&
+                         current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED;
+
+        this._killswitch.setToggleState(on);
+        this._killswitch.actor.reactive = can_toggle;
+
+        if (has_adapter)
+            this.actor.show();
+        else
+            this.actor.hide();
+
+        if (on) {
+            this._discoverable.actor.show();
+            this.setIcon('bluetooth-active');
+        } else {
+            this._discoverable.actor.hide();
+            this.setIcon('bluetooth-disabled');
+        }
+    },
+
+    _deviceCompare: function(d1, d2) {
+        return d1.device_path == d2.device_path &&
+            d1.bdaddr == d2.bdaddr &&
+            d1.can_connect == d2.can_connect &&
+            d1.capabilities == d2.capabilities;
+    },
+
+    _updateDevices: function() {
+        let devices = this._applet.get_devices();
+
+        let newlist = [ ];
+        for (let i = 0; i < this._deviceItems.length; i++) {
+            let item = this._deviceItems[i];
+            let destroy = true;
+            for (let j = 0; j < devices.length; j++) {
+                // we need to deep compare because BluetoothSimpleDevice is a boxed type
+                // (but we take advantage of that, because _skip will disappear the next
+                // time get_devices() is called)
+                if (this._deviceCompare(item._device, devices[j])) {
+                    item.label.text = devices[j].alias;
+                    devices[j]._skip = true;
+                    destroy = false;
+                    break;
+                }
+            }
+            if (destroy)
+                item.destroy();
+            else
+                newlist.push(item);
+        }
+
+        this._deviceItems = newlist;
+        this._hasDevices = newlist.length > 0;
+        for (let i = 0; i < devices.length; i++) {
+            let d = devices[i];
+            if (d._skip)
+                continue;
+            let item = this._createDeviceItem(d);
+            if (item) {
+                this.menu.addMenuItem(item, this._deviceItemPosition + this._deviceItems.length);
+                this._deviceItems.push(item);
+                this._hasDevices = true;
+            }
+        }
+        if (this._hasDevices)
+            this._deviceSep.actor.show();
+        else
+            this._deviceSep.actor.hide();
+    },
+
+    _createDeviceItem: function(device) {
+        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
+            return null;
+        let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
+        item._device = device;
+
+        if (device.can_connect) {
+            item._connected = device.connected;
+            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+
+            menuitem.connect('toggled', Lang.bind(this, function() {
+                if (item._connected > ConnectionState.CONNECTED) {
+                    // operation already in progress, revert
+                    menuitem.setToggleState(menuitem.state);
+                }
+                if (item._connected) {
+                    item._connected = ConnectionState.DISCONNECTING;
+                    this._applet.disconnect_device(item._device.device_path, function(applet, success) {
+                        if (success) { // apply
+                            item._connected = ConnectionState.DISCONNECTED;
+                            menuitem.setToggleState(false);
+                        } else { // revert
+                            item._connected = ConnectionState.CONNECTED;
+                            menuitem.setToggleState(true);
+                        }
+                    });
+                } else {
+                    item._connected = ConnectionState.CONNECTING;
+                    this._applet.connect_device(item._device.device_path, function(applet, success) {
+                        if (success) { // apply
+                            item._connected = ConnectionState.CONNECTED;
+                            menuitem.setToggleState(true);
+                        } else { // revert
+                            item._connected = ConnectionState.DISCONNECTED;
+                            menuitem.setToggleState(false);
+                        }
+                    });
+                }
+            }));
+
+            item.menu.addMenuItem(menuitem);
+        }
+
+        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
+            item.menu.addAction(_("Send Files..."), Lang.bind(this, function() {
+                this._applet.send_to_address(device.bdaddr, device.alias);
+            }));
+        }
+        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
+            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
+                this._applet.browse_address(device.bdaddr, event.get_time(),
+                    Lang.bind(this, function(applet, result) {
+                        try {
+                            applet.browse_address_finish(result);
+                        } catch (e) {
+                            this._ensureSource();
+                            this._source.notify(new MessageTray.Notification(this._source,
+                                 _("Bluetooth"),
+                                 _("Error browsing device"),
+                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
+                        }
+                    }));
+            }));
+        }
+
+        switch (device.type) {
+        case GnomeBluetoothApplet.Type.KEYBOARD:
+            item.menu.addAction(_("Keyboard Settings"), function() {
+                GLib.spawn_command_line_async('gnome-control-center keyboard');
+            });
+            break;
+        case GnomeBluetoothApplet.Type.MOUSE:
+            item.menu.addAction(_("Mouse Settings"), function() {
+                GLib.spawn_command_line_async('gnome-control-center mouse');
+            });
+            break;
+        case GnomeBluetoothApplet.Type.HEADSET:
+        case GnomeBluetoothApplet.Type.HEADPHONES:
+        case GnomeBluetoothApplet.Type.OTHER_AUDIO:
+            item.menu.addAction(_("Sound Settings"), function() {
+                GLib.spawn_command_line_async('gnome-control-center sound');
+            });
+            break;
+        default:
+            break;
+        }
+
+        return item;
+    },
+
+    _updateFullMenu: function() {
+        if (this._applet.show_full_menu) {
+            this._showAll(this._fullMenuItems);
+            if (this._hasDevices)
+                this._showAll(this._deviceItems);
+            else
+                this._deviceSep.actor.hide();
+        } else {
+            this._hideAll(this._fullMenuItems);
+            this._hideAll(this._deviceItems);
+        }
+    },
+
+    _showAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].actor.show();
+    },
+
+    _hideAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].actor.hide();
+    },
+
+    _destroyAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].destroy();
+    },
+
+    _ensureSource: function() {
+        if (!this._source) {
+            this._source = new Source();
+            Main.messageTray.add(this._source);
+        }
+    },
+
+    _authRequest: function(applet, device_path, name, long_name, uuid) {
+        this._ensureSource();
+        this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name, uuid));
+    },
+
+    _confirmRequest: function(applet, device_path, name, long_name, pin) {
+        this._ensureSource();
+        this._source.notify(new ConfirmNotification(this._source, this._applet, device_path, name, long_name, pin));
+    },
+
+    _pinRequest: function(applet, device_path, name, long_name, numeric) {
+        this._ensureSource();
+        this._source.notify(new PinNotification(this._source, this._applet, device_path, name, long_name, numeric));
+    },
+
+    _cancelRequest: function() {
+        this._source.destroy();
+    }
+}
+
+function Source() {
+    this._init.apply(this, arguments);
+}
+
+Source.prototype = {
+    __proto__: MessageTray.Source.prototype,
+
+    _init: function() {
+        MessageTray.Source.prototype._init.call(this, _("Bluetooth"));
+
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    notify: function(notification) {
+        this._private_destroyId = notification.connect('destroy', Lang.bind(this, function(notification) {
+            if (this.notification == notification) {
+                // the destroyed notification is the last for this source
+                this.notification.disconnect(this._private_destroyId);
+                this.destroy();
+            }
+        }));
+
+        MessageTray.Source.prototype.notify.call(this, notification);
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'bluetooth-active',
+                             icon_type: St.IconType.SYMBOLIC,
+                             icon_size: this.ICON_SIZE });
+    }
+}
+
+function AuthNotification() {
+    this._init.apply(this, arguments);
+}
+
+AuthNotification.prototype = {
+    __proto__: MessageTray.Notification.prototype,
+
+    _init: function(source, applet, device_path, name, long_name, uuid) {
+        MessageTray.Notification.prototype._init.call(this,
+                                                      source,
+                                                      _("Bluetooth"),
+                                                      _("Authorization request from %s").format(name),
+                                                      { customContent: true });
+        this.setResident(true);
+
+        this._applet = applet;
+        this._devicePath = device_path;
+        this.addBody(_("Device %s wants access to the service '%s'").format(long_name, uuid));
+
+        this.addButton('always-grant', _("Always grant access"));
+        this.addButton('grant', _("Grant this time only"));
+        this.addButton('reject', _("Reject"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            switch (action) {
+            case 'always-grant':
+                this._applet.agent_reply_auth(this._devicePath, true, true);
+                break;
+            case 'grant':
+                this._applet.agent_reply_auth(this._devicePath, true, false);
+                break;
+            case 'reject':
+            default:
+                this._applet.agent_reply_auth(this._devicePath, false, false);
+            }
+            this.destroy();
+        }));
+    }
+}
+
+function ConfirmNotification() {
+    this._init.apply(this, arguments);
+}
+
+ConfirmNotification.prototype = {
+    __proto__: MessageTray.Notification.prototype,
+
+    _init: function(source, applet, device_path, name, long_name, pin) {
+        MessageTray.Notification.prototype._init.call(this,
+                                                      source,
+                                                      _("Bluetooth"),
+                                                      _("Pairing confirmation for %s").format(name),
+                                                      { customContent: true });
+        this.setResident(true);
+
+        this._applet = applet;
+        this._devicePath = device_path;
+        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
+        this.addBody(_("Please confirm whether the PIN '%s' matches the one on the device.").format(pin));
+
+        this.addButton('matches', _("Matches"));
+        this.addButton('does-not-match', _("Does not match"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            if (action == 'matches')
+                this._applet.agent_reply_confirm(this._devicePath, true);
+            else
+                this._applet.agent_reply_confirm(this._devicePath, false);
+            this.destroy();
+        }));
+    }
+}
+
+function PinNotification() {
+    this._init.apply(this, arguments);
+}
+
+PinNotification.prototype = {
+    __proto__: MessageTray.Notification.prototype,
+
+    _init: function(source, applet, device_path, name, long_name, numeric) {
+        MessageTray.Notification.prototype._init.call(this,
+                                                      source,
+                                                      _("Bluetooth"),
+                                                      _("Pairing request for %s").format(name),
+                                                      { customContent: true });
+        this.setResident(true);
+
+        this._applet = applet;
+        this._devicePath = device_path;
+        this._numeric = numeric;
+        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
+        this.addBody(_("Please enter the PIN mentioned on the device."));
+
+        this._entry = new St.Entry();
+        this._entry.connect('key-release-event', Lang.bind(this, function(entry, event) {
+            let key = event.get_key_symbol();
+            if (key == Clutter.KEY_Return) {
+                this.emit('action-invoked', 'ok');
+                return true;
+            } else if (key == Clutter.KEY_Escape) {
+                this.emit('action-invoked', 'cancel');
+                return true;
+            }
+            return false;
+        }));
+        this.addActor(this._entry);
+
+        this.addButton('ok', _("OK"));
+        this.addButton('cancel', _("Cancel"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            if (action == 'ok') {
+                if (this._numeric) {
+                    let num = parseInt(this._entry.text);
+                    if (isNaN(num)) {
+                        // user reply was empty, or was invalid
+                        // cancel the operation
+                        num = -1;
+                    }
+                    this._applet.agent_reply_passkey(this._devicePath, num);
+                } else
+                    this._applet.agent_reply_pincode(this._devicePath, this._entry.text);
+            } else {
+                if (this._numeric)
+                    this._applet.agent_reply_passkey(this._devicePath, -1);
+                else
+                    this._applet.agent_reply_pincode(this._devicePath, null);
+            }
+            this.destroy();
+        }));
+    },
+
+    grabFocus: function(lockTray) {
+        MessageTray.Notification.prototype.grabFocus.call(this, lockTray);
+        global.stage.set_key_focus(this._entry);
+    }
+}

js/ui/status/keyboard.js

@@ -0,0 +1,203 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gkbd = imports.gi.Gkbd;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const PopupMenu = imports.ui.popupMenu;
+const PanelMenu = imports.ui.panelMenu;
+const Util = imports.misc.util;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+function LayoutMenuItem() {
+    this._init.apply(this, arguments);
+}
+
+LayoutMenuItem.prototype = {
+    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+
+    _init: function(config, id, indicator, long_name) {
+        PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
+
+        this._config = config;
+        this._id = id;
+        this.label = new St.Label({ text: long_name });
+        this.indicator = indicator;
+        this.addActor(this.label);
+        this.addActor(this.indicator);
+    },
+
+    activate: function(event) {
+        PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
+        this._config.lock_group(this._id);
+    }
+};
+
+function XKBIndicator() {
+    this._init.call(this);
+}
+
+XKBIndicator.prototype = {
+    __proto__: PanelMenu.Button.prototype,
+
+    _init: function() {
+        PanelMenu.Button.prototype._init.call(this, St.Align.START);
+
+        this._container = new Shell.GenericContainer();
+        this._container.connect('get-preferred-width', Lang.bind(this, this._get_preferred_width));
+        this._container.connect('get-preferred-height', Lang.bind(this, this._get_preferred_height));
+        this._container.connect('allocate', Lang.bind(this, this._allocate));
+        this.actor.set_child(this._container);
+
+        this._iconActor = new St.Icon({ icon_name: 'keyboard', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
+        this._container.add_actor(this._iconActor);
+        this._labelActors = [ ];
+        this._layoutItems = [ ];
+
+        this._showFlags = false;
+        this._config = Gkbd.Configuration.get();
+        this._config.connect('changed', Lang.bind(this, this._sync_config));
+        this._config.connect('group-changed', Lang.bind(this, this._sync_group));
+        this._config.start_listen();
+
+        this._sync_config();
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addAction(_("Show Keyboard Layout..."), Lang.bind(this, function() {
+            Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
+        }));
+        this.menu.addAction(_("Localization Settings"), function() {
+            let app = Shell.AppSystem.get_default().get_app('gnome-region-panel.desktop');
+            app.activate(-1);
+        });
+    },
+
+    _sync_config: function() {
+        this._showFlags = this._config.if_flags_shown();
+        if (this._showFlags) {
+            this._container.set_skip_paint(this._iconActor, false);
+        } else {
+            this._container.set_skip_paint(this._iconActor, true);
+        }
+
+        let groups = this._config.get_group_names();
+        if (groups.length > 1) {
+            this.actor.show();
+        } else {
+            this.menu.close();
+            this.actor.hide();
+        }
+
+        for (let i = 0; i < this._layoutItems.length; i++)
+            this._layoutItems[i].destroy();
+
+        for (let i = 0; i < this._labelActors.length; i++)
+            this._labelActors[i].destroy();
+
+        let short_names = this._config.get_short_group_names();
+
+        this._selectedLayout = null;
+        this._layoutItems = [ ];
+        this._selectedLabel = null;
+        this._labelActors = [ ];
+        for (let i = 0; i < groups.length; i++) {
+            let icon_name = this._config.get_group_name(i);
+            let actor;
+            if (this._showFlags)
+                actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.SYMBOLIC, style_class: 'popup-menu-icon' });
+            else
+                actor = new St.Label({ text: short_names[i] });
+            let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
+            item._short_group_name = short_names[i];
+            item._icon_name = icon_name;
+            this._layoutItems.push(item);
+            this.menu.addMenuItem(item, i);
+
+            let shortLabel = new St.Label({ text: short_names[i] });
+            this._labelActors.push(shortLabel);
+            this._container.add_actor(shortLabel);
+            this._container.set_skip_paint(shortLabel, true);
+        }
+
+        this._sync_group();
+    },
+
+    _sync_group: function() {
+        let selected = this._config.get_current_group();
+
+        if (this._selectedLayout) {
+            this._selectedLayout.setShowDot(false);
+            this._selectedLayout = null;
+        }
+
+        if (this._selectedLabel) {
+            this._container.set_skip_paint(this._selectedLabel, true);
+            this._selectedLabel = null;
+        }
+
+        let item = this._layoutItems[selected];
+        item.setShowDot(true);
+
+        this._iconActor.icon_name = item._icon_name;
+        this._selectedLabel = this._labelActors[selected];
+        this._container.set_skip_paint(this._selectedLabel, this._showFlags);
+
+        this._selectedLayout = item;
+    },
+
+    _get_preferred_width: function(container, for_height, alloc) {
+        /* Here, and in _get_preferred_height, we need to query for the
+           height of all children, but we ignore the results for those
+           we don't actually display. */
+        let max_min_width = 0, max_natural_width = 0;
+        if (this._showFlags)
+            [max_min_width, max_natural_width] = this._iconActor.get_preferred_width(for_height);
+
+        for (let i = 0; i < this._labelActors.length; i++) {
+            let [min_width, natural_width] = this._labelActors[i].get_preferred_width(for_height);
+            if (!this._showFlags) {
+                max_min_width = Math.max(max_min_width, min_width);
+                max_natural_width = Math.max(max_natural_width, natural_width);
+            }
+        }
+
+        alloc.min_size = max_min_width;
+        alloc.natural_size = max_natural_width;
+    },
+
+    _get_preferred_height: function(container, for_width, alloc) {
+        let max_min_height = 0, max_natural_height = 0;
+        if (this._showFlags)
+            [max_min_height, max_natural_height] = this._iconActor.get_preferred_height(for_width);
+        
+        for (let i = 0; i < this._labelActors.length; i++) {
+            let [min_height, natural_height] = this._labelActors[i].get_preferred_height(for_width);
+            if (!this._showFlags) {
+                max_min_height = Math.max(max_min_height, min_height);
+                max_natural_height = Math.max(max_natural_height, natural_height);
+            }
+        }
+
+        alloc.min_size = max_min_height;
+        alloc.natural_size = max_natural_height;
+    },
+
+    _allocate: function(container, box, flags) {
+        // translate box to (0, 0)
+        box.x2 -= box.x1;
+        box.x1 = 0;
+        box.y2 -= box.y1;
+        box.y1 = 0;
+
+        this._iconActor.allocate_align_fill(box, 0.5, 0, false, false, flags);
+        for (let i = 0; i < this._labelActors.length; i++)
+            this._labelActors[i].allocate_align_fill(box, 0.5, 0, false, false, flags);
+    }
+};

js/ui/status/power.js

@@ -0,0 +1,253 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gio = imports.gi.Gio;
+const DBus = imports.dbus;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Util = imports.misc.util;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const BUS_NAME = 'org.gnome.PowerManager';
+const OBJECT_PATH = '/org/gnome/PowerManager';
+
+const UPDeviceType = {
+    UNKNOWN: 0,
+    AC_POWER: 1,
+    BATTERY: 2,
+    UPS: 3,
+    MONITOR: 4,
+    MOUSE: 5,
+    KEYBOARD: 6,
+    PDA: 7,
+    PHONE: 8,
+    MEDIA_PLAYER: 9,
+    TABLET: 10,
+    COMPUTER: 11
+};
+
+const UPDeviceState = {
+    UNKNOWN: 0,
+    CHARGING: 1,
+    DISCHARGING: 2,
+    EMPTY: 3,
+    FULLY_CHARGED: 4,
+    PENDING_CHARGE: 5,
+    PENDING_DISCHARGE: 6
+};
+
+const PowerManagerInterface = {
+    name: 'org.gnome.PowerManager',
+    methods: [
+        { name: 'GetDevices', inSignature: '', outSignature: 'a(susbut)' },
+        { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susbut)' },
+        ],
+    signals: [
+        { name: 'Changed', inSignature: '' },
+        ],
+    properties: [
+        { name: 'Icon', signature: 's', access: 'read' },
+        ]
+};
+let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
+
+function Indicator() {
+    this._init.apply(this, arguments);
+}
+
+Indicator.prototype = {
+    __proto__: PanelMenu.SystemStatusButton.prototype,
+
+    _init: function() {
+        PanelMenu.SystemStatusButton.prototype._init.call(this, 'battery-missing');
+        this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
+
+        this._deviceItems = [ ];
+        this._hasPrimary = false;
+        this._primaryDeviceId = null;
+
+        this._batteryItem = new PopupMenu.PopupMenuItem('', { reactive: false });
+        this._primaryPercentage = new St.Label();
+        this._batteryItem.addActor(this._primaryPercentage, { align: St.Align.END });
+        this.menu.addMenuItem(this._batteryItem);
+
+        this._deviceSep = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(this._deviceSep);
+        this._otherDevicePosition = 2;
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        this.menu.addAction(_("Power Settings"),function() {
+            let app = Shell.AppSystem.get_default().get_app('gnome-power-panel.desktop');
+            app.activate(-1);
+        });
+
+        this._proxy.connect('Changed', Lang.bind(this, this._devicesChanged));
+        this._devicesChanged();
+    },
+
+    _readPrimaryDevice: function() {
+        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) {
+            if (error) {
+                this._checkError(error);
+                this._hasPrimary = false;
+                this._primaryDeviceId = null;
+                this._batteryItem.actor.hide();
+                this._deviceSep.actor.hide();
+                return;
+            }
+            let [device_id, device_type, icon, percentage, state, seconds] = device;
+            if (device_type == UPDeviceType.BATTERY) {
+                this._hasPrimary = true;
+                let time = Math.round(seconds / 60);
+                if (time == 0) {
+                    // 0 is reported when UPower does not have enough data
+                    // to estimate battery life
+                    this._batteryItem.label.text = _("Estimating...");
+                } else {
+                    let minutes = time % 60;
+                    let hours = Math.floor(time / 60);
+                    let timestring;
+                    if (time > 60) {
+                        if (minutes == 0) {
+                            timestring = Gettext.ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
+                        } else {
+                            /* TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
+                            let template = _("%d %s %d %s remaining");
+
+                            timestring = template.format (hours, Gettext.ngettext("hour", "hours", hours), minutes, Gettext.ngettext("minute", "minutes", minutes));
+                        }
+                    } else
+                        timestring = Gettext.ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
+                    this._batteryItem.label.text = timestring;
+                }
+                this._primaryPercentage.text = Math.round(percentage) + '%';
+                this._batteryItem.actor.show();
+                if (this._deviceItems.length > 0)
+                    this._deviceSep.actor.show();
+            } else {
+                this._hasPrimary = false;
+                this._batteryItem.actor.hide();
+                this._deviceSep.actor.hide();
+            }
+
+            this._primaryDeviceId = device_id;
+        }));
+    },
+
+    _readOtherDevices: function() {
+        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
+            this._deviceItems.forEach(function(i) { i.destroy(); });
+            this._deviceItems = [];
+
+            if (error) {
+                this._checkError(error);
+                this._deviceSep.actor.hide();
+                return;
+            }
+
+            let position = 0;
+            for (let i = 0; i < devices.length; i++) {
+                let [device_id, device_type] = devices[i];
+                if (device_type == UPDeviceType.AC_POWER || device_id == this._primaryDeviceId)
+                    continue;
+
+                let item = new DeviceItem (devices[i]);
+                this._deviceItems.push(item);
+                this.menu.addMenuItem(item, this._otherDevicePosition + position);
+                position++;
+            }
+
+            if (this._hasPrimary && position > 0)
+                this._deviceSep.actor.show();
+            else
+                this._deviceSep.actor.hide();
+        }));
+    },
+
+    _devicesChanged: function() {
+        this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) {
+            if (icon) {
+                let gicon = Shell.util_icon_from_string (icon);
+                this.setGIcon(gicon);
+                this.actor.show();
+            } else {
+                this._checkError(error);
+                this.menu.close();
+                this.actor.hide();
+            }
+        }));
+        this._readPrimaryDevice();
+        this._readOtherDevices();
+    },
+
+    _checkError: function(error) {
+        if (!this._restarted && error && error.message.match(/org\.freedesktop\.DBus\.Error\.(UnknownMethod|InvalidArgs)/)) {
+            Util.killall('gnome-power-manager');
+            Util.spawn(['gnome-power-manager']);
+            this._restarted = true;
+        }
+    }
+};
+
+function DeviceItem() {
+    this._init.apply(this, arguments);
+}
+
+DeviceItem.prototype = {
+    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+
+    _init: function(device) {
+        PopupMenu.PopupBaseMenuItem.prototype._init.call(this, { reactive: false });
+
+        let [device_id, device_type, icon, percentage, state, time] = device;
+
+        this._box = new St.BoxLayout({ style_class: 'popup-device-menu-item' });
+        this._label = new St.Label({ text: this._deviceTypeToString(device_type) });
+
+        this._icon = new St.Icon({ gicon: Shell.util_icon_from_string(icon),
+                                   icon_type: St.IconType.SYMBOLIC,
+                                   style_class: 'popup-menu-icon' });
+
+        this._box.add_actor(this._icon);
+        this._box.add_actor(this._label);
+        this.addActor(this._box);
+
+        let percentLabel = new St.Label({ text: '%d%%'.format(Math.round(percentage)) });
+        this.addActor(percentLabel, { align: St.Align.END });
+    },
+
+    _deviceTypeToString: function(type) {
+	switch (type) {
+	case UPDeviceType.AC_POWER:
+            return _("AC adapter");
+        case UPDeviceType.BATTERY:
+            return _("Laptop battery");
+        case UPDeviceType.UPS:
+            return _("UPS");
+        case UPDeviceType.MONITOR:
+            return _("Monitor");
+        case UPDeviceType.MOUSE:
+            return _("Mouse");
+        case UPDeviceType.KEYBOARD:
+            return _("Keyboard");
+        case UPDeviceType.PDA:
+            return _("PDA");
+        case UPDeviceType.PHONE:
+            return _("Cell phone");
+        case UPDeviceType.MEDIA_PLAYER:
+            return _("Media player");
+        case UPDeviceType.TABLET:
+            return _("Tablet");
+        case UPDeviceType.COMPUTER:
+            return _("Computer");
+        default:
+            return _("Unknown");
+        }
+    }
+}

js/ui/status/volume.js

@@ -0,0 +1,234 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const DBus = imports.dbus;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Gvc = imports.gi.Gvc;
+const Signals = imports.signals;
+const St = imports.gi.St;
+
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Util = imports.misc.util;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */
+
+const VOLUME_NOTIFY_ID = 1;
+
+function Indicator() {
+    this._init.apply(this, arguments);
+}
+
+Indicator.prototype = {
+    __proto__: PanelMenu.SystemStatusButton.prototype,
+
+    _init: function() {
+        PanelMenu.SystemStatusButton.prototype._init.call(this, 'audio-volume-muted', null);
+
+        this._control = new Gvc.MixerControl({ name: 'GNOME Shell Volume Control' });
+        this._control.connect('ready', Lang.bind(this, this._onControlReady));
+        this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
+        this._control.connect('default-source-changed', Lang.bind(this, this._readInput));
+        this._control.connect('stream-added', Lang.bind(this, this._maybeShowInput));
+        this._control.connect('stream-removed', Lang.bind(this, this._maybeShowInput));
+        this._volumeMax = this._control.get_vol_max_norm();
+        this._volumeMaxAmplified = this._control.get_vol_max_amplified();
+
+        this._output = null;
+        this._outputVolumeId = 0;
+        this._outputMutedId = 0;
+        this._outputTitle = new PopupMenu.PopupMenuItem(_("Volume"), { reactive: false });
+        this._outputSlider = new PopupMenu.PopupSliderMenuItem(0);
+        this._outputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_output'));
+        this._outputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
+        this.menu.addMenuItem(this._outputTitle);
+        this.menu.addMenuItem(this._outputSlider);
+
+        this._separator = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(this._separator);
+
+        this._input = null;
+        this._inputVolumeId = 0;
+        this._inputMutedId = 0;
+        this._inputTitle = new PopupMenu.PopupMenuItem(_("Microphone"), { reactive: false });
+        this._inputSlider = new PopupMenu.PopupSliderMenuItem(0);
+        this._inputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_input'));
+        this._inputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
+        this.menu.addMenuItem(this._inputTitle);
+        this.menu.addMenuItem(this._inputSlider);
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addAction(_("Sound Settings"), function() {
+            let app = Shell.AppSystem.get_default().get_app('gnome-sound-panel.desktop');
+            app.activate(-1);
+        });
+
+        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        this._control.open();
+    },
+
+    _getMaxVolume: function(property) {
+        if (this[property].get_can_decibel())
+            return this._volumeMaxAmplified;
+        else
+            return this._volumeMax;
+    },
+
+    _onScrollEvent: function(actor, event) {
+        let direction = event.get_scroll_direction();
+        let currentVolume = this._output.volume;
+        let maxVolume = this._getMaxVolume('_output');
+
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            let prev_muted = this._output.is_muted;
+            this._output.volume = Math.max(0, currentVolume - maxVolume * VOLUME_ADJUSTMENT_STEP);
+            if (this._output.volume < 1) {
+                this._output.volume = 0;
+                if (!prev_muted)
+                    this._output.change_is_muted(true);
+            }
+            this._output.push_volume();
+        }
+        else if (direction == Clutter.ScrollDirection.UP) {
+            this._output.volume = Math.min(maxVolume, currentVolume + maxVolume * VOLUME_ADJUSTMENT_STEP);
+            this._output.change_is_muted(false);
+            this._output.push_volume();
+        }
+
+        this._notifyVolumeChange();
+    },
+
+    _onControlReady: function() {
+        this._readOutput();
+        this._readInput();
+    },
+
+    _readOutput: function() {
+        if (this._outputVolumeId) {
+            this._output.disconnect(this._outputVolumeId);
+            this._output.disconnect(this._outputMutedId);
+            this._outputVolumeId = 0;
+            this._outputMutedId = 0;
+        }
+        this._output = this._control.get_default_sink();
+        if (this._output) {
+            this._outputMutedId = this._output.connect('notify::is-muted', Lang.bind(this, this._mutedChanged, '_output'));
+            this._outputVolumeId = this._output.connect('notify::volume', Lang.bind(this, this._volumeChanged, '_output'));
+            this._mutedChanged (null, null, '_output');
+            this._volumeChanged (null, null, '_output');
+        } else {
+            this._outputSlider.setValue(0);
+            this.setIcon('audio-volume-muted-symbolic');
+        }
+    },
+
+    _readInput: function() {
+        if (this._inputVolumeId) {
+            this._input.disconnect(this._inputVolumeId);
+            this._input.disconnect(this._inputMutedId);
+            this._inputVolumeId = 0;
+            this._inputMutedId = 0;
+        }
+        this._input = this._control.get_default_source();
+        if (this._input) {
+            this._inputMutedId = this._input.connect('notify::is-muted', Lang.bind(this, this._mutedChanged, '_input'));
+            this._inputVolumeId = this._input.connect('notify::volume', Lang.bind(this, this._volumeChanged, '_input'));
+            this._mutedChanged (null, null, '_input');
+            this._volumeChanged (null, null, '_input');
+        } else {
+            this._separator.actor.hide();
+            this._inputTitle.actor.hide();
+            this._inputSlider.actor.hide();
+        }
+    },
+
+    _maybeShowInput: function() {
+        // only show input widgets if any application is recording audio
+        let showInput = false;
+        let recordingApps = this._control.get_source_outputs();
+        if (this._input && recordingApps) {
+            for (let i = 0; i < recordingApps.length; i++) {
+                let outputStream = recordingApps[i];
+                let id = outputStream.get_application_id();
+                // but skip gnome-volume-control and pavucontrol
+                // (that appear as recording because they show the input level)
+                if (!id || (id != 'org.gnome.VolumeControl' && id != 'org.PulseAudio.pavucontrol')) {
+                    showInput = true;
+                    break;
+                }
+            }
+        }
+        if (showInput) {
+            this._separator.actor.show();
+            this._inputTitle.actor.show();
+            this._inputSlider.actor.show();
+        } else {
+            this._separator.actor.hide();
+            this._inputTitle.actor.hide();
+            this._inputSlider.actor.hide();
+        }
+    },
+
+    _volumeToIcon: function(volume) {
+        let maxVolume = this._getMaxVolume('_output');
+        if (volume <= 0) {
+            return 'audio-volume-muted';
+        } else {
+            let n = Math.floor(3 * volume / maxVolume) + 1;
+            if (n < 2)
+                return 'audio-volume-low';
+            if (n >= 3)
+                return 'audio-volume-high';
+            return 'audio-volume-medium';
+        }
+    },
+
+    _sliderChanged: function(slider, value, property) {
+        if (this[property] == null) {
+            log ('Volume slider changed for %s, but %s does not exist'.format(property, property));
+            return;
+        }
+        let volume = value * this._getMaxVolume(property);
+        let prev_muted = this[property].is_muted;
+        if (volume < 1) {
+            this[property].volume = 0;
+            if (!prev_muted)
+                this[property].change_is_muted(true);
+        } else {
+            this[property].volume = volume;
+            if (prev_muted)
+                this[property].change_is_muted(false);
+        }
+        this[property].push_volume();
+    },
+
+    _notifyVolumeChange: function() {
+        global.cancel_theme_sound(VOLUME_NOTIFY_ID);
+        global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
+    },
+
+    _mutedChanged: function(object, param_spec, property) {
+        let muted = this[property].is_muted;
+        let slider = this[property+'Slider'];
+        let maxVolume = this._getMaxVolume(property);
+        slider.setValue(muted ? 0 : (this[property].volume / maxVolume));
+        if (property == '_output') {
+            if (muted)
+                this.setIcon('audio-volume-muted');
+            else
+                this.setIcon(this._volumeToIcon(this._output.volume));
+        }
+    },
+
+    _volumeChanged: function(object, param_spec, property) {
+        let maxVolume = this._getMaxVolume(property);
+        this[property+'Slider'].setValue(this[property].volume / maxVolume);
+        if (property == '_output' && !this._output.is_muted)
+            this.setIcon(this._volumeToIcon(this._output.volume));
+    }
+};

js/ui/statusIconDispatcher.js

@@ -0,0 +1,65 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+
+const MessageTray = imports.ui.messageTray;
+const NotificationDaemon = imports.ui.notificationDaemon;
+const Util = imports.misc.util;
+
+const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
+    'bluetooth-applet': 'bluetooth',
+    'gnome-volume-control-applet': 'volume', // renamed to gnome-sound-applet
+                                             // when moved to control center
+    'gnome-sound-applet': 'volume',
+    'nm-applet': 'network',
+    'gnome-power-manager': 'battery',
+    'keyboard': 'keyboard',
+    'a11y-keyboard': 'a11y',
+    'kbd-scrolllock': 'keyboard',
+    'kbd-numlock': 'keyboard',
+    'kbd-capslock': 'keyboard',
+    'ibus-ui-gtk': 'input-method'
+};
+
+function StatusIconDispatcher() {
+    this._init();
+}
+
+StatusIconDispatcher.prototype = {
+    _init: function() {
+        this._traymanager = new Shell.TrayManager();
+        this._traymanager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
+        this._traymanager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
+
+        // Yet-another-Ubuntu-workaround - we have to kill their
+        // app-indicators, so that applications fall back to normal
+        // status icons
+        // http://bugzilla.gnome.org/show_bug.cgi=id=621382
+        Util.killall('indicator-application-service');
+    },
+
+    start: function(themeWidget) {
+        this._traymanager.manage_stage(global.stage, themeWidget);
+    },
+
+    _onTrayIconAdded: function(o, icon) {
+        let wmClass = (icon.wm_class || 'unknown').toLowerCase();
+        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
+        if (role)
+            this.emit('status-icon-added', icon, role);
+        else
+            this.emit('message-icon-added', icon);
+    },
+
+    _onTrayIconRemoved: function(o, icon) {
+        let wmClass = (icon.wm_class || 'unknown').toLowerCase();
+        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
+        if (role)
+            this.emit('status-icon-removed', icon);
+        else
+            this.emit('message-icon-removed', icon);
+    }
+};
+Signals.addSignalMethods(StatusIconDispatcher.prototype);

js/ui/statusMenu.js

@@ -1,302 +1,307 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const DBus = imports.dbus;
 const Gdm = imports.gi.Gdm;
+const DBus = imports.dbus;
+const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Signals = imports.signals;
+const Tp = imports.gi.TelepathyGLib;
+const UPowerGlib = imports.gi.UPowerGlib;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
-const Panel = imports.ui.panel;
+const GnomeSession = imports.misc.gnomeSession;
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Util = imports.misc.util;
+
+const BUS_NAME = 'org.gnome.ScreenSaver';
+const OBJECT_PATH = '/org/gnome/ScreenSaver';
+
+const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
+const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
+const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
+const DISABLE_LOG_OUT_KEY = 'disable-log-out';
+
+const ScreenSaverInterface = {
+    name: BUS_NAME,
+    methods: [ { name: 'Lock', inSignature: '' } ]
+};
+
+let ScreenSaverProxy = DBus.makeProxyClass(ScreenSaverInterface);
 
 // Adapted from gdm/gui/user-switch-applet/applet.c
 //
 // Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
 // Copyright (C) 2008,2009 Red Hat, Inc.
 
-const SIDEBAR_VISIBLE_KEY = 'sidebar/visible';
-
-function StatusMenu() {
+function StatusMenuButton() {
     this._init();
 }
 
-StatusMenu.prototype = {
-    _init: function() {
-        this._gdm = Gdm.UserManager.ref_default();
-        this._user = this._gdm.get_user(GLib.get_user_name());
-        this._presence = new GnomeSessionPresence();
+StatusMenuButton.prototype = {
+    __proto__: PanelMenu.Button.prototype,
 
-        this.actor = new St.BoxLayout({ name: 'statusMenu' });
+    _init: function() {
+        PanelMenu.Button.prototype._init.call(this, 0.0);
+        let box = new St.BoxLayout({ name: 'panelStatusMenu' });
+        this.actor.set_child(box);
+
+        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
+
+        this._gdm = Gdm.UserManager.ref_default();
+        this._gdm.queue_load();
+
+        this._user = this._gdm.get_user(GLib.get_user_name());
+        this._presence = new GnomeSession.Presence();
+        this._presenceItems = {};
+        this._session = new GnomeSession.SessionManager();
+
+        this._account_mgr = Tp.AccountManager.dup()
+
+        this._upClient = new UPowerGlib.Client();
+        this._screenSaverProxy = new ScreenSaverProxy(DBus.session, BUS_NAME, OBJECT_PATH);
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
         this._iconBox = new St.Bin();
-        this.actor.add(this._iconBox, { y_align: St.Align.MIDDLE });
+        box.add(this._iconBox, { y_align: St.Align.MIDDLE, y_fill: false });
 
         let textureCache = St.TextureCache.get_default();
-        // FIXME: these icons are all wrong (likewise in createSubMenu)
-        this._availableIcon = textureCache.load_icon_name('gtk-yes', 16);
-        this._busyIcon = textureCache.load_icon_name('gtk-no', 16);
-        this._invisibleIcon = textureCache.load_icon_name('gtk-close', 16);
-        this._idleIcon = textureCache.load_icon_name('gtk-media-pause', 16);
+        this._availableIcon = new St.Icon({ icon_name: 'user-available', style_class: 'popup-menu-icon' });
+        this._busyIcon = new St.Icon({ icon_name: 'user-busy', style_class: 'popup-menu-icon' });
+        this._invisibleIcon = new St.Icon({ icon_name: 'user-invisible', style_class: 'popup-menu-icon' });
+        this._idleIcon = new St.Icon({ icon_name: 'user-idle', style_class: 'popup-menu-icon' });
 
         this._presence.connect('StatusChanged', Lang.bind(this, this._updatePresenceIcon));
         this._presence.getStatus(Lang.bind(this, this._updatePresenceIcon));
 
-        this._name = new St.Label({ text: this._user.get_real_name() });
-        this.actor.add(this._name, { expand: true, y_align: St.Align.MIDDLE });
-        this._userNameChangedId = this._user.connect('notify::display-name', Lang.bind(this, this._updateUserName));
+        this._name = new St.Label();
+        box.add(this._name, { y_align: St.Align.MIDDLE, y_fill: false });
+        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUserName));
+        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUserName));
 
         this._createSubMenu();
-        this._gdm.connect('users-loaded', Lang.bind(this, this._updateSwitchUser));
+        this._gdm.connect('notify::is-loaded', Lang.bind(this, this._updateSwitchUser));
         this._gdm.connect('user-added', Lang.bind(this, this._updateSwitchUser));
         this._gdm.connect('user-removed', Lang.bind(this, this._updateSwitchUser));
+        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
+                                       Lang.bind(this, this._updateSwitchUser));
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+                                       Lang.bind(this, this._updateLogout));
+        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
+                                       Lang.bind(this, this._updateLockScreen));
+        this._updateSwitchUser();
+        this._updateLogout();
+        this._updateLockScreen();
+
+        this._upClient.connect('notify::can-suspend', Lang.bind(this, this._updateSuspendOrPowerOff));
     },
 
     _onDestroy: function() {
-        this._user.disconnect(this._userNameChangedId);
+        this._user.disconnect(this._userLoadedId);
+        this._user.disconnect(this._userChangedId);
     },
 
     _updateUserName: function() {
-        this._name.set_text(this._user.get_real_name());
+        if (this._user.is_loaded)
+          this._name.set_text(this._user.get_real_name());
+        else
+          this._name.set_text("");
+    },
+
+    _updateSessionSeparator: function() {
+        let showSeparator = this._loginScreenItem.actor.visible ||
+                            this._logoutItem.actor.visible ||
+                            this._lockScreenItem.actor.visible;
+        if (showSeparator)
+            this._sessionSeparator.actor.show();
+        else
+            this._sessionSeparator.actor.hide();
     },
 
     _updateSwitchUser: function() {
-        let users = this._gdm.list_users();
-        if (users.length > 1)
-            this._loginScreenItem.show();
+        let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
+        if (allowSwitch && this._gdm.can_switch ())
+            this._loginScreenItem.actor.show();
         else
-            this._loginScreenItem.hide();
+            this._loginScreenItem.actor.hide();
+        this._updateSessionSeparator();
+    },
+
+    _updateLogout: function() {
+        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
+        if (allowLogout)
+            this._logoutItem.actor.show();
+        else
+            this._logoutItem.actor.hide();
+        this._updateSessionSeparator();
+    },
+
+    _updateLockScreen: function() {
+        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
+        if (allowLockScreen)
+            this._lockScreenItem.actor.show();
+        else
+            this._lockScreenItem.actor.hide();
+        this._updateSessionSeparator();
+    },
+
+    _updateSuspendOrPowerOff: function() {
+        this._haveSuspend = this._upClient.get_can_suspend();
+
+        if (!this._suspendOrPowerOffItem)
+            return;
+
+        // If we can't suspend show Power Off... instead
+        // and disable the alt key
+        if (!this._haveSuspend) {
+            this._suspendOrPowerOffItem.updateText(_("Power Off..."), null);
+        } else {
+            this._suspendOrPowerOffItem.updateText(_("Suspend"), _("Power Off..."));
+        }
     },
 
     _updatePresenceIcon: function(presence, status) {
-        if (status == GnomeSessionPresenceStatus.AVAILABLE)
+        if (status == GnomeSession.PresenceStatus.AVAILABLE)
             this._iconBox.child = this._availableIcon;
-        else if (status == GnomeSessionPresenceStatus.BUSY)
+        else if (status == GnomeSession.PresenceStatus.BUSY)
             this._iconBox.child = this._busyIcon;
-        else if (status == GnomeSessionPresenceStatus.INVISIBLE)
+        else if (status == GnomeSession.PresenceStatus.INVISIBLE)
             this._iconBox.child = this._invisibleIcon;
         else
             this._iconBox.child = this._idleIcon;
-    },
 
-    // The menu
-
-    _createImageMenuItem: function(label, iconName, forceIcon) {
-        let image = new Gtk.Image();
-        let item = new Gtk.ImageMenuItem({ label: label,
-                                           image: image,
-                                           always_show_image: forceIcon == true });
-        item.connect('style-set', Lang.bind(this,
-            function() {
-                image.set_from_icon_name(iconName, Gtk.IconSize.MENU);
-            }));
-
-        return item;
+        for (let itemStatus in this._presenceItems)
+            this._presenceItems[itemStatus].setShowDot(itemStatus == status);
     },
 
     _createSubMenu: function() {
-        this._menu = new Gtk.Menu();
-        this._menu.connect('deactivate', Lang.bind(this, function() { this.emit('deactivated'); }));
-
         let item;
 
-        item = this._createImageMenuItem(_("Available"), 'gtk-yes', true);
-        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.AVAILABLE));
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available');
+        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.AVAILABLE));
+        this.menu.addMenuItem(item);
+        this._presenceItems[GnomeSession.PresenceStatus.AVAILABLE] = item;
 
-        item = this._createImageMenuItem(_("Busy"), 'gtk-no', true);
-        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.BUSY));
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy');
+        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.BUSY));
+        this.menu.addMenuItem(item);
+        this._presenceItems[GnomeSession.PresenceStatus.BUSY] = item;
 
-        item = this._createImageMenuItem(_("Invisible"), 'gtk-close', true);
-        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.INVISIBLE));
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);
 
-        item = new Gtk.SeparatorMenuItem();
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupMenuItem(_("My Account"));
+        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+        this.menu.addMenuItem(item);
 
-        item = this._createImageMenuItem(_("Account Information..."), 'user-info');
-        item.connect('activate', Lang.bind(this, this._onAccountInformationActivate));
-        this._menu.append(item);
-        item.show();
-
-        let gconf = Shell.GConf.get_default();
-        item = new Gtk.CheckMenuItem({ label: _("Sidebar"),
-                                       active: gconf.get_boolean(SIDEBAR_VISIBLE_KEY) });
-        item.connect('activate', Lang.bind(this,
-            function() {
-                gconf.set_boolean(SIDEBAR_VISIBLE_KEY, this._sidebarItem.active);
-            }));
-        this._menu.append(item);
-        item.show();
-        this._sidebarItem = item;
-
-        item = this._createImageMenuItem(_("System Preferences..."), 'preferences-desktop');
+        item = new PopupMenu.PopupMenuItem(_("System Settings"));
         item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);
 
-        item = new Gtk.SeparatorMenuItem();
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);
 
-        item = this._createImageMenuItem(_("Lock Screen"), 'system-lock-screen');
+        item = new PopupMenu.PopupMenuItem(_("Lock Screen"));
         item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);
+        this._lockScreenItem = item;
 
-        item = this._createImageMenuItem(_("Switch User"), 'system-users');
+        item = new PopupMenu.PopupMenuItem(_("Switch User"));
         item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);
         this._loginScreenItem = item;
 
-        item = this._createImageMenuItem(_("Log Out..."), 'system-log-out');
+        item = new PopupMenu.PopupMenuItem(_("Log Out..."));
         item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);
+        this._logoutItem = item;
 
-        item = this._createImageMenuItem(_("Shut Down..."), 'system-shutdown');
-        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);
+        this._sessionSeparator = item;
+
+        item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"),
+                                                      _("Power Off..."));
+        this.menu.addMenuItem(item);
+        this._suspendOrPowerOffItem = item;
+        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
+        this._updateSuspendOrPowerOff();
     },
 
-    _setPresenceStatus: function(item, status) {
+    _setPresenceStatus: function(item, event, status) {
         this._presence.setStatus(status);
+
+        this._setIMStatus(status);
     },
 
-    _onAccountInformationActivate: function() {
-        this._spawn(['gnome-about-me']);
+    _onMyAccountActivate: function() {
+        Main.overview.hide();
+        let app = Shell.AppSystem.get_default().get_app('gnome-user-accounts-panel.desktop');
+        app.activate(-1);
     },
 
     _onPreferencesActivate: function() {
-        this._spawn(['gnome-control-center']);
+        Main.overview.hide();
+        let app = Shell.AppSystem.get_default().get_app('gnome-control-center.desktop');
+        app.activate(-1);
     },
 
     _onLockScreenActivate: function() {
-        this._spawn(['gnome-screensaver-command', '--lock']);
+        Main.overview.hide();
+        this._screenSaverProxy.LockRemote();
     },
 
     _onLoginScreenActivate: function() {
+        Main.overview.hide();
         this._gdm.goto_login_session();
         this._onLockScreenActivate();
     },
 
     _onQuitSessionActivate: function() {
-        this._spawn(['gnome-session-save', '--logout-dialog']);
+        Main.overview.hide();
+        this._session.LogoutRemote(0);
     },
 
-    _onShutDownActivate: function() {
-        this._spawn(['gnome-session-save', '--shutdown-dialog']);
-    },
+    _onSuspendOrPowerOffActivate: function() {
+        Main.overview.hide();
 
-    _spawn: function(args) {
-        // FIXME: once Shell.Process gets support for signalling
-        // errors we should pop up an error dialog or something here
-        // on failure
-        let p = new Shell.Process({'args' : args});
-        p.run();
-    },
-
-    // shell_status_menu_toggle:
-    // @event: event causing the toggle
-    //
-    // If the menu is not currently up, pops it up. Otherwise, hides it.
-    // Popping up may fail if another grab is already active; check with
-    // isActive().
-    toggle: function(event) {
-        if (this._menu.visible)
-            this._menu.popdown();
-        else {
-            // We don't want to overgrab a Mutter grab with the grab
-            // that GTK+ uses on menus.
-            if (global.display_is_grabbed())
-                return;
-
-            let [menuWidth, menuHeight] = this._menu.get_size_request ();
-
-            let panel;
-            for (panel = this.actor; panel; panel = panel.get_parent()) {
-                if (panel._delegate instanceof Panel.Panel)
-                    break;
-            }
-
-            let [panelX, panelY] = panel.get_transformed_position();
-            let [panelWidth, panelHeight] = panel.get_transformed_size();
-
-            let menuX;
-            if (St.Widget.get_default_direction() == St.TextDirection.RTL) {
-                menuX = panelX;
-            } else {
-                menuX = Math.round(panelX + panelWidth - menuWidth);
-            }
-            let menuY = Math.round(panelY + panelHeight);
-
-            Shell.popup_menu(this._menu, event.get_button(), event.get_time(),
-                             menuX, menuY);
+        if (this._haveSuspend &&
+            this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
+            this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
+                this._upClient.suspend_sync(null);
+            }));
+        } else {
+            this._session.ShutdownRemote();
         }
     },
-    
-    //  isActive:
-    //  
-    //  Gets whether the menu is currently popped up
-    //  
-    //  Return value: %true if the menu is currently popped up
-    isActive: function() {
-        return this._menu.visible;
+
+    _setIMStatus: function(session_status) {
+        let [presence_type, presence_status, msg] = this._account_mgr.get_most_available_presence();
+        let type, status;
+
+        // We change the IM presence only if there are connected accounts
+        if (presence_type == Tp.ConnectionPresenceType.UNSET ||
+            presence_type == Tp.ConnectionPresenceType.OFFLINE ||
+            presence_type == Tp.ConnectionPresenceType.UNKNOWN ||
+            presence_type == Tp.ConnectionPresenceType.ERROR)
+          return;
+
+        if (session_status == GnomeSession.PresenceStatus.AVAILABLE) {
+            type = Tp.ConnectionPresenceType.AVAILABLE;
+            status = "available";
+        }
+        else if (session_status == GnomeSession.PresenceStatus.BUSY) {
+            type = Tp.ConnectionPresenceType.BUSY;
+            status = "busy";
+        }
+        else {
+          return;
+        }
+
+        this._account_mgr.set_all_requested_presences(type, status, msg);
     }
 };
-Signals.addSignalMethods(StatusMenu.prototype);
-
-
-const GnomeSessionPresenceIface = {
-    name: 'org.gnome.SessionManager.Presence',
-    methods: [{ name: 'SetStatus',
-                inSignature: 'u' }],
-    properties: [{ name: 'status',
-                   signature: 'u',
-                   access: 'readwrite' }],
-    signals: [{ name: 'StatusChanged',
-                inSignature: 'u' }]
-};
-
-const GnomeSessionPresenceStatus = {
-    AVAILABLE: 0,
-    INVISIBLE: 1,
-    BUSY: 2,
-    IDLE: 3
-};
-
-function GnomeSessionPresence() {
-    this._init();
-}
-
-GnomeSessionPresence.prototype = {
-    _init: function() {
-        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
-        this.connect('StatusChanged', Lang.bind(this, function (proxy, status) { this.status = status; }));
-    },
-
-    getStatus: function(callback) {
-        this.GetRemote('status', Lang.bind(this,
-            function(status, ex) {
-                if (!ex)
-                    callback(this, status);
-            }));
-    },
-
-    setStatus: function(status) {
-        this.SetStatusRemote(status);
-    }
-};
-DBus.proxifyPrototype(GnomeSessionPresence.prototype, GnomeSessionPresenceIface);
-

js/ui/telepathyClient.js

@@ -0,0 +1,554 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const St = imports.gi.St;
+const Tpl = imports.gi.TelepathyLogger;
+const Tp = imports.gi.TelepathyGLib;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+const C_ = Gettext.pgettext;
+
+const History = imports.misc.history;
+const Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;
+
+
+// See Notification.appendMessage
+const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute
+const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes
+const SCROLLBACK_RECENT_LENGTH = 20;
+const SCROLLBACK_IDLE_LENGTH = 5;
+
+// See Source._displayPendingMessages
+const SCROLLBACK_HISTORY_LINES = 10;
+
+const NotificationDirection = {
+    SENT: 'chat-sent',
+    RECEIVED: 'chat-received'
+};
+
+let contactFeatures = [Tp.ContactFeature.ALIAS,
+                        Tp.ContactFeature.AVATAR_DATA,
+                        Tp.ContactFeature.PRESENCE];
+
+// This is GNOME Shell's implementation of the Telepathy 'Client'
+// interface. Specifically, the shell is a Telepathy 'Observer', which
+// lets us see messages even if they belong to another app (eg,
+// Empathy).
+
+function makeMessageFromTpMessage(tpMessage, direction) {
+    let [text, flags] = tpMessage.to_text();
+    return {
+        messageType: tpMessage.get_message_type(),
+        text: text,
+        sender: tpMessage.sender.alias,
+        timestamp: tpMessage.get_received_timestamp(),
+        direction: direction
+    };
+}
+
+
+function makeMessageFromTplEvent(event) {
+    let sent = event.get_sender().get_entity_type() == Tpl.EntityType.SELF;
+    let direction = sent ? NotificationDirection.SENT : NotificationDirection.RECEIVED;
+
+    return {
+        messageType: event.get_message_type(),
+        text: event.get_message(),
+        sender: event.get_sender().get_alias(),
+        timestamp: event.get_timestamp(),
+        direction: direction
+    };
+}
+
+function Client() {
+    this._init();
+};
+
+Client.prototype = {
+    _init : function() {
+        // channel path -> Source
+        this._sources = {};
+
+        // Set up a SimpleObserver, which will call _observeChannels whenever a
+        // channel matching its filters is detected.
+        // The second argument, recover, means _observeChannels will be run
+        // for any existing channel as well.
+        let dbus = Tp.DBusDaemon.dup();
+        this._observer = Tp.SimpleObserver.new(dbus, true, 'GnomeShell', true,
+                                              Lang.bind(this, this._observeChannels));
+
+        // We only care about single-user text-based chats
+        let props = {};
+        props[Tp.PROP_CHANNEL_CHANNEL_TYPE] = Tp.IFACE_CHANNEL_TYPE_TEXT;
+        props[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE] = Tp.HandleType.CONTACT;
+        this._observer.add_observer_filter(props);
+
+        try {
+            this._observer.register();
+        } catch (e) {
+            throw new Error('Couldn\'t register SimpleObserver. Error: \n' + e);
+        }
+    },
+
+    _observeChannels: function(observer, account, conn, channels,
+                               dispatchOp, requests, context) {
+        // If the self_contact doesn't have the ALIAS, make sure
+        // to fetch it before trying to grab the channels.
+        let self_contact = conn.get_self_contact();
+        if (self_contact.has_feature(Tp.ContactFeature.ALIAS)) {
+            this._finishObserveChannels(account, conn, channels, context);
+        } else {
+            Shell.get_self_contact_features(conn,
+                                            contactFeatures.length, contactFeatures,
+                                            Lang.bind(this, function() {
+                                                this._finishObserveChannels(account, conn, channels, context);
+                                            }));
+            context.delay();
+        }
+    },
+
+    _finishObserveChannels: function(account, conn, channels, context) {
+        let len = channels.length;
+        for (let i = 0; i < len; i++) {
+            let channel = channels[i];
+            let [targetHandle, targetHandleType] = channel.get_handle();
+
+            /* Only observe contact text channels */
+            if ((!(channel instanceof Tp.TextChannel)) ||
+               targetHandleType != Tp.HandleType.CONTACT)
+               continue;
+
+            /* Request a TpContact */
+            Shell.get_tp_contacts(conn, 1, [targetHandle],
+                    contactFeatures.length, contactFeatures,
+                    Lang.bind(this,  function (connection, contacts, failed) {
+                        if (contacts.length < 1)
+                            return;
+
+                        /* We got the TpContact */
+                        this._createSource(account, conn, channel, contacts[0]);
+                    }), null);
+        }
+
+        context.accept();
+    },
+
+    _createSource: function(account, conn, channel, contact) {
+        if (this._sources[channel.get_object_path()])
+            return;
+
+        let source = new Source(account, conn, channel, contact);
+
+        this._sources[channel.get_object_path()] = source;
+        source.connect('destroy', Lang.bind(this,
+                       function() {
+                           delete this._sources[channel.get_object_path()];
+                       }));
+    }
+};
+
+function Source(account, conn, channel, contact) {
+    this._init(account, conn, channel, contact);
+}
+
+Source.prototype = {
+    __proto__:  MessageTray.Source.prototype,
+
+    _init: function(account, conn, channel, contact) {
+        MessageTray.Source.prototype._init.call(this, contact.get_alias());
+
+        this.isChat = true;
+
+        this._account = account;
+        this._contact = contact;
+
+        this._conn = conn;
+        this._channel = channel;
+        this._closedId = this._channel.connect('invalidated', Lang.bind(this, this._channelClosed));
+
+        this._notification = new Notification(this);
+        this._notification.setUrgency(MessageTray.Urgency.HIGH);
+
+        this._presence = contact.get_presence_type();
+
+        this._sentId = this._channel.connect('message-sent', Lang.bind(this, this._messageSent));
+        this._receivedId = this._channel.connect('message-received', Lang.bind(this, this._messageReceived));
+
+        this._setSummaryIcon(this.createNotificationIcon());
+
+        this._notifyAliasId = this._contact.connect('notify::alias', Lang.bind(this, this._updateAlias));
+        this._notifyAvatarId = this._contact.connect('notify::avatar-file', Lang.bind(this, this._updateAvatarIcon));
+        this._presenceChangedId = this._contact.connect('presence-changed', Lang.bind(this, this._presenceChanged));
+
+        // Add ourselves as a source.
+        Main.messageTray.add(this);
+        this.pushNotification(this._notification);
+
+        this._getLogMessages();
+    },
+
+    _updateAlias: function() {
+        let oldAlias = this.title;
+        this.title = this._contact.get_alias();
+        this._notification.appendAliasChange(oldAlias, this.title);
+        this.pushNotification(this._notification);
+    },
+
+    createNotificationIcon: function() {
+        this._iconBox = new St.Bin({ style_class: 'avatar-box' });
+        this._iconBox._size = this.ICON_SIZE;
+
+        this._updateAvatarIcon();
+
+        return this._iconBox;
+    },
+
+    _updateAvatarIcon: function() {
+        let textureCache = St.TextureCache.get_default();
+        let file = this._contact.get_avatar_file();
+
+        if (file) {
+            let uri = file.get_uri();
+            this._iconBox.child = textureCache.load_uri_async(uri, this._iconBox._size, this._iconBox._size);
+        } else {
+            this._iconBox.child = new St.Icon({ icon_name: 'avatar-default',
+                                                icon_type: St.IconType.FULLCOLOR,
+                                                icon_size: this._iconBox._size });
+        }
+    },
+
+    open: function(notification) {
+        let props = {};
+        props[Tp.PROP_CHANNEL_CHANNEL_TYPE] = Tp.IFACE_CHANNEL_TYPE_TEXT;
+        [props[Tp.PROP_CHANNEL_TARGET_HANDLE], props[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE]] = this._channel.get_handle();
+
+        let req = Tp.AccountChannelRequest.new(this._account, props, global.get_current_time());
+
+        req.ensure_channel_async('', null, null);
+    },
+
+    _getLogMessages: function() {
+        let logManager = Tpl.LogManager.dup_singleton();
+        let entity = Tpl.Entity.new_from_tp_contact(this._contact, Tpl.EntityType.CONTACT);
+        Shell.get_contact_events(logManager,
+                                 this._account, entity,
+                                 SCROLLBACK_HISTORY_LINES,
+                                 Lang.bind(this, this._displayPendingMessages));
+    },
+
+    _displayPendingMessages: function(logManager, result) {
+        let [success, events] = logManager.get_filtered_events_finish(result);
+
+        let logMessages = events.map(makeMessageFromTplEvent);
+
+        let pendingTpMessages = this._channel.get_pending_messages();
+        let pendingMessages = pendingTpMessages.map(function (tpMessage) { return makeMessageFromTpMessage(tpMessage, NotificationDirection.RECEIVED); });
+
+        let showTimestamp = false;
+
+        for (let i = 0; i < logMessages.length; i++) {
+            let logMessage = logMessages[i];
+            let isPending = false;
+
+            // Skip any log messages that are also in pendingMessages
+            for (let j = 0; j < pendingMessages.length; j++) {
+                let pending = pendingMessages[j];
+                if (logMessage.timestamp == pending.timestamp && logMessage.text == pending.text) {
+                    isPending = true;
+                    break;
+                }
+            }
+
+            if (!isPending) {
+                showTimestamp = true;
+                this._notification.appendMessage(logMessage, true, ['chat-log-message']);
+            }
+        }
+
+        if (showTimestamp)
+            this._notification.appendTimestamp();
+
+        for (let i = 0; i < pendingMessages.length; i++)
+            this._notification.appendMessage(pendingMessages[i], true);
+
+        if (pendingMessages.length > 0)
+            this.notify();
+    },
+
+    _channelClosed: function() {
+        this._channel.disconnect(this._closedId);
+        this._channel.disconnect(this._receivedId);
+        this._channel.disconnect(this._sentId);
+
+        this._contact.disconnect(this._notifyAliasId);
+        this._contact.disconnect(this._notifyAvatarId);
+        this._contact.disconnect(this._presenceChangedId);
+
+        this.destroy();
+    },
+
+    _messageReceived: function(channel, message) {
+        message = makeMessageFromTpMessage(message, NotificationDirection.RECEIVED);
+        this._notification.appendMessage(message);
+        this.notify();
+    },
+
+    // This is called for both messages we send from
+    // our client and other clients as well.
+    _messageSent: function(channel, message, flags, token) {
+        message = makeMessageFromTpMessage(message, NotificationDirection.SENT);
+        this._notification.appendMessage(message);
+    },
+
+    notify: function() {
+        MessageTray.Source.prototype.notify.call(this, this._notification);
+    },
+
+    respond: function(text) {
+        let type;
+        if (text.slice(0, 4) == '/me ') {
+            type = Tp.ChannelTextMessageType.ACTION;
+            text = text.slice(4);
+        } else {
+            type = Tp.ChannelTextMessageType.NORMAL;
+        }
+
+        let msg = Tp.ClientMessage.new_text(type, text);
+        this._channel.send_message_async(msg, 0, null);
+    },
+
+    _presenceChanged: function (contact, presence, type, status, message) {
+        let msg, shouldNotify, title;
+
+        if (this._presence == presence)
+          return;
+
+        title = GLib.markup_escape_text(this.title, -1);
+
+        if (presence == Tp.ConnectionPresenceType.AVAILABLE) {
+            msg = _("%s is online.").format(title);
+            shouldNotify = (this._presence == Tp.ConnectionPresenceType.OFFLINE);
+        } else if (presence == Tp.ConnectionPresenceType.OFFLINE ||
+                   presence == Tp.ConnectionPresenceType.EXTENDED_AWAY) {
+            presence = Tp.ConnectionPresenceType.OFFLINE;
+            msg = _("%s is offline.").format(title);
+            shouldNotify = (this._presence != Tp.ConnectionPresenceType.OFFLINE);
+        } else if (presence == Tp.ConnectionPresenceType.AWAY) {
+            msg = _("%s is away.").format(title);
+            shouldNotify = false;
+        } else if (presence == Tp.ConnectionPresenceType.BUSY) {
+            msg = _("%s is busy.").format(title);
+            shouldNotify = false;
+        } else
+            return;
+
+        this._presence = presence;
+
+        if (message)
+            msg += ' <i>(' + GLib.markup_escape_text(message, -1) + ')</i>';
+
+        this._notification.appendPresence(msg, shouldNotify);
+        if (shouldNotify)
+            this.notify();
+    }
+};
+
+function Notification(source) {
+    this._init(source);
+}
+
+Notification.prototype = {
+    __proto__:  MessageTray.Notification.prototype,
+
+    _init: function(source) {
+        MessageTray.Notification.prototype._init.call(this, source, source.title, null, { customContent: true });
+        this.setResident(true);
+
+        this._responseEntry = new St.Entry({ style_class: 'chat-response',
+                                             can_focus: true });
+        this._responseEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivated));
+        this.setActionArea(this._responseEntry);
+
+        this._oldMaxScrollAdjustment = 0;
+        this._createScrollArea();
+
+        this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
+            let currentValue = adjustment.value + adjustment.page_size;
+            if (currentValue == this._oldMaxScrollAdjustment)
+                this.scrollTo(St.Side.BOTTOM);
+            this._oldMaxScrollAdjustment = adjustment.upper;
+        }));
+
+        this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
+
+        this._history = [];
+        this._timestampTimeoutId = 0;
+    },
+
+    /**
+     * appendMessage:
+     * @message: An object with the properties:
+     *   text: the body of the message,
+     *   messageType: a #Tp.ChannelTextMessageType,
+     *   sender: the name of the sender,
+     *   timestamp: the time the message was sent
+     *   direction: a #NotificationDirection
+     * 
+     * @noTimestamp: Whether to add a timestamp. If %true, no timestamp
+     *   will be added, regardless of the difference since the
+     *   last timestamp
+     * @styles: A list of CSS class names.
+     */
+    appendMessage: function(message, noTimestamp, styles) {
+        let messageBody = GLib.markup_escape_text(message.text, -1);
+        styles = styles || [];
+        styles.push(message.direction);
+
+        if (message.messageType == Tp.ChannelTextMessageType.ACTION) {
+            let senderAlias = GLib.markup_escape_text(message.sender, -1);
+            messageBody = '<i>%s</i> %s'.format(senderAlias, messageBody);
+            styles.push('chat-action');
+        }
+
+        if (message.direction == NotificationDirection.RECEIVED) {
+            this.update(this.source.title, messageBody, { customContent: true,
+                                                          bannerMarkup: true });
+        }
+
+        this._append(messageBody, styles, message.timestamp, noTimestamp);
+    },
+
+    _append: function(text, styles, timestamp, noTimestamp) {
+        let currentTime = (Date.now() / 1000);
+        if (!timestamp)
+            timestamp = currentTime;
+        let lastMessageTime = -1;
+        if (this._history.length > 0)
+            lastMessageTime = this._history[0].time;
+
+        // Reset the old message timeout
+        if (this._timestampTimeoutId)
+            Mainloop.source_remove(this._timestampTimeoutId);
+
+        let body = this.addBody(text, true);
+        for (let i = 0; i < styles.length; i ++)
+            body.add_style_class_name(styles[i]);
+
+        this._history.unshift({ actor: body, time: timestamp, realMessage: true });
+
+        if (!noTimestamp) {
+            if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME)
+                this.appendTimestamp();
+            else
+                // Schedule a new timestamp in SCROLLBACK_IMMEDIATE_TIME
+                // from the timestamp of the message.
+                this._timestampTimeoutId = Mainloop.timeout_add_seconds(
+                    SCROLLBACK_IMMEDIATE_TIME - (currentTime - timestamp),
+                    Lang.bind(this, this.appendTimestamp));
+        }
+
+        if (this._history.length > 1) {
+            // Keep the scrollback from growing too long. If the most
+            // recent message (before the one we just added) is within
+            // SCROLLBACK_RECENT_TIME, we will keep
+            // SCROLLBACK_RECENT_LENGTH previous messages. Otherwise
+            // we'll keep SCROLLBACK_IDLE_LENGTH messages.
+
+            let maxLength = (lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME) ?
+                SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
+            let filteredHistory = this._history.filter(function(item) { return item.realMessage });
+            if (filteredHistory.length > maxLength) {
+                let lastMessageToKeep = filteredHistory[maxLength];
+                let expired = this._history.splice(this._history.indexOf(lastMessageToKeep));
+                for (let i = 0; i < expired.length; i++)
+                    expired[i].actor.destroy();
+            }
+        }
+    },
+
+    _formatTimestamp: function(date) {
+        let now = new Date();
+
+        var daysAgo = (now.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
+
+        let format;
+
+        // Show a week day and time if date is in the last week
+        if (daysAgo < 1 || (daysAgo < 7 && now.getDay() != date.getDay())) {
+            /* Translators: this is a time format string followed by a date.
+             If applicable, replace %X with a strftime format valid for your
+             locale, without seconds. */
+            // xgettext:no-c-format
+            format = _("Sent at %X on %A");
+
+        // FIXME: The next two are stolen from calendar.js with the comment to avoid
+        // a string-freeze break. They should be replaced with better strings
+        // with 'Sent at', appropriate context and appropriate translator comment.
+
+        } else if (date.getYear() == now.getYear()) {
+            /* Translators: Shown on calendar heading when selected day occurs on current year */
+            format = C_("calendar heading", "%A, %B %d");
+        } else {
+            /* Translators: Shown on calendar heading when selected day occurs on different year */
+            format = C_("calendar heading", "%A, %B %d, %Y");
+        }
+
+        return date.toLocaleFormat(format);
+    },
+
+    appendTimestamp: function() {
+        let lastMessageTime = this._history[0].time;
+        let lastMessageDate = new Date(lastMessageTime * 1000);
+
+        let timeLabel = this.addBody(this._formatTimestamp(lastMessageDate), false, { expand: true, x_fill: false, x_align: St.Align.END });
+        timeLabel.add_style_class_name('chat-meta-message');
+        this._history.unshift({ actor: timeLabel, time: lastMessageTime, realMessage: false });
+
+        this._timestampTimeoutId = 0;
+        return false;
+    },
+
+    appendPresence: function(text, asTitle) {
+        if (asTitle)
+            this.update(text, null, { customContent: true, titleMarkup: true });
+        else
+            this.update(this.source.title, null, { customContent: true });
+        let label = this.addBody(text, true);
+        label.add_style_class_name('chat-meta-message');
+        this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false});
+    },
+
+    appendAliasChange: function(oldAlias, newAlias) {
+        // FIXME: uncomment this after 3.0 string freeze ends
+
+        // oldAlias = GLib.markup_escape_text(oldAlias, -1);
+        // newAlias = GLib.markup_escape_text(newAlias, -1);
+
+        // /* Translators: this is the other person changing their old IM name to their new
+        //    IM name. */
+        // let message = '<i>' + _("%s is now known as %s").format(oldAlias, newAlias) + '</i>';
+        // let label = this.addBody(message, true);
+        // label.add_style_class_name('chat-meta-message');
+        // this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false });
+        // this.update(newAlias, null, { customContent: true });
+    },
+
+    _onEntryActivated: function() {
+        let text = this._responseEntry.get_text();
+        if (text == '')
+            return;
+
+        this._inputHistory.addItem(text);
+
+        // Telepathy sends out the Sent signal for us.
+        // see Source._messageSent
+        this._responseEntry.set_text('');
+        this.source.respond(text);
+    }
+};