Handle changes in window position for workspace thumbnails

Connect to the 'position-set' signal of MetaWindowActor and move actors when the source windows move.
Improve workspace controls slide-in positioning
2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:56 -05:00
32 changed files with 1348 additions and 858 deletions
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -24,7 +24,6 @@ dist_images_DATA =				\

 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
-	theme/add-workspace.svg			\
 	theme/calendar-arrow-left.svg		\
 	theme/calendar-arrow-right.svg		\
 	theme/close-window.svg			\
@ -37,7 +36,6 @@ dist_theme_DATA =				\
 	theme/mosaic-view.svg			\
 	theme/move-window-on-new.svg		\
 	theme/process-working.png		\
-	theme/remove-workspace.svg		\
 	theme/running-indicator.svg		\
 	theme/scroll-button-down-hover.png	\
 	theme/scroll-button-down.png		\
--- a/data/theme/add-workspace.svg
+++ b/data/theme/add-workspace.svg
@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="23"
-   height="15"
-   id="svg6375"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="New document 13">
-  <defs
-     id="defs6377">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective6383" />
-    <inkscape:perspective
-       id="perspective6366"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="16"
-     inkscape:cy="16"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1680"
-     inkscape:window-height="997"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata6380">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-17)">
-    <g
-       style="display:inline"
-       id="g6243"
-       transform="translate(-986.28859,-658.2796)">
-      <rect
-         style="fill:#000000;fill-opacity:0.98770495;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="rect5318"
-         width="22"
-         height="14"
-         x="986.89801"
-         y="675.86743"
-         rx="0.49999979"
-         ry="0.5" />
-      <g
-         id="g5320"
-         transform="translate(402.77304,-12.882544)">
-        <path
-           id="path5322"
-           d="m 595.125,692.53048 0,6.43903"
-           style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path
-           id="path5324"
-           d="m 598.34451,695.75 -6.43902,0"
-           style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      </g>
-    </g>
-  </g>
-</svg>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -260,44 +260,23 @@ StTooltip StLabel {
    spacing: 25px;
 }

-.workspace-indicator-panel {
-    spacing: 8px;
-}
-
-.workspace-indicator {
-    width: 24px;
-    height: 16px;
-    background: rgba(255,255,255,0.2);
-}
-
-.workspace-indicator.active {
-    background: rgba(255,255,255,0.8);
-}
-
 .workspace-controls {
-    width: 48px;
    font-size: 32px;
    font-weight: bold;
    color: #ffffff;
-    border: 2px solid rgba(128, 128, 128, 0.4);
+    border: 1px solid #424242;
    border-right: 0px;
    border-radius: 9px 0px 0px 9px;
+    background: #071524;
 }

