Bump version to 3.33.4

Update NEWS.

.gitlab-ci.yml

@@ -21,10 +21,10 @@ check_commit_log:
         - merge_requests
 
 eslint:
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.static-analysis
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
   stage: source_check
   script:
-    - sh lint/generate-report.sh -o $LINT_LOG || { cat $LINT_LOG; false; }
+    - eslint -o $LINT_LOG --no-color || { cat $LINT_LOG; false; }
   <<: *only_default
   artifacts:
     paths:
@@ -32,10 +32,8 @@ eslint:
     when: on_failure
 
 build-shell-extensions:
-  image: fedora:latest
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
   stage: build
-  before_script:
-    - dnf install -y meson gettext mozjs60-devel
   script:
     - meson _build .
     - ninja -C _build test install

NEWS

@@ -1,3 +1,68 @@
+3.33.4
+======
+* Make GNOME Classic more classic:
+  - Disable GNOME 3 overview [Florian; !69]
+  - Add window picker button to window list [Florian; !73, !80]
+  - Style improvements and fixes [Jakub; #169, !82]
+  - Support horizontal workspace layout in window list [Florian; !70]
+  - Add draggable previews to window list workspace switcher [Florian; !74]
+  - Arrange workspaces horizontally [Florian; !72]
+* workspace-indicator: Support horizontal workspace layout [Florian; !71]
+* workspace-indicator: Add draggable previews [Florian; !77]
+* Misc. bug fixes and cleanups [Florian; !75, !76, !79, !78, #168, !84]
+
+Contributors:
+  Florian Müllner, Jakub Steiner, Jor Teron
+
+Translators:
+  Jor Teron [mjw]
+
+3.33.3
+======
+* Misc. bug fixes [Florian, Marco; !67, !68]
+
+Contributors:
+  Florian Müllner, Marco Trevisan (Treviño)
+
+3.33.2
+======
+* Misc. bug fixes and cleanups [Florian; !66]
+
+Contributors:
+  Florian Müllner
+
+3.33.1
+======
+* Misc. bug fixes [Florian; !64]
+
+Contributors:
+  Florian Müllner
+
+3.32.1
+======
+* Fix windowsNavigator extension after ES6 port [Florian; #143]
+* screenshot-window-sizer: Add phone screenshot sizes [Adrien; !65]
+* Misc. bug fixes and cleanups [Fabian; !62]
+
+Contributors:
+  Florian Müllner, Adrien Plazas, Fabian P. Schmidt
+
+3.32.0
+======
+
+Contributors:
+  Florian Müllner
+
+Translations:
+  Victor Ibragimov [tg], Kristjan SCHMIDT [eo], Mart Raudsepp [et]
+
+3.31.92
+=======
+* Misc. bug fixes and cleanups [Florian; !57, !58, !59, !60]
+
+Contributors:
+  Florian Müllner
+
 3.31.91
 =======
 * apps-menu: Remove outdated legacy-tray handling [Florian; !53]

README.md

@@ -15,6 +15,12 @@ Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
 
 ## Extensions
 
+ * alternate-tab (**OBSOLETE**)
+ 
+     Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
+     This extension is obsolete since GNOME 3.30, see [this blogpost][alternatetab-post]
+     for further details.
+
  * apps-menu
 
      Lets you reach an application using gnome 2.x style menu on the panel.
@@ -74,3 +80,4 @@ file for details.
 [shell-page]: https://wiki.gnome.org/Projects/GnomeShell
 [bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
 [license]: COPYING
+[alternatetab-post]: https://blogs.gnome.org/fmuellner/2018/10/11/the-future-of-alternatetab-and-why-you-need-not-worry/

data/classic.json.in

@@ -1,8 +1,9 @@
 {
     "parentMode": "user",
     "stylesheetName": "gnome-classic.css",
+    "hasOverview": false,
     "enabledExtensions": [@CLASSIC_EXTENSIONS@],
-    "panel": { "left": ["activities", "appMenu"],
+    "panel": { "left": ["appMenu"],
                "center": [],
                "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"]
              }

data/gnome-classic.scss

@@ -32,18 +32,20 @@ $variant: 'light';
     font-weight: normal;
     color: $fg_color;
     text-shadow: none;
-    &:active, &:overview, &:focus, &:checked {
-      // Trick due to St limitations. It needs a background to draw
-      // a box-shadow
-      background-color: $selected_bg_color !important;
-      color: $selected_fg_color !important;
-      box-shadow: none;
-      & > .system-status-icon { icon-shadow: none; }
-    }
     &:hover {
+      color: lighten($fg_color,10%);
       text-shadow: none;
       & .system-status-icon { icon-shadow: none; }
     }
+    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw
+      // a box-shadow
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+      box-shadow: none;
+      & > .system-status-icon { icon-shadow: none; }
+    }
+
     .app-menu-icon { width: 0; height: 0; margin: 0; } // shell's display:none; :D
 
     .system-status-icon {
@@ -60,9 +62,9 @@ $variant: 'light';
   &.lock-screen,
   &.unlock-screen, 
   &.login-screen { 
-    background-color: transparentize($_bubble_bg_color, 0.5);
-    background-gradient-start: transparentize($_bubble_bg_color, 0.5);
-    background-gradient-end: transparentize($_bubble_bg_color, 0.5);
+    background-color: transparentize($bg_color, 0.5);
+    background-gradient-start: transparentize($bg_color, 0.5);
+    background-gradient-end: transparentize($bg_color, 0.5);
     border-bottom: none;
     .panel-button { color: $osd_fg_color; }
   }
@@ -91,15 +93,3 @@ $variant: 'light';
   background-image: url("calendar-today.svg");
 }
 
-.message-list-clear-button.button {
-  color: $fg_color
-}
-
-.notification-banner {
-  background-color: $bg_color !important;
-  color: $fg_color;
-  .notification-button {
-    background-color: darken($bg_color,5%);
-    &:hover, &focus { background-color: darken($bg_color,2%); }
-  }
-}

extensions/apps-menu/extension.js

@@ -1,19 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported init enable disable */
 
-const { Atk, Clutter, Gio, GLib, GMenu,
-        GObject, Gtk, Meta, Shell, St } = imports.gi;
+const {
+    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
+} = imports.gi;
+const Signals = imports.signals;
+
 const DND = imports.ui.dnd;
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Signals = imports.signals;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
-const ExtensionUtils = imports.misc.extensionUtils;
-
 const appSys = Shell.AppSystem.get_default();
 
 const APPLICATION_ICON_SIZE = 32;
@@ -21,44 +22,37 @@ const HORIZ_FACTOR = 5;
 const MENU_HEIGHT_OFFSET = 132;
 const NAVIGATION_REGION_OVERSHOOT = 50;
 
-class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button) {
-        super();
-        this._button = button;
-        this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
-    }
-
-    activate(event) {
-        this._button.menu.toggle();
-        Main.overview.toggle();
-        super.activate(event);
-    }
-}
+Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
+Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');
 
+var ApplicationMenuItem = GObject.registerClass(
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button, app) {
-        super();
+    _init(button, app) {
+        super._init();
         this._app = app;
         this._button = button;
 
         this._iconBin = new St.Bin();
-        this.actor.add_child(this._iconBin);
+        this.add_child(this._iconBin);
 
-        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
-                                      y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add_child(appLabel);
-        this.actor.label_actor = appLabel;
+        let appLabel = new St.Label({
+            text: app.get_name(),
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
+        this.add_child(appLabel);
+        this.label_actor = appLabel;
 
         let textureCache = St.TextureCache.get_default();
         let iconThemeChangedId = textureCache.connect('icon-theme-changed',
-                                                      this._updateIcon.bind(this));
-        this.actor.connect('destroy', () => {
+            this._updateIcon.bind(this));
+        this.connect('destroy', () => {
             textureCache.disconnect(iconThemeChangedId);
         });
         this._updateIcon();
 
-        this.actor._delegate = this;
-        let draggable = DND.makeDraggable(this.actor);
+        this._delegate = this;
+        let draggable = DND.makeDraggable(this);
 
         let maybeStartDrag = draggable._maybeStartDrag;
         draggable._maybeStartDrag = (event) => {
@@ -73,6 +67,8 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._button.selectCategory(null);
         this._button.menu.toggle();
         super.activate(event);
+
+        Main.overview.hide();
     }
 
     setActive(active, params) {
@@ -94,13 +90,16 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _updateIcon() {
-        this._iconBin.set_child(this.getDragActor());
+        let icon = this.getDragActor();
+        icon.style_class = 'icon-dropshadow';
+        this._iconBin.set_child(icon);
     }
-}
+});
 
+var CategoryMenuItem = GObject.registerClass(
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button, category) {
-        super();
+    _init(button, category) {
+        super._init();
         this._category = category;
         this._button = button;
 
@@ -111,10 +110,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         if (this._category)
             name = this._category.get_name();
         else
-            name = _("Favorites");
+            name = _('Favorites');
 
-        this.actor.add_child(new St.Label({ text: name }));
-        this.actor.connect('motion-event', this._onMotionEvent.bind(this));
+        this.add_child(new St.Label({ text: name }));
+        this.connect('motion-event', this._onMotionEvent.bind(this));
+        this.connect('notify::active', this._onActiveChanged.bind(this));
     }
 
     activate(event) {
@@ -124,7 +124,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _isNavigatingSubmenu([x, y]) {
-        let [posX, posY] = this.actor.get_transformed_position();
+        let [posX, posY] = this.get_transformed_position();
 
         if (this._oldX == -1) {
             this._oldX = x;
@@ -139,11 +139,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._oldY = y;
 
         // If it lies outside the x-coordinates then it is definitely outside.
-        if (posX > x || posX + this.actor.width < x)
+        if (posX > x || posX + this.width < x)
             return false;
 
         // If it lies inside the menu item then it is definitely inside.
-        if (posY <= y && posY + this.actor.height >= y)
+        if (posY <= y && posY + this.height >= y)
             return true;
 
         // We want the keep-up triangle only if the movement is more
@@ -164,17 +164,17 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         // only check for triangle ABC.
         if (posY > y) {
             let offset = posY - y;
-            y = posY + this.actor.height + offset;
+            y = posY + this.height + offset;
         }
 
         // Ensure that A is (0, 0).
         x -= posX;
-        y -= posY + this.actor.height;
+        y -= posY + this.height;
 
         // Check which side of line AB the point P lies on by taking the
         // cross-product of AB and AP. See:
         // http://stackoverflow.com/questions/3461453/determine-which-side-of-a-line-a-point-lies
-        if (((this.actor.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
+        if (((this.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
             return true;
 
         return false;
@@ -184,16 +184,16 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         if (!Clutter.get_pointer_grab()) {
             this._oldX = -1;
             this._oldY = -1;
-            Clutter.grab_pointer(this.actor);
+            Clutter.grab_pointer(this);
         }
-        this.actor.hover = true;
+        this.hover = true;
 
         if (this._isNavigatingSubmenu(event.get_coords()))
             return true;
 
         this._oldX = -1;
         this._oldY = -1;
-        this.actor.hover = false;
+        this.hover = false;
         Clutter.ungrab_pointer();
 
         let source = event.get_source();
@@ -203,14 +203,14 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         return false;
     }
 
-    setActive(active, params) {
-        if (active) {
-            this._button.selectCategory(this._category);
-            this._button.scrollToCatButton(this);
-        }
-        super.setActive(active, params);
+    _onActiveChanged() {
+        if (!this.active)
+            return;
+
+        this._button.selectCategory(this._category);
+        this._button.scrollToCatButton(this);
     }
-}
+});
 
 class ApplicationsMenu extends PopupMenu.PopupMenu {
     constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -222,28 +222,9 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
         return false;
     }
 
-    open(animate) {
-        this._button.hotCorner.setBarrierSize(0);
-        if (this._button.hotCorner.actor) // fallback corner
-            this._button.hotCorner.actor.hide();
-        super.open(animate);
-    }
-
-    close(animate) {
-        let size = Main.layoutManager.panelBox.height;
-        this._button.hotCorner.setBarrierSize(size);
-        if (this._button.hotCorner.actor) // fallback corner
-            this._button.hotCorner.actor.show();
-        super.close(animate);
-    }
-
     toggle() {
-        if (this.isOpen) {
+        if (this.isOpen)
             this._button.selectCategory(null);
-        } else {
-            if (Main.overview.visible)
-                Main.overview.hide();
-        }
         super.toggle();
     }
 }
@@ -255,7 +236,7 @@ class DesktopTarget {
 
         this._windowAddedId =
             global.window_group.connect('actor-added',
-                                        this._onWindowAdded.bind(this));
+                this._onWindowAdded.bind(this));
 
         global.get_window_actors().forEach(a => {
             this._onWindowAdded(a.get_parent(), a);
@@ -299,48 +280,32 @@ class DesktopTarget {
         return source._app.app_info;
     }
 
-    _touchFile(file) {
-        let queryFlags = Gio.FileQueryInfoFlags.NONE;
-        let ioPriority = GLib.PRIORITY_DEFAULT;
-
-        let info = new Gio.FileInfo();
-        info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
-                                  GLib.get_real_time());
-        file.set_attributes_async (info, queryFlags, ioPriority, null,
-            (o, res) => {
-                try {
-                    o.set_attributes_finish(res);
-                } catch (e) {
-                    log(`Failed to update access time: ${e.message}`);
-                }
-            });
-    }
-
-    _markTrusted(file) {
+    async _markTrusted(file) {
         let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
         let trustedAttr = 'metadata::trusted';
         let queryFlags = Gio.FileQueryInfoFlags.NONE;
         let ioPriority = GLib.PRIORITY_DEFAULT;
 
-        file.query_info_async(modeAttr, queryFlags, ioPriority, null,
-            (o, res) => {
-                try {
-                    let info = o.query_info_finish(res);
-                    let mode = info.get_attribute_uint32(modeAttr) | 0o100;
+        try {
+            let info = await file.query_info_async(modeAttr, queryFlags, ioPriority, null);
 
-                    info.set_attribute_uint32(modeAttr, mode);
-                    info.set_attribute_string(trustedAttr, 'yes');
-                    file.set_attributes_async (info, queryFlags, ioPriority, null,
-                        (o, res) => {
-                            o.set_attributes_finish(res);
+            let mode = info.get_attribute_uint32(modeAttr) | 0o100;
+            info.set_attribute_uint32(modeAttr, mode);
+            info.set_attribute_string(trustedAttr, 'yes');
+            await file.set_attributes_async(info, queryFlags, ioPriority, null);
 
-                            // Hack: force nautilus to reload file info
-                            this._touchFile(file);
-                        });
-                } catch (e) {
-                    log(`Failed to mark file as trusted: ${e.message}`);
-                }
-            });
+            // Hack: force nautilus to reload file info
+            info = new Gio.FileInfo();
+            info.set_attribute_uint64(
+                Gio.FILE_ATTRIBUTE_TIME_ACCESS, GLib.get_real_time());
+            try {
+                await file.set_attributes_async(info, queryFlags, ioPriority, null);
+            } catch (e) {
+                log(`Failed to update access time: ${e.message}`);
+            }
+        } catch (e) {
+            log(`Failed to mark file as trusted: ${e.message}`);
+        }
     }
 
     destroy() {
@@ -399,9 +364,11 @@ class ApplicationsButton extends PanelMenu.Button {
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
 
-        this._label = new St.Label({ text: _("Applications"),
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.CENTER });
+        this._label = new St.Label({
+            text: _('Applications'),
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
         hbox.add_child(this._label);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
@@ -409,8 +376,6 @@ class ApplicationsButton extends PanelMenu.Button {
         this.name = 'panelApplications';
         this.label_actor = this._label;
 
-        this.connect('captured-event', this._onCapturedEvent.bind(this));
-
         this._showingId = Main.overview.connect('showing', () => {
             this.add_accessible_state (Atk.StateType.CHECKED);
         });
@@ -418,7 +383,7 @@ class ApplicationsButton extends PanelMenu.Button {
             this.remove_accessible_state (Atk.StateType.CHECKED);
         });
         Main.layoutManager.connect('startup-complete',
-                                   this._setKeybinding.bind(this));
+            this._setKeybinding.bind(this));
         this._setKeybinding();
 
         this._desktopTarget = new DesktopTarget();
@@ -433,14 +398,14 @@ class ApplicationsButton extends PanelMenu.Button {
 
         this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
         this._treeChangedId = this._tree.connect('changed',
-                                                 this._onTreeChanged.bind(this));
+            this._onTreeChanged.bind(this));
 
         this._applicationsButtons = new Map();
         this.reloadFlag = false;
         this._createLayout();
         this._display();
         this._installedChangedId = appSys.connect('installed-changed',
-                                                  this._onTreeChanged.bind(this));
+            this._onTreeChanged.bind(this));
     }
 
     _onTreeChanged() {
@@ -452,18 +417,18 @@ class ApplicationsButton extends PanelMenu.Button {
         }
     }
 
-    get hotCorner() {
-        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
-    }
-
     _createVertSeparator() {
-        let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
-                                             pseudo_class: 'highlighted' });
+        let separator = new St.DrawingArea({
+            style_class: 'calendar-vertical-separator',
+            pseudo_class: 'highlighted'
+        });
         separator.connect('repaint', this._onVertSepRepaint.bind(this));
         return separator;
     }
 
     _onDestroy() {
+        super._onDestroy();
+
         Main.overview.disconnect(this._showingId);
         Main.overview.disconnect(this._hidingId);
         appSys.disconnect(this._installedChangedId);
@@ -471,28 +436,19 @@ class ApplicationsButton extends PanelMenu.Button {
         this._tree = null;
 
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
-                                           Shell.ActionMode.NORMAL |
-                                           Shell.ActionMode.OVERVIEW,
-                                           Main.sessionMode.hasOverview ?
-                                           Main.overview.toggle.bind(Main.overview) :
-                                           null);
+            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
+            Main.sessionMode.hasOverview
+                ? Main.overview.toggle.bind(Main.overview)
+                : null);
 
         this._desktopTarget.destroy();
     }
 
-    _onCapturedEvent(actor, event) {
-        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
-            if (!Main.overview.shouldToggleByCornerOrButton())
-                return true;
-        }
-        return false;
-    }
-
     _onMenuKeyPress(actor, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
-            let direction = symbol == Clutter.KEY_Left ? Gtk.DirectionType.LEFT
-                                                       : Gtk.DirectionType.RIGHT;
+            let direction = symbol == Clutter.KEY_Left ?
+                Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
             if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                 return true;
         }
@@ -527,9 +483,8 @@ class ApplicationsButton extends PanelMenu.Button {
 
     _setKeybinding() {
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
-                                           Shell.ActionMode.NORMAL |
-                                           Shell.ActionMode.OVERVIEW,
-                                           () => { this.menu.toggle(); });
+            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
+            () => this.menu.toggle());
     }
 
     _redisplay() {
@@ -570,7 +525,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
         let currentScrollValue = appsScrollBoxAdj.get_value();
         let boxHeight = appsScrollBoxAlloc.y2 - appsScrollBoxAlloc.y1;
-        let buttonAlloc = button.actor.get_allocation_box();
+        let buttonAlloc = button.get_allocation_box();
         let newScrollValue = currentScrollValue;
         if (currentScrollValue > buttonAlloc.y1 - 10)
             newScrollValue = buttonAlloc.y1 - 10;
@@ -585,7 +540,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
         let currentScrollValue = catsScrollBoxAdj.get_value();
         let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
-        let buttonAlloc = button.actor.get_allocation_box();
+        let buttonAlloc = button.get_allocation_box();
         let newScrollValue = currentScrollValue;
         if (currentScrollValue > buttonAlloc.y1 - 10)
             newScrollValue = buttonAlloc.y1 - 10;
@@ -600,9 +555,12 @@ class ApplicationsButton extends PanelMenu.Button {
         this.menu.addMenuItem(section);
         this.mainBox = new St.BoxLayout({ vertical: false });
         this.leftBox = new St.BoxLayout({ vertical: true });
-        this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
-                                                         y_align: St.Align.START,
-                                                         style_class: 'apps-menu vfade' });
+        this.applicationsScrollBox = new St.ScrollView({
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'apps-menu vfade'
+        });
         this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let vscroll = this.applicationsScrollBox.get_vscroll_bar();
         vscroll.connect('scroll-start', () => {
@@ -611,21 +569,22 @@ class ApplicationsButton extends PanelMenu.Button {
         vscroll.connect('scroll-stop', () => {
             this.menu.passEvents = false;
         });
-        this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
-                                                       y_align: St.Align.START,
-                                                       style_class: 'vfade' });
+        this.categoriesScrollBox = new St.ScrollView({
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'vfade'
+        });
         this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         vscroll = this.categoriesScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => { this.menu.passEvents = true; });
-        vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; });
-        this.leftBox.add(this.categoriesScrollBox, { expand: true,
-                                                     x_fill: true, y_fill: true,
-                                                     y_align: St.Align.START });
-
-        let activities = new ActivitiesMenuItem(this);
-        this.leftBox.add(activities.actor, { expand: false,
-                                             x_fill: true, y_fill: false,
-                                             y_align: St.Align.START });
+        vscroll.connect('scroll-start', () => this.menu.passEvents = true);
+        vscroll.connect('scroll-stop', () => this.menu.passEvents = false);
+        this.leftBox.add(this.categoriesScrollBox, {
+            expand: true,
+            x_fill: true,
+            y_fill: true,
+            y_align: St.Align.START
+        });
 
         this.applicationsBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox.add_actor(this.applicationsBox);
@@ -633,8 +592,16 @@ class ApplicationsButton extends PanelMenu.Button {
         this.categoriesScrollBox.add_actor(this.categoriesBox);
 
         this.mainBox.add(this.leftBox);
-        this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true });
-        this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true });
+        this.mainBox.add(this._createVertSeparator(), {
+            expand: false,
+            x_fill: false,
+            y_fill: true
+        });
+        this.mainBox.add(this.applicationsScrollBox, {
+            expand: true,
+            x_fill: true,
+            y_fill: true
+        });
         section.actor.add_actor(this.mainBox);
     }
 
@@ -648,21 +615,23 @@ class ApplicationsButton extends PanelMenu.Button {
         this._tree.load_sync();
         let root = this._tree.get_root_directory();
         let categoryMenuItem = new CategoryMenuItem(this, null);
-        this.categoriesBox.add_actor(categoryMenuItem.actor);
+        this.categoriesBox.add_actor(categoryMenuItem);
         let iter = root.iter();
         let nextType;
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
-            if (nextType == GMenu.TreeItemType.DIRECTORY) {
-                let dir = iter.get_directory();
-                if (!dir.get_is_nodisplay()) {
-                    let categoryId = dir.get_menu_id();
-                    this.applicationsByCategory[categoryId] = [];
-                    this._loadCategory(categoryId, dir);
-                    if (this.applicationsByCategory[categoryId].length > 0) {
-                        let categoryMenuItem = new CategoryMenuItem(this, dir);
-                        this.categoriesBox.add_actor(categoryMenuItem.actor);
-                    }
-                }
+            if (nextType != GMenu.TreeItemType.DIRECTORY)
+                continue;
+
+            let dir = iter.get_directory();
+            if (dir.get_is_nodisplay())
+                continue;
+
+            let categoryId = dir.get_menu_id();
+            this.applicationsByCategory[categoryId] = [];
+            this._loadCategory(categoryId, dir);
+            if (this.applicationsByCategory[categoryId].length > 0) {
+                let categoryMenuItem = new CategoryMenuItem(this, dir);
+                this.categoriesBox.add_actor(categoryMenuItem);
             }
         }
 
@@ -691,22 +660,20 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _displayButtons(apps) {
-        if (apps) {
-            for (let i = 0; i < apps.length; i++) {
-                let app = apps[i];
-                let item;
-                if (app instanceof Shell.App)
-                    item = this._applicationsButtons.get(app);
-                else
-                    item = new PopupMenu.PopupSeparatorMenuItem();
-                if (!item) {
-                    item = new ApplicationMenuItem(this, app);
-                    item.setDragEnabled(this._desktopTarget.hasDesktop);
-                    this._applicationsButtons.set(app, item);
-                }
-                if (!item.actor.get_parent())
-                    this.applicationsBox.add_actor(item.actor);
+        for (let i = 0; i < apps.length; i++) {
+            let app = apps[i];
+            let item;
+            if (app instanceof Shell.App)
+                item = this._applicationsButtons.get(app);
+            else
+                item = new PopupMenu.PopupSeparatorMenuItem();
+            if (!item) {
+                item = new ApplicationMenuItem(this, app);
+                item.setDragEnabled(this._desktopTarget.hasDesktop);
+                this._applicationsButtons.set(app, item);
             }
+            if (!item.get_parent())
+                this.applicationsBox.add_actor(item);
         }
     }
 
@@ -730,19 +697,16 @@ class ApplicationsButton extends PanelMenu.Button {
 });
 
 let appsMenuButton;
-let activitiesButton;
 
 function enable() {
-    activitiesButton = Main.panel.statusArea['activities'];
-    activitiesButton.container.hide();
     appsMenuButton = new ApplicationsButton();
-    Main.panel.addToStatusArea('apps-menu', appsMenuButton, 1, 'left');
+    let index = Main.sessionMode.panel.left.indexOf('activities') + 1;
+    Main.panel.addToStatusArea('apps-menu', appsMenuButton, index, 'left');
 }
 
 function disable() {
     Main.panel.menuManager.removeMenu(appsMenuButton.menu);
     appsMenuButton.destroy();
-    activitiesButton.container.show();
 }
 
 function init() {

extensions/auto-move-windows/extension.js

@@ -4,9 +4,8 @@
 
 const Shell = imports.gi.Shell;
 
-const Main = imports.ui.main;
-
 const ExtensionUtils = imports.misc.extensionUtils;
+const Main = imports.ui.main;
 
 class WindowMover {
     constructor() {
@@ -17,7 +16,7 @@ class WindowMover {
 
         this._appsChangedId =
             this._appSystem.connect('installed-changed',
-                                    this._updateAppData.bind(this));
+                this._updateAppData.bind(this));
 
         this._settings.connect('changed', this._updateAppConfigs.bind(this));
         this._updateAppConfigs();
@@ -50,7 +49,7 @@ class WindowMover {
         addedApps.forEach(app => {
             let data = {
                 windowsChangedId: app.connect('windows-changed',
-                                              this._appWindowsChanged.bind(this)),
+                    this._appWindowsChanged.bind(this)),
                 moveWindowsId: 0,
                 windows: app.get_windows()
             };
@@ -125,9 +124,9 @@ function myCheckWorkspaces() {
     }
 
     // make sure the original method only removes empty workspaces at the end
-    keepAliveWorkspaces.forEach(ws => { ws._keepAliveId = 1; });
+    keepAliveWorkspaces.forEach(ws => ws._keepAliveId = 1);
     prevCheckWorkspaces.call(this);
-    keepAliveWorkspaces.forEach(ws => { delete ws._keepAliveId; });
+    keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);
 
     return false;
 }

extensions/auto-move-windows/prefs.js

@@ -34,35 +34,48 @@ const Widget = GObject.registerClass({
         this._changedPermitted = false;
 
         this._store = new Gtk.ListStore();
-        this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
-                                      Gtk.Adjustment]);
+        this._store.set_column_types([
+            Gio.AppInfo,
+            GObject.TYPE_STRING,
+            Gio.Icon,
+            GObject.TYPE_INT,
+            Gtk.Adjustment
+        ]);
 
         let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
         scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         this.add(scrolled);
 
 
-        this._treeView = new Gtk.TreeView({ model: this._store,
-                                            hexpand: true, vexpand: true });
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            hexpand: true,
+            vexpand: true
+        });
         this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
 
-        let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME,
-                                                 title: _("Application") });
+        let appColumn = new Gtk.TreeViewColumn({
+            expand: true,
+            sort_column_id: Columns.DISPLAY_NAME,
+            title: _('Application')
+        });
         let iconRenderer = new Gtk.CellRendererPixbuf;
         appColumn.pack_start(iconRenderer, false);
-        appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
+        appColumn.add_attribute(iconRenderer, 'gicon', Columns.ICON);
         let nameRenderer = new Gtk.CellRendererText;
         appColumn.pack_start(nameRenderer, true);
-        appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
+        appColumn.add_attribute(nameRenderer, 'text', Columns.DISPLAY_NAME);
         this._treeView.append_column(appColumn);
 
-        let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"),
-                                                       sort_column_id: Columns.WORKSPACE });
+        let workspaceColumn = new Gtk.TreeViewColumn({
+            title: _('Workspace'),
+            sort_column_id: Columns.WORKSPACE
+        });
         let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
         workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
         workspaceColumn.pack_start(workspaceRenderer, true);
-        workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
-        workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
+        workspaceColumn.add_attribute(workspaceRenderer, 'adjustment', Columns.ADJUSTMENT);
+        workspaceColumn.add_attribute(workspaceRenderer, 'text', Columns.WORKSPACE);
         this._treeView.append_column(workspaceColumn);
 
         scrolled.add(this._treeView);
@@ -71,13 +84,15 @@ const Widget = GObject.registerClass({
         toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
         this.add(toolbar);
 
-        let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
-                                             label: _("Add Rule"),
-                                             is_important: true });
+        let newButton = new Gtk.ToolButton({
+            icon_name: 'bookmark-new-symbolic',
+            label: _('Add Rule'),
+            is_important: true
+        });
         newButton.connect('clicked', this._createNew.bind(this));
         toolbar.add(newButton);
 
-        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
         delButton.connect('clicked', this._deleteSelected.bind(this));
         toolbar.add(delButton);
 
@@ -92,17 +107,21 @@ const Widget = GObject.registerClass({
     }
 
     _createNew() {
-        let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
-                                      transient_for: this.get_toplevel(),
-                                      use_header_bar: true,
-                                      modal: true });
+        let dialog = new Gtk.Dialog({
+            title: _('Create new matching rule'),
+            transient_for: this.get_toplevel(),
+            use_header_bar: true,
+            modal: true
+        });
         dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
-        let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+        let addButton = dialog.add_button(_('Add'), Gtk.ResponseType.OK);
         dialog.set_default_response(Gtk.ResponseType.OK);
 
-        let grid = new Gtk.Grid({ column_spacing: 10,
-                                  row_spacing: 15,
-                                  margin: 10 });
+        let grid = new Gtk.Grid({
+            column_spacing: 10,
+            row_spacing: 15,
+            margin: 10
+        });
         dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
         dialog._appChooser.connect('application-selected', (w, appInfo) => {
             addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
@@ -111,13 +130,19 @@ const Widget = GObject.registerClass({
         addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
 
         grid.attach(dialog._appChooser, 0, 0, 2, 1);
-        grid.attach(new Gtk.Label({ label: _("Workspace"),
-                                    halign: Gtk.Align.END }), 0, 1, 1, 1);
-        let adjustment = new Gtk.Adjustment({ lower: 1,
-                                              upper: WORKSPACE_MAX,
-                                              step_increment: 1 });
-        dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
-                                            snap_to_ticks: true });
+        grid.attach(new Gtk.Label({
+            label: _('Workspace'),
+            halign: Gtk.Align.END
+        }), 0, 1, 1, 1);
+        let adjustment = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1
+        });
+        dialog._spin = new Gtk.SpinButton({
+            adjustment: adjustment,
+            snap_to_ticks: true
+        });
         dialog._spin.set_value(1);
         grid.attach(dialog._spin, 1, 1, 1, 1);
         dialog.get_content_area().add(grid);
@@ -139,14 +164,7 @@ const Widget = GObject.registerClass({
             this._appendItem(appInfo.get_id(), index);
             this._changedPermitted = true;
 
-            let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
-                                           step_increment: 1,
-                                           value: index });
-            this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
+            this._appendRow(appInfo, index);
 
             dialog.destroy();
         });
