Update for review of e57b7ec335

Clutter no longer allows using a clone of an actor that is not a part of
the scene graph. This is what used to happen when we created a clone for
the icon of the item that was being dragged, and then closed the More panes
with the original item, removing the icon from the scene graph. This was
also when happened when the user hit Esc while dragging, which prompted the
overlay to close, removing the original icon from the scene graph.

Rename getIcon() methods to createIcon() to better reflect on the fact that
a new icon is created each time the method is called (we do use cache in
some cases).

Remove a stray log message in overlay.js

Fixes http://bugzilla.gnome.org/show_bug.cgi?id=585490
and http://bugzilla.gnome.org/show_bug.cgi?id=585489

.gitignore

@@ -16,17 +16,7 @@ config.log
 config.status
 config
 configure
-data/gnome-shell.desktop
-data/gnome-shell.desktop.in
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
 libtool
-omf.make
-po/*.gmo
-po/Makefile.in.in
-po/POTFILES
-po/stamp-it
 scripts/launcher.pyc
 src/*.gir
 src/*.typelib
@@ -38,9 +28,4 @@ src/gnomeshell-taskpanel
 src/gnome-shell
 src/test-recorder
 src/test-recorder.ogg
-src/test-theme
 stamp-h1
-tests/run-test.sh
-xmldocs.make
-*~
-*.patch

Makefile.am

@@ -1,22 +1,13 @@
-SUBDIRS = data js src tests po
+SUBDIRS = data js src
 
 EXTRA_DIST =		\
 	.project	\
-	.settings	\
-	autogen.sh
-
-# These are files checked into Git that we don't want to distribute
-DIST_EXCLUDE =					\
-	.gitignore				\
-	gnome-shell.doap			\
-	MAINTAINERS				\
-	tools/build/*
+	.settings
 
 distcheck-hook:
-	@echo "Checking disted files against files in git"
+	@echo "Checking disted javascript against files in git"
 	@failed=false; \
-	exclude=`(for p in $(DIST_EXCLUDE) ; do echo --exclude=$$p ; done)`; \
-	for f in `cd $(srcdir) && git ls-files $$exclude` ; do \
+	for f in `cd $(srcdir) && git-ls-files js` ; do \
 		if ! test -e $(distdir)/$$f ; then \
 			echo File missing from distribution: $$f ; \
 			failed=true ; \

README

@@ -1,20 +0,0 @@
-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.
-
-For more information about GNOME Shell, including instructions on how
-to build GNOME Shell from source and how to get involved with the project,
-see:
-
- http://live.gnome.org/GnomeShell
-
-Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
-product.
-
-License
-=======
-GNOME Shell is distributed under the terms of the GNU General Public License,
-version 2 or later. See the COPYING file for details.
-

autogen.sh

@@ -1,22 +1,8 @@
-#!/bin/bash
-# Run this to generate all the initial makefiles, etc.
+#!/bin/sh
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="gnome-shell"
-REQUIRED_AUTOMAKE_VERSION=1.10
-
-(test -f $srcdir/configure.ac \
-  && test -d $srcdir/src) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level gnome-shell directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from GNOME Subversion (or from"
-    echo "your OS vendor's package manager)."
-    exit 1
-}
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+(cd `dirname $0`;
+    touch ChangeLog NEWS &&
+    autoreconf --install --symlink &&
+    autoreconf &&
+    ./configure --enable-maintainer-mode $@
+)

configure.ac

@@ -1,12 +1,10 @@
-AC_INIT(gnome-shell, 2.28.1)
+AC_INIT(gnome-shell, 0.0.1)
 
 AC_CONFIG_AUX_DIR(config)
 
-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 AM_MAINTAINER_MODE
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
-
 AC_CONFIG_HEADERS(config.h)
 
 AC_DISABLE_STATIC
@@ -22,16 +20,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 
 PKG_PROG_PKG_CONFIG(0.16)
 
-IT_PROG_INTLTOOL(0.26)
-AM_GLIB_GNU_GETTEXT
-
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_GCONF_SOURCE_2
 
-# Get a value to substitute into gnome-shell.in
-AM_PATH_PYTHON([2.5])
-AC_SUBST(PYTHON)
-
 # We need at least this, since gst_plugin_register_static() was added
 # in 0.10.16, but nothing older than 0.10.21 has been tested.
 GSTREAMER_MIN_VERSION=0.10.16
@@ -43,24 +33,23 @@ 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)
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-0.9)
 else
    AC_MSG_RESULT(no)
 fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-# 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
-                                 gjs-gi-1.0 libgnome-menu $recorder_modules gconf-2.0
-                                 gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0
-                                 gnome-desktop-2.0 >= 2.26 libstartup-notification-1.0
-                                 gobject-introspection-1.0 >= 0.6.5)
-PKG_CHECK_MODULES(TIDY, clutter-1.0)
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-2.0 libcroco-0.6)
-PKG_CHECK_MODULES(BIG, clutter-1.0 gtk+-2.0 librsvg-2.0)
+PKG_CHECK_MODULES(MUTTER_PLUGIN, gtk+-2.0 dbus-glib-1 mutter-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-0.9 clutter-glx-0.9)
+PKG_CHECK_MODULES(TIDY, clutter-0.9)
+PKG_CHECK_MODULES(BIG, clutter-0.9 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(TASKPANEL, libwnck-1.0 dbus-glib-1)
+# We require libgnomeui for generating thumbnails for recent files with GnomeThumbnailFactory.
+# We'll switch to using GnomeDesktopThumbnailFactory once the branch of gnome-desktop that contains
+# it becomes stable.
+PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
 
 MUTTER_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix mutter-plugins`/bin
 # FIXME: metacity-plugins.pc should point directly to its .gir file
@@ -91,31 +80,17 @@ AC_SUBST(GIRDIR)
 TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
 AC_SUBST(TYPELIBDIR)
 
-# Stay command-line compatible with the gnome-common configure option. Here
-# minimum/yes/maximum are the same, however.
-AC_ARG_ENABLE(compile_warnings,
-  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                 [Turn on compiler warnings]),,
-  enable_compile_warnings=error)
-
 changequote(,)dnl
-if test "$enable_compile_warnings" != no ; then
-  if test "x$GCC" = "xyes"; then
-    case " $CFLAGS " in
-    *[\ \	]-Wall[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -Wall" ;;
-    esac
-    case " $CFLAGS " in
-    *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
-    esac
-    if test "$enable_compile_warnings" = error ; then
-      case " $CFLAGS " in
-      *[\ \	]-Werror[\ \	]*) ;;
-      *) CFLAGS="$CFLAGS -Werror" ;;
-      esac
-    fi
-  fi
+if test "x$GCC" = "xyes"; then
+  case " $CFLAGS " in
+  *[\ \	]-Wall[\ \	]*) ;;
+  *) CFLAGS="$CFLAGS -Wall" ;;
+  esac
+
+  case " $OBJCFLAGS " in
+  *[\ \	]-Wall[\ \	]*) ;;
+  *) OBJCFLAGS="$OBJCFLAGS -Wall" ;;
+  esac
 fi
 changequote([,])dnl
 
@@ -129,6 +104,4 @@ AC_OUTPUT([
   js/misc/Makefile
   js/ui/Makefile
   src/Makefile
-  tests/Makefile
-  po/Makefile.in
 ])

data/Makefile.am

@@ -1,49 +1,14 @@
-desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop
+imagedir = $(pkgdatadir)/images
 
-# 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
-	$(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
-	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
-
-imagesdir = $(pkgdatadir)/images
-dist_images_DATA =				\
-	add-workspace.svg			\
-	app-well-glow.png			\
-	close-black.svg				\
-	magnifier.svg				\
+dist_image_DATA =		\
+	add-workspace.svg	\
 	remove-workspace.svg
 
-themedir = $(pkgdatadir)/theme
-dist_theme_DATA =				\
-	theme/gnome-shell.css			\
-	theme/close.svg                 \
-	theme/close-window.svg			\
-	theme/scroll-button-down.png		\
-	theme/scroll-button-down-hover.png	\
-	theme/scroll-button-up.png		\
-	theme/scroll-button-up-hover.png	\
-	theme/scroll-vhandle.png        \
-	theme/section-back.svg          \
-	theme/section-more.svg
-
 schemadir  = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = gnome-shell.schemas
 
 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 $(top_builddir)/data/$(schema_DATA)
 
-EXTRA_DIST =					\
-	gnome-shell.desktop.in.in		\
+EXTRA_DIST =			\
 	$(schema_DATA)
-
-CLEANFILES =					\
-	gnome-shell.desktop.in			\
-	$(desktop_DATA)
-

data/gnome-shell.desktop.in.in

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell
-_Comment=Window management and application launching
-Exec=@bindir@/gnome-shell
-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;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=panel;windowmanager;
-X-GNOME-Autostart-Notify=true

data/gnome-shell.schemas

@@ -1,21 +1,6 @@
 <gconfschemafile>
     <schemalist>
 
-      <schema>
-        <key>/schemas/desktop/gnome/shell/development_tools</key>
-        <applyto>/desktop/gnome/shell/development_tools</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>
@@ -35,7 +20,7 @@
 	<applyto>/desktop/gnome/shell/favorite_apps</applyto>
 	<owner>gnome-shell</owner>
 	<type>list</type>
-	<list_type>string</list_type>
+	<listtype>string</listtype>
 	<default>[mozilla-firefox.desktop,evolution.desktop,openoffice.org-writer.desktop]</default>
 	<locale name="C">
 	  <short>List of desktop file IDs for favorite applications</short>
@@ -45,64 +30,6 @@
 	</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/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>
-          <long>
-            GNOME Shell extensions have a uuid property; this key lists extensions which should not be loaded.
-         </long>
-        </locale>
-      </schema>
-
   </schemalist>
 
-</gconfschemafile>
+</gconfschemafile>

data/info.svg

@@ -1,12 +1,12 @@
 <?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.1"
@@ -19,28 +19,36 @@
    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:version="0.46"
+   sodipodi:docname="info_16.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata2399"><rdf:RDF><cc:Work
+   id="metadata2389"><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
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2387"><linearGradient
+     id="linearGradient3710"><stop
        style="stop-color:#c4c4c4;stop-opacity:1;"
        offset="0"
-       id="stop3175" /><stop
+       id="stop3712" /><stop
        style="stop-color:#ffffff;stop-opacity:1;"
        offset="1"
-       id="stop3177" /></linearGradient><inkscape:perspective
+       id="stop3714" /></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"
+     id="perspective2391" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3710"
+     id="linearGradient3716"
+     x1="7.9066148"
+     y1="15.937743"
+     x2="7.9377432"
+     y2="0.031128405"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   inkscape:window-height="713"
+   inkscape:window-width="722"
    inkscape:pageshadow="2"
    inkscape:pageopacity="0.0"
    guidetolerance="10.0"
@@ -53,14 +61,14 @@
    showgrid="false"
    inkscape:zoom="32.125"
    inkscape:cx="8"
-   inkscape:cy="10.440056"
-   inkscape:window-x="40"
-   inkscape:window-y="40"
+   inkscape:cy="8.154146"
+   inkscape:window-x="20"
+   inkscape:window-y="20"
    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:#000000" />
+   d="M7,3h2v2H7V3z M5.5,12H7V8H5.5V7H9v5h1.5v1h-5V12z M0,8c0-4.418,3.582-8,8-8  s8,3.582,8,8s-3.582,8-8,8S0,12.418,0,8z"
+   id="path2384"
+   style="fill-opacity:1;fill:url(#linearGradient3716)" />
 </svg>

data/theme/close-window.svg

@@ -1,76 +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="22"
-   height="22"
-   viewBox="0 0 16 16"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="close-window.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 /></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="999"
-   inkscape:window-width="1680"
-   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="false"
-   inkscape:zoom="25.648691"
-   inkscape:cx="8.8097603"
-   inkscape:cy="9.0472789"
-   inkscape:window-x="0"
-   inkscape:window-y="26"
-   inkscape:current-layer="Foreground"
-   showguides="true"
-   inkscape:guide-bbox="true" />
-
-<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>

data/theme/gnome-shell.css

@@ -1,538 +0,0 @@
-/* Copyright 2009, Red Hat, Inc.
- *
- * Portions adapted from Mx's data/style/default.css
- *   Copyright 2009 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-.shell-link {
-    color: #0000ff;
-    text-decoration: underline;
-}
-
-.shell-link:hover {
-    color: #0000e0;
-}
-
-StScrollBar
-{
-  padding: 0px;
-}
-
-StScrollView
-{
-  scrollbar-width: 16px;
-  scrollbar-height: 16px;
-}
-
-StButton#up-stepper
-{
-  border-image: url("scroll-button-up.png") 5;
-}
-
-StButton#up-stepper:hover,
-StButton#up-stepper:active
-{
-  border-image: url("scroll-button-up-hover.png") 5;
-}
-
-StButton#down-stepper
-{
-  border-image: url("scroll-button-down.png") 5;
-}
-
-StButton#down-stepper:hover,
-StButton#down-stepper:active
-{
-  border-image: url("scroll-button-down-hover.png") 5;
-}
-
-StScrollBar StButton#vhandle
-{
-  border-image: url("scroll-vhandle.png") 5;
-}
-
-StScrollBar StButton#vhandle:hover
-{
-  border-image: url("scroll-vhandle.png") 5;
-}
-
-StTooltip {
-    border: 1px solid rgba(79,111,173,0.9);
-    border-radius: 5px;
-    padding: 4px;
-    background-color: rgba(79,111,173,0.9);
-    color: #ffffff;
-}
-
-/* Panel */
-
-#panel {
-    color: #ffffff;
-    font-size: 16px;
-    background-gradient-direction: vertical;
-    background-gradient-start: #161616;
-    background-gradient-end: #000000;
-}
-
-#panelLeft, #panelCenter, #panelRight {
-    spacing: 4px;
-}
-
-#panelLeft {
-    padding-right: 4px;
-}
-
-#panelRight {
-    padding-left: 4px;
-}
-
-.panel-button:pressed {
-    background-color: rgba(50,76,111,0.98);
-    border-radius: 4px;
-}
-
-#appMenu {
-    spacing: 4px;
-}
-
-.app-menu-icon {
-    width: 24px;
-    height: 24px;
-}
-
-.panel-button {
-    padding: 4px 12px 3px;
-    border-radius: 5px;
-    font: 16px sans-serif;
-}
-
-.panel-button:active, .panel-button:checked {
-    background-color: #314a6c;
-}
-
-#panelStatus {
-    spacing: 4px;
-}
-
-/* Overlay */
-
-.workspaces {
-    color: white;
-}
-
-.window-caption {
-    background: rgba(0,0,0,0.8);
-    border: 1px solid rgba(128,128,128,0.40);
-    border-radius: 10px;
-    font-size: 12px;
-    padding: 2px 8px;
-    -shell-caption-spacing: 4px;
-}
-
-.window-close {
-    background-image: url("close-window.svg");
-    height: 24px;
-    width: 24px;
-    -shell-close-overlap: 16px;
-}
-
-/* Dash */
-
-#dash {
-    color: #5f5f5f;
-    background-color: rgba(0,0,0,0.75);
-    padding: 0px 14px;
-}
-
-#dashSections {
-    spacing: 12px;
-}
-
-#searchEntry {
-    padding: 4px;
-    border-bottom: 1px solid #262626;
-}
-
-#searchEntry:active {
-    background-color: #c4c4c4;
-}
-
-.dash-section {
-    spacing: 8px;
-}
-
-.section-header {
-    border: 1px solid #262626;
-    background-gradient-direction: vertical;
-    background-gradient-start: #161616;
-    background-gradient-end: #000000;
-    font-weight: bold;
-    font-size: 12px;
-}
-
-.section-header-inner {
-    border: 1px solid #000000;
-    padding: 0px 4px;
-    spacing: 4px;
-}
-
-.section-text-content {
-    padding: 4px 0px;
-}
-
-.section-header-back {
-    padding: 0px 4px 0px 0px;
-    border-right: 1px solid #262626;
-}
-
-.section-header-back-image {
-    background-image: url("section-back.svg");
-    width: 12px;
-    height: 16px;
-}
-
-.section-count {
-}
-
-.dash-section-content {
-    font-size: 14px;
-    color: #ffffff;
-    spacing: 8px;
-}
-
-.more-link {
-}
-
-.more-link-expander {
-    background-image: url("section-more.svg");
-    width: 9px;
-    height: 9px;
-}
-
-.dash-pane {
-    background-color: rgba(0,0,0,0.95);
-    border: 1px solid #262626;
-    padding: 4px;
-    spacing: 4px;
-}
-
-.dash-pane-close {
-    background-image: url("close.svg");
-    width: 16px;
-    height: 16px;
-}
-
-.dash-search-section-header {
-    padding: 6px 0px;
-    spacing: 4px;
-}
-
-.dash-search-section-results {
-    color: #ffffff;
-    padding-left: 4px;
-}
-
-.dash-search-section-list-results {
-    spacing: 4px;
-}
-
-.dash-search-result-content {
-    padding: 2px;
-}
-
-.dash-search-result-content:selected {
-    padding: 1px;
-    border: 1px solid #262626;
-}
-
-/* GenericDisplay */
-
-.generic-display-container {
-    spacing: 4px;
-}
-
-.generic-display-item {
-    height: 50px;
-    border-radius: 4px;
-    color: #ffffff;
-    font-size: 14px;
-    spacing: 4px;
-}
-
-.generic-display-item:selected {
-    background-color: rgba(79,111,173,0.66);
-}
-
-.generic-display-item-text {
-    spacing: 4px;
-}
-
-.generic-display-item-description {
-    font-size: 12px;
-    color: #bababa;
-}
-
-.generic-display-details {
-    font-size: 14px;
-    color: #ffffff;
-}
-
-.generic-display-details-name {
-    font-weight: bold;
-}
-
-/* Apps */
-
-#dashAppWell {
-    spacing: 2px;
-    -shell-grid-item-size: 74px;
-}
-
-.app-well-app {
-    border: 1px solid #080808;
-    border-radius: 2px;
-    padding: 2px;
-    width: 74px;
-    height: 74px;
-    font-size: 12px;
-}
-
-.app-well-app:hover {
-    border: 1px solid #202020;
-}
-
-.app-well-app:active {
-    background-color: #1e1e1e;
-    border: 1px solid #5f5f5f;
-}
-
-.app-well-app-glow {
-    -shell-glow-extend-vertical: 3px;
-    -shell-glow-shrink-horizontal: 3px;
-}
-
-.app-well-menu {
-    border: 1px solid #5f5f5f;
-    border-radius: 4px;
-    padding: 4px;
-    background-color: rgba(0,0,0,0.9);
-    color: #ffffff;
-    -shell-arrow-width: 12px;
-    -shell-menu-spacing: 4px;
-}
-
-.app-well-menu-item:hover {
-    background-color: #1e1e1e;
-}
-
-.app-well-menu-separator {
-    padding-top: 1px;
-    border-bottom: 1px solid #5f5f5f;
-    height: 1px;
-}
-
-/* Places */
-
-.places-actions {
-    spacing: 4px;
-}
-
-#placesDevices {
-    padding-top: 4px;
-}
-
-/* LookingGlass */
-
-#LookingGlassDialog
-{
-  background-color: rgba(0,0,0,0.85);
-  spacing: 4px;
-  padding: 4px;
-  border: 1px solid rgba(0,0,172,0.85);
-  border-radius: 4px;
-
-  color: #88ff66;
-}
-
-#LookingGlassDialog > #Toolbar
-{
-  border: 1px solid grey;
-  border-radius: 4px;
-}
-
-#LookingGlassDialog .labels {
-  spacing: 4px;
-}
-
-#LookingGlassDialog .notebook-tab {
-  padding: 2px;
-}
-
-#LookingGlassDialog .notebook-tab:selected {
-  border: 1px solid #88ff66;
-  padding: 1px;
-}
-
-#LookingGlassDialog StLabel
-{
-  color: #88ff66;
-}
-
-#LookingGlassDialog StEntry
-{
-  color: #88ff66;
-}
-
-#LookingGlassDialog StBoxLayout#EvalBox
-{
-  padding: 4px;
-  spacing: 4px;
-}
-
-#lookingGlassExtensions {
-    padding: 4px;
-}
-
-.lg-extension-list {
-    padding: 4px;
-    spacing: 6px;
-}
-
-.lg-extension {
-    border: 1px solid #6f6f6f;
-    border-radius: 4px;
-    padding: 4px;
-}
-
-.lg-extension-name {
-    font-weight: bold;
-}
-
-.lg-extension-actions {
-    spacing: 6px;
-}
-
-/* Calendar popup */
-
-#calendarPopup {
-    border-radius: 5px;
-    background: rgba(0,0,0,0.9);
-    border: 1px solid rgba(128,128,128,0.45);
-    color: white;
-}
-
-#calendarPopup .calendar {
-    padding: 10px;
-}
-
-.calendar {
-    spacing-rows: 5px;
-    spacing-columns: 3px;
-}
-
-.calendar-change-month {
-    padding: 2px;
-}
-
-.calendar-change-month:hover {
-    background: #314a6c;
-    border-radius: 5px;
-}
-
-.calendar-change-month:active {
-    background: #213050;
-    border-radius: 5px;
-}
-
-.calendar-day {
-    padding: 1px 2px;
-}
-
-.calendar-today {
-    font-weight: bold;
-    background: #ffffff;
-    color: black;
-    border-radius: 5px;
-}
-
-.calendar-other-month-day {
-    color: #cccccc;
-}
-
-/* Message Tray */
-#message-tray {
-    background-gradient-direction: vertical;
-    background-gradient-start: rgba(0,0,0,0.01);
-    background-gradient-end: rgba(0,0,0,0.95);
-    height: 28px;
-}
-
-#notification {
-    border-radius: 5px;
-    background: rgba(0,0,0,0.9);
-    color: white;
-    padding: 2px 10px;
-    spacing: 10px;
-}
-
-#summary-mode {
-    spacing: 10px;
-    padding: 2px 4px;
-}
-
-/* App Switcher */
-.switcher-list {
-    background: rgba(0,0,0,0.8);
-    border: 1px solid rgba(128,128,128,0.40);
-    border-radius: 8px;
-    padding: 18px;
-
-    font: 12px sans-serif;
-    color: white;
-}
-
-.switcher-list .item-box {
-    padding: 8px;
-    border-radius: 4px;
-}
-
-.switcher-list .thumbnail-box {
-    padding: 2px;
-    spacing: 4px;
-}
-
-.switcher-list .thumbnail {
-    width:  256px;
-    height: 256px;
-}
-
-.switcher-list .outlined-item-box {
-    padding: 6px;
-    border: 2px solid rgba(85,85,85,1.0);
-    border-radius: 4px;
-}
-
-.switcher-list .selected-item-box {
-    padding: 8px;
-    border-radius: 4px;
-    background: rgba(255,255,255,0.33);
-}
-
-.switcher-list .separator {
-    width: 1px;
-    background: rgba(255,255,255,0.33);
-}
-

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/section-more.svg

@@ -1,87 +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="5.8600588"
-   height="9"
-   id="svg3647"
-   version="1.1"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="New document 6">
-  <defs
-     id="defs3649">
-    <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="perspective3655" />
-    <inkscape:perspective
-       id="perspective3603"
-       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="112.21575"
-     inkscape:cy="-32.642856"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="609"
-     inkscape:window-height="501"
-     inkscape:window-x="164"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3652">
-    <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(-262.78425,-490.71933)">
-    <path
-       transform="matrix(0,0.98149546,-0.71467449,0,506.02358,412.28296)"
-       d="M 88.830127,340 80.169873,340 84.5,332.5 88.830127,340 z"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="true"
-       sodipodi:arg2="1.5707963"
-       sodipodi:arg1="0.52359878"
-       sodipodi:r2="2.5"
-       sodipodi:r1="5"
-       sodipodi:cy="337.5"
-       sodipodi:cx="84.5"
-       sodipodi:sides="3"
-       id="path5497-5"
-       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.59699643;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="star" />
-  </g>
-</svg>

data/view-more-activated.svg

@@ -0,0 +1,66 @@
+<?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="29px"
+   height="18px"
+   viewBox="0 0 29 18"
+   enable-background="new 0 0 29 18"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="search_2.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" /></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="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="false"
+   inkscape:zoom="19.275862"
+   inkscape:cx="14.5"
+   inkscape:cy="9"
+   inkscape:window-x="40"
+   inkscape:window-y="40"
+   inkscape:current-layer="Foreground"><inkscape:grid
+     type="xygrid"
+     id="grid2391" /></sodipodi:namedview>
+
+<path
+   style="fill:#4669a9;fill-opacity:1"
+   id="path9"
+   d="" />
+<path
+   id="path3"
+   style="fill:#3d5a93;fill-opacity:1"
+   d="M 0,3 C 0,1.343 1.343,0 3,0 L 20,0 C 20.515,0 21.027,0.195 21.42,0.588 L 28.412,7.58 C 29.196,8.364 29.196,9.636 28.412,10.42 L 21.42,17.412 C 21.028,17.804 20.514,18 20,18 L 3,18 C 1.343,18 0,16.657 0,15 L 0,3 zM 13.5,3 C 11.015,3 9,5.015 9,7.5 C 9,8.2423219 9.1815696,8.9452421 9.5,9.5625 L 6.25,12.8125 C 5.931,13.1325 5.9310002,13.64975 6.25,13.96875 L 7.03125,14.78125 C 7.35025,15.10025 7.8674999,15.10025 8.1875,14.78125 L 11.46875,11.5 C 12.080227,11.810879 12.767137,12 13.5,12 C 15.985,12 18,9.985 18,7.5 C 18,5.015 15.985,3 13.5,3 z M 11.25,7.5 C 11.25,6.257 12.257,5.25 13.5,5.25 C 14.743,5.25 15.75,6.257 15.75,7.5 C 15.75,8.743 14.743,9.75 13.5,9.75 C 12.257,9.75 11.25,8.743 11.25,7.5 z" />
+</svg>

data/view-more.svg

@@ -1,6 +1,5 @@
 <?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#"
@@ -9,22 +8,22 @@
    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"
+   version="1.1"
    id="Foreground"
    x="0px"
    y="0px"
-   width="18"
-   height="18"
-   viewBox="0 0 18 18"
+   width="29px"
+   height="18px"
+   viewBox="0 0 29 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:version="0.46"
+   sodipodi:docname="search_1.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
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
    id="defs14"><inkscape:perspective
      sodipodi:type="inkscape:persp3d"
      inkscape:vp_x="0 : 9 : 1"
@@ -35,46 +34,46 @@
    inkscape:window-height="728"
    inkscape:window-width="1103"
    inkscape:pageshadow="2"
-   inkscape:pageopacity="1"
+   inkscape:pageopacity="0.0"
    guidetolerance="10.0"
    gridtolerance="10.0"
    objecttolerance="10.0"
    borderopacity="1.0"
    bordercolor="#666666"
-   pagecolor="#000000"
+   pagecolor="#ffffff"
    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
+   showgrid="false"
+   inkscape:zoom="19.275862"
+   inkscape:cx="14.5"
+   inkscape:cy="9"
+   inkscape:window-x="40"
+   inkscape:window-y="40"
+   inkscape:current-layer="Foreground"><inkscape:grid
      type="xygrid"
-     id="grid2391"
-     empspacing="5"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
-
+     id="grid2391" /></sodipodi:namedview>
+<path
+   d="M0,3c0-1.657,1.343-3,3-3h17c0.515,0,1.027,0.195,1.42,0.588l6.992,6.992c0.784,0.784,0.784,2.056,0,2.84l-6.992,6.992  C21.028,17.804,20.514,18,20,18H3c-1.657,0-3-1.343-3-3V3z"
+   id="path3"
+   style="fill:#151e2f;fill-opacity:1" />
 <g
    id="g5"
-   style="fill:#ffffff;fill-opacity:1"
-   transform="translate(-4,-0.023114)">
+   style="fill:#4669a9;fill-opacity:1">
 	<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"
+   fill="#FFFFFF"
+   d="M6.246,13.98c-0.319-0.319-0.319-0.837,0-1.157l3.717-3.717c0.319-0.319,0.837-0.319,1.157,0l0.786,0.787   c0.32,0.319,0.32,0.837,0,1.157l-3.717,3.717c-0.32,0.319-0.838,0.319-1.157,0L6.246,13.98L6.246,13.98z"
    id="path7"
-   style="fill:#ffffff;fill-opacity:1" />
+   style="fill:#4669a9;fill-opacity:1" />
 	<path
-   d="M 9.076,11.937"
+   fill="#FFFFFF"
+   d="M9.076,11.937"
    id="path9"
-   style="fill:#ffffff;fill-opacity:1" />
+   style="fill:#4669a9;fill-opacity:1" />
 </g>
 <path
+   fill-rule="evenodd"
    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"
+   fill="#FFFFFF"
+   d="M11.25,7.5c0-1.243,1.007-2.25,2.25-2.25s2.25,1.007,2.25,2.25  s-1.007,2.25-2.25,2.25S11.25,8.743,11.25,7.5z M9,7.5C9,5.015,11.015,3,13.5,3S18,5.015,18,7.5S15.985,12,13.5,12S9,9.985,9,7.5z"
    id="path11"
-   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
+   style="fill:#4669a9;fill-opacity:1" />
 </svg>

gnome-shell.doap

@@ -1,53 +0,0 @@
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xmlns:gnome="http://api.gnome.org/doap-extensions#"
-         xmlns="http://usefulinc.com/ns/doap#">
-
-  <name xml:lang="en">GNOME Shell</name>
-  <shortdesc xml:lang="en">Next generation GNOME desktop shell</shortdesc>
-  <!--
-  <homepage rdf:resource="http://live.gnome.org/GnomeShell" />
-  -->
-  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
-  <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell/" />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />
-
-  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
-
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>William Jon McCann</foaf:name>
-      <foaf:mbox rdf:resource="mailto:jmccann@redhat.com" />
-      <gnome:userid>mccann</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Owen Taylor</foaf:name>
-      <foaf:mbox rdf:resource="mailto:otaylor@redhat.com" />
-      <gnome:userid>otaylor</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Colin Walters</foaf:name>
-      <foaf:mbox rdf:resource="mailto:walters@verbum.org" />
-      <gnome:userid>cwalters</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Dan Winship</foaf:name>
-      <foaf:mbox rdf:resource="mailto:danw@gnome.org" />
-      <gnome:userid>danw</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Marina Zhurakhinskaya</foaf:name>
-      <foaf:mbox rdf:resource="mailto:marinaz@redhat.com" />
-      <gnome:userid>marinaz</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-</Project>

js/misc/Makefile.am

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

js/misc/appInfo.js

@@ -0,0 +1,134 @@
+/* -*- 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 Shell = imports.gi.Shell;
+
+const Main = imports.ui.main;
+
+function AppInfo(appId) {
+    this._init(appId);
+}
+
+AppInfo.prototype = {
+    _init : function(appId) {
+        this.appId = appId;
+        this._gAppInfo = Gio.DesktopAppInfo.new(appId);
+        if (!this._gAppInfo) {
+            throw new Error('Unknown appId ' + appId);
+        }
+
+        this.id = this._gAppInfo.get_id();
+        this.name = this._gAppInfo.get_name();
+        this.description = this._gAppInfo.get_description();
+        this.executable = this._gAppInfo.get_executable();
+
+        this._gicon = this._gAppInfo.get_icon();
+    },
+
+    createIcon : function(size) {
+        if (this._gicon)
+            return Shell.TextureCache.get_default().load_gicon(this._gicon, size);
+        else
+            return new Clutter.Texture({ width: size, height: size });
+    },
+
+    getIconPath : function(size) {
+        if (this._gicon) {
+            let iconTheme = Gtk.IconTheme.get_default();
+            let previewIconInfo = iconTheme.lookup_by_gicon(this._gicon, size, 0);
+            if (previewIconInfo)
+                return previewIconInfo.get_filename();
+        }
+        return null;
+    },
+
+    launch : function() {
+        this._gAppInfo.launch([], Main.createAppLaunchContext());
+    }
+};
+
+var _infos = {};
+
+// getAppInfo:
+// @appId: an appId
+//
+// Gets an #AppInfo for @appId. This is preferable to calling
+// new AppInfo() directly, because it caches #AppInfos.
+//
+// Return value: the new or cached #AppInfo, or %null if @appId
+// doesn't point to a valid .desktop file
+function getAppInfo(appId) {
+    let info = _infos[appId];
+    if (info === undefined) {
+        try {
+            info = _infos[appId] = new AppInfo(appId);
+        } catch (e) {
+            info = _infos[appId] = null;
+        }
+    }
+    return info;
+}
+
+// getTopApps:
+// @count: maximum number of apps to retrieve
+//
+// Gets a list of #AppInfos for the @count most-frequently-used
+// applications, with explicitly-chosen favorites first.
+//
+// Return value: the list of #AppInfo
+function getTopApps(count) {
+    let appMonitor = Shell.AppMonitor.get_default();
+
+    let matches = [], alreadyAdded = {};
+
+    let favs = getFavorites();
+    for (let i = 0; i < favs.length && favs.length <= count; i++) {
+        let appId = favs[i].appId;
+
+        if (alreadyAdded[appId])
+            continue;
+        alreadyAdded[appId] = true;
+
+        matches.push(favs[i]);
+    }
+
+    // Ask for more apps than we need, since the list of recently used
+    // apps might contain an app we don't have a desktop file for
+    let apps = appMonitor.get_most_used_apps (0, Math.round(count * 1.5));
+    for (let i = 0; i < apps.length && matches.length <= count; i++) {
+        let appId = apps[i] + ".desktop";
+        if (alreadyAdded[appId])
+            continue;
+        alreadyAdded[appId] = true;
+        let appInfo = getAppInfo(appId);
+        if (appInfo) {
+            matches.push(appInfo);
+        }
+    }
+
+    return matches;
+}
+
+function _idListToInfos(ids) {
+    let infos = [];
+    for (let i = 0; i < ids.length; i++) {
+        let display = getAppInfo(ids[i]);
+        if (display == null)
+            continue;
+        infos.push(display);
+    }
+    return infos;
+}
+
+function getFavorites() {
+    let system = Shell.AppSystem.get_default();
+
+    return _idListToInfos(system.get_favorites());
+}
+
+function getRunning() {
+    let monitor = Shell.AppMonitor.get_default();
+    return _idListToInfos(monitor.get_running_app_ids());
+}

js/misc/docInfo.js

@@ -5,9 +5,6 @@ const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 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;
@@ -18,135 +15,100 @@ function DocInfo(recentInfo) {
 
 DocInfo.prototype = {
     _init : function(recentInfo) {
-        this.recentInfo = recentInfo;
-        // 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._recentInfo = recentInfo;
         this.name = recentInfo.get_display_name();
-        this._lowerName = this.name.toLowerCase();
         this.uri = recentInfo.get_uri();
         this.mimeType = recentInfo.get_mime_type();
     },
 
     createIcon : function(size) {
-        return Shell.TextureCache.get_default().load_recent_thumbnail(size, this.recentInfo);
+        let icon = new Clutter.Texture();
+        let iconPixbuf;
+
+        if (this.uri.match("^file://"))
+            iconPixbuf = Shell.get_thumbnail(this.uri, this.mimeType);
+
+        if (iconPixbuf) {
+            // We calculate the width and height of the texture so as
+            // to preserve the aspect ratio of the thumbnail. Because
+            // the images generated based on thumbnails don't have an
+            // internal padding like system icons do, we create a
+            // slightly smaller texture and then create a group around
+            // it for padding purposes
+
+            let scalingFactor = (size - THUMBNAIL_ICON_MARGIN * 2) / Math.max(iconPixbuf.get_width(), iconPixbuf.get_height());
+            icon.set_width(Math.ceil(iconPixbuf.get_width() * scalingFactor));
+            icon.set_height(Math.ceil(iconPixbuf.get_height() * scalingFactor));
+            Shell.clutter_texture_set_from_pixbuf(icon, iconPixbuf);
+
+            let group = new Clutter.Group({ width: size,
+                                            height: size });
+            group.add_actor(icon);
+            icon.set_position(THUMBNAIL_ICON_MARGIN, THUMBNAIL_ICON_MARGIN);
+            return group;
+        } else {
+            Shell.clutter_texture_set_from_pixbuf(icon, this._recentInfo.get_icon(size));
+            return icon;
+        }
     },
 
     launch : function() {
-        Shell.DocSystem.get_default().open(this.recentInfo);
-    },
+        // While using Gio.app_info_launch_default_for_uri() would be
+        // shorter in terms of lines of code, we are not doing so
+        // because that would duplicate the work of retrieving the
+        // mime type.
 
-    matchTerms: function(terms) {
-        let mtype = Search.MatchType.NONE;
-        for (let i = 0; i < terms.length; i++) {
-            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;
+        let appInfo = Gio.app_info_get_default_for_type(this.mimeType, true);
+
+        if (appInfo != null) {
+            appInfo.launch_uris([this.uri], Main.createAppLaunchContext());
+        } else {
+            log("Failed to get default application info for mime type " + mimeType +
+                ". Will try to use the last application that registered the document.");
+            let appName = this._recentInfo.last_application();
+            let [success, appExec, count, time] = this._recentInfo.get_application_info(appName);
+            if (success) {
+                log("Will open a document with the following command: " + appExec);
+                // TODO: Change this once better support for creating
+                // GAppInfo is added to GtkRecentInfo, as right now
+                // this relies on the fact that the file uri is
+                // already a part of appExec, so we don't supply any
+                // files to appInfo.launch().
+
+                // The 'command line' passed to
+                // create_from_command_line is allowed to contain
+                // '%<something>' macros that are expanded to file
+                // name / icon name, etc, so we need to escape % as %%
+                appExec = appExec.replace(/%/g, "%%");
+
+                let appInfo = Gio.app_info_create_from_commandline(appExec, null, 0, null);
+
+                // The point of passing an app launch context to
+                // launch() is mostly to get startup notification and
+                // associated benefits like the app appearing on the
+                // right desktop; but it doesn't really work for now
+                // because with the way we create the appInfo we
+                // aren't reading the application's desktop file, and
+                // thus don't find the StartupNotify=true in it. So,
+                // despite passing the app launch context, no startup
+                // notification occurs.
+                appInfo.launch([], Main.createAppLaunchContext());
             } else {
-                continue;
+                log("Failed to get application info for " + this.uri);
             }
         }
-        return mtype;
+    },
+
+    exists : function() {
+        return this._recentInfo.exists();
+    },
+
+    lastVisited : function() {
+        // 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
+
+        return this._recentInfo.get_modified();
     }
 };
-
-var docManagerInstance = null;
-
-function getDocManager() {
-    if (docManagerInstance == null)
-        docManagerInstance = new DocManager();
-    return docManagerInstance;
-}
-
-/**
- * DocManager wraps the DocSystem, primarily to expose DocInfo objects
- * which conform to the GenericDisplay item API.
- */
-function DocManager() {
-    this._init();
-}
-
-DocManager.prototype = {
-    _init: function() {
-        this._docSystem = Shell.DocSystem.get_default();
-        this._infosByTimestamp = [];
-        this._infosByUri = {};
-        this._docSystem.connect('changed', Lang.bind(this, this._reload));
-        this._reload();
-    },
-
-    _reload: function() {
-        let docs = this._docSystem.get_all();
-        this._infosByTimestamp = [];
-        this._infosByUri = {};
-        for (let i = 0; i < docs.length; i++) {
-            let recentInfo = docs[i];
-
-            let docInfo = new DocInfo(recentInfo);
-            this._infosByTimestamp.push(docInfo);
-            this._infosByUri[docInfo.uri] = docInfo;
-        }
-        this.emit('changed');
-    },
-
-    getTimestampOrderedInfos: function() {
-        return this._infosByTimestamp;
-    },
-
-    getInfosByUri: function() {
-        return this._infosByUri;
-    },
-
-    lookupByUri: function(uri) {
-        return this._infosByUri[uri];
-    },
-
-    queueExistenceCheck: function(count) {
-        return this._docSystem.queue_existence_check(count);
-    },
-
-    initialSearch: function(terms) {
-        let multipleMatches = [];
-        let prefixMatches = [];
-        let substringMatches = [];
-        for (let i = 0; i < this._infosByTimestamp.length; i++) {
-            let item = this._infosByTimestamp[i];
-            let mtype = item.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleMatches.push(item.uri);
-            else if (mtype == Search.MatchType.PREFIX)
-                prefixMatches.push(item.uri);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringMatches.push(item.uri);
-         }
-        return multipleMatches.concat(prefixMatches.concat(substringMatches));
-    },
-
-    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));
-    }
-}
-
-Signals.addSignalMethods(DocManager.prototype);

js/misc/format.js

@@ -1,44 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-/*
- * This function is intended to extend the String object and provide
- * an String.format API for string formatting.
- * 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)
- */
-
-function format() {
-    let str = this;
-    let i = 0;
-    let args = arguments;
-
-    return str.replace(/%(?:\.([0-9]+))?(.)/g, function (str, precisionGroup, genericGroup) {
-
-                    if (precisionGroup != '' && genericGroup != 'f')
-                        throw new Error("Precision can only be specified for 'f'");
-
-                    switch (genericGroup) {
-                        case '%':
-                            return '%';
-                            break;
-                        case 's':
-                            return args[i++].toString();
-                            break;
-                        case 'd':
-                            return parseInt(args[i++]);
-                            break;
-                        case 'f':
-                            if (precisionGroup == '')
-                                return parseFloat(args[i++]);
-                            else
-                                return parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
-                            break;
-                        default:
-                            throw new Error('Unsupported conversion character %' + genericGroup);
-                    }
-                    return ""; // Suppress warning
-                });
-}

js/misc/params.js

@@ -1,33 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-// parse:
-// @params: caller-provided parameter object, or %null
-// @default: function-provided defaults object
-// @allowExtras: whether or not to allow properties not in @default
-//
-// Examines @params and fills in default values from @defaults for
-// any properties in @defaults that don't appear in @params. If
-// @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.
-//
-// Return value: the updated params
-function parse(params, defaults, allowExtras) {
-    if (!params)
-        return defaults;
-
-    if (!allowExtras) {
-	for (let prop in params) {
-	    if (!(prop in defaults))
-		throw new Error('Unrecognized parameter "' + prop + '"');
-	}
-    }
-
-    for (let prop in defaults) {
-	if (!(prop in params))
-	    params[prop] = defaults[prop];
-    }
-
-    return params;
-}

js/ui/Makefile.am

@@ -3,29 +3,17 @@ jsuidir = $(pkgdatadir)/js/ui
 dist_jsui_DATA =		\
 	altTab.js		\
 	appDisplay.js		\
-	appFavorites.js		\
-	calendar.js		\
+	button.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		\
+	overlay.js		\
 	panel.js		\
-	placeDisplay.js		\
 	runDialog.js		\
-	search.js           \
-	shellDBus.js		\
 	sidebar.js		\
-	statusMenu.js		\
 	tweener.js		\
 	widget.js		\
 	widgetBox.js		\

js/ui/appFavorites.js

@@ -1,90 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-
-function AppFavorites() {
-    this._init();
-}
-
-AppFavorites.prototype = {
-    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));
-        this._reload();
-    },
-
-    _onFavsChanged: function() {
-        this._reload();
-        this.emit('changed');
-    },
-
-    _reload: function() {
-        let ids = Shell.GConf.get_default().get_string_list('favorite_apps');
-        let appSys = Shell.AppSystem.get_default();
-        let apps = ids.map(function (id) {
-                return appSys.get_app(id);
-            }).filter(function (app) {
-                return app != null;
-            });
-        this._favorites = {};
-        for (let i = 0; i < apps.length; i++) {
-            let app = apps[i];
-            this._favorites[app.get_id()] = app;
-        }
-    },
-
-    _getIds: function() {
-        let ret = [];
-        for (let id in this._favorites)
-            ret.push(id);
-        return ret;
-    },
-
-    getFavoriteMap: function() {
-        return this._favorites;
-    },
-
-    getFavorites: function() {
-        let ret = [];
-        for (let id in this._favorites)
-            ret.push(this._favorites[id]);
-        return ret;
-    },
-
-    isFavorite: function(appId) {
-        return appId in this._favorites;
-    },
-
-    addFavorite: function(appId) {
-        if (appId in this._favorites)
-            return;
-        let app = Shell.AppSystem.get_default().get_app(appId);
-        if (!app)
-            return;
-        let ids = this._getIds();
-        ids.push(appId);
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
-        this._favorites[appId] = app;
-    },
-
-    removeFavorite: function(appId) {
-        if (!appId in this._favorites)
-            return;
-        let ids = this._getIds().filter(function (id) { return id != appId; });
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
-    }
-};
-Signals.addSignalMethods(AppFavorites.prototype);
-
-var appFavoritesInstance = null;
-function getAppFavorites() {
-    if (appFavoritesInstance == null)
-        appFavoritesInstance = new AppFavorites();
-    return appFavoritesInstance;
-}

js/ui/appIcon.js

@@ -1,591 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Pango = imports.gi.Pango;
-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 GenericDisplay = imports.ui.genericDisplay;
-const AppFavorites = imports.ui.appFavorites;
-const Main = imports.ui.main;
-const Workspaces = imports.ui.workspaces;
-
-const GLOW_COLOR = new Clutter.Color();
-GLOW_COLOR.from_pixel(0x4f6ba4ff);
-const GLOW_PADDING_HORIZONTAL = 3;
-const GLOW_PADDING_VERTICAL = 3;
-
-const APPICON_DEFAULT_ICON_SIZE = 48;
-
-const APPICON_PADDING = 1;
-const APPICON_BORDER_WIDTH = 1;
-const APPICON_CORNER_RADIUS = 4;
-
-const APPICON_MENU_POPUP_TIMEOUT_MS = 600;
-
-const APPICON_DEFAULT_BORDER_COLOR = new Clutter.Color();
-APPICON_DEFAULT_BORDER_COLOR.from_pixel(0x787878ff);
-const APPICON_MENU_BACKGROUND_COLOR = new Clutter.Color();
-APPICON_MENU_BACKGROUND_COLOR.from_pixel(0x292929ff);
-const APPICON_MENU_FONT = 'Sans 14px';
-const APPICON_MENU_COLOR = new Clutter.Color();
-APPICON_MENU_COLOR.from_pixel(0xffffffff);
-const APPICON_MENU_SELECTED_COLOR = new Clutter.Color();
-APPICON_MENU_SELECTED_COLOR.from_pixel(0x005b97ff);
-const APPICON_MENU_SEPARATOR_COLOR = new Clutter.Color();
-APPICON_MENU_SEPARATOR_COLOR.from_pixel(0x787878ff);
-const APPICON_MENU_BORDER_WIDTH = 1;
-const APPICON_MENU_ARROW_SIZE = 12;
-const APPICON_MENU_CORNER_RADIUS = 4;
-const APPICON_MENU_PADDING = 4;
-
-const TRANSPARENT_COLOR = new Clutter.Color();
-TRANSPARENT_COLOR.from_pixel(0x00000000);
-
-const MenuType = { NONE: 0, ON_RIGHT: 1, BELOW: 2 };
-
-function AppIcon(params) {
-    this._init(params);
-}
-
-AppIcon.prototype = {
-    _init : function(params) {
-        this.app = params.app;
-        if (!this.app)
-            throw new Error('AppIcon constructor requires "app" param');
-
-        this._menuType = ('menuType' in params) ? params.menuType : MenuType.NONE;
-        this._iconSize = ('size' in params) ? params.size : APPICON_DEFAULT_ICON_SIZE;
-        this._showGlow = ('glow' in params) ? params.glow : false;
-
-        this.actor = new Shell.ButtonBox({ orientation: Big.BoxOrientation.VERTICAL,
-                                           border: APPICON_BORDER_WIDTH,
-                                           corner_radius: APPICON_CORNER_RADIUS,
-                                           padding: APPICON_PADDING,
-                                           reactive: true });
-        this.actor._delegate = this;
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this.highlight_border_color = APPICON_DEFAULT_BORDER_COLOR;
-
-        if (this._menuType != MenuType.NONE) {
-            this.actor.connect('button-press-event', Lang.bind(this, this._updateMenuOnButtonPress));
-            this.actor.connect('notify::hover', Lang.bind(this, this._updateMenuOnHoverChanged));
-            this.actor.connect('activate', Lang.bind(this, this._updateMenuOnActivate));
-
-            this._menuTimeoutId = 0;
-            this._menu = null;
-        }
-
-        let iconBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                    x_align: Big.BoxAlignment.CENTER,
-                                    y_align: Big.BoxAlignment.CENTER,
-                                    width: this._iconSize,
-                                    height: this._iconSize });
-        this.icon = this.app.create_icon_texture(this._iconSize);
-        iconBox.append(this.icon, Big.BoxPackFlags.NONE);
-
-        this.actor.append(iconBox, Big.BoxPackFlags.EXPAND);
-
-        let nameBox = new Shell.GenericContainer();
-        nameBox.connect('get-preferred-width', Lang.bind(this, this._nameBoxGetPreferredWidth));
-        nameBox.connect('get-preferred-height', Lang.bind(this, this._nameBoxGetPreferredHeight));
-        nameBox.connect('allocate', Lang.bind(this, this._nameBoxAllocate));
-        this._nameBox = nameBox;
-
-        this._name = new St.Label({ style_class: "app-icon-label",
-                                     text: this.app.get_name() });
-        this._name.clutter_text.line_alignment = Pango.Alignment.CENTER;
-        nameBox.add_actor(this._name);
-        if (this._showGlow) {
-            this._glowBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
-            this._nameBox.add_actor(this._glowBox);
-            this._glowBox.lower(this._name);
-            this._appWindowChangedId = this.app.connect('windows-changed', Lang.bind(this, this._rerenderGlow));
-            this._rerenderGlow();
-        } else {
-            this._glowBox = null;
-            this._appWindowChangedId = 0;
-        }
-
-        this.actor.append(nameBox, Big.BoxPackFlags.NONE);
-    },
-
-    _nameBoxGetPreferredWidth: function (nameBox, forHeight, alloc) {
-        let [min, natural] = this._name.get_preferred_width(forHeight);
-        alloc.min_size = min + GLOW_PADDING_HORIZONTAL * 2;
-        alloc.natural_size = natural + GLOW_PADDING_HORIZONTAL * 2;
-    },
-
-    _nameBoxGetPreferredHeight: function (nameBox, forWidth, alloc) {
-        let [min, natural] = this._name.get_preferred_height(forWidth);
-        alloc.min_size = min + GLOW_PADDING_VERTICAL * 2;
-        alloc.natural_size = natural + GLOW_PADDING_VERTICAL * 2;
-    },
-
-    _nameBoxAllocate: function (nameBox, box, flags) {
-        let childBox = new Clutter.ActorBox();
-        let [minWidth, naturalWidth] = this._name.get_preferred_width(-1);
-        let [minHeight, naturalHeight] = this._name.get_preferred_height(-1);
-        let availWidth = box.x2 - box.x1;
-        let availHeight = box.y2 - box.y1;
-        let targetWidth = availWidth;
-        let xPadding = 0;
-        if (naturalWidth < availWidth) {
-            xPadding = Math.floor((availWidth - naturalWidth) / 2);
-        }
-        childBox.x1 = xPadding;
-        childBox.x2 = availWidth - xPadding;
-        childBox.y1 = GLOW_PADDING_VERTICAL;
-        childBox.y2 = availHeight - GLOW_PADDING_VERTICAL;
-        this._name.allocate(childBox, flags);
-
-        // Now the glow
-        if (this._glowBox != null) {
-            let glowPaddingHoriz = Math.max(0, xPadding - GLOW_PADDING_HORIZONTAL);
-            glowPaddingHoriz = Math.max(GLOW_PADDING_HORIZONTAL, glowPaddingHoriz);
-            childBox.x1 = glowPaddingHoriz;
-            childBox.x2 = availWidth - glowPaddingHoriz;
-            childBox.y1 = 0;
-            childBox.y2 = availHeight;
-            this._glowBox.allocate(childBox, flags);
-        }
-    },
-
-    _onDestroy: function() {
-        if (this._appWindowChangedId > 0)
-            this.app.disconnect(this._appWindowChangedId);
-    },
-
-    _rerenderGlow: function() {
-        if (!this._showGlow)
-            return;
-        this._glowBox.get_children().forEach(function (a) { a.destroy(); });
-        let glowPath = GLib.filename_to_uri(global.imagedir + 'app-well-glow.png', '');
-        let windows = this.app.get_windows();
-        for (let i = 0; i < windows.length && i < 3; i++) {
-            let glow = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
-                                                                      glowPath, -1, -1);
-            glow.keep_aspect_ratio = false;
-            this._glowBox.append(glow, Big.BoxPackFlags.EXPAND);
-        }
-    },
-
-    // AppIcon itself is not a draggable, but if you want to make
-    // a subclass of it draggable, you can use this method to create
-    // a drag actor
-    createDragActor: function() {
-        return this.app.create_icon_texture(this._iconSize);
-    },
-
-    setHighlight: function(highlight) {
-        if (highlight) {
-            this.actor.border_color = this.highlight_border_color;
-        } else {
-            this.actor.border_color = TRANSPARENT_COLOR;
-        }
-    },
-
-    _updateMenuOnActivate: function(actor, event) {
-        if (this._menuTimeoutId != 0) {
-            Mainloop.source_remove(this._menuTimeoutId);
-            this._menuTimeoutId = 0;
-        }
-        this.emit('activate');
-        return false;
-    },
-
-    _updateMenuOnHoverChanged: function() {
-        if (!this.actor.hover && this._menuTimeoutId != 0) {
-            Mainloop.source_remove(this._menuTimeoutId);
-            this._menuTimeoutId = 0;
-        }
-        return false;
-    },
-
-    _updateMenuOnButtonPress: function(actor, event) {
-        let button = event.get_button();
-        if (button == 1) {
-            if (this._menuTimeoutId != 0)
-                Mainloop.source_remove(this._menuTimeoutId);
-            this._menuTimeoutId = Mainloop.timeout_add(APPICON_MENU_POPUP_TIMEOUT_MS,
-                                                       Lang.bind(this, function () { this.popupMenu(button); }));
-        } else if (button == 3) {
-            this.popupMenu(button);
-        }
-        return false;
-    },
-
-    popupMenu: function(activatingButton) {
-        if (this._menuTimeoutId != 0) {
-            Mainloop.source_remove(this._menuTimeoutId);
-            this._menuTimeoutId = 0;
-        }
-
-        this.actor.fake_release();
-
-        if (!this._menu) {
-            this._menu = new AppIconMenu(this, this._menuType);
-            this._menu.connect('highlight-window', Lang.bind(this, function (menu, window) {
-                this.highlightWindow(window);
-            }));
-            this._menu.connect('activate-window', Lang.bind(this, function (menu, window) {
-                this.activateWindow(window);
-            }));
-            this._menu.connect('popup', Lang.bind(this, function (menu, isPoppedUp) {
-                if (isPoppedUp)
-                    this.menuPoppedUp();
-                else
-                    this.menuPoppedDown();
-            }));
-        }
-
-        this._menu.popup(activatingButton);
-
-        return false;
-    },
-
-    // Default implementations; AppDisplay.RunningWellItem overrides these
-    highlightWindow: function(window) {
-        this.emit('highlight-window', window);
-    },
-
-    activateWindow: function(window) {
-        this.emit('activate-window', window);
-    },
-
-    menuPoppedUp: function() {
-        this.emit('menu-popped-up', this._menu);
-    },
-
-    menuPoppedDown: function() {
-        this.emit('menu-popped-down', this._menu);
-    }
-};
-
-Signals.addSignalMethods(AppIcon.prototype);
-
-function AppIconMenu(source, type) {
-    this._init(source, type);
-}
-
-AppIconMenu.prototype = {
-    _init: function(source, type) {
-        this._source = source;
-        this._type = type;
-
-        this.actor = new Shell.GenericContainer({ 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._windowContainer = new Shell.Menu({ orientation: Big.BoxOrientation.VERTICAL,
-                                                 border_color: source.highlight_border_color,
-                                                 border: APPICON_MENU_BORDER_WIDTH,
-                                                 background_color: APPICON_MENU_BACKGROUND_COLOR,
-                                                 padding: 4,
-                                                 corner_radius: APPICON_MENU_CORNER_RADIUS,
-                                                 width: Main.overview._dash.actor.width * 0.75 });
-        this._windowContainer.connect('unselected', Lang.bind(this, this._onItemUnselected));
-        this._windowContainer.connect('selected', Lang.bind(this, this._onItemSelected));
-        this._windowContainer.connect('cancelled', Lang.bind(this, this._onWindowSelectionCancelled));
-        this._windowContainer.connect('activate', Lang.bind(this, this._onItemActivate));
-        this.actor.add_actor(this._windowContainer);
-
-        // Stay popped up on release over application icon
-        this._windowContainer.set_persistent_source(this._source.actor);
-
-        // Intercept events while the menu has the pointer grab to do window-related effects
-        this._windowContainer.connect('enter-event', Lang.bind(this, this._onMenuEnter));
-        this._windowContainer.connect('leave-event', Lang.bind(this, this._onMenuLeave));
-        this._windowContainer.connect('button-release-event', Lang.bind(this, this._onMenuButtonRelease));
-
-        this._arrow = new St.DrawingArea();
-        this._arrow.connect('redraw', Lang.bind(this, function (area, texture) {
-            Shell.draw_box_pointer(texture,
-                                   this._type == MenuType.ON_RIGHT ? Shell.PointerDirection.LEFT : Shell.PointerDirection.UP,
-                                   source.highlight_border_color,
-                                   APPICON_MENU_BACKGROUND_COLOR);
-        }));
-        this.actor.add_actor(this._arrow);
-
-        // Chain our visibility and lifecycle to that of the source
-        source.actor.connect('notify::mapped', Lang.bind(this, function () {
-            if (!source.actor.mapped)
-                this._windowContainer.popdown();
-        }));
-        source.actor.connect('destroy', Lang.bind(this, function () { this.actor.destroy(); }));
-
-        global.stage.add_actor(this.actor);
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let [min, natural] = this._windowContainer.get_preferred_width(forHeight);
-        if (this._type == MenuType.ON_RIGHT) {
-            min += APPICON_MENU_ARROW_SIZE;
-            natural += APPICON_MENU_ARROW_SIZE;
-        }
-        alloc.min_size = min;
-        alloc.natural_size = natural;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let [min, natural] = this._windowContainer.get_preferred_height(forWidth);
-        if (this._type == MenuType.BELOW) {
-            min += APPICON_MENU_ARROW_SIZE;
-            natural += APPICON_MENU_ARROW_SIZE;
-        }
-        alloc.min_size = min;
-        alloc.natural_size = natural;
-    },
-
-    _allocate: function(actor, box, flags) {
-        let childBox = new Clutter.ActorBox();
-
-        let width = box.x2 - box.x1;
-        let height = box.y2 - box.y1;
-
-        if (this._type == MenuType.ON_RIGHT) {
-            childBox.x1 = 0;
-            childBox.x2 = APPICON_MENU_ARROW_SIZE;
-            childBox.y1 = Math.floor((height / 2) - (APPICON_MENU_ARROW_SIZE / 2));
-            childBox.y2 = childBox.y1 + APPICON_MENU_ARROW_SIZE;
-            this._arrow.allocate(childBox, flags);
-
-            childBox.x1 = APPICON_MENU_ARROW_SIZE - APPICON_MENU_BORDER_WIDTH;
-            childBox.x2 = width;
-            childBox.y1 = 0;
-            childBox.y2 = height;
-            this._windowContainer.allocate(childBox, flags);
-        } else /* MenuType.BELOW */ {
-            childBox.x1 = Math.floor((width / 2) - (APPICON_MENU_ARROW_SIZE / 2));
-            childBox.x2 = childBox.x1 + APPICON_MENU_ARROW_SIZE;
-            childBox.y1 = 0;
-            childBox.y2 = APPICON_MENU_ARROW_SIZE;
-            this._arrow.allocate(childBox, flags);
-
-            childBox.x1 = 0;
-            childBox.x2 = width;
-            childBox.y1 = APPICON_MENU_ARROW_SIZE - APPICON_MENU_BORDER_WIDTH;
-            childBox.y2 = height;
-            this._windowContainer.allocate(childBox, flags);
-        }
-    },
-
-    _redisplay: function() {
-        this._windowContainer.remove_all();
-
-        let windows = this._source.app.get_windows();
-
-        this._windowContainer.show();
-
-        let iconsDiffer = false;
-        let texCache = Shell.TextureCache.get_default();
-        if (windows.length > 0) {
-            let firstIcon = windows[0].mini_icon;
-            for (let i = 1; i < windows.length; i++) {
-                if (!texCache.pixbuf_equal(windows[i].mini_icon, firstIcon)) {
-                    iconsDiffer = true;
-                    break;
-                }
-            }
-        }
-
-        // Display the app windows menu items and the separator between windows
-        // of the current desktop and other windows.
-        let activeWorkspace = global.screen.get_active_workspace();
-        let separatorShown = windows.length > 0 && windows[0].get_workspace() != activeWorkspace;
-
-        for (let i = 0; i < windows.length; i++) {
-            if (!separatorShown && windows[i].get_workspace() != activeWorkspace) {
-                this._appendSeparator();
-                separatorShown = true;
-            }
-
-            let icon = null;
-            if (iconsDiffer)
-                icon = Shell.TextureCache.get_default().bind_pixbuf_property(windows[i], "mini-icon");
-
-            let box = this._appendMenuItem(icon, windows[i].title);
-            box._window = windows[i];
-        }
-
-        if (windows.length > 0)
-            this._appendSeparator();
-
-        let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());
-
-        this._newWindowMenuItem = windows.length > 0 ? this._appendMenuItem(null, _("New Window")) : null;
-
-        if (windows.length > 0)
-            this._appendSeparator();
-        this._toggleFavoriteMenuItem = this._appendMenuItem(null, isFavorite ? _("Remove from Favorites")
-                                                                    : _("Add to Favorites"));
-
-        this._highlightedItem = null;
-    },
-
-    _appendSeparator: function () {
-        let box = new Big.Box({ padding_top: 2, padding_bottom: 2 });
-        box.append(new Clutter.Rectangle({ height: 1,
-                                           color: APPICON_MENU_SEPARATOR_COLOR }),
-                   Big.BoxPackFlags.EXPAND);
-        this._windowContainer.append_separator(box, Big.BoxPackFlags.NONE);
-    },
-
-    _appendMenuItem: function(iconTexture, labelText) {
-        /* Use padding here rather than spacing in the box above so that
-         * we have a larger reactive area.
-         */
-        let box = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                padding_top: 4,
-                                padding_bottom: 4,
-                                spacing: 4,
-                                reactive: true });
-        let vCenter;
-        if (iconTexture != null) {
-            vCenter = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
-            vCenter.append(iconTexture, Big.BoxPackFlags.NONE);
-            box.append(vCenter, Big.BoxPackFlags.NONE);
-        }
-        vCenter = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
-        let label = new Clutter.Text({ text: labelText,
-                                       font_name: APPICON_MENU_FONT,
-                                       ellipsize: Pango.EllipsizeMode.END,
-                                       color: APPICON_MENU_COLOR });
-        vCenter.append(label, Big.BoxPackFlags.NONE);
-        box.append(vCenter, Big.BoxPackFlags.NONE);
-        this._windowContainer.append(box, Big.BoxPackFlags.NONE);
-        return box;
-    },
-
-    popup: function(activatingButton) {
-        let [stageX, stageY] = this._source.actor.get_transformed_position();
-        let [stageWidth, stageHeight] = this._source.actor.get_transformed_size();
-
-        this._redisplay();
-
-        this._windowContainer.popup(activatingButton, global.get_current_time());
-
-        this.emit('popup', true);
-
-        let x, y;
-        if (this._type == MenuType.ON_RIGHT) {
-            x = Math.floor(stageX + stageWidth);
-            y = Math.floor(stageY + (stageHeight / 2) - (this.actor.height / 2));
-        } else {
-            x = Math.floor(stageX + (stageWidth / 2) - (this.actor.width / 2));
-            y = Math.floor(stageY + stageHeight);
-        }
-
-        this.actor.set_position(x, y);
-        this.actor.show();
-    },
-
-    popdown: function() {
-        this._windowContainer.popdown();
-        this.emit('popup', false);
-        this.actor.hide();
-    },
-
-    selectWindow: function(metaWindow) {
-        this._selectMenuItemForWindow(metaWindow);
-    },
-
-    _findMetaWindowForActor: function (actor) {
-        if (actor._delegate instanceof Workspaces.WindowClone)
-            return actor._delegate.metaWindow;
-        else if (actor.get_meta_window)
-            return actor.get_meta_window();
-        return null;
-    },
-
-    // This function is called while the menu has a pointer grab; what we want
-    // to do is see if the mouse was released over a window representation
-    _onMenuButtonRelease: function (actor, event) {
-        let metaWindow = this._findMetaWindowForActor(event.get_source());
-        if (metaWindow) {
-            this.emit('activate-window', metaWindow);
-        }
-    },
-
-    _updateHighlight: function (item) {
-        if (this._highlightedItem) {
-            this._highlightedItem.background_color = TRANSPARENT_COLOR;
-            this.emit('highlight-window', null);
-        }
-        this._highlightedItem = item;
-        if (this._highlightedItem) {
-            this._highlightedItem.background_color = APPICON_MENU_SELECTED_COLOR;
-            let window = this._highlightedItem._window;
-            if (window)
-                this.emit('highlight-window', window);
-        }
-    },
-
-    _selectMenuItemForWindow: function (metaWindow) {
-        let children = this._windowContainer.get_children();
-        for (let i = 0; i < children.length; i++) {
-            let child = children[i];
-            let menuMetaWindow = child._window;
-            if (menuMetaWindow == metaWindow)
-                this._updateHighlight(child);
-        }
-    },
-
-    // Called while menu has a pointer grab
-    _onMenuEnter: function (actor, event) {
-        let metaWindow = this._findMetaWindowForActor(event.get_source());
-        if (metaWindow) {
-            this._selectMenuItemForWindow(metaWindow);
-        }
-    },
-
-    // Called while menu has a pointer grab
-    _onMenuLeave: function (actor, event) {
-        let metaWindow = this._findMetaWindowForActor(event.get_source());
-        if (metaWindow) {
-            this._updateHighlight(null);
-        }
-    },
-
-    _onItemUnselected: function (actor, child) {
-        this._updateHighlight(null);
-    },
-
-    _onItemSelected: function (actor, child) {
-        this._updateHighlight(child);
-    },
-
-    _onItemActivate: function (actor, child) {
-        if (child._window) {
-            let metaWindow = child._window;
-            this.emit('activate-window', metaWindow);
-        } else if (child == this._newWindowMenuItem) {
-            this._source.app.launch();
-            this.emit('activate-window', null);
-        } else if (child == this._toggleFavoriteMenuItem) {
-            let favs = AppFavorites.getAppFavorites();
-            let isFavorite = favs.isFavorite(this._source.app.get_id());
-            if (isFavorite)
-                favs.removeFavorite(this._source.app.get_id());
-            else
-                favs.addFavorite(this._source.app.get_id());
-        }
-        this.popdown();
-    },
-
-    _onWindowSelectionCancelled: function () {
-        this.emit('highlight-window', null);
-        this.popdown();
-    }
-};
-
-Signals.addSignalMethods(AppIconMenu.prototype);

js/ui/button.js

@@ -0,0 +1,114 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Big = imports.gi.Big;
+const Clutter = imports.gi.Clutter;
+
+const DEFAULT_BUTTON_COLOR = new Clutter.Color();
+DEFAULT_BUTTON_COLOR.from_pixel(0xeeddcc66);
+
+const DEFAULT_PRESSED_BUTTON_COLOR = new Clutter.Color();
+DEFAULT_PRESSED_BUTTON_COLOR.from_pixel(0xccbbaa66);
+
+function Button(widget, buttonColor, pressedButtonColor, staysPressed, minWidth, minHeight) {
+    this._init(widget, buttonColor, pressedButtonColor, staysPressed, minWidth, minHeight);
+}
+
+Button.prototype = {
+    _init : function(widgetOrText, buttonColor, pressedButtonColor, staysPressed, minWidth, minHeight) {
+        let me = this;
+
+        this._buttonColor = buttonColor
+        if (buttonColor == null)
+            this._buttonColor = DEFAULT_BUTTON_COLOR;
+
+        this._pressedButtonColor = pressedButtonColor
+        if (pressedButtonColor == null)
+            this._pressedButtonColor = DEFAULT_PRESSED_BUTTON_COLOR;
+
+        this._staysPressed = staysPressed
+        if (staysPressed == null)
+            this._staysPressed = false;
+
+        if (minWidth == null)
+            minWidth = 0;
+        if (minHeight == null)
+            minHeight = 0;
+
+        // if this._staysPressed is true, this._active will be true past the first release of a button, until a subsequent one (the button
+        // is unpressed) or until release() is called explicitly
+        this._active = false;
+        this._isBetweenPressAndRelease = false;
+        this._mouseIsOverButton = false;
+
+        this.button = new Big.Box({ reactive: true,
+                                    corner_radius: 5,
+                                    padding_left: 4,
+                                    padding_right: 4,
+                                    orientation: Big.BoxOrientation.HORIZONTAL,
+                                    y_align: Big.BoxAlignment.CENTER
+                                  });
+        if (typeof widgetOrText == 'string') {
+            this._widget = new Clutter.Text({ font_name: "Sans Bold 16px",
+                                              text: widgetOrText });
+        } else {
+            this._widget = widgetOrText;
+        }
+
+        this.button.append(this._widget, Big.BoxPackFlags.EXPAND);
+
+        this._minWidth = minWidth;
+        this._minHeight = minHeight;
+
+        this.button.connect('button-press-event',
+            function(o, event) {
+                me._isBetweenPressAndRelease = true;
+                me.button.backgroundColor = me._pressedButtonColor;
+                return false;
+            });
+        this.button.connect('button-release-event',
+            function(o, event) {
+                me._isBetweenPressAndRelease = false;
+                if (!me._staysPressed || me._active) {
+                    me.release();
+                } else {
+                    me._active = true;
+                }
+                return false;
+            });
+        this.button.connect('enter-event',
+            function(o, event) {
+                me._mouseIsOverButton = true;
+                if (!me._active) {
+                    me.button.backgroundColor = me._buttonColor;
+                }
+                return false;
+            });
+        this.button.connect('leave-event',
+            function(o, event) {
+                me._isBetweenPressAndRelease = false;
+                me._mouseIsOverButton = false;
+                if (!me._active) {
+                    me.button.backgroundColor = null;
+                }
+                return false;
+            });
+    },
+
+    pressIn : function() {
+        if (!this._isBetweenPressAndRelease && this._staysPressed) {
+            this._active = true;
+            this.button.backgroundColor = this._pressedButtonColor;
+        }
+    },
+
+    release : function() {
+        if (!this._isBetweenPressAndRelease && this._staysPressed) {
+            this._active = false;
+            if (this._mouseIsOverButton) {
+                this.button.backgroundColor = this._buttonColor;
+            } else {
+                this.button.backgroundColor = null;
+            }
+        }
+    }
+};

js/ui/calendar.js

@@ -1,177 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const St = imports.gi.St;
-
-const Gettext_gtk20 = imports.gettext.domain('gtk20');
-
-const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
-
-function _sameDay(dateA, dateB) {
-    return (dateA.getDate() == dateB.getDate() &&
-            dateA.getMonth() == dateB.getMonth() &&
-            dateA.getYear() == dateB.getYear());
-}
-
-function Calendar() {
-    this._init();
-};
-
-Calendar.prototype = {
-    _init: function() {
-        // 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._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;
-        }
-
-        // Find the ordering for month/year in the calendar heading
-        switch (Gettext_gtk20.gettext("calendar:MY")) {
-        case "calendar:MY":
-            this._headerFormat = "%B %Y";
-            break;
-        case "calendar:YM":
-            this._headerFormat = "%Y %B";
-            break;
-        default:
-            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.actor = new St.Table({ homogeneous: false,
-                                    style_class: "calendar",
-                                    reactive: true });
-
-        this.actor.connect('scroll-event',
-                           Lang.bind(this, this._onScroll));
-
-        // Top line of the calendar '<| September 2009 |>'
-        this._topBox = new St.BoxLayout();
-        this.actor.add(this._topBox,
-                       { row: 0, col: 0, col_span: 7 });
-
-        let back = new St.Button({ label: "&lt;", style_class: 'calendar-change-month'  });
-        this._topBox.add(back);
-        back.connect("clicked", Lang.bind(this, this._prevMonth));
-
-        this._dateLabel = new St.Label();
-        this._topBox.add(this._dateLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
-
-        let forward = new St.Button({ label: "&gt;", style_class: 'calendar-change-month' });
-        this._topBox.add(forward);
-        forward.connect("clicked", Lang.bind(this, this._nextMonth));
-
-        // 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);
-        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") }),
-                           { row: 1,
-                             col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: 1.0 });
-            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();
-        }
-    },
-
-    _onScroll : function(actor, event) {
-        switch (event.get_scroll_direction()) {
-        case Clutter.ScrollDirection.UP:
-        case Clutter.ScrollDirection.LEFT:
-            this._prevMonth();
-            break;
-        case Clutter.ScrollDirection.DOWN:
-        case Clutter.ScrollDirection.RIGHT:
-            this._nextMonth();
-            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);
-        }
-        this._update();
-   },
-
-    _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);
-        }
-        this._update();
-    },
-
-    _update: function() {
-        this._dateLabel.text = this.date.toLocaleFormat(this._headerFormat);
-
-        // Remove everything but the topBox and the weekday labels
-        let children = this.actor.get_children();
-        for (let i = this._firstDayIndex; i < children.length; i++)
-            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 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";
-            else
-                label.style_class = "calendar-day";
-            this.actor.add(label,
-                           { row: row, col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: 1.0 });
-
-            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())
-                    break;
-                row++;
-            }
-        }
-    }
-};

js/ui/chrome.js

@@ -7,10 +7,9 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
-const Params = imports.misc.params;
 
 // This manages the shell "chrome"; the UI that's visible in the
-// normal mode (ie, outside the Overview), that surrounds the main
+// normal mode (ie, outside the overlay), that surrounds the main
 // workspace content.
 
 function Chrome() {
@@ -19,11 +18,13 @@ function Chrome() {
 
 Chrome.prototype = {
     _init: function() {
+        let global = Shell.Global.get();
+
         // 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.nonOverlayActor = new Clutter.Group();
+        this.actor.add_actor(this.nonOverlayActor);
 
         this._obscuredByFullscreen = false;
 
@@ -36,10 +37,10 @@ Chrome.prototype = {
         global.screen.connect('notify::n-workspaces',
                               Lang.bind(this, this._queueUpdateRegions));
 
-        Main.overview.connect('showing',
-                             Lang.bind(this, this._overviewShowing));
-        Main.overview.connect('hidden',
-                             Lang.bind(this, this._overviewHidden));
+        Main.overlay.connect('showing',
+                             Lang.bind(this, this._overlayShowing));
+        Main.overlay.connect('hidden',
+                             Lang.bind(this, this._overlayHidden));
 
         this._queueUpdateRegions();
     },
@@ -55,7 +56,7 @@ Chrome.prototype = {
 
     // addActor:
     // @actor: an actor to add to the chrome layer
-    // @params: (optional) additional params
+    // @shapeActor: optional "shape actor".
     //
     // Adds @actor to the chrome layer and extends the input region
     // and window manager struts to include it. (Window manager struts
@@ -65,45 +66,59 @@ Chrome.prototype = {
     // in its visibility will affect the input region, but NOT the
     // struts.
     //
-    // 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.
-    addActor: function(actor, params) {
-        params = Params.parse(params, { visibleInOverview: false,
-                                        affectsStruts: true,
-                                        affectsInputRegion: true });
+    // If @shapeActor is provided, it will be used instead of @actor
+    // for the input region/strut shape. (This lets you have things like
+    // drop shadows in @actor that don't affect the struts.) It must
+    // be a child of @actor. Alternatively, you can pass %null for
+    // @shapeActor to indicate that @actor should not affect the input
+    // region or struts at all.
+    addActor: function(actor, shapeActor) {
+        if (shapeActor === undefined)
+            shapeActor = actor;
+        else if (shapeActor && !this._verifyAncestry(shapeActor, actor))
+            throw new Error('shapeActor is not a descendent of actor');
 
-        if (params.visibleInOverview)
-            this.actor.add_actor(actor);
-        else
-            this.nonOverviewActor.add_actor(actor);
+        this.nonOverlayActor.add_actor(actor);
 
-        this._trackActor(actor, params.affectsInputRegion, params.affectsStruts);
+        if (shapeActor)
+            this._trackActor(shapeActor, true, true);
     },
 
-    // trackActor:
-    // @actor: a descendant of the chrome to begin tracking
-    // @params: parameters describing how to track @actor
+    // setVisibleInOverlay:
+    // @actor: an actor in the chrome layer
+    // @visible: overlay visibility
     //
-    // 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.
-    trackActor: function(actor, params) {
+    // By default, actors in the chrome layer are automatically hidden
+    // when the overlay is shown. This can be used to override that
+    // behavior
+    setVisibleInOverlay: function(actor, visible) {
         if (!this._verifyAncestry(actor, this.actor))
             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);
+        if (visible)
+            actor.reparent(this.actor);
+        else
+            actor.reparent(this.nonOverlayActor);
     },
 
-    // untrackActor:
-    // @actor: an actor previously tracked via trackActor()
+    // addInputRegionActor:
+    // @actor: an actor to add to the stage input region
     //
-    // Undoes the effect of trackActor()
-    untrackActor: function(actor) {
-        this._untrackActor(actor);
+    // Adds @actor to the stage input region, as with addActor(), but
+    // for actors that are already descendants of the chrome layer.
+    addInputRegionActor: function(actor) {
+        if (!this._verifyAncestry(actor, this.actor))
+            throw new Error('actor is not a descendent of the chrome layer');
+
+        this._trackActor(actor, true, false);
+    },
+
+    // removeInputRegionActor:
+    // @actor: an actor previously added to the stage input region
+    //
+    // Undoes the effect of addInputRegionActor()
+    removeInputRegionActor: function(actor) {
+        this._untrackActor(actor, true, false);
     },
 
     // removeActor:
@@ -111,11 +126,9 @@ 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._untrackActor(actor);
+        this.actor.remove_actor(actor);
+        // We don't have to do anything else; the parent-set handlers
+        // will do the rest.
     },
 
     _findActor: function(actor) {
@@ -129,13 +142,23 @@ Chrome.prototype = {
 
     _trackActor: function(actor, inputRegion, strut) {
         let actorData;
+        let i = this._findActor(actor);
 
-        if (this._findActor(actor) != -1)
-            throw new Error('trying to re-track existing chrome actor');
+        if (i != -1) {
+            actorData = this._trackedActors[i];
+            if (inputRegion)
+                actorData.inputRegion++;
+            if (strut)
+                actorData.strut++;
+            if (!inputRegion && !strut)
+                actorData.children++;
+            return;
+        }
 
         actorData = { actor: actor,
-                      inputRegion: inputRegion,
-                      strut: strut };
+                      inputRegion: inputRegion ? 1 : 0,
+                      strut: strut ? 1 : 0,
+                      children: 0 };
 
         actorData.visibleId = actor.connect('notify::visible',
                                             Lang.bind(this, this._queueUpdateRegions));
@@ -143,55 +166,77 @@ Chrome.prototype = {
                                                Lang.bind(this, this._queueUpdateRegions));
         actorData.parentSetId = actor.connect('parent-set',
                                               Lang.bind(this, this._actorReparented));
-        // Note that destroying actor will unset its parent, so we don't
-        // need to connect to 'destroy' too.
 
         this._trackedActors.push(actorData);
-        this._queueUpdateRegions();
+
+        actor = actor.get_parent();
+        if (actor != this.actor)
+            this._trackActor(actor, false, false);
+
+        if (inputRegion || strut)
+            this._queueUpdateRegions();
     },
 
-    _untrackActor: function(actor) {
+    _untrackActor: function(actor, inputRegion, strut) {
         let i = this._findActor(actor);
 
         if (i == -1)
             return;
         let actorData = this._trackedActors[i];
 
-        this._trackedActors.splice(i, 1);
-        actor.disconnect(actorData.visibleId);
-        actor.disconnect(actorData.allocationId);
-        actor.disconnect(actorData.parentSetId);
+        if (inputRegion)
+            actorData.inputRegion--;
+        if (strut)
+            actorData.strut--;
+        if (!inputRegion && !strut)
+            actorData.children--;
 
-        this._queueUpdateRegions();
+        if (actorData.inputRegion <= 0 && actorData.strut <= 0 && actorData.children <= 0) {
+            this._trackedActors.splice(i, 1);
+            actor.disconnect(actorData.visibleId);
+            actor.disconnect(actorData.allocationId);
+            actor.disconnect(actorData.parentSetId);
+
+            actor = actor.get_parent();
+            if (actor && actor != this.actor)
+                this._untrackActor(actor, false, false);
+        }
+
+        if (inputRegion || strut)
+            this._queueUpdateRegions();
     },
 
     _actorReparented: function(actor, oldParent) {
-        if (!this._verifyAncestry(actor, this.actor))
-            this._untrackActor(actor);
+        if (this._verifyAncestry(actor, this.actor)) {
+            let newParent = actor.get_parent();
+            if (newParent != this.actor)
+                this._trackActor(newParent, false, false);
+        }
+        if (oldParent != this.actor)
+            this._untrackActor(oldParent, false, false);
     },
 
-    _overviewShowing: function() {
+    _overlayShowing: function() {
         this.actor.show();
-        this.nonOverviewActor.hide();
+        this.nonOverlayActor.hide();
         this._queueUpdateRegions();
     },
 
-    _overviewHidden: function() {
+    _overlayHidden: function() {
         if (this._obscuredByFullscreen)
             this.actor.hide();
-        this.nonOverviewActor.show();
+        this.nonOverlayActor.show();
         this._queueUpdateRegions();
     },
 
     _queueUpdateRegions: function() {
         if (!this._updateRegionIdle)
-            this._updateRegionIdle = Mainloop.idle_add(Lang.bind(this, this._updateRegions),
-                                                       Meta.PRIORITY_BEFORE_REDRAW);
+            this._updateRegionIdle = Mainloop.idle_add(Lang.bind(this, this._updateRegions));
     },
 
     _windowsRestacked: function() {
+        let global = Shell.Global.get();
         let windows = global.get_windows();
-        let primary = global.get_primary_monitor();
 
         // The chrome layer should be visible unless there is a window
         // with layer FULLSCREEN, or a window with layer
@@ -209,20 +254,22 @@ Chrome.prototype = {
         for (let i = windows.length - 1; i > -1; i--) {
             let layer = windows[i].get_meta_window().get_layer();
 
-            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT ||
-                layer == Meta.StackLayer.FULLSCREEN) {
-                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) {
+            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT) {
+                if (windows[i].x <= 0 &&
+                    windows[i].x + windows[i].width >= global.screen_width &&
+                    windows[i].y <= 0 &&
+                    windows[i].y + windows[i].height >= global.screen_height) {
                     this._obscuredByFullscreen = true;
                     break;
                 }
+            } else if (layer == Meta.StackLayer.FULLSCREEN) {
+                this._obscuredByFullscreen = true;
+                break;
             } else
                 break;
         }
 
-        let shouldBeVisible = !this._obscuredByFullscreen || Main.overview.visible;
+        let shouldBeVisible = !this._obscuredByFullscreen || Main.overlay.visible;
         if (this.actor.visible != shouldBeVisible) {
             this.actor.visible = shouldBeVisible;
             this._queueUpdateRegions();
@@ -230,6 +277,7 @@ Chrome.prototype = {
     },
 
     _updateRegions: function() {
+        let global = Shell.Global.get();
         let rects = [], struts = [], i;
 
         delete this._updateRegionIdle;

js/ui/dash.js

@@ -1,947 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
-const Mainloop = imports.mainloop;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const Lang = imports.lang;
-const St = imports.gi.St;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const AppDisplay = imports.ui.appDisplay;
-const DocDisplay = imports.ui.docDisplay;
-const PlaceDisplay = imports.ui.placeDisplay;
-const GenericDisplay = imports.ui.genericDisplay;
-const Main = imports.ui.main;
-const Search = imports.ui.search;
-
-// 25 search results (per result type) should be enough for everyone
-const MAX_RENDERED_SEARCH_RESULTS = 25;
-
-const DEFAULT_PADDING = 4;
-const DEFAULT_SPACING = 4;
-
-const BACKGROUND_COLOR = new Clutter.Color();
-BACKGROUND_COLOR.from_pixel(0x000000c0);
-
-const PRELIGHT_COLOR = new Clutter.Color();
-PRELIGHT_COLOR.from_pixel(0x4f6fadaa);
-
-const TEXT_COLOR = new Clutter.Color();
-TEXT_COLOR.from_pixel(0x5f5f5fff);
-const BRIGHTER_TEXT_COLOR = new Clutter.Color();
-BRIGHTER_TEXT_COLOR.from_pixel(0xbbbbbbff);
-const BRIGHT_TEXT_COLOR = new Clutter.Color();
-BRIGHT_TEXT_COLOR.from_pixel(0xffffffff);
-const SEARCH_TEXT_COLOR = new Clutter.Color();
-SEARCH_TEXT_COLOR.from_pixel(0x333333ff);
-
-const SEARCH_CURSOR_COLOR = BRIGHT_TEXT_COLOR;
-const HIGHLIGHTED_SEARCH_CURSOR_COLOR = SEARCH_TEXT_COLOR;
-
-const SEARCH_BORDER_BOTTOM_COLOR = new Clutter.Color();
-SEARCH_BORDER_BOTTOM_COLOR.from_pixel(0x191919ff);
-
-const BROWSE_ACTIVATED_BG = new Clutter.Color();
-BROWSE_ACTIVATED_BG.from_pixel(0x303030f0);
-
-const APPS = "apps";
-const PREFS = "prefs";
-const DOCS = "docs";
-const PLACES = "places";
-
-/*
- * Returns the index in an array of a given length that is obtained
- * if the provided index is incremented by an increment and the array
- * is wrapped in if necessary.
- *
- * index: prior index, expects 0 <= index < length
- * increment: the change in index, expects abs(increment) <= length
- * length: the length of the array
- */
-function _getIndexWrapped(index, increment, length) {
-   return (index + increment + length) % length;
-}
-
-function _createDisplay(displayType, flags) {
-    if (displayType == APPS)
-        return new AppDisplay.AppDisplay(false, flags);
-    else if (displayType == PREFS)
-        return new AppDisplay.AppDisplay(true, flags);
-    else if (displayType == DOCS)
-        return new DocDisplay.DocDisplay(flags);
-    else if (displayType == PLACES)
-        return new PlaceDisplay.PlaceDisplay(flags);
-    return null;
-}
-
-function Pane() {
-    this._init();
-}
-
-Pane.prototype = {
-    _init: function () {
-        this._open = false;
-
-        this.actor = new St.BoxLayout({ style_class: "dash-pane",
-                                         vertical: true,
-                                         reactive: true });
-        this.actor.connect('button-press-event', Lang.bind(this, function (a, e) {
-            // Eat button press events so they don't go through and close the pane
-            return true;
-        }));
-
-        let chromeTop = new St.BoxLayout();
-
-        let closeIcon = new St.Button({ style_class: "dash-pane-close" });
-        closeIcon.connect('clicked', Lang.bind(this, function (b, e) {
-            this.close();
-        }));
-        let dummy = new St.Bin();
-        chromeTop.add(dummy, { expand: true });
-        chromeTop.add(closeIcon, { x_align: St.Align.END });
-        this.actor.add(chromeTop);
-
-        this.content = new St.BoxLayout({ vertical: true });
-        this.actor.add(this.content, { expand: true });
-
-        // Hidden by default
-        this.actor.hide();
-    },
-
-    open: function () {
-        if (this._open)
-            return;
-        this._open = true;
-        this.actor.show();
-        this.emit('open-state-changed', this._open);
-    },
-
-    close: function () {
-        if (!this._open)
-            return;
-        this._open = false;
-        this.actor.hide();
-        this.emit('open-state-changed', this._open);
-    },
-
-    destroyContent: function() {
-        let children = this.content.get_children();
-        for (let i = 0; i < children.length; i++) {
-            children[i].destroy();
-        }
-    },
-
-    toggle: function () {
-        if (this._open)
-            this.close();
-        else
-            this.open();
-    }
-}
-Signals.addSignalMethods(Pane.prototype);
-
-function ResultArea(displayType, flags) {
-    this._init(displayType, flags);
-}
-
-ResultArea.prototype = {
-    _init : function(displayType, flags) {
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL });
-        this.resultsContainer = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                              spacing: DEFAULT_PADDING
-                                            });
-        this.actor.append(this.resultsContainer, Big.BoxPackFlags.EXPAND);
-
-        this.display = _createDisplay(displayType, flags);
-        this.resultsContainer.append(this.display.actor, Big.BoxPackFlags.EXPAND);
-        this.display.load();
-    }
-}
-
-// Utility function shared between ResultPane and the DocDisplay in the main dash.
-// Connects to the detail signal of the display, and on-demand creates a new
-// pane.
-function createPaneForDetails(dash, display) {
-    let detailPane = null;
-    display.connect('show-details', Lang.bind(this, function(display, index) {
-        if (detailPane == null) {
-            detailPane = new Pane();
-            detailPane.connect('open-state-changed', Lang.bind(this, function (pane, isOpen) {
-                if (!isOpen) {
-                    /* Ensure we don't keep around large preview textures */
-                    detailPane.destroyContent();
-                }
-            }));
-            dash._addPane(detailPane);
-        }
-
-        if (index >= 0) {
-            detailPane.destroyContent();
-            let details = display.createDetailsForIndex(index);
-            detailPane.content.add(details, { expand: true });
-            detailPane.open();
-        } else {
-            detailPane.close();
-        }
-    }));
-    return null;
-}
-
-function ResultPane(dash) {
-    this._init(dash);
-}
-
-ResultPane.prototype = {
-    __proto__: Pane.prototype,
-
-    _init: function(dash) {
-        Pane.prototype._init.call(this);
-        this._dash = dash;
-    },
-
-    // Create a display of displayType and pack it into this pane's
-    // content area.  Return the display.
-    packResults: function(displayType) {
-        let resultArea = new ResultArea(displayType);
-
-        createPaneForDetails(this._dash, resultArea.display);
-
-        this.content.add(resultArea.actor, { expand: true });
-        this.connect('open-state-changed', Lang.bind(this, function(pane, isOpen) {
-            resultArea.display.resetState();
-        }));
-        return resultArea.display;
-    }
-}
-
-function SearchEntry() {
-    this._init();
-}
-
-SearchEntry.prototype = {
-    _init : function() {
-        this.actor = new St.BoxLayout({ name: "searchEntry",
-                                        reactive: true });
-        let box = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                y_align: Big.BoxAlignment.CENTER });
-        this.actor.add(box, { expand: true });
-        this.actor.connect('button-press-event', Lang.bind(this, function () {
-            this._resetTextState(true);
-            return false;
-        }));
-
-        this.pane = null;
-
-        this._defaultText = _("Find...");
-
-        let textProperties = { font_name: "Sans 16px" };
-        let entryProperties = { editable: true,
-                                activatable: true,
-                                single_line_mode: true,
-                                color: SEARCH_TEXT_COLOR,
-                                cursor_color: SEARCH_CURSOR_COLOR };
-        Lang.copyProperties(textProperties, entryProperties);
-        this.entry = new Clutter.Text(entryProperties);
-
-        this.entry.connect('notify::text', Lang.bind(this, function () {
-            this._resetTextState(false);
-        }));
-        box.append(this.entry, Big.BoxPackFlags.EXPAND);
-
-        // Mark as editable just to get a cursor
-        let defaultTextProperties = { ellipsize: Pango.EllipsizeMode.END,
-                                      text: this._defaultText,
-                                      editable: true,
-                                      color: TEXT_COLOR,
-                                      cursor_visible: false,
-                                      single_line_mode: true };
-        Lang.copyProperties(textProperties, defaultTextProperties);
-        this._defaultText = new Clutter.Text(defaultTextProperties);
-        box.add_actor(this._defaultText);
-        this.entry.connect('notify::allocation', Lang.bind(this, function () {
-            this._repositionDefaultText();
-        }));
-
-        this._iconBox = new Big.Box({ x_align: Big.BoxAlignment.CENTER,
-                                      y_align: Big.BoxAlignment.CENTER,
-                                      padding_right: 4 });
-        box.append(this._iconBox, Big.BoxPackFlags.END);
-
-        let magnifierUri = "file://" + global.imagedir + "magnifier.svg";
-        this._magnifierIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
-                                                                             magnifierUri, 18, 18);
-        let closeUri = "file://" + global.imagedir + "close-black.svg";
-        this._closeIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
-                                                                         closeUri, 18, 18);
-        this._closeIcon.reactive = true;
-        this._closeIcon.connect('button-press-event', Lang.bind(this, function () {
-            // Resetting this.entry.text will trigger notify::text signal which will
-            // result in this._resetTextState() being called, but we should not rely
-            // on that not short-circuiting if the text was already empty, so we call
-            // this._resetTextState() explicitly in that case.
-            if (this.entry.text == '')
-                this._resetTextState(false);
-            else
-                this.entry.text = '';
-
-            // Return true to stop the signal emission, so that this.actor doesn't get
-            // the button-press-event and re-highlight itself.
-            return true;
-        }));
-        this._repositionDefaultText();
-        this._resetTextState();
-    },
-
-    setPane: function (pane) {
-        this._pane = pane;
-    },
-
-    reset: function () {
-        this.entry.text = '';
-    },
-
-    getText: function () {
-        return this.entry.text;
-    },
-
-    _resetTextState: function (searchEntryClicked) {
-        let text = this.getText();
-        this._iconBox.remove_all();
-        // We highlight the search box if the user starts typing in it
-        // or just clicks in it to indicate that the search is active.
-        if (text != '' || searchEntryClicked) {
-            if (!searchEntryClicked)
-                this._defaultText.hide();
-            this._iconBox.append(this._closeIcon, Big.BoxPackFlags.NONE);
-            this.actor.set_style_pseudo_class('active');
-            this.entry.cursor_color = HIGHLIGHTED_SEARCH_CURSOR_COLOR;
-        } else {
-            this._defaultText.show();
-            this._iconBox.append(this._magnifierIcon, Big.BoxPackFlags.NONE);
-            this.actor.set_style_pseudo_class(null);
-            this.entry.cursor_color = SEARCH_CURSOR_COLOR;
-        }
-    },
-
-    _repositionDefaultText: function () {
-        // Offset a little to show the cursor
-        this._defaultText.set_position(this.entry.x + 4, this.entry.y);
-        this._defaultText.set_size(this.entry.width, this.entry.height);
-    }
-};
-Signals.addSignalMethods(SearchEntry.prototype);
-
-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.Clickable({ style_class: 'dash-search-result',
-                                        reactive: true,
-                                        x_align: St.Align.START,
-                                        x_fill: true,
-                                        y_fill: true });
-        this.actor._delegate = this;
-
-        let content = provider.createResultActor(metaInfo, terms);
-        if (content == null) {
-            content = new St.BoxLayout({ style_class: 'dash-search-result-content' });
-            let title = new St.Label({ text: this.metaInfo['name'] });
-            let icon = this.metaInfo['icon'];
-            content.add(icon, { y_fill: false });
-            content.add(title, { expand: true, y_fill: false });
-        }
-        this._content = content;
-        this.actor.set_child(content);
-
-        this.actor.connect('clicked', Lang.bind(this, this._onResultClicked));
-    },
-
-    setSelected: function(selected) {
-        this._content.set_style_pseudo_class(selected ? 'selected' : null);
-    },
-
-    activate: function() {
-        this.provider.activateResult(this.metaInfo.id);
-        Main.overview.toggle();
-    },
-
-    _onResultClicked: function(actor, event) {
-        this.activate();
-    }
-}
-
-function OverflowSearchResults(provider) {
-    this._init(provider);
-}
-
-OverflowSearchResults.prototype = {
-    __proto__: Search.SearchResultDisplay.prototype,
-
-    _init: function(provider) {
-        Search.SearchResultDisplay.prototype._init.call(this, provider);
-        this.actor = new St.OverflowBox({ style_class: 'dash-search-section-list-results' });
-    },
-
-    renderResults: function(results, terms) {
-        for (let i = 0; i < results.length && i < MAX_RENDERED_SEARCH_RESULTS; i++) {
-            let result = results[i];
-            let meta = this.provider.getResultMeta(result);
-            let display = new SearchResult(this.provider, meta, terms);
-            this.actor.add_actor(display.actor);
-        }
-    },
-
-    getVisibleCount: function() {
-        return this.actor.get_n_visible();
-    },
-
-    selectIndex: function(index) {
-        let nVisible = this.actor.get_n_visible();
-        let children = this.actor.get_children();
-        if (this.selectionIndex >= 0) {
-            let prevActor = children[this.selectionIndex];
-            prevActor._delegate.setSelected(false);
-        }
-        this.selectionIndex = -1;
-        if (index >= nVisible)
-            return false;
-        else if (index < 0)
-            return false;
-        let targetActor = children[index];
-        targetActor._delegate.setSelected(true);
-        this.selectionIndex = index;
-        return true;
-    }
-}
-
-function SearchResults(searchSystem) {
-    this._init(searchSystem);
-}
-
-SearchResults.prototype = {
-    _init: function(searchSystem) {
-        this._searchSystem = searchSystem;
-
-        this.actor = new St.BoxLayout({ name: 'dashSearchResults',
-                                        vertical: true });
-        this._searchingNotice = new St.Label({ style_class: 'dash-search-starting',
-                                               text: _("Searching...") });
-        this.actor.add(this._searchingNotice);
-        this._selectedProvider = -1;
-        this._providers = this._searchSystem.getProviders();
-        this._providerMeta = [];
-        for (let i = 0; i < this._providers.length; i++) {
-            let provider = this._providers[i];
-            let providerBox = new St.BoxLayout({ style_class: 'dash-search-section',
-                                                  vertical: true });
-            let titleButton = new St.Button({ style_class: 'dash-search-section-header',
-                                              reactive: true,
-                                              x_fill: true,
-                                              y_fill: true });
-            titleButton.connect('clicked', Lang.bind(this, function () { this._onHeaderClicked(provider); }));
-            providerBox.add(titleButton);
-            let titleBox = new St.BoxLayout();
-            titleButton.set_child(titleBox);
-            let title = new St.Label({ text: provider.title });
-            let count = new St.Label();
-            titleBox.add(title, { expand: true });
-            titleBox.add(count);
-
-            let resultDisplayBin = new St.Bin({ style_class: 'dash-search-section-results',
-                                                x_fill: true,
-                                                y_fill: true });
-            providerBox.add(resultDisplayBin, { expand: true });
-            let resultDisplay = provider.createResultContainerActor();
-            if (resultDisplay == null) {
-                resultDisplay = new OverflowSearchResults(provider);
-            }
-            resultDisplayBin.set_child(resultDisplay.actor);
-
-            this._providerMeta.push({ actor: providerBox,
-                                      resultDisplay: resultDisplay,
-                                      count: count });
-            this.actor.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._searchingNotice.hide();
-        this._clearDisplay();
-    },
-
-    startingSearch: function() {
-        this.reset();
-        this._searchingNotice.show();
-    },
-
-    _metaForProvider: function(provider) {
-        return this._providerMeta[this._providers.indexOf(provider)];
-    },
-
-    updateSearch: function (searchString) {
-        let results = this._searchSystem.updateSearch(searchString);
-
-        this._searchingNotice.hide();
-        this._clearDisplay();
-
-        let terms = this._searchSystem.getTerms();
-
-        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);
-            meta.count.set_text(""+providerResults.length);
-        }
-
-        this.selectDown(false);
-
-        return true;
-    },
-
-    _onHeaderClicked: function(provider) {
-        provider.expandSearch(this._searchSystem.getTerms());
-    },
-
-    _modifyActorSelection: function(resultDisplay, up) {
-        let success;
-        let index = resultDisplay.getSelectionIndex();
-        if (up && index == -1)
-            index = resultDisplay.getVisibleCount() - 1;
-        else if (up)
-            index = index - 1;
-        else
-            index = index + 1;
-        return resultDisplay.selectIndex(index);
-    },
-
-    selectUp: function(recursing) {
-        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._providerMeta.length > 0 && !recursing) {
-            this._selectedProvider = this._providerMeta.length - 1;
-            this.selectUp(true);
-        }
-    },
-
-    selectDown: function(recursing) {
-        let current = this._selectedProvider;
-        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;
-            }
-        }
-        if (this._providerMeta.length > 0 && !recursing) {
-            this._selectedProvider = 0;
-            this.selectDown(true);
-        }
-    },
-
-    activateSelected: function() {
-        let current = this._selectedProvider;
-        if (current < 0)
-            return;
-        let meta = this._providerMeta[current];
-        let resultDisplay = meta.resultDisplay;
-        let children = resultDisplay.actor.get_children();
-        let targetActor = children[resultDisplay.getSelectionIndex()];
-        targetActor._delegate.activate();
-    }
-}
-
-function MoreLink() {
-    this._init();
-}
-
-MoreLink.prototype = {
-    _init : function () {
-        this.actor = new St.BoxLayout({ style_class: "more-link",
-                                        reactive: true });
-        this.pane = null;
-
-        let expander = new St.Bin({ style_class: "more-link-expander" });
-        this.actor.add(expander, { expand: true, y_fill: false });
-    },
-
-    activate: function() {
-        if (this.pane == null) {
-            // Ensure the pane is created; the activated handler will call setPane
-            this.emit('activated');
-        }
-        this._pane.toggle();
-        return true;
-    },
-
-    setPane: function (pane) {
-        this._pane = pane;
-        this._pane.connect('open-state-changed', Lang.bind(this, function(pane, isOpen) {
-        }));
-    }
-}
-
-Signals.addSignalMethods(MoreLink.prototype);
-
-function BackLink() {
-    this._init();
-}
-
-BackLink.prototype = {
-    _init : function () {
-        this.actor = new St.Button({ style_class: "section-header-back",
-                                      reactive: true });
-        this.actor.set_child(new St.Bin({ style_class: "section-header-back-image" }));
-    }
-}
-
-function SectionHeader(title, suppressBrowse) {
-    this._init(title, suppressBrowse);
-}
-
-SectionHeader.prototype = {
-    _init : function (title, suppressBrowse) {
-        this.actor = new St.Bin({ style_class: "section-header",
-                                  x_align: St.Align.START,
-                                  x_fill: true,
-                                  y_fill: true,
-                                  reactive: !suppressBrowse });
-        this._innerBox = new St.BoxLayout({ style_class: "section-header-inner" });
-        this.actor.set_child(this._innerBox);
-
-        this.backLink = new BackLink();
-        this._innerBox.add(this.backLink.actor);
-        this.backLink.actor.hide();
-        this.backLink.actor.connect('clicked', Lang.bind(this, function (actor) {
-            this.emit('back-link-activated');
-        }));
-
-        let textBox = new St.BoxLayout({ style_class: "section-text-content" });
-        this.text = new St.Label({ style_class: "section-title",
-                                   text: title });
-        textBox.add(this.text, { x_align: St.Align.START });
-
-        this.countText = new St.Label({ style_class: "section-count" });
-        textBox.add(this.countText, { expand: true, x_fill: false, x_align: St.Align.END });
-        this.countText.hide();
-
-        this._innerBox.add(textBox, { expand: true });
-
-        if (!suppressBrowse) {
-            this.moreLink = new MoreLink();
-            this._innerBox.add(this.moreLink.actor, { x_align: St.Align.END });
-            this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
-        }
-    },
-
-    _onButtonPress: function() {
-        this.moreLink.activate();
-    },
-
-    setTitle : function(title) {
-        this.text.text = title;
-    },
-
-    setBackLinkVisible : function(visible) {
-        if (visible)
-            this.backLink.actor.show();
-        else
-            this.backLink.actor.hide();
-    },
-
-    setMoreLinkVisible : function(visible) {
-        if (visible)
-            this.moreLink.actor.show();
-        else
-            this.moreLink.actor.hide();
-    },
-
-    setCountText : function(countText) {
-        if (countText == "") {
-            this.countText.hide();
-        } else {
-            this.countText.show();
-            this.countText.text = countText;
-        }
-    }
-}
-
-Signals.addSignalMethods(SectionHeader.prototype);
-
-function SearchSectionHeader(title, onClick) {
-    this._init(title, onClick);
-}
-
-SearchSectionHeader.prototype = {
-    _init : function(title, onClick) {
-        this.actor = new St.Button({ style_class: "dash-search-section-header",
-                                      x_fill: true,
-                                      y_fill: true });
-        let box = new St.BoxLayout();
-        this.actor.set_child(box);
-        let titleText = new St.Label({ style_class: "dash-search-section-title",
-                                        text: title });
-        this.countText = new St.Label({ style_class: "dash-search-section-count" });
-
-        box.add(titleText);
-        box.add(this.countText, { expand: true, x_fill: false, x_align: St.Align.END });
-
-        this.actor.connect('clicked', onClick);
-    }
-}
-
-function Section(titleString, suppressBrowse) {
-    this._init(titleString, suppressBrowse);
-}
-
-Section.prototype = {
-    _init: function(titleString, suppressBrowse) {
-        this.actor = new St.BoxLayout({ style_class: 'dash-section',
-                                         vertical: true });
-        this.header = new SectionHeader(titleString, suppressBrowse);
-        this.actor.add(this.header.actor);
-        this.content = new St.BoxLayout({ style_class: 'dash-section-content',
-                                           vertical: true });
-        this.actor.add(this.content);
-    }
-}
-
-function Dash() {
-    this._init();
-}
-
-Dash.prototype = {
-    _init : function() {
-        // dash and the popup panes need to be reactive so that the clicks in unoccupied places on them
-        // are not passed to the transparent background underneath them. This background is used for the workspaces area when
-        // the additional dash panes are being shown and it handles clicks by closing the additional panes, so that the user
-        // can interact with the workspaces. However, this behavior is not desirable when the click is actually over a pane.
-        //
-        // We have to make the individual panes reactive instead of making the whole dash actor reactive because the width
-        // of the Group actor ends up including the width of its hidden children, so we were getting a reactive object as
-        // wide as the details pane that was blocking the clicks to the workspaces underneath it even when the details pane
-        // was actually hidden.
-        this.actor = new St.BoxLayout({ name: "dash",
-                                        vertical: true,
-                                        reactive: true });
-
-        // The searchArea just holds the entry
-        this.searchArea = new St.BoxLayout({ name: "dashSearchArea",
-                                             vertical: true });
-        this.sectionArea = new St.BoxLayout({ name: "dashSections",
-                                               vertical: true });
-
-        this.actor.add(this.searchArea);
-        this.actor.add(this.sectionArea);
-
-        // The currently active popup display
-        this._activePane = null;
-
-        /***** Search *****/
-
-        this._searchActive = false;
-        this._searchPending = false;
-        this._searchEntry = new SearchEntry();
-        this.searchArea.add(this._searchEntry.actor, { y_fill: false, expand: true });
-
-        this._searchSystem = new Search.SearchSystem();
-        this._searchSystem.registerProvider(new AppDisplay.AppSearchProvider());
-        this._searchSystem.registerProvider(new AppDisplay.PrefsSearchProvider());
-        this._searchSystem.registerProvider(new PlaceDisplay.PlaceSearchProvider());
-        this._searchSystem.registerProvider(new DocDisplay.DocSearchProvider());
-
-        this.searchResults = new SearchResults(this._searchSystem);
-        this.actor.add(this.searchResults.actor);
-        this.searchResults.actor.hide();
-
-        this._searchTimeoutId = 0;
-        this._searchEntry.entry.connect('text-changed', Lang.bind(this, function (se, prop) {
-            let text = this._searchEntry.getText();
-            text = text.replace(/^\s+/g, "").replace(/\s+$/g, "");
-            let searchPreviouslyActive = this._searchActive;
-            this._searchActive = text != '';
-            this._searchPending = this._searchActive && !searchPreviouslyActive;
-            if (this._searchPending) {
-                this.searchResults.startingSearch();
-            }
-            if (this._searchActive) {
-                this.searchResults.actor.show();
-                this.sectionArea.hide();
-            } else {
-                this.searchResults.actor.hide();
-                this.sectionArea.show();
-            }
-            if (!this._searchActive) {
-                if (this._searchTimeoutId > 0) {
-                    Mainloop.source_remove(this._searchTimeoutId);
-                    this._searchTimeoutId = 0;
-                }
-                return;
-            }
-            if (this._searchTimeoutId > 0)
-                return;
-            this._searchTimeoutId = Mainloop.timeout_add(150, Lang.bind(this, this._doSearch));
-        }));
-        this._searchEntry.entry.connect('activate', Lang.bind(this, function (se) {
-            if (this._searchTimeoutId > 0) {
-                Mainloop.source_remove(this._searchTimeoutId);
-                this._doSearch();
-            }
-            this.searchResults.activateSelected();
-            return true;
-        }));
-        this._searchEntry.entry.connect('key-press-event', Lang.bind(this, function (se, e) {
-            let symbol = e.get_key_symbol();
-            if (symbol == Clutter.Escape) {
-                // Escape will keep clearing things back to the desktop.
-                // If we have an active search, we remove it.
-                if (this._searchActive)
-                    this._searchEntry.reset();
-                // Next, if we're in one of the "more" modes or showing the details pane, close them
-                else if (this._activePane != null)
-                    this._activePane.close();
-                // Finally, just close the Overview entirely
-                else
-                    Main.overview.hide();
-                return true;
-            } else if (symbol == Clutter.Up) {
-                if (!this._searchActive)
-                    return true;
-                this.searchResults.selectUp(false);
-
-                return true;
-            } else if (symbol == Clutter.Down) {
-                if (!this._searchActive)
-                    return true;
-
-                this.searchResults.selectDown(false);
-                return true;
-            }
-            return false;
-        }));
-
-        /***** Applications *****/
-
-        this._appsSection = new Section(_("APPLICATIONS"));
-        let appWell = new AppDisplay.AppWell();
-        this._appsSection.content.add(appWell.actor, { expand: true });
-
-        this._moreAppsPane = null;
-        this._appsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
-            if (this._moreAppsPane == null) {
-                this._moreAppsPane = new ResultPane(this);
-                this._moreAppsPane.packResults(APPS);
-                this._addPane(this._moreAppsPane);
-                link.setPane(this._moreAppsPane);
-           }
-        }));
-
-        this.sectionArea.add(this._appsSection.actor);
-
-        /***** Places *****/
-
-        /* Translators: This is in the sense of locations for documents,
-           network locations, etc. */
-        this._placesSection = new Section(_("PLACES"), true);
-        let placesDisplay = new PlaceDisplay.DashPlaceDisplay();
-        this._placesSection.content.add(placesDisplay.actor, { expand: true });
-        this.sectionArea.add(this._placesSection.actor);
-
-        /***** Documents *****/
-
-        this._docsSection = new Section(_("RECENT DOCUMENTS"));
-
-        this._docDisplay = new DocDisplay.DashDocDisplay();
-        this._docsSection.content.add(this._docDisplay.actor, { expand: true });
-
-        this._moreDocsPane = null;
-        this._docsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
-            if (this._moreDocsPane == null) {
-                this._moreDocsPane = new ResultPane(this);
-                this._moreDocsPane.packResults(DOCS);
-                this._addPane(this._moreDocsPane);
-                link.setPane(this._moreDocsPane);
-           }
-        }));
-
-        this._docDisplay.connect('changed', Lang.bind(this, function () {
-            this._docsSection.header.setMoreLinkVisible(
-                this._docDisplay.actor.get_children().length > 0);
-        }));
-        this._docDisplay.emit('changed');
-
-        this.sectionArea.add(this._docsSection.actor, { expand: true });
-    },
-
-    _doSearch: function () {
-        this._searchTimeoutId = 0;
-        let text = this._searchEntry.getText();
-        this.searchResults.updateSearch(text);
-
-        return false;
-    },
-
-    show: function() {
-        global.stage.set_key_focus(this._searchEntry.entry);
-    },
-
-    hide: function() {
-        this._firstSelectAfterOverlayShow = true;
-        this._searchEntry.reset();
-        if (this._activePane != null)
-            this._activePane.close();
-    },
-
-    closePanes: function () {
-        if (this._activePane != null)
-            this._activePane.close();
-    },
-
-    _addPane: function(pane) {
-        pane.connect('open-state-changed', Lang.bind(this, function (pane, isOpen) {
-            if (isOpen) {
-                if (pane != this._activePane && this._activePane != null) {
-                    this._activePane.close();
-                }
-                this._activePane = pane;
-            } else if (pane == this._activePane) {
-                this._activePane = null;
-            }
-        }));
-        Main.overview.addPane(pane);
-    }
-};
-Signals.addSignalMethods(Dash.prototype);

js/ui/dnd.js

@@ -8,40 +8,15 @@ const Tweener = imports.ui.tweener;
 
 const SNAP_BACK_ANIMATION_TIME = 0.25;
 
-let eventHandlerActor = null;
-let currentDraggable = null;
-
-function _getEventHandlerActor() {
-    if (!eventHandlerActor) {
-        eventHandlerActor = new Clutter.Rectangle();
-        eventHandlerActor.width = 0;
-        eventHandlerActor.height = 0;
-        global.stage.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',
-                                  function(actor, event) {
-                                      return currentDraggable._onEvent(actor, event);
-                                  });
-    }
-    return eventHandlerActor;
-}
-
-function _Draggable(actor, manualMode) {
-    this._init(actor, manualMode);
+function _Draggable(actor) {
+    this._init(actor);
 }
 
 _Draggable.prototype = {
-    _init : function(actor, manualMode) {
+    _init : function(actor) {
         this.actor = actor;
-        if (!manualMode)
-            this.actor.connect('button-press-event',
-                               Lang.bind(this, this._onButtonPress));
-        this._onEventId = null;
-
-        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.actor.connect('button-press-event',
+                           Lang.bind(this, this._onButtonPress));
     },
 
     _onButtonPress : function (actor, event) {
@@ -50,8 +25,7 @@ _Draggable.prototype = {
         if (Tweener.getTweenCount(actor))
             return false;
 
-        this._buttonDown = true;
-        this._grabActor();
+        this._grabActor(actor);
 
         let [stageX, stageY] = event.get_coords();
         this._dragStartX = stageX;
@@ -60,168 +34,97 @@ _Draggable.prototype = {
         return false;
     },
     
-    _grabActor: function() {
-        Clutter.grab_pointer(this.actor);
-        this._onEventId = this.actor.connect('event',
-                                             Lang.bind(this, this._onEvent));
+    _grabActor : function (actor) {
+        Clutter.grab_pointer(actor);
+
+        // We intercept motion and button-release events so that when
+        // you release after dragging, the app doesn't see that and
+        // think you just clicked. We connect to 'event' rather than
+        // 'captured-event' because the capturing phase doesn't happen
+        // when you've grabbed the pointer.
+        this._onEventId = actor.connect('event',
+                                        Lang.bind(this, this._onEvent));
     },
 
-    _ungrabActor: function() {
+    _ungrabActor : function (actor) {
         Clutter.ungrab_pointer();
-        this.actor.disconnect(this._onEventId);
-        this._onEventId = null;
+        actor.disconnect(this._onEventId);
     },
 
-    _grabEvents: function() {
-        Clutter.grab_pointer(_getEventHandlerActor());
-        Clutter.grab_keyboard(_getEventHandlerActor());
-    },
-
-    _ungrabEvents: function() {
-        Clutter.ungrab_pointer();
-        Clutter.ungrab_keyboard();
-    },
-
-    _onEvent: function(actor, event) {
-        // We intercept BUTTON_RELEASE event to know that the button was released in case we
-        // didn't start the drag, to drop the draggable in case the drag was in progress, and
-        // to complete the drag and ensure that whatever happens to be under the pointer does
-        // not get triggered if the drag was cancelled with Esc.
-        if (event.type() == Clutter.EventType.BUTTON_RELEASE) {
-            this._buttonDown = false;
-            if (this._dragInProgress) {
-                return this._dragActorDropped(event);
-            } else if (this._dragActor != null && !this._snapBackInProgress) {
-                // Drag must have been cancelled with Esc.
-                this._dragComplete();
-                return true;
-            } else {
-                // Drag has never started.
-                this._ungrabActor();
+    _onEvent : function (actor, event) {
+        if (this._dragActor) {
+            if (actor != this._dragActor )
                 return false;
-            }
-        // We intercept MOTION event to figure out if the drag has started and to draw
-        // this._dragActor under the pointer when dragging is in progress
-        } else if (event.type() == Clutter.EventType.MOTION) {
-            if (this._dragInProgress) {
-                return this._updateDragPosition(event);
-            } else if (this._dragActor == null) {
-                return this._maybeStartDrag(event);
-            }
-        // We intercept KEY_PRESS event so that we can process Esc key press to cancel
-        // dragging and ignore all other key presses.
-        } else if (event.type() == Clutter.EventType.KEY_PRESS && this._dragInProgress) {
-            let symbol = event.get_key_symbol();
-            if (symbol == Clutter.Escape) {
-                this._cancelDrag(event.get_time());
-                return true;
-            }
-        }
+        } else if (actor != this.actor)
+            return false;
 
-        return false;
+        if (event.type() == Clutter.EventType.BUTTON_RELEASE)
+            return this._onButtonRelease(actor, event);
+        else if (event.type() == Clutter.EventType.MOTION)
+            return this._onMotion(actor, event);
+        else
+            return false;
     },
 
-    /**
-     * startDrag:
-     * @stageX: X coordinate of event
-     * @stageY: Y coordinate of event
-     * @time: Event timestamp
-     *
-     * Directly initiate a drag and drop operation from the given actor.
-     * This function is useful to call if you've specified manualMode
-     * for the draggable.
-     */
-    startDrag: function (stageX, stageY, time) {
-        currentDraggable = this;
-        this._dragInProgress = true;
-
-        this.emit('drag-begin', time);
-        if (this._onEventId)
-            this._ungrabActor();
-        this._grabEvents();
-
-        this._dragStartX = stageX;
-        this._dragStartY = stageY;
-
-        if (this.actor._delegate && this.actor._delegate.getDragActor) {
-            this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
-            // Drag actor does not always have to be the same as actor. For example drag actor
-            // can be an image that's part of the actor. So to perform "snap back" correctly we need
-            // to know what was the drag actor source.
-            if (this.actor._delegate.getDragActorSource) {
-                this._dragActorSource = this.actor._delegate.getDragActorSource();
-                // If the user dragged from the source, then position
-                // the dragActor over it. Otherwise, center it
-                // around the pointer
-                let [sourceX, sourceY] = this._dragActorSource.get_transformed_position();
-                let [sourceWidth, sourceHeight] = this._dragActorSource.get_transformed_size();
-                let x, y;
-                if (stageX > sourceX && stageX <= sourceX + sourceWidth &&
-                    stageY > sourceY && stageY <= sourceY + sourceHeight) {
-                    x = sourceX;
-                    y = sourceY;
-                } else {
-                    x = stageX - this._dragActor.width / 2;
-                    y = stageY - this._dragActor.height / 2;
-                }
-                this._dragActor.set_position(x, y);
-            } else {
-                this._dragActorSource = this.actor;
-            }
-            this._dragOrigParent = undefined;
-
-            this._dragOffsetX = this._dragActor.x - this._dragStartX;
-            this._dragOffsetY = this._dragActor.y - this._dragStartY;
-        } else {
-            this._dragActor = this.actor;
-            this._dragActorSource = undefined;
-            this._dragOrigParent = this.actor.get_parent();
-            this._dragOrigX = this._dragActor.x;
-            this._dragOrigY = this._dragActor.y;
-            this._dragOrigScale = this._dragActor.scale_x;
-
-            let [actorStageX, actorStageY] = this.actor.get_transformed_position();
-            this._dragOffsetX = actorStageX - this._dragStartX;
-            this._dragOffsetY = actorStageY - this._dragStartY;
-
-            // Set the actor's scale such that it will keep the same
-            // transformed size when it's reparented to the stage
-            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
-            this.actor.set_scale(scaledWidth / this.actor.width,
-                                 scaledHeight / this.actor.height);
-        }
-
-        this._dragActor.reparent(this.actor.get_stage());
-        this._dragActor.raise_top();
-    },
-
-    _maybeStartDrag:  function(event) {
+    _onMotion : function (actor, event) {
         let [stageX, stageY] = event.get_coords();
 
-        // See if the user has moved the mouse enough to trigger a drag
+        // If we haven't begun a drag, see if the user has moved the
+        // mouse enough to trigger a drag
         let threshold = Gtk.Settings.get_default().gtk_dnd_drag_threshold;
-        if ((Math.abs(stageX - this._dragStartX) > threshold ||
+        if (!this._dragActor &&
+            (Math.abs(stageX - this._dragStartX) > threshold ||
              Math.abs(stageY - this._dragStartY) > threshold)) {
-                this.startDrag(stageX, stageY, event.get_time());
-                this._updateDragPosition(event);
+            this.emit('drag-begin', event.get_time());
+
+            if (this.actor._delegate && this.actor._delegate.getDragActor) {
+                this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
+                // Drag actor does not always have to be the same as actor. For example drag actor
+                // can be an image that's part of the actor. So to perform "snap back" correctly we need
+                // to know what was the drag actor source.
+                if (this.actor._delegate.getDragActorSource)
+                    this._dragActorSource = this.actor._delegate.getDragActorSource();
+                else  
+                    this._dragActorSource = this.actor;
+                this._dragOrigParent = undefined;
+                this._ungrabActor(actor);
+                this._grabActor(this._dragActor);
+
+                this._dragOffsetX = this._dragActor.x - this._dragStartX;
+                this._dragOffsetY = this._dragActor.y - this._dragStartY;
+            } else {
+                this._dragActor = actor;
+                this._dragActorSource = undefined;
+                this._dragOrigParent = actor.get_parent();
+                this._dragOrigX = this._dragActor.x;
+                this._dragOrigY = this._dragActor.y;
+                this._dragOrigScale = this._dragActor.scale_x;
+
+                let [actorStageX, actorStageY] = actor.get_transformed_position();
+                this._dragOffsetX = actorStageX - this._dragStartX;
+                this._dragOffsetY = actorStageY - this._dragStartY;
+
+                // Set the actor's scale such that it will keep the same
+                // transformed size when it's reparented to the stage
+                let [scaledWidth, scaledHeight] = actor.get_transformed_size();
+                actor.set_scale(scaledWidth / actor.width,
+                                scaledHeight / actor.height);
+            }
+
+            this._dragActor.reparent(actor.get_stage());
+            this._dragActor.raise_top();
         }
 
-        return true;
-    },
-
-    _updateDragPosition : function (event) {
-        let [stageX, stageY] = event.get_coords();
-
         // If we are dragging, update the position
         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 + this._dragOffsetX,
-                                                                      stageY + this._dragOffsetY);
+            this._dragActor.hide(); 
+            let target = actor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                            stageX + this._dragOffsetX,
+                                                            stageY + this._dragOffsetY);
             this._dragActor.show();
             while (target) {
                 if (target._delegate && target._delegate.handleDragOver) {
@@ -229,54 +132,53 @@ _Draggable.prototype = {
                     // 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 + this._dragOffsetX - targX) / target.scale_x,
-                                                    (stageY + this._dragOffsetY - targY) / target.scale_y,
+                    target._delegate.handleDragOver(this.actor._delegate, actor,
+                                                    (stageX + this._dragOffsetX + this._xOffset - targX) / target.scale_x,
+                                                    (stageY + this._dragOffsetY + this._yOffset - targY) / target.scale_y,
                                                     event.get_time());
                 }
                 target = target.get_parent();
-            }
+            }  
         }
 
         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();
+    _onButtonRelease : function (actor, event) {
+        this._ungrabActor(actor);
+
+        let dragging = (actor == this._dragActor);
+        this._dragActor = undefined;
+
+        if (!dragging)
+            return false;
+
+        this.emit('drag-end', event.get_time());
+
+        // Find a drop target
+        actor.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();
+        let target = actor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                        dropX, dropY);
+        actor.show();
         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,
+                if (target._delegate.acceptDrop(this.actor._delegate, actor,
+                                                (dropX + this._xOffset - targX) / target.scale_x,
+                                                (dropY + this._yOffset - targY) / target.scale_y,
                                                 event.get_time())) {
                     // If it accepted the drop without taking the actor,
                     // destroy it.
-                    if (this._dragActor.get_parent() == this._dragActor.get_stage())
-                        this._dragActor.destroy();
+                    if (actor.get_parent() == actor.get_stage())
+                        actor.destroy();
 
-                    this._dragInProgress = false;
-                    this.emit('drag-end', event.get_time(), true);
-                    this._dragComplete();
                     return true;
                 }
             }
             target = target.get_parent();
         }
 
-        this._cancelDrag(event.get_time());
-
-        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.
@@ -286,50 +188,31 @@ _Draggable.prototype = {
             [snapBackX, snapBackY] = this._dragActorSource.get_transformed_position();
         }
 
-        this._snapBackInProgress = true;
         // No target, so snap back
-        Tweener.addTween(this._dragActor,
+        Tweener.addTween(actor,
                          { x: snapBackX,
                            y: snapBackY,
                            time: SNAP_BACK_ANIMATION_TIME,
                            transition: "easeOutQuad",
                            onComplete: this._onSnapBackComplete,
                            onCompleteScope: this,
-                           onCompleteParams: [this._dragActor, eventTime]
+                           onCompleteParams: [actor]
                          });
+        return true;
     },
 
-    _onSnapBackComplete : function (dragActor, eventTime) {
+    _onSnapBackComplete : function (dragActor) {
         if (this._dragOrigParent) {
             dragActor.reparent(this._dragOrigParent);
             dragActor.set_scale(this._dragOrigScale, this._dragOrigScale);
             dragActor.set_position(this._dragOrigX, this._dragOrigY);
-        } else {
+        } else
             dragActor.destroy();
-        }
-        this.emit('drag-end', eventTime, false);
-
-        this._snapBackInProgress = false;
-        if (!this._buttonDown)
-            this._dragComplete();
-    },
-
-    _dragComplete: function() {
-        this._dragActor = undefined;
-        currentDraggable = null;
-        this._ungrabEvents();
     }
 };
 
 Signals.addSignalMethods(_Draggable.prototype);
 
-/**
- * makeDraggable:
- * @actor: Source actor
- * @manualMode: If given, do not automatically start drag and drop on click
- *
- * Create an object which controls drag and drop for the given actor.
- */
-function makeDraggable(actor, manualMode) {
-    return new _Draggable(actor, manualMode);
+function makeDraggable(actor) {
+    return new _Draggable(actor);
 }

js/ui/docDisplay.js

@@ -1,64 +1,37 @@
 /* -*- 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 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
+ * availableWidth - total width available for the item
  */
-function DocDisplayItem(docInfo, currentSecs) {
-    this._init(docInfo, currentSecs);
+function DocDisplayItem(docInfo, availableWidth) {
+    this._init(docInfo, availableWidth);
 }
 
 DocDisplayItem.prototype = {
     __proto__:  GenericDisplay.GenericDisplayItem.prototype,
 
-    _init : function(docInfo, currentSecs) {
-        GenericDisplay.GenericDisplayItem.prototype._init.call(this);
+    _init : function(docInfo, availableWidth) {
+        GenericDisplay.GenericDisplayItem.prototype._init.call(this, availableWidth);     
         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.
@@ -73,93 +46,67 @@ DocDisplayItem.prototype = {
         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);
+    // Ensures the preview icon is created.
+    _ensurePreviewIconCreated : function() {
+        if (!this._previewIcon)
+            this._previewIcon = 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() {
+    _createLargePreviewIcon : function(availableWidth, availableHeight) {
         if (this._docInfo.mimeType == null || this._docInfo.mimeType.indexOf("image/") != 0)
             return null;
 
-        try {
-            return Shell.TextureCache.get_default().load_uri_sync(Shell.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);
+        return Shell.TextureCache.get_default().load_uri_sync(this._docInfo.uri, availableWidth, availableHeight);
     }
 };
 
 /* This class represents a display containing a collection of document items.
  * The documents are sorted by how recently they were last visited.
+ *
+ * width - width available for the display
+ * height - height available for the display
  */
-function DocDisplay(flags) {
-    this._init(flags);
-}
+function DocDisplay(width, height, numberOfColumns, columnGap) {
+    this._init(width, height, numberOfColumns, columnGap);
+} 
 
 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();
+    _init : function(width, height, numberOfColumns, columnGap) {
+        GenericDisplay.GenericDisplay.prototype._init.call(this, width, height, numberOfColumns, columnGap);  
+        let me = this;
+        this._recentManager = Gtk.RecentManager.get_default();
         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,
+        this._recentManager.connect('changed', function(recentManager, userData) {
+            me._docsStale = true;
+            // Changes in local recent files should not happen when we are in the overlay 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);
-        }));
+            me._redisplay(false); 
+        });
     },
 
     //// Protected method overrides ////
 
     // Gets the list of recent items from the recent items manager.
     _refreshCache : function() {
+        let me = this;
         if (!this._docsStale)
-            return true;
+            return;
         this._allItems = {};
-        Lang.copyProperties(this._docManager.getInfosByUri(), this._allItems);
+        let docs = this._recentManager.get_items();
+        for (let i = 0; i < docs.length; i++) {
+            let recentInfo = docs[i];
+            let docInfo = new DocInfo.DocInfo(recentInfo);
+
+            // we use GtkRecentInfo URI as an item Id
+            this._allItems[docInfo.uri] = docInfo;
+        }
         this._docsStale = false;
-        return false;
     },
 
     // Sets the list of the displayed items based on how recently they were last visited.
@@ -173,24 +120,26 @@ DocDisplay.prototype = {
         // 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
+        // the overlay, 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 = [];
+        this._matchedItems = [];
         let docIdsToRemove = [];
         for (docId in this._allItems) {
-            this._matchedItems[docId] = 1;
-            this._matchedItemKeys.push(docId);
+            // this._allItems[docId].exists() checks if the resource still exists
+            if (this._allItems[docId].exists()) 
+                this._matchedItems.push(docId);
+            else 
+                docIdsToRemove.push(docId);
         }
 
         for (docId in docIdsToRemove) {
             delete this._allItems[docId];
         }
 
-        this._matchedItemKeys.sort(Lang.bind(this, this._compareItems));
+        this._matchedItems.sort(Lang.bind(this, function (a,b) { return this._compareItems(a,b); }));
     },
 
     // Compares items associated with the item ids based on how recently the items
@@ -200,7 +149,7 @@ DocDisplay.prototype = {
         let docA = this._allItems[itemIdA];
         let docB = this._allItems[itemIdB];
 
-        return docB.timestamp - docA.timestamp;
+        return docB.lastVisited() - docA.lastVisited();
     },
 
     // Checks if the item info can be a match for the search string by checking
@@ -223,295 +172,8 @@ DocDisplay.prototype = {
 
     // 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;
-        }
-    }
+        return new DocDisplayItem(itemInfo, this._columnWidth);
+    } 
 };
 
 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();
-
-        // Two columns, where we go vertically down first.  So just take
-        // the height of half of the children as our preferred height.
-
-        let firstColumnChildren = Math.ceil(children.length / 2);
-
-        let natural = 0;
-        for (let i = 0; i < firstColumnChildren; i++) {
-            let child = children[i];
-            let [minSize, naturalSize] = child.get_preferred_height(-1);
-            natural += naturalSize;
-
-            if (i > 0 && i < children.length - 1) {
-                natural += DEFAULT_SPACING;
-            }
-        }
-        alloc.natural_size = natural;
-    },
-
-    _allocate: function(actor, box, flags) {
-        let width = box.x2 - box.x1;
-        let height = box.y2 - box.y1;
-
-        let children = actor.get_children();
-
-        // The width of an item is our allocated width, minus spacing, divided in half.
-        let itemWidth = Math.floor((width - DEFAULT_SPACING) / 2);
-        let x = box.x1;
-        let y = box.y1;
-        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];
-
-            let [minSize, naturalSize] = child.get_preferred_height(-1);
-
-            if (y + naturalSize > 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 + itemWidth + DEFAULT_SPACING;
-                // And y is back to the top.
-                y = box.y1;
-                // 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 + itemWidth;
-            childBox.y2 = y + naturalSize;
-
-            y = childBox.y2 + DEFAULT_SPACING;
-
-            child.show();
-            child.allocate(childBox, flags);
-
-            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;
-        }
-
-        let skipPaint = [];
-        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();
-}
-
-DocSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
-
-    _init: function(name) {
-        Search.SearchProvider.prototype._init.call(this, _("DOCUMENTS"));
-        this._docManager = DocInfo.getDocManager();
-    },
-
-    getResultMeta: function(resultId) {
-        let docInfo = this._docManager.lookupByUri(resultId);
-        if (!docInfo)
-            return null;
-        return { 'id': resultId,
-                 'name': docInfo.name,
-                 'icon': docInfo.createIcon(Search.RESULT_ICON_SIZE)};
-    },
-
-    activateResult: function(id) {
-        let docInfo = this._docManager.lookupByUri(id);
-        docInfo.launch();
-    },
-
-    getInitialResultSet: function(terms) {
-        return this._docManager.initialSearch(terms);
-    },
-
-    getSubsearchResultSet: function(previousResults, terms) {
-        return this._docManager.subsearch(previousResults, terms);
-    },
-
-    expandSearch: function(terms) {
-        log("TODO expand docs search");
-    }
-};

js/ui/environment.js

@@ -1,42 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const St = imports.gi.St;
-const Gettext_gtk20 = imports.gettext.domain('gtk20');
-
-const Tweener = imports.ui.tweener;
-
-const Format = imports.misc.format;
-
-// "monkey patch" in some varargs ClutterContainer methods; we need
-// to do this per-container class since there is no representation
-// of interfaces in Javascript
-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)
-            meta[prop] = props[prop];
-    };
-
-    // clutter_container_add() actually is a an add-many-actors
-    // method. We conveniently, but somewhat dubiously, take the
-    // this opportunity to make it do something more useful.
-    containerClass.prototype.add = function(actor, props) {
-        this.add_actor(actor);
-        if (props)
-            this.child_set(actor, props);
-    };
-}
-
-_patchContainerClass(St.BoxLayout);
-_patchContainerClass(St.Table);
-
-function init() {
-    Tweener.init();
-    String.prototype.format = Format.format;
-
-    // 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") {
-        St.Widget.set_default_direction(St.TextDirection.RTL);
-    }
-}

js/ui/extensionSystem.js

@@ -1,158 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const ExtensionState = {
-    ENABLED: 1,
-    DISABLED: 2,
-    ERROR: 3,
-    OUT_OF_DATE: 4
-};
-
-const ExtensionType = {
-    SYSTEM: 1,
-    PER_USER: 2
-};
-
-// Maps uuid -> metadata object
-const extensionMeta = {};
-// Maps uuid -> importer object (extension directory tree)
-const extensions = {};
-// Array of uuids
-var disabledExtensions;
-// GFile for user extensions
-var userExtensionsDir = null;
-
-function loadExtension(dir, enabled, type) {
-    let info;
-    let baseErrorString = 'While loading extension from "' + dir.get_parse_name() + '": ';
-
-    let metadataFile = dir.get_child('metadata.json');
-    if (!metadataFile.query_exists(null)) {
-        global.logError(baseErrorString + 'Missing metadata.json');
-        return;
-    }
-
-    let [success, metadataContents, len, etag] = metadataFile.load_contents(null);
-    let meta;
-    try {
-        meta = JSON.parse(metadataContents);
-    } catch (e) {
-        global.logError(baseErrorString + 'Failed to parse metadata.json: ' + e);
-        return;
-    }
-    let requiredProperties = ['uuid', 'name', 'description'];
-    for (let i = 0; i < requiredProperties; i++) {
-        let prop = requiredProperties[i];
-        if (!meta[prop]) {
-            global.logError(baseErrorString + 'missing "' + prop + '" property in metadata.json');
-            return;
-        }
-    }
-    // Encourage people to add this
-    if (!meta['url']) {
-        global.log(baseErrorString + 'Warning: Missing "url" property in metadata.json');
-    }
-
-    let base = dir.get_basename();
-    if (base != meta.uuid) {
-        global.logError(baseErrorString + 'uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + base + '"');
-        return;
-    }
-
-    extensionMeta[meta.uuid] = meta;
-    extensionMeta[meta.uuid].type = type;
-    extensionMeta[meta.uuid].path = dir.get_path();
-    if (!enabled) {
-        extensionMeta[meta.uuid].state = ExtensionState.DISABLED;
-        return;
-    }
-
-    // Default to error, we set success as the last step
-    extensionMeta[meta.uuid].state = ExtensionState.ERROR;
-
-    let extensionJs = dir.get_child('extension.js');
-    if (!extensionJs.query_exists(null)) {
-        global.logError(baseErrorString + 'Missing extension.js');
-        return;
-    }
-    let stylesheetPath = null;
-    let themeContext = St.ThemeContext.get_for_stage(global.stage);
-    let theme = themeContext.get_theme();
-    let stylesheetFile = dir.get_child('stylesheet.css');
-    if (stylesheetFile.query_exists(null)) {
-        try {
-            theme.load_stylesheet(stylesheetFile.get_path());
-        } catch (e) {
-            global.logError(baseErrorString + 'Stylesheet parse error: ' + e);
-            return;
-        }
-    }
-
-    let extensionModule;
-    try {
-        global.add_extension_importer('imports.ui.extensionSystem.extensions', meta.uuid, dir.get_path());
-        extensionModule = extensions[meta.uuid].extension;
-    } catch (e) {
-        if (stylesheetPath != null)
-            theme.unload_stylesheet(stylesheetPath);
-        global.logError(baseErrorString + e);
-        return;
-    }
-    if (!extensionModule.main) {
-        global.logError(baseErrorString + 'missing \'main\' function');
-        return;
-    }
-    try {
-        extensionModule.main();
-    } catch (e) {
-        if (stylesheetPath != null)
-            theme.unload_stylesheet(stylesheetPath);
-        global.logError(baseErrorString + 'Failed to evaluate main function:' + e);
-        return;
-    }
-    extensionMeta[meta.uuid].state = ExtensionState.ENABLED;
-    global.log('Loaded extension ' + meta.uuid);
-}
-
-function init() {
-    let userConfigPath = GLib.get_user_config_dir();
-    let userExtensionsPath = GLib.build_filenamev([userConfigPath, 'gnome-shell', 'extensions']);
-    userExtensionsDir = Gio.file_new_for_path(userExtensionsPath);
-    try {
-        userExtensionsDir.make_directory_with_parents(null);
-    } catch (e) {
-        global.logError(""+e);
-    }
-
-    disabledExtensions = Shell.GConf.get_default().get_string_list('disabled_extensions');
-}
-
-function _loadExtensionsIn(dir, type) {
-    let fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
-    let file, info;
-    while ((info = fileEnum.next_file(null)) != null) {
-        let fileType = info.get_file_type();
-        if (fileType != Gio.FileType.DIRECTORY)
-            continue;
-        let name = info.get_name();
-        let enabled = disabledExtensions.indexOf(name) < 0;
-        let child = dir.get_child(name);
-        loadExtension(child, enabled, type);
-    }
-    fileEnum.close(null);
-}
-
-function loadExtensions() {
-    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
-    let systemDataDirs = GLib.get_system_data_dirs();
-    for (let i = 0; i < systemDataDirs.length; i++) {
-        let dirPath = systemDataDirs[i] + '/gnome-shell/extensions';
-        let dir = Gio.file_new_for_path(dirPath);
-        if (dir.query_exists(null))
-            _loadExtensionsIn(dir, ExtensionType.SYSTEM);
-    }
-}

js/ui/lightbox.js

@@ -1,151 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const SHADE_COLOR = new Clutter.Color();
-SHADE_COLOR.from_pixel(0x00000044);
-
-/**
- * Lightbox:
- * @container: parent Clutter.Container
- * @width: (optional) shade actor width
- * @height: (optional) shade actor height
- *
- * Lightbox creates a dark translucent "shade" actor to hide the
- * contents of @container, and allows you to specify particular actors
- * in @container to highlight by bringing them above the shade. It
- * tracks added and removed actors in @container while the lightboxing
- * is active, and ensures that all actors are returned to their
- * original stacking order when the lightboxing is removed. (However,
- * if actors are restacked by outside code while the lightboxing is
- * active, the lightbox may later revert them back to their original
- * order.)
- *
- * 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
- */
-function Lightbox(container, width, height) {
-    this._init(container, width, height);
-}
-
-Lightbox.prototype = {
-    _init : function(container, width, height) {
-        this._container = container;
-        this._children = container.get_children();
-        this.actor = new Clutter.Rectangle({ color: SHADE_COLOR,
-                                             x: 0,
-                                             y: 0,
-                                             border_width: 0,
-                                             reactive: true });
-
-        container.add_actor(this.actor);
-        this.actor.raise_top();
-
-        this._destroySignalId = this.actor.connect('destroy', Lang.bind(this, this.destroy));
-
-        if (width && height) {
-            this.actor.width = width;
-            this.actor.height = height;
-            this._allocationChangedSignalId = 0;
-        } else {
-            this.actor.width = container.width;
-            this.actor.height = container.height;
-            this._allocationChangedSignalId = container.connect('allocation-changed', Lang.bind(this, this._allocationChanged));
-        }
-
-        this._actorAddedSignalId = container.connect('actor-added', Lang.bind(this, this._actorAdded));
-        this._actorRemovedSignalId = container.connect('actor-removed', Lang.bind(this, this._actorRemoved));
-
-        this._highlighted = null;
-    },
-
-    _allocationChanged : function(container, box, flags) {
-        this.actor.width = this._container.width;
-        this.actor.height = this._container.height;
-    },
-
-    _actorAdded : function(container, newChild) {
-        let children = this._container.get_children();
-        let myIndex = children.indexOf(this.actor);
-        let newChildIndex = children.indexOf(newChild);
-
-        if (newChildIndex > myIndex) {
-            // The child was added above the shade (presumably it was
-            // made the new top-most child). Move it below the shade,
-            // and add it to this._children as the new topmost actor.
-            newChild.lower(this.actor);
-            this._children.push(newChild);
-        } else if (newChildIndex == 0) {
-            // Bottom of stack
-            this._children.unshift(newChild);
-        } else {
-            // Somewhere else; insert it into the correct spot
-            let prevChild = this._children.indexOf(children[newChildIndex - 1]);
-            if (prevChild != -1) // paranoia
-                this._children.splice(prevChild + 1, 0, newChild);
-        }
-    },
-
-    _actorRemoved : function(container, child) {
-        let index = this._children.indexOf(child);
-        if (index != -1) // paranoia
-            this._children.splice(index, 1);
-
-        if (child == this._highlighted)
-            this._highlighted = null;
-    },
-
-    /**
-     * highlight:
-     * @window: actor to highlight
-     *
-     * Highlights the indicated actor and unhighlights any other
-     * currently-highlighted actor. With no arguments or a false/null
-     * argument, all actors will be unhighlighted.
-     */
-    highlight : function(window) {
-        if (this._highlighted == window)
-            return;
-
-        // Walk this._children raising and lowering actors as needed.
-        // Things get a little tricky if the to-be-raised and
-        // to-be-lowered actors were originally adjacent, in which
-        // case we may need to indicate some *other* actor as the new
-        // sibling of the to-be-lowered one.
-
-        let below = this.actor;
-        for (let i = this._children.length - 1; i >= 0; i--) {
-            if (this._children[i] == window)
-                this._children[i].raise_top();
-            else if (this._children[i] == this._highlighted)
-                this._children[i].lower(below);
-            else
-                below = this._children[i];
-        }
-
-        this._highlighted = window;
-    },
-
-    /**
-     * destroy:
-     *
-     * Destroys the lightbox. This is called automatically if the
-     * lightbox's container is destroyed.
-     */
-    destroy : function() {
-        if (this._allocationChangedSignalId != 0)
-            this._container.disconnect(this._allocationChangedSignalId);
-        this._container.disconnect(this._actorAddedSignalId);
-        this._container.disconnect(this._actorRemovedSignalId);
-
-        this.actor.disconnect(this._destroySignalId);
-
-        this.highlight(null);
-        this.actor.destroy();
-    }
-};

js/ui/link.js

@@ -3,21 +3,78 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
+// Link is a clickable link. Right now it just handles properly capturing
+// press and release events and short-circuiting the button handling in
+// ClutterText, but more features like different colors for hover/pressed states
+// or a different mouse cursor could be implemented.
+//
+// The properties passed in are forwarded to the Clutter.Text() constructor,
+// so can include, 'text', 'font_name', etc.
 function Link(props) {
     this._init(props);
 }
 
 Link.prototype = {
     _init : function(props) {
-        let realProps = { reactive: true,
-                          style_class: 'shell-link' };
+	let realProps = { reactive: true };
         // The user can pass in reactive: false to override the above and get
         // a non-reactive link (a link to the current page, perhaps)
-        Lang.copyProperties(props, realProps);
+	Lang.copyProperties(props, realProps);
 
-        this.actor = new St.Button(realProps);
+	this.actor = new Clutter.Text(realProps);
+	this.actor._delegate = this;
+	this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
+	this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease));
+	this.actor.connect('enter-event', Lang.bind(this, this._onEnter));
+	this.actor.connect('leave-event', Lang.bind(this, this._onLeave));
+
+	this._buttonDown = false;
+	this._havePointer = false;
+    },
+
+    // Update the text of the link
+    setText : function(text) {
+	this.actor.text = text;
+    },
+
+    // We want to react on buttonDown, but if we override button-release-event for
+    // ClutterText, but not button-press-event, we get a stuck grab. Tracking
+    // buttonDown and doing the grab isn't really necessary, but doing it makes
+    // the behavior perfectly correct if the user clicks on one actor, drags
+    // to another and releases - that should not trigger either actor.
+    _onButtonPress : function(actor, event) {
+	this._buttonDown = true;
+	this._havePointer = true; // Hack to work around poor enter/leave tracking in Clutter
+	Clutter.grab_pointer(actor);
+
+	return true;
+    },
+
+    _onButtonRelease : function(actor, event) {
+	if (this._buttonDown) {
+	    this._buttonDown = false;
+	    Clutter.ungrab_pointer(actor);
+
+	    if (this._havePointer)
+		this.emit('clicked');
+	}
+
+	return true;
+    },
+
+    _onEnter : function(actor, event) {
+	if (event.get_source() == actor)
+	    this._havePointer = true;
+
+        return false;
+    },
+
+    _onLeave : function(actor, event) {
+	if (event.get_source() == actor)
+	    this._havePointer = false;
+
+        return false;
     }
 };
 

js/ui/lookingGlass.js

@@ -1,766 +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 Pango = imports.gi.Pango;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-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; " +
-                    /* 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; }; " +
-                    /* Special lookingGlass functions */
-                       "const it = Main.lookingGlass.getIt(); " +
-                    "const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ";
-
-function Notebook() {
-    this._init();
-}
-
-Notebook.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout({ vertical: true });
-
-        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 label = new St.Button({ label: name });
-        label.connect('clicked', Lang.bind(this, function () {
-            this.selectChild(child);
-            return true;
-        }));
-        labelBox.add(label, { expand: true });
-        this.tabControls.add(labelBox);
-
-        let scrollview = new St.ScrollView({ x_fill: true, y_fill: true });
-        scrollview.get_hscroll_bar().hide();
-        scrollview.add_actor(child);
-
-        let tabData = { child: child,
-                        labelBox: labelBox,
-                        label: label,
-                        scrollView: scrollview,
-                        _scrollToBottom: false };
-        this._tabs.push(tabData);
-        scrollview.hide();
-        this.actor.add(scrollview, { expand: true });
-
-        let vAdjust = scrollview.vscroll.adjustment;
-        vAdjust.connect('changed', Lang.bind(this, function () { this._onAdjustScopeChanged(tabData); }));
-        vAdjust.connect('notify::value', Lang.bind(this, function() { this._onAdjustValueChanged(tabData); }));
-
-        if (this._selectedIndex == -1)
-            this.selectIndex(0);
-    },
-
-    _unselect: function() {
-        if (this._selectedIndex < 0)
-            return;
-        let tabData = this._tabs[this._selectedIndex];
-        tabData.labelBox.set_style_pseudo_class(null);
-        tabData.scrollView.hide();
-        this._selectedIndex = -1;
-    },
-
-    selectIndex: function(index) {
-        if (index == this._selectedIndex)
-            return;
-        this._unselect();
-        if (index < 0) {
-            this.emit('selection', null);
-            return;
-        }
-        let tabData = this._tabs[index];
-        tabData.labelBox.set_style_pseudo_class('selected');
-        tabData.scrollView.show();
-        this._selectedIndex = index;
-        this.emit('selection', tabData.child);
-    },
-
-    selectChild: function(child) {
-        if (child == null)
-            this.selectIndex(-1);
-        else {
-            for (let i = 0; i < this._tabs.length; i++) {
-                let tabData = this._tabs[i];
-                if (tabData.child == child) {
-                    this.selectIndex(i);
-                    return;
-                }
-            }
-        }
-    },
-
-    scrollToBottom: function(index) {
-        let tabData = this._tabs[index];
-        tabData._scrollToBottom = true;
-
-    },
-
-    _onAdjustValueChanged: function (tabData) {
-        let vAdjust = tabData.scrollView.vscroll.adjustment;
-        if (vAdjust.value < (vAdjust.upper - vAdjust.lower - 0.5))
-            tabData._scrolltoBottom = false;
-    },
-
-    _onAdjustScopeChanged: function (tabData) {
-        if (!tabData._scrollToBottom)
-            return;
-        let vAdjust = tabData.scrollView.vscroll.adjustment;
-        vAdjust.value = vAdjust.upper - vAdjust.page_size;
-    }
-}
-Signals.addSignalMethods(Notebook.prototype);
-
-function Result(command, o, index) {
-    this._init(command, o, index);
-}
-
-Result.prototype = {
-    _init : function(command, o, index) {
-        this.index = index;
-        this.o = o;
-
-        this.actor = new Big.Box();
-
-        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 });
-        padBin.add_actor(line);
-        this.actor.append(padBin, Big.BoxPackFlags.NONE);
-    }
-}
-
-function ActorHierarchy() {
-    this._init();
-}
-
-ActorHierarchy.prototype = {
-    _init : function () {
-        this._previousTarget = null;
-        this._target = null;
-
-        this._parentList = [];
-
-        this.actor = new St.BoxLayout({ name: "ActorHierarchy", vertical: true });
-    },
-
-    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>';
-            }
-            let propText = propName + ": " + valueStr;
-            let propDisplay = new St.Label({ reactive: true,
-                                             text: propText });
-            this.actor.add_actor(propDisplay);
-        }
-    }
-}
-
-function Inspector() {
-    this._init();
-}
-
-Inspector.prototype = {
-    _init: function() {
-        let width = 150;
-        let primary = global.get_primary_monitor();
-        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 });
-
-        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);
-            displayText.text = '<inspect x: ' + stageX + ' y: ' + stageY + '> ' + target;
-            if (borderPaintTarget != null)
-                borderPaintTarget.disconnect(borderPaintId);
-            borderPaintTarget = target;
-            borderPaintId = Shell.add_hook_paint_red_border(target);
-            return true;
-        }));
-        Clutter.grab_pointer(eventHandler);
-    }
-}
-
-Signals.addSignalMethods(Inspector.prototype);
-
-function ErrorLog() {
-    this._init();
-}
-
-ErrorLog.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout();
-        this.text = new St.Label();
-        this.actor.add(this.text);
-        this.text.clutter_text.line_wrap = true;
-        this.actor.connect('notify::mapped', Lang.bind(this, this._renderText));
-    },
-
-    _formatTime: function(d){
-        function pad(n) { return n < 10 ? '0' + n : n };
-        return d.getUTCFullYear()+'-'
-            + pad(d.getUTCMonth()+1)+'-'
-            + pad(d.getUTCDate())+'T'
-            + pad(d.getUTCHours())+':'
-            + pad(d.getUTCMinutes())+':'
-            + pad(d.getUTCSeconds())+'Z'
-    },
-
-    _renderText: function() {
-        if (!this.actor.mapped)
-            return;
-        let text = this.text.text;
-        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";
-        }
-        this.text.text = text;
-    }
-}
-
-function Extensions() {
-    this._init();
-}
-
-Extensions.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout({ vertical: true,
-                                        name: 'lookingGlassExtensions' });
-        this._noExtensions = new St.Label({ style_class: 'lg-extensions-none',
-                                             text: _("No extensions installed") });
-        this._extensionsList = new St.BoxLayout({ vertical: true,
-                                                  style_class: 'lg-extensions-list' });
-        this.actor.add(this._extensionsList);
-        this._loadExtensionList();
-    },
-
-    _loadExtensionList: function() {
-        let extensions = ExtensionSystem.extensionMeta;
-        let totalExtensions = 0;
-        for (let uuid in extensions) {
-            let extensionDisplay = this._createExtensionDisplay(extensions[uuid]);
-            this._extensionsList.add(extensionDisplay);
-            totalExtensions++;
-        }
-        if (totalExtensions == 0) {
-            this._extensionsList.add(this._noExtensions);
-        }
-    },
-
-    _onViewSource: function (actor) {
-        let meta = actor._extensionMeta;
-        let file = Gio.file_new_for_path(meta.path);
-        let uri = file.get_uri();
-        Gio.app_info_launch_default_for_uri(uri, global.create_app_launch_context());
-        Main.lookingGlass.close();
-    },
-
-    _onWebPage: function (actor) {
-        let meta = actor._extensionMeta;
-        Gio.app_info_launch_default_for_uri(meta.url, global.create_app_launch_context());
-        Main.lookingGlass.close();
-    },
-
-    _stateToString: function(extensionState) {
-        switch (extensionState) {
-            case ExtensionSystem.ExtensionState.ENABLED:
-                return _("Enabled");
-            case ExtensionSystem.ExtensionState.DISABLED:
-                return _("Disabled");
-            case ExtensionSystem.ExtensionState.ERROR:
-                return _("Error");
-            case ExtensionSystem.ExtensionState.OUT_OF_DATE:
-                return _("Out of date");
-        }
-        return "Unknown"; // Not translated, shouldn't appear
-    },
-
-    _createExtensionDisplay: function(meta) {
-        let box = new St.BoxLayout({ style_class: 'lg-extension', vertical: true });
-        let name = new St.Label({ style_class: 'lg-extension-name',
-                                   text: meta.name });
-        box.add(name, { expand: true });
-        let description = new St.Label({ style_class: 'lg-extension-description',
-                                         text: meta.description });
-        box.add(description, { expand: true });
-
-        let metaBox = new St.BoxLayout();
-        box.add(metaBox);
-        let stateString = this._stateToString(meta.state);
-        let state = new St.Label({ style_class: 'lg-extension-state',
-                                   text: this._stateToString(meta.state) });
-
-        let actionsContainer = new St.Bin({ x_align: St.Align.END });
-        metaBox.add(actionsContainer);
-        let actionsBox = new St.BoxLayout({ style_class: 'lg-extension-actions' });
-        actionsContainer.set_child(actionsBox);
-
-        let viewsource = new Link.Link({ label: _("View Source") });
-        viewsource.actor._extensionMeta = meta;
-        viewsource.actor.connect('clicked', Lang.bind(this, this._onViewSource));
-        actionsBox.add(viewsource.actor);
-
-        if (meta.url) {
-            let webpage = new Link.Link({ label: _("Web Page") });
-            webpage.actor._extensionMeta = meta;
-            webpage.actor.connect('clicked', Lang.bind(this, this._onWebPage));
-            actionsBox.add(webpage.actor);
-        }
-
-        return box;
-    }
-};
-
-function LookingGlass() {
-    this._init();
-}
-
-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;
-        this._results = [];
-
-        // Sort of magic, but...eh.
-        this._maxItems = 150;
-
-        this.actor = new St.BoxLayout({ name: "LookingGlassDialog",
-                                        vertical: true,
-                                        visible: false });
-
-        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._updateFont();
-
-        global.stage.add_actor(this.actor);
-
-        let toolbar = new St.BoxLayout({ name: "Toolbar" });
-        this.actor.add_actor(toolbar);
-        let inspectIcon = Shell.TextureCache.get_default().load_gicon(new Gio.ThemedIcon({ name: 'gtk-color-picker' }),
-                                                                      24);
-        toolbar.add_actor(inspectIcon);
-        inspectIcon.reactive = true;
-        inspectIcon.connect('button-press-event', Lang.bind(this, function () {
-            let inspector = new Inspector();
-            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();
-                global.stage.set_key_focus(this._entry);
-            }));
-            this.actor.hide();
-            return true;
-        }));
-
-        let notebook = new Notebook();
-        this._notebook = notebook;
-        this.actor.add(notebook.actor, { expand: true });
-
-        let emptyBox = new St.Bin();
-        toolbar.add(emptyBox, { expand: true });
-        toolbar.add_actor(notebook.tabControls);
-
-        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._evalBox.add(this._resultsArea, { expand: true });
-
-        let entryArea = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
-        this._evalBox.add_actor(entryArea);
-
-        let label = new St.Label({ text: 'js>>> ' });
-        entryArea.append(label, Big.BoxPackFlags.NONE);
-
-        this._entry = new St.Entry();
-        /* unmapping the edit box will un-focus it, undo that */
-        notebook.connect('selection', Lang.bind(this, function (nb, child) {
-            if (child == this._evalBox)
-                global.stage.set_key_focus(this._entry);
-        }));
-        entryArea.append(this._entry, Big.BoxPackFlags.EXPAND);
-
-        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);
-            notebook.selectIndex(0);
-        }));
-
-        this._errorLog = new ErrorLog();
-        notebook.appendPage('Errors', this._errorLog.actor);
-
-        this._extensions = new Extensions();
-        notebook.appendPage('Extensions', this._extensions.actor);
-
-        this._entry.clutter_text.connect('activate', Lang.bind(this, function (o, e) {
-            let text = o.get_text();
-            // Ensure we don't get newlines in the command; the history file is
-            // newline-separated.
-            text.replace('\n', ' ');
-            // Strip leading and trailing whitespace
-            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;
-            }
-        }));
-    },
-
-    _updateFont: function() {
-        let gconf = Shell.GConf.get_default();
-        let fontName = gconf.get_string("/desktop/gnome/interface/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);
-        // 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 =
-            'font-size: ' + fontDesc.get_size() / 1024. + (fontDesc.get_size_is_absolute() ? 'px' : 'pt') + ';'
-            + '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);
-        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._borderDestroyId = obj.connect('destroy', Lang.bind(this, function () {
-                this._borderDestroyId = 0;
-                this._borderPaintTarget = null;
-            }));
-        }
-        let children = this._resultsArea.get_children();
-        if (children.length > this._maxItems) {
-            this._results.shift();
-            children[0].destroy();
-            this._offset++;
-        }
-        this._it = obj;
-
-        // Scroll to bottom
-        this._notebook.scrollToBottom(0);
-    },
-
-    _evaluate : function(command) {
-        this._history.push(command);
-        this._queueHistorySave();
-
-        let fullCmd = commandHeader + command;
-
-        let resultObj;
-        try {
-            resultObj = eval(fullCmd);
-        } catch (e) {
-            resultObj = "<exception " + e + ">";
-        }
-
-        this._pushResult(command, resultObj);
-        this._hierarchy.setTarget(null);
-        this._entry.text = '';
-    },
-
-    getIt: function () {
-        return this._it;
-    },
-
-    getResult: function(idx) {
-        return this._results[idx - this._offset].o;
-    },
-
-    toggle: function() {
-        if (this._open)
-            this.close();
-        else
-            this.open();
-    },
-
-    _resizeTo: function(actor) {
-        let primary = global.get_primary_monitor();
-        let myWidth = primary.width * 0.7;
-        let myHeight = primary.height * 0.7;
-        let [srcX, srcY] = actor.get_transformed_position();
-        this.actor.x = srcX + (primary.width - myWidth) / 2;
-        this._hiddenY = srcY + actor.height - myHeight - 4; // -4 to hide the top corners
-        this._targetY = this._hiddenY + myHeight;
-        this.actor.y = this._hiddenY;
-        this.actor.width = myWidth;
-        this.actor.height = myHeight;
-    },
-
-    slaveTo: function(actor) {
-        this._slaveTo = actor;
-        actor.connect('notify::allocation', Lang.bind(this, function () {
-            this._resizeTo(actor);
-        }));
-        this._resizeTo(actor);
-    },
-
-    // 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();
-            return true;
-        }
-        return false;
-    },
-
-    open : function() {
-        if (this._open)
-            return;
-
-        if (!Main.pushModal(this.actor))
-            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;
-
-        Tweener.removeTweens(this.actor);
-
-        global.stage.set_key_focus(this._entry);
-
-        Tweener.addTween(this.actor, { time: 0.5,
-                                       transition: "easeOutQuad",
-                                       y: this._targetY
-                                     });
-    },
-
-    close : function() {
-        if (!this._open)
-            return;
-
-        if (this._keyPressEventId)
-            global.stage.disconnect(this._keyPressEventId);
-
-        this._historyNavIndex = -1;
-        this._open = false;
-        Tweener.removeTweens(this.actor);
-
-        if (this._borderPaintTarget != null) {
-            this._borderPaintTarget.disconnect(this._borderPaintId);
-            this._borderPaintTarget.disconnect(this._borderDestroyId);
-            this._borderPaintTarget = null;
-        }
-
-        Main.popModal(this.actor);
-
-        Tweener.addTween(this.actor, { time: 0.5,
-                                       transition: "easeOutQuad",
-                                       y: this._hiddenY,
-                                       onComplete: Lang.bind(this, function () {
-                                           this.actor.hide();
-                                       })
-                                     });
-    }
-};
-Signals.addSignalMethods(LookingGlass.prototype);

js/ui/main.js

@@ -1,29 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 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 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 Chrome = imports.ui.chrome;
-const Environment = imports.ui.environment;
-const ExtensionSystem = imports.ui.extensionSystem;
-const MessageTray = imports.ui.messageTray;
-const Overview = imports.ui.overview;
+const Overlay = imports.ui.overlay;
 const Panel = imports.ui.panel;
-const PlaceDisplay = imports.ui.placeDisplay;
 const RunDialog = imports.ui.runDialog;
-const LookingGlass = imports.ui.lookingGlass;
-const NotificationDaemon = imports.ui.notificationDaemon;
-const ShellDBus = imports.ui.shellDBus;
 const Sidebar = imports.ui.sidebar;
+const Tweener = imports.ui.tweener;
 const WindowManager = imports.ui.windowManager;
 
 const DEFAULT_BACKGROUND_COLOR = new Clutter.Color();
@@ -32,55 +23,21 @@ DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);
 let chrome = null;
 let panel = null;
 let sidebar = null;
-let placesManager = null;
-let overview = null;
+let overlay = null;
 let runDialog = null;
-let lookingGlass = null;
 let wm = null;
-let notificationDaemon = null;
-let notificationPopup = null;
-let messageTray = null;
 let recorder = null;
-let shellDBusService = null;
-let modalCount = 0;
-let modalActorFocusStack = [];
-let _errorLogStack = [];
-let _startDate;
+let inModal = false;
 
 function start() {
-    // Add a binding for "global" in the global JS namespace; (gjs
-    // keeps the web browser convention of having that namespace be
-    // called "window".)
-    window.global = Shell.Global.get();
-
-    // Now monkey patch utility functions into the global proxy;
-    // This is easier and faster than indirecting down into global
-    // if we want to call back up into JS.
-    global.logError = _logError;
-    global.log = _logDebug;
+    let global = Shell.Global.get();
 
     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
-    // now; to do so we'd need to convert from its async calls
-    // back into sync ones.
-    DBus.session.flush();
+    global.start_task_panel();
 
-    Environment.init();
-
-    // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
-    // also initialize ShellAppSystem first.  ShellAppSystem
-    // needs to load all the .desktop files, and ShellWindowTracker
-    // will use those to associate with windows.  Right now
-    // the Monitor doesn't listen for installed app changes
-    // and recalculate application associations, so to avoid
-    // races for now we initialize it here.  It's better to
-    // be predictable anyways.
-    Shell.WindowTracker.get_default();
-    Shell.AppUsage.get_default();
+    Tweener.init();
 
     // The background color really only matters if there is no desktop
     // window (say, nautilus) running. We set it mostly so things look good
@@ -88,44 +45,39 @@ function start() {
     global.stage.color = DEFAULT_BACKGROUND_COLOR;
 
     // Mutter currently hardcodes putting "Yessir. The compositor is running""
-    // in the Overview. Clear that out.
+    // in the overlay. Clear that out.
     let children = global.overlay_group.get_children();
     for (let i = 0; i < children.length; i++)
         children[i].destroy();
 
-    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);
-
     global.connect('panel-run-dialog', function(panel) {
         // Make sure not more than one run dialog is shown.
-        getRunDialog().open();
-    });
-    let shellwm = global.window_manager;
-    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 () {
-       getRunDialog().open();
+        if (!runDialog) {
+            runDialog = new RunDialog.RunDialog();
+            let endHandler = function() {
+                runDialog.destroy();
+                runDialog = null;
+            };
+            runDialog.connect('run', endHandler);
+            runDialog.connect('cancel', endHandler);
+            if (!runDialog.show())
+                endHandler();
+        }
     });
 
-    placesManager = new PlaceDisplay.PlacesManager();
-    overview = new Overview.Overview();
+    overlay = new Overlay.Overlay();
     chrome = new Chrome.Chrome();
     panel = new Panel.Panel();
     sidebar = new Sidebar.Sidebar();
     wm = new WindowManager.WindowManager();
-    notificationDaemon = new NotificationDaemon.NotificationDaemon();
-    notificationPopup = new MessageTray.Notification();
-    messageTray = new MessageTray.MessageTray();
-
-    _startDate = new Date();
-
+    
     global.screen.connect('toggle-recording', function() {
         if (recorder == null) {
+            // We have to initialize GStreamer first. This isn't done
+            // inside ShellRecorder to make it usable inside projects
+            // with other usage of GStreamer.
+            let Gst = imports.gi.Gst;
+            Gst.init(null, null);
             recorder = new Shell.Recorder({ stage: global.stage });
         }
 
@@ -136,72 +88,13 @@ function start() {
         }
     });
 
-    _relayout();
-
-    ExtensionSystem.init();
-    ExtensionSystem.loadExtensions();
-
-    panel.startupAnimation();
-
     let display = global.screen.get_display();
-    display.connect('overlay-key', Lang.bind(overview, overview.toggle));
-    global.connect('panel-main-menu', Lang.bind(overview, overview.toggle));
-
-    global.stage.connect('captured-event', _globalKeyPressHandler);
-
-    _log('info', 'loaded at ' + _startDate);
-
+    display.connect('overlay-key', Lang.bind(overlay, overlay.toggle));
+    global.connect('panel-main-menu', Lang.bind(overlay, overlay.toggle));
+    
     Mainloop.idle_add(_removeUnusedWorkspaces);
 }
 
-/**
- * _log:
- * @category: string message type ('info', 'error')
- * @msg: A message string
- * ...: Any further arguments are converted into JSON notation,
- *      and appended to the log message, separated by spaces.
- *
- * Log a message into the LookingGlass error
- * stream.  This is primarily intended for use by the
- * extension system as well as debugging.
- */
-function _log(category, msg) {
-    let text = msg;
-    if (arguments.length > 2) {
-        text += ': ';
-        for (let i = 2; i < arguments.length; i++) {
-            text += JSON.stringify(arguments[i]);
-            if (i < arguments.length - 1)
-                text += " ";
-        }
-    }
-    _errorLogStack.push({timestamp: new Date().getTime(),
-                         category: category,
-                         message: text });
-}
-
-function _logError(msg) {
-    return _log('error', msg);
-}
-
-function _logDebug(msg) {
-    return _log('debug', msg);
-}
-
-// Used by the error display in lookingGlass.js
-function _getAndClearErrorStack() {
-    let errors = _errorLogStack;
-    _errorLogStack = [];
-    return errors;
-}
-
-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();
-}
-
 // 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
@@ -209,6 +102,8 @@ function _relayout() {
 // is called.)
 function _removeUnusedWorkspaces() {
 
+    let global = Shell.Global.get();
+
     let windows = global.get_windows();
     let maxWorkspace = 0;
     for (let i = 0; i < windows.length; i++) {
@@ -230,288 +125,40 @@ function _removeUnusedWorkspaces() {
     return false;
 }
 
-// This function encapsulates hacks to make certain global keybindings
-// work even when we are in one of our modes where global keybindings
-// 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)
+// Used to go into a mode where all keyboard and mouse input goes to
+// the stage. Returns true if we successfully grabbed the keyboard and
+// went modal, false otherwise
+function startModal() {
+    let global = Shell.Global.get();
+
+    if (!global.grab_keyboard())
         return false;
-
-    let type = event.type();
-
-    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();
-            }
-
-            return true;
-        }
-    } else if (type == Clutter.EventType.KEY_RELEASE) {
-        let symbol = event.get_key_symbol();
-        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();
-
-            return true;
-        } else if (symbol == Clutter.F2 && (Shell.get_event_state(event) & Clutter.ModifierType.MOD1_MASK)) {
-            getRunDialog().open();
-        }
-    }
-
-    return false;
-}
-
-function _findModal(actor) {
-    for (let i = 0; i < modalActorFocusStack.length; i++) {
-        let [stackActor, stackFocus] = modalActorFocusStack[i];
-        if (stackActor == actor) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-/**
- * pushModal:
- * @actor: #ClutterActor which will be given keyboard focus
- *
- * 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.
- *
- * 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.
- *
- * Returns: true iff we successfully acquired a grab or already had one
- */
-function pushModal(actor) {
-    if (modalCount == 0) {
-        if (!global.begin_modal(global.get_current_time())) {
-            log("pushModal: invocation of begin_modal failed");
-            return false;
-        }
-    }
-
     global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
 
-    modalCount += 1;
-    actor.connect('destroy', function() {
-        let index = _findModal(actor);
-        if (index >= 0)
-            modalActorFocusStack.splice(index, 1);
-    });
-    let curFocus = global.stage.get_key_focus();
-    if (curFocus != null) {
-        curFocus.connect('destroy', function() {
-            let index = _findModal(actor);
-            if (index >= 0)
-                modalActorFocusStack[index][1] = null;
-        });
-    }
-    modalActorFocusStack.push([actor, curFocus]);
+    inModal = true;
 
     return true;
 }
 
-/**
- * popModal:
- * @actor: #ClutterActor passed to original invocation of pushModal().
- *
- * 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.
- */
-function popModal(actor) {
-    modalCount -= 1;
-    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 (modalCount > 0)
-        return;
+function endModal() {
+    let global = Shell.Global.get();
 
-    global.end_modal(global.get_current_time());
+    global.ungrab_keyboard();
     global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
+    inModal = false;
 }
 
-function createLookingGlass() {
-    if (lookingGlass == null) {
-        lookingGlass = new LookingGlass.LookingGlass();
-        lookingGlass.slaveTo(panel.actor);
-    }
-    return lookingGlass;
-}
-
-function getRunDialog() {
-    if (runDialog == null) {
-        runDialog = new RunDialog.RunDialog();
-    }
-    return runDialog;
-}
-
-/**
- * activateWindow:
- * @window: the Meta.Window to activate
- * @time: (optional) current event time
- *
- * Activates @window, switching to its workspace first if necessary
- */
-function activateWindow(window, time) {
-    let activeWorkspaceNum = global.screen.get_active_workspace_index();
-    let windowWorkspaceNum = window.get_workspace().index();
-
-    if (!time)
-        time = global.get_current_time();
-
-    if (windowWorkspaceNum != activeWorkspaceNum) {
-        let workspace = global.screen.get_workspace_by_index(windowWorkspaceNum);
-        workspace.activate_with_focus(window, time);
-    } else {
-        window.activate(time);
-    }
-}
-
-// TODO - replace this timeout with some system to guess when the user might
-// be e.g. just reading the screen and not likely to interact.
-const DEFERRED_TIMEOUT_SECONDS = 20;
-var _deferredWorkData = {};
-// Work scheduled for some point in the future
-var _deferredWorkQueue = [];
-// Work we need to process before the next redraw
-var _beforeRedrawQueue = [];
-// Counter to assign work ids
-var _deferredWorkSequence = 0;
-var _deferredTimeoutId = 0;
-
-function _runDeferredWork(workId) {
-    if (!_deferredWorkData[workId])
-        return;
-    let index = _deferredWorkQueue.indexOf(workId);
-    if (index < 0)
-        return;
-
-    _deferredWorkQueue.splice(index, 1);
-    _deferredWorkData[workId].callback();
-    if (_deferredWorkQueue.length == 0 && _deferredTimeoutId > 0) {
-        Mainloop.source_remove(_deferredTimeoutId);
-        _deferredTimeoutId = 0;
-    }
-}
-
-function _runAllDeferredWork() {
-    while (_deferredWorkQueue.length > 0)
-        _runDeferredWork(_deferredWorkQueue[0]);
-}
-
-function _runBeforeRedrawQueue() {
-    for (let i = 0; i < _beforeRedrawQueue.length; i++) {
-        let workId = _beforeRedrawQueue[i];
-        _runDeferredWork(workId);
-    }
-    _beforeRedrawQueue = [];
-}
-
-function _queueBeforeRedraw(workId) {
-    _beforeRedrawQueue.push(workId);
-    if (_beforeRedrawQueue.length == 1) {
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, function () {
-            _runBeforeRedrawQueue();
-            return false;
-        }, null);
-    }
-}
-
-/**
- * initializeDeferredWork:
- * @actor: A #ClutterActor
- * @callback: Function to invoke to perform work
- *
- * This function sets up a callback to be invoked when either the
- * given actor is mapped, or after some period of time when the machine
- * is idle.  This is useful if your actor isn't always visible on the
- * screen (for example, all actors in the overview), and you don't want
- * to consume resources updating if the actor isn't actually going to be
- * displaying to the user.
- *
- * Note that queueDeferredWork is called by default immediately on
- * initialization as well, under the assumption that new actors
- * will need it.
- *
- * Returns: A string work identifer
- */
-function initializeDeferredWork(actor, callback, props) {
-    // Turn into a string so we can use as an object property
-    let workId = "" + (++_deferredWorkSequence);
-    _deferredWorkData[workId] = { 'actor': actor,
-                                  'callback': callback };
-    actor.connect('notify::mapped', function () {
-        if (!(actor.mapped && _deferredWorkQueue.indexOf(workId) >= 0))
-            return;
-        _queueBeforeRedraw(workId);
-    });
-    actor.connect('destroy', function() {
-        let index = _deferredWorkQueue.indexOf(workId);
-        if (index >= 0)
-            _deferredWorkQueue.splice(index, 1);
-        delete _deferredWorkData[workId];
-    });
-    queueDeferredWork(workId);
-    return workId;
-}
-
-/**
- * queueDeferredWork:
- * @workId: work identifier
- *
- * Ensure that the work identified by @workId will be
- * run on map or timeout.  You should call this function
- * for example when data being displayed by the actor has
- * changed.
- */
-function queueDeferredWork(workId) {
-    let data = _deferredWorkData[workId];
-    if (!data) {
-        global.logError("invalid work id ", workId);
-        return;
-    }
-    if (_deferredWorkQueue.indexOf(workId) < 0)
-        _deferredWorkQueue.push(workId);
-    if (data.actor.mapped) {
-        _queueBeforeRedraw(workId);
-        return;
-    } else if (_deferredTimeoutId == 0) {
-        _deferredTimeoutId = Mainloop.timeout_add_seconds(DEFERRED_TIMEOUT_SECONDS, function () {
-            _runAllDeferredWork();
-            _deferredTimeoutId = 0;
-            return false;
-        });
-    }
+function createAppLaunchContext() {
+    let global = Shell.Global.get();
+    let screen = global.screen;
+    let display = screen.get_display();
+
+    let context = new Gdk.AppLaunchContext();
+    context.set_timestamp(display.get_current_time());
+
+    // Make sure that the app is opened on the current workspace even if
+    // the user switches before it starts
+    context.set_desktop(screen.get_active_workspace_index());
+
+    return context;
 }

js/ui/messageTray.js

@@ -1,271 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Signals = imports.signals;
-const Tweener = imports.ui.tweener;
-
-const Main = imports.ui.main;
-
-const ANIMATION_TIME = 0.2;
-const NOTIFICATION_TIMEOUT = 4;
-
-const MESSAGE_TRAY_TIMEOUT = 0.2;
-
-const ICON_SIZE = 24;
-
-function Notification(icon, text) {
-    this._init(icon, text);
-}
-
-Notification.prototype = {
-    _init: function(icon, text) {
-        this.icon = icon;
-        this.text = text;
-    }
-}
-
-function NotificationBox() {
-    this._init();
-}
-
-NotificationBox.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout({ name: 'notification' });
-
-        this._iconBox = new St.Bin();
-        this.actor.add(this._iconBox);
-
-        this._textBox = new Shell.GenericContainer();
-        this._textBox.connect('get-preferred-width', Lang.bind(this, this._textBoxGetPreferredWidth));
-        this._textBox.connect('get-preferred-height', Lang.bind(this, this._textBoxGetPreferredHeight));
-        this._textBox.connect('allocate', Lang.bind(this, this._textBoxAllocate));
-        this.actor.add(this._textBox, { expand: true, x_fill: false, y_fill: false, y_align: St.Align.MIDDLE });
-
-        this._text = new St.Label();
-        this._text.clutter_text.line_wrap = true;
-        this._text.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._textBox.add_actor(this._text);
-    },
-
-    _textBoxGetPreferredWidth: function (actor, forHeight, alloc) {
-        let [min, nat] = this._text.get_preferred_width(forHeight);
-
-        alloc.min_size = alloc.nat_size = Math.min(nat, global.screen_width / 2);
-    },
-
-    _textBoxGetPreferredHeight: function (actor, forWidth, alloc) {
-        // St.BoxLayout passes -1 for @forWidth, which isn't what we want.
-        let prefWidth = {};
-        this._textBoxGetPreferredWidth(this._textBox, -1, prefWidth);
-        [alloc.min_size, alloc.nat_size] = this._text.get_preferred_height(prefWidth.nat_size);
-        log('for width ' + prefWidth.nat_size + ', height ' + alloc.nat_size);
-    },
-
-    _textBoxAllocate: function (actor, box, flags) {
-        let childBox = new Clutter.ActorBox();
-        childBox.x1 = childBox.y1 = 0;
-        childBox.x2 = box.x2 - box.x1;
-        childBox.y2 = box.y2 - box.y1;
-        this._text.allocate(childBox, flags);
-    },
-
-    setContent: function(notification) {
-        this._iconBox.child = notification.icon;
-
-        // Support <b>, <i>, and <u>, escape anything else
-        // so it displays as raw markup.
-        let markup = notification.text.replace(/<(\/?[^biu]>|[^>\/][^>])/g, "&lt;$1");
-        this._text.clutter_text.set_markup(markup);
-    }
-};
-
-function Source(id, createIcon) {
-    this._init(id, createIcon);
-}
-
-Source.prototype = {
-    _init: function(id, createIcon) {
-        this.id = id;
-        if (createIcon)
-            this.createIcon = createIcon;
-    },
-
-    // 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);
-    },
-
-    notify: function(text) {
-        Main.messageTray.showNotification(new Notification(this.createIcon(ICON_SIZE), text));
-    },
-
-    clicked: function() {
-        this.emit('clicked');
-    },
-
-    destroy: function() {
-        this.emit('destroy');
-    }
-};
-Signals.addSignalMethods(Source.prototype);
-
-function MessageTray() {
-    this._init();
-}
-
-MessageTray.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout({ name: 'message-tray',
-                                        reactive: true });
-
-        let primary = global.get_primary_monitor();
-        this.actor.x = 0;
-        this.actor.y = primary.height - 1;
-
-        this.actor.width = primary.width;
-
-        this._summaryBin = new St.Bin({ x_align: St.Align.END });
-        this.actor.add(this._summaryBin, { expand: true });
-        this._summaryBin.hide();
-
-        this._notificationBox = new NotificationBox();
-        this._notificationQueue = [];
-        this.actor.add(this._notificationBox.actor);
-        this._notificationBox.actor.hide();
-
-        Main.chrome.addActor(this.actor, { affectsStruts: false });
-
-        this.actor.connect('enter-event',
-                           Lang.bind(this, this._onMessageTrayEntered));
-        this.actor.connect('leave-event',
-                           Lang.bind(this, this._onMessageTrayLeft));
-        this._isShowing = false;
-        this.actor.show();
-
-        this._summary = new St.BoxLayout({ name: 'summary-mode' });
-        this._summaryBin.child = this._summary;
-
-        this._sources = {};
-        this._icons = {};
-    },
-
-    contains: function(source) {
-        return this._sources.hasOwnProperty(source.id);
-    },
-
-    add: function(source) {
-        if (this.contains(source)) {
-            log('Trying to re-add source ' + source.id);
-            return;
-        }
-
-        let iconBox = new St.Bin({ reactive: true });
-        iconBox.child = source.createIcon(ICON_SIZE);
-        this._summary.insert_actor(iconBox, 0);
-        this._icons[source.id] = iconBox;
-        this._sources[source.id] = source;
-
-        iconBox.connect('button-release-event', Lang.bind(this,
-            function () {
-                source.clicked();
-            }));
-
-        source.connect('destroy', Lang.bind(this,
-            function () {
-                this.remove(source);
-            }));
-    },
-
-    remove: function(source) {
-        if (!this.contains(source))
-            return;
-
-        this._summary.remove_actor(this._icons[source.id]);
-        delete this._icons[source.id];
-        delete this._sources[source.id];
-    },
-
-    getSource: function(id) {
-        return this._sources[id];
-    },
-
-    _onMessageTrayEntered: function() {
-        // Don't hide the message tray after a timeout if the user has moved the mouse over it.
-        // We might have a timeout in place if the user moved the mouse away from the message tray for a very short period of time
-        // or if we are showing a notification.
-        if (this._hideTimeoutId > 0)
-            Mainloop.source_remove(this._hideTimeoutId);
-
-        if (this._isShowing)
-            return;
-
-        // If the message tray was not already showing, we'll show it in the summary mode.
-        this._summaryBin.show();
-        this._show();
-    },
-
-    _onMessageTrayLeft: function() {
-        if (!this._isShowing)
-            return;
-
-        // We wait just a little before hiding the message tray in case the user will quickly move the mouse back over it.
-        this._hideTimeoutId = Mainloop.timeout_add(MESSAGE_TRAY_TIMEOUT * 1000, Lang.bind(this, this._hide));
-    },
-
-    _show: function() {
-        this._isShowing = true;
-        let primary = global.get_primary_monitor();
-        Tweener.addTween(this.actor,
-                         { y: primary.height - this.actor.height,
-                           time: ANIMATION_TIME,
-                           transition: "easeOutQuad"
-                         });
-    },
-
-    _hide: function() {
-        this._hideTimeoutId = 0;
-
-        let primary = global.get_primary_monitor();
-
-        Tweener.addTween(this.actor,
-                         { y: primary.height - 1,
-                           time: ANIMATION_TIME,
-                           transition: "easeOutQuad",
-                           onComplete: this._hideComplete,
-                           onCompleteScope: this
-                         });
-        return false;
-    },
-
-    _hideComplete: function() {
-        this._isShowing = false;
-        this._summaryBin.hide();
-        this._notificationBox.actor.hide();
-        if (this._notificationQueue.length > 0)
-            this.showNotification(this._notificationQueue.shift());
-    },
-
-    showNotification: function(notification) {
-        if (this._isShowing) {
-            this._notificationQueue.push(notification);
-            return;
-        }
-
-        this._notificationBox.setContent(notification);
-
-        this._notificationBox.actor.x = Math.round((this.actor.width - this._notificationBox.actor.width) / 2);
-        this._notificationBox.actor.show();
-
-        // Because we set up the timeout before we do the animation, we add ANIMATION_TIME to NOTIFICATION_TIMEOUT, so that
-        // NOTIFICATION_TIMEOUT represents the time the notifiation is fully shown.
-        this._hideTimeoutId = Mainloop.timeout_add((NOTIFICATION_TIMEOUT + ANIMATION_TIME) * 1000, Lang.bind(this, this._hide));
-
-        this._show();
-     }
-};

js/ui/notificationDaemon.js

@@ -1,218 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const DBus = imports.dbus;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Mainloop = imports.mainloop;
-
-const Main = imports.ui.main;
-const MessageTray = imports.ui.messageTray;
-const Params = imports.misc.params;
-
-let nextNotificationId = 1;
-
-const NotificationDaemonIface = {
-    name: 'org.freedesktop.Notifications',
-    methods: [{ name: 'Notify',
-                inSignature: 'susssasa{sv}i',
-                outSignature: 'u'
-              },
-              { name: 'CloseNotification',
-                inSignature: 'u',
-                outSignature: ''
-              },
-              { name: 'GetCapabilities',
-                inSignature: '',
-                outSignature: 'as'
-              },
-              { name: 'GetServerInformation',
-                inSignature: '',
-                outSignature: 'ssss'
-              }],
-    signals: [{ name: 'NotificationClosed',
-                inSignature: 'uu' },
-              { name: 'ActionInvoked',
-                inSignature: 'us' }]
-};
-
-const NotificationClosedReason = {
-    EXPIRED: 1,
-    DISMISSED: 2,
-    APP_CLOSED: 3,
-    UNDEFINED: 4
-};
-
-const Urgency = {
-    LOW: 0,
-    NORMAL: 1,
-    CRITICAL: 2
-};
-
-function NotificationDaemon() {
-    this._init();
-}
-
-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));
-    },
-
-    _acquiredName: function() {
-        this._everAcquiredName = true;
-    },
-
-    _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();
-        }
-    },
-
-    _sourceId: function(id) {
-        return 'notification-' + id;
-    },
-
-    Notify: function(appName, replacesId, icon, summary, body,
-                     actions, hints, timeout) {
-        let id, source = null;
-
-        if (replacesId != 0) {
-            id = replacesId;
-            source = Main.messageTray.getSource(this._sourceId(id));
-            // source may be null if the current source was destroyed
-            // right as the client sent the new notification
-        }
-
-        if (source == null) {
-            id = nextNotificationId++;
-
-            source = new Source(this._sourceId(id), icon, hints);
-            Main.messageTray.add(source);
-
-            source.connect('clicked', Lang.bind(this,
-                function() {
-                    source.destroy();
-                    this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
-                }));
-        }
-
-        summary = GLib.markup_escape_text(summary, -1);
-        if (body)
-            source.notify('<b>' + summary + '</b>: ' + body);
-        else
-            source.notify('<b>' + summary + '</b>');
-        return id;
-    },
-
-    CloseNotification: function(id) {
-        let source = Main.messageTray.getSource(this._sourceId(id));
-        if (source)
-            source.destroy();
-        this._emitNotificationClosed(id, NotificationClosedReason.APP_CLOSED);
-    },
-
-    GetCapabilities: function() {
-        return [
-            // 'actions',
-            'body',
-            // 'body-hyperlinks',
-            // 'body-images',
-            'body-markup',
-            // 'icon-multi',
-            'icon-static'
-            // 'sound',
-        ];
-    },
-
-    GetServerInformation: function() {
-        return [
-            'GNOME Shell',
-            'GNOME',
-            '0.1', // FIXME, get this from somewhere
-            '1.0'
-        ];
-    },
-
-    _emitNotificationClosed: function(id, reason) {
-        DBus.session.emit_signal('/org/freedesktop/Notifications',
-                                 'org.freedesktop.Notifications',
-                                 'NotificationClosed', 'uu',
-                                 [id, reason]);
-    }
-};
-
-DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
-
-function Source(sourceId, icon, hints) {
-    this._init(sourceId, icon, hints);
-}
-
-Source.prototype = {
-    __proto__:  MessageTray.Source.prototype,
-
-    _init: function(sourceId, icon, hints) {
-        MessageTray.Source.prototype._init.call(this, sourceId);
-
-        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
-
-        this._icon = icon;
-        this._iconData = hints.icon_data;
-        this._urgency = hints.urgency;
-    },
-
-    createIcon: function(size) {
-        let textureCache = Shell.TextureCache.get_default();
-
-        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);
-        } 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);
-        }
-    }
-};

js/ui/overlay.js

@@ -0,0 +1,954 @@
+/* -*- 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 Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const Lang = imports.lang;
+
+const AppDisplay = imports.ui.appDisplay;
+const DocDisplay = imports.ui.docDisplay;
+const GenericDisplay = imports.ui.genericDisplay;
+const Link = imports.ui.link;
+const Main = imports.ui.main;
+const Panel = imports.ui.panel;
+const Tweener = imports.ui.tweener;
+const Workspaces = imports.ui.workspaces;
+
+const ROOT_OVERLAY_COLOR = new Clutter.Color();
+ROOT_OVERLAY_COLOR.from_pixel(0x000000bb);
+
+// The factor to scale the overlay wallpaper with. This should not be less
+// than 3/2, because the rule of thirds is used for positioning (see below).
+const BACKGROUND_SCALE = 2;
+
+const LABEL_HEIGHT = 16;
+const DASH_MIN_WIDTH = 250;
+const DASH_SECTION_PADDING = 6;
+const DASH_SECTION_SPACING = 6;
+const DASH_COLUMNS = 1;
+const DASH_CORNER_RADIUS = 5;
+// This is the height of section components other than the item display.
+const DASH_SECTION_MISC_HEIGHT = (LABEL_HEIGHT + DASH_SECTION_SPACING) * 2 + DASH_SECTION_PADDING;
+const DASH_SEARCH_BG_COLOR = new Clutter.Color();
+DASH_SEARCH_BG_COLOR.from_pixel(0xffffffff);
+const DASH_TEXT_COLOR = new Clutter.Color();
+DASH_TEXT_COLOR.from_pixel(0xffffffff);
+
+// Time for initial animation going into overlay mode
+const ANIMATION_TIME = 0.25;
+
+// We divide the screen into a grid of rows and columns, which we use
+// to help us position the overlay components, such as the side panel
+// that lists applications and documents, the workspaces display, and 
+// the button for adding additional workspaces.
+// In the regular mode, the side panel takes up one column on the left,
+// and the workspaces display takes up the remaining columns.
+// In the expanded side panel display mode, the side panel takes up two
+// columns, and the workspaces display slides all the way to the right,
+// being visible only in the last quarter of the right-most column.
+// In the future, this mode will have more components, such as a display 
+// of documents which were recently opened with a given application, which 
+// will take up the remaining sections of the display.
+
+const WIDE_SCREEN_CUT_OFF_RATIO = 1.4;
+
+const COLUMNS_REGULAR_SCREEN = 4;
+const ROWS_REGULAR_SCREEN = 8;
+const COLUMNS_WIDE_SCREEN = 5;
+const ROWS_WIDE_SCREEN = 10;
+
+// Padding around workspace grid / Spacing between Dash and Workspaces
+const WORKSPACE_GRID_PADDING = 12;
+
+const COLUMNS_FOR_WORKSPACES_REGULAR_SCREEN = 3;
+const ROWS_FOR_WORKSPACES_REGULAR_SCREEN = 6;
+
+const COLUMNS_FOR_WORKSPACES_WIDE_SCREEN = 4;
+const ROWS_FOR_WORKSPACES_WIDE_SCREEN = 8;
+
+// A multi-state; PENDING is used during animations
+const STATE_ACTIVE = true;
+const STATE_PENDING_INACTIVE = false;
+const STATE_INACTIVE = false;
+
+// The dash has a slightly transparent blue background with a gradient.
+const DASH_LEFT_COLOR = new Clutter.Color();
+DASH_LEFT_COLOR.from_pixel(0x324c6fbb);
+const DASH_MIDDLE_COLOR = new Clutter.Color();
+DASH_MIDDLE_COLOR.from_pixel(0x324c6faa);
+const DASH_RIGHT_COLOR = new Clutter.Color();
+DASH_RIGHT_COLOR.from_pixel(0x324c6fcc);
+
+const DASH_BORDER_COLOR = new Clutter.Color();
+DASH_BORDER_COLOR.from_pixel(0x213b5dff);
+
+const DASH_BORDER_WIDTH = 2;
+
+// The results and details panes have a somewhat transparent blue background with a gradient.
+const PANE_LEFT_COLOR = new Clutter.Color();
+PANE_LEFT_COLOR.from_pixel(0x324c6ff4);
+const PANE_MIDDLE_COLOR = new Clutter.Color();
+PANE_MIDDLE_COLOR.from_pixel(0x324c6ffa);
+const PANE_RIGHT_COLOR = new Clutter.Color();
+PANE_RIGHT_COLOR.from_pixel(0x324c6ff4);
+
+const SHADOW_COLOR = new Clutter.Color();
+SHADOW_COLOR.from_pixel(0x00000033);
+const TRANSPARENT_COLOR = new Clutter.Color();
+TRANSPARENT_COLOR.from_pixel(0x00000000);
+
+const SHADOW_WIDTH = 6;
+
+const NUMBER_OF_SECTIONS_IN_SEARCH = 2;
+
+let wideScreen = false;
+let displayGridColumnWidth = null;
+let displayGridRowHeight = null;
+
+function SearchEntry(width) {
+    this._init(width);
+}
+
+SearchEntry.prototype = {
+    _init : function(width) {
+        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                   y_align: Big.BoxAlignment.CENTER,
+                                   background_color: DASH_SEARCH_BG_COLOR,
+                                   corner_radius: 4,
+                                   spacing: 4,
+                                   padding_left: 4,
+                                   padding_right: 4,
+                                   width: width,
+                                   height: 24
+                                 });
+
+        let icontheme = Gtk.IconTheme.get_default();
+        let searchIconTexture = new Clutter.Texture({});
+        let searchIconPath = icontheme.lookup_icon('gtk-find', 16, 0).get_filename();
+        searchIconTexture.set_from_file(searchIconPath);
+        this.actor.append(searchIconTexture, 0);
+
+        // We need to initialize the text for the entry to have the cursor displayed
+        // in it. See http://bugzilla.openedhand.com/show_bug.cgi?id=1365
+        this.entry = new Clutter.Text({ font_name: "Sans 14px",
+                                        editable: true,
+                                        activatable: true,
+                                        singleLineMode: true,
+                                        text: ""
+                                      });
+        this.entry.connect('text-changed', Lang.bind(this, function (e) {
+            let text = this.entry.text;
+        }));
+        this.actor.append(this.entry, Big.BoxPackFlags.EXPAND);
+    }
+};
+
+function ItemResults(resultsWidth, resultsHeight, displayClass, labelText) {
+    this._init(resultsWidth, resultsHeight, displayClass, labelText);
+}
+
+ItemResults.prototype = {
+    _init: function(resultsWidth, resultsHeight, displayClass, labelText) {
+        this._resultsWidth = resultsWidth;
+        this._resultsHeight = resultsHeight;
+
+        this.actor = new Big.Box({ height: resultsHeight,
+                                   padding: DASH_SECTION_PADDING + DASH_BORDER_WIDTH,
+                                   spacing: DASH_SECTION_SPACING });
+
+        this._resultsText = new Clutter.Text({ color: DASH_TEXT_COLOR,
+                                               font_name: "Sans Bold 14px",
+                                               text: labelText });
+        this.actor.append(this._resultsText, Big.BoxPackFlags.NONE);
+
+        // LABEL_HEIGHT is the height of this._resultsText and GenericDisplay.LABEL_HEIGHT is the height
+        // of the display controls.
+        this._displayHeight = resultsHeight - LABEL_HEIGHT - GenericDisplay.LABEL_HEIGHT - DASH_SECTION_SPACING * 2;
+        this.display = new displayClass(resultsWidth, this._displayHeight, DASH_COLUMNS, DASH_SECTION_SPACING);
+
+        this.actor.append(this.display.actor, Big.BoxPackFlags.EXPAND);
+
+        this.controlBox = new Big.Box({ x_align: Big.BoxAlignment.CENTER });
+        this.controlBox.append(this.display.displayControl, Big.BoxPackFlags.NONE);
+
+        this.actor.append(this.controlBox, Big.BoxPackFlags.END);
+    },
+
+    _setSearchMode: function() {
+        this.actor.height = this._resultsHeight /  NUMBER_OF_SECTIONS_IN_SEARCH;
+        let displayHeight = this._displayHeight - this._resultsHeight * (NUMBER_OF_SECTIONS_IN_SEARCH - 1) /  NUMBER_OF_SECTIONS_IN_SEARCH;
+        this.display.setExpanded(false, this._resultsWidth, 0, displayHeight, DASH_COLUMNS);     
+        this.actor.remove_all();
+        this.actor.append(this._resultsText, Big.BoxPackFlags.NONE);
+        this.actor.append(this.display.actor, Big.BoxPackFlags.EXPAND);
+        this.actor.append(this.controlBox, Big.BoxPackFlags.END);
+    },
+
+    _unsetSearchMode: function() {
+        this.actor.height = this._resultsHeight;
+        this.display.setExpanded(false, this._resultsWidth, 0, this._displayHeight, DASH_COLUMNS);     
+        this.actor.remove_all();
+        this.actor.append(this._resultsText, Big.BoxPackFlags.NONE);
+        this.actor.append(this.display.actor, Big.BoxPackFlags.EXPAND);
+        this.actor.append(this.controlBox, Big.BoxPackFlags.END);
+    }
+}
+
+function Dash() {
+    this._init();
+}
+
+Dash.prototype = {
+    _init : function() {
+        let me = this;
+
+        this._moreAppsMode = false;
+        this._moreDocsMode = false;
+
+        this._width = displayGridColumnWidth;
+
+        this._displayWidth = displayGridColumnWidth - DASH_SECTION_PADDING * 2;
+        this._resultsWidth = displayGridColumnWidth;  
+        this._detailsWidth = displayGridColumnWidth * 2;  
+
+        let bottomHeight = DASH_SECTION_PADDING;
+
+        let global = Shell.Global.get();
+
+        let resultsHeight = global.screen_height - Panel.PANEL_HEIGHT - DASH_SECTION_PADDING - bottomHeight;
+        let detailsHeight = global.screen_height - Panel.PANEL_HEIGHT - DASH_SECTION_PADDING - bottomHeight;
+
+        // The whole dash group needs to be reactive so that the clicks are not passed to the transparent background underneath it.
+        // This background is used in the workspaces area when the additional dash panes are being shown. It handles clicks in the
+        // workspaces area by closing these additional dash panes and revealing all workspaces.
+        this.actor = new Clutter.Group({reactive: true});
+        this.actor.height = global.screen_height;
+
+        let dashPane = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                     x: 0,
+                                     y: Panel.PANEL_HEIGHT + DASH_SECTION_PADDING,
+                                     width: this._width + SHADOW_WIDTH,
+                                     height: global.screen_height - Panel.PANEL_HEIGHT - DASH_SECTION_PADDING - bottomHeight});
+
+        let dashBackground = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                           width: this._width,
+                                           height: global.screen_height - Panel.PANEL_HEIGHT - DASH_SECTION_PADDING - bottomHeight,
+                                           corner_radius: DASH_CORNER_RADIUS,
+                                           border: DASH_BORDER_WIDTH,
+                                           border_color: DASH_BORDER_COLOR });
+
+        dashPane.append(dashBackground, Big.BoxPackFlags.EXPAND);
+        
+        let dashLeft = global.create_horizontal_gradient(DASH_LEFT_COLOR,
+                                                         DASH_MIDDLE_COLOR);
+        let dashRight = global.create_horizontal_gradient(DASH_MIDDLE_COLOR,
+                                                          DASH_RIGHT_COLOR);
+        let dashShadow = global.create_horizontal_gradient(SHADOW_COLOR,
+                                                           TRANSPARENT_COLOR);
+        dashShadow.set_width(SHADOW_WIDTH);
+        
+        dashBackground.append(dashLeft, Big.BoxPackFlags.EXPAND);
+        dashBackground.append(dashRight, Big.BoxPackFlags.EXPAND);
+        dashPane.append(dashShadow, Big.BoxPackFlags.NONE);
+        
+        this.actor.add_actor(dashPane);
+
+        this._searchEntry = new SearchEntry(this._width - DASH_SECTION_PADDING * 2 - DASH_BORDER_WIDTH * 2);
+        this.actor.add_actor(this._searchEntry.actor);
+        this._searchEntry.actor.set_position(DASH_SECTION_PADDING + DASH_BORDER_WIDTH, dashPane.y + DASH_SECTION_PADDING + DASH_BORDER_WIDTH);
+
+        this._searchQueued = false;
+        this._searchEntry.entry.connect('text-changed', function (se, prop) {
+            if (me._searchQueued)
+                return;
+            me._searchQueued = true;
+            Mainloop.timeout_add(250, function() {
+                // Strip leading and trailing whitespace
+                let text = me._searchEntry.entry.text.replace(/^\s+/g, "").replace(/\s+$/g, "");
+                me._searchQueued = false;
+                me._resultsAppsSection.display.setSearch(text);
+                me._resultsDocsSection.display.setSearch(text);
+                if (text == '')
+                    me._unsetSearchMode();
+                else 
+                    me._setSearchMode();
+                   
+                return false;
+            });
+        });
+        this._searchEntry.entry.connect('activate', function (se) {
+            // only one of the displays will have an item selected, so it's ok to
+            // call activateSelected() on all of them
+            me._docDisplay.activateSelected();
+            me._resultsAppsSection.display.activateSelected();
+            me._resultsDocsSection.display.activateSelected();
+            return true;
+        });
+        this._searchEntry.entry.connect('key-press-event', function (se, e) {
+            let symbol = Shell.get_event_key_symbol(e);
+            if (symbol == Clutter.Escape) {
+                // Escape will keep clearing things back to the desktop. First, if
+                // we have active text, we remove it.
+                if (me._searchEntry.entry.text != '')
+                    me._searchEntry.entry.text = '';
+                // Next, if we're in one of the "more" modes or showing the details pane, close them
+                else if (me._moreAppsMode || me._moreDocsMode || me._detailsShowing())
+                    me.unsetMoreMode();
+                // Finally, just close the overlay entirely
+                else
+                    me.emit('activated');
+                return true;
+            } else if (symbol == Clutter.Up) {
+                // selectUp and selectDown wrap around in their respective displays
+                // too, but there doesn't seem to be any flickering if we first select
+                // something in one display, but then unset the selection, and move
+                // it to the other display, so it's ok to do that.
+                // TODO: add the right logic
+            } else if (symbol == Clutter.Down) {
+                // TODO: add the right logic
+            }
+            return false;
+        });
+
+        this._appsText = new Clutter.Text({ color: DASH_TEXT_COLOR,
+                                            font_name: "Sans Bold 14px",
+                                            text: "Applications",
+                                            height: LABEL_HEIGHT});
+        this._appsSection = new Big.Box({ x: DASH_SECTION_PADDING,
+                                          y: this._searchEntry.actor.y + this._searchEntry.actor.height + DASH_SECTION_PADDING,
+                                          padding_top: DASH_SECTION_PADDING,
+                                          spacing: DASH_SECTION_SPACING});
+        this._appsSection.append(this._appsText, Big.BoxPackFlags.EXPAND);
+
+        this._itemDisplayHeight = global.screen_height - this._appsSection.y - DASH_SECTION_MISC_HEIGHT * 2 - bottomHeight;
+        
+        this._appsContent = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
+        this._appsSection.append(this._appsContent, Big.BoxPackFlags.EXPAND);
+        this._appWell = new AppDisplay.AppWell(this._displayWidth);
+        this._appWell.actor.show();
+        this._appsContent.append(this._appWell.actor, Big.BoxPackFlags.EXPAND);
+
+        let moreAppsBox = new Big.Box({x_align: Big.BoxAlignment.END});
+        this._moreAppsLink = new Link.Link({ color: DASH_TEXT_COLOR,
+                                             font_name: "Sans Bold 14px",
+                                             text: "More...",
+                                             height: LABEL_HEIGHT });
+        moreAppsBox.append(this._moreAppsLink.actor, Big.BoxPackFlags.EXPAND);
+        this._appsSection.append(moreAppsBox, Big.BoxPackFlags.EXPAND);
+
+        this.actor.add_actor(this._appsSection);
+  
+        this._appsSectionDefaultHeight = this._appsSection.height;
+
+        this._docsSection = new Big.Box({ x: DASH_SECTION_PADDING,
+                                          y: this._appsSection.y + this._appsSection.height,
+                                          padding_top: DASH_SECTION_PADDING,
+                                          spacing: DASH_SECTION_SPACING});
+
+        this._docsText = new Clutter.Text({ color: DASH_TEXT_COLOR,
+                                            font_name: "Sans Bold 14px",
+                                            text: "Recent Documents",
+                                            height: LABEL_HEIGHT});
+        this._docsSection.append(this._docsText, Big.BoxPackFlags.EXPAND);
+
+        this._docDisplay = new DocDisplay.DocDisplay(this._displayWidth, this._itemDisplayHeight - this._appsContent.height, DASH_COLUMNS, DASH_SECTION_PADDING);
+        this._docsSection.append(this._docDisplay.actor, Big.BoxPackFlags.EXPAND);
+
+        let moreDocsBox = new Big.Box({x_align: Big.BoxAlignment.END});
+        this._moreDocsLink = new Link.Link({ color: DASH_TEXT_COLOR,
+                                             font_name: "Sans Bold 14px",
+                                             text: "More...",
+                                             height: LABEL_HEIGHT });
+        moreDocsBox.append(this._moreDocsLink.actor, Big.BoxPackFlags.EXPAND);
+        this._docsSection.append(moreDocsBox, Big.BoxPackFlags.EXPAND);
+
+        this.actor.add_actor(this._docsSection);
+
+        this._docsSectionDefaultHeight = this._docsSection.height;
+
+        // The "More" or search results area
+        this._resultsAppsSection = new ItemResults(this._displayWidth, resultsHeight, AppDisplay.AppDisplay, "Applications");
+        this._resultsDocsSection = new ItemResults(this._displayWidth, resultsHeight, DocDisplay.DocDisplay, "Documents");
+
+        this._resultsPane = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                          x: this._width,
+                                          y: Panel.PANEL_HEIGHT + DASH_SECTION_PADDING,
+                                          width: this._resultsWidth + SHADOW_WIDTH,
+                                          height: resultsHeight });
+
+        let resultsBackground = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                              width: this._resultsWidth,
+                                              height: resultsHeight,
+                                              corner_radius: DASH_CORNER_RADIUS,
+                                              border: DASH_BORDER_WIDTH,
+                                              border_color: DASH_BORDER_COLOR });
+
+        this._resultsPane.append(resultsBackground, Big.BoxPackFlags.EXPAND);
+
+        let resultsLeft = global.create_horizontal_gradient(PANE_LEFT_COLOR,
+                                                            PANE_MIDDLE_COLOR);
+        let resultsRight = global.create_horizontal_gradient(PANE_MIDDLE_COLOR,
+                                                             PANE_RIGHT_COLOR);
+        let resultsShadow = global.create_horizontal_gradient(SHADOW_COLOR,
+                                                              TRANSPARENT_COLOR);
+        resultsShadow.set_width(SHADOW_WIDTH);
+        
+        resultsBackground.append(resultsLeft, Big.BoxPackFlags.EXPAND);
+        resultsBackground.append(resultsRight, Big.BoxPackFlags.EXPAND);
+        this._resultsPane.append(resultsShadow, Big.BoxPackFlags.NONE);
+
+        this.actor.add_actor(this._resultsPane);
+        this._resultsPane.hide();
+
+        this._detailsPane = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                          x: this._width,
+                                          y: Panel.PANEL_HEIGHT + DASH_SECTION_PADDING,
+                                          width: this._detailsWidth + SHADOW_WIDTH,
+                                          height: detailsHeight });
+        this._firstSelectAfterOverlayShow = true;
+
+        let detailsBackground = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                              width: this._detailsWidth,
+                                              height: detailsHeight,
+                                              corner_radius: DASH_CORNER_RADIUS,
+                                              border: DASH_BORDER_WIDTH,
+                                              border_color: DASH_BORDER_COLOR });
+
+        this._detailsPane.append(detailsBackground, Big.BoxPackFlags.EXPAND);
+
+        let detailsLeft = global.create_horizontal_gradient(PANE_LEFT_COLOR,
+                                                            PANE_MIDDLE_COLOR);
+        let detailsRight = global.create_horizontal_gradient(PANE_MIDDLE_COLOR,
+                                                             PANE_RIGHT_COLOR);
+        let detailsShadow = global.create_horizontal_gradient(SHADOW_COLOR,
+                                                              TRANSPARENT_COLOR);
+        detailsShadow.set_width(SHADOW_WIDTH);
+        
+        detailsBackground.append(detailsLeft, Big.BoxPackFlags.EXPAND);
+        detailsBackground.append(detailsRight, Big.BoxPackFlags.EXPAND);
+        this._detailsPane.append(detailsShadow, Big.BoxPackFlags.NONE);
+
+        this._detailsContent = new Big.Box({ padding: DASH_SECTION_PADDING + DASH_BORDER_WIDTH });
+        this._detailsPane.add_actor(this._detailsContent);
+
+        this.actor.add_actor(this._detailsPane);
+        this._detailsPane.hide();
+
+        let itemDetailsAvailableWidth = this._detailsWidth - DASH_SECTION_PADDING * 2 - DASH_BORDER_WIDTH * 2;
+        let itemDetailsAvailableHeight = detailsHeight - DASH_SECTION_PADDING * 2 - DASH_BORDER_WIDTH * 2;
+
+        this._docDisplay.setAvailableDimensionsForItemDetails(itemDetailsAvailableWidth, itemDetailsAvailableHeight);
+        this._resultsAppsSection.display.setAvailableDimensionsForItemDetails(itemDetailsAvailableWidth, itemDetailsAvailableHeight);
+        this._resultsDocsSection.display.setAvailableDimensionsForItemDetails(itemDetailsAvailableWidth, itemDetailsAvailableHeight);
+
+        /* Proxy the activated signals */
+        this._appWell.connect('activated', function(well) {
+            me.emit('activated');
+        });
+        this._docDisplay.connect('activated', function(docDisplay) {
+            me.emit('activated');
+        });
+        this._resultsAppsSection.display.connect('activated', function(resultsAppsDisplay) {
+            me.emit('activated');
+        });
+        this._resultsDocsSection.display.connect('activated', function(resultsDocsDisplay) {
+            me.emit('activated');
+        });
+        this._docDisplay.connect('selected', function(docDisplay) {
+            me._resultsDocsSection.display.unsetSelected();
+            me._resultsAppsSection.display.unsetSelected();
+            if (!me._detailsShowing()) { 
+                me._detailsPane.show();
+                me.emit('panes-displayed');
+            }
+            me._detailsContent.remove_all();
+            me._detailsContent.append(me._docDisplay.selectedItemDetails, Big.BoxPackFlags.NONE); 
+        });
+        this._resultsDocsSection.display.connect('selected', function(resultsDocDisplay) {
+            me._docDisplay.unsetSelected();
+            me._resultsAppsSection.display.unsetSelected();
+            if (!me._detailsShowing()) { 
+                me._detailsPane.show();
+                me.emit('panes-displayed');
+            }
+            me._detailsContent.remove_all();
+            me._detailsContent.append(me._resultsDocsSection.display.selectedItemDetails, Big.BoxPackFlags.NONE);
+        });
+        this._resultsAppsSection.display.connect('selected', function(resultsAppDisplay) {
+            me._docDisplay.unsetSelected();
+            me._resultsDocsSection.display.unsetSelected();
+            if (!me._detailsShowing()) { 
+                me._detailsPane.show();
+                me.emit('panes-displayed');
+            }
+            me._detailsContent.remove_all();
+            me._detailsContent.append(me._resultsAppsSection.display.selectedItemDetails, Big.BoxPackFlags.NONE);
+        });
+
+        this._moreAppsLink.connect('clicked',
+            function(o, event) {
+                if (me._moreAppsMode) {
+                    me._unsetMoreAppsMode();
+                }  else {
+                    me._setMoreAppsMode();
+                }
+            });
+
+        this._moreDocsLink.connect('clicked',
+            function(o, event) {
+                if (me._moreDocsMode) {
+                    me._unsetMoreDocsMode();
+                }  else {
+                    me._setMoreDocsMode();
+                }
+            });
+    },
+
+    show: function() {
+        let global = Shell.Global.get();
+
+        this._appsContent.show();
+        this._docDisplay.show();
+        global.stage.set_key_focus(this._searchEntry.entry);
+    },
+
+    hide: function() {
+        this._firstSelectAfterOverlayShow = true;
+        this._appsContent.hide();
+        this._docDisplay.hide(); 
+        this._searchEntry.entry.text = '';
+        this.unsetMoreMode();
+    },
+
+    unsetMoreMode: function() {
+        this._unsetMoreAppsMode();
+        this._unsetMoreDocsMode();
+        if (this._detailsShowing()) { 
+             this._detailsPane.hide();
+             this.emit('panes-removed');
+        }
+        this._unsetSearchMode();
+    },
+
+    // Sets the 'More' mode for browsing applications.
+    _setMoreAppsMode: function() {
+        if (this._moreAppsMode)
+            return;
+
+        this._unsetMoreDocsMode();
+        this._unsetSearchMode();
+        this._moreAppsMode = true;
+
+        this._resultsAppsSection.display.show();
+        this._resultsPane.add_actor(this._resultsAppsSection.actor);
+        this._resultsPane.show();
+
+        this._moreAppsLink.setText("Less...");
+ 
+        this._detailsPane.x = this._width + this._resultsWidth;
+        this.emit('panes-displayed');
+    },
+
+    // Unsets the 'More' mode for browsing applications.
+    _unsetMoreAppsMode: function() {
+        if (!this._moreAppsMode)
+            return;
+
+        this._moreAppsMode = false;
+
+        this._resultsPane.remove_actor(this._resultsAppsSection.actor);
+        this._resultsAppsSection.display.hide();
+        this._resultsPane.hide(); 
+       
+        this._moreAppsLink.setText("More...");
+
+        this._detailsPane.x = this._width;
+
+        if (!this._detailsShowing()) {
+            this.emit('panes-removed');
+        }
+    },   
+ 
+    // Sets the 'More' mode for browsing documents.
+    _setMoreDocsMode: function() {
+        if (this._moreDocsMode)
+            return;
+
+        this._unsetMoreAppsMode();
+        this._unsetSearchMode();
+        this._moreDocsMode = true;
+
+        this._resultsDocsSection.display.show();
+        this._resultsPane.add_actor(this._resultsDocsSection.actor);
+        this._resultsPane.show();
+         
+        this._moreDocsLink.setText("Less...");
+        
+        this._detailsPane.x = this._width + this._resultsWidth; 
+        this.emit('panes-displayed');
+    },
+
+    // Unsets the 'More' mode for browsing documents. 
+    _unsetMoreDocsMode: function() {
+        if (!this._moreDocsMode)
+            return;
+
+        this._moreDocsMode = false;
+
+        this._resultsPane.hide();
+        this._resultsPane.remove_actor(this._resultsDocsSection.actor);
+        this._resultsDocsSection.display.hide();
+ 
+        this._moreDocsLink.setText("More...");
+
+        this._detailsPane.x = this._width;
+
+        if (!this._detailsShowing()) {
+            this.emit('panes-removed');
+        }
+    },
+
+    _setSearchMode: function() {
+        if (this._resultsShowing())
+            return;
+
+        this._resultsAppsSection._setSearchMode();
+        this._resultsAppsSection.display.show();
+        this._resultsPane.add_actor(this._resultsAppsSection.actor);
+
+        this._resultsDocsSection._setSearchMode();    
+        this._resultsDocsSection.display.show();
+        this._resultsPane.add_actor(this._resultsDocsSection.actor);
+        this._resultsDocsSection.actor.set_y(this._resultsAppsSection.actor.height);
+
+        this._resultsPane.show();
+
+        this._detailsPane.x = this._width + this._resultsWidth;
+        this.emit('panes-displayed');
+    },
+
+    _unsetSearchMode: function() {
+        if (this._moreDocsMode || this._moreAppsMode || !this._resultsShowing())
+            return;
+
+        this._resultsPane.hide();
+
+        this._resultsPane.remove_actor(this._resultsAppsSection.actor);
+        this._resultsAppsSection.display.hide();
+        this._resultsAppsSection._unsetSearchMode();
+
+        this._resultsPane.remove_actor(this._resultsDocsSection.actor);
+        this._resultsDocsSection.display.hide();
+        this._resultsDocsSection._unsetSearchMode();
+        this._resultsDocsSection.actor.set_y(0);
+
+        this._detailsPane.x = this._width;
+
+        if (!this._detailsShowing()) {
+            this.emit('panes-removed');
+        }
+    },
+
+    _detailsShowing: function() {
+        return this._detailsPane.visible;
+    },
+
+    _resultsShowing: function() {
+        return this._resultsPane.visible;
+    }      
+};
+
+Signals.addSignalMethods(Dash.prototype);
+
+function Overlay() {
+    this._init();
+}
+
+Overlay.prototype = {
+    _init : function() {
+        let me = this;
+
+        let global = Shell.Global.get();
+
+        wideScreen = (global.screen_width/global.screen_height > WIDE_SCREEN_CUT_OFF_RATIO);
+
+        // We divide the screen into an imaginary grid which helps us determine the layout of
+        // different visual components.  
+        if (wideScreen) {
+            displayGridColumnWidth = global.screen_width / COLUMNS_WIDE_SCREEN;
+            displayGridRowHeight = global.screen_height / ROWS_WIDE_SCREEN;
+        } else {
+            displayGridColumnWidth = global.screen_width / COLUMNS_REGULAR_SCREEN;
+            displayGridRowHeight = global.screen_height / ROWS_REGULAR_SCREEN;
+        }
+
+        this._group = new Clutter.Group();
+        this._group._delegate = this;
+
+        this.visible = false;
+        this._hideInProgress = false;
+
+        // A scaled root pixmap actor is used as a background. It is zoomed in
+        // to the lower right intersection of the lines that divide the image
+        // evenly in a 3x3 grid. This is based on the rule of thirds, a
+        // compositional rule of thumb in visual arts. The choice for the
+        // lower right point is based on a quick survey of GNOME wallpapers.
+        let background = global.create_root_pixmap_actor();
+        background.width = global.screen_width * BACKGROUND_SCALE;
+        background.height = global.screen_height * BACKGROUND_SCALE;
+        background.x = -global.screen_width * (4 * BACKGROUND_SCALE - 3) / 6;
+        background.y = -global.screen_height * (4 * BACKGROUND_SCALE - 3) / 6;
+        this._group.add_actor(background);
+
+        // Transparent background is used to catch clicks outside of the dash panes when the panes
+        // are being displayed and the workspaces area should not be reactive. Catching such a
+        // click results in the panes being closed and the workspaces area becoming reactive again. 
+        this._transparentBackground = new Clutter.Rectangle({ opacity: 0,
+                                                              width: global.screen_width,
+                                                              height: global.screen_height - Panel.PANEL_HEIGHT,
+                                                              y: Panel.PANEL_HEIGHT,
+                                                              reactive: true });
+        this._group.add_actor(this._transparentBackground);
+
+        // Draw a semitransparent rectangle over the background for readability.
+        let backOver = new Clutter.Rectangle({ color: ROOT_OVERLAY_COLOR,
+                                               width: global.screen_width,
+                                               height: global.screen_height - Panel.PANEL_HEIGHT,
+                                               y: Panel.PANEL_HEIGHT });
+        this._group.add_actor(backOver);
+
+        this._group.hide();
+        global.overlay_group.add_actor(this._group);
+
+        // TODO - recalculate everything when desktop size changes
+        this._dash = new Dash();
+        this._group.add_actor(this._dash.actor);
+        this._workspaces = null;
+        this._buttonEventHandlerId = null;
+        this._dash.connect('activated', function(dash) {
+            // TODO - have some sort of animation/effect while
+            // transitioning to the new app.  We definitely need
+            // startup-notification integration at least.
+            me.hide();
+        });
+        this._dash.connect('panes-displayed', function(dash) {
+            if (me._buttonEventHandlerId == null) {
+                me._transparentBackground.raise_top();
+                me._dash.actor.raise_top();
+                me._buttonEventHandlerId = me._transparentBackground.connect('button-release-event', function(background) {
+                    me._dash.unsetMoreMode();
+                    return true;
+                }); 
+            }    
+        });
+        this._dash.connect('panes-removed', function(dash) {
+            if (me._buttonEventHandlerId != null) {
+                me._transparentBackground.lower_bottom();  
+                me._transparentBackground.disconnect(me._buttonEventHandlerId);  
+                me._buttonEventHandlerId = null;
+            }
+        });
+    },
+
+    //// Draggable target interface ////
+
+    // Unsets the expanded display mode if a GenericDisplayItem is being 
+    // dragged over the overlay, i.e. as soon as it starts being dragged.
+    // This closes the additional panes and allows the user to place
+    // the item on any workspace.
+    handleDragOver : function(source, actor, x, y, time) {
+        if (source instanceof GenericDisplay.GenericDisplayItem) {
+            this._dash.unsetMoreMode();
+            return true;
+        }
+  
+        return false;
+    },
+
+    //// Public methods ////
+
+    show : function() {
+        if (this.visible)
+            return;
+        if (!Main.startModal())
+            return;
+
+        this.visible = true;
+
+        let global = Shell.Global.get();
+        let screenWidth = global.screen_width;
+        let screenHeight = global.screen_height; 
+
+        this._dash.show();
+
+        let columnsUsed = wideScreen ? COLUMNS_FOR_WORKSPACES_WIDE_SCREEN : COLUMNS_FOR_WORKSPACES_REGULAR_SCREEN;
+        let rowsUsed = wideScreen ? ROWS_FOR_WORKSPACES_WIDE_SCREEN : ROWS_FOR_WORKSPACES_REGULAR_SCREEN;  
+         
+        let workspacesWidth = displayGridColumnWidth * columnsUsed - WORKSPACE_GRID_PADDING * 2;
+        // We scale the vertical padding by (screenHeight / screenWidth) so that the workspace preserves its aspect ratio.
+        let workspacesHeight = displayGridRowHeight * rowsUsed - WORKSPACE_GRID_PADDING * (screenHeight / screenWidth) * 2;
+
+        let workspacesX = displayGridColumnWidth + WORKSPACE_GRID_PADDING;
+        let workspacesY = displayGridRowHeight + WORKSPACE_GRID_PADDING * (screenHeight / screenWidth);
+
+        // place the 'Add Workspace' button in the bottom row of the grid
+        let addButtonSize = Math.floor(displayGridRowHeight * 3/5);
+        let addButtonX = workspacesX + workspacesWidth - addButtonSize;
+        let addButtonY = screenHeight - Math.floor(displayGridRowHeight * 4/5);
+
+        this._workspaces = new Workspaces.Workspaces(workspacesWidth, workspacesHeight, workspacesX, workspacesY, 
+                                                     addButtonSize, addButtonX, addButtonY);
+        this._group.add_actor(this._workspaces.actor);
+
+        // All the the actors in the window group are completely obscured,
+        // hiding the group holding them while the overlay is displayed greatly
+        // increases performance of the overlay especially when there are many
+        // windows visible.
+        //
+        // If we switched to displaying the actors in the overlay rather than
+        // clones of them, this would obviously no longer be necessary.
+        global.window_group.hide();
+        this._group.show();
+
+        // Try to make the menu not too visible behind the empty space between
+        // the workspace previews by sliding in its clipping rectangle.
+        // We want to finish drawing the Dash just before the top workspace fully
+        // slides in on the top. Which means that we have more time to wait before
+        // drawing the dash if the active workspace is displayed on the bottom of
+        // the workspaces grid, and almost no time to wait if it is displayed in the top
+        // row of the workspaces grid. The calculations used below try to roughly
+        // capture the animation ratio for when workspaces are covering the top of the overlay
+        // vs. when workspaces are already below the top of the overlay, and apply it
+        // to clipping the dash. The clipping is removed in this._showDone().
+        this._dash.actor.set_clip(0, 0,
+                                      this._workspaces.getFullSizeX(),
+                                      this._dash.actor.height);
+        Tweener.addTween(this._dash.actor,
+                         { clipWidthRight: this._dash._width + WORKSPACE_GRID_PADDING + this._workspaces.getWidthToTopActiveWorkspace(),
+                           time: ANIMATION_TIME,
+                           transition: "easeOutQuad",
+                           onComplete: this._showDone,
+                           onCompleteScope: this
+
+                         });
+
+        this.emit('showing');
+    },
+
+    hide : function() {
+        if (!this.visible || this._hideInProgress)
+            return;
+
+        let global = Shell.Global.get();
+
+        this._hideInProgress = true;
+        // lower the Dash, so that workspaces display is on top and covers the Dash while it is sliding out
+        this._dash.actor.lower(this._workspaces.actor);
+        this._workspaces.hide();
+
+        // Try to make the menu not too visible behind the empty space between
+        // the workspace previews by sliding in its clipping rectangle.
+        // The logic used is the same as described in this.show(). If the active workspace
+        // is displayed in the top row, than almost full animation time is needed for it
+        // to reach the top of the overlay and cover the Dash fully, while if the
+        // active workspace is in the lower row, than the top left workspace reaches the
+        // top of the overlay sooner as it is moving out of the way.
+        // The clipping is removed in this._hideDone().
+        this._dash.actor.set_clip(0, 0,
+                                      this._dash.actor.width + WORKSPACE_GRID_PADDING + this._workspaces.getWidthToTopActiveWorkspace(),
+                                      this._dash.actor.height);
+        Tweener.addTween(this._dash.actor,
+                         { clipWidthRight: this._workspaces.getFullSizeX() + this._workspaces.getWidthToTopActiveWorkspace() - global.screen_width,
+                           time: ANIMATION_TIME,
+                           transition: "easeOutQuad",
+                           onComplete: this._hideDone,
+                           onCompleteScope: this
+                         });
+
+        this.emit('hiding');
+    },
+
+    toggle: function() {
+        if (this.visible)
+            this.hide();
+        else
+            this.show();
+    },
+
+    //// Private methods ////
+
+    // Raises the Dash to the top, so that we can tell if the pointer is above one of its items.
+    // We need to do this once the workspaces are shown because the workspaces actor currently covers
+    // the whole screen, regardless of where the workspaces are actually displayed.
+    //
+    // Once we rework the workspaces actor to only cover the area it actually needs, we can
+    // remove this workaround. Also http://bugzilla.openedhand.com/show_bug.cgi?id=1513 requests being
+    // able to pick only a reactive actor at a certain position, rather than any actor. Being able
+    // to do that would allow us to not have to raise the Dash.
+    _showDone: function() {
+        if (this._hideInProgress)
+            return;
+
+        this._dash.actor.raise_top();
+        this._dash.actor.remove_clip();
+
+        this.emit('shown');
+    },
+
+    _hideDone: function() {
+        let global = Shell.Global.get();
+
+        global.window_group.show();
+
+        this._workspaces.destroy();
+        this._workspaces = null;
+
+        this._dash.actor.remove_clip();
+        this._dash.hide();
+        this._group.hide();
+
+        this.visible = false; 
+        this._hideInProgress = false;
+
+        Main.endModal();
+        this.emit('hidden');
+    }
+};
+Signals.addSignalMethods(Overlay.prototype);
+
+Tweener.registerSpecialProperty("clipHeightBottom", _clipHeightBottomGet, _clipHeightBottomSet);
+
+function _clipHeightBottomGet(actor) {
+    let [xOffset, yOffset, clipWidth, clipHeight] = actor.get_clip();
+    return clipHeight;
+}
+
+function _clipHeightBottomSet(actor, clipHeight) {
+    actor.set_clip(0, 0, actor.width, clipHeight);
+}
+
+Tweener.registerSpecialProperty("clipHeightTop", _clipHeightTopGet, _clipHeightTopSet);
+
+function _clipHeightTopGet(actor) {
+    let [xOffset, yOffset, clipWidth, clipHeight] = actor.get_clip();
+    return clipHeight;
+}
+
+function _clipHeightTopSet(actor, clipHeight) {
+    actor.set_clip(0, actor.height - clipHeight, actor.width, clipHeight);
+}
+
+Tweener.registerSpecialProperty("clipWidthRight", _clipWidthRightGet, _clipWidthRightSet);
+
+function _clipWidthRightGet(actor) {
+    let [xOffset, yOffset, clipWidth, clipHeight] = actor.get_clip();
+    return clipWidth;
+}
+
+function _clipWidthRightSet(actor, clipWidth) {
+    actor.set_clip(0, 0, clipWidth, actor.height);
+}

js/ui/overview.js

@@ -1,496 +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 Gtk = imports.gi.Gtk;
-const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const Lang = imports.lang;
-
-const AppDisplay = imports.ui.appDisplay;
-const DocDisplay = imports.ui.docDisplay;
-const GenericDisplay = imports.ui.genericDisplay;
-const Main = imports.ui.main;
-const Panel = imports.ui.panel;
-const Dash = imports.ui.dash;
-const Tweener = imports.ui.tweener;
-const Workspaces = imports.ui.workspaces;
-
-const ROOT_OVERVIEW_COLOR = new Clutter.Color();
-ROOT_OVERVIEW_COLOR.from_pixel(0x000000ff);
-
-// Time for initial animation going into Overview mode
-const ANIMATION_TIME = 0.25;
-
-// We divide the screen into a grid of rows and columns, which we use
-// to help us position the Overview components, such as the side panel
-// that lists applications and documents, the workspaces display, and 
-// the button for adding additional workspaces.
-// In the regular mode, the side panel takes up one column on the left,
-// and the workspaces display takes up the remaining columns.
-// In the expanded side panel display mode, the side panel takes up two
-// columns, and the workspaces display slides all the way to the right,
-// being visible only in the last quarter of the right-most column.
-// In the future, this mode will have more components, such as a display 
-// of documents which were recently opened with a given application, which 
-// will take up the remaining sections of the display.
-
-const WIDE_SCREEN_CUT_OFF_RATIO = 1.4;
-// A common netbook resolution is 1024x600, which trips the widescreen
-// ratio.  However that leaves way too few pixels for the dash.  So
-// just treat this as a regular screen.
-const WIDE_SCREEN_MINIMUM_HEIGHT = 768;
-
-const COLUMNS_REGULAR_SCREEN = 4;
-const ROWS_REGULAR_SCREEN = 8;
-const COLUMNS_WIDE_SCREEN = 5;
-const ROWS_WIDE_SCREEN = 10;
-
-const DEFAULT_PADDING = 4;
-
-// Padding around workspace grid / Spacing between Dash and Workspaces
-const WORKSPACE_GRID_PADDING = 12;
-
-const COLUMNS_FOR_WORKSPACES_REGULAR_SCREEN = 3;
-const ROWS_FOR_WORKSPACES_REGULAR_SCREEN = 6;
-
-const COLUMNS_FOR_WORKSPACES_WIDE_SCREEN = 4;
-const ROWS_FOR_WORKSPACES_WIDE_SCREEN = 8;
-
-// A multi-state; PENDING is used during animations
-const STATE_ACTIVE = true;
-const STATE_PENDING_INACTIVE = false;
-const STATE_INACTIVE = false;
-
-const SHADOW_COLOR = new Clutter.Color();
-SHADOW_COLOR.from_pixel(0x00000033);
-const TRANSPARENT_COLOR = new Clutter.Color();
-TRANSPARENT_COLOR.from_pixel(0x00000000);
-
-const SHADOW_WIDTH = 6;
-
-const NUMBER_OF_SECTIONS_IN_SEARCH = 2;
-
-let wideScreen = false;
-let displayGridColumnWidth = null;
-let displayGridRowHeight = null;
-let addRemoveButtonSize = null;
-
-function Overview() {
-    this._init();
-}
-
-Overview.prototype = {
-    _init : function() {
-        this._group = new Clutter.Group();
-        this._group._delegate = this;
-
-        this.visible = false;
-        this.animationInProgress = false;
-        this._hideInProgress = false;
-
-        this._recalculateGridSizes();
-
-        this._activeDisplayPane = null;
-
-        // During transitions, we raise this to the top to avoid having the overview
-        // area be reactive; it causes too many issues such as double clicks on
-        // Dash elements, or mouseover handlers in the workspaces.
-        this._coverPane = new Clutter.Rectangle({ opacity: 0,
-                                                  reactive: true });
-        this._group.add_actor(this._coverPane);
-        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return true; }));
-
-        // Similar to the cover pane but used for dialogs ("panes"); see the comments
-        // in addPane below.
-        this._transparentBackground = new Clutter.Rectangle({ opacity: 0,
-                                                              reactive: true });
-        this._group.add_actor(this._transparentBackground);
-
-        // Background color for the Overview
-        this._backOver = new Clutter.Rectangle({ color: ROOT_OVERVIEW_COLOR });
-        this._group.add_actor(this._backOver);
-
-        this._group.hide();
-        global.overlay_group.add_actor(this._group);
-
-        // TODO - recalculate everything when desktop size changes
-        this._dash = new Dash.Dash();
-        this._group.add_actor(this._dash.actor);
-
-        // Container to hold popup pane chrome.
-        this._paneContainer = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                             spacing: 6 });
-        // Note here we explicitly don't set the paneContainer to be reactive yet; that's done
-        // inside the notify::visible handler on panes.
-        this._paneContainer.connect('button-release-event', Lang.bind(this, function(background) {
-            this._activeDisplayPane.close();
-            return true;
-        }));
-        this._group.add_actor(this._paneContainer);
-
-        this._transparentBackground.lower_bottom();
-        this._paneContainer.lower_bottom();
-
-        this._coverPane.lower_bottom();
-
-        this._workspaces = null;
-    },
-
-    _recalculateGridSizes: function () {
-        let primary = global.get_primary_monitor();
-        wideScreen = (primary.width/primary.height > WIDE_SCREEN_CUT_OFF_RATIO) &&
-                     (primary.height >= WIDE_SCREEN_MINIMUM_HEIGHT);
-
-        // We divide the screen into an imaginary grid which helps us determine the layout of
-        // different visual components.
-        if (wideScreen) {
-            displayGridColumnWidth = Math.floor(primary.width / COLUMNS_WIDE_SCREEN);
-            displayGridRowHeight = Math.floor(primary.height / ROWS_WIDE_SCREEN);
-        } else {
-            displayGridColumnWidth = Math.floor(primary.width / COLUMNS_REGULAR_SCREEN);
-            displayGridRowHeight = Math.floor(primary.height / ROWS_REGULAR_SCREEN);
-        }
-    },
-
-    relayout: function () {
-        let primary = global.get_primary_monitor();
-
-        this._group.set_position(primary.x, primary.y);
-
-        let contentY = Panel.PANEL_HEIGHT;
-        let contentHeight = primary.height - contentY;
-
-        this._coverPane.set_position(0, contentY);
-        this._coverPane.set_size(primary.width, contentHeight);
-
-        let workspaceColumnsUsed = wideScreen ? COLUMNS_FOR_WORKSPACES_WIDE_SCREEN : COLUMNS_FOR_WORKSPACES_REGULAR_SCREEN;
-        let workspaceRowsUsed = wideScreen ? ROWS_FOR_WORKSPACES_WIDE_SCREEN : ROWS_FOR_WORKSPACES_REGULAR_SCREEN;
-
-        this._workspacesWidth = displayGridColumnWidth * workspaceColumnsUsed
-                                  - WORKSPACE_GRID_PADDING * 2;
-        // We scale the vertical padding by (primary.height / primary.width)
-        // so that the workspace preserves its aspect ratio.
-        this._workspacesHeight = Math.floor(displayGridRowHeight * workspaceRowsUsed
-                                   - WORKSPACE_GRID_PADDING * (primary.height / primary.width) * 2);
-
-        this._workspacesX = displayGridColumnWidth + WORKSPACE_GRID_PADDING;
-        this._workspacesY = Math.floor(displayGridRowHeight + WORKSPACE_GRID_PADDING * (primary.height / primary.width));
-
-        this._dash.actor.set_position(0, contentY);
-        this._dash.actor.set_size(displayGridColumnWidth, contentHeight);
-        this._dash.searchArea.height = this._workspacesY - contentY;
-        this._dash.sectionArea.height = this._workspacesHeight;
-        this._dash.searchResults.actor.height = this._workspacesHeight;
-
-        // place the 'Add Workspace' button in the bottom row of the grid
-        addRemoveButtonSize = Math.floor(displayGridRowHeight * 3/5);
-        this._addButtonX = this._workspacesX + this._workspacesWidth - addRemoveButtonSize;
-        this._addButtonY = primary.height - Math.floor(displayGridRowHeight * 4/5);
-
-        // The parent (this._group) is positioned at the top left of the primary monitor
-        // while this._backOver occupies the entire screen.
-        this._backOver.set_position(- primary.x, - primary.y);
-        this._backOver.set_size(global.screen_width, global.screen_height);
-
-        this._paneContainer.set_position(this._dash.actor.x + this._dash.actor.width + DEFAULT_PADDING,
-                                         this._workspacesY);
-        // Dynamic width
-        this._paneContainer.height = this._workspacesHeight;
-
-        this._transparentBackground.set_position(this._paneContainer.x, this._paneContainer.y);
-        this._transparentBackground.set_size(primary.width - this._paneContainer.x,
-                                             this._paneContainer.height);
-
-        if (this._activeDisplayPane != null)
-            this._activeDisplayPane.actor.width = displayGridColumnWidth * 2;
-    },
-
-    addPane: function (pane) {
-        this._paneContainer.append(pane.actor, Big.BoxPackFlags.NONE);
-        // When a pane is displayed, we raise the transparent background to the top
-        // and connect to button-release-event on it, then raise the pane above that.
-        // The idea here is that clicking anywhere outside the pane should close it.
-        // When the active pane is closed, undo the effect.
-        let backgroundEventId = null;
-        pane.connect('open-state-changed', Lang.bind(this, function (pane, isOpen) {
-            if (isOpen) {
-                pane.actor.width = displayGridColumnWidth * 2;
-                this._activeDisplayPane = pane;
-                this._transparentBackground.raise_top();
-                this._paneContainer.raise_top();
-                if (backgroundEventId != null)
-                    this._transparentBackground.disconnect(backgroundEventId);
-                backgroundEventId = this._transparentBackground.connect('button-release-event', Lang.bind(this, function () {
-                    this._activeDisplayPane.close();
-                    return true;
-                }));
-                this._workspaces.actor.opacity = 64;
-            } else if (pane == this._activeDisplayPane) {
-                this._activeDisplayPane = null;
-                if (backgroundEventId != null) {
-                    this._transparentBackground.disconnect(backgroundEventId);
-                    backgroundEventId = null;
-                }
-                this._transparentBackground.lower_bottom();
-                this._paneContainer.lower_bottom();
-                this._workspaces.actor.opacity = 255;
-            }
-        }));
-    },
-
-    //// Draggable target interface ////
-
-    // Closes any active panes if a GenericDisplayItem is being
-    // dragged over the Overview, i.e. as soon as it starts being dragged.
-    // This allows the user to place the item on any workspace.
-    handleDragOver : function(source, actor, x, y, time) {
-        if (source instanceof GenericDisplay.GenericDisplayItem
-            || source instanceof AppDisplay.AppIcon) {
-            if (this._activeDisplayPane != null)
-                this._activeDisplayPane.close();
-            return true;
-        }
-
-        return false;
-    },
-
-    //// Public methods ////
-
-    // Returns the scale the Overview has when we just start zooming out
-    // to overview mode. That is, when just the active workspace is showing.
-    getZoomedInScale : function() {
-        return 1 / this._workspaces.getScale();
-    },
-
-    // Returns the position the Overview has when we just start zooming out
-    // to overview mode. That is, when just the active workspace is showing.
-    getZoomedInPosition : function() {
-        let [posX, posY] = this._workspaces.getActiveWorkspacePosition();
-        let scale = this.getZoomedInScale();
-
-        return [- posX * scale, - posY * scale];
-    },
-
-    // Returns the current scale of the Overview.
-    getScale : function() {
-        return this._group.scaleX;
-    },
-
-    // Returns the current position of the Overview.
-    getPosition : function() {
-        return [this._group.x, this._group.y];
-    },
-
-    show : function() {
-        if (this.visible)
-            return;
-        if (!Main.pushModal(this._dash.actor))
-            return;
-
-        this.visible = true;
-        this.animationInProgress = true;
-
-        this._dash.show();
-
-        /* TODO: make this stuff dynamic */
-        this._workspaces = new Workspaces.Workspaces(this._workspacesWidth, this._workspacesHeight,
-                                                     this._workspacesX, this._workspacesY);
-        this._group.add_actor(this._workspaces.actor);
-
-        // The workspaces actor is as big as the screen, so we have to raise the dash above it
-        // for drag and drop to work.  In the future we should fix the workspaces to not
-        // be as big as the screen.
-        this._dash.actor.raise(this._workspaces.actor);
-
-        // Create (+) button
-        this._addButton = new AddWorkspaceButton(addRemoveButtonSize, this._addButtonX, this._addButtonY, Lang.bind(this, this._acceptNewWorkspaceDrop));
-        this._addButton.actor.connect('button-release-event', Lang.bind(this, this._addNewWorkspace));
-        this._group.add_actor(this._addButton.actor);
-        this._addButton.actor.raise(this._workspaces.actor);
-
-        // All the the actors in the window group are completely obscured,
-        // hiding the group holding them while the Overview is displayed greatly
-        // increases performance of the Overview especially when there are many
-        // windows visible.
-        //
-        // If we switched to displaying the actors in the Overview rather than
-        // clones of them, this would obviously no longer be necessary.
-        global.window_group.hide();
-        this._group.show();
-
-        // Create a zoom out effect. First scale the Overview group up and
-        // position it so that the active workspace fills up the whole screen,
-        // then transform the group to its normal dimensions and position.
-        // The opposite transition is used in hide().
-        this._group.scaleX = this._group.scaleY = this.getZoomedInScale();
-        [this._group.x, this._group.y] = this.getZoomedInPosition();
-        let primary = global.get_primary_monitor();
-        Tweener.addTween(this._group,
-                         { x: primary.x,
-                           y: primary.y,
-                           scaleX: 1,
-                           scaleY: 1,
-                           transition: 'easeOutQuad',
-                           time: ANIMATION_TIME,
-                           onComplete: this._showDone,
-                           onCompleteScope: this
-                          });
-
-        // Make Dash fade in so that it doesn't appear to big.
-        this._dash.actor.opacity = 0;
-        Tweener.addTween(this._dash.actor,
-                         { opacity: 255,
-                           transition: 'easeOutQuad',
-                           time: ANIMATION_TIME
-                         });
-
-        this._coverPane.raise_top();
-        this.emit('showing');
-    },
-
-    hide: function() {
-        if (!this.visible || this._hideInProgress)
-            return;
-
-        this.animationInProgress = true;
-        this._hideInProgress = true;
-        if (this._activeDisplayPane != null)
-            this._activeDisplayPane.close();
-        this._workspaces.hide();
-
-        this._addButton.actor.destroy();
-        this._addButton.actor = null;
-        this._addButton = null;
-
-        // Create a zoom in effect by transforming the Overview group so that
-        // the active workspace fills up the whole screen. The opposite
-        // transition is used in show().
-        let scale = this.getZoomedInScale();
-        let [posX, posY] = this.getZoomedInPosition();
-        Tweener.addTween(this._group,
-                         { x: posX,
-                           y: posY,
-                           scaleX: scale,
-                           scaleY: scale,
-                           transition: 'easeOutQuad',
-                           time: ANIMATION_TIME,
-                           onComplete: this._hideDone,
-                           onCompleteScope: this
-                          });
-
-        // Make Dash fade out so that it doesn't appear to big.
-        Tweener.addTween(this._dash.actor,
-                         { opacity: 0,
-                           transition: 'easeOutQuad',
-                           time: ANIMATION_TIME
-                         });
-
-        this._coverPane.raise_top();
-        this.emit('hiding');
-    },
-
-    toggle: function() {
-        if (this.visible)
-            this.hide();
-        else
-            this.show();
-    },
-
-    /**
-     * getWorkspacesForWindow:
-     * @metaWindow: A #MetaWindow
-     *
-     * Returns the Workspaces object associated with the given window.
-     * This method is not be accessible if the overview is not open
-     * and will return %null.
-     */
-    getWorkspacesForWindow: function(metaWindow) {
-        return this._workspaces;
-    },
-
-    /**
-     * activateWindow:
-     * @metaWindow: A #MetaWindow
-     * @time: Event timestamp integer
-     *
-     * Make the given MetaWindow be the focus window, switching
-     * to the workspace it's on if necessary.  This function
-     * should only be used when the Overview is currently active;
-     * outside of that, use the relevant methods on MetaDisplay.
-     */
-    activateWindow: function (metaWindow, time) {
-         this._workspaces.activateWindowFromOverview(metaWindow, time);
-    },
-
-    //// Private methods ////
-
-    _showDone: function() {
-        if (this._hideInProgress)
-            return;
-
-        this.animationInProgress = false;
-        this._coverPane.lower_bottom();
-
-        this.emit('shown');
-    },
-
-    _hideDone: function() {
-        global.window_group.show();
-
-        this._workspaces.destroy();
-        this._workspaces = null;
-
-        this._dash.hide();
-        this._group.hide();
-
-        this.visible = false; 
-        this.animationInProgress = false;
-        this._hideInProgress = false;
-
-        this._coverPane.lower_bottom();
-
-        Main.popModal(this._dash.actor);
-        this.emit('hidden');
-    },
-
-    _addNewWorkspace: function() {
-        global.screen.append_new_workspace(false, global.get_current_time());
-    },
-
-    _acceptNewWorkspaceDrop: function(source, dropActor, x, y, time) {
-        this._addNewWorkspace();
-        return this._workspaces.acceptNewWorkspaceDrop(source, dropActor, x, y, time);
-    }
-};
-Signals.addSignalMethods(Overview.prototype);
-
-function AddWorkspaceButton(buttonSize, buttonX, buttonY, acceptDropCallback) {
-    this._init(buttonSize, buttonX, buttonY, acceptDropCallback);
-}
-
-AddWorkspaceButton.prototype = {
-    _init: function(buttonSize, buttonX, buttonY, acceptDropCallback) {
-        this.actor = new Clutter.Group({ x: buttonX,
-                                         y: buttonY,
-                                         width: global.screen_width - buttonX,
-                                         height: global.screen_height - buttonY,
-                                         reactive: true });
-        this.actor._delegate = this;
-        this._acceptDropCallback = acceptDropCallback;
-
-        let plus = new Clutter.Texture({ x: 0,
-                                         y: 0,
-                                         width: buttonSize,
-                                         height: buttonSize });
-        plus.set_from_file(global.imagedir + 'add-workspace.svg');
-        this.actor.add_actor(plus);
-    },
-
-    // Draggable target interface
-    acceptDrop: function(source, actor, x, y, time) {
-        return this._acceptDropCallback(source, actor, x, y, time);
-    }
-};

js/ui/panel.js

@@ -7,302 +7,123 @@ const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Tweener = imports.ui.tweener;
-const Signals = imports.signals;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
 
-const Calendar = imports.ui.calendar;
+const Button = imports.ui.button;
 const Main = imports.ui.main;
-const StatusMenu = imports.ui.statusMenu;
 
-const PANEL_HEIGHT = 26;
+const PANEL_HEIGHT = 32;
+const TRAY_HEIGHT = PANEL_HEIGHT - 1;
+const SHADOW_HEIGHT = 6;
 
-const DEFAULT_PADDING = 4;
+// The panel has a transparent white background with a gradient.
+const PANEL_TOP_COLOR = new Clutter.Color();
+PANEL_TOP_COLOR.from_pixel(0xffffff99);
+const PANEL_MIDDLE_COLOR = new Clutter.Color();
+PANEL_MIDDLE_COLOR.from_pixel(0xffffff88);
+const PANEL_BOTTOM_COLOR = new Clutter.Color();
+PANEL_BOTTOM_COLOR.from_pixel(0xffffffaa);
 
-const PANEL_ICON_SIZE = 24;
+const SHADOW_COLOR = new Clutter.Color();
+SHADOW_COLOR.from_pixel(0x00000033);
+const TRANSPARENT_COLOR = new Clutter.Color();
+TRANSPARENT_COLOR.from_pixel(0x00000000);
 
-// See comments around _recomputeTraySize
-const TRAY_SPACING = 14;
-const TRAY_SPACING_MIN = 8;
+// Darken (pressed) buttons; lightening has no effect on white backgrounds.
+const PANEL_BUTTON_COLOR = new Clutter.Color();
+PANEL_BUTTON_COLOR.from_pixel(0x00000015);
+const PRESSED_BUTTON_BACKGROUND_COLOR = new Clutter.Color();
+PRESSED_BUTTON_BACKGROUND_COLOR.from_pixel(0x00000030);
+
+const TRAY_PADDING = 0;
+const TRAY_SPACING = 2;
 
 // Used for the tray icon container with gtk pre-2.16, which doesn't
 // fully support tray icon transparency
 const TRAY_BACKGROUND_COLOR = new Clutter.Color();
-TRAY_BACKGROUND_COLOR.from_pixel(0x0b0b0bff);
+TRAY_BACKGROUND_COLOR.from_pixel(0xefefefff);
 const TRAY_BORDER_COLOR = new Clutter.Color();
 TRAY_BORDER_COLOR.from_pixel(0x00000033);
 const TRAY_CORNER_RADIUS = 5;
 const TRAY_BORDER_WIDTH = 0;
 
-const HOT_CORNER_ACTIVATION_TIMEOUT = 0.5;
-
-const STANDARD_TRAY_ICON_ORDER = ['keyboard', 'volume', 'bluetooth', 'network', 'battery']
-const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
-    'bluetooth-applet': 'bluetooth',
-    'gnome-volume-control-applet': 'volume',
-    'nm-applet': 'network',
-    'gnome-power-manager': 'battery'
-};
-
-function AppPanelMenu() {
-    this._init();
-}
-
-AppPanelMenu.prototype = {
-    _init: function() {
-        this._metaDisplay = global.screen.get_display();
-
-        this._focusedApp = null;
-        this._activeSequence = null;
-        this._startupSequences = {};
-
-        this.actor = new St.BoxLayout({ name: 'appMenu' });
-        this._iconBox = new St.Bin({ name: 'appMenuIcon' });
-        this.actor.add(this._iconBox);
-        this._label = new St.Label();
-        this.actor.add(this._label, { expand: true, y_fill: false });
-
-        this._startupBox = new St.BoxLayout();
-        this.actor.add(this._startupBox);
-
-        Main.overview.connect('hiding', Lang.bind(this, function () {
-            this.actor.opacity = 255;
-        }));
-        Main.overview.connect('showing', Lang.bind(this, function () {
-            this.actor.opacity = 192;
-        }));
-
-        let tracker = Shell.WindowTracker.get_default();
-        tracker.connect('notify::focus-app', Lang.bind(this, this._sync));
-        tracker.connect('startup-sequence-changed', Lang.bind(this, this._sync));
-        // For now just resync on all running state changes; this is mainly to handle
-        // cases where the focused window's application changes without the focus
-        // changing.  An example case is how we map Firefox based on the window
-        // title which is a dynamic property.
-        tracker.connect('app-running-changed', Lang.bind(this, this._sync));
-
-        this._sync();
-    },
-
-    _sync: function() {
-        let tracker = Shell.WindowTracker.get_default();
-
-        let focusedApp = tracker.focus_app;
-
-        let lastSequence = null;
-        if (focusedApp == null) {
-            let sequences = tracker.get_startup_sequences();
-            if (sequences.length > 0)
-                lastSequence = sequences[sequences.length - 1];
-        }
-
-        // If the currently focused app hasn't changed and the current
-        // startup sequence hasn't changed, we have nothing to do
-        if (focusedApp == this._focusedApp
-            && ((lastSequence == null && this._activeSequence == null)
-                || (lastSequence != null && this._activeSequence != null
-                    && lastSequence.get_id() == this._activeSequence.get_id())))
-            return;
-
-        this._focusedApp = focusedApp;
-        this._activeSequence = lastSequence;
-
-        if (this._iconBox.child != null)
-            this._iconBox.child.destroy();
-        this._iconBox.hide();
-        this._label.set_text('');
-        if (this._focusedApp != null) {
-            let icon = this._focusedApp.create_icon_texture(PANEL_ICON_SIZE);
-            this._iconBox.set_child(icon);
-            this._iconBox.show();
-            let appName = this._focusedApp.get_name();
-            // Use _set_text to work around http://bugzilla.openedhand.com/show_bug.cgi?id=1851
-            this._label.set_text(appName);
-        } else if (this._activeSequence != null) {
-            let icon = this._activeSequence.create_icon(PANEL_ICON_SIZE);
-            this._iconBox.set_child(icon);
-            this._iconBox.show();
-            this._label.set_text(this._activeSequence.get_name());
-        }
-
-        this.emit('changed');
-    }
-}
-
-Signals.addSignalMethods(AppPanelMenu.prototype);
-
 function Panel() {
     this._init();
 }
 
 Panel.prototype = {
     _init : function() {
+        let global = Shell.Global.get();
 
-        this.actor = new St.BoxLayout({ name: 'panel' });
-        this.actor._delegate = this;
+        // Put the background under the panel within a group.
+        this.actor = new Clutter.Group();
 
-        this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
-        this._centerBox = new St.BoxLayout({ name: 'panelCenter' });
-        this._rightBox = new St.BoxLayout({ name: 'panelRight' });
+        // Create backBox, which contains two boxes, backUpper and backLower,
+        // for the background gradients and one for the shadow. The shadow at
+        // the bottom has a fixed height (packing flag NONE), and the rest of
+        // the height above is divided evenly between backUpper and backLower
+        // (with packing flag EXPAND).
+        let backBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+                                    x: 0,
+                                    y: 0,
+                                    width: global.screen_width,
+                                    height: PANEL_HEIGHT + SHADOW_HEIGHT });
+        let backUpper = global.create_vertical_gradient(PANEL_TOP_COLOR,
+                                                        PANEL_MIDDLE_COLOR);
+        let backLower = global.create_vertical_gradient(PANEL_MIDDLE_COLOR,
+                                                        PANEL_BOTTOM_COLOR);
+        let shadow = global.create_vertical_gradient(SHADOW_COLOR,
+                                                     TRANSPARENT_COLOR);
+        shadow.set_height(SHADOW_HEIGHT + 1);
+        backBox.append(backUpper, Big.BoxPackFlags.EXPAND);
+        backBox.append(backLower, Big.BoxPackFlags.EXPAND);
+        backBox.append(shadow, Big.BoxPackFlags.NONE);
+        this.actor.add_actor(backBox);
 
-        /* This box container ensures that the centerBox is positioned in the *absolute*
-         * center, but can be pushed aside if necessary. */
-        this._boxContainer = new Shell.GenericContainer();
-        this.actor.add(this._boxContainer, { expand: true });
-        this._boxContainer.add_actor(this._leftBox);
-        this._boxContainer.add_actor(this._centerBox);
-        this._boxContainer.add_actor(this._rightBox);
-        this._boxContainer.connect('get-preferred-width', Lang.bind(this, function(box, forHeight, alloc) {
-            let children = box.get_children();
-            for (let i = 0; i < children.length; i++) {
-                let [childMin, childNatural] = children[i].get_preferred_width(forHeight);
-                alloc.min_size += childMin;
-                alloc.natural_size += childNatural;
-            }
-        }));
-        this._boxContainer.connect('get-preferred-height', Lang.bind(this, function(box, forWidth, alloc) {
-            let children = box.get_children();
-            for (let i = 0; i < children.length; i++) {
-                let [childMin, childNatural] = children[i].get_preferred_height(forWidth);
-                if (childMin > alloc.min_size)
-                    alloc.min_size = childMin;
-                if (childNatural > alloc.natural_size)
-                    alloc.natural_size = childNatural;
-            }
-        }));
-        this._boxContainer.connect('allocate', Lang.bind(this, function(container, box, flags) {
-            let allocWidth = box.x2 - box.x1;
-            let allocHeight = box.y2 - box.y1;
-            let [leftMinWidth, leftNaturalWidth] = this._leftBox.get_preferred_width(-1);
-            let [centerMinWidth, centerNaturalWidth] = this._centerBox.get_preferred_width(-1);
-            let [rightMinWidth, rightNaturalWidth] = this._rightBox.get_preferred_width(-1);
-            let leftWidth, centerWidth, rightWidth;
-            if (allocWidth < (leftNaturalWidth + centerNaturalWidth + rightNaturalWidth)) {
-                leftWidth = leftMinWidth;
-                centerWidth = centerMinWidth;
-                rightWidth = rightMinWidth;
-            } else {
-                leftWidth = leftNaturalWidth;
-                centerWidth = centerNaturalWidth;
-                rightWidth = rightNaturalWidth;
-            }
+        let box = new Big.Box({ x: 0,
+                                y: 0,
+                                height: PANEL_HEIGHT,
+                                width: global.screen_width,
+                                orientation: Big.BoxOrientation.HORIZONTAL,
+                                spacing: 4 });
 
-            let x;
-            let childBox = new Clutter.ActorBox();
-            childBox.x1 = box.x1;
-            childBox.y1 = box.y1;
-            childBox.x2 = x = childBox.x1 + leftWidth;
-            childBox.y2 = box.y2;
-            this._leftBox.allocate(childBox, flags);
+        this.button = new Button.Button("Activities", PANEL_BUTTON_COLOR, PRESSED_BUTTON_BACKGROUND_COLOR, true, null, PANEL_HEIGHT);
 
-            let centerNaturalX = Math.floor((box.x2 - box.x1) / 2 - (centerWidth / 2));
-            /* Check left side */
-            if (x < centerNaturalX) {
-                /* We didn't overflow the left, use the natural. */
-                x = centerNaturalX;
-            }
-            /* Check right side */
-            if (x + centerWidth > (box.x2 - rightWidth)) {
-                x = box.x2 - rightWidth - centerWidth;
-            }
-            childBox = new Clutter.ActorBox();
-            childBox.x1 = x;
-            childBox.y1 = box.y1;
-            childBox.x2 = x = childBox.x1 + centerWidth;
-            childBox.y2 = box.y2;
-            this._centerBox.allocate(childBox, flags);
+        box.append(this.button.button, Big.BoxPackFlags.NONE);
 
-            childBox = new Clutter.ActorBox();
-            childBox.x1 = box.x2 - rightWidth;
-            childBox.y1 = box.y1;
-            childBox.x2 = box.x2;
-            childBox.y2 = box.y2;
-            this._rightBox.allocate(childBox, flags);
-        }));
+        let statusbox = new Big.Box();
+        let statusmenu = this._statusmenu = new Shell.StatusMenu();
+        statusbox.append(this._statusmenu, Big.BoxPackFlags.NONE);
+        let statusbutton = new Button.Button(statusbox, PANEL_BUTTON_COLOR, PRESSED_BUTTON_BACKGROUND_COLOR,
+                                             true, null, PANEL_HEIGHT);
+        statusbutton.button.connect('button-press-event', function (b, e) {
+            statusmenu.toggle(e);
+            return false;
+        });
+        box.append(statusbutton.button, Big.BoxPackFlags.END);
+        // We get a deactivated event when the popup disappears
+        this._statusmenu.connect('deactivated', function (sm) {
+            statusbutton.release();
+        });
 
-        /* Button on the left side of the panel. */
-        /* Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". */
-        let label = new St.Label({ text: _("Activities") });
-        this.button = new St.Clickable({ name: 'panelActivities',
-                                          style_class: 'panel-button',
-                                          reactive: true });
-        this.button.set_child(label);
-        this.button.height = PANEL_HEIGHT;
-
-        this._leftBox.add(this.button);
-
-        // We use this flag to mark the case where the user has entered the
-        // hot corner and has not left both the hot corner and a surrounding
-        // guard area (the "environs"). This avoids triggering the hot corner
-        // multiple times due to an accidental jitter.
-        this._hotCornerEntered = false;
-
-        this._hotCornerEnvirons = new Clutter.Rectangle({ x: 0,
-                                                          y: 0,
-                                                          width: 3,
-                                                          height: 3,
-                                                          opacity: 0,
-                                                          reactive: true });
-
-        this._hotCorner = new Clutter.Rectangle({ x: 0,
-                                                  y: 0,
-                                                  width: 1,
-                                                  height: 1,
-                                                  opacity: 0,
-                                                  reactive: true });
-
-        this._hotCornerActivationTime = 0;
-
-        this._hotCornerEnvirons.connect('leave-event',
-                                        Lang.bind(this, this._onHotCornerEnvironsLeft));
-        // Clicking on the hot corner environs should result in the same bahavior
-        // as clicking on the hot corner.
-        this._hotCornerEnvirons.connect('button-release-event',
-                                        Lang.bind(this, this._onHotCornerClicked));
-
-        // In addition to being triggered by the mouse enter event, the hot corner
-        // can be triggered by clicking on it. This is useful if the user wants to 
-        // undo the effect of triggering the hot corner once in the hot corner.
-        this._hotCorner.connect('enter-event',
-                                Lang.bind(this, this._onHotCornerEntered));
-        this._hotCorner.connect('button-release-event',
-                                Lang.bind(this, this._onHotCornerClicked));
-        this._hotCorner.connect('leave-event',
-                                Lang.bind(this, this._onHotCornerLeft));
-
-        this._leftBox.add(this._hotCornerEnvirons);
-        this._leftBox.add(this._hotCorner);
-
-        let appMenu = new AppPanelMenu();
-        this._leftBox.add(appMenu.actor);
-
-        /* center */
-
-        let clockButton = new St.Button({ style_class: "panel-button",
-                                          toggle_mode: true,
-                                          x_fill: true,
-                                          y_fill: true });
-        this._centerBox.add(clockButton, { y_fill: false });
-        clockButton.connect('clicked', Lang.bind(this, this._toggleCalendar));
-
-        this._clock = new St.Label();
-        clockButton.set_child(this._clock);
-
-        this._calendarPopup = null;
-
-        /* right */
+        this._clock = new Clutter.Text({ font_name: "Sans Bold 16px",
+                                         text: "" });
+        let pad = (PANEL_HEIGHT - this._clock.height) / 2;
+        let clockbox = new Big.Box({ padding_top: pad,
+                                     padding_bottom: pad,
+                                     padding_left: 4,
+                                     padding_right: 4 });
+        clockbox.append(this._clock, Big.BoxPackFlags.NONE);
+        box.append(clockbox, Big.BoxPackFlags.END);
 
         // The tray icons live in trayBox within trayContainer.
         // The trayBox is hidden when there are no tray icons.
         let trayContainer = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                          y_align: Big.BoxAlignment.CENTER });
-        this._rightBox.add(trayContainer);
+                                          y_align: Big.BoxAlignment.START });
+        box.append(trayContainer, Big.BoxPackFlags.END);
         let trayBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                    height: PANEL_ICON_SIZE,
+                                    height: TRAY_HEIGHT,
+                                    padding: TRAY_PADDING,
                                     spacing: TRAY_SPACING });
-        this._trayBox = trayBox;
 
         // gtk+ < 2.16 doesn't have fully-working icon transparency,
         // so we want trayBox to be opaque in that case (the icons
@@ -318,116 +139,43 @@ Panel.prototype = {
         trayContainer.append(trayBox, Big.BoxPackFlags.NONE);
 
         this._traymanager = new Shell.TrayManager({ bg_color: TRAY_BACKGROUND_COLOR });
-        this._traymanager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
+        this._traymanager.connect('tray-icon-added',
+            function(o, icon) {
+                trayBox.append(icon, Big.BoxPackFlags.NONE);
+
+                // Make sure the trayBox is shown.
+                trayBox.show();
+            });
         this._traymanager.connect('tray-icon-removed',
-            Lang.bind(this, function(o, icon) {
+            function(o, icon) {
                 trayBox.remove_actor(icon);
 
                 if (trayBox.get_children().length == 0)
                     trayBox.hide();
-                this._recomputeTraySize();
-            }));
+            });
         this._traymanager.manage_stage(global.stage);
 
-        let statusmenu = this._statusmenu = new StatusMenu.StatusMenu();
-        let statusbutton = new St.Clickable({ name: 'panelStatus',
-                                               style_class: 'panel-button',
-                                               reactive: true });
-        statusbutton.set_child(statusmenu.actor);
-        statusbutton.height = PANEL_HEIGHT;
-        statusbutton.connect('clicked', function (b, event) {
-            statusmenu.toggle(event);
-            // The statusmenu might not pop up if it couldn't get a pointer grab
-            if (statusmenu.isActive())
-                statusbutton.active = true;
-            return true;
-        });
-        this._rightBox.add(statusbutton);
-        // We get a deactivated event when the popup disappears
-        this._statusmenu.connect('deactivated', function (sm) {
-            statusbutton.active = false;
-        });
-
-        // TODO: decide what to do with the rest of the panel in the Overview mode (make it fade-out, become non-reactive, etc.)
-        // We get into the Overview mode on button-press-event as opposed to button-release-event because eventually we'll probably
-        // have the Overview act like a menu that allows the user to release the mouse on the activity the user wants
+        // TODO: decide what to do with the rest of the panel in the overlay mode (make it fade-out, become non-reactive, etc.)
+        // We get into the overlay mode on button-press-event as opposed to button-release-event because eventually we'll probably
+        // have the overlay act like a menu that allows the user to release the mouse on the activity the user wants
         // to switch to.
-        this.button.connect('clicked', Lang.bind(this, function(b, event) {
-            if (!Main.overview.animationInProgress) {
-                this._maybeToggleOverviewOnClick();
-                return true;
-            } else {
-                return false;
-            }
-        }));
-        // In addition to pressing the button, the Overview can be entered and exited by other means, such as
-        // pressing the System key, Alt+F1 or Esc. We want the button to be pressed in when the Overview is entered
+        this.button.button.connect('button-press-event',
+                                   Lang.bind(Main.overlay, Main.overlay.toggle));
+        // In addition to pressing the button, the overlay can be entered and exited by other means, such as
+        // pressing the System key, Alt+F1 or Esc. We want the button to be pressed in when the overlay is entered
         // and to be released when it is exited regardless of how it was triggered.
-        Main.overview.connect('showing', Lang.bind(this, function() {
-            this.button.active = true;
-        }));
-        Main.overview.connect('hiding', Lang.bind(this, function() {
-            this.button.active = false;
-        }));
+        Main.overlay.connect('showing', Lang.bind(this.button, this.button.pressIn));
+        Main.overlay.connect('hiding', Lang.bind(this.button, this.button.release));
 
-        Main.chrome.addActor(this.actor, { visibleInOverview: true });
+        this.actor.add_actor(box);
+
+        Main.chrome.addActor(this.actor, box);
+        Main.chrome.setVisibleInOverlay(this.actor, true);
 
         // Start the clock
         this._updateClock();
     },
 
-    startupAnimation: function() {
-        this.actor.y = -this.actor.height;
-        Tweener.addTween(this.actor,
-                         { y: 0,
-                           time: 0.2,
-                           transition: "easeOutQuad"
-                         });
-    },
-
-    _onTrayIconAdded: function(o, icon, wmClass) {
-        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
-        if (!role) {
-            // Unknown icons go first in undefined order
-            this._trayBox.prepend(icon, Big.BoxPackFlags.NONE);
-        } else {
-            icon._role = role;
-            // Figure out the index in our well-known order for this icon
-            let position = STANDARD_TRAY_ICON_ORDER.indexOf(role);
-            icon._rolePosition = position;
-            let children = this._trayBox.get_children();
-            let i;
-            // Walk children backwards, until we find one that isn't
-            // well-known, or one where we should follow
-            for (i = children.length - 1; i >= 0; i--) {
-                let rolePosition = children[i]._rolePosition;
-                if (!rolePosition || position > rolePosition) {
-                    this._trayBox.insert_after(icon, children[i], Big.BoxPackFlags.NONE);
-                    break;
-                }
-            }
-            if (i == -1) {
-                // If we didn't find a position, we must be first
-                this._trayBox.prepend(icon, Big.BoxPackFlags.NONE);
-            }
-        }
-
-        // Make sure the trayBox is shown.
-        this._trayBox.show();
-        this._recomputeTraySize();
-    },
-
-    // By default, tray icons have a spacing of TRAY_SPACING.  However this
-    // starts to fail if we have too many as can sadly happen; just jump down
-    // to a spacing of 8 if we're over 6.
-    // http://bugzilla.gnome.org/show_bug.cgi?id=590495
-    _recomputeTraySize: function () {
-        if (this._trayBox.get_children().length > 6)
-            this._trayBox.spacing = TRAY_SPACING_MIN;
-        else
-            this._trayBox.spacing = TRAY_SPACING;
-    },
-
     _updateClock: function() {
         let displayDate = new Date();
         let msecRemaining = 60000 - (1000 * displayDate.getSeconds() +
@@ -436,107 +184,8 @@ Panel.prototype = {
             displayDate.setMinutes(displayDate.getMinutes() + 1);
             msecRemaining += 60000;
         }
-        /* Translators: This is a time format.  */
-        this._clock.set_text(displayDate.toLocaleFormat(_("%a %l:%M %p")));
+        this._clock.set_text(displayDate.toLocaleFormat("%a %b %e, %l:%M %p"));
         Mainloop.timeout_add(msecRemaining, Lang.bind(this, this._updateClock));
         return false;
-    },
-
-    _toggleCalendar: function(clockButton) {
-        if (clockButton.checked) {
-            if (this._calendarPopup == null)
-                this._calendarPopup = new CalendarPopup();
-            this._calendarPopup.show();
-        } else {
-            this._calendarPopup.hide();
-        }
-    },
-
-    _onHotCornerEntered : function() {
-        if (!this._hotCornerEntered) {
-            this._hotCornerEntered = true;
-            if (!Main.overview.animationInProgress) {
-                this._hotCornerActivationTime = Date.now() / 1000;
-                Main.overview.toggle();
-            }
-        }
-        return false;
-    },
-
-    _onHotCornerClicked : function() {
-         if (!Main.overview.animationInProgress) {
-             this._maybeToggleOverviewOnClick();
-         }
-         return false;
-    },
-
-    _onHotCornerLeft : function(actor, event) {
-        if (event.get_related() != this._hotCornerEnvirons) {
-            this._hotCornerEntered = false;
-        }
-        return false;
-    },
-
-    _onHotCornerEnvironsLeft : function(actor, event) {
-        if (event.get_related() != this._hotCorner) {
-            this._hotCornerEntered = false;
-        }
-        return false;
-    },
-
-    // Toggles the overview unless this is the first click on the Activities button within the HOT_CORNER_ACTIVATION_TIMEOUT time
-    // of the hot corner being triggered. This check avoids opening and closing the overview if the user both triggered the hot corner
-    // and clicked the Activities button.
-    _maybeToggleOverviewOnClick: function() {
-        if (this._hotCornerActivationTime == 0 || Date.now() / 1000 - this._hotCornerActivationTime > HOT_CORNER_ACTIVATION_TIMEOUT)
-            Main.overview.toggle();
-        this._hotCornerActivationTime = 0;
-    }
-};
-
-function CalendarPopup() {
-    this._init();
-}
-
-CalendarPopup.prototype = {
-    _init: function() {
-        let panelActor = Main.panel.actor;
-
-        this.actor = new St.BoxLayout({ name: 'calendarPopup' });
-
-        this.calendar = new Calendar.Calendar();
-        this.actor.add(this.calendar.actor);
-
-        Main.chrome.addActor(this.actor, { visibleInOverview: true,
-                                           affectsStruts: false });
-        this.actor.y = (panelActor.y + panelActor.height - this.actor.height);
-    },
-
-    show: function() {
-        let panelActor = Main.panel.actor;
-
-        // Reset the calendar to today's date
-        this.calendar.setDate(new Date());
-
-        this.actor.x = Math.round(panelActor.x + (panelActor.width - this.actor.width) / 2);
-        this.actor.lower(panelActor);
-        this.actor.show();
-        Tweener.addTween(this.actor,
-                         { y: panelActor.y + panelActor.height,
-                           time: 0.2,
-                           transition: "easeOutQuad"
-                         });
-    },
-
-    hide: function() {
-        let panelActor = Main.panel.actor;
-
-        Tweener.addTween(this.actor,
-                         { y: panelActor.y + panelActor.height - this.actor.height,
-                           time: 0.2,
-                           transition: "easeOutQuad",
-                           onComplete: function() { this.actor.hide(); },
-                           onCompleteScope: this
-                         });
     }
 };

js/ui/placeDisplay.js

@@ -1,574 +0,0 @@
-/* -*- 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;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Signals = imports.signals;
-const St = imports.gi.St;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const DND = imports.ui.dnd;
-const Main = imports.ui.main;
-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;
-
-/**
- * Represents a place object, which is most normally a bookmark entry,
- * a mount/volume, or a special place like the Home Folder, Computer, and Network.
- *
- * @name: String title
- * @iconFactory: A JavaScript callback which will create an icon texture given a size parameter
- * @launch: A JavaScript callback to launch the entry
- */
-function PlaceInfo(id, name, iconFactory, launch) {
-    this._init(id, name, iconFactory, launch);
-}
-
-PlaceInfo.prototype = {
-    _init: function(id, name, iconFactory, launch) {
-        this.id = id;
-        this.name = name;
-        this._lowerName = name.toLowerCase();
-        this.iconFactory = iconFactory;
-        this.launch = launch;
-    },
-
-    matchTerms: function(terms) {
-        let mtype = Search.MatchType.NONE;
-        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;
-        }
-        return mtype;
-    },
-
-    isRemovable: function() {
-        return false;
-    }
-}
-
-function PlaceDeviceInfo(mount) {
-    this._init(mount);
-}
-
-PlaceDeviceInfo.prototype = {
-    __proto__: PlaceInfo.prototype,
-
-    _init: function(mount) {
-        this._mount = mount;
-        this.name = mount.get_name();
-        this._lowerName = this.name.toLowerCase();
-        this.id = "mount:" + mount.get_root().get_uri();
-    },
-
-    iconFactory: function(size) {
-        let icon = this._mount.get_icon();
-        return Shell.TextureCache.get_default().load_gicon(icon, size);
-    },
-
-    launch: function() {
-        Gio.app_info_launch_default_for_uri(this._mount.get_root().get_uri(),
-                                            global.create_app_launch_context());
-    },
-
-    isRemovable: function() {
-        return this._mount.can_unmount();
-    },
-
-    remove: function() {
-        if (!this.isRemovable())
-            return;
-
-        this._mount.unmount(0, null, Lang.bind(this, this._removeFinish), null);
-    },
-
-    _removeFinish: function(o, res, data) {
-        this._mount.unmount_finish(res);
-    }
-}
-
-
-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 = false;
-
-        let homeFile = Gio.file_new_for_path (GLib.get_home_dir());
-        let homeUri = homeFile.get_uri();
-        let homeLabel = Shell.util_get_label_for_uri (homeUri);
-        let homeIcon = Shell.util_get_icon_for_uri (homeUri);
-        this._home = new PlaceInfo('special:home', homeLabel,
-            function(size) {
-                return Shell.TextureCache.get_default().load_gicon(homeIcon, size);
-            },
-            function() {
-                Gio.app_info_launch_default_for_uri(homeUri, global.create_app_launch_context());
-            });
-
-        let desktopPath = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
-        let desktopFile = Gio.file_new_for_path (desktopPath);
-        let desktopUri = desktopFile.get_uri();
-        let desktopLabel = Shell.util_get_label_for_uri (desktopUri);
-        let desktopIcon = Shell.util_get_icon_for_uri (desktopUri);
-        this._desktopMenu = new PlaceInfo('special:desktop', desktopLabel,
-            function(size) {
-                return Shell.TextureCache.get_default().load_gicon(desktopIcon, size);
-            },
-            function() {
-                Gio.app_info_launch_default_for_uri(desktopUri, global.create_app_launch_context());
-            });
-
-        this._connect = new PlaceInfo('special:connect', _("Connect to..."),
-            function (size) {
-                return Shell.TextureCache.get_default().load_icon_name("applications-internet", size);
-            },
-            function () {
-                new Shell.Process({ args: ['nautilus-connect-server'] }).run();
-            });
-
-        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);
-
-        if (!this._isDesktopHome)
-            this._defaultPlaces.push(this._desktopMenu);
-
-        if (this._network)
-            this._defaultPlaces.push(this._network);
-
-        this._defaultPlaces.push(this._connect);
-
-        /*
-        * Show devices, code more or less ported from nautilus-places-sidebar.c
-        */
-        this._volumeMonitor = Gio.VolumeMonitor.get();
-        this._volumeMonitor.connect('volume-added', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('volume-removed',Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('volume-changed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-added', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-removed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-changed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-connected', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-disconnected', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
-        this._updateDevices();
-
-        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;
-        monitor.connect('changed', Lang.bind(this, function () {
-            if (this._bookmarkTimeoutId > 0)
-                return;
-            /* Defensive event compression */
-            this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
-                this._bookmarkTimeoutId = 0;
-                this._reloadBookmarks();
-                return false;
-            }));
-        }));
-
-        this._reloadBookmarks();
-        this._updateDesktopMenuVisibility();
-
-        gconf.connect('changed::' + DESKTOP_IS_HOME_KEY, Lang.bind(this, this._updateDesktopMenuVisibility));
-
-    },
-
-    _updateDevices: function() {
-        this._mounts = [];
-
-        /* first go through all connected drives */
-        let drives = this._volumeMonitor.get_connected_drives();
-        for (let i = 0; i < drives.length; i++) {
-            let volumes = drives[i].get_volumes();
-            for(let j = 0; j < volumes.length; j++) {
-                let mount = volumes[j].get_mount();
-                if(mount != null) {
-                    this._addMount(mount);
-                }
-            }
-        }
-
-        /* add all volumes that is not associated with a drive */
-        let volumes = this._volumeMonitor.get_volumes();
-        for(let i = 0; i < volumes.length; i++) {
-            if(volumes[i].get_drive() != null)
-                continue;
-
-            let mount = volumes[i].get_mount();
-            if(mount != null) {
-                this._addMount(mount);
-            }
-        }
-
-        /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
-        let mounts = this._volumeMonitor.get_mounts();
-        for(let i = 0; i < mounts.length; i++) {
-            if(mounts[i].is_shadowed())
-                continue;
-
-            if(mounts[i].get_volume())
-                continue;
-
-            this._addMount(mounts[i]);
-        }
-
-        /* We emit two signals, one for a generic 'all places' update
-         * and the other for one specific to mounts. We do this because
-         * clients like PlaceDisplay may only care about places in general
-         * being updated while clients like DashPlaceDisplay care which
-         * specific type of place got updated.
-         */
-        this.emit('mounts-updated');
-        this.emit('places-updated');
-
-    },
-
-    _reloadBookmarks: function() {
-
-        this._bookmarks = [];
-
-        if (!GLib.file_test(this._bookmarksPath, GLib.FileTest.EXISTS))
-            return;
-
-        let [success, bookmarksContent, len] = GLib.file_get_contents(this._bookmarksPath);
-
-        if (!success)
-            return;
-
-        let bookmarks = bookmarksContent.split('\n');
-
-        let bookmarksToLabel = {};
-        let bookmarksOrder = [];
-        for (let i = 0; i < bookmarks.length; i++) {
-            let bookmarkLine = bookmarks[i];
-            let components = bookmarkLine.split(' ');
-            let bookmark = components[0];
-            if (bookmark in bookmarksToLabel)
-                continue;
-            let label = null;
-            if (components.length > 1)
-                label = components.slice(1).join(' ');
-            bookmarksToLabel[bookmark] = label;
-            bookmarksOrder.push(bookmark);
-        }
-
-        for (let i = 0; i < bookmarksOrder.length; i++) {
-            let bookmark = bookmarksOrder[i];
-            let label = bookmarksToLabel[bookmark];
-            let file = Gio.file_new_for_uri(bookmark);
-            if (!file.query_exists(null))
-                continue;
-            if (label == null)
-                label = Shell.util_get_label_for_uri(bookmark);
-            if (label == null)
-                continue;
-            let icon = Shell.util_get_icon_for_uri(bookmark);
-
-            let item = new PlaceInfo('bookmark:' + bookmark, label,
-                function(size) {
-                    return Shell.TextureCache.get_default().load_gicon(icon, size);
-                },
-                function() {
-                    Gio.app_info_launch_default_for_uri(bookmark, global.create_app_launch_context());
-                });
-            this._bookmarks.push(item);
-        }
-
-        /* See comment in _updateDevices for explanation why there are two signals. */
-        this.emit('bookmarks-updated');
-        this.emit('places-updated');
-    },
-
-    _updateDesktopMenuVisibility: function() {
-        let gconf = Shell.GConf.get_default();
-        this._isDesktopHome = gconf.get_boolean(DESKTOP_IS_HOME_KEY);
-
-        /* 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);
-    },
-
-    getAllPlaces: function () {
-        return this.getDefaultPlaces().concat(this.getBookmarks(), this.getMounts());
-    },
-
-    getDefaultPlaces: function () {
-        return this._defaultPlaces;
-    },
-
-    getBookmarks: function () {
-        return this._bookmarks;
-    },
-
-    getMounts: function () {
-        return this._mounts;
-    },
-
-    _lookupById: function(sourceArray, id) {
-        for (let i = 0; i < sourceArray.length; i++) {
-            let place = sourceArray[i];
-            if (place.id == id)
-                return place;
-        }
-        return null;
-    },
-
-    lookupPlaceById: function(id) {
-        let colonIdx = id.indexOf(':');
-        let type = id.substring(0, colonIdx);
-        let sourceArray = null;
-        if (type == 'special')
-            sourceArray = this._defaultPlaces;
-        else if (type == 'mount')
-            sourceArray = this._mounts;
-        else if (type == 'bookmark')
-            sourceArray = this._bookmarks;
-        return this._lookupById(sourceArray, id);
-    }
-};
-
-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 Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   spacing: 4 });
-        let text = new St.Button({ style_class: 'places-item',
-                                   label: info.name,
-                                   x_align: St.Align.START });
-        text.connect('clicked', Lang.bind(this, this._onClicked));
-        let iconBox = new St.Bin({ child: this._icon, reactive: true });
-        iconBox.connect('button-release-event',
-                        Lang.bind(this, this._onClicked));
-        this.actor.append(iconBox, Big.BoxPackFlags.NONE);
-        this.actor.append(text, Big.BoxPackFlags.EXPAND);
-
-        if (info.isRemovable()) {
-            let removeIcon = Shell.TextureCache.get_default().load_icon_name ('media-eject', PLACES_ICON_SIZE);
-            let removeIconBox = new St.Button({ child: removeIcon,
-                                                reactive: true });
-            this.actor.append(removeIconBox, Big.BoxPackFlags.NONE);
-            removeIconBox.connect('clicked',
-                                  Lang.bind(this, function() {
-                                                  this._info.remove();
-                                            }));
-        }
-
-        this.actor._delegate = this;
-        let draggable = DND.makeDraggable(this.actor);
-    },
-
-    _onClicked: function(b) {
-        this._info.launch();
-        Main.overview.hide();
-    },
-
-    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();
-}
-
-PlaceSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
-
-    _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("PLACES"));
-    },
-
-    getResultMeta: function(resultId) {
-        let placeInfo = Main.placesManager.lookupPlaceById(resultId);
-        if (!placeInfo)
-            return null;
-        return { 'id': resultId,
-                 'name': placeInfo.name,
-                 'icon': placeInfo.iconFactory(Search.RESULT_ICON_SIZE) };
-    },
-
-    activateResult: function(id) {
-        let placeInfo = Main.placesManager.lookupPlaceById(id);
-        placeInfo.launch();
-    },
-
-    _compareResultMeta: function (idA, idB) {
-        let infoA = Main.placesManager.lookupPlaceById(idA);
-        let infoB = Main.placesManager.lookupPlaceById(idB);
-        return infoA.name.localeCompare(infoB.name);
-    },
-
-    _searchPlaces: function(places, terms) {
-        let multipleResults = [];
-        let prefixResults = [];
-        let substringResults = [];
-
-        terms = terms.map(String.toLowerCase);
-
-        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);
-            else if (mtype == Search.MatchType.PREFIX)
-                prefixResults.push(place.id);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringResults.push(place.id);
-        }
-        multipleResults.sort(this._compareResultMeta);
-        prefixResults.sort(this._compareResultMeta);
-        substringResults.sort(this._compareResultMeta);
-        return multipleResults.concat(prefixResults.concat(substringResults));
-    },
-
-    getInitialResultSet: function(terms) {
-        let places = Main.placesManager.getAllPlaces();
-        return this._searchPlaces(places, terms);
-    },
-
-    getSubsearchResultSet: function(previousResults, terms) {
-        let places = previousResults.map(function (id) { return Main.placesManager.lookupPlaceById(id); });
-        return this._searchPlaces(places, terms);
-    }
-}

js/ui/runDialog.js

@@ -1,168 +1,22 @@
 /* -*- 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 Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
 
-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 
+const OVERLAY_COLOR = new Clutter.Color();
+OVERLAY_COLOR.from_pixel(0x00000044);
+
 const BOX_BACKGROUND_COLOR = new Clutter.Color();
 BOX_BACKGROUND_COLOR.from_pixel(0x000000cc);
 
 const BOX_TEXT_COLOR = new Clutter.Color();
 BOX_TEXT_COLOR.from_pixel(0xffffffff);
 
-const DIALOG_WIDTH = 320;
-const DIALOG_PADDING = 6;
-const ICON_SIZE = 24;
-const ICON_BOX_SIZE = 36;
-const MAX_FILE_DELETED_BEFORE_INVALID = 10;
-
-function CommandCompleter() {
-    this._init();
-}
-
-CommandCompleter.prototype = {
-    _init : function() {
-        this._changedCount = 0;
-        this._paths = GLib.getenv('PATH').split(':');
-        this._valid = false;
-        this._updateInProgress = false;
-        this._childs = new Array(this._paths.length);
-        this._monitors = new Array(this._paths.length);
-        for (let i = 0; i < this._paths.length; i++) {
-            this._childs[i] = [];
-            let file = Gio.file_new_for_path(this._paths[i]);
-            let info = file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FileQueryInfoFlags.NONE, null);
-
-            if (info.get_attribute_uint32(Gio.FILE_ATTRIBUTE_STANDARD_TYPE) != Gio.FileType.DIRECTORY)
-                continue;
-
-            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._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), null);
-    },
-
-    _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), null);
-        } else {
-            this._enumerator.close(null);
-            this._enumerator = null;
-            this._update(this._i + 1);
-        }
-    },
-
-    update : function() {
-        if (this._valid)
-            return;
-        this._update(0);
-    },
-
-    _update : function(i) {
-        if (i == 0 && this._updateInProgress)
-            return;
-        this._updateInProgress = true;
-        this._changedCount = 0;
-        this._i = i;
-        if (i >= this._paths.length) {
-            this._valid = true;
-            this._updateInProgress = false;
-            return;
-        }
-        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), null);
-    },
-
-    _onChanged : function(m, f, of, type) {
-        if (!this._valid)
-            return;
-        let path = f.get_parent().get_path();
-        let k = undefined;
-        for (let i = 0; i < this._paths.length; i++) {
-            if (this._paths[i] == path)
-                k = i;
-        }
-        if (k === undefined) {
-            return;
-        }
-        if (type == Gio.FileMonitorEvent.CREATED) {
-            this._childs[k].push(f.get_basename());
-        }
-        if (type == Gio.FileMonitorEvent.DELETED) {
-            this._changedCount++;
-            if (this._changedCount > MAX_FILE_DELETED_BEFORE_INVALID) {
-                this._valid = false;
-            }
-            let name = f.get_basename();
-            this._childs[k] = this._childs[k].filter(function(e) {
-                return e != name;
-            });
-        }
-        if (type == Gio.FileMonitorEvent.UNMOUNTED) {
-            this._childs[k] = [];
-        }
-    },
-
-    getCompletion: function(text) {
-        let common = "";
-        let notInit = true;
-        if (!this._valid) {
-            this._update(0);
-            return common;
-        }
-        function _getCommon(s1, s2) {
-            let k = 0;
-            for (; k < s1.length && k < s2.length; k++) {
-                if (s1[k] != s2[k])
-                    break;
-            }
-            if (k == 0)
-                return "";
-            return s1.substr(0, k);
-        }
-        function _hasPrefix(s1, prefix) {
-            return s1.indexOf(prefix) == 0;
-        }
-        for (let i = 0; i < this._childs.length; i++) {
-            for (let k = 0; k < this._childs[i].length; k++) {
-                if (!_hasPrefix(this._childs[i][k], text))
-                    continue;
-                if (notInit) {
-                    common = this._childs[i][k];
-                    notInit = false;
-                }
-                common = _getCommon(common, this._childs[i][k]);
-            }
-        }
-        if (common.length)
-            return common.substr(text.length);
-        return common;
-    }
-};
+const BOX_WIDTH = 320;
+const BOX_HEIGHT = 56;
 
 function RunDialog() {
     this._init();
@@ -170,223 +24,114 @@ function RunDialog() {
 
 RunDialog.prototype = {
     _init : function() {
-        this._isOpen = false;
-
-        let gconf = Shell.GConf.get_default();
-        gconf.connect('changed::development_tools', Lang.bind(this, function () {
-            this._enableInternalCommands = gconf.get_boolean('development_tools');
-        }));
-        this._enableInternalCommands = gconf.get_boolean('development_tools');
-
-        this._internalCommands = { 'lg':
-                                   Lang.bind(this, function() {
-                                       Main.createLookingGlass().open();
-                                   }),
-
-                                   'r': Lang.bind(this, function() {
-                                       global.reexec_self();
-                                   }),
-
-                                   // Developer brain backwards compatibility
-                                   'restart': Lang.bind(this, function() {
-                                       global.reexec_self();
-                                   }),
-
-                                   'debugexit': Lang.bind(this, function() {
-                                       Meta.exit(Meta.ExitCode.ERROR);
-                                   })
-                                 };
+        let global = Shell.Global.get();
 
         // 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,
-                                          width: global.screen_width,
-                                          height: global.screen_height });
+        this._group = new Clutter.Group({ visible: false });
         global.stage.add_actor(this._group);
 
-        let lightbox = new Lightbox.Lightbox(this._group);
+        this._overlay = new Clutter.Rectangle({ color: OVERLAY_COLOR,
+                                                width: global.screen_width,
+                                                height: global.screen_height,
+                                                border_width: 0,
+                                                reactive: true });
+        this._group.add_actor(this._overlay);
 
-        this._boxH = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   x_align: Big.BoxAlignment.CENTER,
-                                   y_align: Big.BoxAlignment.CENTER });
+        let boxGroup = new Clutter.Group();
+        boxGroup.set_position((global.screen_width - BOX_WIDTH) / 2,
+                              (global.screen_height - BOX_HEIGHT) / 2);
+        this._group.add_actor(boxGroup);
 
-        this._group.add_actor(this._boxH);
-        lightbox.highlight(this._boxH);
-
-        let boxV = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                 y_align: Big.BoxAlignment.CENTER });
-
-        this._boxH.append(boxV, Big.BoxPackFlags.NONE);
-
-
-        let dialogBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                      background_color: BOX_BACKGROUND_COLOR,
-                                      corner_radius: 4,
-                                      reactive: false,
-                                      padding: DIALOG_PADDING,
-                                      width: DIALOG_WIDTH });
-
-        this._boxH.append(dialogBox, Big.BoxPackFlags.NONE);
+        let box = new Clutter.Rectangle({ color: BOX_BACKGROUND_COLOR,
+                                          reactive: false,
+                                          width: BOX_WIDTH,
+                                          height: BOX_HEIGHT,
+                                          border_width: 0 });
+        boxGroup.add_actor(box);
 
         let label = new Clutter.Text({ color: BOX_TEXT_COLOR,
                                        font_name: '18px Sans',
-                                       text: _("Please enter a command:") });
-
-        dialogBox.append(label, Big.BoxPackFlags.EXPAND);
+                                       text: 'Please enter a command:' });
+        label.set_position(6, 6);
+        boxGroup.add_actor(label);
 
         this._entry = new Clutter.Text({ color: BOX_TEXT_COLOR,
                                          font_name: '20px Sans Bold',
                                          editable: true,
                                          activatable: true,
-                                         singleLineMode: true });
+                                         singleLineMode: true,
+                                         text: '',
+                                         width: BOX_WIDTH - 12,
+                                         height: BOX_HEIGHT - 12 });
+        // TODO: Implement relative positioning using Tidy.
+        this._entry.set_position(6, 30);
+        boxGroup.add_actor(this._entry);
 
-        dialogBox.append(this._entry, Big.BoxPackFlags.EXPAND);
+        let me = this;
 
-        this._errorBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                       padding_top: DIALOG_PADDING });
-
-        dialogBox.append(this._errorBox, Big.BoxPackFlags.EXPAND);
-
-        let iconBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                    y_align: Big.BoxAlignment.CENTER,
-                                    x_align: Big.BoxAlignment.CENTER,
-                                    width: ICON_BOX_SIZE,
-                                    height: ICON_BOX_SIZE });
-
-        this._errorBox.append(iconBox, Big.BoxPackFlags.NONE);
-
-        this._commandError = false;
-
-        let errorIcon = Shell.TextureCache.get_default().load_icon_name("gtk-dialog-error", ICON_SIZE);
-        iconBox.append(errorIcon, Big.BoxPackFlags.EXPAND);
-
-        this._errorMessage = new Clutter.Text({ color: BOX_TEXT_COLOR,
-                                                font_name: '18px Sans Bold',
-                                                line_wrap: true });
-
-        this._errorBox.append(this._errorMessage, Big.BoxPackFlags.EXPAND);
-
-        this._errorBox.hide();
-
-        this._entry.connect('activate', Lang.bind(this, function (o, e) {
-            this._run(o.get_text());
-            if (!this._commandError)
-                this.close();
-        }));
-
-        this._pathCompleter = new Gio.FilenameCompleter();
-        this._commandCompleter = new CommandCompleter();
-        this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
-        this._entry.connect('key-press-event', Lang.bind(this, function(o, e) {
-            let symbol = e.get_key_symbol();
-            if (symbol == Clutter.Escape) {
-                this.close();
-                return true;
-            }
-            if (symbol == Clutter.slash) {
-                // Need preload data before get completion. GFilenameCompleter load content of parent directory.
-                // Parent directory for /usr/include/ is /usr/. So need to add fake name('a').
-                let text = o.get_text().concat('/a');
-                let prefix;
-                if (text.lastIndexOf(' ') == -1)
-                    prefix = text;
-                else
-                    prefix = text.substr(text.lastIndexOf(' ') + 1);
-                this._getCompletion(prefix);
-                return false;
-            }
-            if (symbol == Clutter.Tab) {
-                let text = o.get_text();
-                let prefix;
-                if (text.lastIndexOf(' ') == -1)
-                    prefix = text;
-                else
-                    prefix = text.substr(text.lastIndexOf(' ') + 1);
-                let postfix = this._getCompletion(prefix);
-                if (postfix != null && postfix.length > 0) {
-                    o.insert_text(postfix, -1);
-                    o.set_cursor_position(text.length + postfix.length);
-                    if (postfix[postfix.length - 1] == '/')
-                        this._getCompletion(text + postfix + 'a');
-                }
-                return true;
-            }
+        this._entry.connect('activate', function (o, e) {
+            me.hide();
+            me._run(o.get_text());
             return false;
-        }));
-    },
+        });
 
-    _getCompletion : function(text) {
-        if (text.indexOf('/') != -1) {
-            return this._pathCompleter.get_completion_suffix(text);
-        } else {
-            return this._commandCompleter.getCompletion(text);
-        }
     },
 
     _run : function(command) {
-        this._commandError = false;
-        let f;
-        if (this._enableInternalCommands)
-            f = this._internalCommands[command];
-        else
-            f = null;
-        if (f) {
-            f();
+        if (command == 'restart') {
+            let global = Shell.Global.get();
+            global.reexec_self();
         } else if (command) {
+            var p = new Shell.Process({'args' : [command]});
             try {
-                let [ok, len, args] = GLib.shell_parse_argv(command);
-                let p = new Shell.Process({'args' : args});
                 p.run();
             } catch (e) {
-                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();
+                // TODO: Give the user direct feedback.
+                log('Could not run command ' + command + '.');
             }
         }
+
+        this.emit('run');
     },
 
-    open : function() {
-        if (this._isOpen) // Already shown
-            return;
+    show : function() {
+        let me = this;
 
-        if (!Main.pushModal(this._group))
-            return;
+        if (this._group.visible) // Already shown
+            return false;
 
-        // Position the dialog on the current monitor
-        let monitor = global.get_focus_monitor();
+        if (!Main.startModal())
+            return false;
 
-        this._boxH.set_position(monitor.x, monitor.y);
-        this._boxH.set_size(monitor.width, monitor.height);
+        this._group.show_all();
 
-        this._isOpen = true;
-        this._group.show();
+        this._entry.connect('key-press-event', function(o, e) {
+            if (Shell.get_event_key_symbol(e) == Clutter.Escape) {
+                me.hide();
+                me.emit('cancel');
+                return true;
+            } else
+                return false;
+        });
 
+        let global = Shell.Global.get();
         global.stage.set_key_focus(this._entry);
+
+        return true;
     },
 
-    close : function() {
-        if (!this._isOpen)
+    hide : function() {
+        if (!this._group.visible)
             return;
 
-        this._isOpen = false;
-        
-        this._errorBox.hide();
-        this._commandError = false;
-
         this._group.hide();
-        this._entry.set_text('');
+        Main.endModal();
+    },
 
-        Main.popModal(this._group);
+    destroy : function(){
+        this.hide();
+        this._group.destroy();
     }
 };
 Signals.addSignalMethods(RunDialog.prototype);

js/ui/search.js

@@ -1,272 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const RESULT_ICON_SIZE = 24;
-
-// 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
-};
-
-function SearchResultDisplay(provider) {
-    this._init(provider);
-}
-
-SearchResultDisplay.prototype = {
-    _init: function(provider) {
-        this.provider = provider;
-        this.actor = null;
-        this.selectionIndex = -1;
-    },
-
-    /**
-     * renderResults:
-     * @results: List of identifier strings
-     * @terms: List of search term strings
-     *
-     * Display the given search matches which resulted
-     * from the given terms.  It's expected that not
-     * all results will fit in the space for the container
-     * actor; in this case, show as many as makes sense
-     * for your result type.
-     *
-     * The terms are useful for search match highlighting.
-     */
-    renderResults: function(results, terms) {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * clear:
-     * Remove all results from this display and reset the selection index.
-     */
-    clear: function() {
-        this.actor.get_children().forEach(function (actor) { actor.destroy(); });
-        this.selectionIndex = -1;
-    },
-
-    /**
-     * getSelectionIndex:
-     *
-     * Returns the index of the selected actor, or -1 if none.
-     */
-    getSelectionIndex: function() {
-        return this.selectionIndex;
-    },
-
-    /**
-     * getVisibleResultCount:
-     *
-     * Returns: The number of actors visible.
-     */
-    getVisibleResultCount: function() {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * selectIndex:
-     * @index: Integer index
-     *
-     * Move selection to the given index.
-     * Return true if successful, false if no more results
-     * available.
-     */
-    selectIndex: function() {
-        throw new Error("not implemented");
-    }
-};
-
-/**
- * SearchProvider:
- *
- * Subclass this object to add a new result type
- * to the search system, then call registerProvider()
- * in SearchSystem with an instance.
- */
-function SearchProvider(title) {
-    this._init(title);
-}
-
-SearchProvider.prototype = {
-    _init: function(title) {
-        this.title = title;
-    },
-
-    /**
-     * getInitialResultSet:
-     * @terms: Array of search terms, treated as logical OR
-     *
-     * Called when the user first begins a search (most likely
-     * therefore a single term of length one or two), or when
-     * a new term is added.
-     *
-     * Should return an array of result identifier strings representing
-     * items which match the given search terms.  This
-     * is expected to be a substring match on the metadata for a given
-     * 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 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");
-    },
-
-    /**
-     * getSubsearchResultSet:
-     * @previousResults: Array of item identifiers
-     * @newTerms: Updated search terms
-     *
-     * Called when a search is performed which is a "subsearch" of
-     * the previous search; i.e. when every search term has exactly
-     * one corresponding term in the previous search which is a prefix
-     * of the new term.
-     *
-     * This allows search providers to only search through the previous
-     * result set, rather than possibly performing a full re-query.
-     */
-    getSubsearchResultSet: function(previousResults, newTerms) {
-        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.
-     */
-    getResultMeta: function(id) {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * createResultContainer:
-     *
-     * Search providers may optionally override this to render their
-     * results in a custom fashion.  The default implementation
-     * will create a vertical list.
-     *
-     * Returns: An instance of SearchResultDisplay.
-     */
-    createResultContainerActor: function() {
-        return null;
-    },
-
-    /**
-     * createResultActor:
-     * @resultMeta: Object with result metadata
-     * @terms: Array of search terms, should be used for highlighting
-     *
-     * Search providers may optionally override this to render a
-     * particular serch result in a custom fashion.  The default
-     * 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'.
-     */
-    createResultActor: function(resultMeta, terms) {
-        return null;
-    },
-
-    /**
-     * activateResult:
-     * @id: Result identifier string
-     *
-     * 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");
-    }
-}
-Signals.addSignalMethods(SearchProvider.prototype);
-
-function SearchSystem() {
-    this._init();
-}
-
-SearchSystem.prototype = {
-    _init: function() {
-        this._providers = [];
-        this.reset();
-    },
-
-    registerProvider: function (provider) {
-        this._providers.push(provider);
-    },
-
-    getProviders: function() {
-        return this._providers;
-    },
-
-    getTerms: function() {
-        return this._previousTerms;
-    },
-
-    reset: function() {
-        this._previousTerms = [];
-        this._previousResults = [];
-    },
-
-    updateSearch: function(searchString) {
-        searchString = searchString.replace(/^\s+/g, "").replace(/\s+$/g, "");
-        if (searchString == '')
-            return null;
-
-        let terms = searchString.split(/\s+/);
-        let isSubSearch = terms.length == this._previousTerms.length;
-        if (isSubSearch) {
-            for (let i = 0; i < terms.length; i++) {
-                if (terms[i].indexOf(this._previousTerms[i]) != 0) {
-                    isSubSearch = false;
-                    break;
-                }
-            }
-        }
-
-        let results = [];
-        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]);
-            }
-        } 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]);
-            }
-        }
-
-        this._previousTerms = terms;
-        this._previousResults = results;
-
-        return results;
-    }
-}
-Signals.addSignalMethods(SearchSystem.prototype);

js/ui/shellDBus.js

@@ -1,75 +0,0 @@
-/* -*- 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"
-              }
-             ],
-    signals: [],
-    properties: [{ name: "OverviewActive",
-                   signature: "b",
-                   access: "readwrite" }]
-};
-
-function GnomeShell() {
-    this._init();
-}
-
-GnomeShell.prototype = {
-    _init: function() {
-        DBus.session.exportObject('/org/gnome/Shell', this);
-    },
-
-    /**
-     * Eval:
-     * @code: A string containing JavaScript code
-     *
-     * This function executes arbitrary code in the main
-     * loop, and returns a boolean success and
-     * JSON representation of the object as a string.
-     *
-     * If evaluation completes without throwing an exception,
-     * then the return value will be [true, JSON.stringify(result)].
-     * If evaluation fails, then the return value will be
-     * [false, JSON.stringify(exception)];
-     *
-     */
-    Eval: function(code) {
-        let returnValue;
-        let success;
-        try {
-            returnValue = JSON.stringify(eval(code));
-            // A hack; DBus doesn't have null/undefined
-            if (returnValue == undefined)
-                returnValue = "";
-            success = true;
-        } catch (e) {
-            returnValue = JSON.stringify(e);
-            success = false;
-        }
-        return [success, returnValue];
-    },
-
-    get OverviewActive() {
-        return Main.overview.visible;
-    },
-
-    set OverviewActive(visible) {
-        if (visible)
-            Main.overview.show();
-        else
-            Main.overview.hide();
-    }
-};
-
-DBus.conformExport(GnomeShell.prototype, GnomeShellIface);
-

js/ui/sidebar.js

@@ -14,12 +14,24 @@ 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;
+// The total sidebar width is the widget width plus the widget
+// padding, plus the sidebar padding
+const SIDEBAR_COLLAPSED_WIDTH = Widget.COLLAPSED_WIDTH + 2 * WidgetBox.WIDGETBOX_PADDING + 2 * SIDEBAR_PADDING;
+const SIDEBAR_EXPANDED_WIDTH = Widget.EXPANDED_WIDTH + 2 * WidgetBox.WIDGETBOX_PADDING + 2 * SIDEBAR_PADDING;
+
+// The maximum height of the sidebar would be extending from just
+// below the panel to just above the taskbar. Since the taskbar is
+// just a temporary hack and it would be too hard to do this the right
+// way, we just hardcode its size.
+const HARDCODED_TASKBAR_HEIGHT = 24;
+const MAXIMUM_SIDEBAR_HEIGHT = Shell.Global.get().screen_height - Panel.PANEL_HEIGHT - HARDCODED_TASKBAR_HEIGHT;
+
+// FIXME, needs to be configurable, obviously
+const default_widgets = [
+    "imports.ui.widget.ClockWidget",
+    "imports.ui.widget.AppsWidget",
+    "imports.ui.widget.DocsWidget"
+];
 
 function Sidebar() {
     this._init();
@@ -27,6 +39,8 @@ function Sidebar() {
 
 Sidebar.prototype = {
     _init : function() {
+        let global = Shell.Global.get();
+
         // 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
@@ -34,6 +48,7 @@ Sidebar.prototype = {
         this.actor = new Clutter.Group({ x: -WidgetBox.WIDGETBOX_PADDING,
                                          y: Panel.PANEL_HEIGHT,
                                          width: SIDEBAR_EXPANDED_WIDTH });
+        Main.chrome.addActor(this.actor);
 
         // The actual widgets go into a Big.Box inside this.actor. The
         // box's width will vary during the expand/collapse animations,
@@ -43,40 +58,23 @@ Sidebar.prototype = {
         // during the animation.
         this.box = new Big.Box ({ padding_top: SIDEBAR_PADDING,
                                   padding_bottom: SIDEBAR_PADDING,
-                                  padding_right: 0,
+                                  padding_right: SIDEBAR_PADDING,
                                   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._visible = this.expanded = true;
 
         this._widgets = [];
-        this.addWidget(new ToggleWidget());
-
-        let default_widgets = this._gconf.get_string_list("sidebar/widgets");
+        this.addWidget(new ToggleWidget(this));
         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._adjustPosition();
     },
 
     addWidget: function(widget) {
         let widgetBox;
         try {
-            widgetBox = new WidgetBox.WidgetBox(widget, this._expanded);
+            widgetBox = new WidgetBox.WidgetBox(widget);
         } catch(e) {
             logError(e, "Failed to add widget '" + widget + "'");
             return;
@@ -84,42 +82,20 @@ Sidebar.prototype = {
 
         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.max(primary.y + Panel.PANEL_HEIGHT,primary.height/2 - this.actor.height/2);
-        this.actor.x = primary.x;
+    show: function() {
+        this._visible = true;
+        this.actor.show();
     },
 
-    _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);
+    hide: function() {
+        this._visible = false;
+        this.actor.hide();
     },
 
-    _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();
-    },
-
-    _expand: function() {
-        this._expanded = true;
+    expand: function() {
+        this.expanded = true;
         for (let i = 0; i < this._widgets.length; i++)
             this._widgets[i].expand();
 
@@ -130,8 +106,8 @@ Sidebar.prototype = {
                                  } });
     },
 
-    _collapse: function() {
-        this._expanded = false;
+    collapse: function() {
+        this.expanded = false;
         for (let i = 0; i < this._widgets.length; i++)
             this._widgets[i].collapse();
 
@@ -154,33 +130,24 @@ Sidebar.prototype = {
 const LEFT_DOUBLE_ARROW = "\u00AB";
 const RIGHT_DOUBLE_ARROW = "\u00BB";
 
-function ToggleWidget() {
-    this._init();
+function ToggleWidget(sidebar) {
+    this._init(sidebar);
 }
 
 ToggleWidget.prototype = {
     __proto__ : Widget.Widget.prototype,
 
-    _init : function() {
-        this._gconf = Shell.GConf.get_default();
-
+    _init : function(sidebar) {
+        this._sidebar = sidebar;
         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));
+                           Lang.bind(this._sidebar, this._sidebar.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);
+                                    Lang.bind(this._sidebar, this._sidebar.expand));
     }
 };

js/ui/statusMenu.js

@@ -1,297 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const DBus = imports.dbus;
-const Gdm = imports.gi.Gdm;
-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 Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const Panel = imports.ui.panel;
-
-// 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() {
-    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();
-
-        this.actor = new St.BoxLayout({ name: 'StatusMenu' });
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this._iconBox = new St.Bin();
-        this.actor.add(this._iconBox, { y_align: St.Align.MIDDLE });
-
-        let textureCache = Shell.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._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._createSubMenu();
-        this._gdm.connect('users-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));
-    },
-
-    _onDestroy: function() {
-        this._user.disconnect(this._userNameChangedId);
-    },
-
-    _updateUserName: function() {
-        this._name.set_text(this._user.get_real_name());
-    },
-
-    _updateSwitchUser: function() {
-        let users = this._gdm.list_users();
-        if (users.length > 1)
-            this._loginScreenItem.show();
-        else
-            this._loginScreenItem.hide();
-    },
-
-    _updatePresenceIcon: function(presence, status) {
-        if (status == GnomeSessionPresenceStatus.AVAILABLE)
-            this._iconBox.child = this._availableIcon;
-        else if (status == GnomeSessionPresenceStatus.BUSY)
-            this._iconBox.child = this._busyIcon;
-        else if (status == GnomeSessionPresenceStatus.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;
-    },
-
-    _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 = this._createImageMenuItem(_('Busy'), 'gtk-no', true);
-        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.BUSY));
-        this._menu.append(item);
-        item.show();
-
-        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 Gtk.SeparatorMenuItem();
-        this._menu.append(item);
-        item.show();
-
-        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.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        this._menu.append(item);
-        item.show();
-
-        item = new Gtk.SeparatorMenuItem();
-        this._menu.append(item);
-        item.show();
-
-        item = this._createImageMenuItem(_('Lock Screen'), 'system-lock-screen');
-        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
-        this._menu.append(item);
-        item.show();
-
-        item = this._createImageMenuItem(_('Switch User'), 'system-users');
-        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
-        this._menu.append(item);
-        item.show();
-        this._loginScreenItem = item;
-
-        item = this._createImageMenuItem(_('Log Out...'), 'system-log-out');
-        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
-        this._menu.append(item);
-        item.show();
-
-        item = this._createImageMenuItem(_('Shut Down...'), 'system-shutdown');
-        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-        this._menu.append(item);
-        item.show();
-    },
-
-    _setPresenceStatus: function(item, status) {
-        this._presence.setStatus(status);
-    },
-
-    _onAccountInformationActivate: function() {
-        this._spawn(['gnome-about-me']);
-    },
-
-    _onPreferencesActivate: function() {
-        this._spawn(['gnome-control-center']);
-    },
-
-    _onLockScreenActivate: function() {
-        this._spawn(['gnome-screensaver-command', '--lock']);
-    },
-
-    _onLoginScreenActivate: function() {
-        this._gdm.goto_login_session();
-        this._onLockScreenActivate();
-    },
-
-    _onQuitSessionActivate: function() {
-        this._spawn(['gnome-session-save', '--logout-dialog']);
-    },
-
-    _onShutDownActivate: function() {
-        this._spawn(['gnome-session-save', '--shutdown-dialog']);
-    },
-
-    _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 = Math.round(panelX + panelWidth - menuWidth);
-            let menuY = Math.round(panelY + panelHeight);
-
-            Shell.popup_menu(this._menu, event.get_button(), event.get_time(),
-                             menuX, menuY);
-        }
-    },
-    
-    //  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;
-    }
-};
-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/tweener.js

@@ -1,7 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
@@ -42,17 +41,9 @@ const Tweener = imports.tweener.tweener;
 // calls any of these is almost certainly wrong anyway, because they
 // affect the entire application.)
 
-let slowDownFactor = 1.0;
 
 // Called from Main.start
 function init() {
-    let slowdownEnv = GLib.getenv("GNOME_SHELL_SLOWDOWN_FACTOR");
-    if (slowdownEnv) {
-        let factor = parseFloat(slowdownEnv);
-        if (!isNaN(factor) && factor > 0.0)
-            slowDownFactor = factor;
-    }
-
     Tweener.setFrameTicker(new ClutterFrameTicker());
 }
 
@@ -217,10 +208,11 @@ ClutterFrameTicker.prototype = {
         this._startTime = -1;
         this._currentTime = -1;
 
-        this._timeline.connect('new-frame', Lang.bind(this,
+        let me = this;
+        this._timeline.connect('new-frame',
             function(timeline, frame) {
-                this._onNewFrame(frame);
-            }));
+                me._onNewFrame(frame);
+            });
     },
 
     _onNewFrame : function(frame) {
@@ -233,7 +225,7 @@ ClutterFrameTicker.prototype = {
             this._startTime = this._timeline.get_elapsed_time();
 
         // currentTime is in milliseconds
-        this._currentTime = (this._timeline.get_elapsed_time() - this._startTime) / slowDownFactor;
+        this._currentTime = this._timeline.get_elapsed_time() - this._startTime;
         this.emit('prepare-frame');
     },
 

js/ui/widget.js

@@ -9,10 +9,9 @@ const Lang = imports.lang;
 const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
 
-const AppFavorites = imports.ui.appFavorites;
+const AppInfo = imports.misc.appInfo;
+const DocDisplay = imports.ui.docDisplay;
 const DocInfo = imports.misc.docInfo;
 
 const COLLAPSED_WIDTH = 24;
@@ -32,22 +31,12 @@ function Widget() {
 Widget.prototype = {
     // _init():
     //
-    // Your widget constructor. Your constructor function should look
-    // like:
-    //
-    //     function MyWidgetType() {
-    //         this._init.apply(this, arguments);
-    //     }
-    //
-    // and your _init method should start by doing:
-    //
-    //     Widget.Widget.prototype._init.apply(this, arguments);
-    //
-    // The _init method must define a field named "actor" containing
-    // the Clutter.Actor to show in expanded mode. This actor will be
-    // clipped to Widget.EXPANDED_WIDTH. Most widgets will also define
-    // a field named "title" containing the title string to show above
-    // the widget in the sidebar.
+    // Your widget constructor. Receives no arguments. Must define a
+    // field named "actor" containing the Clutter.Actor to show in
+    // expanded mode. This actor will be clipped to
+    // Widget.EXPANDED_WIDTH. Most widgets will also define a field
+    // named "title" containing the title string to show above the
+    // widget in the sidebar.
     //
     // If you want to have a separate collapsed view, you can define a
     // field "collapsedActor" containing the Clutter.Actor to show in
@@ -62,9 +51,6 @@ Widget.prototype = {
     // the sidebar is collapsed, the widget's expanded view will pop
     // out of the sidebar until either the cursor moves out of it,
     // or else the widget calls this.activated() on itself.
-    _init: function (initialState) {
-        this.state = initialState;
-    },
 
     // destroy():
     //
@@ -95,22 +81,23 @@ Widget.prototype = {
     // state:
     //
     // A field set on your widget by the sidebar. Will contain one of
-    // the Widget.STATE_* values. (Eg, Widget.STATE_EXPANDED).
+    // the Widget.STATE_* values. (Eg, Widget.STATE_EXPANDED). Note
+    // that this will not be set until *after* _init() is called, so
+    // you cannot rely on it being set at that point. The widget will
+    // always initially be in STATE_EXPANDED.
 };
 
 Signals.addSignalMethods(Widget.prototype);
 
 
 function ClockWidget() {
-    this._init.apply(this, arguments);
+  this._init();
 }
 
 ClockWidget.prototype = {
     __proto__ : Widget.prototype,
 
     _init: function() {
-        Widget.prototype._init.apply(this, arguments);
-
         this.actor = new Clutter.Text({ font_name: "Sans Bold 16px",
                                         text: "",
                                         // Give an explicit height to ensure
@@ -159,14 +146,14 @@ ClockWidget.prototype = {
     },
 
     _updateText: function(time) {
-        // Translators: This is a time format.
-        this.actor.set_text(time.toLocaleFormat(_("%H:%M")));
+        this.actor.set_text(time.toLocaleFormat("%H:%M"));
     },
 
     _updateCairo: function(time) {
-        Shell.draw_clock(this.collapsedActor,
-                         time.getHours() % 12,
-                         time.getMinutes());
+        let global = Shell.Global.get();
+        global.clutter_cairo_texture_draw_clock(this.collapsedActor,
+                                                time.getHours() % 12,
+                                                time.getMinutes());
     }
 };
 
@@ -181,7 +168,7 @@ const ITEM_NAME_COLOR = new Clutter.Color();
 ITEM_NAME_COLOR.from_pixel(0x000000ff);
 
 function LauncherWidget() {
-    this._init.apply(this, arguments);
+    this._init();
 }
 
 LauncherWidget.prototype = {
@@ -285,58 +272,33 @@ LauncherWidget.prototype = {
     }
 };
 
-function AppsWidgetInfo(appInfo) {
-    this._init(appInfo);
-}
-
-AppsWidgetInfo.prototype = {
-    _init : function(appInfo) {
-        this._info = appInfo;
-        this.name = appInfo.get_name();
-    },
-
-    createIcon : function(size) {
-        return this._info.create_icon_texture(size);
-    },
-
-    launch : function() {
-        this._info.launch();
-    }
-}
-
 function AppsWidget() {
-    this._init.apply(this, arguments);
+    this._init();
 }
 
 AppsWidget.prototype = {
     __proto__ : LauncherWidget.prototype,
 
     _init : function() {
-        Widget.prototype._init.apply(this, arguments);
-
-        this.title = _("Applications");
+        this.title = "Applications";
         this.actor = new Big.Box({ spacing: 2 });
         this.collapsedActor = new Big.Box({ spacing: 2});
 
-        let appSystem = Shell.AppSystem.get_default();
-        let apps = AppFavorites.getAppFavorites().getFavorites();
-        for (let i = 0; i < apps.length; i++) {
-            this.addItem(new AppsWidgetInfo(apps[i]));
-        }
+        let apps = AppInfo.getTopApps(5);
+        for (let i = 0; i < apps.length; i++)
+            this.addItem(apps[i]);
     }
 };
 
-function RecentDocsWidget() {
-    this._init.apply(this, arguments);
+function DocsWidget() {
+    this._init();
 }
 
-RecentDocsWidget.prototype = {
+DocsWidget.prototype = {
     __proto__ : LauncherWidget.prototype,
 
     _init : function() {
-        Widget.prototype._init.apply(this, arguments);
-
-        this.title = _("Recent Documents");
+        this.title = "Recent Docs";
         this.actor = new Big.Box({ spacing: 2 });
 
         this._recentManager = Gtk.RecentManager.get_default();
@@ -354,10 +316,11 @@ RecentDocsWidget.prototype = {
         for (i = 0; i < docs.length; i++) {
             let docInfo = new DocInfo.DocInfo (docs[i]);
 
-            items.push(docInfo);
+            if (docInfo.exists())
+                items.push(docInfo);
         }
 
-        items.sort(function (a,b) { return b.timestamp - a.timestamp; });
+        items.sort(function (a,b) { return b.lastVisited() - a.lastVisited(); });
         for (i = 0; i < Math.min(items.length, 5); i++)
             this.addItem(items[i]);
     }

js/ui/widgetBox.js

@@ -15,24 +15,21 @@ WIDGETBOX_BG_COLOR.from_pixel(0xf0f0f0ff);
 const BLACK = new Clutter.Color();
 BLACK.from_pixel(0x000000ff);
 
-const WIDGETBOX_PADDING = 2;
+const WIDGETBOX_PADDING = 4;
 const ANIMATION_TIME = 0.5;
 const POP_IN_LAG = 250; /* milliseconds */
 
-function WidgetBox(widget, expanded) {
-    this._init(widget, expanded);
+function WidgetBox(widget) {
+    this._init(widget);
 }
 
 WidgetBox.prototype = {
-    _init: function(widget, expanded) {
-        this.state = expanded ? Widget.STATE_EXPANDED : Widget.STATE_COLLAPSED;
-
-	if (widget instanceof Widget.Widget) {
+    _init: function(widget) {
+	if (widget instanceof Widget.Widget)
 	    this._widget = widget;
-            this._widget.state = this.state;
-	} else {
+	else {
 	    let ctor = this._ctorFromName(widget);
-            this._widget = new ctor(this.state);
+            this._widget = new ctor();
 	}
 
         if (!this._widget.actor)
@@ -40,7 +37,7 @@ WidgetBox.prototype = {
         else if (!this._widget.title && !this._widget.collapsedActor)
             throw new Error("widget has neither title nor collapsedActor");
 
-        this.state = expanded ? Widget.STATE_EXPANDED : Widget.STATE_COLLAPSED;
+        this.state = this._widget.state = Widget.STATE_EXPANDED;
 
         // The structure of a WidgetBox:
         //
@@ -80,15 +77,9 @@ WidgetBox.prototype = {
 
         this.actor = new Clutter.Group();
         this._hbox = new Big.Box({ background_color: WIDGETBOX_BG_COLOR,
-                                   padding_top: WIDGETBOX_PADDING,
-                                   padding_bottom: WIDGETBOX_PADDING,
-                                   padding_right: WIDGETBOX_PADDING,
-                                   // Left padding is here to make up for
-                                   // the X offset used for the sidebar
-                                   // to hide its rounded corners
-                                   padding_left: 2 * WIDGETBOX_PADDING,
+                                   padding: WIDGETBOX_PADDING,
                                    spacing: WIDGETBOX_PADDING,
-                                   corner_radius: WIDGETBOX_PADDING,
+                                   corner_radius: WIDGETBOX_PADDING / 2,
                                    orientation: Big.BoxOrientation.HORIZONTAL,
                                    reactive: true });
         this.actor.add_actor(this._hbox);
@@ -131,6 +122,7 @@ WidgetBox.prototype = {
             this._activationHandler = this._widget.connect('activated',
                                                            Lang.bind(this, this._activationHandler));
         }
+        this._cgroup.hide();
 
         this._egroup = new Clutter.Group({ clip_to_allocation: true });
         this._hbox.append(this._egroup, Big.BoxPackFlags.NONE);
@@ -150,11 +142,6 @@ WidgetBox.prototype = {
         }
 
         this._ebox.append(this._widget.actor, Big.BoxPackFlags.NONE);
-
-        if (expanded)
-            this._setWidgetExpanded();
-        else
-            this._setWidgetCollapsed();
     },
 
     // Given a name like "imports.ui.widget.ClockWidget", turn that
@@ -191,25 +178,16 @@ WidgetBox.prototype = {
         this.state = this._widget.state = Widget.STATE_EXPANDING;
     },
 
-    _setWidgetExpanded: function() {
+    _expandPart1Complete: function() {
         this._cgroup.hide();
-        this._egroup.show();
+        this._cbox.x = 0;
 
         if (this._singleActor) {
+            log(this._widget.actor);
             this._widget.actor.unparent();
             this._ebox.append(this._widget.actor, Big.BoxPackFlags.NONE);
         }
 
-        if (this._htitle) {
-            this._htitle.show();
-            this._hline.show();
-        }
-    },
-
-    _expandPart1Complete: function() {
-        this._cbox.x = 0;
-        this._setWidgetExpanded();
-
         if (this._widget.expand) {
             try {
                 this._widget.expand();
@@ -218,6 +196,11 @@ WidgetBox.prototype = {
             }
         }
 
+        this._egroup.show();
+        if (this._htitle) {
+            this._htitle.show();
+            this._hline.show();
+        }
         this._ebox.x = -Widget.EXPANDED_WIDTH;
         Tweener.addTween(this._ebox, { x: 0,
                                        time: ANIMATION_TIME / 2,
@@ -239,27 +222,19 @@ WidgetBox.prototype = {
         this.state = this._widget.state = Widget.STATE_COLLAPSING;
     },
 
-    _setWidgetCollapsed: function() {
+    _collapsePart1Complete: function() {
         this._egroup.hide();
-        this._cgroup.show();
-
-        if (this._singleActor) {
-            this._widget.actor.unparent();
-            this._cbox.append(this._widget.actor, Big.BoxPackFlags.NONE);
-        }
-
+        this._ebox.x = 0;
         if (this._htitle) {
             this._htitle.hide();
             this._hline.hide();
         }
 
-        if (this._vtitle)
-            this._cbox.height = this._ebox.height;
-    },
-
-    _collapsePart1Complete: function() {
-        this._ebox.x = 0;
-        this._setWidgetCollapsed();
+        if (this._singleActor) {
+            log(this._widget.actor);
+            this._widget.actor.unparent();
+            this._cbox.append(this._widget.actor, Big.BoxPackFlags.NONE);
+        }
 
         if (this._widget.collapse) {
             try {
@@ -269,7 +244,10 @@ WidgetBox.prototype = {
             }
         }
 
+        this._cgroup.show();
         this._cbox.x = -Widget.COLLAPSED_WIDTH;
+        if (this._vtitle)
+            this._cbox.height = this._ebox.height;
         Tweener.addTween(this._cbox, { x: 0,
                                        time: ANIMATION_TIME / 2,
                                        transition: "easeOutQuad",
@@ -296,7 +274,7 @@ WidgetBox.prototype = {
                     this.state == Widget.STATE_POPPING_OUT)) {
             // If moving into another actor within this._hbox, let the
             // event be propagated
-            let into = event.get_related();
+            let into = Shell.get_event_related(event);
             while (into) {
                 if (into == this._hbox)
                     return false;
@@ -331,7 +309,7 @@ WidgetBox.prototype = {
                                        onCompleteScope: this });
         this.state = this._widget.state = Widget.STATE_POPPING_OUT;
 
-        Main.chrome.trackActor(this._hbox, { affectsStruts: false });
+        Main.chrome.addInputRegionActor(this._hbox);
     },
 
     _popOutComplete: function() {
@@ -370,7 +348,7 @@ WidgetBox.prototype = {
         this._egroup.hide();
         this._ebox.x = 0;
 
-        Main.chrome.untrackActor(this._hbox);
+        Main.chrome.removeInputRegionActor(this._hbox);
     },
 
     destroy: function() {

js/ui/windowManager.js

@@ -1,7 +1,6 @@
 /* -*- 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;
@@ -18,8 +17,10 @@ function WindowManager() {
 
 WindowManager.prototype = {
     _init : function() {
-        let shellwm = global.window_manager;
+        let me = this;
 
+        this._global = Shell.Global.get();
+        this._shellwm = this._global.window_manager;
         this._minimizing = [];
         this._maximizing = [];
         this._unmaximizing = [];
@@ -27,25 +28,64 @@ WindowManager.prototype = {
         this._destroying = [];
 
         this._switchData = null;
-        shellwm.connect('switch-workspace', Lang.bind(this, this._switchWorkspace));
-        shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
-        shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
-        shellwm.connect('kill-minimize', Lang.bind(this, this._minimizeWindowDone));
-        shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
-        shellwm.connect('kill-maximize', Lang.bind(this, this._maximizeWindowDone));
-        shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
-        shellwm.connect('kill-unmaximize', Lang.bind(this, this._unmaximizeWindowDone));
-        shellwm.connect('map', Lang.bind(this, this._mapWindow));
-        shellwm.connect('kill-map', Lang.bind(this, this._mapWindowDone));
-        shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
-        shellwm.connect('kill-destroy', Lang.bind(this, this._destroyWindowDone));
+        this._shellwm.connect('switch-workspace',
+            function(o, from, to, direction) {
+                let actors = me._shellwm.get_switch_workspace_actors();
+                me._switchWorkspace(actors, from, to, direction);
+            });
+        this._shellwm.connect('kill-switch-workspace',
+            function(o) {
+                me._switchWorkspaceDone();
+            });
+        this._shellwm.connect('minimize',
+            function(o, actor) {
+                me._minimizeWindow(actor);
+            });
+        this._shellwm.connect('kill-minimize',
+            function(o, actor) {
+                me._minimizeWindowDone(actor);
+            });
+        this._shellwm.connect('maximize',
+            function(o, actor, tx, ty, tw, th) {
+                me._maximizeWindow(actor, tx, ty, tw, th);
+            });
+        this._shellwm.connect('kill-maximize',
+            function(o, actor) {
+                me._maximizeWindowDone(actor);
+            });
+        this._shellwm.connect('unmaximize',
+            function(o, actor, tx, ty, tw, th) {
+                me._unmaximizeWindow(actor, tx, ty, tw, th);
+            });
+        this._shellwm.connect('kill-unmaximize',
+            function(o, actor) {
+                me._unmaximizeWindowDone(actor);
+            });
+        this._shellwm.connect('map',
+            function(o, actor) {
+                me._mapWindow(actor);
+            });
+        this._shellwm.connect('kill-map',
+            function(o, actor) {
+                me._mapWindowDone(actor);
+            });
+        this._shellwm.connect('destroy',
+            function(o, actor) {
+                me._destroyWindow(actor);
+            });
+        this._shellwm.connect('kill-destroy',
+            function(o, actor) {
+                me._destroyWindowDone(actor);
+            });
 
-        shellwm.takeover_keybinding('switch_windows');
-        shellwm.connect('keybinding::switch_windows', Lang.bind(this, this._startAppSwitcher));
+        this._shellwm.connect('begin-alt-tab',
+            function(o, handler) {
+                me._beginAltTab(handler);
+            });
     },
 
     _shouldAnimate : function(actor) {
-        if (Main.overview.visible)
+        if (Main.overlay.visible)
             return false;
         if (actor && (actor.get_window_type() != Meta.CompWindowType.NORMAL))
             return false;
@@ -61,9 +101,9 @@ WindowManager.prototype = {
         return false;
     },
 
-    _minimizeWindow : function(shellwm, actor) {
+    _minimizeWindow : function(actor) {
         if (!this._shouldAnimate(actor)) {
-            shellwm.completed_minimize(actor);
+            this._shellwm.completed_minimize(actor);
             return;
         }
 
@@ -81,49 +121,86 @@ WindowManager.prototype = {
                            transition: "easeOutQuad",
                            onComplete: this._minimizeWindowDone,
                            onCompleteScope: this,
-                           onCompleteParams: [shellwm, actor],
+                           onCompleteParams: [actor],
                            onOverwrite: this._minimizeWindowOverwritten,
                            onOverwriteScope: this,
-                           onOverwriteParams: [shellwm, actor]
+                           onOverwriteParams: [actor]
                          });
     },
 
-    _minimizeWindowDone : function(shellwm, actor) {
+    _minimizeWindowDone : function(actor) {
         if (this._removeEffect(this._minimizing, actor)) {
             Tweener.removeTweens(actor);
             actor.set_scale(1.0, 1.0);
             actor.move_anchor_point_from_gravity(Clutter.Gravity.NORTH_WEST);
 
-            shellwm.completed_minimize(actor);
+            this._shellwm.completed_minimize(actor);
         }
     },
 
-    _minimizeWindowOverwritten : function(shellwm, actor) {
+    _minimizeWindowOverwritten : function(actor) {
         if (this._removeEffect(this._minimizing, actor)) {
-            shellwm.completed_minimize(actor);
+            this._shellwm.completed_minimize(actor);
         }
     },
 
-    _maximizeWindow : function(shellwm, actor, targetX, targetY, targetWidth, targetHeight) {
-        shellwm.completed_maximize(actor);
-    },
-
-    _maximizeWindowDone : function(shellwm, actor) {
-    },
-
-    _maximizeWindowOverwrite : function(shellwm, actor) {
-    },
-
-    _unmaximizeWindow : function(shellwm, actor, targetX, targetY, targetWidth, targetHeight) {
-        shellwm.completed_unmaximize(actor);
-    },
-
-    _unmaximizeWindowDone : function(shellwm, actor) {
-    },
-
-    _mapWindow : function(shellwm, actor) {
+    _maximizeWindow : function(actor, targetX, targetY, targetWidth, targetHeight) {
         if (!this._shouldAnimate(actor)) {
-            shellwm.completed_map(actor);
+            this._shellwm.completed_maximize(actor);
+            return;
+        }
+
+        /* this doesn't work very well, as simply scaling up the existing
+         * window contents doesn't produce anything like the same results as
+         * actually maximizing the window.
+         */
+        let scaleX = targetWidth / actor.width;
+        let scaleY = targetHeight / actor.height;
+        let anchorX = (actor.x - targetX) * actor.width/(targetWidth - actor.width);
+        let anchorY = (actor.y - targetY) * actor.height/(targetHeight - actor.height);
+        
+        actor.move_anchor_point(anchorX, anchorY);
+
+        this._maximizing.push(actor);
+        Tweener.addTween(actor,
+                         { scale_x: scaleX,
+                           scale_y: scaleY,
+                           time: WINDOW_ANIMATION_TIME,
+                           transition: "easeOutQuad",
+                           onComplete: this._maximizeWindowDone,
+                           onCompleteScope: this,
+                           onCompleteParams: [actor],
+                           onOverwrite: this._maximizeWindowOverwrite,
+                           onOverwriteScope: this,
+                           onOverwriteParams: [actor]
+                         });
+    },
+
+    _maximizeWindowDone : function(actor) {
+        if (this._removeEffect(this._maximizing, actor)) {
+            Tweener.removeTweens(actor);
+            actor.set_scale(1.0, 1.0);
+            actor.move_anchor_point_from_gravity(Clutter.Gravity.NORTH_WEST);
+            this._shellwm.completed_maximize(actor);
+        }
+    },
+
+    _maximizeWindowOverwrite : function(actor) {
+        if (this._removeEffect(this._maximizing, actor)) {
+            this._shellwm.completed_maximize(actor);
+        }
+    },
+
+    _unmaximizeWindow : function(actor, targetX, targetY, targetWidth, targetHeight) {
+        this._shellwm.completed_unmaximize(actor);
+    },
+
+    _unmaximizeWindowDone : function(actor) {
+    },
+
+    _mapWindow : function(actor) {
+        if (!this._shouldAnimate(actor)) {
+            this._shellwm.completed_map(actor);
             return;
         }
 
@@ -140,42 +217,71 @@ WindowManager.prototype = {
                            transition: "easeOutQuad",
                            onComplete: this._mapWindowDone,
                            onCompleteScope: this,
-                           onCompleteParams: [shellwm, actor],
+                           onCompleteParams: [actor],
                            onOverwrite: this._mapWindowOverwrite,
                            onOverwriteScope: this,
-                           onOverwriteParams: [shellwm, actor]
+                           onOverwriteParams: [actor]
                          });
     },
 
-    _mapWindowDone : function(shellwm, actor) {
+    _mapWindowDone : function(actor) {
         if (this._removeEffect(this._mapping, actor)) {
             Tweener.removeTweens(actor);
             actor.set_scale(1.0, 1.0);
             actor.move_anchor_point_from_gravity(Clutter.Gravity.NORTH_WEST);
-            shellwm.completed_map(actor);
+            this._shellwm.completed_map(actor);
         }
     },
 
-    _mapWindowOverwrite : function(shellwm, actor) {
+    _mapWindowOverwrite : function(actor) {
         if (this._removeEffect(this._mapping, actor)) {
-            shellwm.completed_map(actor);
+            this._shellwm.completed_map(actor);
         }
     },
 
-    _destroyWindow : function(shellwm, actor) {
-        shellwm.completed_destroy(actor);
-    },
-    
-    _destroyWindowDone : function(shellwm, actor) {
-    },
-
-    _switchWorkspace : function(shellwm, from, to, direction) {
-        if (!this._shouldAnimate()) {
-            shellwm.completed_switch_workspace();
+    _destroyWindow : function(actor) {
+        if (!this._shouldAnimate(actor)) {
+            this._shellwm.completed_destroy(actor);
             return;
         }
 
-        let windows = shellwm.get_switch_workspace_actors();
+        actor.move_anchor_point_from_gravity(Clutter.Gravity.CENTER);
+        
+        /* anachronistic 'tv-like' effect - squash on y axis, leave x alone */
+        this._destroying.push(actor);
+        Tweener.addTween(actor,
+                         { scale_x: 1.0,
+                           scale_y: 0.0,
+                           time: WINDOW_ANIMATION_TIME,
+                           transition: "easeOutQuad",
+                           onComplete: this._destroyWindowDone,
+                           onCompleteScope: this,
+                           onCompleteParams: [actor],
+                           onOverwrite: this._destroyWindowOverwrite,
+                           onOverwriteScope: this,
+                           onOverwriteParams: [actor]
+                         });
+    },
+    
+    _destroyWindowDone : function(actor) {
+        if (this._removeEffect(this._destroying, actor)) {
+            this._shellwm.completed_destroy(actor);
+            Tweener.removeTweens(actor);
+            actor.set_scale(1.0, 1.0);
+        }
+    },
+
+    _destroyWindowOverwrite : function(actor) {
+        if (this._removeEffect(this._destroying, actor)) {
+            this._shellwm.completed_destroy(actor);
+        }
+    },
+
+    _switchWorkspace : function(windows, from, to, direction) {
+        if (!this._shouldAnimate()) {
+            this._shellwm.completed_switch_workspace();
+            return;
+        }
 
         /* @direction is the direction that the "camera" moves, so the
          * screen contents have to move one screen's worth in the
@@ -186,20 +292,20 @@ WindowManager.prototype = {
         if (direction == Meta.MotionDirection.UP ||
             direction == Meta.MotionDirection.UP_LEFT ||
             direction == Meta.MotionDirection.UP_RIGHT)
-                yDest = global.screen_height;
+                yDest = this._global.screen_height;
         else if (direction == Meta.MotionDirection.DOWN ||
             direction == Meta.MotionDirection.DOWN_LEFT ||
             direction == Meta.MotionDirection.DOWN_RIGHT)
-                yDest = -global.screen_height;
+                yDest = -this._global.screen_height;
 
         if (direction == Meta.MotionDirection.LEFT ||
             direction == Meta.MotionDirection.UP_LEFT ||
             direction == Meta.MotionDirection.DOWN_LEFT)
-                xDest = global.screen_width;
+                xDest = this._global.screen_width;
         else if (direction == Meta.MotionDirection.RIGHT ||
                  direction == Meta.MotionDirection.UP_RIGHT ||
                  direction == Meta.MotionDirection.DOWN_RIGHT)
-                xDest = -global.screen_width;
+                xDest = -this._global.screen_width;
 
         let switchData = {};
         this._switchData = switchData;
@@ -207,7 +313,7 @@ WindowManager.prototype = {
         switchData.outGroup = new Clutter.Group();
         switchData.windows = [];
 
-        let wgroup = global.window_group;
+        let wgroup = this._global.window_group;
         wgroup.add_actor(switchData.inGroup);
         wgroup.add_actor(switchData.outGroup);
 
@@ -238,8 +344,7 @@ WindowManager.prototype = {
                            time: WINDOW_ANIMATION_TIME,
                            transition: "easeOutQuad",
                            onComplete: this._switchWorkspaceDone,
-                           onCompleteScope: this,
-                           onCompleteParams: [shellwm]
+                           onCompleteScope: this
                          });
         Tweener.addTween(switchData.inGroup,
                          { x: 0,
@@ -249,7 +354,7 @@ WindowManager.prototype = {
                          });
     },
 
-    _switchWorkspaceDone : function(shellwm) {
+    _switchWorkspaceDone : function() {
         let switchData = this._switchData;
         if (!switchData)
             return;
@@ -268,13 +373,15 @@ WindowManager.prototype = {
         switchData.inGroup.destroy();
         switchData.outGroup.destroy();
 
-        shellwm.completed_switch_workspace();
+        this._shellwm.completed_switch_workspace();
     },
 
-    _startAppSwitcher : function(shellwm, binding, window, backwards) {
-        let tabPopup = new AltTab.AltTabPopup();
+    _beginAltTab : function(handler) {
+        let popup = new AltTab.AltTabPopup();
 
-        if (!tabPopup.show(backwards))
-            tabPopup.destroy();
-    }
+        handler.connect('window-added', function(handler, window) { popup.addWindow(window); });
+        handler.connect('show', function(handler, initialSelection) { popup.show(initialSelection); });
+        handler.connect('destroy', function() { popup.destroy(); });
+        handler.connect('notify::selected', function() { popup.select(handler.selected); });
+    }  
 };

po/LINGUAS

@@ -1,27 +0,0 @@
-ar
-ca
-cs
-da
-de
-el
-en_GB
-es
-fi
-fr
-ga
-gl
-he
-hu
-it
-ko
-nb
-nl
-pa
-pl
-pt_BR
-ro
-ru
-sl
-sv
-tr
-zh_CN

po/POTFILES.in

@@ -1,12 +0,0 @@
-data/gnome-shell.desktop.in.in
-js/ui/appDisplay.js
-js/ui/appIcon.js
-js/ui/dash.js
-js/ui/overview.js
-js/ui/panel.js
-js/ui/placeDisplay.js
-js/ui/runDialog.js
-js/ui/widget.js
-src/gdmuser/gdm-user.c
-src/shell-global.c
-src/shell-uri-util.c

po/POTFILES.skip

@@ -1 +0,0 @@
-data/gnome-shell.desktop.in

po/ar.po

@@ -1,247 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Khaled Hosny <khaledhosny@eglug.org>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 20:55+0200\n"
-"PO-Revision-Date: 2009-11-08 20:55+0300\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
-"Language-Team: Arabic <doc@arabeyes.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.4.1\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "صدفة جنوم"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "إدارة النوافذ وإطلاق التطبيقات"
-
-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "متكرر"
-
-#: ../js/ui/appDisplay.js:867
-msgid "Drag here to add favorites"
-msgstr "اسحب إلى هنا ليضاف إلى المفضّلة"
-
-#: ../js/ui/appIcon.js:426
-msgid "New Window"
-msgstr "نافذة جديدة"
-
-#: ../js/ui/appIcon.js:430
-msgid "Remove from Favorites"
-msgstr "أزِل من المفضّلة"
-
-#: ../js/ui/appIcon.js:431
-msgid "Add to Favorites"
-msgstr "أضِف إلى المفضّلة"
-
-#: ../js/ui/dash.js:267
-msgid "Find..."
-msgstr "ابحث..."
-
-#: ../js/ui/dash.js:376
-msgid "More"
-msgstr "المزيد"
-
-#: ../js/ui/dash.js:532
-msgid "(see all)"
-msgstr "(انظر الكل)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:711 ../js/ui/dash.js:773
-msgid "APPLICATIONS"
-msgstr "التطبيقات"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:731
-msgid "PLACES"
-msgstr "الأماكن"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:738 ../js/ui/dash.js:783
-msgid "RECENT DOCUMENTS"
-msgstr "المستندات الحديثة"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:947
-msgid "SEARCH RESULTS"
-msgstr "نتائج البحث"
-
-#: ../js/ui/dash.js:778
-msgid "PREFERENCES"
-msgstr "التفضيلات"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:274
-msgid "Activities"
-msgstr "الأنشطة"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%A %Ol:%OM %p"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "اتّصل ب‍..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "من فضلك اكتب أمرا:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "فشل تنفيذ '%s':‏"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%OH:%OM"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "التطبيقات"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "المستندات الحديثة"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "منذ أقل من دقيقة"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "منذ أقل من دقيقة"
-msgstr[1] "منذ دقيقة"
-msgstr[2] "منذ دقيقتين"
-msgstr[3] "منذ %d دقائق"
-msgstr[4] "منذ %d دقيقة"
-msgstr[5] "منذ %d دقيقة"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "منذ أقل من ساعة"
-msgstr[1] "منذ ساعة"
-msgstr[2] "منذ ساعتين"
-msgstr[3] "منذ %d ساعات"
-msgstr[4] "منذ %d ساعة"
-msgstr[5] "منذ %d ساعة"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "منذ أقل من يوم"
-msgstr[1] "منذ يوم"
-msgstr[2] "منذ يومين"
-msgstr[3] "منذ %d أيام"
-msgstr[4] "منذ %d يوما"
-msgstr[5] "منذ %d يوم"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "منذ أقل من أسبوع"
-msgstr[1] "منذ أسبوع"
-msgstr[2] "منذ أسبوعين"
-msgstr[3] "منذ %d أسابيع"
-msgstr[4] "منذ %d أسبوعا"
-msgstr[5] "منذ %d أسبوع"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "مجهول"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "تعذّر إيصاد الشاشة: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "تعذّر ضبك حافظة الشاشة مؤقتا لتكون شاشة خالية: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "تعذّر الخروج: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "معلومات الحساب..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "الشريط الجانبي"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "تفضيلات النظام..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "أوصد الشاشة"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "بدّل المستخدم"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "اخرج..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "أطفئ..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "مجلد المنزل"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "نظام الملفات"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "ابحث"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "‏%1$s:‏ %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "استعرض"

po/ca.po

@@ -1,226 +0,0 @@
-# Catalan gnome-shell translation.
-# Copyright (C) 2009 Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-10 20:19+0200\n"
-"PO-Revision-Date: 2009-10-10 20:22+0100\n"
-"Last-Translator: Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Gestió de finestres i execució d'aplicacions"
-
-#: ../js/ui/appDisplay.js:335
-msgid "Frequent"
-msgstr "Freqüent"
-
-#: ../js/ui/appIcon.js:462
-msgid "New Window"
-msgstr "Finestra nova"
-
-#: ../js/ui/appIcon.js:475
-msgid "Remove from Favorites"
-msgstr "Elimina dels preferits"
-
-#: ../js/ui/appIcon.js:476
-msgid "Add to Favorites"
-msgstr "Afegeix als preferits"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Cerca..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Més"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(mostra tot)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:763
-#: ../js/ui/dash.js:825
-msgid "APPLICATIONS"
-msgstr "APLICACIONS"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "LLOCS"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:790
-#: ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTS RECENTS"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815
-#: ../js/ui/dash.js:955
-msgid "SEARCH RESULTS"
-msgstr "RESULTATS DE LA CERCA"
-
-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "PREFERÈNCIES"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:272
-msgid "Activities"
-msgstr "Activitats"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:464
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Connecta a..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Introduïu una ordre:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "No s'ha pogut executar «%s»:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:162
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:316
-msgid "Applications"
-msgstr "Aplicacions"
-
-#: ../js/ui/widget.js:341
-msgid "Recent Documents"
-msgstr "Documents recents"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "Fa menys d'un minut"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Fa %d minut"
-msgstr[1] "Fa %d minuts"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Fa %d hora"
-msgstr[1] "Fa %d hores"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Fa %d dia"
-msgstr[1] "Fa %d dies"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Fa %d setmana"
-msgstr[1] "Fa %d setmanes"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "No es pot blocar la pantalla: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "No es pot establir temporalment l'estalvi de pantalla a pantalla negra: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "No es pot sortir: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Informació del compte..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Preferències del sistema..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Bloca la pantalla"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Canvia d'usuari"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Surt..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Atura..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Carpeta d'inici"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Sistema de fitxers"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Cerca"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-

po/cs.po

@@ -1,240 +0,0 @@
-# Czech translation of gnome-shell.
-# Copyright (C) 2009 the author(s) of gnome-shell.
-# This file is distributed under the same license as the gnome-shell package.
-# Andre Klapper <ak-47@gmx.net>, 2009.
-# Petr Kovar <pknbe@volny.cz>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-05 18:03+0100\n"
-"PO-Revision-Date: 2009-11-05 18:03+0100\n"
-"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
-"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.0\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "Prostředí GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Správa oken a spouštění aplikací"
-
-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "Časté"
-
-#: ../js/ui/appDisplay.js:867
-msgid "Drag here to add favorites"
-msgstr "Oblíbené přidáte přetažením sem"
-
-#: ../js/ui/appIcon.js:426
-msgid "New Window"
-msgstr "Nové okno"
-
-#: ../js/ui/appIcon.js:430
-msgid "Remove from Favorites"
-msgstr "Odstranit z oblíbených"
-
-#: ../js/ui/appIcon.js:431
-msgid "Add to Favorites"
-msgstr "Přidat mezi oblíbené"
-
-#: ../js/ui/dash.js:267
-msgid "Find..."
-msgstr "Najít..."
-
-#: ../js/ui/dash.js:376
-msgid "More"
-msgstr "Více"
-
-#: ../js/ui/dash.js:532
-msgid "(see all)"
-msgstr "(zobrazit vše)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:711 ../js/ui/dash.js:773
-msgid "APPLICATIONS"
-msgstr "APLIKACE"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:731
-msgid "PLACES"
-msgstr "MÍSTA"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:738 ../js/ui/dash.js:783
-msgid "RECENT DOCUMENTS"
-msgstr "NEDÁVNÉ DOKUMENTY"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:947
-msgid "SEARCH RESULTS"
-msgstr "VÝSLEDKY HLEDÁNÍ"
-
-#: ../js/ui/dash.js:778
-msgid "PREFERENCES"
-msgstr "PŘEDVOLBY"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:274
-msgid "Activities"
-msgstr "Činnosti"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Připojit se k..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Zadejte prosím příkaz:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Vykonání \"%s\" selhalo:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Aplikace"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Nedávné dokumenty"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "Před méně než minutou"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Před %d minutou"
-msgstr[1] "Před %d minutami"
-msgstr[2] "Před %d minutami"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Před %d hodinou"
-msgstr[1] "Před %d hodinami"
-msgstr[2] "Před %d hodinami"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Před %d dnem"
-msgstr[1] "Před %d dny"
-msgstr[2] "Před %d dny"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Před %d týdnem"
-msgstr[1] "Před %d týdny"
-msgstr[2] "Před %d týdny"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Neznámé"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Nelze uzamknout obrazovku: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Šetřič obrazovky nelze dočasně nastavit na prázdnou obrazovku: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Nelze se odhlásit: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Informace o účtu..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Postranní lišta"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Předvolby systému..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Uzamknout obrazovku"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Přepnout uživatele"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Odhlásit..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Vypnout..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Domovská složka"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Systém souborů"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Hledat"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "Procházet"
-
-#~ msgid "Manager"
-#~ msgstr "Správce"
-
-#~ msgid "The user manager object this user is controlled by."
-#~ msgstr "Objekt správce uživatele, kterým je tento uživatel ovládán."

po/da.po

@@ -1,234 +0,0 @@
-# Danish translation of gnome-shell
-# Copyright (C) 2009 gnome-shell
-# This file is distributed under the same license as the gnome-shell package.
-# Kris Thomsen <lakristho@gmail.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-21 22:51+0200\n"
-"PO-Revision-Date: 2009-10-18 17:32+0200\n"
-"Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "Skal til GNOME"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Vinduehåndtering og åbning af programmer"
-
-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "Ofte"
-
-#: ../js/ui/appIcon.js:410
-msgid "New Window"
-msgstr "Nyt vindue"
-
-#: ../js/ui/appIcon.js:414
-msgid "Remove from Favorites"
-msgstr "Fjern fra favoritter"
-
-#: ../js/ui/appIcon.js:415
-msgid "Add to Favorites"
-msgstr "Tilføj til favoritter"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Find..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Mere"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(se alle)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
-msgid "APPLICATIONS"
-msgstr "PROGRAMMER"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:745
-msgid "PLACES"
-msgstr "STEDER"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
-msgid "RECENT DOCUMENTS"
-msgstr "SENESTE DOKUMENTER"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
-msgid "SEARCH RESULTS"
-msgstr "SØGERESULTATER"
-
-#: ../js/ui/dash.js:792
-msgid "PREFERENCES"
-msgstr "INDSTILLINGER"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:274
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Forbind til..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Indtast en kommando:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Kørsel af \"%s\" mislykkedes:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Programmer"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Seneste dokumenter"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "Mindre end et minut siden"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minut siden"
-msgstr[1] "%d minutter siden"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d time siden"
-msgstr[1] "%d timer siden"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d dag siden"
-msgstr[1] "%d dage siden"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d uge siden"
-msgstr[1] "%d uger siden"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Kan ikke låse skærm: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Kan ikke midlertidigt sætte pauseskærm til blank skærm: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Kan ikke logge ud: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Kontoinformation..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Sidebjælke"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Systemindstillinger..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Lås skærm"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Skift bruger"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Log ud..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Luk ned..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Hjemmemappe"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Filsystem"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Søg"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "Gennemse"
-
-#~ msgid "Find apps or documents"
-#~ msgstr "Find programmer eller dokumenter"
-
-#~ msgid "Manager"
-#~ msgstr "Håndtering"
-
-#~ msgid "The user manager object this user is controlled by."
-#~ msgstr "Brugerhåndteringsobjektet, denne bruger er styret af."

po/de.po

@@ -1,241 +0,0 @@
-# German gnome-shell translation.
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Hendrik Brandt <heb@gnome-de.org>, 2009.
-# Hendrik Richter <hendrikr@gnome.org>, 2009.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
-# Mario Blättermann <mariobl@gnome.org>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2009-10-16 20:05+0000\n"
-"PO-Revision-Date: 2009-10-17 23:37+0200\n"
-"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
-"Language-Team: German <gnome-de@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME-Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Fenster verwalten und Anwendungen starten"
-
-#: ../js/ui/appDisplay.js:335
-msgid "Frequent"
-msgstr "Häufig"
-
-#: ../js/ui/appIcon.js:407
-msgid "New Window"
-msgstr "Neues Fenster"
-
-#: ../js/ui/appIcon.js:420
-msgid "Remove from Favorites"
-msgstr "Aus Favoriten entfernen"
-
-#: ../js/ui/appIcon.js:421
-msgid "Add to Favorites"
-msgstr "Zu Favoriten hinzufügen"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Suchen …"
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Mehr"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(alle sehen)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
-msgid "APPLICATIONS"
-msgstr "ANWENDUNGEN"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:745
-msgid "PLACES"
-msgstr "ORTE"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
-msgid "RECENT DOCUMENTS"
-msgstr "ZULETZT GEÖFFNETE DOKUMENTE"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
-msgid "SEARCH RESULTS"
-msgstr "SUCHERGEBNISSE"
-
-#: ../js/ui/dash.js:792
-msgid "PREFERENCES"
-msgstr "EINSTELLUNGEN"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:273
-msgid "Activities"
-msgstr "Aktivitäten"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:465
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Verbinden mit …"
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Bitte geben Sie einen Befehl ein:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Ausführung von »%s« ist gescheitert:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:162
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:316
-msgid "Applications"
-msgstr "Anwendungen"
-
-#: ../js/ui/widget.js:341
-msgid "Recent Documents"
-msgstr "Zuletzt geöffnete Dokumente"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "Vor weniger als einer Minute"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Vor %d Minute"
-msgstr[1] "Vor %d Minuten"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Vor %d Stunde"
-msgstr[1] "Vor %d Stunden"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Vor %d Tag"
-msgstr[1] "Vor %d Tagen"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Vor %d Woche"
-msgstr[1] "Vor %d Wochen"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Bildschirm kann nicht gesperrt werden: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr ""
-"Der Bildschirmschoner kann vorübergehend nicht auf einen leeren Schirm "
-"gesetzt werden: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Abmelden ist nicht möglich: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Benutzerinformationen …"
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Seitenleiste"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Systemeinstellungen …"
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Bildschirm sperren"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Benutzer wechseln"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Abmelden …"
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Ausschalten …"
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Persönlicher Ordner"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Dateisystem"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Suchen"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Find apps or documents"
-#~ msgstr "Anwendungen oder Dokumente suchen"
-
-#~ msgid "Browse"
-#~ msgstr "Durchsuchen"
-
-#~ msgid "Manager"
-#~ msgstr "Verwaltung"
-
-#~ msgid "The user manager object this user is controlled by."
-#~ msgstr "Das Benutzerverwaltungsobjekt welches diesen Benutzer überwacht."

po/el.po

@@ -1,186 +0,0 @@
-# translation of gnome-shell.po.master.po to Greek
-# Greek translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Jennie Petoumenou <epetoumenou@gmail.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell.po.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2009-10-04 08:03+0000\n"
-"PO-Revision-Date: 2009-10-04 10:25+0200\n"
-"Last-Translator: Jennie Petoumenou <epetoumenou@gmail.com>\n"
-"Language-Team: Greek <<team AT BLOCKSPAM gnome DOT gr>>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "Κέλυφος GNOME"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Διαχείριση παραθύρων και εκκίνηση εφαρμογών"
-
-#. left side
-#: ../js/ui/panel.js:271
-msgid "Activities"
-msgstr "Δραστηριότητες"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:461
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Εύρεση..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Περισσότερα"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(εμφάνιση όλων)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
-msgid "APPLICATIONS"
-msgstr "ΕΦΑΡΜΟΓΕΣ"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "ΤΟΠΟΘΕΣΙΕΣ"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "ΠΡΟΣΦΑΤΑ ΕΓΓΡΑΦΑ"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
-msgid "SEARCH RESULTS"
-msgstr "ΑΠΟΤΕΛΕΣΜΑΤΑ ΑΝΑΖΗΤΗΣΗΣ"
-
-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "ΠΡΟΤΙΜΗΣΕΙΣ"
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Παρακαλώ εισάγετε μία εντολή:"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "Λιγότερο από ένα λεπτό πριν"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d λεπτό πριν"
-msgstr[1] "%d λεπτά πριν"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ώρα πριν"
-msgstr[1] "%d ώρες πριν"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ημέρα πριν"
-msgstr[1] "%d ημέρες πριν"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d εβδομάδα πριν"
-msgstr[1] "%d εβδομάδες πριν"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Άγνωστο"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Αδύνατο το κλείδωμα της οθόνης: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Δεν είναι δυνατή η προσωρινή ρύθμιση της προστασίας οθόνης σε κενή οθόνη: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Αδύνατη η αποσύνδεση: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Πληροφορίες λογαριασμού..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Πλευρική στήλη"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Προστιμήσεις συστήματος..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Κλείδωμα οθόνης"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Αλλαγή χρήστη"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Αποσύνδεση..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Τερματισμός..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Προσωπικός φάκελος"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Σύστημα αρχείων"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Αναζήτηση"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-

po/en_GB.po

@@ -1,184 +0,0 @@
-# British English translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Philip Withnall <philip@tecnocode.co.uk>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2009-09-12 12:41+0000\n"
-"PO-Revision-Date: 2009-09-12 12:41+0000\n"
-"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
-"Language-Team: British English <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Window management and application launching"
-
-#. left side
-#: ../js/ui/panel.js:269
-msgid "Activities"
-msgstr "Activities"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:452
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Find…"
-
-#: ../js/ui/dash.js:400
-msgid "Browse"
-msgstr "Browse"
-
-#: ../js/ui/dash.js:536
-msgid "(see all)"
-msgstr "(see all)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:753 ../js/ui/dash.js:809
-msgid "APPLICATIONS"
-msgstr "APPLICATIONS"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:773
-msgid "PLACES"
-msgstr "PLACES"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:780 ../js/ui/dash.js:819
-msgid "RECENT DOCUMENTS"
-msgstr "RECENT DOCUMENTS"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:799 ../js/ui/dash.js:931
-msgid "SEARCH RESULTS"
-msgstr "SEARCH RESULTS"
-
-#: ../js/ui/dash.js:814
-msgid "PREFERENCES"
-msgstr "PREFERENCES"
-
-#: ../js/ui/runDialog.js:90
-msgid "Please enter a command:"
-msgstr "Please enter a command:"
-
-#: ../src/shell-global.c:799
-msgid "Less than a minute ago"
-msgstr "Less than a minute ago"
-
-#: ../src/shell-global.c:802
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minute ago"
-msgstr[1] "%d minutes ago"
-
-#: ../src/shell-global.c:805
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d hour ago"
-msgstr[1] "%d hours ago"
-
-#: ../src/shell-global.c:808
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d day ago"
-msgstr[1] "%d days ago"
-
-#: ../src/shell-global.c:811
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d week ago"
-msgstr[1] "%d weeks ago"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Can't lock screen: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Can't temporarily set screensaver to blank screen: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Can't logout: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Account Information…"
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Sidebar"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "System Preferences…"
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Lock Screen"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Switch User"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Log Out…"
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Shut Down…"
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Home Folder"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "File System"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Search"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/es.po

@@ -1,228 +0,0 @@
-# Spanish translation of gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Jorge González <jorgegonz@svn.gnome.org>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2009-12-18 15:06+0000\n"
-"PO-Revision-Date: 2009-12-19 14:41+0100\n"
-"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Gestión de ventanas e inicio de aplicaciones"
-
-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:852
-msgid "APPLICATIONS"
-msgstr "APLICACIONES"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "PREFERENCIAS"
-
-#: ../js/ui/appDisplay.js:707 ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Ventana nueva"
-
-#: ../js/ui/appDisplay.js:711 ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Quitar de los favoritos"
-
-#: ../js/ui/appDisplay.js:712 ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Añadir a los favoritos"
-
-#: ../js/ui/appDisplay.js:1064
-msgid "Drag here to add favorites"
-msgstr "Arrastrar aquí para añadir a los favoritos"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Buscar…"
-
-#: ../js/ui/dash.js:437
-#| msgid "Search"
-msgid "Searching..."
-msgstr "Buscando…"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:872 ../js/ui/placeDisplay.js:471
-msgid "PLACES"
-msgstr "LUGARES"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:879
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTOS RECIENTES"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:227
-msgid "Activities"
-msgstr "Actividades"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:440
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/placeDisplay.js:99
-msgid "Connect to..."
-msgstr "Conectar a…"
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Introduzca un comando:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Falló la ejecución de «%s»:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Aplicaciones"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documentos recientes"
-
-#: ../src/shell-global.c:826
-msgid "Less than a minute ago"
-msgstr "Hace menos de un minuto"
-
-#: ../src/shell-global.c:829
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Hace %d minuto"
-msgstr[1] "Hace %d minutos"
-
-#: ../src/shell-global.c:832
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Hace %d hora"
-msgstr[1] "Hace %d horas"
-
-#: ../src/shell-global.c:835
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Hace %d día"
-msgstr[1] "Hace %d días"
-
-#: ../src/shell-global.c:838
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Hace %d semana"
-msgstr[1] "Hace %d semanas"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Carpeta personal"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Sistema de archivos"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Buscar"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Frequent"
-#~ msgstr "Frecuentes"
-
-#~ msgid "More"
-#~ msgstr "Más"
-
-#~ msgid "(see all)"
-#~ msgstr "(ver todo)"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "RESULTADOS DE LA BÚSQUEDA"
-
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "No se puede bloquear la pantalla: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "No se puede establecer temporalmente el salvapantallas a oscurecer "
-#~ "pantalla: %s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "No se puede salir de la sesión: %s"
-
-#~ msgid "Account Information..."
-#~ msgstr "Información de la cuenta…"
-
-#~ msgid "Sidebar"
-#~ msgstr "Barra lateral"
-
-#~ msgid "System Preferences..."
-#~ msgstr "Preferencias del sistema…"
-
-#~ msgid "Lock Screen"
-#~ msgstr "Bloquear la pantalla"
-
-#~ msgid "Switch User"
-#~ msgstr "Cambiar de usuario"
-
-#~ msgid "Log Out..."
-#~ msgstr "Salir…"
-
-#~ msgid "Shut Down..."
-#~ msgstr "Apagar…"
-
-#~ msgid "Browse"
-#~ msgstr "Examine"
-
-#~ msgid "Find apps or documents"
-#~ msgstr "Encuentre aplicaciones o documentos"
-
-#~| msgid "RECENT DOCUMENTS"
-#~ msgid "DOCUMENTS"
-#~ msgstr "DOCUMENTOS"
-
-#~ msgid "Manager"
-#~ msgstr "Gestor"
-
-#~ msgid "The user manager object this user is controlled by."
-#~ msgstr "El objeto de gestión de usuarios que controla a este usuario."

po/fi.po

@@ -1,226 +0,0 @@
-# gnome-shell Finnish translation
-# Copyright (C) 2009 Timo Jyrinki
-# This file is distributed under the same license as the gnome-shell package.
-# Timo Jyrinki <timo.jyrinki@iki.fi>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-04 11:16+0200\n"
-"PO-Revision-Date: 2009-11-04 11:16+0200\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
-"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr ""
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Ikkunanhallinta ja sovelluksien käynnistäminen"
-
-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "Usein käytetyt"
-
-#: ../js/ui/appDisplay.js:867
-msgid "Drag here to add favorites"
-msgstr "Raahaa tähän lisätäksesi suosikkeihin"
-
-#: ../js/ui/appIcon.js:426
-msgid "New Window"
-msgstr "Uusi ikkuna"
-
-#: ../js/ui/appIcon.js:430
-msgid "Remove from Favorites"
-msgstr "Poista suosikeista"
-
-#: ../js/ui/appIcon.js:431
-msgid "Add to Favorites"
-msgstr "Lisää suosikkeihin"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Etsi..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Lisää"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(näytä kaikki)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
-msgid "APPLICATIONS"
-msgstr "SOVELLUKSET"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:745
-msgid "PLACES"
-msgstr "SIJAINNIT"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
-msgid "RECENT DOCUMENTS"
-msgstr "VIIMEISIMMÄT ASIAKIRJAT"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
-msgid "SEARCH RESULTS"
-msgstr "HAKUTULOKSET"
-
-#: ../js/ui/dash.js:792
-msgid "PREFERENCES"
-msgstr "ASETUKSET"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:274
-msgid "Activities"
-msgstr "Toiminnot"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %I.%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Yhdistä..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Syötä komento:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr ""
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%I.%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Sovellukset"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Viimeisimmät asiakirjat"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "Alle minuutti sitten"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minuutti sitten"
-msgstr[1] "%d minuuttia sitten"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d tunti sitten"
-msgstr[1] "%d tuntia sitten"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d päivä sitten"
-msgstr[1] "%d päivää sitten"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d viikko sitten"
-msgstr[1] "%d viikkoa sitten"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Näyttöä ei voi lukita: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr ""
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr ""
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Käyttäjätilin tiedot..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Sivupalkki"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Järjestelmän asetukset"
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Lukitse näyttö"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Vaihda käyttäjää"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Kirjaudu ulos..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Sammuta..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Kotikansio"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Tiedostojärjestelmä"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Haku"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/fr.po

@@ -1,220 +0,0 @@
-# French translations for gnome-shell package.
-# Copyright (C) 2009 THE gnome-shell'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Mathieu Bridon <bochecha@fedoraproject.org>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master fr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2009-11-13 17:44+0000\n"
-"PO-Revision-Date: 2009-12-05 16:43+0100\n"
-"Last-Translator: Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Gestion des fenêtres et lancement des applications"
-
-#: ../js/ui/appDisplay.js:696
-msgid "Drag here to add favorites"
-msgstr "Glisser ici pour ajouter aux favoris"
-
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Nouvelle fenêtre"
-
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Enlever des favoris"
-
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Ajouter aux favoris"
-
-#: ../js/ui/dash.js:237
-msgid "Find..."
-msgstr "Rechercher..."
-
-#. **** Applications ****
-#: ../js/ui/dash.js:656 ../js/ui/dash.js:718
-msgid "APPLICATIONS"
-msgstr "APPLICATIONS"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:676 ../js/ui/dash.js:733
-msgid "PLACES"
-msgstr "RACCOURCIS"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:683 ../js/ui/dash.js:728
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTS RÉCENTS"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:708 ../js/ui/dash.js:898
-msgid "SEARCH RESULTS"
-msgstr "RÉSULTATS DE LA RECHERCHE"
-
-#: ../js/ui/dash.js:723
-msgid "PREFERENCES"
-msgstr "PRÉFÉRENCES"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:274
-msgid "Activities"
-msgstr "Activités"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/placeDisplay.js:84
-msgid "Connect to..."
-msgstr "Connexion à..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Veuillez saisir une commande :"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Exécution de « %s » impossible :"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Applications"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documents récents"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "Il y a moins d'une minute"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Il y a %d minute"
-msgstr[1] "Il y a %d minutes"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Il y a %d heure"
-msgstr[1] "Il y a %d heures"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Il y a %d jour"
-msgstr[1] "Il y a %d jours"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Il y a %d semaine"
-msgstr[1] "Il y a %d semaines"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Impossible de verrouiller l'écran : %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr ""
-"Impossible de régler temporairement l'écran de veille sur un écran vide : %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Impossible de fermer la session : %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Informations personnelles..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Barre latérale"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Préférences du système..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Verrouiller l'écran"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Changer d'utilisateur"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Fermer la session..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Éteindre..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Dossier personnel"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Système de fichiers"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Recherche"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s : %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "Parcourir"

po/ga.po

@@ -1,181 +0,0 @@
-# Irish translations for gnome-shell package.
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell package.
-# Seán de Búrca <leftmostcat@gmail.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 06:01-0600\n"
-"PO-Revision-Date: 2009-08-15 06:01-0600\n"
-"Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
-"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%"
-"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
-
-#. left side
-#: ../js/ui/panel.js:266
-msgid "Activities"
-msgstr "Gníomhartha"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:412
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/dash.js:235
-msgid "Find apps or documents"
-msgstr "Aimsigh feidhmchláir nó cáipéisí"
-
-#: ../js/ui/dash.js:336
-msgid "Browse"
-msgstr "Brabhsáil"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:472 ../js/ui/dash.js:545
-msgid "APPLICATIONS"
-msgstr "FEIDHMCHLÁIR"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:477 ../js/ui/dash.js:570
-msgid "RECENT DOCUMENTS"
-msgstr "CÁIPÉISÍ IS DÉANAÍ"
-
-#. **** Places ****
-#: ../js/ui/dash.js:563
-msgid "PLACES"
-msgstr "ÁITEANNA"
-
-#: ../js/ui/runDialog.js:74
-msgid "Please enter a command:"
-msgstr "Iontráil ordú, le do thoil:"
-
-#: ../src/gdmuser/gdm-user.c:242
-msgid "Manager"
-msgstr "Bainisteoir"
-
-#: ../src/gdmuser/gdm-user.c:243
-msgid "The user manager object this user is controlled by."
-msgstr "An réad bhainisteoir úsáideoirí a rialaíonn an t-úsáideoir seo."
-
-#: ../src/shell-global.c:841
-msgid "Less than a minute ago"
-msgstr "Níos lú ná nóiméad ó shin"
-
-#: ../src/shell-global.c:844
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d nóiméad ó shin"
-msgstr[1] "%d nóiméad ó shin"
-msgstr[2] "%d nóiméad ó shin"
-msgstr[3] "%d nóiméad ó shin"
-msgstr[4] "%d nóiméad ó shin"
-
-#: ../src/shell-global.c:847
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d uair ó shin"
-msgstr[1] "%d uair ó shin"
-msgstr[2] "%d uaire ó shin"
-msgstr[3] "%d n-uaire ó shin"
-msgstr[4] "%d uair ó shin"
-
-#: ../src/shell-global.c:850
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d lá ó shin"
-msgstr[1] "%d lá ó shin"
-msgstr[2] "%d lá ó shin"
-msgstr[3] "%d lá ó shin"
-msgstr[4] "%d lá ó shin"
-
-#: ../src/shell-global.c:853
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d seachtain ó shin"
-msgstr[1] "%d sheachtain ó shin"
-msgstr[2] "%d sheachtain ó shin"
-msgstr[3] "%d seachtain ó shin"
-msgstr[4] "%d seachtain ó shin"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Anaithnid"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Ní féidir scáileán a chur faoi ghlas: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Ní féidir spárálaí scáileáin a shocrú chun scáileán a bhánú: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Ní féidir logáil amach: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Eolas Cuntais..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Barra Taoibh"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Sainroghanna an Chórais..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Cuir Scáileán Faoi Ghlas"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Athraigh Úsáideoir"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Logáil Amach..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Múch..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Fillteán Baile"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Córas Comhad"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Cuardaigh"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/gl.po

@@ -1,220 +0,0 @@
-# Galician translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Fran Diéguez <fran.dieguez@mabishu.com>, 2009.
-# Anton Meixome <certima@certima.net>, 2009.
-# Antón Méixome <meixome@certima.net>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-28 17:07+0100\n"
-"PO-Revision-Date: 2009-12-28 08:11+0100\n"
-"Last-Translator: Antón Méixome <meixome@certima.net>\n"
-"Language-Team: Galician Proxecto Trasno <proxecto@trasno.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.4.0\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Xestor de xanelas e lanzamento de aplicativos"
-
-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:858
-msgid "APPLICATIONS"
-msgstr "APLICATIVOS"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "PREFERENCIAS"
-
-#: ../js/ui/appDisplay.js:707 ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Xanela nova"
-
-#: ../js/ui/appDisplay.js:711 ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Eliminar de Favoritos"
-
-#: ../js/ui/appDisplay.js:712 ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Engadir a Favoritos"
-
-#: ../js/ui/appDisplay.js:1064
-msgid "Drag here to add favorites"
-msgstr "Arrastra aquí para engadir favoritos"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Buscar..."
-
-#: ../js/ui/dash.js:437
-msgid "Searching..."
-msgstr "Buscando..."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:878 ../js/ui/placeDisplay.js:519
-msgid "PLACES"
-msgstr "LUGARES"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:885
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTOS RECENTES"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:227
-msgid "Activities"
-msgstr "Actividades"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:440
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Conectar con..."
-
-#: ../js/ui/runDialog.js:235
-msgid "Please enter a command:"
-msgstr "Insira unha orde:"
-
-#: ../js/ui/runDialog.js:351
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Fallou a execución de %s"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Aplicativos"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documentos recentes"
-
-#: ../src/shell-global.c:890
-msgid "Less than a minute ago"
-msgstr "Hai menos dun minuto"
-
-#: ../src/shell-global.c:893
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "hai %d minuto"
-msgstr[1] "hai %d minutos"
-
-#: ../src/shell-global.c:896
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "hai %d hora"
-msgstr[1] "hai %d horas"
-
-#: ../src/shell-global.c:899
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "hai %d día"
-msgstr[1] "hai %d días"
-
-#: ../src/shell-global.c:902
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "hai %d semana"
-msgstr[1] "hai %d semanas"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Cartafol persoal"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Sistema de ficheiros"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Buscar"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "RESULTADOS DA BUSCA"
-
-#~ msgid "Unknown"
-#~ msgstr "Descoñecido"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Non foi posíbel bloquear a pantalla: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "Non foi posíbel estabelecer temporalmente o salvapantallas a unha "
-#~ "pantalla en branco: %s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "Non foi posíbel pechar a sesión: %s"
-
-#~ msgid "Account Information..."
-#~ msgstr "Información da conta..."
-
-#~ msgid "Sidebar"
-#~ msgstr "Barra lateral"
-
-#~ msgid "System Preferences..."
-#~ msgstr "Preferencias do sistema..."
-
-#~ msgid "Lock Screen"
-#~ msgstr "Bloquear pantalla"
-
-#~ msgid "Switch User"
-#~ msgstr "Cambiar de usuario"
-
-#~ msgid "Log Out..."
-#~ msgstr "Saír da sesión..."
-
-#~ msgid "Shut Down..."
-#~ msgstr "Apagar..."
-
-#~ msgid "Browse"
-#~ msgstr "Explorar"
-
-#~ msgid "(see all)"
-#~ msgstr "(ver todos)"
-
-#~ msgid "Find apps or documents"
-#~ msgstr "Atopar aplicativos ou documentos"
-
-#, fuzzy
-#~ msgid "DOCUMENTS"
-#~ msgstr "DOCUMENTOS RECENTES"
-
-#~ msgid "Manager"
-#~ msgstr "Xestor"

po/he.po

@@ -1,215 +0,0 @@
-# Hebrew translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# liel <lielft@gmail.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2009-11-13 17:44+0000\n"
-"PO-Revision-Date: 2009-11-28 17:33+0200\n"
-"Last-Translator: Liel Fridman <lielft@gmail.com>\n"
-"Language-Team: Hebrew <he@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "מעטפת GNOME"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "ניהול חלונות והרצת יישומים"
-
-#: ../js/ui/appDisplay.js:696
-msgid "Drag here to add favorites"
-msgstr "יש לגרור פריטים לכאן כדי להוסיף מועדפים"
-
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "חלון חדש"
-
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "הסר מהמועדפים"
-
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "הוסף למועדפים"
-
-#: ../js/ui/dash.js:237
-msgid "Find..."
-msgstr "חפש..."
-
-#. **** Applications ****
-#: ../js/ui/dash.js:656 ../js/ui/dash.js:718
-msgid "APPLICATIONS"
-msgstr "יישומים"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:676 ../js/ui/dash.js:733
-msgid "PLACES"
-msgstr "מקומות"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:683 ../js/ui/dash.js:728
-msgid "RECENT DOCUMENTS"
-msgstr "מסמכים אחרונים"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:708 ../js/ui/dash.js:898
-msgid "SEARCH RESULTS"
-msgstr "תוצאות חיפוש"
-
-#: ../js/ui/dash.js:723
-msgid "PREFERENCES"
-msgstr "העדפות"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:274
-msgid "Activities"
-msgstr "פעילויות"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/placeDisplay.js:84
-msgid "Connect to..."
-msgstr "התחבר אל..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "נא להזין פקודה:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "ההרצה של '%s' נכשלה:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "יישומים"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "מסמכים אחרונים"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "לפני פחות מדקה"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "לפני דקה"
-msgstr[1] "לפני %d דקות"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "לפני שעה"
-msgstr[1] "לפני %d שעות"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "לפני יום"
-msgstr[1] "לפני %d ימים"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "לפני שבוע"
-msgstr[1] "לפני %d שבועות"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "לא ידוע"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "לא ניתן לנעול את המסך: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "לא ניתן זמנית לקבוע שומר מסך כמסך שחור: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "לא ניתן להתנתק: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "מידע על המשתמש..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "סרגל צד"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "העדפות מערכת..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "נעילת המסך"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "החלף משתמש"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "ניתוק..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "כיבוי..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "תיקיית הבית"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "מערכת הקבצים"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "חפש"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/hu.po

@@ -1,187 +0,0 @@
-# Hungarian translation of gnome-shell
-# Copyright 2009. Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:41+0200\n"
-"PO-Revision-Date: 2009-09-28 13:42+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome at fsf dot hu>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Ablakkezelés és alkalmazásindítás"
-
-#. left side
-#: ../js/ui/panel.js:269
-msgid "Activities"
-msgstr "Tevékenységek"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:452
-msgid "%a %l:%M %p"
-msgstr "%a., %k.%M"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Keresés…"
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Több"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(összes megjelenítése)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
-msgid "APPLICATIONS"
-msgstr "ALKALMAZÁSOK"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "HELYEK"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "LEGUTÓBBI DOKUMENTUMOK"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:958
-msgid "SEARCH RESULTS"
-msgstr "TALÁLATOK"
-
-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "BEÁLLÍTÁSOK"
-
-#: ../js/ui/runDialog.js:94
-msgid "Please enter a command:"
-msgstr "Adjon meg egy parancsot:"
-
-#: ../src/shell-global.c:799
-msgid "Less than a minute ago"
-msgstr "Kevesebb, mint egy perce"
-
-#: ../src/shell-global.c:802
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d perce"
-msgstr[1] "%d perce"
-
-#: ../src/shell-global.c:805
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d órája"
-msgstr[1] "%d órája"
-
-#: ../src/shell-global.c:808
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d napja"
-msgstr[1] "%d napja"
-
-#: ../src/shell-global.c:811
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d hete"
-msgstr[1] "%d hete"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Nem lehet zárolni a képernyőt: %s "
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr ""
-"Átmenetileg nem lehet beállítani a képernyővédőt a képernyő elsötétítésére: %"
-"s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Nem lehet kijelentkezni: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Fiókinformációk…"
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Oldalsáv"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Rendszerbeállítások…"
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Képernyő zárolása"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Felhasználóváltás"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Kijelentkezés…"
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Leállítás…"
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Saját mappa"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Fájlrendszer"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Oldalsáv"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-

po/it.po

@@ -1,213 +0,0 @@
-# Italian translations for gnome-shell package.
-# Copyright (C) 2009 the gnome-shell copyright holder
-# This file is distributed under the same license as the gnome-shell package.
-# Milo Casagrande <milo@ubuntu.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-28 21:58+0100\n"
-"PO-Revision-Date: 2009-12-28 21:59+0100\n"
-"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Gestione finestre e avvio applicazioni"
-
-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:858
-msgid "APPLICATIONS"
-msgstr "Applicazioni"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "Preferenze"
-
-#: ../js/ui/appDisplay.js:707 ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Nuova finestra"
-
-#: ../js/ui/appDisplay.js:711 ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Rimuovi dai preferiti"
-
-#: ../js/ui/appDisplay.js:712 ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Aggiungi ai preferiti"
-
-#: ../js/ui/appDisplay.js:1064
-msgid "Drag here to add favorites"
-msgstr "Trascinare qui per aggiungere ai preferiti"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Trova..."
-
-#: ../js/ui/dash.js:437
-msgid "Searching..."
-msgstr "Ricerca..."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:878 ../js/ui/placeDisplay.js:519
-msgid "PLACES"
-msgstr "Risorse"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:885
-msgid "RECENT DOCUMENTS"
-msgstr "Documenti recenti"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:227
-msgid "Activities"
-msgstr "Attività"
-
-# (ndt) proviamo col k, se non funge, sappiamo il perché...
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:440
-msgid "%a %l:%M %p"
-msgstr "%a %k.%M"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Connetti a..."
-
-#: ../js/ui/runDialog.js:235
-msgid "Please enter a command:"
-msgstr "Inserire un comando:"
-
-#: ../js/ui/runDialog.js:351
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Esecuzione di «%s» non riuscita:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%k.%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Applicazioni"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documenti recenti"
-
-#: ../src/shell-global.c:890
-msgid "Less than a minute ago"
-msgstr "Meno di un minuto fa"
-
-#: ../src/shell-global.c:893
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minuto fa"
-msgstr[1] "%d minuti fa"
-
-#: ../src/shell-global.c:896
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ora fa"
-msgstr[1] "%d ore fa"
-
-#: ../src/shell-global.c:899
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d giorno fa"
-msgstr[1] "%d giorni fa"
-
-#: ../src/shell-global.c:902
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d settimana fa"
-msgstr[1] "%d settimane fa"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Cartella home"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "File system"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Cerca"
-
-# (ndt) valutare...
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Frequent"
-#~ msgstr "Frequente"
-
-#~ msgid "More"
-#~ msgstr "Altro"
-
-#~ msgid "(see all)"
-#~ msgstr "(vedi tutto)"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "Risultati ricerca"
-
-# (ndt) valutare se vada al femminile
-#~ msgid "Unknown"
-#~ msgstr "Sconosciuto"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Impossibile bloccare lo schermo: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "Impossibile impostare temporaneamente il salva schermo a schermo nero: %s "
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "Impossibile terminare la sessione: %s"
-
-#~ msgid "Account Information..."
-#~ msgstr "Informazioni account..."
-
-#~ msgid "Sidebar"
-#~ msgstr "Barra laterale"
-
-#~ msgid "System Preferences..."
-#~ msgstr "Preferenze di sistema..."
-
-#~ msgid "Lock Screen"
-#~ msgstr "Blocca schermo"
-
-#~ msgid "Switch User"
-#~ msgstr "Cambia utente"
-
-#~ msgid "Log Out..."
-#~ msgstr "Termina sessione..."
-
-# (ndt) da valutare... pare che ora anche Windows usi 'Arresta...'...
-#~ msgid "Shut Down..."
-#~ msgstr "Spegni..."

po/ko.po

@@ -1,166 +0,0 @@
-# gnome-shell korean translation.
-# Copyright (C) 2009 THE gnome-shell'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Young-Ho Cha <ganadist@gmail.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 10:09+0900\n"
-"PO-Revision-Date: 2009-08-21 10:10+0900\n"
-"Last-Translator: Young-Ho Cha <ganadist@gmail.com>\n"
-"Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "그놈 쉘"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "창 관리와 프로그램 시작"
-
-#. left side
-#: ../js/ui/panel.js:266
-msgid "Activities"
-msgstr ""
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:433
-msgid "%a %l:%M %p"
-msgstr "%A %p %l:%M"
-
-#: ../js/ui/dash.js:250
-msgid "Find apps or documents"
-msgstr "프로그램과 문서를 찾습니다"
-
-#: ../js/ui/dash.js:368
-msgid "Browse"
-msgstr "찾아보기"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:504 ../js/ui/dash.js:577
-msgid "APPLICATIONS"
-msgstr "프로그램"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:509 ../js/ui/dash.js:604
-msgid "RECENT DOCUMENTS"
-msgstr "최근 문서"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:597
-msgid "PLACES"
-msgstr "위치"
-
-#: ../js/ui/runDialog.js:75
-msgid "Please enter a command:"
-msgstr "명령을 입력하십시오:"
-
-#: ../src/shell-global.c:841
-msgid "Less than a minute ago"
-msgstr "1분 이내"
-
-#: ../src/shell-global.c:844
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d분 전"
-
-#: ../src/shell-global.c:847
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d시간 전"
-
-#: ../src/shell-global.c:850
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d일 전"
-
-#: ../src/shell-global.c:853
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d주 전"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "알 수 없음"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "화면을 잠글 수 없습니다: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "임시로 화면보호기를 빈 화면으로 설정할 수 없습니다: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "로그아웃 할 수 없습니다: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "계정 정보..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "사이드바"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "시스템 설정..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "화면 잠그기"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "사용자 바꾸기"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "로그아웃..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "컴퓨터 끄기..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "내 폴더"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "파일시스템"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "찾기"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%s: %s"

po/nb.po

@@ -1,183 +0,0 @@
-# Norwegian bokmål translation of gnome-shell.
-# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Kjartan Maraas <kmaraas@broadpark.no>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell 0.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-03 10:47+0200\n"
-"PO-Revision-Date: 2009-10-03 10:48+0200\n"
-"Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n"
-"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Vindushåndtering og oppstart av programmer"
-
-#. left side
-#: ../js/ui/panel.js:271
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:461
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Finn..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Mer"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(se alle)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
-msgid "APPLICATIONS"
-msgstr "PROGRAMMER"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "STEDER"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "SISTE DOKUMENTER"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
-msgid "SEARCH RESULTS"
-msgstr "SØKERESULTATER"
-
-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "BRUKERVALG"
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Oppgi en kommando:"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "Mindre enn ett minutt siden"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minutt siden"
-msgstr[1] "%d minutter siden"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d time siden"
-msgstr[1] "%d timer siden"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d dag siden"
-msgstr[1] "%d dager siden"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d uke siden"
-msgstr[1] "%d uker siden"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Kan ikke låse skjermen: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Kan ikke sette skjermsparer midlertidig til blank skjerm: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Kan ikke logge ut: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Kontoinformasjon..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Sidelinje"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Brukervalg for systemet..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Lås skjerm"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Bytt bruker"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Logg ut..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Slå av..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Hjemmemappe"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Filsystem"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Søk"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/nl.po

@@ -1,179 +0,0 @@
-# Dutch translation for gnome-shell
-#
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Sander Dijkhuis <sander.dijkhuis@gmail.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 14:37+0200\n"
-"PO-Revision-Date: 2009-08-29 15:10+0200\n"
-"Last-Translator: Sander Dijkhuis <sander.dijkhuis@gmail.com>\n"
-"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Vensterbeheer en toepassingen starten"
-
-#. left side
-#: ../js/ui/panel.js:271
-msgid "Activities"
-msgstr "Activiteiten"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:451
-msgid "%a %l:%M %p"
-msgstr "%a %k:%M"
-
-#: ../js/ui/dash.js:256
-msgid "Find..."
-msgstr "Zoeken…"
-
-#: ../js/ui/dash.js:374
-msgid "Browse"
-msgstr "Bladeren"
-
-#: ../js/ui/dash.js:451
-msgid "(see all)"
-msgstr "(alles tonen)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:634 ../js/ui/dash.js:682
-msgid "APPLICATIONS"
-msgstr "TOEPASSINGEN"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:654
-msgid "PLACES"
-msgstr "LOCATIES"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:661 ../js/ui/dash.js:694
-msgid "RECENT DOCUMENTS"
-msgstr "RECENTE DOCUMENTEN"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:680
-msgid "SEARCH RESULTS"
-msgstr "ZOEKRESULTATEN"
-
-#: ../js/ui/runDialog.js:82
-msgid "Please enter a command:"
-msgstr "Voer een opdracht in:"
-
-#: ../src/shell-global.c:840
-msgid "Less than a minute ago"
-msgstr "Korter dan een minuut geleden"
-
-#: ../src/shell-global.c:843
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minuut geleden"
-msgstr[1] "%d minuten geleden"
-
-#: ../src/shell-global.c:846
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d uur geleden"
-msgstr[1] "%d uur geleden"
-
-#: ../src/shell-global.c:849
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d dag geleden"
-msgstr[1] "%d dagen geleden"
-
-#: ../src/shell-global.c:852
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d week geleden"
-msgstr[1] "%d weken geleden"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Kan het scherm niet vergrendelen: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Kan de schermbeveiliging niet tijdelijk als zwart scherm instellen: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Kan niet afmelden: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Account-informatie…"
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Zijbalk"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Systeemvoorkeuren…"
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Scherm vergrendelen"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Gebruiker wisselen"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Afmelden…"
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Afsluiten…"
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Persoonlijke map"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Bestandssysteem"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Zoeken"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/pa.po

@@ -1,227 +0,0 @@
-# Punjabi translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-#
-# A S Alam <aalam@users.sf.net>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2009-10-09 22:10+0000\n"
-"PO-Revision-Date: 2009-10-15 06:18+0530\n"
-"Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "ਗਨੋਮ ਸ਼ੈਲ"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "ਵਿੰਡੋ ਪਰਬੰਧ ਅਤੇ ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਓ"
-
-#: ../js/ui/appDisplay.js:335
-msgid "Frequent"
-msgstr "ਅਕਸਰ"
-
-#: ../js/ui/appIcon.js:462
-msgid "New Window"
-msgstr "ਨਵੀਂ ਵਿੰਡੋ"
-
-#: ../js/ui/appIcon.js:475
-msgid "Remove from Favorites"
-msgstr "ਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਓ"
-
-#: ../js/ui/appIcon.js:476
-msgid "Add to Favorites"
-msgstr "ਪਸੰਦ 'ਚ ਸ਼ਾਮਲ ਕਰੋ"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "ਖੋਜ..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "ਹੋਰ"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(ਸਭ ਵੇਖੋ)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
-msgid "APPLICATIONS"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "ਥਾਵਾਂ"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "ਤਾਜ਼ਾ ਡੌਕੂਮੈਂਟ"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
-msgid "SEARCH RESULTS"
-msgstr "ਖੋਜ ਨਤੀਜੇ"
-
-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "ਪਸੰਦ"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:272
-msgid "Activities"
-msgstr "ਸਰਗਰਮੀਆਂ"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:464
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "...ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "ਕਮਾਂਡ ਦਿਓ ਜੀ:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "'%s' ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:162
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:316
-msgid "Applications"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ"
-
-#: ../js/ui/widget.js:341
-msgid "Recent Documents"
-msgstr "ਤਾਜ਼ਾ ਡੌਕੂਮੈਂਟ"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "ਇੱਕ ਮਿੰਟ ਤੋਂ ਘੱਟ ਚਿਰ ਪਹਿਲਾਂ"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
-msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
-msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
-msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d ਹਫ਼ਤਾ ਪਹਿਲਾਂ"
-msgstr[1] "%d ਹਫ਼ਤੇ ਪਹਿਲਾਂ"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "ਸਕਰੀਨ ਲਾਕ ਨਹੀਂ ਹੋ ਸਕਦੀ: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "ਸਕਰੀਨ ਬੰਦ ਕਰਨ ਲਈ ਆਰਜ਼ੀ ਰੂਪ ਵਿੱਚ ਸਕਰੀਨ-ਸੇਵਰ ਨਹੀਂ ਸੈੱਟ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "ਲਾਗਆਉਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "ਬਾਹੀ"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "ਸਿਸਟਮ ਪਸੰਦ..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "ਸਕਰੀਨ ਲਾਕ ਕਰੋ"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "ਯੂਜ਼ਰ ਬਦਲੋ"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "ਲਾਗਆਉਟ..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "ਬੰਦ ਕਰੋ..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "ਘਰ ਫੋਲਡਰ"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "ਫਾਇਲ ਸਿਸਟਮ"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "ਖੋਜ"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "ਝਲਕ"

po/pl.po

@@ -1,188 +0,0 @@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aviary.pl
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-# gnomepl@aviary.pl
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-09 03:06+0200\n"
-"PO-Revision-Date: 2009-09-09 03:02+0100\n"
-"Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
-"Language-Team: Polish <gnomepl@aviary.pl>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "Powłoka środowiska GNOME"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Zarządzanie oknami i uruchamianiem programów"
-
-#. left side
-#: ../js/ui/panel.js:269
-msgid "Activities"
-msgstr "Czynności"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:452
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/dash.js:255
-msgid "Find..."
-msgstr "Znajdź..."
-
-#: ../js/ui/dash.js:372
-msgid "Browse"
-msgstr "Przeglądaj"
-
-#: ../js/ui/dash.js:508
-msgid "(see all)"
-msgstr "(wyświetl wszystko)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:700 ../js/ui/dash.js:756 ../js/ui/dash.js:887
-msgid "APPLICATIONS"
-msgstr "Programy"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:720
-msgid "PLACES"
-msgstr "Miejsca"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:727 ../js/ui/dash.js:768 ../js/ui/dash.js:861
-msgid "RECENT DOCUMENTS"
-msgstr "Ostatnie dokumenty"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:746 ../js/ui/dash.js:850 ../js/ui/dash.js:876
-msgid "SEARCH RESULTS"
-msgstr "Wyniki wyszukiwania"
-
-#: ../js/ui/runDialog.js:90
-msgid "Please enter a command:"
-msgstr "Proszę wprowadzić polecenie:"
-
-#: ../src/shell-global.c:799
-msgid "Less than a minute ago"
-msgstr "Mniej niż minutę temu"
-
-#: ../src/shell-global.c:802
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minuta temu"
-msgstr[1] "%d minuty temu"
-msgstr[2] "%d minut temu"
-
-#: ../src/shell-global.c:805
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d godzina temu"
-msgstr[1] "%d godziny temu"
-msgstr[2] "%d godzin temu"
-
-#: ../src/shell-global.c:808
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d dzień temu"
-msgstr[1] "%d dni temu"
-msgstr[2] "%d dni temu"
-
-#: ../src/shell-global.c:811
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d tydzień temu"
-msgstr[1] "%d tygodnie temu"
-msgstr[2] "%d tygodni temu"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Nieznane"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Nie można zablokować ekranu: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr ""
-"Nie można tymczasowo ustawić wygaszacza ekranu na wygaszenie ekranu: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Nie można się wylogować: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Informacje o koncie..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Panel boczny"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Preferencje systemu..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Zablokuj ekran"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Przełącz użytkownika"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Wyloguj się..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Wyłącz komputer..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Katalog domowy"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "System plików"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Wyszukaj"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/pt_BR.po

@@ -1,231 +0,0 @@
-# Portuguese translations for gnome-shell package.
-# Copyright (C) 2009 THE gnome-shell'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Og Maciel <ogmaciel@gnome.org>, 2009.
-# Rodrigo Flores <mail@rodrigoflores.org>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2009-11-12 21:33+0000\n"
-"PO-Revision-Date: 2009-11-14 11:53-0200\n"
-"Last-Translator: Amanda Magalhães <amandinhakee@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Gerenciamento de janelas e lançador de aplicações"
-
-#: ../js/ui/appDisplay.js:696
-msgid "Drag here to add favorites"
-msgstr "Arraste até aqui para adicionar aos favoritos"
-
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Nova janela"
-
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Remover dos Favoritos"
-
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Adicionar aos Favoritos"
-
-#: ../js/ui/dash.js:237
-msgid "Find..."
-msgstr "Procurar..."
-
-#. **** Applications ****
-#: ../js/ui/dash.js:656 ../js/ui/dash.js:718
-msgid "APPLICATIONS"
-msgstr "APLICATIVOS"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:676 ../js/ui/dash.js:733
-msgid "PLACES"
-msgstr "LOCAIS"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:683 ../js/ui/dash.js:728
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTOS RECENTES"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:708 ../js/ui/dash.js:898
-msgid "SEARCH RESULTS"
-msgstr "RESULTADOS DA BUSCA"
-
-#: ../js/ui/dash.js:723
-msgid "PREFERENCES"
-msgstr "PREFERÊNCIAS"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:274
-msgid "Activities"
-msgstr "Atividades"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/placeDisplay.js:84
-msgid "Connect to..."
-msgstr "Conectar ao..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Por favor digite um comando:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "A execução de \"%s\" falhou:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Aplicações"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documentos Recentes"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "Menos de um minuto atrás"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minuto atrás"
-msgstr[1] "%d minutos atrás"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d hora atrás"
-msgstr[1] "%d horas atrás"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d dia atrás"
-msgstr[1] "%d dias atrás"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d semana atrás"
-msgstr[1] "%d semanas atrás"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Não foi possível travar a tela: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Não foi possível definir a proteção de tela para uma tela vazia: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Não foi possível encerrar a sessão: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Informação da conta..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Preferências do sistema..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Travar a tela"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Alternar usuário"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Encerrar sessão..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Desligar..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Pasta home"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Sistema de arquivos"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Procurar"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "Navegar"
-
-#~ msgid "(see all)"
-#~ msgstr "(veja todos)"
-
-#~ msgid "Find apps or documents"
-#~ msgstr "Localizar aplicativos ou documentos"
-
-#~ msgid "Manager"
-#~ msgstr "Gerenciador"
-
-#~ msgid "The user manager object this user is controlled by."
-#~ msgstr "O objeto gerenciador de usuários que controla este usuário."

po/ro.po

@@ -1,232 +0,0 @@
-# Romanian translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:25+0200\n"
-"PO-Revision-Date: 2009-10-28 22:33+0200\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
-"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Administrare de ferestre și lansare de aplicații"
-
-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "Frecvent"
-
-#: ../js/ui/appDisplay.js:867
-msgid "Drag here to add favorites"
-msgstr "Adăugați aici favorite cu mausul"
-
-#: ../js/ui/appIcon.js:426
-msgid "New Window"
-msgstr "Fereastră nouă"
-
-#: ../js/ui/appIcon.js:430
-msgid "Remove from Favorites"
-msgstr "Șterge din favorite"
-
-#: ../js/ui/appIcon.js:431
-msgid "Add to Favorites"
-msgstr "Adaugă la favorite"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Caută..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Mai multe"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(arată tot)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
-msgid "APPLICATIONS"
-msgstr "APPLICAȚII"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:745
-msgid "PLACES"
-msgstr "LOCAȚII"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTE RECENTE"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
-msgid "SEARCH RESULTS"
-msgstr "REZULTATELE CĂUTĂRII"
-
-#: ../js/ui/dash.js:792
-msgid "PREFERENCES"
-msgstr "PREFERINȚE"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:274
-msgid "Activities"
-msgstr "Activități"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Conectare la..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Introduceți o comandă:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Execuția comenzii „%s” a eșuat:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Aplicații"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documente recente"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "În ultimul minut"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "acum un minut"
-msgstr[1] "acum %d minute"
-msgstr[2] "acum %d de minute"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "acum o oră"
-msgstr[1] "acum %d ore"
-msgstr[2] "acum %d de ore"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "acum o zi"
-msgstr[1] "acum %d zile"
-msgstr[2] "acum %d de zile"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "acum o săptămână"
-msgstr[1] "acum %d săptămâni"
-msgstr[2] "acum %d de săptămâni"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Necunoscut"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Nu s-a putut bloca ecranul: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Nu s-a putut folosi temporar un ecran gol pentru economizorul de "
-"ecran: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Nu se poate ieși din sesiune: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Informații despre cont..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Bară laterală"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Preferințe de sistem..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Blocare ecran"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Alt utilizator"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Ieșire..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Oprire..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Dosar personal"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Sistem de fișiere"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Caută"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-

po/ru.po

@@ -1,233 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Andrey Korzinev <fellrond@gmail.com>, 2009.
-# Sergey V. Kovylov <serejka@gmail.com>, 2009.
-# Marina Zhurakhinskaya <marinaz@redhat.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2009-10-09 00:27-0400\n"
-"PO-Revision-Date: 2009-10-09 00:27-0400\n"
-"Last-Translator: Marina Zhurakhinskaya <marinaz@redhat.com>\n"
-"Language-Team: Russian <gnome-cyr@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Управление окнами и запуск приложений"
-
-#: ../js/ui/appDisplay.js:335
-msgid "Frequent"
-msgstr "Часто используемые"
-
-#: ../js/ui/appIcon.js:462
-msgid "New Window"
-msgstr "Новое окно"
-
-#: ../js/ui/appIcon.js:475
-msgid "Remove from Favorites"
-msgstr "Удалить из избранного"
-
-#: ../js/ui/appIcon.js:476
-msgid "Add to Favorites"
-msgstr "Добавить в избранное"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Найти…"
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Ещё"
-
-#: ../js/ui/dash.js:543
-#: "(увидеть все)" does not fit when it is next to "НЕДАВНИЕ ДОКУМЕНТЫ", so I'm just using "(все)"
-msgid "(see all)"
-msgstr "(все)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
-msgid "APPLICATIONS"
-msgstr "ПРИЛОЖЕНИЯ"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "ПАПКИ И РЕСУРСЫ"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "НЕДАВНИЕ ДОКУМЕНТЫ"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
-msgid "SEARCH RESULTS"
-msgstr "РЕЗУЛЬТАТЫ ПОИСКА"
-
-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "НАСТРОЙКИ"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:272
-#. Another word that was considered was "Обзор", but it was decided that it doesn't give a full sense of the actions
-#. possible when in the overview mode.
-msgid "Activities"
-msgstr "Действия"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:464
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Соединиться с…"
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Введите команду:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Не удалось выполнить «%s»:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:162
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:316
-msgid "Applications"
-msgstr "Приложения"
-
-#: ../js/ui/widget.js:341
-msgid "Recent Documents"
-msgstr "Недавние документы"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "Менее минуты назад"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d минуту назад"
-msgstr[1] "%d минуты назад"
-msgstr[2] "%d минут назад"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d час назад"
-msgstr[1] "%d часа назад"
-msgstr[2] "%d часов назад"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d день назад"
-msgstr[1] "%d дня назад"
-msgstr[2] "%d дней назад"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d неделю назад"
-msgstr[1] "%d недели назад"
-msgstr[2] "%d недель назад"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Неизвестно"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Не удалось заблокировать экран: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Не удалось временно установить пустую экранную заставку: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Не удалось завершить сеанс пользователя: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Информация о пользователе…"
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Боковая панель"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Системные настройки…"
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Заблокировать экран"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Сменить пользователя"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Завершить сеанс…"
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Выключить…"
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Домашняя папка"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Файловая система"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Поиск"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/sl.po

@@ -1,216 +0,0 @@
-# Slovenian translation of gnome-shell package.
-# Copyright (C) 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Matej Urbančič <mateju@svn.gnome.org>, 2009 - 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2010-01-05 01:21+0000\n"
-"PO-Revision-Date: 2010-01-05 09:09+0100\n"
-"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
-"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: Slovenian\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "Gnome lupina"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Upravljanje oken in zaganjanje programov"
-
-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252
-#: ../js/ui/dash.js:858
-msgid "APPLICATIONS"
-msgstr "Programi"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "Možnosti"
-
-#: ../js/ui/appDisplay.js:707
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Novo okno"
-
-#: ../js/ui/appDisplay.js:711
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Odstrani iz priljubljenih"
-
-#: ../js/ui/appDisplay.js:712
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Dodaj med priljubljene"
-
-#: ../js/ui/appDisplay.js:1064
-msgid "Drag here to add favorites"
-msgstr "S potegom na to mesto se izbor doda med priljubljene"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Najdi ..."
-
-#: ../js/ui/dash.js:437
-msgid "Searching..."
-msgstr "Iskanje ..."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:878
-#: ../js/ui/placeDisplay.js:519
-msgid "PLACES"
-msgstr "Mesta"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:885
-msgid "RECENT DOCUMENTS"
-msgstr "Nedavni dokumenti"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:227
-msgid "Activities"
-msgstr "Dejavnosti"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:440
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Povezava z ..."
-
-#: ../js/ui/runDialog.js:235
-msgid "Please enter a command:"
-msgstr "Vnos ukaza:"
-
-#: ../js/ui/runDialog.js:351
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Izvajanje '%s' je spodletelo:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Programi"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Nedavni dokumenti"
-
-#: ../src/shell-global.c:890
-msgid "Less than a minute ago"
-msgstr "Pred manj kot eno minuto"
-
-#: ../src/shell-global.c:893
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Pred %d minutami"
-msgstr[1] "Pred %d minuto"
-msgstr[2] "Pred %d minutama"
-msgstr[3] "Pred %d minutami"
-
-#: ../src/shell-global.c:896
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Pred %d urami"
-msgstr[1] "Pred %d uro"
-msgstr[2] "Pred %d urama"
-msgstr[3] "Pred %d urami"
-
-#: ../src/shell-global.c:899
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Pred %d dnevi"
-msgstr[1] "Pred %d dnevom"
-msgstr[2] "Pred %d dnevoma"
-msgstr[3] "Pred %d dnevi"
-
-#: ../src/shell-global.c:902
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Pred %d tedni"
-msgstr[1] "Pred %d tednom"
-msgstr[2] "Pred %d tednoma"
-msgstr[3] "Pred %d tedni"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Domača mapa"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Datotečni sistem"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Poišči"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "Rezultati iskanja"
-#~ msgid "Unknown"
-#~ msgstr "Neznano"
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Ni mogoče zakleniti zaslona: %s"
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "Ni mogoče začasno nastaviti črnega zaslona za ohranjevalnik zaslona: %s"
-#~ msgid "Can't logout: %s"
-#~ msgstr "Ni se mogoče odjaviti: %s"
-#~ msgid "Account Information..."
-#~ msgstr "Podrobnosti računa ..."
-#~ msgid "Sidebar"
-#~ msgstr "Stranska vrstica"
-#~ msgid "System Preferences..."
-#~ msgstr "Sistemske možnosti ..."
-#~ msgid "Lock Screen"
-#~ msgstr "Zakleni zaslon"
-#~ msgid "Switch User"
-#~ msgstr "Preklop uporabnika"
-#~ msgid "Log Out..."
-#~ msgstr "Odjava ..."
-#~ msgid "Shut Down..."
-#~ msgstr "Izklopi ..."
-#~ msgid "Frequent"
-#~ msgstr "Pogosto"
-#~ msgid "More"
-#~ msgstr "Več"
-#~ msgid "(see all)"
-#~ msgstr "(poglej vse)"
-#~ msgid "Browse"
-#~ msgstr "Prebrskaj"
-

po/sv.po

@@ -1,207 +0,0 @@
-# Swedish translation for gnome-shell.
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell package.
-# Daniel Nylander <po@danielnylander.se>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:52+0100\n"
-"PO-Revision-Date: 2009-12-01 23:53+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME-skal"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Fönsterhantering och programstarter"
-
-#: ../js/ui/appDisplay.js:580
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Nytt fönster"
-
-#: ../js/ui/appDisplay.js:584
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Ta bort från favoriter"
-
-#: ../js/ui/appDisplay.js:585
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Lägg till som favorit"
-
-#: ../js/ui/appDisplay.js:1029
-msgid "Drag here to add favorites"
-msgstr "Dra hit för att lägga till favorit"
-
-#: ../js/ui/dash.js:236
-msgid "Find..."
-msgstr "Sök..."
-
-#. **** Applications ****
-#: ../js/ui/dash.js:620
-#: ../js/ui/dash.js:682
-msgid "APPLICATIONS"
-msgstr "PROGRAM"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:640
-#: ../js/ui/dash.js:697
-msgid "PLACES"
-msgstr "PLATSER"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:647
-#: ../js/ui/dash.js:692
-msgid "RECENT DOCUMENTS"
-msgstr "SENASTE DOKUMENT"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:672
-#: ../js/ui/dash.js:862
-msgid "SEARCH RESULTS"
-msgstr "SÖKRESULTAT"
-
-#: ../js/ui/dash.js:687
-msgid "PREFERENCES"
-msgstr "INSTÄLLNINGAR"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:227
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:440
-msgid "%a %l:%M %p"
-msgstr "%a %H.%M"
-
-#: ../js/ui/placeDisplay.js:84
-msgid "Connect to..."
-msgstr "Anslut till..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Ange ett kommando:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Körning av \"%s\" misslyckades:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H.%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Program"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Senaste dokument"
-
-#: ../src/shell-global.c:826
-msgid "Less than a minute ago"
-msgstr "Mindre än en minut sedan"
-
-#: ../src/shell-global.c:829
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minut sedan"
-msgstr[1] "%d minuter sedan"
-
-#: ../src/shell-global.c:832
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d timme sedan"
-msgstr[1] "%d timmar sedan"
-
-#: ../src/shell-global.c:835
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d dag sedan"
-msgstr[1] "%d dagar sedan"
-
-#: ../src/shell-global.c:838
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d vecka sedan"
-msgstr[1] "%d veckor sedan"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Hemmapp"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Filsystem"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Sök"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "(see all)"
-#~ msgstr "(se alla)"
-#~ msgid "Unknown"
-#~ msgstr "Okänt"
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Kan inte låsa skärmen: %s"
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr "Kan inte temporärt ställa in skärmsläckaren till blank skärm: %s"
-#~ msgid "Can't logout: %s"
-#~ msgstr "Kan inte logga ut: %s"
-#~ msgid "Account Information..."
-#~ msgstr "Kontoinformation..."
-#~ msgid "Sidebar"
-#~ msgstr "Sidopanel"
-#~ msgid "System Preferences..."
-#~ msgstr "Systeminställningar..."
-#~ msgid "Lock Screen"
-#~ msgstr "Lås skärmen"
-#~ msgid "Switch User"
-#~ msgstr "Växla användare"
-#~ msgid "Log Out..."
-#~ msgstr "Logga ut..."
-#~ msgid "Shut Down..."
-#~ msgstr "Stäng av..."
-#~ msgid "Browse"
-#~ msgstr "Bläddra"
-#~ msgid "Find apps or documents"
-#~ msgstr "Hitta program eller dokument"
-#~ msgid "DOCUMENTS"
-#~ msgstr "DOKUMENT"
-#~ msgid "Manager"
-#~ msgstr "Hanterare"
-#~ msgid "The user manager object this user is controlled by."
-#~ msgstr "Användarhanteringsobjektet som denna användare styrs av."
-

po/tr.po

@@ -1,166 +0,0 @@
-# gnome-shell
-# Copyright (C) 2009
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Baris Cicek <baris@teamforce.name.tr>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 00:41+0300\n"
-"PO-Revision-Date: 2009-08-21 00:40+0300\n"
-"Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
-"Language-Team: Turkish <gnome-turk@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Kabuğu"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Pencere yönetimi ve uygulama başlatma"
-
-#. left side
-#: ../js/ui/panel.js:266
-msgid "Activities"
-msgstr "Etkinlikler"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:433
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/dash.js:251
-msgid "Find apps or documents"
-msgstr "Uygulamalar ve belgeler bul"
-
-#: ../js/ui/dash.js:369
-msgid "Browse"
-msgstr "Göz at"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:505 ../js/ui/dash.js:578
-msgid "APPLICATIONS"
-msgstr "UYGULAMALAR"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:510 ../js/ui/dash.js:605
-msgid "RECENT DOCUMENTS"
-msgstr "SON ERİŞİLEN BELGELER"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:598
-msgid "PLACES"
-msgstr "YERLER"
-
-#: ../js/ui/runDialog.js:75
-msgid "Please enter a command:"
-msgstr "Lütfen bir komut girin:"
-
-#: ../src/shell-global.c:841
-msgid "Less than a minute ago"
-msgstr "Bir dakikadan daha az süre önce"
-
-#: ../src/shell-global.c:844
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d dakika önce"
-
-#: ../src/shell-global.c:847
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d saat önce"
-
-#: ../src/shell-global.c:850
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d gün önce"
-
-#: ../src/shell-global.c:853
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d hafta önce"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Bilinmeyen"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Ekran kilitlenemedi: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Ekran koruyucu geçici olarak boş ekran olarak atanamadı: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Çıkış yapılamadı: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Hesap Bilgisi..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Kenar Çubuğu"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Sistem Tercihleri..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Ekrani Kilitle"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Kullanıcı Değiştir"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Çıkış..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Kapat..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Ev Klasörü"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Dosya Sistemi"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Arama"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

po/zh_CN.po

@@ -1,176 +0,0 @@
-# Chinese (China) translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Ray Wang <raywang@gnome.org>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2009-08-29 19:32+0000\n"
-"PO-Revision-Date: 2009-08-30 00:08+0800\n"
-"Last-Translator: Ray Wang <raywang@gnome.org>\n"
-"Language-Team: Chinese (Simplified) <i18n-zh@googlegroups.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: utf-8\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "窗口管理和应用程序启动"
-
-#. left side
-#: ../js/ui/panel.js:271
-msgid "Activities"
-msgstr "活动"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:454
-msgid "%a %l:%M %p"
-msgstr "%A %H:%M"
-
-#: ../js/ui/dash.js:256
-msgid "Find..."
-msgstr "查找..."
-
-#: ../js/ui/dash.js:374
-msgid "Browse"
-msgstr "浏览"
-
-#: ../js/ui/dash.js:451
-msgid "(see all)"
-msgstr "(查看所有)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:633 ../js/ui/dash.js:681
-msgid "APPLICATIONS"
-msgstr "应用程序"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:653
-msgid "PLACES"
-msgstr "位置"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:660 ../js/ui/dash.js:692
-msgid "RECENT DOCUMENTS"
-msgstr "最近的文档"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:679
-msgid "SEARCH RESULTS"
-msgstr "搜索结果"
-
-#: ../js/ui/runDialog.js:82
-msgid "Please enter a command:"
-msgstr "请输入一个命令："
-
-#: ../src/shell-global.c:840
-msgid "Less than a minute ago"
-msgstr "少于一分钟前"
-
-#: ../src/shell-global.c:843
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d 分钟前"
-
-#: ../src/shell-global.c:846
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d 小时前"
-
-#: ../src/shell-global.c:849
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天前"
-
-#: ../src/shell-global.c:852
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d 周前"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "不能锁住屏幕：%s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "不能临时将屏幕保护设置成空白屏幕：%s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "不能退出：%s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "帐户信息..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "侧边栏"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "系统首选项..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "锁住屏幕"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "切换用户"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "退出..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "关机..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "主文件夹"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "文件系统"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "搜索"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"

src/Makefile-big.am

@@ -33,21 +33,21 @@ big_source_c =					\
 big-enum-types.h: stamp-big-enum-types.h Makefile
 	@true
 stamp-big-enum-types.h: $(big_source_h) big/big-enum-types.h.in
-	$(AM_V_GEN) ( cd $(srcdir) && \
+	( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
 	    --template $(srcdir)/big/big-enum-types.h.in \
-	  $(big_source_h) ) >> xgen-beth && \
-	(cmp -s xgen-beth big-enum-types.h || cp xgen-beth big-enum-types.h) && \
-	rm -f xgen-beth && \
+	  $(big_source_h) ) >> xgen-teth && \
+	(cmp xgen-teth big-enum-types.h || cp xgen-teth big-enum-types.h) && \
+	rm -f xgen-teth && \
 	echo timestamp > $(@F)
 
 big-enum-types.c: stamp-big-enum-types.h big/big-enum-types.c.in
-	$(AM_V_GEN) ( cd $(srcdir) && \
+	( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
 	    --template $(srcdir)/big/big-enum-types.c.in \
-	  $(big_source_h) ) >> xgen-betc && \
-	cp xgen-betc big-enum-types.c && \
-	rm -f xgen-betc
+	  $(big_source_h) ) >> xgen-tetc && \
+	cp xgen-tetc big-enum-types.c && \
+	rm -f xgen-tetc
 
 noinst_LTLIBRARIES += libbig-1.0.la
 

src/Makefile-st.am

@@ -1,154 +0,0 @@
-st_cflags =					\
-    -I$(top_srcdir)/src				\
-    -DPREFIX=\""$(prefix)"\"			\
-    -DLIBDIR=\""$(libdir)"\"			\
-    -DG_DISABLE_DEPRECATED			\
-    -DG_LOG_DOMAIN=\"St\"			\
-    -DST_COMPILATION				\
-    -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"	\
-    $(ST_CFLAGS)				\
-    $(NULL)
-
-st_built_sources =				\
-    st-enum-types.h				\
-    st-enum-types.c				\
-    st-marshal.h				\
-    st-marshal.c
-
-BUILT_SOURCES += $(st_built_sources)
-
-EXTRA_DIST +=					\
-	st/test-theme.css			\
-	st/st-marshal.list			\
-	st/st-enum-types.h.in			\
-	st/st-enum-types.c.in
-
-CLEANFILES += stamp-st-marshal.h stamp-st-enum-types.h
-
-st-marshal.h: stamp-st-marshal.h
-	@true
-stamp-st-marshal.h: Makefile st/st-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL)					\
-		--prefix=_st_marshal					\
-		--header						\
-	$(srcdir)/st/st-marshal.list > $@.tmp &&			\
-	(cmp -s $@.tmp st-marshal.h || cp -f $@.tmp st-marshal.h) &&	\
-	rm -f $@.tmp &&							\
-	echo timestamp > $(@F)
-
-st-marshal.c: Makefile st/st-marshal.list
-	$(AM_V_GEN) (echo "#include \"st-marshal.h\"" ;	\
-	 $(GLIB_GENMARSHAL)				\
-		--prefix=_st_marshal			\
-		--body					\
-	 $(srcdir)/st/st-marshal.list ) > $@.tmp &&	\
-	cp -f $@.tmp st-marshal.c &&			\
-	rm -f $@.tmp
-
-st-enum-types.h: stamp-st-enum-types.h Makefile
-	@true
-stamp-st-enum-types.h: $(source_h) st/st-enum-types.h.in
-	$(AM_V_GEN) ( cd $(srcdir) &&					\
-	  $(GLIB_MKENUMS)						\
-	    --template st/st-enum-types.h.in				\
-	  $(st_source_h) ) >> $@.tmp &&					\
-	(cmp -s $@.tmp st-enum-types.h || cp $@.tmp st-enum-types.h) &&	\
-	rm -f $@.tmp &&							\
-	echo timestamp > $(@F)
-
-st-enum-types.c: stamp-st-enum-types.h st/st-enum-types.c.in
-	$(AM_V_GEN) ( cd $(srcdir) &&		\
-	  $(GLIB_MKENUMS)			\
-	    --template st/st-enum-types.c.in	\
-	  $(st_source_h) ) >> $@.tmp &&		\
-	cp $@.tmp $@ &&				\
-	rm -f $@.tmp
-
-# please, keep this sorted alphabetically
-st_source_h =					\
-    st/st-adjustment.h				\
-    st/st-bin.h					\
-    st/st-border-image.h			\
-    st/st-box-layout.h				\
-    st/st-box-layout-child.h			\
-    st/st-button.h				\
-    st/st-clickable.h           \
-    st/st-clipboard.h				\
-    st/st-drawing-area.h        \
-    st/st-entry.h				\
-    st/st-im-text.h				\
-    st/st-label.h				\
-    st/st-overflow-box.h        \
-    st/st-private.h				\
-    st/st-scrollable.h				\
-    st/st-scroll-bar.h				\
-    st/st-scroll-view.h				\
-    st/st-subtexture.h				\
-    st/st-table.h				\
-    st/st-table-child.h				\
-    st/st-table-private.h			\
-    st/st-texture-cache.h			\
-    st/st-texture-frame.h			\
-    st/st-theme.h				\
-    st/st-theme-context.h			\
-    st/st-theme-node.h				\
-    st/st-theme-private.h			\
-    st/st-tooltip.h				\
-    st/st-types.h				\
-    st/st-widget.h				\
-    $(NULL)
-
-st_source_private_h =				\
-    st/st-private.h				\
-    st/st-table-private.h			\
-    st/st-theme-private.h
-
-# please, keep this sorted alphabetically
-st_source_c =					\
-    st/st-adjustment.c				\
-    st/st-bin.c					\
-    st/st-border-image.c			\
-    st/st-box-layout.c				\
-    st/st-box-layout-child.c			\
-    st/st-button.c				\
-    st/st-clickable.c           \
-    st/st-clipboard.c				\
-    st/st-drawing-area.c        \
-    st/st-entry.c				\
-    st/st-im-text.c				\
-    st/st-label.c				\
-    st/st-overflow-box.c        \
-    st/st-private.c				\
-    st/st-scrollable.c				\
-    st/st-scroll-bar.c				\
-    st/st-scroll-view.c				\
-    st/st-subtexture.c				\
-    st/st-table.c				\
-    st/st-table-child.c				\
-    st/st-texture-cache.c			\
-    st/st-texture-frame.c			\
-    st/st-theme.c				\
-    st/st-theme-context.c			\
-    st/st-theme-node.c				\
-    st/st-tooltip.c				\
-    st/st-widget.c				\
-    $(NULL)
-
-noinst_LTLIBRARIES += libst-1.0.la
-
-libst_1_0_la_LIBADD = $(ST_LIBS)
-libst_1_0_la_SOURCES =				\
-    $(st_source_c)				\
-    $(st_source_private_c)			\
-    $(st_source_h)				\
-    $(st_built_sources)				\
-    $(NULL)
-libst_1_0_la_CPPFLAGS = $(st_cflags)
-libst_1_0_la_LDFLAGS = $(LDADD)
-
-noinst_PROGRAMS += test-theme
-
-test_theme_CPPFLAGS = $(st_cflags)
-test_theme_LDADD = libst-1.0.la
-
-test_theme_SOURCES = st/test-theme.c

src/Makefile-taskpanel.am

@@ -0,0 +1,17 @@
+gnomeshell_taskpanel_CPPFLAGS =					\
+	-I$(top_srcdir)/src			\
+	-DG_DISABLE_DEPRECATED			\
+	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
+	-DG_LOG_DOMAIN=\"gnomeshell-taskpanel\"	\
+	$(TASKPANEL_CFLAGS)	\
+	$(NULL)
+
+gnomeshell_taskpanel_SOURCES =			\
+	gnomeshell-taskpanel.c  \
+	shell-panel-window.c	\
+	shell-panel-window.h	\
+	$(NULL)
+
+gnomeshell_taskpanel_LDADD = $(TASKPANEL_LIBS)
+
+libexec_PROGRAMS += gnomeshell-taskpanel

src/Makefile-tidy.am

@@ -0,0 +1,89 @@
+tidy_cflags =					\
+	-I$(top_srcdir)/src			\
+	-DPREFIX=\""$(prefix)"\"		\
+	-DLIBDIR=\""$(libdir)"\"		\
+	-DG_DISABLE_DEPRECATED			\
+	-DG_LOG_DOMAIN=\"Tidy\"			\
+	$(MUTTER_PLUGIN_CFLAGS)			\
+	$(NULL)
+
+tidy_built_sources = \
+	tidy-enum-types.h 	\
+	tidy-enum-types.c 	\
+	tidy-marshal.h 		\
+	tidy-marshal.c
+
+BUILT_SOURCES += $(tidy_built_sources)
+
+TIDY_STAMP_FILES = stamp-tidy-marshal.h stamp-tidy-enum-types.h
+
+# please, keep this sorted alphabetically
+tidy_source_h =					\
+	tidy/tidy-grid.h			\
+	$(NULL)
+
+tidy_source_h_priv =				\
+	$(NULL)
+
+# please, keep this sorted alphabetically
+tidy_source_c =					\
+	tidy/tidy-grid.c			\
+	$(NULL)
+
+tidy-marshal.h: stamp-tidy-marshal.h
+	@true
+stamp-tidy-marshal.h: Makefile tidy/tidy-marshal.list
+	$(GLIB_GENMARSHAL) \
+		--prefix=_tidy_marshal \
+		--header \
+	$(srcdir)/tidy/tidy-marshal.list > xgen-tmh && \
+	(cmp -s xgen-tmh tidy-marshal.h || cp -f xgen-tmh tidy-marshal.h) && \
+	rm -f xgen-tmh && \
+	echo timestamp > $(@F)
+
+tidy-marshal.c: Makefile tidy/tidy-marshal.list
+	(echo "#include \"tidy-marshal.h\"" ; \
+	 $(GLIB_GENMARSHAL) \
+		--prefix=_tidy_marshal \
+		--body \
+	 $(srcdir)/tidy/tidy-marshal.list ) > xgen-tmc && \
+	cp -f xgen-tmc tidy-marshal.c && \
+	rm -f xgen-tmc
+
+tidy-enum-types.h: stamp-tidy-enum-types.h Makefile
+	@true
+stamp-tidy-enum-types.h: $(tidy_source_h) tidy/tidy-enum-types.h.in
+	( cd $(srcdir) && \
+	  $(GLIB_MKENUMS) \
+	    --template $(srcdir)/tidy/tidy-enum-types.h.in \
+	  $(tidy_source_h) ) >> xgen-teth && \
+	(cmp xgen-teth tidy-enum-types.h || cp xgen-teth tidy-enum-types.h) && \
+	rm -f xgen-teth && \
+	echo timestamp > $(@F)
+
+tidy-enum-types.c: stamp-tidy-enum-types.h tidy/tidy-enum-types.c.in
+	( cd $(srcdir) && \
+	  $(GLIB_MKENUMS) \
+	    --template $(srcdir)/tidy/tidy-enum-types.c.in \
+	  $(tidy_source_h) ) >> xgen-tetc && \
+	cp xgen-tetc tidy-enum-types.c && \
+	rm -f xgen-tetc
+
+noinst_LTLIBRARIES += libtidy-1.0.la
+
+libtidy_1_0_la_LIBADD = $(TIDY_LIBS)
+libtidy_1_0_la_SOURCES = \
+	$(tidy_source_c) \
+	$(tidy_source_h) \
+	$(tidy_source_h_priv) \
+	$(tidy_built_sources) \
+	$(NULL)
+libtidy_1_0_la_CPPFLAGS = $(tidy_cflags)
+libtidy_1_0_la_LDFLAGS = $(LDADD)
+
+CLEANFILES += $(TIDY_STAMP_FILES) $(BUILT_SOURCES)
+
+EXTRA_DIST +=					\
+	tidy/tidy-enum-types.h.in		\
+	tidy/tidy-enum-types.c.in		\
+	tidy/tidy-marshal.list

src/Makefile-tray.am

@@ -24,7 +24,7 @@ tray_source =			\
 na-marshal.h: stamp-na-marshal.h
 	@true
 stamp-na-marshal.h: Makefile tray/na-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
+	$(GLIB_GENMARSHAL) \
 		--prefix=_na_marshal \
 		--header \
 	$(srcdir)/tray/na-marshal.list > xgen-tmh && \
@@ -33,7 +33,7 @@ stamp-na-marshal.h: Makefile tray/na-marshal.list
 	echo timestamp > $(@F)
 
 na-marshal.c: Makefile tray/na-marshal.list
-	$(AM_V_GEN) (echo "#include \"na-marshal.h\"" ; \
+	(echo "#include \"na-marshal.h\"" ; \
 	 $(GLIB_GENMARSHAL) \
 		--prefix=_na_marshal \
 		--body \

src/Makefile.am

@@ -1,39 +1,34 @@
 NULL = 
 BUILT_SOURCES =
 CLEANFILES =
-EXTRA_DIST =
+EXTRA_DIST = 
 libexec_PROGRAMS =
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-
-.AUTOPARALLEL:
+noinst_LTLIBRARIES = 
 
 bin_SCRIPTS = gnome-shell
 
 gnome-shell: gnome-shell.in
-	$(AM_V_GEN) sed -e "s|@MUTTER_BIN_DIR[@]|$(MUTTER_BIN_DIR)|" \
+	sed -e "s|@MUTTER_BIN_DIR[@]|$(MUTTER_BIN_DIR)|" \
 	    -e "s|@GJS_JS_DIR[@]|$(GJS_JS_DIR)|" \
 	    -e "s|@GJS_JS_NATIVE_DIR[@]|$(GJS_JS_NATIVE_DIR)|" \
 	    -e "s|@libexecdir[@]|$(libexecdir)|" \
 	    -e "s|@libdir[@]|$(libdir)|" \
 	    -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
-	    -e "s|@PYTHON[@]|$(PYTHON)|" \
-	    -e "s|@sysconfdir[@]|$(sysconfdir)|" \
 	    $< > $@ && chmod a+x $@
 CLEANFILES += gnome-shell
 EXTRA_DIST += gnome-shell.in
 
+include Makefile-tidy.am
 include Makefile-big.am
 include Makefile-gdmuser.am
-include Makefile-st.am
 include Makefile-tray.am
+include Makefile-taskpanel.am
 
 gnome_shell_cflags =				\
 	$(MUTTER_PLUGIN_CFLAGS)			\
         $(LIBGNOMEUI_CFLAGS)                    \
 	-I$(srcdir)/tray			\
-	-DGETTEXT_PACKAGE=\"gnome-shell\"		\
-	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DGETTEXT_PACKAGE=gnome-shell		\
 	-DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\"	\
 	-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \
 	-DJSDIR=\"$(pkgdatadir)/js\"
@@ -54,53 +49,34 @@ CLEANFILES += $(SHELL_STAMP_FILES)
 libgnome_shell_la_SOURCES =			\
 	$(shell_built_sources)			\
 	gnome-shell-plugin.c			\
-	shell-app.c         \
-	shell-app.h         \
-	shell-app-private.h \
+	shell-alttab.c				\
+	shell-alttab.h				\
+	shell-app-monitor.c			\
+	shell-app-monitor.h			\
 	shell-app-system.c			\
 	shell-app-system.h			\
-	shell-app-usage.c			\
-	shell-app-usage.h			\
 	shell-arrow.c			\
 	shell-arrow.h			\
-	shell-doc-system.c			\
-	shell-doc-system.h			\
-	shell-drawing.c            \
-	shell-drawing.h            \
 	shell-embedded-window.c			\
 	shell-embedded-window.h			\
 	shell-embedded-window-private.h		\
-	shell-gconf.c				\
-	shell-gconf.h				\
-	shell-generic-container.c           \
-	shell-generic-container.h           \
 	shell-gtk-embed.c			\
 	shell-gtk-embed.h			\
-	shell-menu.c       \
-	shell-menu.h       \
-	shell-overflow-list.c		\
-	shell-overflow-list.h		\
 	shell-process.c				\
 	shell-process.h				\
 	shell-global.c				\
 	shell-global.h				\
-	shell-global-private.h			\
-	shell-stack.c				\
-	shell-stack.h				\
+	shell-status-menu.c				\
+	shell-status-menu.h				\
 	shell-tray-manager.c			\
 	shell-tray-manager.h			\
 	shell-texture-cache.c			\
 	shell-texture-cache.h			\
-	shell-uri-util.c           \
-	shell-uri-util.h           \
-	shell-window-tracker.c		\
-	shell-window-tracker.h  \
 	shell-wm.c				\
 	shell-wm.h
 
-non_gir_sources =				\
-	shell-embedded-window-private.h		\
-	shell-global-private.h
+non_gir_sources =						\
+	shell-embedded-window-private.h
 
 shell_recorder_sources =        \
 	shell-recorder.c	\
@@ -117,7 +93,7 @@ if BUILD_RECORDER
 libgnome_shell_la_SOURCES += $(shell_recorder_sources)
 non_gir_sources += $(shell_recorder_non_gir_sources)
 
-noinst_PROGRAMS += test-recorder
+noinst_PROGRAMS = test-recorder
 
 test_recorder_CPPFLAGS = $(TEST_SHELL_RECORDER_CFLAGS)
 test_recorder_LDADD = $(TEST_SHELL_RECORDER_LIBS)
@@ -133,47 +109,45 @@ libgnome_shell_la_gir_sources = \
 shell-marshal.h: stamp-shell-marshal.h
 	@true
 stamp-shell-marshal.h: Makefile shell-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
+	$(GLIB_GENMARSHAL) \
 		--prefix=_shell_marshal \
 		--header \
-	$(srcdir)/shell-marshal.list > xgen-smh && \
-	(cmp -s xgen-smh shell-marshal.h || cp -f xgen-smh shell-marshal.h) && \
-	rm -f xgen-smh && \
+	$(srcdir)/shell-marshal.list > xgen-tmh && \
+	(cmp -s xgen-tmh shell-marshal.h || cp -f xgen-tmh shell-marshal.h) && \
+	rm -f xgen-tmh && \
 	echo timestamp > $(@F)
 
 shell-marshal.c: Makefile shell-marshal.list
-	$(AM_V_GEN) (echo "#include \"shell-marshal.h\"" ; \
+	(echo "#include \"shell-marshal.h\"" ; \
 	 $(GLIB_GENMARSHAL) \
 		--prefix=_shell_marshal \
 		--body \
-	 $(srcdir)/shell-marshal.list ) > xgen-smc && \
-	cp -f xgen-smc shell-marshal.c && \
-	rm -f xgen-smc
+	 $(srcdir)/shell-marshal.list ) > xgen-tmc && \
+	cp -f xgen-tmc shell-marshal.c && \
+	rm -f xgen-tmc
 
 libgnome_shell_la_LDFLAGS = -avoid-version -module
 libgnome_shell_la_LIBADD =	\
 	$(MUTTER_PLUGIN_LIBS)	\
         $(LIBGNOMEUI_LIBS)      \
 	libbig-1.0.la		\
-	libst-1.0.la       	\
 	libgdmuser-1.0.la	\
+	libtidy-1.0.la		\
 	libtray.la
 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
 
 typelibdir = $(pkglibdir)
-typelib_DATA = Shell-0.1.typelib Big-1.0.typelib St-1.0.typelib Gdm-1.0.typelib
+typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib Big-1.0.typelib
 
-Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir St-1.0.gir libgnome-shell.la Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER)			\
+Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile
+	$(G_IR_SCANNER)		\
 		--namespace=Shell			\
 		--nsversion=0.1				\
 		--add-include-path=$(MUTTER_LIB_DIR)/mutter/ \
-		--include=Clutter-1.0			\
-		--include=Meta-2.28			\
-		--libtool="$(LIBTOOL)"    \
+		--include=Clutter-0.9			\
+		--include=Meta-2.27			\
 		--add-include-path=$(builddir)     \
 		--include=Big-1.0     \
-		--include=St-1.0     \
 		--program=mutter			\
 	        --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
 		$(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources)) \
@@ -184,20 +158,33 @@ CLEANFILES += Shell-0.1.gir
 # The dependency on libgnome-shell.la here is because g-ir-compiler opens it
 # (not the fake library, since we've already done the rewriting)
 Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir Big-1.0.gir
-	$(AM_V_GEN) \
-		$(G_IR_COMPILER)						\
-			--includedir=.						\
-			--includedir=$(MUTTER_LIB_DIR)/mutter/			\
-		Shell-0.1.gir -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=$(builddir) --includedir=$(MUTTER_LIB_DIR)/mutter/ Shell-0.1.gir -o $@
 CLEANFILES += Shell-0.1.typelib
 
-Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER)			\
-		--namespace=Big				\
+Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile
+	$(G_IR_SCANNER)					\
+		--namespace=Tidy			\
 		--nsversion=1.0				\
-		--include=Clutter-1.0			\
+		--include=Clutter-0.9			\
+		--program=mutter			\
+	        --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
+		$(addprefix $(srcdir)/,$(tidy_source_h)) \
+		$(addprefix $(srcdir)/,$(tidy_source_c)) \
+		$(srcdir)/tidy-enum-types.h		\
+		$(tidy_cflags)				\
+		-o $@
+CLEANFILES += Tidy-1.0.gir
+
+Tidy-1.0.typelib: libtidy-1.0.la Tidy-1.0.gir
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Tidy-1.0.gir -o $@
+CLEANFILES += Tidy-1.0.typelib
+
+Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile
+	$(G_IR_SCANNER)					\
+		--namespace=Big			\
+		--nsversion=1.0				\
+		--include=Clutter-0.9			\
 		--include=GdkPixbuf-2.0			\
-		--libtool="$(LIBTOOL)"    \
 		--program=mutter			\
 	        --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
 		$(addprefix $(srcdir)/,$(big_source_h))	\
@@ -208,47 +195,5 @@ Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile
 CLEANFILES += Big-1.0.gir
 
 Big-1.0.typelib: libbig-1.0.la Big-1.0.gir
-	$(AM_V_GEN) $(G_IR_COMPILER) Big-1.0.gir -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Big-1.0.gir -o $@
 CLEANFILES += Big-1.0.typelib
-
-St-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libst-1.0.la Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER)						\
-	        --namespace=St							\
-	        --nsversion=1.0							\
-	        --include=Clutter-1.0						\
-		--add-include-path=$(builddir)     				\
-	        --libtool="$(LIBTOOL)"						\
-	        --program=mutter						\
-		--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la	\
-	        -DST_COMPILATION						\
-	        $(addprefix $(srcdir)/,$(st_source_h))				\
-	        $(addprefix $(srcdir)/,$(st_source_c))				\
-	        $(srcdir)/st-enum-types.h					\
-	        $(st_cflags)							\
-	        -o $@
-CLEANFILES += St-1.0.gir
-
-St-1.0.typelib: St-1.0.gir
-	$(AM_V_GEN) $(G_IR_COMPILER)						\
-		$< -o $@
-
-CLEANFILES += St-1.0.typelib
-
-Gdm-1.0.gir: $(mutter) $(G_IR_SCANNER) libgdmuser-1.0.la Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER)			\
-		--namespace=Gdm				\
-		--nsversion=1.0				\
-		--include=GObject-2.0			\
-		--include=GdkPixbuf-2.0			\
-		--libtool="$(LIBTOOL)"			\
-		--library=libgdmuser-1.0.la		\
-		$(addprefix $(srcdir)/,$(gdmuser_source_h))	\
-		$(addprefix $(srcdir)/,$(gdmuser_source_c))	\
-		$(gdmuser_cflags)				\
-		-o $@
-CLEANFILES += Gdm-1.0.gir
-
-Gdm-1.0.typelib: libbig-1.0.la Gdm-1.0.gir
-	$(AM_V_GEN) $(G_IR_COMPILER) Gdm-1.0.gir -o $@
-CLEANFILES += Gdm-1.0.typelib
-

src/big/rectangle.c

@@ -268,52 +268,6 @@ corner_get(guint         radius,
     return corner;
 }
 
-/* To match the CSS specification, we want the border to look like it was
- * drawn over the background. But actually drawing the border over the
- * background will produce slightly bad antialiasing at the edges, so
- * compute the effective border color instead.
- */
-#define NORM(x) (t = (x) + 127, (t + (t >> 8)) >> 8)
-#define MULT(c,a) NORM(c*a)
-
-static void
-premultiply (ClutterColor *color)
-{
-    guint t;
-    color->red = MULT (color->red, color->alpha);
-    color->green = MULT (color->green, color->alpha);
-    color->blue = MULT (color->blue, color->alpha);
-}
-
-static void
-unpremultiply (ClutterColor *color)
-{
-    if (color->alpha != 0) {
-        color->red = (color->red * 255 + 127) / color->alpha;
-        color->green = (color->green * 255 + 127) / color->alpha;
-        color->blue = (color->blue * 255 + 127) / color->alpha;
-    }
-}
-
-static void
-over (const ClutterColor *source,
-      const ClutterColor *destination,
-      ClutterColor       *result)
-{
-    guint t;
-    ClutterColor src = *source;
-    ClutterColor dst = *destination;
-    premultiply (&src);
-    premultiply (&dst);
-
-    result->alpha = src.alpha + NORM ((255 - src.alpha) * dst.alpha);
-    result->red   = src.red +   NORM ((255 - src.alpha) * dst.red);
-    result->green = src.green + NORM ((255 - src.alpha) * dst.green);
-    result->blue  = src.blue +  NORM ((255 - src.alpha) * dst.blue);
-
-    unpremultiply (result);
-}
-
 static void
 big_rectangle_update_corners(BigRectangle *rectangle)
 {
@@ -324,7 +278,6 @@ big_rectangle_update_corners(BigRectangle *rectangle)
     if (rectangle->radius != 0) {
         ClutterColor *color;
         ClutterColor *border_color;
-        ClutterColor effective_border;
         guint border_width;
 
         g_object_get(rectangle,
@@ -333,12 +286,10 @@ big_rectangle_update_corners(BigRectangle *rectangle)
                      "color", &color,
                      NULL);
 
-        over (border_color, color, &effective_border);
-
         corner = corner_get(rectangle->radius,
                             color,
                             border_width,
-                            &effective_border);
+                            border_color);
 
         clutter_color_free(border_color);
         clutter_color_free(color);
@@ -378,10 +329,12 @@ big_rectangle_paint(ClutterActor *actor)
 
     rectangle = BIG_RECTANGLE(actor);
 
-    /* We can't chain up, even when we the radius is 0, because of the different
-     * interpretation of the border/background relationship here than for
-     * ClutterRectangle.
-     */
+    if (rectangle->radius == 0) {
+        /* In that case we are no different than our parent class,
+         * so don't bother */
+        CLUTTER_ACTOR_CLASS(big_rectangle_parent_class)->paint(actor);
+        return;
+    }
 
     if (rectangle->corners_dirty)
         big_rectangle_update_corners(rectangle);
@@ -392,9 +345,6 @@ big_rectangle_paint(ClutterActor *actor)
                  "color", &color,
                  NULL);
 
-    if (border_color->alpha == 0 && color->alpha == 0)
-        goto out;
-
     actor_opacity = clutter_actor_get_paint_opacity (actor);
 
     clutter_actor_get_allocation_box(actor, &box);
@@ -408,11 +358,6 @@ big_rectangle_paint(ClutterActor *actor)
 
     radius = rectangle->radius;
 
-    /* Optimization; if the border is transparent, it just looks like part of
-     * the background */
-    if (radius == 0 && border_color->alpha == 0)
-        border_width = 0;
-
     max = MAX(border_width, radius);
 
     if (radius != 0) {
@@ -448,54 +393,33 @@ big_rectangle_paint(ClutterActor *actor)
     }
 
     if (border_width != 0) {
-        ClutterColor effective_border;
-        over (border_color, color, &effective_border);
-
         if (!rectangle->border_material)
             rectangle->border_material = cogl_material_new ();
 
         cogl_color_set_from_4ub(&tmp_color,
-                                effective_border.red,
-                                effective_border.green,
-                                effective_border.blue,
-                                actor_opacity * effective_border.alpha / 255);
+                                border_color->red,
+                                border_color->green,
+                                border_color->blue,
+                                actor_opacity * border_color->alpha / 255);
         cogl_color_premultiply (&tmp_color);
         cogl_material_set_color(rectangle->border_material, &tmp_color);
         cogl_set_source(rectangle->border_material);
 
-        if (radius > 0) { /* skip corners */
-            /* NORTH */
-            cogl_rectangle(max, 0,
-                           width - max, border_width);
+        /* NORTH */
+        cogl_rectangle(max, 0,
+                       width - max, border_width);
 
-            /* EAST */
-            cogl_rectangle(width - border_width, max,
-                           width, height - max);
+        /* EAST */
+        cogl_rectangle(width - border_width, max,
+                       width, height - max);
 
-            /* SOUTH */
-            cogl_rectangle(max, height - border_width,
-                           width - max, height);
+        /* SOUTH */
+        cogl_rectangle(max, height - border_width,
+                       width - max, height);
 
-            /* WEST */
-            cogl_rectangle(0, max,
-                           border_width, height - max);
-        } else { /* include corners */
-            /* NORTH */
-            cogl_rectangle(0, 0,
-                           width, border_width);
-
-            /* EAST */
-            cogl_rectangle(width - border_width, border_width,
-                           width, height - border_width);
-
-            /* SOUTH */
-            cogl_rectangle(0, height - border_width,
-                           width, height);
-
-            /* WEST */
-            cogl_rectangle(0, border_width,
-                           border_width, height - border_width);
-        }
+        /* WEST */
+        cogl_rectangle(0, max,
+                       border_width, height - max);
     }
 
     if (!rectangle->background_material)
@@ -531,7 +455,6 @@ big_rectangle_paint(ClutterActor *actor)
     cogl_rectangle(border_width, max,
                    width - border_width, height - max);
 
-out:
     clutter_color_free(border_color);
     clutter_color_free(color);
 }

src/gdmuser/gdm-user-chooser-dialog.c

@@ -0,0 +1,208 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+ *
+ * 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 of the License, 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.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include "gdm-user-chooser-widget.h"
+#include "gdm-user-chooser-dialog.h"
+
+#define GDM_USER_CHOOSER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_USER_CHOOSER_DIALOG, GdmUserChooserDialogPrivate))
+
+struct GdmUserChooserDialogPrivate
+{
+        GtkWidget *chooser_widget;
+};
+
+enum {
+        PROP_0,
+};
+
+static void     gdm_user_chooser_dialog_class_init  (GdmUserChooserDialogClass *klass);
+static void     gdm_user_chooser_dialog_init        (GdmUserChooserDialog      *user_chooser_dialog);
+static void     gdm_user_chooser_dialog_finalize    (GObject                       *object);
+
+G_DEFINE_TYPE (GdmUserChooserDialog, gdm_user_chooser_dialog, GTK_TYPE_DIALOG)
+
+char *
+gdm_user_chooser_dialog_get_chosen_user_name (GdmUserChooserDialog *dialog)
+{
+        char *user_name;
+
+        g_return_val_if_fail (GDM_IS_USER_CHOOSER_DIALOG (dialog), NULL);
+
+        user_name = gdm_user_chooser_widget_get_chosen_user_name (GDM_USER_CHOOSER_WIDGET (dialog->priv->chooser_widget));
+
+        return user_name;
+}
+
+void
+gdm_user_chooser_dialog_set_show_user_other (GdmUserChooserDialog *dialog,
+                                             gboolean              show_user)
+{
+        g_return_if_fail (GDM_IS_USER_CHOOSER_DIALOG (dialog));
+
+        gdm_user_chooser_widget_set_show_user_other (GDM_USER_CHOOSER_WIDGET (dialog->priv->chooser_widget), show_user);
+}
+
+void
+gdm_user_chooser_dialog_set_show_user_guest (GdmUserChooserDialog *dialog,
+                                             gboolean              show_user)
+{
+        g_return_if_fail (GDM_IS_USER_CHOOSER_DIALOG (dialog));
+
+        gdm_user_chooser_widget_set_show_user_guest (GDM_USER_CHOOSER_WIDGET (dialog->priv->chooser_widget), show_user);
+}
+
+void
+gdm_user_chooser_dialog_set_show_user_auto (GdmUserChooserDialog *dialog,
+                                            gboolean              show_user)
+{
+        g_return_if_fail (GDM_IS_USER_CHOOSER_DIALOG (dialog));
+
+        gdm_user_chooser_widget_set_show_user_auto (GDM_USER_CHOOSER_WIDGET (dialog->priv->chooser_widget), show_user);
+}
+
+static void
+gdm_user_chooser_dialog_set_property (GObject        *object,
+                                      guint           prop_id,
+                                      const GValue   *value,
+                                      GParamSpec     *pspec)
+{
+        switch (prop_id) {
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static void
+gdm_user_chooser_dialog_get_property (GObject        *object,
+                                      guint           prop_id,
+                                      GValue         *value,
+                                      GParamSpec     *pspec)
+{
+        switch (prop_id) {
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static GObject *
+gdm_user_chooser_dialog_constructor (GType                  type,
+                                     guint                  n_construct_properties,
+                                     GObjectConstructParam *construct_properties)
+{
+        GdmUserChooserDialog      *user_chooser_dialog;
+
+        user_chooser_dialog = GDM_USER_CHOOSER_DIALOG (G_OBJECT_CLASS (gdm_user_chooser_dialog_parent_class)->constructor (type,
+                                                                                                                           n_construct_properties,
+                                                                                                                           construct_properties));
+
+        return G_OBJECT (user_chooser_dialog);
+}
+
+static void
+gdm_user_chooser_dialog_dispose (GObject *object)
+{
+        G_OBJECT_CLASS (gdm_user_chooser_dialog_parent_class)->dispose (object);
+}
+
+static void
+gdm_user_chooser_dialog_class_init (GdmUserChooserDialogClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+
+        object_class->get_property = gdm_user_chooser_dialog_get_property;
+        object_class->set_property = gdm_user_chooser_dialog_set_property;
+        object_class->constructor = gdm_user_chooser_dialog_constructor;
+        object_class->dispose = gdm_user_chooser_dialog_dispose;
+        object_class->finalize = gdm_user_chooser_dialog_finalize;
+
+        g_type_class_add_private (klass, sizeof (GdmUserChooserDialogPrivate));
+}
+
+static void
+on_response (GdmUserChooserDialog *dialog,
+             gint                      response_id)
+{
+        switch (response_id) {
+        default:
+                break;
+        }
+}
+
+static void
+gdm_user_chooser_dialog_init (GdmUserChooserDialog *dialog)
+{
+
+        dialog->priv = GDM_USER_CHOOSER_DIALOG_GET_PRIVATE (dialog);
+
+        dialog->priv->chooser_widget = gdm_user_chooser_widget_new ();
+
+        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog->priv->chooser_widget);
+
+        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                NULL);
+        g_signal_connect (dialog,
+                          "response",
+                          G_CALLBACK (on_response),
+                          dialog);
+
+        gtk_widget_show_all (GTK_WIDGET (dialog));
+}
+
+static void
+gdm_user_chooser_dialog_finalize (GObject *object)
+{
+        GdmUserChooserDialog *user_chooser_dialog;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GDM_IS_USER_CHOOSER_DIALOG (object));
+
+        user_chooser_dialog = GDM_USER_CHOOSER_DIALOG (object);
+
+        g_return_if_fail (user_chooser_dialog->priv != NULL);
+
+        G_OBJECT_CLASS (gdm_user_chooser_dialog_parent_class)->finalize (object);
+}
+
+GtkWidget *
+gdm_user_chooser_dialog_new (void)
+{
+        GObject *object;
+
+        object = g_object_new (GDM_TYPE_USER_CHOOSER_DIALOG,
+                               NULL);
+
+        return GTK_WIDGET (object);
+}