-.add-workspace {
-    background-color: rgba(128, 128, 128, 0.4);
+.workspace-thumbnails {
+    spacing: 7px;
+    padding: 8px;
 }

-.add-workspace:hover {
-    background-color: rgba(128, 128, 128, 0.6);
-}
-
-.remove-workspace {
-    height: 48px;
-}
-
-.remove-workspace:hover {
-    background-color: rgba(128, 128, 128, 0.2);
+.workspace-thumbnail-indicator {
+    outline: 2px solid white;
 }

 .window-caption {
@ -921,6 +900,10 @@ StTooltip StLabel {
    border: 1px solid #a1a1a1;
 }

+.notification-button:focus {
+    background-color: #666666;
+}
+
 .notification-button:active {
    border: 1px solid #a1a1a1;
    background-color: #2b2b2b;
@ -933,6 +916,10 @@ StTooltip StLabel {
 }

 .notification-icon-button:hover {
+    border: 2px rgba(161,161,161,0.7);
+}
+
+.notification-icon-button:focus {
    background: rgba(192,192,192,0.7);
 }

--- a/data/theme/remove-workspace.svg
+++ b/data/theme/remove-workspace.svg
@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="23"
-   height="15"
-   id="svg5501"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="add-workspace.svg">
-  <defs
-     id="defs5503">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective5509" />
-    <inkscape:perspective
-       id="perspective5314"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="-0.074583208"
-     inkscape:cy="16"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1680"
-     inkscape:window-height="997"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox="true" />
-  <metadata
-     id="metadata5506">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-17)">
-    <g
-       style="display:inline"
-       id="g6239"
-       transform="translate(-953.97989,-657.32287)">
-      <rect
-         style="fill:#000000;fill-opacity:0.98770495;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         id="rect5318-6"
-         width="22"
-         height="14"
-         x="954.5"
-         y="675"
-         rx="0.49999979"
-         ry="0.5" />
-      <path
-         style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         d="m 968.71951,682 -6.43902,0"
-         id="path5324-5" />
-    </g>
-  </g>
-</svg>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -58,6 +58,7 @@ nobase_dist_js_DATA = 	\
 	ui/windowAttentionHandler.js	\
 	ui/windowManager.js	\
 	ui/workspace.js		\
+	ui/workspaceThumbnail.js	\
 	ui/workspacesView.js	\
 	ui/workspaceSwitcherPopup.js    \
 	ui/xdndHandler.js
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@ -29,8 +29,8 @@ DocInfo.prototype = {
        return St.TextureCache.get_default().load_recent_thumbnail(size, this.recentInfo);
    },

-    launch : function() {
-        Shell.DocSystem.get_default().open(this.recentInfo);
+    launch : function(workspaceIndex) {
+        Shell.DocSystem.get_default().open(this.recentInfo, workspaceIndex);
    },

    matchTerms: function(terms) {
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -223,14 +223,20 @@ BaseAppSearchProvider.prototype = {
                 'icon': app.create_icon_texture(Search.RESULT_ICON_SIZE)};
    },

-    activateResult: function(id) {
+    activateResult: function(id, params) {
+        params = Params.parse(params, { workspace: null,
+                                        timestamp: null });
+
        let app = this._appSys.get_app(id);
-        app.activate();
+        app.activate(params.workspace ? params.workspace.index() : -1);
    },

-    dragActivateResult: function(id) {
+    dragActivateResult: function(id, params) {
+        params = Params.parse(params, { workspace: null,
+                                        timestamp: null });
+
        let app = this._appSys.get_app(id);
-        app.open_new_window();
+        app.open_new_window(params.workspace ? params.workspace.get_index() : -1);
    }
 };

@ -397,7 +403,7 @@ AppWellIcon.prototype = {
            if (newWorkspace != null) {
                newWorkspace.activate(global.get_current_time());
                this.emit('launching');
-                this.app.open_new_window();
+                this.app.open_new_window(-1);
                Main.overview.hide();
            }
        } else if (button == 3) {
@ -485,9 +491,9 @@ AppWellIcon.prototype = {

        if (modifiers & Clutter.ModifierType.CONTROL_MASK
            && this.app.state == Shell.AppState.RUNNING) {
-            this.app.open_new_window();
+            this.app.open_new_window(-1);
        } else {
-            this.app.activate();
+            this.app.activate(-1);
        }
        Main.overview.hide();
    },
@ -497,8 +503,11 @@ AppWellIcon.prototype = {
        return this._menu.menuEventFilter(event);
    },

-    shellWorkspaceLaunch : function() {
-        this.app.open_new_window();
+    shellWorkspaceLaunch : function(params) {
+        params = Params.parse(params, { workspace: null,
+                                        timestamp: null });
+
+        this.app.open_new_window(params.workspace ? params.workspace.index() : -1);
    },

    getDragActor: function() {
@ -630,7 +639,7 @@ AppIconMenu.prototype = {
    },

    _findMetaWindowForActor: function (actor) {
-        if (actor._delegate instanceof Workspace.WindowClone)
+        if (actor._delegate.metaWindow)
            return actor._delegate.metaWindow;
        else if (actor.get_meta_window)
            return actor.get_meta_window();
@ -667,7 +676,7 @@ AppIconMenu.prototype = {
            let metaWindow = child._window;
            this.emit('activate-window', metaWindow);
        } else if (child == this._newWindowMenuItem) {
-            this._source.app.open_new_window();
+            this._source.app.open_new_window(-1);
            this.emit('activate-window', null);
        } else if (child == this._toggleFavoriteMenuItem) {
            let favs = AppFavorites.getAppFavorites();
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@ -414,16 +414,15 @@ BoxPointer.prototype = {
            if (sourceCenterX < margin) {
                // Not enough space to the top
                this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPLEFT : St.Corner.BOTTOMLEFT;
-                resX = 10;
-            } else if (sourceCenterX > (primary.width - margin)) {
+                resX = primary.x + 10;
+            } else if (sourceCenterX > (primary.x + primary.width - margin)) {
                // Not enough space to the botom
                this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPRIGHT : St.Corner.BOTTOMRIGHT;
-                resX = primary.width - (10 + natWidth);
+                resX = primary.x + primary.width - (10 + natWidth);
            }

-            resX = Math.max(resX, 10);
-            resX = Math.min(resX, primary.width - (10 + natWidth));
-
+            resX = Math.max(resX, primary.x + 10);
+            resX = Math.min(resX, primary.x + primary.width - (10 + natWidth));
            this.setArrowOrigin(sourceCenterX - resX);
            break;

@ -445,14 +444,14 @@ BoxPointer.prototype = {
                this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.TOPLEFT : St.Corner.TORIGHT;
                resY = 10;
            }
-            else if (sourceCenterY > (primary.height - margin)) {
+            else if (sourceCenterY > (primary.y + primary.height - margin)) {
                // Not enough space to the right
                this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.BOTTOMLEFT : St.Corner.BOTTOMRIGHT;
-                resY = primary.height - (10 + natHeight);
+                resY = primary.y + primary.height - (10 + natHeight);
            }

-            resY = Math.max(resY, 10);
-            resY = Math.min(resY, primary.height - (10 + natHeight));
+            resY = Math.max(resY, primary.y + 10);
+            resY = Math.min(resY, primary.y + primary.height - (10 + natHeight));

            this.setArrowOrigin(sourceCenterY - resY);
            break;
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -54,7 +54,7 @@ RemoveFavoriteIcon.prototype = {
        if (source instanceof AppDisplay.AppWellIcon) {
            let appSystem = Shell.AppSystem.get_default();
            app = appSystem.get_app(source.getId());
-        } else if (source instanceof Workspace.WindowClone) {
+        } else if (source.metaWindow) {
            let tracker = Shell.WindowTracker.get_default();
            app = tracker.get_window_app(source.metaWindow);
        }
@ -148,7 +148,7 @@ Dash.prototype = {
        let app = null;
        if (dragEvent.source instanceof AppDisplay.AppWellIcon)
            app = this._appSystem.get_app(dragEvent.source.getId());
-        else if (dragEvent.source instanceof Workspace.WindowClone)
+        else if (dragEvent.source.metaWindow)
            app = this._tracker.get_window_app(dragEvent.source.metaWindow);
        else
            return DND.DragMotionResult.CONTINUE;
@ -206,7 +206,7 @@ Dash.prototype = {

    _redisplay: function () {
        this._box.hide();
-        this._box.remove_all();
+        this._box.destroy_children();

        let favorites = AppFavorites.getAppFavorites().getFavoriteMap();

@ -265,7 +265,7 @@ Dash.prototype = {
        let app = null;
        if (source instanceof AppDisplay.AppWellIcon)
            app = this._appSystem.get_app(source.getId());
-        else if (source instanceof Workspace.WindowClone)
+        else if (source.metaWindow)
            app = this._tracker.get_window_app(source.metaWindow);

        // Don't allow favoriting of transient apps
@ -316,7 +316,7 @@ Dash.prototype = {
        let app = null;
        if (source instanceof AppDisplay.AppWellIcon) {
            app = this._appSystem.get_app(source.getId());
-        } else if (source instanceof Workspace.WindowClone) {
+        } else if (source.metaWindow) {
            app = this._tracker.get_window_app(source.metaWindow);
        }

--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -101,6 +101,12 @@ _Draggable.prototype = {
        this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet.
        this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).

+        // During the drag, we eat enter/leave events so that actors don't prelight or show
+        // tooltips. But we remember the relevant events (first leave, last enter) so we can
+        // fix up the hover state after the drag ends.
+        this._firstLeaveEvent = null;
+        this._lastEnterEvent = null;
+
        this._eventsGrabbed = false;
    },

@ -198,6 +204,11 @@ _Draggable.prototype = {
                this._cancelDrag(event.get_time());
                return true;
            }
+        } else if (event.type() == Clutter.EventType.LEAVE) {
+            if (this._firstLeaveEvent == null)
+                this._firstLeaveEvent = event;
+        } else if (event.type() == Clutter.EventType.ENTER) {
+            this._lastEnterEvent = event;
        }

        return false;
@ -485,7 +496,7 @@ _Draggable.prototype = {
        if (this._actorDestroyed) {
            global.unset_cursor();
            if (!this._buttonDown)
-                this._ungrabEvents();
+                this._dragComplete();
            this.emit('drag-end', eventTime, false);
            return;
        }
@ -542,12 +553,41 @@ _Draggable.prototype = {
            this._dragComplete();
    },

+    // Actor is an actor we might have entered or left during the drag; call
+    // st_widget_sync_hover on all StWidget ancestors
+    _syncHover: function(actor) {
+        // If the actor was reparented from its original location and
+        // destroyed, then start syncing hover at the original parent
+        if (actor == this._dragActor && this._actorDestroyed)
+            actor = this._dragOrigParent;
+
+        while (actor) {
+            let parent = actor.get_parent();
+            if (actor instanceof St.Widget)
+                actor.sync_hover();
+
+            actor = parent;
+        }
+    },
+
    _dragComplete: function() {
-        Shell.util_set_hidden_from_pick(this._dragActor, false);
+        if (!this._actorDestroyed)
+            Shell.util_set_hidden_from_pick(this._dragActor, false);
+
+        this._ungrabEvents();
+
+        if (this._firstLeaveEvent) {
+            this._syncHover(this._firstLeaveEvent.get_source());
+            this._firstLeaveEvent = null;
+        }
+
+        if (this._lastEnterEvent) {
+            this._syncHover(this._lastEnterEvent.get_source());
+            this._lastEnterEvent = null;
+        }

        this._dragActor = undefined;
        currentDraggable = null;
-        this._ungrabEvents();
    }
 };

--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@ -4,6 +4,7 @@ const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

 const DocInfo = imports.misc.docInfo;
+const Params = imports.misc.params;
 const Search = imports.ui.search;


@ -28,9 +29,12 @@ DocSearchProvider.prototype = {
                 'icon': docInfo.createIcon(Search.RESULT_ICON_SIZE)};
    },

-    activateResult: function(id) {
+    activateResult: function(id, params) {
+        params = Params.parse(params, { workspace: null,
+                                        timestamp: null });
+
        let docInfo = this._docManager.lookupByUri(id);
-        docInfo.launch();
+        docInfo.launch(params.workspace ? params.workspace.index() : -1);
    },

    getInitialResultSet: function(terms) {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -171,7 +171,7 @@ ListItem.prototype = {

    _onClicked: function() {
        this.emit('activate');
-        this._app.activate();
+        this._app.activate(-1);
    }
 };
 Signals.addSignalMethods(ListItem.prototype);
@ -470,7 +470,7 @@ EndSessionDialog.prototype = {
    OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) {
        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
        this._inhibitors = [];
-        this._applicationList.remove_all();
+        this._applicationList.destroy_children();
        this._type = type;

        if (!(this._type in DialogContent))
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -175,6 +175,8 @@ function start() {
        }
    });

+    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT, false, -1, 1);
+
    // Provide the bus object for gnome-session to
    // initiate logouts.
    EndSessionDialog.init();
@ -197,14 +199,103 @@ function start() {
    _log('info', 'loaded at ' + _startDate);
    log('GNOME Shell started at ' + _startDate);

-    Mainloop.idle_add(_removeUnusedWorkspaces);
-
    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
    if (perfModuleName) {
        let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
        let module = eval('imports.perf.' + perfModuleName + ';');
        Scripting.runPerfScript(module, perfOutput);
    }
+
+    global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
+    Mainloop.idle_add(_nWorkspacesChanged);
+}
+
+let _workspaces = [];
+let _checkWorkspacesId = 0;
+
+function _checkWorkspaces() {
+    let i;
+    let emptyWorkspaces = [];
+
+    for (i = 0; i < _workspaces.length; i++)
+        emptyWorkspaces[i] = true;
+
+    let windows = global.get_window_actors();
+    for (i = 0; i < windows.length; i++) {
+        let win = windows[i];
+
+        if (win.get_meta_window().is_on_all_workspaces())
+            continue;
+
+        let workspaceIndex = win.get_workspace();
+        emptyWorkspaces[workspaceIndex] = false;
+    }
+
+    // If we don't have an empty workspace at the end, add one
+    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
+        global.screen.append_new_workspace(false, global.get_current_time());
+        emptyWorkspaces.push(false);
+    }
+
+    // Delete other empty workspaces; do it from the end to avoid index changes
+    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
+        if (emptyWorkspaces[i])
+            global.screen.remove_workspace(_workspaces[i], global.get_current_time());
+    }
+
+    _checkWorkspacesId = 0;
+    return false;
+}
+
+function _queueCheckWorkspaces() {
+    if (_checkWorkspacesId == 0)
+        _checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, _checkWorkspaces);
+}
+
+function _nWorkspacesChanged() {
+    let oldNumWorkspaces = _workspaces.length;
+    let newNumWorkspaces = global.screen.n_workspaces;
+
+    if (oldNumWorkspaces == newNumWorkspaces)
+        return false;
+
+    let lostWorkspaces = [];
+    if (newNumWorkspaces > oldNumWorkspaces) {
+        let w;
+
+        // Assume workspaces are only added at the end
+        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
+            _workspaces[w] = global.screen.get_workspace_by_index(w);
+
+        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
+            let workspace = _workspaces[w];
+            workspace._windowAddedId = workspace.connect('window-added', _queueCheckWorkspaces);
+            workspace._windowRemovedId = workspace.connect('window-removed', _queueCheckWorkspaces);
+        }
+
+    } else {
+        // Assume workspaces are only removed sequentially
+        // (e.g. 2,3,4 - not 2,4,7)
+        let removedIndex;
+        let removedNum = oldNumWorkspaces - newNumWorkspaces;
+        for (let w = 0; w < oldNumWorkspaces; w++) {
+            let workspace = global.screen.get_workspace_by_index(w);
+            if (_workspaces[w] != workspace) {
+                removedIndex = w;
+                break;
+            }
+        }
+
+        let lostWorkspaces = _workspaces.splice(removedIndex, removedNum);
+        lostWorkspaces.forEach(function(workspace) {
+                                   workspace.disconnect(workspace._windowAddedId);
+                                   workspace.disconnect(workspace._windowRemovedId);
+                               });
+    }
+
+    _queueCheckWorkspaces();
+
+    return false;
 }

 /**
@ -301,34 +392,6 @@ function _relayout() {
    overview.hide();
 }

-// metacity-clutter currently uses the same prefs as plain metacity,
-// which probably means we'll be starting out with multiple workspaces;
-// remove any unused ones. (We do this from an idle handler, because
-// global.get_window_actors() still returns NULL at the point when start()
-// is called.)
-function _removeUnusedWorkspaces() {
-
-    let windows = global.get_window_actors();
-    let maxWorkspace = 0;
-    for (let i = 0; i < windows.length; i++) {
-        let win = windows[i];
-
-        if (!win.get_meta_window().is_on_all_workspaces() &&
-            win.get_workspace() > maxWorkspace) {
-            maxWorkspace = win.get_workspace();
-        }
-    }
-    let screen = global.screen;
-    if (screen.n_workspaces > maxWorkspace) {
-        for (let w = screen.n_workspaces - 1; w > maxWorkspace; w--) {
-            let workspace = screen.get_workspace_by_index(w);
-            screen.remove_workspace(workspace, 0);
-        }
-    }
-
-    return false;
-}
-
 // 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
@ -376,6 +439,12 @@ function _globalKeyPressHandler(actor, event) {
        case Meta.KeyBindingAction.WORKSPACE_RIGHT:
            wm.actionMoveWorkspaceRight();
            return true;
+        case Meta.KeyBindingAction.WORKSPACE_UP:
+            wm.actionMoveWorkspaceUp();
+            return true;
+        case Meta.KeyBindingAction.WORKSPACE_DOWN:
+            wm.actionMoveWorkspaceDown();
+            return true;
        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
        case Meta.KeyBindingAction.COMMAND_2:
            getRunDialog().open();
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -262,6 +262,7 @@ Notification.prototype = {
        this._titleFitsInBannerMode = true;
        this._spacing = 0;

+        this._buttonFocusManager = null;
        this._hasFocus = false;
        this._lockTrayOnFocusGrab = false;
        // We use this._prevFocusedWindow and this._prevKeyFocusActor to return the
@ -504,7 +505,7 @@ Notification.prototype = {
            this._buttonBox = box;
        }

-        let button = new St.Button();
+        let button = new St.Button({ can_focus: true });

        if (this._useActionIcons && Gtk.IconTheme.get_default().has_icon(id)) {
            button.add_style_class_name('notification-icon-button');
@ -514,8 +515,15 @@ Notification.prototype = {
            button.label = label;
        }

+        if (!this._buttonFocusManager)
+            this._buttonFocusManager = St.FocusManager.get_for_stage(global.stage);
+        if (this._buttonBox.get_children().length > 0)
+            this._buttonFocusManager.remove_group(this._buttonBox);
+
        this._buttonBox.add(button);
+        this._buttonFocusManager.add_group(this._buttonBox);
        button.connect('clicked', Lang.bind(this, this._onActionInvoked, id));
+
        this._updated();
    },

@ -665,6 +673,10 @@ Notification.prototype = {
        this._focusActorChangedId = global.stage.connect('notify::key-focus', Lang.bind(this, this._focusActorChanged));

        this._hasFocus = true;
+
+        if (this._buttonFocusManager)
+            this._buttonBox.get_children()[0].grab_key_focus();
+
        if (lockTray)
            Main.messageTray.lock();
    },
@ -794,6 +806,7 @@ Source.prototype = {
        this._iconBin = new St.Bin({ width: this.ICON_SIZE,
                                     height: this.ICON_SIZE });
        this.isTransient = false;
+        this.isChat = false;
    },

    setTransient: function(isTransient) {
@ -1013,6 +1026,7 @@ MessageTray.prototype = {
        // added to the summary without a notification being shown.
        this._newSummaryItems = [];
        this._longestSummaryItem = null;
+        this._chatSummaryItemsCount = 0;
    },

    _setSizePosition: function() {
@ -1046,7 +1060,12 @@ MessageTray.prototype = {

        let summaryItem = new SummaryItem(source);

-        this._summary.insert_actor(summaryItem.actor, 0);
+        if (source.isChat) {
+            this._summary.insert_actor(summaryItem.actor, 0);
+            this._chatSummaryItemsCount++;
+        } else {
+            this._summary.insert_actor(summaryItem.actor, this._chatSummaryItemsCount);
+        }

        let titleWidth = summaryItem.getTitleNaturalWidth();
        if (titleWidth > this._summaryItemTitleWidth) {
@ -1111,6 +1130,10 @@ MessageTray.prototype = {
            this._newSummaryItems.splice(newSummaryItemsIndex, 1);

        this._summaryItems.splice(index, 1);
+
+        if (source.isChat)
+            this._chatSummaryItemsCount--;
+
        if (this._longestSummaryItem.source == source) {
            let newTitleWidth = 0;
            this._longestSummaryItem = null;
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -83,7 +83,9 @@ ModalDialog.prototype = {
    },

    setButtons: function(buttons) {
-        this._buttonLayout.remove_all();
+        this._buttonLayout.destroy_children();
+        this._actionKeys = {};
+
        let i = 0;
        for (let index in buttons) {
            let buttonInfo = buttons[index];
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@ -12,6 +12,7 @@ const _ = Gettext.gettext;

 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
+const Params = imports.misc.params;
 const Search = imports.ui.search;
 const Util = imports.misc.util;

@ -58,6 +59,21 @@ PlaceInfo.prototype = {
    }
 };

+// Helper function to translate launch parameters into a GAppLaunchContext
+function _makeLaunchContext(params)
+{
+    params = Params.parse(params, { workspace: null,
+                                    timestamp: null });
+
+    let launchContext = global.create_app_launch_context();
+    if (params.workspace != null)
+        launchContext.set_desktop(params.workspace.index());
+    if (params.timestamp != null)
+        launchContext.set_timestamp(params.timestamp);
+
+    return launchContext;
+}
+
 function PlaceDeviceInfo(mount) {
    this._init(mount);
 }
@ -77,9 +93,9 @@ PlaceDeviceInfo.prototype = {
        return St.TextureCache.get_default().load_gicon(null, icon, size);
    },

-    launch: function() {
+    launch: function(param) {
        Gio.app_info_launch_default_for_uri(this._mount.get_root().get_uri(),
-                                            global.create_app_launch_context());
+                                            _makeLaunchContex(params));
    },

    isRemovable: function() {
@ -111,7 +127,6 @@ PlaceDeviceInfo.prototype = {
    }
 };

-
 function PlacesManager() {
    this._init();
 }
@ -130,8 +145,8 @@ PlacesManager.prototype = {
            function(size) {
                return St.TextureCache.get_default().load_gicon(null, homeIcon, size);
            },
-            function() {
-                Gio.app_info_launch_default_for_uri(homeUri, global.create_app_launch_context());
+            function(params) {
+                Gio.app_info_launch_default_for_uri(homeUri, _makeLaunchContext(params));
            });

        let desktopPath = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
@ -143,8 +158,8 @@ PlacesManager.prototype = {
            function(size) {
                return St.TextureCache.get_default().load_gicon(null, desktopIcon, size);
            },
-            function() {
-                Gio.app_info_launch_default_for_uri(desktopUri, global.create_app_launch_context());
+            function(params) {
+                Gio.app_info_launch_default_for_uri(desktopUri, _makeLaunchContext(params));
            });

        this._connect = new PlaceInfo('special:connect', _("Connect to..."),
@ -153,7 +168,11 @@ PlacesManager.prototype = {
                                     icon_type: St.IconType.FULLCOLOR,
                                     icon_size: size });
            },
-            function () {
+            function (params) {
+                // BUG: nautilus-connect-server doesn't have a desktop file, so we can'
+                // launch it with the workspace from params. It's probably pretty rare
+                // and odd to drag this place onto a workspace in any case
+
                Util.spawn(['nautilus-connect-server']);
            });

@ -173,8 +192,12 @@ PlacesManager.prototype = {
                function(size) {
                    return networkApp.create_icon_texture(size);
                },
-                function () {
-                    networkApp.launch();
+                function (params) {
+                    params = Params.parse(params, { workspace: null,
+                                                    timestamp: 0 });
+
+                    networkApp.launch_full(params.timestamp, [],
+                                           params.workspace ? params.workspace.index() : -1);
                });
        }

@ -314,8 +337,8 @@ PlacesManager.prototype = {
                function(size) {
                    return St.TextureCache.get_default().load_gicon(null, icon, size);
                },
-                function() {
-                    Gio.app_info_launch_default_for_uri(bookmark, global.create_app_launch_context());
+                function(params) {
+                    Gio.app_info_launch_default_for_uri(bookmark, _makeLaunchContext(params));
                });
            this._bookmarks.push(item);
        }
@ -395,9 +418,9 @@ PlaceSearchProvider.prototype = {
                 'icon': placeInfo.iconFactory(Search.RESULT_ICON_SIZE) };
    },

-    activateResult: function(id) {
+    activateResult: function(id, params) {
        let placeInfo = Main.placesManager.lookupPlaceById(id);
-        placeInfo.launch();
+        placeInfo.launch(params);
    },

    _compareResultMeta: function (idA, idB) {
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -267,7 +267,7 @@ OpenSearchSystem.prototype = {
        return lang != null;
    },

-    activateResult: function(id) {
+    activateResult: function(id, params) {
        let searchTerms = this._terms.join(' ');

        let url = this._providers[id].url.replace('{searchTerms}', encodeURIComponent(searchTerms));
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@ -81,11 +81,11 @@ SearchResult.prototype = {
        return new Clutter.Clone({ source: this.metaInfo['icon'] });
    },

-    shellWorkspaceLaunch: function() {
+    shellWorkspaceLaunch: function(params) {
        if (this.provider.dragActivateResult)
-            this.provider.dragActivateResult(this.metaInfo.id);
+            this.provider.dragActivateResult(this.metaInfo.id, params);
        else
-            this.provider.activateResult(this.metaInfo.id);
+            this.provider.activateResult(this.metaInfo.id, params);
    }
 };

--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@ -455,6 +455,8 @@ Source.prototype = {
    _init: function(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId) {
        MessageTray.Source.prototype._init.call(this, targetId);

+        this.isChat = true;
+
        this._accountPath = accountPath;

        let connName = Telepathy.pathToName(connPath);
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -525,23 +525,20 @@ WindowManager.prototype = {
    },

    _showWorkspaceSwitcher : function(shellwm, binding, window, backwards) {
-        /* We don't support this kind of layout */
-        if (binding == 'switch_to_workspace_up' || binding == 'switch_to_workspace_down')
-            return;
-
        if (global.screen.n_workspaces == 1)
            return;

        if (this._workspaceSwitcherPopup == null)
            this._workspaceSwitcherPopup = new WorkspaceSwitcherPopup.WorkspaceSwitcherPopup();

-        if (binding == 'switch_to_workspace_left') {
+        if (binding == 'switch_to_workspace_left')
            this.actionMoveWorkspaceLeft();
-        }
-
-        if (binding == 'switch_to_workspace_right') {
+        else if (binding == 'switch_to_workspace_right')
            this.actionMoveWorkspaceRight();
-        }
+        else if (binding == 'switch_to_workspace_up')
+            this.actionMoveWorkspaceUp();
+        else if (binding == 'switch_to_workspace_down')
+            this.actionMoveWorkspaceDown();
    },

    actionMoveWorkspaceLeft: function() {
@ -572,6 +569,32 @@ WindowManager.prototype = {
        if (indexToActivate != activeWorkspaceIndex)
            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());

+        if (!Main.overview.visible)
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, indexToActivate);
+    },
+
+    actionMoveWorkspaceUp: function() {
+        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+        let indexToActivate = activeWorkspaceIndex;
+        if (activeWorkspaceIndex > 0)
+            indexToActivate--;
+
+        if (indexToActivate != activeWorkspaceIndex)
+            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());
+
+        if (!Main.overview.visible)
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, indexToActivate);
+    },
+
+    actionMoveWorkspaceDown: function() {
+        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+        let indexToActivate = activeWorkspaceIndex;
+        if (activeWorkspaceIndex < global.screen.n_workspaces - 1)
+            indexToActivate++;
+
+        if (indexToActivate != activeWorkspaceIndex)
+            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());
+
        if (!Main.overview.visible)
            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, indexToActivate);
    }
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -104,6 +104,10 @@ WindowClone.prototype = {

        this._stackAbove = null;

+        this._sizeChangedId = this.realWindow.connect('size-changed', Lang.bind(this, function() {
+            this.emit('size-changed');
+        }));
+
        this.actor.connect('button-release-event',
                           Lang.bind(this, this._onButtonRelease));

@ -157,6 +161,9 @@ WindowClone.prototype = {
    },

    _onDestroy: function() {
+        this.realWindow.disconnect(this._sizeChangedId);
+        this._sizeChangedId = 0;
+
        this.metaWindow._delegate = null;
        this.actor._delegate = null;
        if (this._zoomLightbox)
@ -1325,10 +1332,10 @@ Workspace.prototype = {
                      Lang.bind(this, function() {
                          this._windowIsZooming = false;
                      }));
-        win.connect('size-changed',
-                    Lang.bind(this, function() {
-                        this.positionWindows(0);
-                    }));
+        clone.connect('size-changed',
+                      Lang.bind(this, function() {
+                          this.positionWindows(0);
+                      }));

        this.actor.add_actor(clone.actor);

@ -1395,7 +1402,7 @@ Workspace.prototype = {
    },

    acceptDrop : function(source, actor, x, y, time) {
-        if (source instanceof WindowClone) {
+        if (source.realWindow) {
            let win = source.realWindow;
            if (this._isMyWindow(win))
                return false;
@ -1414,8 +1421,8 @@ Workspace.prototype = {
                                                 time);
            return true;
        } else if (source.shellWorkspaceLaunch) {
-            this.metaWorkspace.activate(time);
-            source.shellWorkspaceLaunch();
+            source.shellWorkspaceLaunch({ workspace: this.metaWorkspace,
+                                          timestamp: time });
            return true;
        }

--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -0,0 +1,310 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const St = imports.gi.St;
+
+const DND = imports.ui.dnd;
+const Main = imports.ui.main;
+const Workspace = imports.ui.workspace;
+
+// Fraction of original screen size for thumbnails
+let THUMBNAIL_SCALE = 1/8.;
+
+function WindowClone(realWindow) {
+    this._init(realWindow);
+}
+
+WindowClone.prototype = {
+    _init : function(realWindow) {
+        this.actor = new Clutter.Clone({ source: realWindow.get_texture(),
+                                         clip_to_allocation: true,
+                                         reactive: true });
+        this.actor._delegate = this;
+        this.realWindow = realWindow;
+        this.metaWindow = realWindow.meta_window;
+        this.metaWindow._delegate = this;
+
+        this._positionChangedId = this.realWindow.connect('position-changed',
+                                                          Lang.bind(this, this._onPositionChanged));
+        this._onPositionChanged();
+
+        this.actor.connect('button-release-event',
+                           Lang.bind(this, this._onButtonRelease));
+
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+
+        this._draggable = DND.makeDraggable(this.actor,
+                                            { restoreOnSuccess: true,
+                                              dragActorMaxSize: Workspace.WINDOW_DND_SIZE,
+                                              dragActorOpacity: Workspace.DRAGGING_WINDOW_OPACITY });
+        this._draggable.connect('drag-begin', Lang.bind(this, this._onDragBegin));
+        this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd));
+        this.inDrag = false;
+
+        this._selected = false;
+    },
+
+    setStackAbove: function (actor) {
+        this._stackAbove = actor;
+        if (this._stackAbove == null)
+            this.actor.lower_bottom();
+        else
+            this.actor.raise(this._stackAbove);
+    },
+
+    destroy: function () {
+        this.actor.destroy();
+    },
+
+    _onPositionChanged: function() {
+        let rect = this.metaWindow.get_outer_rect();
+        this.actor.set_position(this.realWindow.x, this.realWindow.y);
+    },
+
+    _onDestroy: function() {
+        this.metaWindow._delegate = null;
+        this.actor._delegate = null;
+
+        if (this._positionChangedId != 0) {
+            this.realWindow.disconnect(this._positionChangedId);
+            this._positionChangedId = 0;
+        }
+
+        if (this.inDrag) {
+            this.emit('drag-end');
+            this.inDrag = false;
+        }
+
+        this.disconnectAll();
+    },
+
+    _onButtonRelease : function (actor, event) {
+        this._selected = true;
+        this.emit('selected', event.get_time());
+    },
+
+    _onDragBegin : function (draggable, time) {
+        this.inDrag = true;
+        this.emit('drag-begin');
+    },
+
+    _onDragEnd : function (draggable, time, snapback) {
+        this.inDrag = false;
+
+        // We may not have a parent if DnD completed successfully, in
+        // which case our clone will shortly be destroyed and replaced
+        // with a new one on the target workspace.
+        if (this.actor.get_parent() != null) {
+            if (this._stackAbove == null)
+                this.actor.lower_bottom();
+            else
+                this.actor.raise(this._stackAbove);
+        }
+
+
+        this.emit('drag-end');
+    }
+};
+Signals.addSignalMethods(WindowClone.prototype);
+
+
+/**
+ * @metaWorkspace: a #Meta.Workspace
+ */
+function WorkspaceThumbnail(metaWorkspace) {
+    this._init(metaWorkspace);
+}
+
+WorkspaceThumbnail.prototype = {
+    _init : function(metaWorkspace) {
+        // When dragging a window, we use this slot for reserve space.
+        this.metaWorkspace = metaWorkspace;
+
+        this.actor = new St.Bin({ reactive: true,
+                                  style_class: 'workspace-thumbnail' });
+        this.actor._delegate = this;
+
+        this._group = new Clutter.Group();
+        this.actor.add_actor(this._group);
+
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        this.actor.connect('button-press-event', Lang.bind(this,
+            function(actor, event) {
+                return true;
+            }));
+        this.actor.connect('button-release-event', Lang.bind(this,
+            function(actor, event) {
+                this.metaWorkspace.activate(event.get_time());
+                return true;
+            }));
+
+        this._background = new Clutter.Clone({ source: global.background_actor });
+        this._group.add_actor(this._background);
+
+        this._group.set_size(THUMBNAIL_SCALE * global.screen_width, THUMBNAIL_SCALE * global.screen_height);
+        this._group.set_scale(THUMBNAIL_SCALE, THUMBNAIL_SCALE);
+
+        let windows = global.get_window_actors().filter(this._isMyWindow, this);
+
+        // Create clones for windows that should be visible in the Overview
+        this._windows = [];
+        for (let i = 0; i < windows.length; i++) {
+            if (this._isOverviewWindow(windows[i])) {
+                this._addWindowClone(windows[i]);
+            }
+        }
+
+        // Track window changes
+        this._windowAddedId = this.metaWorkspace.connect('window-added',
+                                                          Lang.bind(this, this._windowAdded));
+        this._windowRemovedId = this.metaWorkspace.connect('window-removed',
+                                                           Lang.bind(this, this._windowRemoved));
+    },
+
+    _lookupIndex: function (metaWindow) {
+        for (let i = 0; i < this._windows.length; i++) {
+            if (this._windows[i].metaWindow == metaWindow) {
+                return i;
+            }
+        }
+        return -1;
+    },
+
+    syncStacking: function(stackIndices) {
+        this._windows.sort(function (a, b) { return stackIndices[a.metaWindow.get_stable_sequence()] - stackIndices[b.metaWindow.get_stable_sequence()]; });
+
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+            let metaWindow = clone.metaWindow;
+            if (i == 0) {
+                clone.setStackAbove(this._background);
+            } else {
+                let previousClone = this._windows[i - 1];
+                clone.setStackAbove(previousClone.actor);
+            }
+        }
+    },
+
+    _windowRemoved : function(metaWorkspace, metaWin) {
+        let win = metaWin.get_compositor_private();
+
+        // find the position of the window in our list
+        let index = this._lookupIndex (metaWin);
+
+        if (index == -1)
+            return;
+
+        let clone = this._windows[index];
+        this._windows.splice(index, 1);
+        clone.destroy();
+    },
+
+    _windowAdded : function(metaWorkspace, metaWin) {
+        if (this.leavingOverview)
+            return;
+
+        let win = metaWin.get_compositor_private();
+
+        if (!win) {
+            // Newly-created windows are added to a workspace before
+            // the compositor finds out about them...
+            Mainloop.idle_add(Lang.bind(this,
+                                        function () {
+                                            if (this.actor && metaWin.get_compositor_private())
+                                                this._windowAdded(metaWorkspace, metaWin);
+                                            return false;
+                                        }));
+            return;
+        }
+
+        if (!this._isOverviewWindow(win))
+            return;
+
+        let clone = this._addWindowClone(win);
+    },
+
+    destroy : function() {
+        this.actor.destroy();
+    },
+
+    _onDestroy: function(actor) {
+        this.metaWorkspace.disconnect(this._windowAddedId);
+        this.metaWorkspace.disconnect(this._windowRemovedId);
+
+        this._windows = [];
+        this.actor = null;
+    },
+
+    // Tests if @win belongs to this workspaces
+    _isMyWindow : function (win) {
+        return win.get_workspace() == this.metaWorkspace.index() ||
+            (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
+    },
+
+    // Tests if @win should be shown in the Overview
+    _isOverviewWindow : function (win) {
+        let tracker = Shell.WindowTracker.get_default();
+        return tracker.is_window_interesting(win.get_meta_window());
+    },
+
+    // Create a clone of a (non-desktop) window and add it to the window list
+    _addWindowClone : function(win) {
+        let clone = new WindowClone(win);
+
+        clone.connect('selected',
+                      Lang.bind(this, this._onCloneSelected));
+        clone.connect('drag-begin',
+                      Lang.bind(this, function(clone) {
+                          Main.overview.beginWindowDrag();
+                      }));
+        clone.connect('drag-end',
+                      Lang.bind(this, function(clone) {
+                          Main.overview.endWindowDrag();
+                      }));
+        this._group.add_actor(clone.actor);
+
+        this._windows.push(clone);
+
+        return clone;
+    },
+
+    _onCloneSelected : function (clone, time) {
+        this.metaWorkspace.activate(time);
+    },
+
+    // Draggable target interface
+    handleDragOver : function(source, actor, x, y, time) {
+        if (source.realWindow)
+            return DND.DragMotionResult.MOVE_DROP;
+        if (source.shellWorkspaceLaunch)
+            return DND.DragMotionResult.COPY_DROP;
+
+        return DND.DragMotionResult.CONTINUE;
+    },
+
+    acceptDrop : function(source, actor, x, y, time) {
+        if (source.realWindow) {
+            let win = source.realWindow;
+            if (this._isMyWindow(win))
+                return false;
+
+            let metaWindow = win.get_meta_window();
+            metaWindow.change_workspace_by_index(this.metaWorkspace.index(),
+                                                 false, // don't create workspace
+                                                 time);
+            return true;
+        } else if (source.shellWorkspaceLaunch) {
+            source.shellWorkspaceLaunch({ workspace: this.metaWorkspace,
+                                          timestamp: time });
+            return true;
+        }
+
+        return false;
+    }
+};
+
+Signals.addSignalMethods(WorkspaceThumbnail.prototype);
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -4,7 +4,9 @@ data/org.gnome.accessibility.magnifier.gschema.xml.in
 js/misc/util.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
+js/ui/calendar.js
 js/ui/dash.js
+js/ui/dateMenu.js
 js/ui/docDisplay.js
 js/ui/endSessionDialog.js
 js/ui/lookingGlass.js
--- a/po/nb.po
+++ b/po/nb.po
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 2.91.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-25 20:46+0100\n"
-"PO-Revision-Date: 2011-01-25 20:47+0100\n"
+"POT-Creation-Date: 2011-02-02 20:31+0100\n"
+"PO-Revision-Date: 2011-02-02 20:34+0100\n"
 "Last-Translator: Torstein Adolf Winterseth <kvikende@fsfe.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@ -268,17 +268,21 @@ msgstr ""
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr ""

+#: ../js/misc/util.js:86
+msgid "Command not found"
+msgstr "Kommando ikke funnet"
+
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:108
+#: ../js/misc/util.js:113
 msgid "Could not parse command:"
 msgstr "Klarte ikke å lese kommando:"

-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:135
 msgid "No such application"
 msgstr "Programmet finnes ikke"

-#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
+#: ../js/misc/util.js:148
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Kjøring av «%s» feilet:"
@ -318,10 +322,142 @@ msgstr "%s ble lagt til i dine favoritter."
 msgid "%s has been removed from your favorites."
 msgstr "%s ble fjernet fra dine favoritter."

+#. Translators: Shown in calendar event list for all day events
+#: ../js/ui/calendar.js:62
+msgid "All Day"
+msgstr "Hele dagen"
+
+#. Translators: Calendar grid abbreviation for Sunday.
+#. *
+#. * NOTE: These abbreviations are always shown together and in
+#. * order, e.g. "S M T W T F S".
+#.
+#. Translators: Calendar grid abbreviation for Saturday
+#. Translators: Event list abbreviation for Saturday
+#: ../js/ui/calendar.js:112 ../js/ui/calendar.js:124 ../js/ui/calendar.js:149
+msgid "S"
+msgstr "S"
+
+#. Translators: Calendar grid abbreviation for Monday
+#. Translators: Event list abbreviation for Monday
+#: ../js/ui/calendar.js:114 ../js/ui/calendar.js:139
+msgid "M"
+msgstr "M"
+
+#. Translators: Calendar grid abbreviation for Tuesday
+#. Translators: Calendar grid abbreviation for Thursday
+#. Translators: Event list abbreviation for Tuesday
+#: ../js/ui/calendar.js:116 ../js/ui/calendar.js:120 ../js/ui/calendar.js:141
+msgid "T"
+msgstr "T"
+
+#. Translators: Calendar grid abbreviation for Wednesday
+#. Translators: Event list abbreviation for Wednesday
+#: ../js/ui/calendar.js:118 ../js/ui/calendar.js:143
+msgid "W"
+msgstr "O"
+
+#. Translators: Calendar grid abbreviation for Friday
+#. Translators: Event list abbreviation for Friday
+#: ../js/ui/calendar.js:122 ../js/ui/calendar.js:147
+msgid "F"
+msgstr "F"
+
+#. Translators: Event list abbreviation for Sunday.
+#. *
+#. * NOTE: These abbreviations are normally not shown together
+#. * so they need to be unique (e.g. Tuesday and Thursday cannot
+#. * both be 'T').
+#.
+#: ../js/ui/calendar.js:137
+msgid "Su"
+msgstr "Sø"
+
+#. Translators: Event list abbreviation for Thursday
+#: ../js/ui/calendar.js:145
+msgid "Th"
+msgstr "To"
+
+#. Translators: Text to show if there are no events
+#: ../js/ui/calendar.js:696
+msgid "Nothing Scheduled"
+msgstr "Ingenting planlagt"
+
+#: ../js/ui/calendar.js:723
+msgid "Today"
+msgstr "I dag"
+
+#: ../js/ui/calendar.js:727
+msgid "Tomorrow"
+msgstr "I morgen"
+
+#: ../js/ui/calendar.js:736
+msgid "This week"
+msgstr "Denne uken"
+
+#: ../js/ui/calendar.js:744
+msgid "Next week"
+msgstr "Neste uke"
+
 #: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "Fjern"

+#: ../js/ui/dateMenu.js:91
+msgid "Date and Time Settings"
+msgstr "Innstillinger for dato og klokkeslett"
+
+#: ../js/ui/dateMenu.js:110
+msgid "Open Calendar"
+msgstr "Åpne kalender"
+
+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/dateMenu.js:149
+msgid "%a %b %e, %R:%S"
+msgstr "%a %e %b, %R.%S"
+
+#: ../js/ui/dateMenu.js:150
+msgid "%a %b %e, %R"
+msgstr "%a %e %b, %R"
+
+#. Translators: This is the time format without date used
+#. in 24-hour mode.
+#: ../js/ui/dateMenu.js:154
+msgid "%a %R:%S"
+msgstr "%a %R.%S"
+
+#: ../js/ui/dateMenu.js:155
+msgid "%a %R"
+msgstr "%a %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/dateMenu.js:162
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e %b, %l.%M.%S %p"
+
+#: ../js/ui/dateMenu.js:163
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a %e %b, %l.%M %p"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#: ../js/ui/dateMenu.js:167
+msgid "%a %l:%M:%S %p"
+msgstr "%a %l.%M.%S %p"
+
+#: ../js/ui/dateMenu.js:168
+msgid "%a %l:%M %p"
+msgstr "%a %l.%M %p"
+
+#. Translators: This is the date format to use when the calendar popup is
+#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
+#.
+#: ../js/ui/dateMenu.js:194
+msgid "%A %B %e, %Y"
+msgstr "%a %e %B, %Y"
+
 #: ../js/ui/docDisplay.js:18
 msgid "RECENT ITEMS"
 msgstr "SISTE OPPFØRINGER"
@ -337,7 +473,8 @@ msgstr "Logg ut …"

 #: ../js/ui/endSessionDialog.js:65
 msgid "Click Log Out to quit these applications and log out of the system."
-msgstr "Klikk Logg ut for å avslutte disse programmene og logge ut av systemet."
+msgstr ""
+"Klikk Logg ut for å avslutte disse programmene og logge ut av systemet."

 #: ../js/ui/endSessionDialog.js:66
 #, c-format
@ -376,7 +513,9 @@ msgstr "Start på nytt"

 #: ../js/ui/endSessionDialog.js:85
 msgid "Click Restart to quit these applications and restart the system."
-msgstr "Klikk Start på nytt for å avslutte disse programmene og starte systemet på nytt."
+msgstr ""
+"Klikk Start på nytt for å avslutte disse programmene og starte systemet på "
+"nytt."

 #: ../js/ui/endSessionDialog.js:86
 #, c-format
@ -425,7 +564,7 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"

-#: ../js/ui/messageTray.js:1765
+#: ../js/ui/messageTray.js:1809
 msgid "System Information"
 msgstr "Systeminformasjon"

@ -442,54 +581,14 @@ msgid "Applications"
 msgstr "Programmer"

 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:483
+#: ../js/ui/panel.js:480
 #, c-format
 msgid "Quit %s"
 msgstr "Avslutt %s"

-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/panel.js:568
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %R.%S"
-
-#: ../js/ui/panel.js:569
-msgid "%a %b %e, %R"
-msgstr "%a %e %b, %R"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../js/ui/panel.js:573
-msgid "%a %R:%S"
-msgstr "%a %R.%S"
-
-#: ../js/ui/panel.js:574
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/panel.js:581
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %l.%M.%S %p"
-
-#: ../js/ui/panel.js:582
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %l.%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../js/ui/panel.js:586
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l.%M.%S %p"
-
-#: ../js/ui/panel.js:587
-msgid "%a %l:%M %p"
-msgstr "%a %l.%M %p"
-
 #. 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:732
+#: ../js/ui/panel.js:614
 msgid "Activities"
 msgstr "Aktiviteter"

@ -815,22 +914,22 @@ msgstr "Volum"
 msgid "Microphone"
 msgstr "Mikrofon"

-#: ../js/ui/telepathyClient.js:561
+#: ../js/ui/telepathyClient.js:563
 #, c-format
 msgid "%s is online."
 msgstr "%s er tilkoblet."

-#: ../js/ui/telepathyClient.js:566
+#: ../js/ui/telepathyClient.js:568
 #, c-format
 msgid "%s is offline."
 msgstr "%s er frakoblet."

-#: ../js/ui/telepathyClient.js:569
+#: ../js/ui/telepathyClient.js:571
 #, c-format
 msgid "%s is away."
 msgstr "«%s» er borte."

-#: ../js/ui/telepathyClient.js:572
+#: ../js/ui/telepathyClient.js:574
 #, c-format
 msgid "%s is busy."
 msgstr "%s er opptatt."
@ -838,7 +937,7 @@ msgstr "%s er opptatt."
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:666
+#: ../js/ui/telepathyClient.js:668
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "Sendt %X på %A"
--- a/po/pa.po
+++ b/po/pa.po
@ -7,8 +7,8 @@ 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: 2011-01-27 20:47+0000\n"
-"PO-Revision-Date: 2011-01-29 07:39+0530\n"
+"POT-Creation-Date: 2011-02-02 12:03+0000\n"
+"PO-Revision-Date: 2011-02-03 08:24+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"
@ -351,10 +351,145 @@ msgstr "%s ਨੂੰ ਤੁਹਾਡੀ ਪਸੰਦ ਵਿੱਚ ਸ਼ਾਮ
 msgid "%s has been removed from your favorites."
 msgstr "%s ਨੂੰ ਤੁਹਾਡੀ ਪਸੰਦ ਤੋਂ ਹਟਾਇਆ ਜਾ ਚੁੱਕਿਆ ਹੈ।"

+#. Translators: Shown in calendar event list for all day events
+#: ../js/ui/calendar.js:62
+#| msgid "All"
+msgid "All Day"
+msgstr "ਸਭ ਦਿਨ"
+
+#. Translators: Calendar grid abbreviation for Sunday.
+#. *
+#. * NOTE: These abbreviations are always shown together and in
+#. * order, e.g. "S M T W T F S".
+#.
+#. Translators: Calendar grid abbreviation for Saturday
+#. Translators: Event list abbreviation for Saturday
+#: ../js/ui/calendar.js:112 ../js/ui/calendar.js:124 ../js/ui/calendar.js:149
+msgid "S"
+msgstr "ਐ"
+
+#. Translators: Calendar grid abbreviation for Monday
+#. Translators: Event list abbreviation for Monday
+#: ../js/ui/calendar.js:114 ../js/ui/calendar.js:139
+msgid "M"
+msgstr "ਸੋ"
+
+#. Translators: Calendar grid abbreviation for Tuesday
+#. Translators: Calendar grid abbreviation for Thursday
+#. Translators: Event list abbreviation for Tuesday
+#: ../js/ui/calendar.js:116 ../js/ui/calendar.js:120 ../js/ui/calendar.js:141
+msgid "T"
+msgstr "ਮੰ"
+
+#. Translators: Calendar grid abbreviation for Wednesday
+#. Translators: Event list abbreviation for Wednesday
+#: ../js/ui/calendar.js:118 ../js/ui/calendar.js:143
+msgid "W"
+msgstr "ਬੁੱ"
+
+#. Translators: Calendar grid abbreviation for Friday
+#. Translators: Event list abbreviation for Friday
+#: ../js/ui/calendar.js:122 ../js/ui/calendar.js:147
+msgid "F"
+msgstr "ਸ਼ੁੱ"
+
+#. Translators: Event list abbreviation for Sunday.
+#. *
+#. * NOTE: These abbreviations are normally not shown together
+#. * so they need to be unique (e.g. Tuesday and Thursday cannot
+#. * both be 'T').
+#.
+#: ../js/ui/calendar.js:137
+msgid "Su"
+msgstr "ਐ"
+
+#. Translators: Event list abbreviation for Thursday
+#: ../js/ui/calendar.js:145
+msgid "Th"
+msgstr "ਵੀ"
+
+#. Translators: Text to show if there are no events
+#: ../js/ui/calendar.js:696
+msgid "Nothing Scheduled"
+msgstr "ਕੋਈ ਵੀ ਸੈਡਿਊਲ ਨਹੀਂ ਹੈ"
+
+#: ../js/ui/calendar.js:723
+msgid "Today"
+msgstr "ਅੱਜ"
+
+#: ../js/ui/calendar.js:727
+msgid "Tomorrow"
+msgstr "ਭਲਕ"
+
+#: ../js/ui/calendar.js:736
+msgid "This week"
+msgstr "ਇਹ ਹਫ਼ਤਾ"
+
+#: ../js/ui/calendar.js:744
+msgid "Next week"
+msgstr "ਹਫ਼ਤਾ ਅੱਗੇ"
+
 #: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "ਹਟਾਓ"

+#: ../js/ui/dateMenu.js:91
+#| msgid "System Settings"
+msgid "Date and Time Settings"
+msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ ਸੈਟਿੰਗ"
+
+#: ../js/ui/dateMenu.js:110
+msgid "Open Calendar"
+msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹੋ"
+
+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/dateMenu.js:149
+msgid "%a %b %e, %R:%S"
+msgstr "%a, %e %b %R:%S"
+
+#: ../js/ui/dateMenu.js:150
+msgid "%a %b %e, %R"
+msgstr "%a %e %b, %R"
+
+#. Translators: This is the time format without date used
+#. in 24-hour mode.
+#: ../js/ui/dateMenu.js:154
+msgid "%a %R:%S"
+msgstr "%a %R:%S"
+
+#: ../js/ui/dateMenu.js:155
+msgid "%a %R"
+msgstr "%a %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/dateMenu.js:162
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e %b, %l:%M:%S %p"
+
+#: ../js/ui/dateMenu.js:163
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a %e %b, %l:%M %p"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#: ../js/ui/dateMenu.js:167
+msgid "%a %l:%M:%S %p"
+msgstr "%a %l:%M:%S %p"
+
+#: ../js/ui/dateMenu.js:168
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#. Translators: This is the date format to use when the calendar popup is
+#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
+#.
+#: ../js/ui/dateMenu.js:194
+#| msgid "%a %b %e, %R"
+msgid "%A %B %e, %Y"
+msgstr "%A, %e %B %Y"
+
 #: ../js/ui/docDisplay.js:18
 msgid "RECENT ITEMS"
 msgstr "ਤਾਜ਼ਾ ਆਈਟਮਾਂ"
@ -460,7 +595,7 @@ msgstr "ਸਰੋਤ ਵੇਖੋ"
 msgid "Web Page"
 msgstr "ਵੈੱਬ ਪੇਜ਼"

-#: ../js/ui/messageTray.js:1765
+#: ../js/ui/messageTray.js:1809
 msgid "System Information"
 msgstr "ਸਿਸਟਮ ਜਾਣਕਾਰੀ"

@ -477,54 +612,14 @@ msgid "Applications"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ"

 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:483
+#: ../js/ui/panel.js:480
 #, c-format
 msgid "Quit %s"
 msgstr "%s ਬੰਦ ਕਰੋ"

-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/panel.js:568
-msgid "%a %b %e, %R:%S"
-msgstr "%a, %e %b %R:%S"
-
-#: ../js/ui/panel.js:569
-msgid "%a %b %e, %R"
-msgstr "%a %e %b, %R"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../js/ui/panel.js:573
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
-
-#: ../js/ui/panel.js:574
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/panel.js:581
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %l:%M:%S %p"
-
-#: ../js/ui/panel.js:582
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../js/ui/panel.js:586
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../js/ui/panel.js:587
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
 #. 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:732
+#: ../js/ui/panel.js:614
 msgid "Activities"
 msgstr "ਸਰਗਰਮੀਆਂ"

@ -755,7 +850,6 @@ msgid "OK"
 msgstr "ਠੀਕ ਹੈ"

 #: ../js/ui/status/keyboard.js:78
-#| msgid "Sound Settings"
 msgid "Localization Settings"
 msgstr "ਲੋਕਲਾਈਜ਼ੇਸ਼ਨ ਸੈਟਿੰਗ"

@ -851,22 +945,22 @@ msgstr "ਆਵਾਜ਼"
 msgid "Microphone"
 msgstr "ਮਾਈਕਰੋਫੋਨ"

-#: ../js/ui/telepathyClient.js:561
+#: ../js/ui/telepathyClient.js:563
 #, c-format
 msgid "%s is online."
 msgstr "%s ਆਨਲਾਈਨ ਹੈ।"

-#: ../js/ui/telepathyClient.js:566
+#: ../js/ui/telepathyClient.js:568
 #, c-format
 msgid "%s is offline."
 msgstr "%s ਆਫਲਾਈਨ ਹੈ।"

-#: ../js/ui/telepathyClient.js:569
+#: ../js/ui/telepathyClient.js:571
 #, c-format
 msgid "%s is away."
 msgstr "%s ਦੂਰ ਹੈ।"

-#: ../js/ui/telepathyClient.js:572
+#: ../js/ui/telepathyClient.js:574
 #, c-format
 msgid "%s is busy."
 msgstr "%s ਰੁੱਝਿਆ/ਰੁੱਝੀ ਹੈ।"
@ -874,7 +968,7 @@ msgstr "%s ਰੁੱਝਿਆ/ਰੁੱਝੀ ਹੈ।"
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:666
+#: ../js/ui/telepathyClient.js:668
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "%2$A ਨੂੰ %1$X ਵਜੇ ਭੇਜਿਆ"
--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -411,6 +411,8 @@ shell_app_activate_window (ShellApp     *app,
 /**
 * shell_app_activate:
 * @app: a #ShellApp
+ * @workspace: launch on this workspace, or -1 for default. Ignored if
+ *   activating an existing window
 *
 * Perform an appropriate default action for operating on this application,
 * dependent on its current state.  For example, if the application is not
@ -419,13 +421,19 @@ shell_app_activate_window (ShellApp     *app,
 * recently used transient for that window).
 */
 void
-shell_app_activate (ShellApp  *app)
+shell_app_activate (ShellApp      *app,
+                    int            workspace)
 {
  switch (app->state)
    {
      case SHELL_APP_STATE_STOPPED:
        /* TODO sensibly handle this error */
-        shell_app_info_launch (app->info, NULL);
+        shell_app_info_launch_full (app->info,
+                                    0,
+                                    NULL,
+                                    workspace,
+                                    NULL,
+                                    NULL);
        break;
      case SHELL_APP_STATE_STARTING:
        break;
@ -438,11 +446,13 @@ shell_app_activate (ShellApp  *app)
 /**
 * shell_app_open_new_window:
 * @app: a #ShellApp
+ * @workspace: open on this workspace, or -1 for default
 *
 * Request that the application create a new window.
 */
 void
-shell_app_open_new_window (ShellApp *app)
+shell_app_open_new_window (ShellApp      *app,
+                           int            workspace)
 {
  /* Here we just always launch the application again, even if we know
   * it was already running.  For most applications this
@ -452,7 +462,12 @@ shell_app_open_new_window (ShellApp *app)
   * as say Pidgin.  Ideally, we have the application express to us
   * that it supports an explicit new-window action.
   */
-  shell_app_info_launch (app->info, NULL);
+  shell_app_info_launch_full (app->info,
+                              0,
+                              NULL,
+                              workspace,
+                              NULL,
+                              NULL);
 }

 /**
--- a/src/shell-app.h
+++ b/src/shell-app.h
@ -44,9 +44,11 @@ gboolean shell_app_is_transient (ShellApp *app);

 void shell_app_activate_window (ShellApp *app, MetaWindow *window, guint32 timestamp);

-void shell_app_activate (ShellApp *app);
+void shell_app_activate (ShellApp      *app,
+                         int            workspace);

-void shell_app_open_new_window (ShellApp *app);
+void shell_app_open_new_window (ShellApp *app,
+                                int       workspace);

 ShellAppState shell_app_get_state (ShellApp *app);

--- a/src/shell-doc-system.c
+++ b/src/shell-doc-system.c
@ -227,17 +227,24 @@ shell_doc_system_on_recent_changed (GtkRecentManager  *manager,
 * shell_doc_system_open:
 * @system: A #ShellDocSystem
 * @info: A #GtkRecentInfo
+ * @workspace: Open on this workspace, or -1 for default
 *
 * Launch the default application associated with the mime type of
 * @info, using its uri.
 */
 void
 shell_doc_system_open (ShellDocSystem *system,
-                       GtkRecentInfo  *info)
+                       GtkRecentInfo  *info,
+                       int             workspace)
 {
  GFile *file;
  GAppInfo *app_info;
  gboolean needs_uri;
+  GAppLaunchContext *context;
+
+  context = shell_global_create_app_launch_context (shell_global_get ());
+  if (workspace != -1)
+    gdk_app_launch_context_set_desktop ((GdkAppLaunchContext *)context, workspace);

  file = g_file_new_for_uri (gtk_recent_info_get_uri (info));
  needs_uri = g_file_get_path (file) == NULL;
@ -248,7 +255,7 @@ shell_doc_system_open (ShellDocSystem *system,
    {
      GList *uris;
      uris = g_list_prepend (NULL, (gpointer)gtk_recent_info_get_uri (info));
-      g_app_info_launch_uris (app_info, uris, shell_global_create_app_launch_context (shell_global_get ()), NULL);
+      g_app_info_launch_uris (app_info, uris, context, NULL);
      g_list_free (uris);
    }
  else
@ -267,7 +274,6 @@ shell_doc_system_open (ShellDocSystem *system,
      if (gtk_recent_info_get_application_info (info, app_name, &app_exec, &count, &time))
        {
          GRegex *regex;
-          GAppLaunchContext *context;

          /* TODO: Change this once better support for creating
             GAppInfo is added to GtkRecentInfo, as right now
@ -298,13 +304,13 @@ shell_doc_system_open (ShellDocSystem *system,
             despite passing the app launch context, no startup
             notification occurs.
           */
-          context = shell_global_create_app_launch_context (shell_global_get ());
          g_app_info_launch (app_info, NULL, context, NULL);
-          g_object_unref (context);
        }

      g_free (app_name);
    }
+
+  g_object_unref (context);
 }

 static void
--- a/src/shell-doc-system.h
+++ b/src/shell-doc-system.h
@ -41,6 +41,7 @@ void shell_doc_system_queue_existence_check (ShellDocSystem   *system,
                                             guint             n_items);

 void shell_doc_system_open (ShellDocSystem *system,
-                            GtkRecentInfo  *info);
+                            GtkRecentInfo  *info,
+                            int             workspace);

 #endif /* __SHELL_DOC_SYSTEM_H__ */
--- a/src/st/st-container.c
+++ b/src/st/st-container.c
@ -35,6 +35,7 @@ struct _StContainerPrivate
  GList *children;
  ClutterActor *first_child;
  ClutterActor *last_child;
+  gboolean block_update_pseude_classes;
 };

 static void clutter_container_iface_init (ClutterContainerIface *iface);
@ -50,6 +51,9 @@ st_container_update_pseudo_classes (StContainer *container)
  ClutterActor *first_child, *last_child;
  StContainerPrivate *priv = container->priv;

+  if (priv->block_update_pseude_classes)
+    return;
+
  first_item = priv->children;
  first_child = first_item ? first_item->data : NULL;
  if (first_child != priv->first_child)
@ -91,28 +95,6 @@ st_container_update_pseudo_classes (StContainer *container)
    }
 }

-/**
- * st_container_remove_all:
- * @container: An #StContainer
- *
- * Removes all child actors from @container.
- */
-void
-st_container_remove_all (StContainer *container)
-{
-  StContainerPrivate *priv = container->priv;
-
-  /* copied from clutter_group_remove_all() */
-  while (priv->children)
-    {
-      ClutterActor *child = priv->children->data;
-      priv->children = priv->children->next;
-
-      clutter_container_remove_actor (CLUTTER_CONTAINER (container), child);
-    }
-  st_container_update_pseudo_classes (container);
-}
-
 /**
 * st_container_destroy_children:
 * @container: An #StContainer
@ -124,13 +106,14 @@ st_container_destroy_children (StContainer *container)
 {
  StContainerPrivate *priv = container->priv;

-  while (priv->children)
-    {
-      ClutterActor *child = priv->children->data;
-      priv->children = priv->children->next;
+  priv->block_update_pseude_classes = TRUE;

-      clutter_actor_destroy (child);
-    }
+  while (priv->children)
+    clutter_actor_destroy (priv->children->data);
+
+  priv->block_update_pseude_classes = FALSE;
+
+  st_container_update_pseudo_classes (container);
 }

 void
--- a/src/st/st-container.h
+++ b/src/st/st-container.h
@ -53,7 +53,6 @@ struct _StContainerClass {

 GType   st_container_get_type             (void) G_GNUC_CONST;

-void    st_container_remove_all           (StContainer *container);
 void    st_container_destroy_children     (StContainer *container);

 GList * st_container_get_focus_chain      (StContainer *container);
Author	SHA1	Message	Date
Owen W. Taylor	87ce301faa	Handle changes in window position for workspace thumbnails Connect to the 'position-set' signal of MetaWindowActor and move actors when the source windows move.	2011-02-02 23:45:57 -05:00
Owen W. Taylor	1ab526dc64	Improve workspace controls slide-in positioning Intead of using a St.Group and tweening the position of the controls actor, use a St.GenericLayout and tween a Javascript property. This allows us to more reliably track the height of the overall workspace display and propagate it to the controls actor. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:57 -05:00
Owen W. Taylor	c11162f794	Don't switch to a workspace when dragging it to launch on that workspace With workspace thumbnails, we don't switch workspaces when dragging windows between workspaces or adding new workspaces, so we also shouldn't switch on launch. * Add workspace parameters to shell_doc_system_open(), shell_app_activate, shell_app_open_new_window() * Pass a 'params' object when activating items in the overview with two currently defined parameters: workspace and timestamp. (timestamp is only implemented where it is easy and doesn't require interface changes - using the global current timestamp for the shell is almost always right or at least good enough.) https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:57 -05:00
Owen W. Taylor	8e5d613bfa	Avoid popping the workspace controls in and out at the end of DND At the end of a drag operation, we would invoke the code to slide the controls in (because we were no longer DND'ing and not hovering) and then immediately afterwards invoke the code to slide it back out when we got the ENTER event from the end of DND. While the immediately overridden tween probably won't have any visible effect it's better to avoid this, so wait to update the zoom state until BEFORE_REDRAW. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:57 -05:00
Owen W. Taylor	8786da0044	Remove now unnecessary workspace controls With automatic workspace management, explicit controls to add and remove workspaces are no longer necessary. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:57 -05:00
Owen W. Taylor	3d5cb0f30a	Add automatic workspace management Automatically add and remove workspaces so that the last workspace is always empty and no workspaces are empty other than that workspace. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:56 -05:00
Owen W. Taylor	fb28f77c85	Don't activate newly added workspaces With workspace thumbnails, we want to make workspace switching something that happens largely under the users control, so don't switch to newly added workspaces in the overview. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:56 -05:00
Owen W. Taylor	58c8006f1f	Add workspace thumbnails to the overview Add workspace thumbnails to the workspace controls area. The user can click on the thumbnail to switch workspaces and can also drag windows out of the thumbnail to other workspaces. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:56 -05:00
Owen W. Taylor	277cff3013	Move restacking handling from WorkspacesView to WorkspacesDisplay Moving the base tracking of restacking to WorkspacesDisplay will allow us to use it to update stacking in the workspace thumbnails as well as in the main workspaces. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:56 -05:00
Owen W. Taylor	cde3ce2e27	Use a single "zoomed out" view for both workspace controls hover and DND Instead of having a separation between popping the controls out on hover and zooming out for DND, always do both at once. This is necessary because when we added workspace thumbnails the controls will get bigger, so we need to make sure we zoom out far enough so that the windows don't overlap the controls. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:54 -05:00
Owen W. Taylor	57a4ad2d00	Don't check for Workspaces.WindowClone for window drops When checking the type of a DND source, instead of checking 'instanceof Workspaces.WindowClone' accept any actor with realWindow and metaWindow properties. This will be useful to support a separate type of actor dragged from workspace thumbnails. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:42:46 -05:00
Owen W. Taylor	8bc0caa21b	Remove workspace indicators Once we have workspace thumbnails in the overview, workspace indicators will no longer be needed. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:42:43 -05:00
Owen W. Taylor	ae478c2344	Switch to a vertical layout for workspaces The new plans for a row of workspace thumbnails on the right side of the overview means that the mental model we present to the user will be vertical, so switch the Metacity workspace layout to be vertical and adjust the keybinding handling, animations, and workspace layout in the overview to match. (This commit does not change the workspace switching indicator pending finalization of what we want to do with that - it still shows workspaces arranged vertically.) https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:42:01 -05:00
Owen W. Taylor	0dfdc9371e	Fix hover state after DND During a drag-and-drop, our pointer grab keeps enter/leave events from being delivered. That means that after the DND ends, whatever actor is under the pointer won't have received the enter event it should have, and any state or hover effect dependent on that won't work right. By remembering the first-leave and last-enter events we can figure out what widgets we need to call st_widget_sync_hover() on after the drag. https://bugzilla.gnome.org/show_bug.cgi?id=640974	2011-02-02 23:42:01 -05:00
A S Alam	ac92d0678b	update Punjabi Translation by A S Alam	2011-02-03 08:27:11 +05:30
Kjartan Maraas	bd9e6a3bdf	Updated Norwegian bokmål translation.	2011-02-02 20:34:34 +01:00
Luca Ferretti	2ce93ce39e	l10n: add new calendar to POTFILES.in	2011-02-02 13:03:19 +01:00
Maxim Ermilov	5b95ccae5f	boxpointer: fix multi monitor support https://bugzilla.gnome.org/show_bug.cgi?id=641195	2011-02-02 02:37:43 +03:00
Maxim Ermilov	0310f07eab	modalDialog: remove old actions from _actionKeys in setButtons https://bugzilla.gnome.org/show_bug.cgi?id=640781	2011-02-01 23:41:28 +03:00
Maxim Ermilov	e3acaa05be	Remove st_container_remove_all & rewrite st_container_destroy_children 1. Both functions leaked the nodes in priv->children 2. st_container_remove_all wasn't properly updating first_child and last_child 3. remove_all() is almost never right since it won't cause signal handlers on the children to be removed. In the rare cases where it might be needed the caller can simply use clutter_container_remove(). https://bugzilla.gnome.org/show_bug.cgi?id=640781	2011-02-01 23:41:21 +03:00
Maxim Ermilov	91d8a32f25	workspace: make WindowClone forward the 'size-changed' event https://bugzilla.gnome.org/show_bug.cgi?id=640781	2011-02-01 23:41:16 +03:00
Maxim Ermilov	457c7adf59	workspacesView: dispose _scrollAdjustment in _onDestroy https://bugzilla.gnome.org/show_bug.cgi?id=640781	2011-02-01 23:41:11 +03:00
Maxim Ermilov	8ebdb7f493	workspacesView: remove duplicate connection to same signal	2011-02-01 23:41:05 +03:00
Hellyna Ng	6c55ca59b0	Group chat sources on the left in the message tray This will make it easier for users to get back to their chats. https://bugzilla.gnome.org/show_bug.cgi?id=617234	2011-02-01 15:29:14 -05:00
Hellyna Ng	0e4a47c0aa	Enables navigation using arrow keys in notifications with buttons. Users can now use the keyboard and mouse to navigate with buttons interchangeably, instead of entirely using only mouse. https://bugzilla.gnome.org/show_bug.cgi?id=630937	2011-02-01 15:12:00 -05:00