@@ -196,20 +214,29 @@ const Widget = GObject.registerClass({
                 continue;
             validItems.push(currentItems[i]);
 
-            let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
-                                           step_increment: 1,
-                                           value: index });
-            this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
+            this._appendRow(appInfo, parseInt(index));
         }
 
         if (validItems.length != currentItems.length) // some items were filtered out
             this._settings.set_strv(SETTINGS_KEY, validItems);
     }
 
+    _appendRow(appInfo, workspace) {
+        let iter = this._store.append();
+        let icon = appInfo.get_icon();
+        let displayName = appInfo.get_display_name();
+        let adj = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1,
+            value: workspace
+        });
+        let { APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT } = Columns;
+        this._store.set(iter,
+            [APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT],
+            [appInfo, icon, displayName, workspace, adj]);
+    }
+
     _checkId(id) {
         let items = this._settings.get_strv(SETTINGS_KEY);
         return !items.some(i => i.startsWith(`${id}:`));

extensions/drive-menu/extension.js

@@ -5,34 +5,38 @@ const { Gio, GObject, Shell, St } = imports.gi;
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
-const ExtensionUtils = imports.misc.extensionUtils;
-
+var MountMenuItem = GObject.registerClass(
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(mount) {
-        super();
+    _init(mount) {
+        super._init();
 
         this.label = new St.Label({ text: mount.get_name() });
-        this.actor.add(this.label, { expand: true });
-        this.actor.label_actor = this.label;
+        this.add(this.label, { expand: true });
+        this.label_actor = this.label;
 
         this.mount = mount;
 
-        let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                      style_class: 'popup-menu-icon ' });
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        let ejectIcon = new St.Icon({
+            icon_name: 'media-eject-symbolic',
+            style_class: 'popup-menu-icon'
+        });
         let ejectButton = new St.Button({ child: ejectIcon });
         ejectButton.connect('clicked', this._eject.bind(this));
-        this.actor.add(ejectButton);
+        this.add(ejectButton);
 
         this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
         this._syncVisibility();
     }
 
-    destroy() {
+    _onDestroy() {
         if (this._changedId) {
             this.mount.disconnect(this._changedId);
             this._changedId = 0;
@@ -59,22 +63,22 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _syncVisibility() {
-        this.actor.visible = this._isInteresting();
+        this.visible = this._isInteresting();
     }
 
     _eject() {
-        let mountOp = new ShellMountOperation.ShellMountOperation(this.mount);
+        let unmountArgs = [
+            Gio.MountUnmountFlags.NONE,
+            (new ShellMountOperation.ShellMountOperation(this.mount)).mountOp,
+            null // Gio.Cancellable
+        ];
 
         if (this.mount.can_eject())
-            this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
-                                            mountOp.mountOp,
-                                            null, // Gio.Cancellable
-                                            this._ejectFinish.bind(this));
+            this.mount.eject_with_operation(...unmountArgs,
+                this._ejectFinish.bind(this));
         else
-            this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
-                                              mountOp.mountOp,
-                                              null, // Gio.Cancellable
-                                              this._unmountFinish.bind(this));
+            this.mount.unmount_with_operation(...unmountArgs,
+                this._unmountFinish.bind(this));
     }
 
     _unmountFinish(mount, result) {
@@ -95,27 +99,29 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
     _reportFailure(exception) {
         // TRANSLATORS: %s is the filesystem name
-        let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
+        let msg = _('Ejecting drive “%s” failed:').format(this.mount.get_name());
         Main.notifyError(msg, exception.message);
     }
 
     activate(event) {
+        let uri = this.mount.get_root().get_uri();
         let context = global.create_app_launch_context(event.get_time(), -1);
-        Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
-                                           context);
+        Gio.AppInfo.launch_default_for_uri(uri, context);
 
         super.activate(event);
     }
-}
+});
 
 let DriveMenu = GObject.registerClass(
 class DriveMenu extends PanelMenu.Button {
     _init() {
-        super._init(0.0, _("Removable devices"));
+        super._init(0.0, _('Removable devices'));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                 style_class: 'system-status-icon' });
+        let icon = new St.Icon({
+            icon_name: 'media-eject-symbolic',
+            style_class: 'system-status-icon'
+        });
 
         hbox.add_child(icon);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
@@ -136,7 +142,7 @@ class DriveMenu extends PanelMenu.Button {
         this._monitor.get_mounts().forEach(this._addMount.bind(this));
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_("Open Files"), event => {
+        this.menu.addAction(_('Open Files'), event => {
             let appSystem = Shell.AppSystem.get_default();
             let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
             app.activate_full(-1, event.get_time());
@@ -146,7 +152,7 @@ class DriveMenu extends PanelMenu.Button {
     }
 
     _updateMenuVisibility() {
-        if (this._mounts.filter(i => i.actor.visible).length > 0)
+        if (this._mounts.filter(i => i.visible).length > 0)
             this.show();
         else
             this.hide();

extensions/horizontal-workspaces/extension.js

@@ -0,0 +1,38 @@
+/* exported init */
+const { Meta } = imports.gi;
+
+const { ThumbnailsBox } = imports.ui.workspaceThumbnail;
+
+class Extension {
+    constructor() {
+        this._origUpdateSwitcherVisibility =
+            ThumbnailsBox.prototype._updateSwitcherVisibility;
+    }
+
+    enable() {
+        global.workspace_manager.override_workspace_layout(
+            Meta.DisplayCorner.TOPLEFT,
+            false,
+            1,
+            -1);
+
+        ThumbnailsBox.prototype._updateSwitcherVisibility = function() {
+            this.hide();
+        };
+    }
+
+    disable() {
+        global.workspace_manager.override_workspace_layout(
+            Meta.DisplayCorner.TOPLEFT,
+            false,
+            -1,
+            1);
+
+        ThumbnailsBox.prototype._updateSwitcherVisibility =
+            this._origUpdateSwitcherVisibility;
+    }
+}
+
+function init() {
+    return new Extension();
+}

extensions/horizontal-workspaces/meson.build

@@ -0,0 +1,5 @@
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)

extensions/horizontal-workspaces/metadata.json.in

@@ -0,0 +1,10 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "Horizontal workspaces",
+"description": "Use a horizontal workspace layout",
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}

extensions/horizontal-workspaces/stylesheet.css

@@ -0,0 +1 @@
+/* This extensions requires no special styling */

extensions/native-window-placement/extension.js

@@ -1,8 +1,7 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported enable disable */
-const Workspace = imports.ui.workspace;
-
 const ExtensionUtils = imports.misc.extensionUtils;
+const Workspace = imports.ui.workspace;
 
 // testing settings for natural window placement strategy:
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
@@ -112,10 +111,11 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
             overlap = false;
             for (let i = 0; i < rects.length; i++) {
                 for (let j = 0; j < rects.length; j++) {
-                    if (i != j && rects[i].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
-                                                    WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS)
-                                          .overlap(rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
-                                                                     WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) {
+                    let adjustments = [-1, -1, 1, 1]
+                        .map(v => v *= WINDOW_PLACEMENT_NATURAL_GAPS);
+                    let iAdjusted = rects[i].adjusted(...adjustments);
+                    let jAdjusted = rects[j].adjusted(...adjustments);
+                    if (i != j && iAdjusted.overlap(jAdjusted)) {
                         loopCounter++;
                         overlap = true;
 
@@ -202,9 +202,10 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
 
         // Work out scaling by getting the most top-left and most bottom-right window coords.
         let scale;
-        scale = Math.min(areaRect.width / bounds.width,
-                         areaRect.height / bounds.height,
-                         1.0);
+        scale = Math.min(
+            areaRect.width / bounds.width,
+            areaRect.height / bounds.height,
+            1.0);
 
         // Make bounding rect fill the screen size for later steps
         bounds.x = bounds.x - (areaRect.width - bounds.width * scale) / 2;

extensions/places-menu/extension.js

@@ -3,6 +3,7 @@
 
 const { Clutter, GObject, St } = imports.gi;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -11,34 +12,38 @@ const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = x => x;
 
-const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const PlaceDisplay = Me.imports.placeDisplay;
 
 const PLACE_ICON_SIZE = 16;
 
+var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(info) {
-        super();
+    _init(info) {
+        super._init();
         this._info = info;
 
-        this._icon = new St.Icon({ gicon: info.icon,
-                                   icon_size: PLACE_ICON_SIZE });
-        this.actor.add_child(this._icon);
+        this._icon = new St.Icon({
+            gicon: info.icon,
+            icon_size: PLACE_ICON_SIZE
+        });
+        this.add_child(this._icon);
 
         this._label = new St.Label({ text: info.name, x_expand: true });
-        this.actor.add_child(this._label);
+        this.add_child(this._label);
 
         if (info.isRemovable()) {
-            this._ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                            style_class: 'popup-menu-icon ' });
+            this._ejectIcon = new St.Icon({
+                icon_name: 'media-eject-symbolic',
+                style_class: 'popup-menu-icon'
+            });
             this._ejectButton = new St.Button({ child: this._ejectIcon });
             this._ejectButton.connect('clicked', info.eject.bind(info));
-            this.actor.add_child(this._ejectButton);
+            this.add_child(this._ejectButton);
         }
 
         this._changedId = info.connect('changed',
-                                       this._propertiesChanged.bind(this));
+            this._propertiesChanged.bind(this));
     }
 
     destroy() {
@@ -60,7 +65,7 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._icon.gicon = info.icon;
         this._label.text = info.name;
     }
-}
+});
 
 const SECTIONS = [
     'special',
@@ -72,12 +77,14 @@ const SECTIONS = [
 let PlacesMenu = GObject.registerClass(
 class PlacesMenu extends PanelMenu.Button {
     _init() {
-        super._init(0.0, _("Places"));
+        super._init(0.0, _('Places'));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        let label = new St.Label({ text: _("Places"),
-                                   y_expand: true,
-                                   y_align: Clutter.ActorAlign.CENTER });
+        let label = new St.Label({
+            text: _('Places'),
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
         hbox.add_child(label);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
         this.add_actor(hbox);
@@ -129,9 +136,9 @@ let _indicator;
 function enable() {
     _indicator = new PlacesMenu;
 
-    let pos = 1;
+    let pos = Main.sessionMode.panel.left.indexOf('appMenu');
     if ('apps-menu' in Main.panel.statusArea)
-        pos = 2;
+        pos++;
     Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }
 

extensions/places-menu/placeDisplay.js

@@ -38,65 +38,54 @@ class PlaceInfo {
         return false;
     }
 
-    _createLaunchCallback(launchContext, tryMount) {
-        return (_ignored, result) => {
-            try {
-                Gio.AppInfo.launch_default_for_uri_finish(result);
-            } catch (e) {
-                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-                    let source = {
-                        get_icon: () => { return this.icon; }
-                    };
-                    let op = new ShellMountOperation.ShellMountOperation(source);
-                    this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
-                        try {
-                            op.close();
-                            file.mount_enclosing_volume_finish(result);
-                        } catch (e) {
-                            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                                // e.g. user canceled the password dialog
-                                return;
-                            Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
-                            return;
-                        }
-
-                        if (tryMount) {
-                            let callback = this._createLaunchCallback(launchContext, false);
-                            Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
-                                                                     launchContext,
-                                                                     null,
-                                                                     callback);
-                        }
-                    });
-                } else {
-                    Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
-                }
+    async _ensureMountAndLaunch(context, tryMount) {
+        try {
+            await this._launchDefaultForUri(this.file.get_uri(), context, null);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+                Main.notifyError(_('Failed to launch “%s”').format(this.name), e.message);
+                return;
             }
-        };
+
+            let source = {
+                get_icon: () => this.icon
+            };
+            let op = new ShellMountOperation.ShellMountOperation(source);
+            try {
+                await this._mountEnclosingVolume(0, op.mountOp, null);
+
+                if (tryMount)
+                    this._ensureMountAndLaunch(context, false);
+            } catch (e) {
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                    Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message);
+            } finally {
+                op.close();
+            }
+        }
     }
 
     launch(timestamp) {
         let launchContext = global.create_app_launch_context(timestamp, -1);
-        let callback = this._createLaunchCallback(launchContext, true);
-        Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(),
-                                                 launchContext,
-                                                 null,
-                                                 callback);
+        this._ensureMountAndLaunch(launchContext, true);
     }
 
     getIcon() {
-        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
-                                   (file, result) => {
-                                       try {
-                                           let info = file.query_info_finish(result);
-                                           this.icon = info.get_symbolic_icon();
-                                           this.emit('changed');
-                                       } catch (e) {
-                                           if (e instanceof Gio.IOErrorEnum)
-                                               return;
-                                           throw e;
-                                       }
-                                   });
+        this.file.query_info_async('standard::symbolic-icon',
+            Gio.FileQueryInfoFlags.NONE,
+            0,
+            null,
+            (file, result) => {
+                try {
+                    let info = file.query_info_finish(result);
+                    this.icon = info.get_symbolic_icon();
+                    this.emit('changed');
+                } catch (e) {
+                    if (e instanceof Gio.IOErrorEnum)
+                        return;
+                    throw e;
+                }
+            });
 
         // return a generic icon for this kind for now, until we have the
         // icon from the query info above
@@ -125,12 +114,38 @@ class PlaceInfo {
             throw e;
         }
     }
+
+    _launchDefaultForUri(uri, context, cancel) {
+        return new Promise((resolve, reject) => {
+            Gio.AppInfo.launch_default_for_uri_async(uri, context, cancel, (o, res) => {
+                try {
+                    Gio.AppInfo.launch_default_for_uri_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+
+    _mountEnclosingVolume(flags, mountOp, cancel) {
+        return new Promise((resolve, reject) => {
+            this.file.mount_enclosing_volume(flags, mountOp, cancel, (o, res) => {
+                try {
+                    this.file.mount_enclosing_volume_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
 }
 Signals.addSignalMethods(PlaceInfo.prototype);
 
 class RootInfo extends PlaceInfo {
     _init() {
-        super._init('devices', Gio.File.new_for_path('/'), _("Computer"));
+        super._init('devices', Gio.File.new_for_path('/'), _('Computer'));
 
         let busName = 'org.freedesktop.hostname1';
         let objPath = '/org/freedesktop/hostname1';
@@ -140,7 +155,7 @@ class RootInfo extends PlaceInfo {
 
             this._proxy = obj;
             this._proxy.connect('g-properties-changed',
-                                this._propertiesChanged.bind(this));
+                this._propertiesChanged.bind(this));
             this._propertiesChanged(obj);
         });
     }
@@ -153,7 +168,7 @@ class RootInfo extends PlaceInfo {
         // GDBusProxy will emit a g-properties-changed when hostname1 goes down
         // ignore it
         if (proxy.g_name_owner) {
-            this.name = proxy.PrettyHostname || _("Computer");
+            this.name = proxy.PrettyHostname || _('Computer');
             this.emit('changed');
         }
     }
@@ -183,18 +198,18 @@ class PlaceDeviceInfo extends PlaceInfo {
     }
 
     eject() {
-        let mountOp = new ShellMountOperation.ShellMountOperation(this._mount);
+        let unmountArgs = [
+            Gio.MountUnmountFlags.NONE,
+            (new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
+            null // Gio.Cancellable
+        ];
 
         if (this._mount.can_eject())
-            this._mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
-                                             mountOp.mountOp,
-                                             null, // Gio.Cancellable
-                                             this._ejectFinish.bind(this));
+            this._mount.eject_with_operation(...unmountArgs,
+                this._ejectFinish.bind(this));
         else
-            this._mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
-                                               mountOp.mountOp,
-                                               null, // Gio.Cancellable
-                                               this._unmountFinish.bind(this));
+            this._mount.unmount_with_operation(...unmountArgs,
+                this._unmountFinish.bind(this));
     }
 
     _ejectFinish(mount, result) {
@@ -214,7 +229,7 @@ class PlaceDeviceInfo extends PlaceInfo {
     }
 
     _reportFailure(exception) {
-        let msg = _("Ejecting drive “%s” failed:").format(this._mount.get_name());
+        let msg = _('Ejecting drive “%s” failed:').format(this._mount.get_name());
         Main.notifyError(msg, exception.message);
     }
 }
@@ -263,9 +278,8 @@ var PlacesManager = class {
         };
 
         this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
-        this._showDesktopIconsChangedId =
-            this._settings.connect('changed::show-desktop-icons',
-                                   this._updateSpecials.bind(this));
+        this._showDesktopIconsChangedId = this._settings.connect(
+            'changed::show-desktop-icons', this._updateSpecials.bind(this));
         this._updateSpecials();
 
         /*
@@ -298,9 +312,17 @@ var PlacesManager = class {
     }
 
     _connectVolumeMonitorSignals() {
-        const signals = ['volume-added', 'volume-removed', 'volume-changed',
-                         'mount-added', 'mount-removed', 'mount-changed',
-                         'drive-connected', 'drive-disconnected', 'drive-changed'];
+        const signals = [
+            'volume-added',
+            'volume-removed',
+            'volume-changed',
+            'mount-added',
+            'mount-removed',
+            'mount-changed',
+            'drive-connected',
+            'drive-disconnected',
+            'drive-changed'
+        ];
 
         this._volumeMonitorSignals = [];
         let func = this._updateMounts.bind(this);
@@ -325,14 +347,15 @@ var PlacesManager = class {
     }
 
     _updateSpecials() {
-        this._places.special.forEach(p => { p.destroy(); });
+        this._places.special.forEach(p => p.destroy());
         this._places.special = [];
 
         let homePath = GLib.get_home_dir();
 
-        this._places.special.push(new PlaceInfo('special',
-                                                Gio.File.new_for_path(homePath),
-                                                _("Home")));
+        this._places.special.push(new PlaceInfo(
+            'special',
+            Gio.File.new_for_path(homePath),
+            _('Home')));
 
         let specials = [];
         let dirs = DEFAULT_DIRECTORIES.slice();
@@ -367,17 +390,18 @@ var PlacesManager = class {
         let networkMounts = [];
         let networkVolumes = [];
 
-        this._places.devices.forEach(p => { p.destroy(); });
+        this._places.devices.forEach(p => p.destroy());
         this._places.devices = [];
-        this._places.network.forEach(p => { p.destroy(); });
+        this._places.network.forEach(p => p.destroy());
         this._places.network = [];
 
         /* Add standard places */
         this._places.devices.push(new RootInfo());
-        this._places.network.push(new PlaceInfo('network',
-                                                Gio.File.new_for_uri('network:///'),
-                                                _("Browse Network"),
-                                                'network-workgroup-symbolic'));
+        this._places.network.push(new PlaceInfo(
+            'network',
+            Gio.File.new_for_uri('network:///'),
+            _('Browse Network'),
+            'network-workgroup-symbolic'));
 
         /* first go through all connected drives */
         let drives = this._volumeMonitor.get_connected_drives();

extensions/screenshot-window-sizer/extension.js

@@ -21,11 +21,10 @@
 
 const { Meta, Shell, St } = imports.gi;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
-const ExtensionUtils = imports.misc.extensionUtils;
-
 const MESSAGE_FADE_TIME = 2;
 
 let text;
@@ -47,14 +46,16 @@ function flashMessage(message) {
     text.opacity = 255;
 
     let monitor = Main.layoutManager.primaryMonitor;
-    text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
-                      monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
+    text.set_position(
+        monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
+        monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
 
-    Tweener.addTween(text,
-                     { opacity: 0,
-                       time: MESSAGE_FADE_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete: hideMessage });
+    Tweener.addTween(text, {
+        opacity: 0,
+        time: MESSAGE_FADE_TIME,
+        transition: 'easeOutQuad',
+        onComplete: hideMessage
+    });
 }
 
 let SIZES = [
@@ -62,7 +63,9 @@ let SIZES = [
     [800, 450],
     [1024, 576],
     [1200, 675],
-    [1600, 900]
+    [1600, 900],
+    [360, 654], // Phone portrait maximized
+    [720, 360] // Phone landscape fullscreen
 ];
 
 function cycleScreenshotSizes(display, window, binding) {
@@ -72,8 +75,8 @@ function cycleScreenshotSizes(display, window, binding) {
     let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) != 0;
 
     // Unmaximize first
-    if (window.maximized_horizontally || window.maximizedVertically)
-        window.unmaximize(Meta.MaximizeFlags.HORIZONTAL | Meta.MaximizeFlags.VERTICAL);
+    if (window.get_maximized() != 0)
+        window.unmaximize(Meta.MaximizeFlags.BOTH);
 
     let workArea = window.get_work_area_current_monitor();
     let outerRect = window.get_frame_rect();
@@ -134,17 +137,18 @@ function cycleScreenshotSizes(display, window, binding) {
 }
 
 function enable() {
-    Main.wm.addKeybinding('cycle-screenshot-sizes',
-                          ExtensionUtils.getSettings(),
-                          Meta.KeyBindingFlags.PER_WINDOW,
-                          Shell.ActionMode.NORMAL,
-                          cycleScreenshotSizes);
-    Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
-                          ExtensionUtils.getSettings(),
-                          Meta.KeyBindingFlags.PER_WINDOW |
-                          Meta.KeyBindingFlags.IS_REVERSED,
-                          Shell.ActionMode.NORMAL,
-                          cycleScreenshotSizes);
+    Main.wm.addKeybinding(
+        'cycle-screenshot-sizes',
+        ExtensionUtils.getSettings(),
+        Meta.KeyBindingFlags.PER_WINDOW,
+        Shell.ActionMode.NORMAL,
+        cycleScreenshotSizes);
+    Main.wm.addKeybinding(
+        'cycle-screenshot-sizes-backward',
+        ExtensionUtils.getSettings(),
+        Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.IS_REVERSED,
+        Shell.ActionMode.NORMAL,
+        cycleScreenshotSizes);
 }
 
 function disable() {

extensions/user-theme/extension.js

@@ -3,12 +3,12 @@
 /* exported init */
 
 const { Gio, GLib } = imports.gi;
+
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 
 const SETTINGS_KEY = 'name';
 
-const ExtensionUtils = imports.misc.extensionUtils;
-
 class ThemeManager {
     constructor() {
         this._settings = ExtensionUtils.getSettings();
@@ -30,43 +30,29 @@ class ThemeManager {
     }
 
     _changeTheme() {
-        let _stylesheet = null;
-        let _themeName = this._settings.get_string(SETTINGS_KEY);
+        let stylesheet = null;
+        let themeName = this._settings.get_string(SETTINGS_KEY);
 
-        if (_themeName) {
-            let _userCssStylesheetCompat = GLib.build_filenamev([
-                GLib.get_home_dir(), '.themes', _themeName, 'gnome-shell', 'gnome-shell.css'
-            ]);
-            let fileCompat = Gio.file_new_for_path(_userCssStylesheetCompat);
-            let _userCssStylesheet = GLib.build_filenamev([
-                GLib.get_user_data_dir(), 'themes', _themeName, 'gnome-shell', 'gnome-shell.css'
-            ]);
-            let file = Gio.file_new_for_path(_userCssStylesheet);
-            if (fileCompat.query_exists(null))
-                _stylesheet = _userCssStylesheetCompat;
-            else if (file.query_exists(null))
-                _stylesheet = _userCssStylesheet;
-            else {
-                let sysdirs = GLib.get_system_data_dirs();
-                sysdirs.unshift(GLib.get_user_data_dir());
-                for (let i = 0; i < sysdirs.length; i++) {
-                    _userCssStylesheet = GLib.build_filenamev([
-                        sysdirs[i], 'themes', _themeName, 'gnome-shell', 'gnome-shell.css'
-                    ]);
-                    let file = Gio.file_new_for_path(_userCssStylesheet);
-                    if (file.query_exists(null)) {
-                        _stylesheet = _userCssStylesheet;
-                        break;
-                    }
-                }
-            }
+        if (themeName) {
+            let stylesheetPaths = [
+                [GLib.get_home_dir(), '.themes'],
+                [GLib.get_user_data_dir(), 'themes'],
+                ...GLib.get_system_data_dirs().map(dir => [dir, 'themes'])
+            ].map(themeDir => GLib.build_filenamev([
+                ...themeDir, themeName, 'gnome-shell', 'gnome-shell.css'
+            ]));
+
+            stylesheet = stylesheetPaths.find(path => {
+                let file = Gio.file_new_for_path(path);
+                return file.query_exists(null);
+            });
         }
 
-        if (_stylesheet)
-            global.log(`loading user theme: ${_stylesheet}`);
+        if (stylesheet)
+            global.log(`loading user theme: ${stylesheet}`);
         else
             global.log('loading default theme (Adwaita)');
-        Main.setThemeStylesheet(_stylesheet);
+        Main.setThemeStylesheet(stylesheet);
         Main.loadTheme();
     }
 }

extensions/window-list/classic.css

@@ -4,36 +4,39 @@
     border-top-width: 1px;
     border-bottom-width: 0px;
     height: 2.25em ;
+    padding: 2px;
+  }
+
+  .bottom-panel .window-button > StWidget,
+  .bottom-panel .window-picker-toggle > StWidget {
+    color: #2e3436;
+    background-color: #eee;
+    border-radius: 3px;
+    padding: 3px 6px 1px;
+    box-shadow: none;
+    text-shadow: none;
+    border: 1px solid rgba(0,0,0,0.2);
   }
 
   .bottom-panel .window-button > StWidget {
-    background-gradient-drection: vertical;
-    background-color: #fff;
-    background-gradient-start: #fff;
-    background-gradient-end: #eee;
-    color: #000;
     -st-natural-width: 18.7em;
     max-width: 18.75em;
-    color: #2e3436;
-    background-color: #eee;
-    border-radius: 2px;
-    padding: 3px 6px 1px;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
-    text-shadow: 0 0 transparent;
   }
 
-  .bottom-panel .window-button:hover > StWidget {
+  .bottom-panel .window-button:hover > StWidget,
+  .bottom-panel .window-picker-toggle:hover > StWidget {
     background-color: #f9f9f9;
   }
 
   .bottom-panel .window-button:active > StWidget,
   .bottom-panel .window-button:focus > StWidget {
-    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
+    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
   }
 
-  .bottom-panel .window-button.focused > StWidget {
-    background-color: #ddd;
-    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.5);
+  .bottom-panel .window-button.focused > StWidget,
+  .bottom-panel .window-picker-toggle:checked > StWidget {
+    background-color: #ccc;
+    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
   }
 
   .bottom-panel .window-button.focused:hover > StWidget {
@@ -42,5 +45,24 @@
 
   .bottom-panel .window-button.minimized > StWidget {
     color: #888;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+    box-shadow: none;
   }
+
+/* workspace switcher */
+.window-list-workspace-indicator .workspace {
+  background-color: #ddd;
+}
+
+.window-list-workspace-indicator .workspace.active {
+  background-color: #ccc;
+}
+
+.window-list-window-preview {
+  background-color: #ededed;
+  border: 1px solid #ccc;
+}
+
+.window-list-window-preview.active {
+  background-color: #f6f5f4;
+  border: 2px solid #888;
+}

extensions/window-list/meson.build

@@ -4,7 +4,7 @@ extension_data += configure_file(
   configuration: metadata_conf
 )
 
-extension_sources += files('prefs.js')
+extension_sources += files('prefs.js', 'windowPicker.js', 'workspaceIndicator.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
 
 if classic_mode_enabled

extensions/window-list/prefs.js

@@ -22,16 +22,20 @@ class WindowListPrefsWidget extends Gtk.Grid {
         this.row_spacing = 6;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        let groupingLabel = '<b>%s</b>'.format(_("Window Grouping"));
-        this.add(new Gtk.Label({ label: groupingLabel, use_markup: true,
-                                 halign: Gtk.Align.START }));
+        let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
+        this.add(new Gtk.Label({
+            label: groupingLabel, use_markup: true,
+            halign: Gtk.Align.START
+        }));
 
         let align = new Gtk.Alignment({ left_padding: 12 });
         this.add(align);
 
-        let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
-                                  row_spacing: 6,
-                                  column_spacing: 6 });
+        let grid = new Gtk.Grid({
+            orientation: Gtk.Orientation.VERTICAL,
+            row_spacing: 6,
+            column_spacing: 6
+        });
         align.add(grid);
 
         this._settings = ExtensionUtils.getSettings();
@@ -40,9 +44,9 @@ class WindowListPrefsWidget extends Gtk.Grid {
         let modes = range.deep_unpack()[1].deep_unpack();
 
         let modeLabels = {
-            'never': _("Never group windows"),
-            'auto': _("Group windows when space is limited"),
-            'always': _("Always group windows")
+            'never': _('Never group windows'),
+            'auto': _('Group windows when space is limited'),
+            'always': _('Always group windows')
         };
 
         let radio = null;
@@ -54,9 +58,11 @@ class WindowListPrefsWidget extends Gtk.Grid {
                 continue;
             }
 
-            radio = new Gtk.RadioButton({ active: currentMode == mode,
-                                          label: label,
-                                          group: radio });
+            radio = new Gtk.RadioButton({
+                active: currentMode == mode,
+                label: label,
+                group: radio
+            });
             grid.add(radio);
 
             radio.connect('toggled', button => {
@@ -65,8 +71,10 @@ class WindowListPrefsWidget extends Gtk.Grid {
             });
         }
 
-        let check = new Gtk.CheckButton({ label: _("Show on all monitors"),
-                                          margin_top: 6 });
+        let check = new Gtk.CheckButton({
+            label: _('Show on all monitors'),
+            margin_top: 6
+        });
         this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
         this.add(check);
     }

extensions/window-list/stylesheet.css

@@ -26,9 +26,8 @@
   spacing: 4px;
 }
 
-.window-button > StWidget {
-  -st-natural-width: 18.75em;
-  max-width: 18.75em;
+.window-button > StWidget,
+.window-picker-toggle > StWidget {
   color: #bbb;
   background-color: black;
   border-radius: 4px;
@@ -37,7 +36,21 @@
   text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
 }
 
-.window-button:hover > StWidget {
+.window-picker-toggle {
+  padding: 3px;
+}
+
+.window-picker-toggle > StWidet {
+  border: 1px solid rgba(255,255,255,0.3);
+}
+
+.window-button > StWidget {
+  -st-natural-width: 18.75em;
+  max-width: 18.75em;
+}
+
+.window-button:hover > StWidget,
+.window-picker-toggle:hover > StWidget {
   color: white;
   background-color: #1f1f1f;
 }
@@ -47,12 +60,14 @@
   box-shadow: inset 2px 2px 4px rgba(255,255,255,0.5);
 }
 
-.window-button.focused > StWidget {
+.window-button.focused > StWidget,
+.window-picker-toggle:checked > StWidget {
   color: white;
   box-shadow: inset 1px 1px 4px rgba(255,255,255,0.7);
 }
 
-.window-button.focused:active > StWidget {
+.window-button.focused:active > StWidget,
+.window-picker-toggle:checked:active > StWidget {
   box-shadow: inset 2px 2px 4px rgba(255,255,255,0.7);
 }
 
@@ -70,13 +85,50 @@
   height: 24px;
 }
 
-.window-list-workspace-indicator {
+.window-list-workspace-indicator .status-label-bin {
+  background-color: rgba(200, 200, 200, .3);
+  border: 1px solid #cccccc;
+  padding: 0 3px;
+  margin: 3px 0;
+}
+
+.window-list-workspace-indicator .workspaces-box {
+  spacing: 3px;
   padding: 3px;
 }
 
-.window-list-workspace-indicator > StWidget {
-  background-color: rgba(200, 200, 200, .3);
+.window-list-workspace-indicator .workspace {
   border: 1px solid #cccccc;
+  width: 52px;
+}
+
+.window-list-workspace-indicator .workspace:first-child:last-child:ltr,
+.window-list-workspace-indicator .workspace:first-child:last-child:rtl {
+  border-radius: 4px;
+}
+
+.window-list-workspace-indicator .workspace:first-child:ltr,
+.window-list-workspace-indicator .workspace:last-child:rtl {
+  border-radius: 4px 0 0 4px;
+}
+
+.window-list-workspace-indicator .workspace:first-child:rtl,
+.window-list-workspace-indicator .workspace:last-child:ltr {
+  border-radius: 0 4px 4px 0;
+}
+
+.window-list-workspace-indicator .workspace.active {
+  background-color: rgba(200, 200, 200, .3);
+}
+
+.window-list-window-preview {
+  background-color: #252525;
+  border: 1px solid #ccc;
+}
+
+.window-list-window-preview.active {
+  background-color: #353535;
+  border: 2px solid #ccc;
 }
 
 .notification {

extensions/window-list/windowPicker.js

@@ -0,0 +1,278 @@
+/* exported WindowPicker, WindowPickerToggle */
+const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+
+const Layout = imports.ui.layout;
+const Main = imports.ui.main;
+const Overview = imports.ui.overview;
+const { WorkspacesDisplay } = imports.ui.workspacesView;
+
+let MyWorkspacesDisplay = class extends WorkspacesDisplay {
+    constructor() {
+        super();
+
+        this.actor.add_constraint(
+            new Layout.MonitorConstraint({
+                primary: true,
+                work_area: true
+            }));
+
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+
+        this._workareasChangedId = global.display.connect('workareas-changed',
+            this._onWorkAreasChanged.bind(this));
+        this._onWorkAreasChanged();
+    }
+
+    show(...args) {
+        if (this._scrollEventId == 0)
+            this._scrollEventId = Main.windowPicker.connect('scroll-event',
+                this._onScrollEvent.bind(this));
+
+        super.show(...args);
+    }
+
+    hide(...args) {
+        if (this._scrollEventId > 0)
+            Main.windowPicker.disconnect(this._scrollEventId);
+        this._scrollEventId = 0;
+
+        super.hide(...args);
+    }
+
+    _onWorkAreasChanged() {
+        let { primaryIndex } = Main.layoutManager;
+        let workarea = Main.layoutManager.getWorkAreaForMonitor(primaryIndex);
+        this.setWorkspacesFullGeometry(workarea);
+    }
+
+    _updateWorkspacesViews() {
+        super._updateWorkspacesViews();
+
+        this._workspacesViews.forEach(v => {
+            Main.layoutManager.overviewGroup.remove_actor(v.actor);
+            Main.windowPicker.add_actor(v.actor);
+        });
+    }
+
+    _onDestroy() {
+        if (this._workareasChangedId)
+            global.display.disconnect(this._workareasChangedId);
+        this._workareasChangedId = 0;
+    }
+};
+
+var WindowPicker = GObject.registerClass({
+    GTypeName: 'WindowListWindowPicker',
+    Signals: {
+        'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
+        'scroll-event': { param_types: [Clutter.Event.$gtype] }
+    }
+}, class extends Clutter.Actor {
+    _init() {
+        this._visible = false;
+        this._modal = false;
+
+        this._overlayKeyId = 0;
+        this._stageKeyPressId = 0;
+
+        super._init();
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        global.bind_property('screen-width',
+            this, 'width',
+            GObject.BindingFlags.SYNC_CREATE);
+        global.bind_property('screen-height',
+            this, 'height',
+            GObject.BindingFlags.SYNC_CREATE);
+
+        this._backgroundGroup = new Meta.BackgroundGroup({ reactive: true });
+        this.add_child(this._backgroundGroup);
+
+        this._backgroundGroup.connect('scroll-event', (a, ev) => {
+            this.emit('scroll-event', ev);
+        });
+
+        // Trick WorkspacesDisplay constructor into adding actions here
+        let addActionOrig = Main.overview.addAction;
+        Main.overview.addAction = a => this._backgroundGroup.add_action(a);
+
+        this._workspacesDisplay = new MyWorkspacesDisplay();
+        this.add_child(this._workspacesDisplay.actor);
+
+        Main.overview.addAction = addActionOrig;
+
+        this._bgManagers = [];
+
+        this._monitorsChangedId = Main.layoutManager.connect('monitors-changed',
+            this._updateBackgrounds.bind(this));
+        this._updateBackgrounds();
+
+        Main.uiGroup.insert_child_below(this, global.window_group);
+
+        if (!Main.sessionMode.hasOverview) {
+            this._overlayKeyId = global.display.connect('overlay-key', () => {
+                if (!this._visible)
+                    this.open();
+                else
+                    this.close();
+            });
+        }
+    }
+
+    get visible() {
+        return this._visible;
+    }
+
+    open() {
+        if (this._visible)
+            return;
+
+        this._visible = true;
+
+        if (!this._syncGrab())
+            return;
+
+        this._fakeOverviewVisible(true);
+        this._shadeBackgrounds();
+        this._fakeOverviewAnimation();
+        this._workspacesDisplay.show(false);
+
+        this._stageKeyPressId = global.stage.connect('key-press-event',
+            (a, event) => {
+                let sym = event.get_key_symbol();
+                if (sym == Clutter.KEY_Escape) {
+                    this.close();
+                    return Clutter.EVENT_STOP;
+                }
+                return Clutter.EVENT_PROPAGATE;
+            });
+
+        this.emit('open-state-changed', this._visible);
+    }
+
+    close() {
+        if (!this._visible)
+            return;
+
+        this._visible = false;
+
+        if (!this._syncGrab())
+            return;
+
+        this._workspacesDisplay.animateFromOverview(false);
+        this._unshadeBackgrounds();
+        this._fakeOverviewAnimation(() => {
+            this._workspacesDisplay.hide();
+            this._fakeOverviewVisible(false);
+        });
+
+        global.stage.disconnect(this._stageKeyPressId);
+        this._stageKeyPressId = 0;
+
+        this.emit('open-state-changed', this._visible);
+    }
+
+    _fakeOverviewAnimation(onComplete) {
+        Main.overview.animationInProgress = true;
+        GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            Overview.ANIMATION_TIME * 1000,
+            () => {
+                Main.overview.animationInProgress = false;
+                if (onComplete)
+                    onComplete();
+            });
+    }
+
+    _fakeOverviewVisible(visible) {
+        // Fake overview state for WorkspacesDisplay
+        Main.overview.visible = visible;
+
+        // Hide real windows
+        Main.layoutManager._inOverview = visible;
+        Main.layoutManager._updateVisibility();
+    }
+
+    _syncGrab() {
+        if (this._visible) {
+            if (this._modal)
+                return true;
+
+            this._modal = Main.pushModal(this, {
+                actionMode: Shell.ActionMode.OVERVIEW
+            });
+
+            if (!this._modal) {
+                this.hide();
+                return false;
+            }
+        } else if (this._modal) {
+            Main.popModal(this);
+            this._modal = false;
+        }
+        return true;
+    }
+
+    _onDestroy() {
+        if (this._monitorsChangedId)
+            Main.layoutManager.disconnect(this._monitorsChangedId);
+        this._monitorsChangedId = 0;
+
+        if (this._overlayKeyId)
+            global.display.disconnect(this._overlayKeyId);
+        this._overlayKeyId = 0;
+
+        if (this._stageKeyPressId)
+            global.stage.disconnect(this._stageKeyPressId);
+        this._stageKeyPressId = 0;
+    }
+
+    _updateBackgrounds() {
+        Main.overview._updateBackgrounds.call(this);
+    }
+
+    _shadeBackgrounds() {
+        Main.overview._shadeBackgrounds.call(this);
+    }
+
+    _unshadeBackgrounds() {
+        Main.overview._unshadeBackgrounds.call(this);
+    }
+});
+
+var WindowPickerToggle = GObject.registerClass(
+class WindowPickerToggle extends St.Button {
+    _init() {
+        let iconBin = new St.Widget({
+            layout_manager: new Clutter.BinLayout()
+        });
+        iconBin.add_child(new St.Icon({
+            icon_name: 'focus-windows-symbolic',
+            icon_size: 16,
+            x_expand: true,
+            y_expand: true,
+            x_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
+        }));
+        super._init({
+            style_class: 'window-picker-toggle',
+            child: iconBin,
+            visible: !Main.sessionMode.hasOverview,
+            x_fill: true,
+            y_fill: true,
+            toggle_mode: true
+        });
+
+        this.connect('notify::checked', () => {
+            if (this.checked)
+                Main.windowPicker.open();
+            else
+                Main.windowPicker.close();
+        });
+
+        Main.windowPicker.connect('open-state-changed', () => {
+            this.checked = Main.windowPicker.visible;
+        });
+    }
+});

extensions/window-list/workspaceIndicator.js

@@ -0,0 +1,402 @@
+/* exported WorkspaceIndicator */
+const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+
+const DND = imports.ui.dnd;
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+let WindowPreview = GObject.registerClass({
+    GTypeName: 'WindowListWindowPreview'
+}, class WindowPreview extends St.Button {
+    _init(window) {
+        super._init({
+            style_class: 'window-list-window-preview'
+        });
+
+        this._delegate = this;
+        DND.makeDraggable(this, { restoreOnSuccess: true });
+
+        this._window = window;
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._sizeChangedId = this._window.connect('size-changed',
+            this._relayout.bind(this));
+        this._positionChangedId = this._window.connect('position-changed',
+            this._relayout.bind(this));
+        this._minimizedChangedId = this._window.connect('notify::minimized',
+            this._relayout.bind(this));
+        this._monitorEnteredId = global.display.connect('window-entered-monitor',
+            this._relayout.bind(this));
+        this._monitorLeftId = global.display.connect('window-left-monitor',
+            this._relayout.bind(this));
+
+        // Do initial layout when we get a parent
+        let id = this.connect('parent-set', () => {
+            this.disconnect(id);
+            if (!this.get_parent())
+                return;
+            this._laterId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                this._laterId = 0;
+                this._relayout();
+                return false;
+            });
+        });
+
+        this._focusChangedId = global.display.connect('notify::focus-window',
+            this._onFocusChanged.bind(this));
+        this._onFocusChanged();
+    }
+
+    // needed for DND
+    get realWindow() {
+        return this._window.get_compositor_private();
+    }
+
+    _onDestroy() {
+        this._window.disconnect(this._sizeChangedId);
+        this._window.disconnect(this._positionChangedId);
+        this._window.disconnect(this._minimizedChangedId);
+        global.display.disconnect(this._monitorEnteredId);
+        global.display.disconnect(this._monitorLeftId);
+        global.display.disconnect(this._focusChangedId);
+        if (this._laterId)
+            Meta.later_remove(this._laterId);
+    }
+
+    _onFocusChanged() {
+        if (global.display.focus_window == this._window)
+            this.add_style_class_name('active');
+        else
+            this.remove_style_class_name('active');
+    }
+
+    _relayout() {
+        let monitor = Main.layoutManager.findIndexForActor(this);
+        this.visible = monitor == this._window.get_monitor() &&
+            this._window.showing_on_its_workspace();
+
+        if (!this.visible)
+            return;
+
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+        let hscale = this.get_parent().allocation.get_width() / workArea.width;
+        let vscale = this.get_parent().allocation.get_height() / workArea.height;
+
+        let frameRect = this._window.get_frame_rect();
+        this.set_size(
+            Math.round(Math.min(frameRect.width, workArea.width) * hscale),
+            Math.round(Math.min(frameRect.height, workArea.height) * vscale));
+        this.set_position(
+            Math.round(frameRect.x * hscale),
+            Math.round(frameRect.y * vscale));
+    }
+});
+
+let WorkspaceThumbnail = GObject.registerClass({
+    GTypeName: 'WindowListWorkspaceThumbnail'
+}, class WorkspaceThumbnail extends St.Button {
+    _init(index) {
+        super._init({
+            style_class: 'workspace',
+            child: new Clutter.Actor({
+                layout_manager: new Clutter.BinLayout(),
+                clip_to_allocation: true
+            }),
+            x_fill: true,
+            y_fill: true
+        });
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._index = index;
+        this._delegate = this; // needed for DND
+
+        this._windowPreviews = new Map();
+
+        let workspaceManager = global.workspace_manager;
+        this._workspace = workspaceManager.get_workspace_by_index(index);
+
+        this._windowAddedId = this._workspace.connect('window-added',
+            (ws, window) => {
+                this._addWindow(window);
+            });
+        this._windowRemovedId = this._workspace.connect('window-removed',
+            (ws, window) => {
+                this._removeWindow(window);
+            });
+        this._restackedId = global.display.connect('restacked',
+            this._onRestacked.bind(this));
+
+        this._workspace.list_windows().forEach(w => this._addWindow(w));
+        this._onRestacked();
+    }
+
+    acceptDrop(source) {
+        if (!source.realWindow)
+            return false;
+
+        let window = source.realWindow.get_meta_window();
+        this._moveWindow(window);
+        return true;
+    }
+
+    handleDragOver(source) {
+        if (source.realWindow)
+            return DND.DragMotionResult.MOVE_DROP;
+        else
+            return DND.DragMotionResult.CONTINUE;
+    }
+
+    _addWindow(window) {
+        if (this._windowPreviews.has(window))
+            return;
+
+        let preview = new WindowPreview(window);
+        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
+        this._windowPreviews.set(window, preview);
+        this.child.add_child(preview);
+    }
+
+    _removeWindow(window) {
+        let preview = this._windowPreviews.get(window);
+        if (!preview)
+            return;
+
+        this._windowPreviews.delete(window);
+        preview.destroy();
+    }
+
+    _onRestacked() {
+        let lastPreview = null;
+        let windows = global.get_window_actors().map(a => a.meta_window);
+        for (let i = 0; i < windows.length; i++) {
+            let preview = this._windowPreviews.get(windows[i]);
+            if (!preview)
+                continue;
+
+            this.child.set_child_above_sibling(preview, lastPreview);
+            lastPreview = preview;
+        }
+    }
+
+    _moveWindow(window) {
+        let monitorIndex = Main.layoutManager.findIndexForActor(this);
+        if (monitorIndex != window.get_monitor())
+            window.move_to_monitor(monitorIndex);
+        window.change_workspace_by_index(this._index, false);
+    }
+
+    on_clicked() {
+        let ws = global.workspace_manager.get_workspace_by_index(this._index);
+        if (ws)
+            ws.activate(global.get_current_time());
+    }
+
+    _onDestroy() {
+        this._workspace.disconnect(this._windowAddedId);
+        this._workspace.disconnect(this._windowRemovedId);
+        global.display.disconnect(this._restackedId);
+    }
+});
+
+var WorkspaceIndicator = GObject.registerClass({
+    GTypeName: 'WindowListWorkspaceIndicator'
+}, class WorkspaceIndicator extends PanelMenu.Button {
+    _init() {
+        super._init(0.0, _('Workspace Indicator'), true);
+        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
+        this.add_style_class_name('window-list-workspace-indicator');
+        this.menu.actor.remove_style_class_name('panel-menu');
+
+        let container = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            x_expand: true,
+            y_expand: true
+        });
+        this.add_actor(container);
+
+        let workspaceManager = global.workspace_manager;
+
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+        this._statusLabel = new St.Label({ text: this._getStatusText() });
+
+        this._statusBin = new St.Bin({
+            style_class: 'status-label-bin',
+            x_expand: true,
+            y_expand: true,
+            child: this._statusLabel
+        });
+        container.add_actor(this._statusBin);
+
+        this._thumbnailsBox = new St.BoxLayout({
+            style_class: 'workspaces-box',
+            y_expand: true,
+            reactive: true
+        });
+        this._thumbnailsBox.connect('scroll-event',
+            this._onScrollEvent.bind(this));
+        container.add_actor(this._thumbnailsBox);
+
+        this._workspacesItems = [];
+
+        this._workspaceManagerSignals = [
+            workspaceManager.connect('notify::n-workspaces',
+                this._nWorkspacesChanged.bind(this)),
+            workspaceManager.connect_after('workspace-switched',
+                this._onWorkspaceSwitched.bind(this)),
+            workspaceManager.connect('notify::layout-rows',
+                this._onWorkspaceOrientationChanged.bind(this))
+        ];
+
+        this.connect('scroll-event', this._onScrollEvent.bind(this));
+        this._updateMenu();
+        this._updateThumbnails();
+        this._onWorkspaceOrientationChanged();
+
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
+        this._settingsChangedId = this._settings.connect(
+            'changed::workspace-names', this._updateMenuLabels.bind(this));
+    }
+
+    _onDestroy() {
+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
+            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+
+        if (this._settingsChangedId) {
+            this._settings.disconnect(this._settingsChangedId);
+            this._settingsChangedId = 0;
+        }
+
+        super._onDestroy();
+    }
+
+    _onWorkspaceOrientationChanged() {
+        let vertical = global.workspace_manager.layout_rows == -1;
+        this.reactive = vertical;
+
+        this._statusBin.visible = vertical;
+        this._thumbnailsBox.visible = !vertical;
+    }
+
+    _onWorkspaceSwitched() {
+        let workspaceManager = global.workspace_manager;
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+
+        this._updateMenuOrnament();
+        this._updateActiveThumbnail();
+
+        this._statusLabel.set_text(this._getStatusText());
+    }
+
+    _nWorkspacesChanged() {
+        this._updateMenu();
+        this._updateThumbnails();
+    }
+
+    _updateMenuOrnament() {
+        for (let i = 0; i < this._workspacesItems.length; i++) {
+            this._workspacesItems[i].setOrnament(i == this._currentWorkspace
+                ? PopupMenu.Ornament.DOT
+                : PopupMenu.Ornament.NONE);
+        }
+    }
+
+    _updateActiveThumbnail() {
+        let thumbs = this._thumbnailsBox.get_children();
+        for (let i = 0; i < thumbs.length; i++) {
+            if (i == this._currentWorkspace)
+                thumbs[i].add_style_class_name('active');
+            else
+                thumbs[i].remove_style_class_name('active');
+        }
+    }
+
+    _getStatusText() {
+        let workspaceManager = global.workspace_manager;
+        let current = workspaceManager.get_active_workspace_index();
+        let total = workspaceManager.n_workspaces;
+
+        return '%d / %d'.format(current + 1, total);
+    }
+
+    _updateMenuLabels() {
+        for (let i = 0; i < this._workspacesItems.length; i++) {
+            let item = this._workspacesItems[i];
+            let name = Meta.prefs_get_workspace_name(i);
+            item.label.text = name;
+        }
+    }
+
+    _updateMenu() {
+        let workspaceManager = global.workspace_manager;
+
+        this.menu.removeAll();
+        this._workspacesItems = [];
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
+            let name = Meta.prefs_get_workspace_name(i);
+            let item = new PopupMenu.PopupMenuItem(name);
+            item.workspaceId = i;
+
+            item.connect('activate', (item, _event) => {
+                this._activate(item.workspaceId);
+            });
+
+            if (i == this._currentWorkspace)
+                item.setOrnament(PopupMenu.Ornament.DOT);
+
+            this.menu.addMenuItem(item);
+            this._workspacesItems[i] = item;
+        }
+
+        this._statusLabel.set_text(this._getStatusText());
+    }
+
+    _updateThumbnails() {
+        let workspaceManager = global.workspace_manager;
+
+        this._thumbnailsBox.destroy_all_children();
+
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
+            let thumb = new WorkspaceThumbnail(i);
+            this._thumbnailsBox.add_actor(thumb);
+        }
+        this._updateActiveThumbnail();
+    }
+
+    _activate(index) {
+        let workspaceManager = global.workspace_manager;
+
+        if (index >= 0 && index < workspaceManager.n_workspaces) {
+            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
+            metaWorkspace.activate(global.get_current_time());
+        }
+    }
+
+    _onScrollEvent(actor, event) {
+        let direction = event.get_scroll_direction();
+        let diff = 0;
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            diff = 1;
+        } else if (direction == Clutter.ScrollDirection.UP) {
+            diff = -1;
+        } else {
+            return;
+        }
+
+        let newIndex = this._currentWorkspace + diff;
+        this._activate(newIndex);
+    }
+
+    _allocate(actor, box, flags) {
+        if (actor.get_n_children() > 0)
+            actor.get_first_child().allocate(box, flags);
+    }
+});
+

extensions/windowsNavigator/extension.js

@@ -1,50 +1,65 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* exported enable disable */
+/* exported init */
 const { Clutter, St } = imports.gi;
 
 const Main = imports.ui.main;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;
 
-function injectToFunction(parent, name, func) {
-    let origin = parent[name];
-    parent[name] = function() {
-        let ret;
-        ret = origin.apply(this, arguments);
-        if (ret === undefined)
-            ret = func.apply(this, arguments);
-        return ret;
-    };
-    return origin;
-}
+var MyWindowOverlay = class extends Workspace.WindowOverlay {
+    constructor(windowClone, parentActor) {
+        super(windowClone, parentActor);
 
-let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;
+        this._id = null;
+        this._text = new St.Label({
+            style_class: 'extension-windowsNavigator-window-tooltip',
+            visible: false
+        });
+        parentActor.add_actor(this._text);
+    }
 
-function resetState() {
-    winInjections = {};
-    workspaceInjections = {};
-    workViewInjections = {};
-    createdActors = [];
-    connectedSignals = [];
-}
-
-function enable() {
-    resetState();
-
-    Workspace.WindowOverlay.prototype.showTooltip = function() {
+    showTooltip() {
         this._text.raise_top();
         this._text.show();
         this._text.text = (this._windowClone.slotId + 1).toString();
-    };
-    winInjections['showTooltip'] = undefined;
+    }
 
-    Workspace.WindowOverlay.prototype.hideTooltip = function() {
+    hideTooltip() {
         if (this._text && this._text.visible)
             this._text.hide();
-    };
-    winInjections['hideTooltip'] = undefined;
+    }
 
-    Workspace.Workspace.prototype.showTooltip = function() {
+    relayout(animate) {
+        super.relayout(animate);
+
+        let [cloneX, cloneY, cloneWidth_, cloneHeight_] = this._windowClone.slot;
+
+        let textX = cloneX - 2;
+        let textY = cloneY - 2;
+        this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
+        this._text.raise_top();
+    }
+};
+
+var MyWorkspace = class extends Workspace.Workspace {
+    constructor(metaWorkspace, monitorIndex) {
+        super(metaWorkspace, monitorIndex);
+
+        if (metaWorkspace && metaWorkspace.index() < 9) {
+            this._tip = new St.Label({
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false
+            });
+            this.actor.add_actor(this._tip);
+
+            this.actor.connect('notify::scale-x', () => {
+                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
+            });
+        } else
+            this._tip = null;
+    }
+
+    showTooltip() {
         if (this._tip == null || this._actualGeometry == null)
             return;
         this._tip.text = (this.metaWorkspace.index() + 1).toString();
@@ -64,61 +79,74 @@ function enable() {
         this._tip.y = area.y;
         this._tip.show();
         this._tip.raise_top();
-    };
-    workspaceInjections['showTooltip'] = undefined;
+    }
 
-    Workspace.Workspace.prototype.hideTooltip = function() {
+    hideTooltip() {
         if (this._tip == null)
             return;
         if (!this._tip.get_parent())
             return;
         this._tip.hide();
-    };
-    workspaceInjections['hideTooltip'] = undefined;
+    }
 
-    Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
+    getWindowWithTooltip(id) {
         for (let i = 0; i < this._windows.length; i++) {
             if ((this._windows[i].slotId + 1) == id)
                 return this._windows[i].metaWindow;
         }
         return null;
-    };
-    workspaceInjections['getWindowWithTooltip'] = undefined;
+    }
 
-    Workspace.Workspace.prototype.showWindowsTooltips = function() {
+    showWindowsTooltips() {
         for (let i in this._windowOverlays) {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].showTooltip();
         }
-    };
-    workspaceInjections['showWindowsTooltips'] = undefined;
+    }
 
-    Workspace.Workspace.prototype.hideWindowsTooltips = function() {
+    hideWindowsTooltips() {
         for (let i in this._windowOverlays) {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].hideTooltip();
         }
-    };
-    workspaceInjections['hideWindowsTooltips'] = undefined;
+    }
+};
 
-    WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
+var MyWorkspacesView = class extends WorkspacesView.WorkspacesView {
+    constructor(width, height, x, y, workspaces) {
+        super(width, height, x, y, workspaces);
+
+        this._pickWorkspace = false;
+        this._pickWindow = false;
+        this._keyPressEventId =
+            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
+        this._keyReleaseEventId =
+            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
+    }
+
+    _onDestroy() {
+        super._onDestroy();
+
+        global.stage.disconnect(this._keyPressEventId);
+        global.stage.disconnect(this._keyReleaseEventId);
+    }
+
+    _hideTooltips() {
         if (global.stage.get_key_focus() == global.stage)
             global.stage.set_key_focus(this._prevFocusActor);
         this._pickWindow = false;
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].hideWindowsTooltips();
-    };
-    workViewInjections['_hideTooltips'] = undefined;
+    }
 
-    WorkspacesView.WorkspacesView.prototype._hideWorkspacesTooltips = function() {
+    _hideWorkspacesTooltips() {
         global.stage.set_key_focus(this._prevFocusActor);
         this._pickWorkspace = false;
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].hideTooltip();
-    };
-    workViewInjections['_hideWorkspacesTooltips'] = undefined;
+    }
 
-    WorkspacesView.WorkspacesView.prototype._onKeyRelease = function(s, o) {
+    _onKeyRelease(s, o) {
         if (this._pickWindow &&
             (o.get_key_symbol() == Clutter.KEY_Alt_L ||
              o.get_key_symbol() == Clutter.KEY_Alt_R))
@@ -127,11 +155,11 @@ function enable() {
             (o.get_key_symbol() == Clutter.KEY_Control_L ||
              o.get_key_symbol() == Clutter.KEY_Control_R))
             this._hideWorkspacesTooltips();
-    };
-    workViewInjections['_onKeyRelease'] = undefined;
+    }
 
-    WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
-        if (Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
+    _onKeyPress(s, o) {
+        let viewSelector = Main.overview.viewSelector;
+        if (viewSelector._activePage != viewSelector._workspacesPage)
             return false;
 
         let workspaceManager = global.workspace_manager;
@@ -208,79 +236,29 @@ function enable() {
             return true;
         }
         return false;
-    };
-    workViewInjections['_onKeyPress'] = undefined;
+    }
+};
 
-    winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
-        this._id = null;
-        createdActors.push(this._text = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip' }));
-        this._text.hide();
-        parentActor.add_actor(this._text);
-    });
+class Extension {
+    constructor() {
+        this._origWindowOverlay = Workspace.WindowOverlay;
+        this._origWorkspace = Workspace.Workspace;
+        this._origWorkspacesView = WorkspacesView.WorkspacesView;
+    }
 
-    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(_animate) {
-        let [cloneX, cloneY, cloneWidth_, cloneHeight_] = this._windowClone.slot;
+    enable() {
+        Workspace.WindowOverlay = MyWindowOverlay;
+        Workspace.Workspace = MyWorkspace;
+        WorkspacesView.WorkspacesView = MyWorkspacesView;
+    }
 
-        let textX = cloneX - 2;
-        let textY = cloneY - 2;
-        this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
-        this._text.raise_top();
-    });
-
-    workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
-        if (metaWorkspace && metaWorkspace.index() < 9) {
-            createdActors.push(this._tip = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip',
-                                                          visible: false }));
-
-            this.actor.add_actor(this._tip);
-            let signalId = this.actor.connect('notify::scale-x', () => {
-                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
-            });
-            connectedSignals.push({ obj: this.actor, id: signalId });
-        } else
-            this._tip = null;
-    });
-
-    workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(_width, _height, _x, _y, _workspaces) {
-        this._pickWorkspace = false;
-        this._pickWindow = false;
-        this._keyPressEventId =
-            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
-        this._keyReleaseEventId =
-            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
-        connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
-        connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
-    });
-
-    workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
-        global.stage.disconnect(this._keyPressEventId);
-        global.stage.disconnect(this._keyReleaseEventId);
-        connectedSignals = [];
-    });
+    disable() {
+        Workspace.WindowOverlay = this._origWindowOverlay;
+        Workspace.Workspace = this._origWorkspace;
+        WorkspacesView.WorkspacesView = this._origWorkspacesView;
+    }
 }
 
-function removeInjection(object, injection, name) {
-    if (injection[name] === undefined)
-        delete object[name];
-    else
-        object[name] = injection[name];
-}
-
-function disable() {
-    let i;
-
-    for (i in workspaceInjections)
-        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
-    for (i in winInjections)
-        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
-    for (i in workViewInjections)
-        removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
-
-    for (i of connectedSignals)
-        i.obj.disconnect(i.id);
-
-    for (i of createdActors)
-        i.destroy();
-
-    resetState();
+function init() {
+    return new Extension();
 }

extensions/workspace-indicator/extension.js

@@ -2,54 +2,268 @@
 /* exported init enable disable */
 
 const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+
+const DND = imports.ui.dnd;
+const ExtensionUtils = imports.misc.extensionUtils;
+const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
-const Main = imports.ui.main;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
+let WindowPreview = GObject.registerClass({
+    GTypeName: 'WorkspaceIndicatorWindowPreview'
+}, class WindowPreview extends St.Button {
+    _init(window) {
+        super._init({
+            style_class: 'workspace-indicator-window-preview'
+        });
+
+        this._delegate = this;
+        DND.makeDraggable(this, { restoreOnSuccess: true });
+
+        this._window = window;
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._sizeChangedId = this._window.connect('size-changed',
+            this._relayout.bind(this));
+        this._positionChangedId = this._window.connect('position-changed',
+            this._relayout.bind(this));
+        this._minimizedChangedId = this._window.connect('notify::minimized',
+            this._relayout.bind(this));
+        this._monitorEnteredId = global.display.connect('window-entered-monitor',
+            this._relayout.bind(this));
+        this._monitorLeftId = global.display.connect('window-left-monitor',
+            this._relayout.bind(this));
+
+        // Do initial layout when we get a parent
+        let id = this.connect('parent-set', () => {
+            this.disconnect(id);
+            if (!this.get_parent())
+                return;
+            this._laterId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                this._laterId = 0;
+                this._relayout();
+                return false;
+            });
+        });
+
+        this._focusChangedId = global.display.connect('notify::focus-window',
+            this._onFocusChanged.bind(this));
+        this._onFocusChanged();
+    }
+
+    // needed for DND
+    get realWindow() {
+        return this._window.get_compositor_private();
+    }
+
+    _onDestroy() {
+        this._window.disconnect(this._sizeChangedId);
+        this._window.disconnect(this._positionChangedId);
+        this._window.disconnect(this._minimizedChangedId);
+        global.display.disconnect(this._monitorEnteredId);
+        global.display.disconnect(this._monitorLeftId);
+        global.display.disconnect(this._focusChangedId);
+        if (this._laterId)
+            Meta.later_remove(this._laterId);
+    }
+
+    _onFocusChanged() {
+        if (global.display.focus_window == this._window)
+            this.add_style_class_name('active');
+        else
+            this.remove_style_class_name('active');
+    }
+
+    _relayout() {
+        let monitor = Main.layoutManager.findIndexForActor(this);
+        this.visible = monitor == this._window.get_monitor() &&
+            this._window.showing_on_its_workspace();
+
+        if (!this.visible)
+            return;
+
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+        let hscale = this.get_parent().allocation.get_width() / workArea.width;
+        let vscale = this.get_parent().allocation.get_height() / workArea.height;
+
+        let frameRect = this._window.get_frame_rect();
+        this.set_size(
+            Math.round(Math.min(frameRect.width, workArea.width) * hscale),
+            Math.round(Math.min(frameRect.height, workArea.height) * vscale));
+        this.set_position(
+            Math.round(frameRect.x * hscale),
+            Math.round(frameRect.y * vscale));
+    }
+});
+
+let WorkspaceThumbnail = GObject.registerClass({
+    GTypeName: 'WorkspaceIndicatorWorkspaceThumbnail'
+}, class WorkspaceThumbnail extends St.Button {
+    _init(index) {
+        super._init({
+            style_class: 'workspace',
+            child: new Clutter.Actor({
+                layout_manager: new Clutter.BinLayout(),
+                clip_to_allocation: true
+            }),
+            x_fill: true,
+            y_fill: true
+        });
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._index = index;
+        this._delegate = this; // needed for DND
+
+        this._windowPreviews = new Map();
+
+        let workspaceManager = global.workspace_manager;
+        this._workspace = workspaceManager.get_workspace_by_index(index);
+
+        this._windowAddedId = this._workspace.connect('window-added',
+            (ws, window) => {
+                this._addWindow(window);
+            });
+        this._windowRemovedId = this._workspace.connect('window-removed',
+            (ws, window) => {
+                this._removeWindow(window);
+            });
+        this._restackedId = global.display.connect('restacked',
+            this._onRestacked.bind(this));
+
+        this._workspace.list_windows().forEach(w => this._addWindow(w));
+        this._onRestacked();
+    }
+
+    acceptDrop(source) {
+        if (!source.realWindow)
+            return false;
+
+        let window = source.realWindow.get_meta_window();
+        this._moveWindow(window);
+        return true;
+    }
+
+    handleDragOver(source) {
+        if (source.realWindow)
+            return DND.DragMotionResult.MOVE_DROP;
+        else
+            return DND.DragMotionResult.CONTINUE;
+    }
+
+    _addWindow(window) {
+        if (this._windowPreviews.has(window))
+            return;
+
+        let preview = new WindowPreview(window);
+        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
+        this._windowPreviews.set(window, preview);
+        this.child.add_child(preview);
+    }
+
+    _removeWindow(window) {
+        let preview = this._windowPreviews.get(window);
+        if (!preview)
+            return;
+
+        this._windowPreviews.delete(window);
+        preview.destroy();
+    }
+
+    _onRestacked() {
+        let lastPreview = null;
+        let windows = global.get_window_actors().map(a => a.meta_window);
+        for (let i = 0; i < windows.length; i++) {
+            let preview = this._windowPreviews.get(windows[i]);
+            if (!preview)
+                continue;
+
+            this.child.set_child_above_sibling(preview, lastPreview);
+            lastPreview = preview;
+        }
+    }
+
+    _moveWindow(window) {
+        let monitorIndex = Main.layoutManager.findIndexForActor(this);
+        if (monitorIndex != window.get_monitor())
+            window.move_to_monitor(monitorIndex);
+        window.change_workspace_by_index(this._index, false);
+    }
+
+    on_clicked() {
+        let ws = global.workspace_manager.get_workspace_by_index(this._index);
+        if (ws)
+            ws.activate(global.get_current_time());
+    }
+
+    _onDestroy() {
+        this._workspace.disconnect(this._windowAddedId);
+        this._workspace.disconnect(this._windowRemovedId);
+        global.display.disconnect(this._restackedId);
+    }
+});
+
 let WorkspaceIndicator = GObject.registerClass(
 class WorkspaceIndicator extends PanelMenu.Button {
     _init() {
-        super._init(0.0, _("Workspace Indicator"));
+        super._init(0.0, _('Workspace Indicator'));
+
+        let container = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            x_expand: true,
+            y_expand: true
+        });
+        this.add_actor(container);
 
         let workspaceManager = global.workspace_manager;
 
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
-        this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
-                                          text: this._labelText() });
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+        this._statusLabel = new St.Label({
+            style_class: 'panel-workspace-indicator',
+            y_align: Clutter.ActorAlign.CENTER,
+            text: this._labelText()
+        });
 
-        this.add_actor(this.statusLabel);
+        container.add_actor(this._statusLabel);
 
-        this.workspacesItems = [];
+        this._thumbnailsBox = new St.BoxLayout({
+            style_class: 'panel-workspace-indicator-box',
+            y_expand: true,
+            reactive: true
+        });
+
+        container.add_actor(this._thumbnailsBox);
+
+        this._workspacesItems = [];
         this._workspaceSection = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(this._workspaceSection);
 
-        this._workspaceManagerSignals = [];
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-added',
-                                                                          this._createWorkspacesSection.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-removed',
-                                                                          this._createWorkspacesSection.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
-                                                                          this._updateIndicator.bind(this)));
+        this._workspaceManagerSignals = [
+            workspaceManager.connect_after('notify::n-workspaces',
+                this._nWorkspacesChanged.bind(this)),
+            workspaceManager.connect_after('workspace-switched',
+                this._onWorkspaceSwitched.bind(this)),
+            workspaceManager.connect('notify::layout-rows',
+                this._onWorkspaceOrientationChanged.bind(this))
+        ];
 
         this.connect('scroll-event', this._onScrollEvent.bind(this));
+        this._thumbnailsBox.connect('scroll-event', this._onScrollEvent.bind(this));
         this._createWorkspacesSection();
-
-        //styling
-        this.statusLabel.add_style_class_name('panel-workspace-indicator');
+        this._updateThumbnails();
+        this._onWorkspaceOrientationChanged();
 
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        this._settingsChangedId =
-            this._settings.connect(`changed::${WORKSPACE_KEY}`,
-                                   this._createWorkspacesSection.bind(this));
+        this._settingsChangedId = this._settings.connect(
+            `changed::${WORKSPACE_KEY}`,
+            this._updateMenuLabels.bind(this));
     }
 
     _onDestroy() {
@@ -61,15 +275,55 @@ class WorkspaceIndicator extends PanelMenu.Button {
             this._settingsChangedId = 0;
         }
 
+        Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
+
         super._onDestroy();
     }
 
-    _updateIndicator() {
-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+    _onWorkspaceOrientationChanged() {
+        let vertical = global.workspace_manager.layout_rows == -1;
+        this.reactive = vertical;
 
-        this.statusLabel.set_text(this._labelText());
+        this._statusLabel.visible = vertical;
+        this._thumbnailsBox.visible = !vertical;
+
+        // Disable offscreen-redirect when showing the workspace switcher
+        // so that clip-to-allocation works
+        Main.panel.set_offscreen_redirect(vertical
+            ? Clutter.OffscreenRedirect.ALWAYS
+            : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
+    }
+
+    _onWorkspaceSwitched() {
+        this._currentWorkspace = global.workspace_manager.get_active_workspace_index();
+
+        this._updateMenuOrnament();
+        this._updateActiveThumbnail();
+
+        this._statusLabel.set_text(this._labelText());
+    }
+
+    _nWorkspacesChanged() {
+        this._createWorkspacesSection();
+        this._updateThumbnails();
+    }
+
+    _updateMenuOrnament() {
+        for (let i = 0; i < this._workspacesItems.length; i++) {
+            this._workspacesItems[i].setOrnament(i == this._currentWorkspace
+                ? PopupMenu.Ornament.DOT
+                : PopupMenu.Ornament.NONE);
+        }
+    }
+
+    _updateActiveThumbnail() {
+        let thumbs = this._thumbnailsBox.get_children();
+        for (let i = 0; i < thumbs.length; i++) {
+            if (i == this._currentWorkspace)
+                thumbs[i].add_style_class_name('active');
+            else
+                thumbs[i].remove_style_class_name('active');
+        }
     }
 
     _labelText(workspaceIndex) {
@@ -80,34 +334,51 @@ class WorkspaceIndicator extends PanelMenu.Button {
         return Meta.prefs_get_workspace_name(workspaceIndex);
     }
 
+    _updateMenuLabels() {
+        for (let i = 0; i < this._workspacesItems.length; i++)
+            this._workspacesItems[i].label.text = this._labelText(i);
+    }
+
     _createWorkspacesSection() {
         let workspaceManager = global.workspace_manager;
 
         this._workspaceSection.removeAll();
-        this.workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._workspacesItems = [];
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
 
         let i = 0;
         for (; i < workspaceManager.n_workspaces; i++) {
-            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
-            this.workspacesItems[i].workspaceId = i;
-            this.workspacesItems[i].label_actor = this.statusLabel;
-            this.workspacesItems[i].connect('activate', (actor, _event) => {
+            this._workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+            this._workspaceSection.addMenuItem(this._workspacesItems[i]);
+            this._workspacesItems[i].workspaceId = i;
+            this._workspacesItems[i].label_actor = this._statusLabel;
+            this._workspacesItems[i].connect('activate', (actor, _event) => {
                 this._activate(actor.workspaceId);
             });
 
             if (i == this._currentWorkspace)
-                this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+                this._workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
         }
 
-        this.statusLabel.set_text(this._labelText());
+        this._statusLabel.set_text(this._labelText());
+    }
+
+    _updateThumbnails() {
+        let workspaceManager = global.workspace_manager;
+
+        this._thumbnailsBox.destroy_all_children();
+
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
+            let thumb = new WorkspaceThumbnail(i);
+            this._thumbnailsBox.add_actor(thumb);
+        }
+        this._updateActiveThumbnail();
     }
 
     _activate(index) {
         let workspaceManager = global.workspace_manager;
 
-        if (index >= 0 && index <  workspaceManager.n_workspaces) {
+        if (index >= 0 && index < workspaceManager.n_workspaces) {
             let metaWorkspace = workspaceManager.get_workspace_by_index(index);
             metaWorkspace.activate(global.get_current_time());
         }
@@ -124,7 +395,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
             return;
         }
 
-        let newIndex = global.workspace_manager.get_active_workspace().index() + diff;
+        let newIndex = global.workspace_manager.get_active_workspace_index() + diff;
         this._activate(newIndex);
     }
 });

extensions/workspace-indicator/prefs.js

@@ -127,22 +127,28 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
         this.margin = 12;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        this.add(new Gtk.Label({ label: '<b>%s</b>'.format(_("Workspace Names")),
-                                 use_markup: true, margin_bottom: 6,
-                                 hexpand: true, halign: Gtk.Align.START }));
+        this.add(new Gtk.Label({
+            label: '<b>%s</b>'.format(_('Workspace Names')),
+            use_markup: true,
+            margin_bottom: 6,
+            hexpand: true,
+            halign: Gtk.Align.START
+        }));
 
         let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
         scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         this.add(scrolled);
 
         this._store = new WorkspaceNameModel();
-        this._treeView = new Gtk.TreeView({ model: this._store,
-                                            headers_visible: false,
-                                            reorderable: true,
-                                            hexpand: true,
-                                            vexpand: true });
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            headers_visible: false,
+            reorderable: true,
+            hexpand: true,
+            vexpand: true
+        });
 
-        let column = new Gtk.TreeViewColumn({ title: _("Name") });
+        let column = new Gtk.TreeViewColumn({ title: _('Name') });
         let renderer = new Gtk.CellRendererText({ editable: true });
         renderer.connect('edited', this._cellEdited.bind(this));
         column.pack_start(renderer, true);
@@ -182,7 +188,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
         let iter = this._store.append();
         let index = this._store.get_path(iter).get_indices()[0];
 
-        let label = _("Workspace %d").format(index + 1);
+        let label = _('Workspace %d').format(index + 1);
         this._store.set(iter, [this._store.Columns.LABEL], [label]);
     }
 

extensions/workspace-indicator/stylesheet.css

@@ -1,5 +1,40 @@
 .panel-workspace-indicator {
 	padding: 0 8px;
-	background-color: rgba(200, 200, 200, .5);
+}
+
+.panel-workspace-indicator-box {
+	padding: 2px 0;
+}
+
+.panel-workspace-indicator-box .workspace {
+	width: 40px;
+}
+
+.panel-workspace-indicator,
+.panel-workspace-indicator-box .workspace {
 	border: 1px solid #cccccc;
 }
+
+.panel-workspace-indicator,
+.panel-workspace-indicator-box .workspace.active {
+	background-color: rgba(200, 200, 200, .5);
+}
+
+.panel-workspace-indicator-box .workspace {
+    background-color: rgba(200, 200, 200, .3);
+    border-left-width: 0;
+}
+
+.panel-workspace-indicator-box .workspace:first-child {
+    border-left-width: 1px;
+}
+
+.workspace-indicator-window-preview {
+    background-color: #252525;
+    border: 1px solid #ccc;
+}
+
+.workspace-indicator-window-preview.active {
+    background-color: #353535;
+    border: 2px solid #ccc;
+}

lint/eslintrc-gjs.json

@@ -12,6 +12,7 @@
             "error",
             "never"
         ],
+        "arrow-spacing": "error",
         "brace-style": "error",
         "comma-spacing": [
             "error",
@@ -24,6 +25,9 @@
             "error",
             4,
             {
+                "ignoredNodes": [
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
                 "MemberExpression": "off"
             }
         ],
@@ -57,6 +61,19 @@
                 "allow": ["!!"]
             }
         ],
+        "no-restricted-properties": [
+            "error",
+            {
+                "object": "Lang",
+                "property": "bind",
+                "message": "Use arrow notation or Function.prototype.bind()"
+            },
+            {
+                "object": "Lang",
+                "property": "Class",
+                "message": "Use ES6 classes"
+            }
+        ],
         "nonblock-statement-body-position": [
             "error",
             "below"

lint/eslintrc-legacy.json

@@ -1,20 +0,0 @@
-{
-    "rules": {
-        "indent": [
-            "error",
-            4,
-            {
-                "ignoredNodes": [
-                    "ConditionalExpression",
-                    "CallExpression > ArrowFunctionExpression",
-                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
-                ],
-                "CallExpression": { "arguments": "first" },
-                "ArrayExpression": "first",
-                "ObjectExpression": "first",
-                "MemberExpression": "off"
-            }
-        ],
-        "quotes": "off"
-   }
-}

lint/eslintrc-shell.json

@@ -1,38 +1,10 @@
 {
     "rules": {
-        "arrow-spacing": "error",
-        "brace-style": [
-            "error",
-            "1tbs",
-            {
-                "allowSingleLine": true
-            }
-        ],
         "camelcase": [
             "error",
             {
                 "properties": "never",
-                "allow": ["^vfunc_"]
-            }
-        ],
-        "indent": [
-            "error",
-            4,
-            {
-                "ignoredNodes": [
-                    "ArrayExpression > ObjectExpression",
-                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child",
-                    "ConditionalExpression"
-                ],
-                "MemberExpression": "off"
-            }
-        ],
-        "key-spacing": [
-            "error",
-            {
-                "mode": "minimum",
-                "beforeColon": false,
-                "afterColon": true
+                "allow": ["^vfunc_", "^on_"]
             }
         ],
         "no-unused-vars": [
@@ -49,10 +21,6 @@
         "prefer-arrow-callback": "error"
     },
     "globals": {
-        "global": false,
-        "_": false,
-        "C_": false,
-        "N_": false,
-        "ngettext": false
+        "global": false
     }
 }

lint/generate-report.sh

@@ -1,61 +0,0 @@
-#!/bin/sh
-SEP=`printf '\t'`
-OUTPUT=/dev/stderr
-CWD=`pwd`
-SRCDIR=`dirname $0`
-
-run_lint() {
-  eslint -f unix "$@" .
-}
-
-parse_opts() {
-  tmp=`getopt -l output: o: "$@"`
-  [ $? -ne 0 ] && exit 1
-
-  eval set -- $tmp
-  while true
-  do
-    case $1 in
-      --output|-o)
-        OUTPUT=`realpath $2`; shift 2; continue ;;
-      --)
-        shift; break ;;
-    esac
-  done
-}
-
-# delete lines that don't start with '/',
-# replace the first space with tab, sort
-process_for_join() {
-  sed -E "/\//!d; s|(\S+)\s|\1$SEP|" | sort -k 1b,1
-}
-
-# re-replace tab with space
-process_post_join() {
-  sed -E "s|$SEP| |"
-}
-
-create_report() {
-  tmp1=`mktemp --tmpdir lint-XXXX`
-  run_lint | process_for_join > $tmp1
-
-  tmp2=`mktemp --tmpdir lint-XXXX`
-  run_lint -c lint/eslintrc-legacy.json | process_for_join > $tmp2
-
-  join -t"$SEP" -o '0,1.2' $tmp1 $tmp2 | process_post_join
-  rm $tmp1 $tmp2
-}
-
-
-parse_opts "$@"
-
-cd $SRCDIR/..
-
-create_report | tee $OUTPUT | grep -q .
-rv=$(( $? == 0 ))
-
-cd $CWD
-
-[ $rv -eq 0 -a -f $OUTPUT ] && rm $OUTPUT
-
-exit $rv

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.31.91',
+  version: '3.33.4',
   meson_version: '>= 0.44.0',
   license: 'GPL2+'
 )
@@ -33,6 +33,7 @@ uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
 
 classic_extensions = [
   'apps-menu',
+  'horizontal-workspaces',
   'places-menu',
   'launch-new-instance',
   'window-list'

po/LINGUAS

@@ -38,6 +38,7 @@ kn
 ko
 lt
 lv
+mjw
 ml
 mr
 ms

po/POTFILES.in

@@ -15,6 +15,7 @@ extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml
 extensions/window-list/extension.js
 extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
 extensions/window-list/prefs.js
+extensions/window-list/workspaceIndicator.js
 extensions/windowsNavigator/extension.js
 extensions/workspace-indicator/extension.js
 extensions/workspace-indicator/prefs.js

po/eo.po

@@ -3,107 +3,49 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Ryan LORTIE <desrt@desrt.ca>, 2013.
 # Daniel PUENTES <blatberk@openmailbox.org>, 2015.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011, 2015.
-#
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011-2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-01-31 08:37+0000\n"
-"PO-Revision-Date: 2015-02-01 16:13+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2019-03-02 10:57+0000\n"
+"PO-Revision-Date: 2019-03-06 22:14+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
+"Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
 "Language: eo\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: Poedit 1.5.4\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME-klasika"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Ĉi seanco ensalutas vin GNOME-klasiken"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Kunligi modalan dialogon al la patra fenestro"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Ĉi ŝlosilo atutas la ŝlosilon en org.gnome.mutter kiam rulanta GNOME-ŝelon."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Aranĝo de butonoj en la titolbreto"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-#| msgid ""
-#| "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Ĉi tiu ŝlosilo anstataŭas la ŝlosilon en org.gnome.desktop.wm.preferences "
-"kiam GNOME-ŝelo rulas."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Aktivigi kahelan aranĝon kiam demetante fenestrojn sur ekranaj borderoj"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Laborspacoj nur sur la ĉefa ekrano"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "En musa reĝimo, prokrasti ŝanĝi fokuson ĝis la musmontrilo haltas"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Miniaturo nur"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Aplikaĵa piktogramo nur"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Miniaturo kaj aplikaĵo piktogramo"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Prezenti fenestron kiel"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Montri nur fenestrojn en la aktuala laborspaco"
-
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:29
 msgid "Activities Overview"
 msgstr "Aktivecoj-Superrigardon"
 
-#: ../extensions/apps-menu/extension.js:114
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Plej ŝatataj"
 
-#: ../extensions/apps-menu/extension.js:283
+#: extensions/apps-menu/extension.js:407
 msgid "Applications"
 msgstr "Aplikaĵoj"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "Aplikaĵa kaj laborspaca listo"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -111,76 +53,49 @@ msgstr ""
 "Listo de ĉenoj, ĉiu enhavas aplikaĵan identigilon ('desktop' dosiernomo), "
 "sevkita per dupunkto kaj la laborspaca numero"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Aplikaĵo"
 
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Laborspaco"
 
-#: ../extensions/auto-move-windows/prefs.js:85
-#| msgid "Add rule"
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Aldoni regulon"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Krei novan kongruantan regulon"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Aldoni"
 
-#: ../extensions/drive-menu/extension.js:106
-msgid "Ejecting drive '%s' failed:"
-msgstr "Elĵeto de volumo '%s' malsukcesis:"
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:100
+#: extensions/places-menu/placeDisplay.js:217
+#, javascript-format
+#| msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
+msgstr "Elĵeto de volumo “%s” malsukcesis:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:116
 msgid "Removable devices"
 msgstr "Demeteblaj aparatoj"
 
-#: ../extensions/drive-menu/extension.js:151
-msgid "Open File"
-msgstr "Malfermi dosieron"
+#: extensions/drive-menu/extension.js:143
+#| msgid "Open File"
+msgid "Open Files"
+msgstr "Malfermi dosierojn"
 
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Saluton, mondo!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "Alterna saluta teksto."
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Se ne malplena, enhavas la tekston kiu estos montrita kiam alklakante sur la "
-"panelo."
-
-#: ../extensions/example/prefs.js:30
-#| msgid "Message:"
-msgid "Message"
-msgstr "Mesaĝo"
-
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"Ekzemplo klopodas montri kial krei bone-kondutantan etendojn por la ŝelo kaj "
-"sekve ne havas multan funkcion.\n"
-"Tamen, eblas agordi la salutan mesagon."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Uzi pli da ekrano por fenetroj"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -190,11 +105,11 @@ msgstr ""
 "aspekta rilatumo, kaj kunfandi ilin plu por redukti la limigan keston. Ĉi "
 "agordo uzitas nur kun la natura lokada strategio."
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "Meti fenestrajn apudskribojn supre"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -204,154 +119,241 @@ msgstr ""
 "estas meti ĝin malsupre). Si vi ŝanĝas ĉi agordon tiam vi devas restartigi "
 "la ŝelon."
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:83
 msgid "Places"
 msgstr "Lokoj"
 
-#: ../extensions/places-menu/placeDisplay.js:57
-msgid "Failed to launch \"%s\""
-msgstr "Malsukceis lanĉi \"%s\""
+#: extensions/places-menu/placeDisplay.js:59
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr ""
 
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:72
+#, javascript-format
+#| msgid "Failed to launch \"%s\""
+msgid "Failed to launch “%s”"
+msgstr "Malsukcesis lanĉi “%s”"
+
+#: extensions/places-menu/placeDisplay.js:133
+#: extensions/places-menu/placeDisplay.js:156
 msgid "Computer"
 msgstr "Komputilo"
 
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:343
 msgid "Home"
 msgstr "Domo"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:387
 msgid "Browse Network"
 msgstr "Foliumi reton"
 
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "Cikle montri ekrankopiajn grandojn"
 
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "Ĉefprocesoro"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+#, fuzzy
+#| msgid "Cycle Screenshot Sizes"
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "Cikle montri ekrankopiajn grandojn"
 
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "Memoro"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Etosnomo"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "La nomo de la etoso, malfermigi de ~/.themes/name/gnome-shell"
 
-#: ../extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:100
 msgid "Close"
 msgstr "Malfermi"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Neplejetigi"
 
-#: ../extensions/window-list/extension.js:121
+#: extensions/window-list/extension.js:120
 msgid "Minimize"
 msgstr "Plejetigi"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Nemaksimumigi"
 
-#: ../extensions/window-list/extension.js:128
+#: extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "Maksimumigi"
 
-#: ../extensions/window-list/extension.js:390
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Plejetigi ĉiujn"
 
-#: ../extensions/window-list/extension.js:398
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "Neplejetigi ĉiujn"
 
-#: ../extensions/window-list/extension.js:406
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Maksimumigi ĉiujn"
 
-#: ../extensions/window-list/extension.js:415
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "Nemaksimumigi ĉiujn"
 
-#: ../extensions/window-list/extension.js:424
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Fermi ĉiujn"
 
-#: ../extensions/window-list/extension.js:706
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:655
+#: extensions/workspace-indicator/extension.js:21
 msgid "Workspace Indicator"
 msgstr "Laborspaco Indikilo"
 
-#: ../extensions/window-list/extension.js:870
+#: extensions/window-list/extension.js:836
 msgid "Window List"
 msgstr "Fenestra listo"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Kiam grupigi fenestrojn"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#, fuzzy
+#| msgid ""
+#| "Decides when to group windows from the same application on the window "
+#| "list. Possible values are \"never\", \"auto\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are “never”, “auto” and “always”."
 msgstr ""
 "Decidas kiam grupi fenestrojn de la sama aplikaĵo en la fenestra listo. "
-"Validaj valoroj estas \"never\" (neniam), \"auto\" (aŭtomate) kaj \"always"
-"\" (ĉiam)."
+"Validaj valoroj estas “never” (neniam), “auto” (aŭtomate) kaj “always” "
+"(ĉiam)."
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
 msgstr "Montri la fenestroliston en ĉiuj ekranoj"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
 "Ĉu montri la fenestroliston en ĉiuj konektitaj ekranoj aŭ nur en la ĉefa."
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Fenestra grupigo"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Neniam grupigi fenestrojn"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Grupigi fenestrojn kiam spaco limitas"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Ĉiam grupigi fenestrojn"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Montri en ĉiuj ekranoj"
 
-#: ../extensions/workspace-indicator/prefs.js:141
-#| msgid "Workspace names:"
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Laborspacaj nomoj"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:151
 msgid "Name"
 msgstr "Nomo"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:191
+#, javascript-format
 msgid "Workspace %d"
 msgstr "Laborspaco %d"
 
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Kunligi modalan dialogon al la patra fenestro"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "Ĉi ŝlosilo atutas la ŝlosilon en org.gnome.mutter kiam rulanta GNOME-"
+#~ "ŝelon."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Aranĝo de butonoj en la titolbreto"
+
+#~| msgid ""
+#~| "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "Ĉi tiu ŝlosilo anstataŭas la ŝlosilon en org.gnome.desktop.wm.preferences "
+#~ "kiam GNOME-ŝelo rulas."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr ""
+#~ "Aktivigi kahelan aranĝon kiam demetante fenestrojn sur ekranaj borderoj"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Laborspacoj nur sur la ĉefa ekrano"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr "En musa reĝimo, prokrasti ŝanĝi fokuson ĝis la musmontrilo haltas"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "Miniaturo nur"
+
+#~ msgid "Application icon only"
+#~ msgstr "Aplikaĵa piktogramo nur"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "Miniaturo kaj aplikaĵo piktogramo"
+
+#~ msgid "Present windows as"
+#~ msgstr "Prezenti fenestron kiel"
+
+#~ msgid "Show only windows in the current workspace"
+#~ msgstr "Montri nur fenestrojn en la aktuala laborspaco"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Saluton, mondo!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "Alterna saluta teksto."
+
+#~ msgid ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+#~ msgstr ""
+#~ "Se ne malplena, enhavas la tekston kiu estos montrita kiam alklakante sur "
+#~ "la panelo."
+
+#~| msgid "Message:"
+#~ msgid "Message"
+#~ msgstr "Mesaĝo"
+
+#~ msgid ""
+#~ "Example aims to show how to build well behaved extensions for the Shell "
+#~ "and as such it has little functionality on its own.\n"
+#~ "Nevertheless it's possible to customize the greeting message."
+#~ msgstr ""
+#~ "Ekzemplo klopodas montri kial krei bone-kondutantan etendojn por la ŝelo "
+#~ "kaj sekve ne havas multan funkcion.\n"
+#~ "Tamen, eblas agordi la salutan mesagon."
+
+#~ msgid "CPU"
+#~ msgstr "Ĉefprocesoro"
+
+#~ msgid "Memory"
+#~ msgstr "Memoro"
+
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "GNOME-ŝelo-klasika"
 

po/et.po

@@ -6,85 +6,44 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2014-08-06 07:34+0000\n"
-"PO-Revision-Date: 2014-08-06 21:43+0300\n"
-"Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2019-03-02 10:57+0000\n"
+"PO-Revision-Date: 2019-03-10 19:24+0200\n"
+"Last-Translator: Mart Raudsepp <leio@gentoo.org>\n"
 "Language-Team: Estonian <gnome-et-list@gnome.org>\n"
 "Language: et\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: Poedit 1.5.4\n"
+"X-Generator: Poedit 2.2\n"
 
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "Klassikaline GNOME"
 
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "See on klassikalise GNOME seanss"
 
-msgid "GNOME Shell Classic"
-msgstr "GNOME klassikaline kest"
-
-msgid "Window management and application launching"
-msgstr "Akende haldus ja rakenduste käivitamine"
-
-msgid "Attach modal dialog to the parent window"
-msgstr "Modaalsed dialoogid on vanemakna küljes"
-
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"See võti on tähtsam võtmest org.gnome.mutter GNOME Shelli käivitamisel."
-
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Nuppude järjestus tiitliribal"
-
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"See võti on tähtsam võtmest org.gnome.desktop.wm.preferences GNOME Shelli "
-"käivitamisel."
-
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Akna automaatpaigutus on lubatud, kui aken lohistatakse ekraani serva"
-
-msgid "Workspaces only on primary monitor"
-msgstr "Tööalad on ainult peamisel ekraanil"
-
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Hiire all asuv aken saab fookuse alles hiire peatumisel"
-
-msgid "Thumbnail only"
-msgstr "Ainult pisipilt"
-
-msgid "Application icon only"
-msgstr "Ainult rakenduse ikoon"
-
-msgid "Thumbnail and application icon"
-msgstr "Pisipilt ja rakenduse ikoon"
-
-msgid "Present windows as"
-msgstr "Aknaid esitletakse kui"
-
-msgid "Show only windows in the current workspace"
-msgstr "Näidatakse ainult käesoleva tööala aknaid"
-
+#: extensions/apps-menu/extension.js:29
 msgid "Activities Overview"
 msgstr "Tegevuste ülevaade"
 
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Lemmikud"
 
+#: extensions/apps-menu/extension.js:407
 msgid "Applications"
 msgstr "Rakendused"
 
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "Rakenduste ja tööalade loend"
 
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -92,57 +51,47 @@ msgstr ""
 "Rakenduste loend, sõnedest, mis sisaldavad rakenduse id-d (desktop faili "
 "nimi), koolonit ja tööala numbrit."
 
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Rakendus"
 
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Tööala"
 
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Lisa reegel"
 
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Uue reegli loomine"
 
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Lisa"
 
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:100
+#: extensions/places-menu/placeDisplay.js:217
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Seadme '%s' väljastamine nurjus:"
+msgid "Ejecting drive “%s” failed:"
+msgstr "Seadme „%s“ väljastamine nurjus:"
 
+#: extensions/drive-menu/extension.js:116
 msgid "Removable devices"
 msgstr "Eemaldatavad seadmed"
 
-msgid "Open File"
-msgstr "Faili avamine"
-
-msgid "Hello, world!"
-msgstr "Tere, maailm!"
-
-msgid "Alternative greeting text."
-msgstr "Alternatiivne tervitustekst."
-
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr "Kui see pole tühi, näidatakse seda teksti paneelile klõpsates."
-
-msgid "Message"
-msgstr "Sõnum"
-
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"Näide hästi käituva Shelli laienduse koostamise kohta, see ise väga kasulik "
-"ei ole.\n"
-"See võimaldab muuta kõigest tervitusteksti."
+#: extensions/drive-menu/extension.js:143
+msgid "Open Files"
+msgstr "Failide avamine"
 
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Rohkem pinda akende jaoks"
 
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -152,9 +101,11 @@ msgstr ""
 "ja paigutatakse aknad üksteisele lähemale. See säte kehtib ainult koos "
 "akende loomuliku paigutusega."
 
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "Akende pealkirjad on üleval"
 
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -164,99 +115,229 @@ msgstr ""
 "Shelli vaikimisi viisi, alla asetamist. Selle sätte muutmine mõjub alles "
 "pärast Shelli taaskäivitust."
 
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:83
 msgid "Places"
 msgstr "Asukohad"
 
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "\"%s\" käivitamine nurjus"
+msgid "Failed to mount volume for “%s”"
+msgstr ""
 
+#: extensions/places-menu/placeDisplay.js:72
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "„%s“ käivitamine nurjus"
+
+#: extensions/places-menu/placeDisplay.js:133
+#: extensions/places-menu/placeDisplay.js:156
 msgid "Computer"
 msgstr "Arvuti"
 
+#: extensions/places-menu/placeDisplay.js:343
 msgid "Home"
 msgstr "Kodu"
 
+#: extensions/places-menu/placeDisplay.js:387
 msgid "Browse Network"
 msgstr "Võrgu sirvimine"
 
-msgid "CPU"
-msgstr "Protsessor"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+msgid "Cycle Screenshot Sizes"
+msgstr ""
 
-msgid "Memory"
-msgstr "Mälu"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr ""
 
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Kujunduse nimi"
 
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Kujunduse nimi, mis laaditakse asukohast ~/.themes/name/gnome-shell"
 
+#: extensions/window-list/extension.js:100
 msgid "Close"
 msgstr "Sulge"
 
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Taasta"
 
+#: extensions/window-list/extension.js:120
 msgid "Minimize"
 msgstr "Minimeeri"
 
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Taasta suurus"
 
+#: extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "Maksimeeri"
 
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Minimeeri kõik"
 
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "Taasta kõik"
 
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Maksimeeri kõik"
 
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "Taasta kõigi suurus"
 
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Sulge kõik"
 
+#: extensions/window-list/extension.js:655
+#: extensions/workspace-indicator/extension.js:21
 msgid "Workspace Indicator"
 msgstr "Tööala näitaja"
 
+#: extensions/window-list/extension.js:836
 msgid "Window List"
 msgstr "Akende loend"
 
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Millal aknaid grupeeritakse"
 
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are “never”, “auto” and “always”."
 msgstr ""
 "Määrab, millal akende loendis sama rakenduse aknaid grupeeritakse. "
-"Võimalikud väärtused on \"never\" (mitte kunagi), \"auto\" (automaatselt) ja "
-"\"always\" (alati)."
+"Võimalikud väärtused on „never“ (mitte kunagi), „auto“ (automaatselt) ja "
+"„always“ (alati)."
 
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+msgid "Show the window list on all monitors"
+msgstr ""
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Akende grupeerimine"
 
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Aknaid ei grupeerita kunagi"
 
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Aknaid grupeeritakse, kui ruumi on vähe"
 
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Aknaid grupeeritakse alati"
 
+#: extensions/window-list/prefs.js:75
+msgid "Show on all monitors"
+msgstr ""
+
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Tööalade nimed"
 
+#: extensions/workspace-indicator/prefs.js:151
 msgid "Name"
 msgstr "Nimi"
 
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Tööala %d"
+
+#~ msgid "GNOME Shell Classic"
+#~ msgstr "GNOME klassikaline kest"
+
+#~ msgid "Window management and application launching"
+#~ msgstr "Akende haldus ja rakenduste käivitamine"
+
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Modaalsed dialoogid on vanemakna küljes"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "See võti on tähtsam võtmest org.gnome.mutter GNOME Shelli käivitamisel."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Nuppude järjestus tiitliribal"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "See võti on tähtsam võtmest org.gnome.desktop.wm.preferences GNOME Shelli "
+#~ "käivitamisel."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr ""
+#~ "Akna automaatpaigutus on lubatud, kui aken lohistatakse ekraani serva"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Tööalad on ainult peamisel ekraanil"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr "Hiire all asuv aken saab fookuse alles hiire peatumisel"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "Ainult pisipilt"
+
+#~ msgid "Application icon only"
+#~ msgstr "Ainult rakenduse ikoon"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "Pisipilt ja rakenduse ikoon"
+
+#~ msgid "Present windows as"
+#~ msgstr "Aknaid esitletakse kui"
+
+#~ msgid "Show only windows in the current workspace"
+#~ msgstr "Näidatakse ainult käesoleva tööala aknaid"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Tere, maailm!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "Alternatiivne tervitustekst."
+
+#~ msgid ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+#~ msgstr "Kui see pole tühi, näidatakse seda teksti paneelile klõpsates."
+
+#~ msgid "Message"
+#~ msgstr "Sõnum"
+
+#~ msgid ""
+#~ "Example aims to show how to build well behaved extensions for the Shell "
+#~ "and as such it has little functionality on its own.\n"
+#~ "Nevertheless it's possible to customize the greeting message."
+#~ msgstr ""
+#~ "Näide hästi käituva Shelli laienduse koostamise kohta, see ise väga "
+#~ "kasulik ei ole.\n"
+#~ "See võimaldab muuta kõigest tervitusteksti."
+
+#~ msgid "CPU"
+#~ msgstr "Protsessor"
+
+#~ msgid "Memory"
+#~ msgstr "Mälu"

po/mjw.po

@@ -0,0 +1,249 @@
+# Karbi (India) translation for gnome-shell-extensions.
+# Copyright (C) 2019 gnome-shell-extensions's Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnome-shell-extensions package.
+# Jor Teron <jor.teron@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-shell-extensions master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2019-07-14 04:31+0000\n"
+"PO-Revision-Date: 2019-07-16 08:19+0530\n"
+"Last-Translator: Jor Teron <jor.teron@gmail.com>\n"
+"Language-Team: Karbi <mjw@li.org>\n"
+"Language: mjw\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: gedit 3.28.1\n"
+
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+msgid "GNOME Classic"
+msgstr "GNOME Classic"
+
+#: data/gnome-classic.desktop.in:4
+msgid "This session logs you into GNOME Classic"
+msgstr ""
+
+#: extensions/apps-menu/extension.js:111
+msgid "Favorites"
+msgstr ""
+
+#: extensions/apps-menu/extension.js:366
+msgid "Applications"
+msgstr ""
+
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+msgid "Application and workspace list"
+msgstr ""
+
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+msgid ""
+"A list of strings, each containing an application id (desktop file name), "
+"followed by a colon and the workspace number"
+msgstr ""
+
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr ""
+
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr ""
+
+#: extensions/auto-move-windows/prefs.js:89
+msgid "Add Rule"
+msgstr ""
+
+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr ""
+
+#: extensions/auto-move-windows/prefs.js:117
+msgid "Add"
+msgstr ""
+
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:102
+#: extensions/places-menu/placeDisplay.js:232
+#, javascript-format
+msgid "Ejecting drive “%s” failed:"
+msgstr ""
+
+#: extensions/drive-menu/extension.js:118
+msgid "Removable devices"
+msgstr ""
+
+#: extensions/drive-menu/extension.js:145
+msgid "Open Files"
+msgstr "Files kangpu"
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+msgid "Use more screen for windows"
+msgstr ""
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+msgid "Place window captions on top"
+msgstr ""
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+msgid ""
+"If true, place window captions on top the respective thumbnail, overriding "
+"shell default of placing it at the bottom. Changing this setting requires "
+"restarting the shell to have any effect."
+msgstr ""
+
+#: extensions/places-menu/extension.js:80
+#: extensions/places-menu/extension.js:84
+msgid "Places"
+msgstr "Places"
+
+#: extensions/places-menu/placeDisplay.js:46
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "“%s” ingpu un-eh"
+
+#: extensions/places-menu/placeDisplay.js:61
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr ""
+
+#: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
+msgid "Computer"
+msgstr "Computer"
+
+#: extensions/places-menu/placeDisplay.js:358
+msgid "Home"
+msgstr "Home"
+
+#: extensions/places-menu/placeDisplay.js:403
+msgid "Browse Network"
+msgstr ""
+
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+msgid "Cycle Screenshot Sizes"
+msgstr ""
+
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr ""
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+msgid "Theme name"
+msgstr "Theme amen"
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
+msgstr "Theme amem, kewan ji pen ~/.themes/name/gnome-shell"
+
+#: extensions/window-list/extension.js:99
+msgid "Close"
+msgstr "Kanghap"
+
+#: extensions/window-list/extension.js:119
+msgid "Unminimize"
+msgstr "Pabi-thuthe"
+
+#: extensions/window-list/extension.js:119
+msgid "Minimize"
+msgstr "Pabi"
+
+#: extensions/window-list/extension.js:126
+msgid "Unmaximize"
+msgstr "Pathe-thuthe"
+
+#: extensions/window-list/extension.js:126
+msgid "Maximize"
+msgstr "Pathe"
+
+#: extensions/window-list/extension.js:399
+msgid "Minimize all"
+msgstr "Kado-kawe pabi"
+
+#: extensions/window-list/extension.js:405
+msgid "Unminimize all"
+msgstr "Kado-kawe pabi-thuthe"
+
+#: extensions/window-list/extension.js:411
+msgid "Maximize all"
+msgstr "Kathe-kawe pathe"
+
+#: extensions/window-list/extension.js:419
+msgid "Unmaximize all"
+msgstr "Kado-kawe pathe-thuthe"
+
+#: extensions/window-list/extension.js:427
+msgid "Close all"
+msgstr "Kado-kawe kanghap"
+
+#: extensions/window-list/extension.js:642
+#: extensions/workspace-indicator/extension.js:20
+msgid "Workspace Indicator"
+msgstr ""
+
+#: extensions/window-list/extension.js:829
+msgid "Window List"
+msgstr ""
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+msgid "When to group windows"
+msgstr "Mentu hutsi windows muluk nangji"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+msgid ""
+"Decides when to group windows from the same application on the window list. "
+"Possible values are “never”, “auto” and “always”."
+msgstr ""
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+msgid "Show the window list on all monitors"
+msgstr ""
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+
+#: extensions/window-list/prefs.js:25
+msgid "Window Grouping"
+msgstr "Window muluk"
+
+#: extensions/window-list/prefs.js:47
+msgid "Never group windows"
+msgstr "Windows muluk ri"
+
+#: extensions/window-list/prefs.js:48
+msgid "Group windows when space is limited"
+msgstr "Adim bihek te windows muluk noi"
+
+#: extensions/window-list/prefs.js:49
+msgid "Always group windows"
+msgstr "Windows muluk vek nangji"
+
+#: extensions/window-list/prefs.js:75
+msgid "Show on all monitors"
+msgstr ""
+
+#: extensions/workspace-indicator/prefs.js:131
+msgid "Workspace Names"
+msgstr "Workspace amen hai"
+
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Amen"
+
+#: extensions/workspace-indicator/prefs.js:191
+#, javascript-format
+msgid "Workspace %d"
+msgstr "Workspace amen %d"

po/tg.po

@@ -1,356 +1,303 @@
 # Tajik translation for gnome-shell-extensions.
 # Copyright (C) 2013 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Victor Ibragimov <victor.ibragimov@gmail.com>, 2013, 2014, 2015
+# Victor Ibragimov <victor.ibragimov@gmail.com>, 2013, 2014, 2015, 2019
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-03-09 20:46+0000\n"
-"PO-Revision-Date: 2015-03-10 11:25+0500\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues\n"
+"POT-Creation-Date: 2019-03-02 10:57+0000\n"
+"PO-Revision-Date: 2019-03-06 19:50+0500\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: Tajik <tg@li.org>\n"
 "Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 2.2.1\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME-и классикӣ"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Ин ҷаласа шуморо ба GNOME-и классикӣ ворид мекунад"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Замима кардани равзанаи гуфтугӯи модалӣ ба равзанаи асосӣ"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Ҳангоми иҷрокунии GNOME Shell ин калид калидеро дар org.gnome.mutter "
-"ҷойгузин мекунад."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Мураттабсозии тугмаҳо дар навори унвон"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-#| msgid ""
-#| "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Ин тугма тугмаро дар хусусиятҳои org.gnome.desktop.wm.preferences ҳангоми "
-"иҷрокунии восити GNOME лағв мекунад."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Фаъол кардани лавҳаҳои канорӣ ҳангоми интиқолдиҳии равзанаҳо ба канорҳои "
-"экран"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Фазоҳои корӣ танҳо дар монитори асосӣ"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Ҳангоми истифодаи муш таъхири фокус тағйир меёбад, то он вақте ки курсор "
-"намеистад"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Танҳо тасвирҳои пешнамоишӣ"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Танҳо нишонаи барнома"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Тасвирҳои пешнамоишӣ ва нишонаҳои барномаҳо"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Намоиш додани равзанаҳо ҳамчун"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Намоиш додани равзанаҳо танҳо дар фазои кории ҷорӣ"
-
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:29
 msgid "Activities Overview"
 msgstr "Хулосаи фаъолият"
 
-#: ../extensions/apps-menu/extension.js:110
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Баргузидаҳо"
 
-#: ../extensions/apps-menu/extension.js:279
+#: extensions/apps-menu/extension.js:407
 msgid "Applications"
 msgstr "Барномаҳо"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "Рӯйхати барномаҳо ва фазоҳои корӣ"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Рӯйхати сатрҳое, ки рақами мушаххаси барномаҳоро дар бар мегиранд (номҳои "
-"файлҳои мизи корӣ) ва бо ду нуқта ва рақами фазо ҷудо мешаванд"
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+msgid "A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number"
+msgstr "Рӯйхати сатрҳое, ки рақами мушаххаси барномаҳоро дар бар мегиранд (номҳои файлҳои мизи корӣ) ва бо ду нуқта ва рақами фазо ҷудо мешаванд"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Барнома"
 
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:71 extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Фазои корӣ"
 
-#: ../extensions/auto-move-windows/prefs.js:85
-#| msgid "Add rule"
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Илова кардани қоида"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Эҷод кардани қоидаи мувофиқати нав"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Илова кардан"
 
-#: ../extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:100 extensions/places-menu/placeDisplay.js:217
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
+#| msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
 msgstr "Баровардани диски '%s' қатъ шудааст:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:116
 msgid "Removable devices"
 msgstr "Дастгоҳҳои ҷудошаванда"
 
-#: ../extensions/drive-menu/extension.js:151
-msgid "Open File"
+#: extensions/drive-menu/extension.js:143
+#| msgid "Open File"
+msgid "Open Files"
 msgstr "Кушодани файл"
 
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Салом, ҷаҳон!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "Матни табрики иловагӣ."
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Агар холӣ набошад, матнро дар бар мегирад, ки ҳангоми зеркунӣ ба панел "
-"намоиш дода мешавад."
-
-#: ../extensions/example/prefs.js:30
-#| msgid "Message:"
-msgid "Message"
-msgstr "Паём"
-
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"Ин мисол намоиш медиҳад, ки чӣ тавр пасвандҳои танзимшуда барои Восит бояд "
-"таҳия карда шаванд, зеро ки худи онҳо фунскияҳои кам доранд.\n"
-"Бо вуҷуди ин, фармоишдиҳии паёми табрик имконпазир аст."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Истифодаи экрани бештар барои равзанаҳо"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+msgid "Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating them further to reduce the bounding box. This setting applies only with the natural placement strategy."
 msgstr ""
-"Кӯшиш кунед, ки экрани бештарро бо мувофиқсозии таносуби экран ва "
-"маҳдудкунии сарҳадҳои қуттиҳо барои ҷойгиркунии тасвирҳои пешнамоишии "
-"равзана истифода баред. Ин танзимот танҳо барои стратегияи ҷойгиркунии асил "
-"мувофиқ мебошад."
+"Кӯшиш кунед, ки экрани бештарро бо мувофиқсозии таносуби экран ва маҳдудкунии сарҳадҳои қуттиҳо барои ҷойгиркунии тасвирҳои пешнамоишии равзана истифода баред. Ин танзимот танҳо барои стратегияи ҷойгиркунии асил мувофиқ мебошад."
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "Ҷойгир кардани зернависҳои равзана ба боло"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+msgid "If true, place window captions on top the respective thumbnail, overriding shell default of placing it at the bottom. Changing this setting requires restarting the shell to have any effect."
 msgstr ""
-"Агар қимати \"true\" бошад, зернависҳои равзанаро ба болои тасвири "
-"пешнамоишии мувофиқ, бо ҷойгузинкунии навбати восити пешфарз ба поён, ҷойгир "
-"мекунад. Барои татбиқ кардани таъсири ин танзимот шумо бояд воситро бозоғозӣ "
-"кунед."
+"Агар қимати \"true\" бошад, зернависҳои равзанаро ба болои тасвири пешнамоишии мувофиқ, бо ҷойгузинкунии навбати восити пешфарз ба поён, ҷойгир мекунад. Барои татбиқ кардани таъсири ин танзимот шумо бояд воситро бозоғозӣ кунед."
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79 extensions/places-menu/extension.js:83
 msgid "Places"
 msgstr "Ҷойҳо"
 
-#: ../extensions/places-menu/placeDisplay.js:57
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "Оғоз бахшидани \"%s\" қатъ шудааст"
+msgid "Failed to mount volume for “%s”"
+msgstr "Васлкунии ҳаҷми диск барои “%s” иҷро нашуд"
 
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:72
+#, javascript-format
+#| msgid "Failed to launch \"%s\""
+msgid "Failed to launch “%s”"
+msgstr "Оғози “%s” қатъ шуд"
+
+#: extensions/places-menu/placeDisplay.js:133 extensions/places-menu/placeDisplay.js:156
 msgid "Computer"
 msgstr "Компютер"
 
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:343
 msgid "Home"
 msgstr "Асосӣ"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:387
 msgid "Browse Network"
 msgstr "Тамошо кардани шабака"
 
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "Андозаҳои скриншоти ҳалқа"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+#| msgid "Cycle Screenshot Sizes"
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "Андозаҳои скриншоти ҳалқа"
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Номи мавзӯъ"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Номи мавзӯъ аз ~/.themes/name/gnome-shell боргирӣ мешавад"
 
-#: ../extensions/window-list/extension.js:109
+#: extensions/window-list/extension.js:100
 msgid "Close"
 msgstr "Пӯшидан"
 
-#: ../extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Бекор кардани ҳадди ақал"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:120
 msgid "Minimize"
 msgstr "Ҳадди ақал сохтан"
 
-#: ../extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Бекор кардани ҳадди аксар"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "Ҳадди аксар сохтан"
 
-#: ../extensions/window-list/extension.js:399
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Ҳамаро бо ҳадди ақал сохтан"
 
-#: ../extensions/window-list/extension.js:407
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "Бекор кардани ҳадди ақал барои ҳама"
 
-#: ../extensions/window-list/extension.js:415
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Ҳамаро бо ҳадди аксар сохтан"
 
-#: ../extensions/window-list/extension.js:424
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "Бекор кардани ҳадди аксар барои ҳама"
 
-#: ../extensions/window-list/extension.js:433
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Ҳамаро пӯшонидан"
 
-#: ../extensions/window-list/extension.js:650
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:655 extensions/workspace-indicator/extension.js:21
 msgid "Workspace Indicator"
 msgstr "Нишондиҳандаи фазои кор"
 
-#: ../extensions/window-list/extension.js:807
+#: extensions/window-list/extension.js:836
 msgid "Window List"
 msgstr "Рӯйхати равзанаҳо"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Шартҳои гурӯҳбандии равзанаҳо"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"Қарор медиҳад, ки дар кадом ҳолат равзанаҳо аз худи барномаҳо дар рӯйхати "
-"равзанаҳо гурӯҳбандӣ мешаванд. Қиматҳои имконпазир: \"ҳеҷ гоҳ\", \"ба таври "
-"худкор\" ва \"ҳамеша\"."
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#| msgid "Decides when to group windows from the same application on the window list. Possible values are \"never\", \"auto\" and \"always\"."
+msgid "Decides when to group windows from the same application on the window list. Possible values are “never”, “auto” and “always”."
+msgstr "Қарор медиҳад, ки дар кадом ҳолат равзанаҳо аз худи барномаҳо дар рӯйхати равзанаҳо гурӯҳбандӣ мешаванд. Қиматҳои имконпазир: \"ҳеҷ гоҳ\", \"ба таври худкор\" ва \"ҳамеша\"."
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
 msgstr "Намоиш додани рӯйхати равзанаҳо дар ҳамаи мониторҳо"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Намоиш додани рӯйхати равзанаҳо дар ҳамаи мониторҳои пайвастшуда ё намоиш "
-"додани танҳо дар монитори асосӣ."
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid "Whether to show the window list on all connected monitors or only on the primary one."
+msgstr "Намоиш додани рӯйхати равзанаҳо дар ҳамаи мониторҳои пайвастшуда ё намоиш додани танҳо дар монитори асосӣ."
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Гурӯҳбандии равзанаҳо"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Ҳеҷ гоҳ равзанаҳоро гурӯҳбандӣ накардан"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Гурӯҳбандии равзанаҳо барои фазои маҳдудшуда"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Ҳамеша равзанаҳоро гурӯҳбандӣ кардан"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Намоиш додан дар ҳамаи мониторҳо"
 
-#: ../extensions/workspace-indicator/prefs.js:141
-#| msgid "Workspace names:"
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Номҳои фазоҳои корӣ"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:151
 msgid "Name"
 msgstr "Ном"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Фазои кории %d"
 
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Замима кардани равзанаи гуфтугӯи модалӣ ба равзанаи асосӣ"
+
+#~ msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr "Ҳангоми иҷрокунии GNOME Shell ин калид калидеро дар org.gnome.mutter ҷойгузин мекунад."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Мураттабсозии тугмаҳо дар навори унвон"
+
+#~| msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgid "This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell."
+#~ msgstr "Ин тугма тугмаро дар хусусиятҳои org.gnome.desktop.wm.preferences ҳангоми иҷрокунии восити GNOME лағв мекунад."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr "Фаъол кардани лавҳаҳои канорӣ ҳангоми интиқолдиҳии равзанаҳо ба канорҳои экран"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Фазоҳои корӣ танҳо дар монитори асосӣ"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr "Ҳангоми истифодаи муш таъхири фокус тағйир меёбад, то он вақте ки курсор намеистад"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "Танҳо тасвирҳои пешнамоишӣ"
+
+#~ msgid "Application icon only"
+#~ msgstr "Танҳо нишонаи барнома"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "Тасвирҳои пешнамоишӣ ва нишонаҳои барномаҳо"
+
+#~ msgid "Present windows as"
+#~ msgstr "Намоиш додани равзанаҳо ҳамчун"
+
+#~ msgid "Show only windows in the current workspace"
+#~ msgstr "Намоиш додани равзанаҳо танҳо дар фазои кории ҷорӣ"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Салом, ҷаҳон!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "Матни табрики иловагӣ."
+
+#~ msgid "If not empty, it contains the text that will be shown when clicking on the panel."
+#~ msgstr "Агар холӣ набошад, матнро дар бар мегирад, ки ҳангоми зеркунӣ ба панел намоиш дода мешавад."
+
+#~| msgid "Message:"
+#~ msgid "Message"
+#~ msgstr "Паём"
+
+#~ msgid ""
+#~ "Example aims to show how to build well behaved extensions for the Shell and as such it has little functionality on its own.\n"
+#~ "Nevertheless it's possible to customize the greeting message."
+#~ msgstr ""
+#~ "Ин мисол намоиш медиҳад, ки чӣ тавр пасвандҳои танзимшуда барои Восит бояд таҳия карда шаванд, зеро ки худи онҳо фунскияҳои кам доранд.\n"
+#~ "Бо вуҷуди ин, фармоишдиҳии паёми табрик имконпазир аст."
+
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "Восити GNOME-и классикӣ"