Upload to experimental

Update to upstream version '42~beta'
with Debian dir 7f35debfa0

.gitlab-ci.yml

@@ -0,0 +1,177 @@
+include:
+  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
+  - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml"
+
+image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/34:2021-08-12.0
+
+stages:
+  - pre_review
+  - prepare
+  - review
+  - build
+  - deploy
+
+default:
+  # Cancel jobs if newer commits are pushed to the branch
+  interruptible: true
+  # Auto-retry jobs in case of infra failures
+  retry:
+    max: 1
+    when:
+      - 'runner_system_failure'
+      - 'stuck_or_timeout_failure'
+      - 'scheduler_failure'
+      - 'api_failure'
+
+variables:
+  FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions
+  LINT_LOG: "eslint-report.xml"
+  JS_LOG: "js-report.txt"
+
+workflow:
+  rules:
+    - if: '$CI_MERGE_REQUEST_IID'
+    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH'
+
+.pipeline_guard: &pipeline_guard
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
+    - when: 'manual'
+
+.gnome-shell-extensions.fedora:34:
+  variables:
+    FDO_DISTRIBUTION_VERSION: 34
+    FDO_DISTRIBUTION_TAG: '2021-08-31.0'
+    FDO_DISTRIBUTION_PACKAGES: >
+      meson git gettext sassc
+
+.prereview_req: &prereview_req
+  needs:
+    - check_commit_log
+    - check-merge-request
+
+check_commit_log:
+  extends:
+    - .fdo.ci-fairy
+  stage: pre_review
+  script:
+    - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
+      then
+        ci-fairy check-commits --junit-xml=commit-message-junit-report.xml ;
+      else
+        echo "Not a merge request" ;
+      fi
+  <<: *pipeline_guard
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - commit-message-junit-report.xml
+    reports:
+      junit: commit-message-junit-report.xml
+
+check-merge-request:
+  extends:
+    - .fdo.ci-fairy
+  stage: pre_review
+  script:
+    - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
+      then
+        ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request-report.xml ;
+      else
+        echo "Not a merge request" ;
+      fi
+  <<: *pipeline_guard
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - check-merge-request-report.xml
+    reports:
+      junit: check-merge-request-report.xml
+
+build-fedora-container:
+  extends:
+    - .fdo.container-build@fedora@x86_64
+    - .gnome-shell-extensions.fedora:34
+  stage: prepare
+  <<: *prereview_req
+
+js_check:
+  stage: review
+  <<: *prereview_req
+  script:
+    - find extensions -name '*.js' -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG
+    - (! grep -q . $JS_LOG)
+  artifacts:
+    paths:
+      - ${JS_LOG}
+    when: on_failure
+
+eslint:
+  stage: review
+  <<: *prereview_req
+  script:
+    - eslint -o $LINT_LOG -f junit --resolve-plugins-relative-to $(npm root -g) extensions
+  artifacts:
+    paths:
+      - ${LINT_LOG}
+    reports:
+      junit: ${LINT_LOG}
+
+build-bundles:
+  stage: build
+  <<: *prereview_req
+  script:
+    - ./export-zips.sh
+  artifacts:
+    name: 'Extension bundles'
+    expose_as: 'Get Extension bundles here'
+    paths:
+      - zip-files/
+
+fedora-build:
+  extends:
+    - .fdo.distribution-image@fedora
+    - .gnome-shell-extensions.fedora:34
+  stage: build
+  needs:
+    - build-fedora-container
+  before_script:
+    - git submodule update --init
+  script:
+    - meson setup build --werror -Dextension_set=all -Dclassic_mode=true
+    - meson compile -C build
+    - meson test -C build
+    - meson install -C build
+  artifacts:
+    paths:
+      - build
+
+fedora-dist:
+  extends:
+    - .fdo.distribution-image@fedora
+    - .gnome-shell-extensions.fedora:34
+  stage: deploy
+  needs:
+    - fedora-build
+  before_script:
+    - git submodule update --init
+  script:
+    - meson dist -C build
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes:
+        - "**/meson.build"
+        - meson/*
+
+fedora-dist-tarball:
+  extends: fedora-dist
+  artifacts:
+    expose_as: 'Get tarball here'
+    paths:
+      - build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz
+  rules:
+    - if: '$CI_COMMIT_TAG'

.gitlab-ci/commit-rules.yml

@@ -0,0 +1,13 @@
+patterns:
+  deny:
+    - regex: '^$CI_MERGE_REQUEST_PROJECT_URL/(-/)?merge_requests/$CI_MERGE_REQUEST_IID$'
+      message: Commit message must not contain a link to its own merge request
+    - regex: '^extensions/'
+      message: Commit message subject should not be prefixed with 'extensions/', use the extension name instead
+      where: subject
+    - regex: '^[^:]+: [a-z]'
+      message: "Commit message subject should be properly Capitalized. E.g.  'window: Marginalize extradicity'"
+      where: subject
+    - regex: '^\S*\.js:'
+      message: Commit message subject prefix should not include .js
+      where: subject

HACKING.md

@@ -28,4 +28,4 @@ imports (like imports.lang or imports.dbus) and introspection,
 the other for Shell API. Within the same group, put everything
 in alphabetic order.
 
-[coding-style]: https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Style_Guide.md
+[coding-style]: https://gitlab.gnome.org/GNOME/gjs/blob/HEAD/doc/Style_Guide.md

NEWS

@@ -1,17 +1,231 @@
-3.36.2
+42.beta
-======
+=======
-* Misc. bug fixes and cleanups [Florian, Xiaoguang; !113, !106]
+* workspace-indicator: Fix cancelling editing with Esc [Florian; !208]
+* window-list: Update window tracking to avoid missing icons [Florian; !207]
+* Use libadwaita for preferences [Florian; !209, !213]
+* Adapt to Clutter grab API changes [Florian; !212]
+* Misc. bug fixes and cleanups [Jan, Florian; !210, !214]
 
 Contributors:
-  Florian Müllner, Xiaoguang Wang
+  Jan Beich, Florian Müllner, Naala Nanba
 
 Translators:
-  Yosef Or Boczko [he], Kristjan SCHMIDT [eo]
+  Boyuan Yang [zh_CN], Matej Urbančič [sl], Naala Nanba [ab],
-3.36.1
+  Alexander Shopov [bg], Emin Tufan Çetin [tr]
+
+42.alpha
+========
+* native-window-placement: Fix distorted layout in app grid [Sebastian; !189]
+* window-list: Fix on-screen keyboard [Florian; !199]
+* Misc. bug fixes and cleanups [Neal; Just; !195, !197]
+
+Contributors:
+  Piotr Drąg, Neal Gompa, Sebastian Keller, Florian Müllner, Just Perfection
+
+Translators:
+  Goran Vidović [hr], Sveinn í Felli [is], Yuri Chornoivan [uk],
+  Fabio Tomat [fur], Quentin PAGÈS [oc], Hugo Carvalho [pt],
+  Yaron Shahrabani [he], Jordi Mas i Hernandez [ca], MohammadSaleh Kamyab [fa],
+  Fran Dieguez [gl], Daniel Mustieles [es], Aleksandr Melman [ru],
+  Aurimas Černius [lt], Asier Sarasua Garmendia [eu], Kukuh Syafaat [id],
+  Rafael Fontenelle [pt_BR]
+
+41.0
+====
+* Bump version
+
+41.rc.1
+=======
+* Fix pre-generating stylesheets in tarball [Florian; !190]
+
+Contributors:
+  Florian Müllner
+
+41.rc
+=====
+* window-list: Adapt to overview-on-startup [Florian; !185]
+* apps-menu: Use a custom 'toggle-menu' shortcut [Florian; !173]
+* Misc. bug fixes and cleanups [Florian; !186]
+
+Contributors:
+  Florian Müllner
+
+41.beta
+=======
+* window-list: Extend reactive area of minimap to screen edges [Adam; !171]
+* drive-menu: Improve detection of network mounts [Florian; !27, !176]
+* Use distinct gettext domain for e.g.o uploads [Florian; #335]
+* Misc. bug fixes and cleanups [Florian; !172, !174, !177, !167, !178, !180,
+  !181, !182, !183]
+
+Contributors:
+  Marco Trevisan (Treviño), Adam Goode, Florian Müllner
+
+Translators:
+  Hugo Carvalho [pt], Juliano de Souza Camargo [pt], Alexander Shopov [bg]
+
+40.1
+====
+* Disable welcome dialog in classic session [Florian; !169]
+* windowsNavigator: Adjust to a late gnome-shell change [Florian; !170]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Ngọc Quân Trần [vi], Anders Jonsson [sv], Carmen Bianca BAKKER [eo],
+  Pawan Chitrakar [ne], Quentin PAGÈS [oc]
+
+40.0
+====
+
+Translators:
+  Jiri Grönroos [fi]
+
+40.rc
+=====
+* native-window-placement: Adjust to gnome-shell changes [Florian; !164]
+* windows-navigator: Adjust to gnome-shell changes [Florian; !163]
+* window-list, workspace-indicator: Only show previews for up to six workspaces
+  [Florian; !165]
+* window-list, workspace-indicator: Improve workspace preview appearance
+  [Florian; !166]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Fran Dieguez [gl]
+
+40.beta
+=======
+* Add tooltips to workspace thumbnails [Florian; !155]
+* Drop arrows from top bar menus [Florian; !156]
+* drive-menu: Mark mounts that can be unmounted as removable [Michael; !152]
+* Remove horizontal-workspaces extension [Florian; !158]
+* Adjust to shell overview changes [Florian; !159, !160]
+* Fix crashes [Daniel; !157]
+* Misc. bug fixes and cleanups [Florian; !154, !161]
+
+Contributors:
+  Michael Lawton, Florian Müllner, Daniel van Vugt
+
+Translators:
+  Аляксей [be], A S Alam [pa]
+
+40.alpha.1
+==========
+* Don't depend on sassc when building from tarball [Florian; !150]
+* Port extensions preferences to GTK4 [Florian; !148]
+* Misc. bug fixes and cleanups [Florian, Jonas; !149, !151, !153]
+
+Contributors:
+  Jonas Dreßler, Florian Müllner
+
+40.alpha
+========
+* window-list: Honor changes in skip-taskbar property [Sergio; !130]
+* window-list, workspace-indicator: Adjust to 3.38 changes [Florian; !133]
+* window-list, workspace-indicator: Improve previews in workspace thumbs
+  [Florian; #260, !142]
+* auto-move: Improve behavior on multi-monitor setups [Florian; !135]
+* windowNavigator: Adjust to 3.38 changes [Thun; #259]
+* Misc. bug fixes and cleanups [Florian, Jonas Å, Jordan, Ray; !131, !136,
+  !137, !140, !141, !144, !146, !145]
+
+Contributors:
+  Sergio Costas, Florian Müllner, Jordan Petridis, Thun Pin, Ray Strode,
+  Jonas Ådahl
+
+Translators:
+  Fabio Tomat [fur], Jordi Mas [ca]
+
+3.38.1
+======
+
+Contributors:
+  Yacine Bouklif, Florian Müllner
+
+Translators:
+  Yacine Bouklif [kab], Cheng-Chia Tseng [zh_TW], Stas Solovey [ru],
+  Yosef Or Boczko [he]
+
+3.38.0
 ======
 
 Translators:
-  Daniel Korostil [uk]
+  Balázs Meskó [hu], Alan Mortensen [da], Juliano Camargo [pt], Tim Sabsch [de],
+  Milo Casagrande [it], Rūdolfs Mazurs [lv]
+
+3.37.92
+=======
+
+Translators:
+  Nathan Follens [nl], Zander Brown [en_GB], Aurimas Černius [lt],
+  Marek Černocký [cs], Changwoo Ryu [ko], Dušan Kazik [sk]
+
+3.37.91
+=======
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Fran Dieguez [gl], Akarshan Biswas [bn_IN], Kukuh Syafaat [id],
+  Piotr Drąg [pl], Rafael Fontenelle [pt_BR], Jiri Grönroos [fi],
+  Марко Костић [sr], Goran Vidović [hr]
+
+3.37.90
+=======
+* Misc. bug fixes and cleanups [Florian, Piotr; !126, !128]
+
+Contributors:
+  Piotr Drąg, Florian Müllner
+
+Translators:
+  Fabio Tomat [fur], Efstathios Iosifidis [el], Anders Jonsson [sv],
+  Asier Sarasua Garmendia [eu], Alexandre Franke [fr]
+
+3.37.3
+======
+* window-list, native-window-placement: Adjust to shell changes [Florian; !124]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Jordi Mas [ca], sicklylife [ja], Boyuan Yang [zh_CN],
+  Baurzhan Muftakhidinov [kk]
+
+3.37.2
+======
+* window-list, auto-move: Modernize preference dialogs [Florian; !121]
+* Adjust to gnome-shell changes [Florian; !122]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Cheng-Chia Tseng [zh_TW], Yuri Chornoivan [uk], Daniel Mustieles [es],
+  Emin Tufan Çetin [tr], Danial Behzadi [fa], Daniel Șerbănescu [ro],
+  Matej Urbančič [sl]
+
+3.37.1
+======
+* drive-menu: Emphasize eject buttons [Florian; #223]
+* user-theme: Add preference dialog [Florian; !117]
+* window-list: Fix inconsistent state in preference dialog [Milan; !119]
+* workspace-indicator: Overhaul preference dialog [Florian; !120]
+* user-theme: Support session mode styles [Florian; !118]
+* Misc. bug fixes and cleanups [Florian, Xiaoguang; !113, !106, !114, !116]
+
+Contributors:
+  Milan Crha, Florian Müllner, Xiaoguang Wang
+
+Translators:
+  Daniel Korostil [uk], Yosef Or Boczko [he], Kristjan SCHMIDT [eo],
+  Dz Chen [zh_CN], Danial Behzadi [fa], Yuri Chornoivan [uk],
+  Anders Jonsson [sv], Daniel Mustieles [es]
 
 3.36.0
 ======

README.md

@@ -69,6 +69,19 @@ GSettings key.
 
      Adds a simple workspace switcher to the top bar.
 
+## Default branch
+
+The default development branch is `main`. If you still have a local
+checkout under the old name, use:
+```sh
+git checkout master
+git branch -m master main
+git fetch
+git branch --unset-upstream
+git branch -u origin/master
+git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
+```
+
 ## License
 
 GNOME Shell Extensions are distributed under the terms of the GNU General

data/classic.json.in

@@ -2,6 +2,7 @@
     "parentMode": "user",
     "stylesheetName": "gnome-classic.css",
     "hasOverview": false,
+    "showWelcomeDialog": false,
     "enabledExtensions": [@CLASSIC_EXTENSIONS@],
     "panel": { "left": ["appMenu"],
                "center": [],

data/gnome-classic-wayland.desktop.in

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=GNOME Classic on Wayland
+Comment=This session logs you into GNOME Classic
+Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
+TryExec=gnome-session
+Type=Application
+DesktopNames=GNOME-Classic;GNOME;
+X-GDM-SessionRegisters=true

data/gnome-classic-xorg.desktop.in

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=GNOME Classic on Xorg
+Comment=This session logs you into GNOME Classic
+Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
+TryExec=gnome-session
+Type=Application
+DesktopNames=GNOME-Classic;GNOME;
+X-GDM-SessionRegisters=true

data/gnome-classic.desktop.in

@@ -1,7 +1,8 @@
 [Desktop Entry]
 Name=GNOME Classic
 Comment=This session logs you into GNOME Classic
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
+Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
 TryExec=gnome-session
 Type=Application
 DesktopNames=GNOME-Classic;GNOME;
+X-GDM-SessionRegisters=true

data/gnome-classic.scss

@@ -33,6 +33,18 @@ $variant: 'light';
     font-weight: normal;
     color: $fg_color;
     text-shadow: none;
+    transition-duration: 0ms;
+    border: 0;
+    border-radius: 0px;
+
+    &.clock-display {
+      .clock {
+        transition-duration: 0ms;
+        border: 0;
+        border-radius: 0px;
+      }
+    }
+
     &:hover {
       color: lighten($fg_color,10%);
       text-shadow: none;
@@ -69,12 +81,11 @@ $variant: 'light';
     border-bottom: none;
     .panel-button { color: $osd_fg_color; }
   }
-  .popup-menu-arrow { width: 0; height: 0;  } // shell's display: none;
 }
 
 #appMenu { 
-  padding: 0 8px 0 8px; 
   spinner-image: url("classic-process-working.svg"); 
+  .panel-status-menu-box { padding: 0; }
 }
 .tile-preview-left.on-primary,
 .tile-preview-right.on-primary,

data/gnome-classic.session.desktop.in

@@ -1,3 +0,0 @@
-[GNOME Session]
-Name=GNOME Classic
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;

data/gnome-shell-sass/README.md

@@ -11,6 +11,6 @@ will then be synchronized periodically before releases.
 GNOME Shell Sass is distributed under the terms of the GNU General Public
 License, version 2 or later. See the [COPYING][license] file for details.
 
-[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
+[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/HEAD/data/theme/gnome-shell-sass
 [sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
 [license]: COPYING

data/gnome-shell-sass/_colors.scss

@@ -28,6 +28,7 @@ $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.84);
 
 $shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
+$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

data/gnome-shell-sass/_common.scss

@@ -31,7 +31,7 @@ $base_margin: 4px;
 $base_spacing: 6px;
 
 // border radii
-$base_border_radius: 5px;
+$base_border_radius: 8px;
 
 $modal_radius:$base_border_radius * 2;
 
@@ -76,17 +76,16 @@ stage {
 %osd_panel {
   color: $osd_fg_color;
   background-color: $osd_bg_color;
-  border: 1px solid $osd_outer_borders_color;
+  //border: 1px solid $osd_outer_borders_color;
   border-radius: $base_border_radius * 2 + 4px;
   padding: $base_padding * 2;
 }
 
-// Overview panels 
+// Overview panels
 // for the dash and workspace switcher
 %overview_panel {
   color: $osd_fg_color;
-  background-color: transparentize($osd_bg_color, 0.2);
+  background-color: transparentize($osd_fg_color, 0.9);
-  border: 1px solid $osd_outer_borders_color;
 }
 
 // icon tiles
@@ -130,8 +129,8 @@ stage {
   border-bottom-width: 0;
 
   &:insensitive { @include button(insensitive, $shadow: none); }
-  &:hover { @include button(hover, $shadow: none); }
   &:focus { @include button(focus, $shadow: none); }
+  &:hover { @include button(hover, $shadow: none); }
   &:active { @include button(active, $shadow: none); }
 
   // radius is 2 pixel less to fit in bubble
@@ -143,7 +142,7 @@ stage {
     border-right-width: 0;
     border-radius: 0 0 $modal_radius - 2px 0;
   }
-  
+
   &:first-child:last-child {
     border-radius: 0 0 $modal_radius - 2px $modal_radius - 2px;
   }

data/gnome-shell-sass/_drawing.scss

@@ -46,7 +46,7 @@
     border-color: if($fc==$selected_bg_color,
               $selected_borders_color,
               darken($fc,35%));
-    box-shadow: inset 0 0 0 1px $fc;
+    box-shadow: inset 0 0 0 2px $fc;
   }
   @if $t==hover { }
   @if $t==insensitive {
@@ -79,7 +79,7 @@
 
 @function draw_button_hilight_color($c) {
 //
-// calculate the right top hilight color for buttons
+// calculate the right top highlight color for buttons
 //
 // $c: base color;
 //
@@ -218,7 +218,8 @@
 
   &:drop {
     .overview-icon {
-      background-color: transparentize($selected_bg_color, .15);
+      border: 2px solid $selected_bg_color; //already 2px transparent so no jumping
+      background-color: transparentize($selected_bg_color, .8);
     }
   }
 

data/gnome-shell-sass/_high-contrast-colors.scss

@@ -26,6 +26,7 @@ $osd_borders_color: rgba(0,0,0, 0.7);
 $osd_outer_borders_color: rgba(255,255,255, 0.1);
 
 $shadow_color: rgba(0,0,0, 0.1);
+$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

data/gnome-shell-sass/_widgets.scss

@@ -37,8 +37,8 @@
 @import 'widgets/window-picker';
 @import 'widgets/search-entry';
 @import 'widgets/search-results';
-@import 'widgets/app-grid';
 @import 'widgets/dash';
+@import 'widgets/app-grid';
 @import 'widgets/workspace-thumbnails';
 // A11y / misc
 @import 'widgets/a11y';

data/gnome-shell-sass/widgets/_app-grid.scss

@@ -1,21 +1,19 @@
 /* App Grid */
 
 $app_icon_size: 96px;
-$app_icon_padding: 24px;
 
 // app icons
 .icon-grid {
-  -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2;
+  row-spacing: $base_spacing * 2;
-  -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2;
+  column-spacing: $base_spacing * 2;
-  spacing: $base_spacing * 6;
+  max-row-spacing: $base_spacing * 12;
-
+  max-column-spacing: $base_spacing * 12;
-  .overview-icon {
+  page-padding-top: $base_padding * 4;
-    icon-size: $app_icon_size;
+  page-padding-bottom: $base_padding * 4;
-  }
+  page-padding-left: $base_padding * 2;
+  page-padding-right: $base_padding * 2;
 }
 
-//.app-display { spacing: 20px; }
-
 /* App Icons */
 
 $app_grid_fg_color: #fff;
@@ -36,16 +34,15 @@ $app_grid_fg_color: #fff;
 
 /* App Folders */
 .app-well-app.app-folder {
-  background-color: transparentize($osd_bg_color, 0.8);
+  background-color: $dash_background_color;
   border-radius: $base_border_radius + 4px; // same as %icon_tile
 }
 
 // expanded folder
-.app-folder-dialog {
+.app-folder-dialog { //style like the dash
   border-radius: $modal_radius * 1.5;
-  border: 1px solid $osd_outer_borders_color;
+  background-color: $dash_background_color;
-  spacing: 12px;
+  padding: 12px 0px 12px 0px;
-  background-color: transparentize(darken($osd_bg_color,10%), 0.05);
 
   & .folder-name-container {
     padding: 24px 36px 0;
@@ -54,7 +51,7 @@ $app_grid_fg_color: #fff;
     & .folder-name-label,
     & .folder-name-entry {
       font-size: 18pt;
-      font-weight: bold;
+      font-weight: 800;
     }
 
     & .folder-name-entry { width: 300px }
@@ -73,20 +70,26 @@ $app_grid_fg_color: #fff;
       & > StIcon { icon-size: 16px }
     }
   }
+
+  & .icon-grid {
+    row-spacing: $base_spacing * 2;
+    column-spacing: $base_spacing * 5;
+    page-padding-top: 0;
+    page-padding-bottom: 0;
+    page-padding-left: 0;
+    page-padding-right: 0;
+  }
+
+  & .page-indicators {
+    margin-bottom: 18px;
+  }
 }
 .app-folder-dialog-container {
   padding: 12px;
-  width: 800px;
+  width: 620px;
-  height: 600px;
+  height: 620px;
 }
 
-.app-folder-icon {
-  padding: $base_padding;
-  spacing-rows: $base_spacing;
-  spacing-columns: $base_spacing;
-}
-
-
 // Running app indicator (also shown in dash)
 .app-well-app-running-dot {
   height: 5px;
@@ -105,14 +108,13 @@ $app_grid_fg_color: #fff;
 }
 
 // right-click app menu
-.app-menu,
+.app-menu {
-.app-well-menu {
   max-width: 27.25em;
 }
 
 // App Grid pagination indicators
 .page-indicator {
-  padding: 15px 20px;
+  padding: $base_padding $base_padding * 2 0;
 
   .page-indicator-icon {
     width: 10px;
@@ -122,16 +124,10 @@ $app_grid_fg_color: #fff;
   }
 }
 
-// Some hacks I don't even know
+.apps-scroll-view {
-.all-apps,
+  padding: 0;
-.frequent-apps > StBoxLayout {
-  // horizontal padding to make sure scrollbars or dash don't overlap content
-  padding: 0px 88px 10px 88px;
 }
 
-// Label when no frequent apps
-.no-frequent-applications-label { @extend %status_text; }
-
 // shutdown and other actions in the grid
 .system-action-icon {
   background-color: rgba(0,0,0,0.8);
@@ -140,43 +136,32 @@ $app_grid_fg_color: #fff;
   icon-size: $app_icon_size * 0.5;
 }
 
-/* Frequent | All toggle */
+.page-navigation-hint {
+  width: 300px;
 
-// container
+  &.dnd {
-.app-view-controls { 
+    background: rgba(255, 255, 255, 0.1);
-  padding-bottom: 32px;
-}
-
-// buttons
-.app-view-control {
-  padding: 4px 32px;
-  margin: 0 4px;
-
-  &, &:hover, &:checked {
-    @include button(undecorated);
-    color: darken($osd_fg_color, 25%);
   }
 
-  &:hover {
+  &.next:ltr,
-    color: $osd_fg_color;
+  &.previous:rtl {
-    box-shadow: inset 0 -2px darken($osd_fg_color, 25%);
+    background-gradient-start: rgba(255, 255, 255, 0.05);
+    background-gradient-end: transparent;
+    background-gradient-direction: horizontal;
+    border-radius: 15px 0px 0px 15px;
   }
 
-  &:active {
+  &.previous:ltr,
-    box-shadow: inset 0 -2px $osd_fg_color;
+  &.next:rtl {
-  }
+    background-gradient-start: transparent;
-
+    background-gradient-end: rgba(255, 255, 255, 0.05);
-  &:checked {
+    background-gradient-direction: horizontal;
-    color: $osd_fg_color;
+    border-radius: 0px 15px 15px 0px;
-    box-shadow: inset 0 -2px $selected_bg_color;
-  }
-
-  &:first-child {
-    border-right-width: 0;
-    border-radius: 0;
-  }
-
-  &:last-child {
-    border-radius: 0;
   }
 }
+
+.page-navigation-arrow {
+  margin: 6px;
+  width: 24px;
+  height: 24px;
+}

data/gnome-shell-sass/widgets/_base.scss

@@ -14,5 +14,5 @@
 
 // Dropshadow for large icons
 .icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(black, 0.4);
+  icon-shadow: 0 1px 5px rgba(black, 0.8);
 }

data/gnome-shell-sass/widgets/_calendar.scss

@@ -1,11 +1,11 @@
 /* Date/Time Menu */
 
 .clock-display-box {
-  spacing: $base_spacing / 2;
+  spacing: 2px;
 
   .clock {
-    padding-left: $base_padding;
+    padding-left: $base_padding * 2;
-    padding-right: $base_padding;
+    padding-right: $base_padding * 2;
   }
 }
 
@@ -170,13 +170,38 @@
     height: 1.8em;
     width: 2.3em; 
     border-radius: 2px;
-    padding: 0.5em 0 0;
     margin: 6px;
     background-color: darken($bg_color, 2%);
     color: lighten($fg_color, 5%);
   }
 }
 
+/* Events */
+.events-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .events-box {
+    spacing: $base_spacing;
+  }
+
+  .events-list {
+    spacing: 2 * $base_spacing;
+  }
+
+  .events-title {
+    color: desaturate(darken($fg_color,40%), 10%);
+    font-weight: bold;
+    margin-bottom: $base_margin;
+  }
+
+  .event-time {
+    color: darken($fg_color,20%);
+    font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 1);
+  }
+}
+
 /* World clocks */
 .world-clocks-button {
   @include notification_bubble;
@@ -204,9 +229,11 @@
   .world-clocks-time {
     font-weight: bold;
     color: $fg_color;
-    font-feature-settings: "lnum";
+    font-feature-settings: "tnum";
     @include fontsize($base_font_size);
-    text-align: right;
+
+    &:ltr { text-align: right; }
+    &:rtl { text-align: left; }
   }
 
   // timezone offset label

data/gnome-shell-sass/widgets/_dash.scss

@@ -1,20 +1,18 @@
 /* Dash */
 
+$dash_background_color: #3b3b3b;
 $dash_placeholder_size: 32px;
-$dash_spacing: $base_padding + 4px;
+$dash_padding: $base_padding + 4px; // 10px
+$dash_spacing: $base_padding / 4;
+
+$dash_bottom_margin: $base_margin * 4;
+
 $dash_border_radius: $modal_radius * 1.5;
 
 #dash {
-  @extend %overview_panel;
   @include fontsize($base_font_size - 2);
-  padding: ($dash_spacing / 2) 0;
+  margin-top: $base_spacing * 3;
-
+  padding: 0 $dash_padding;
-  border-radius: 0 $dash_border_radius $dash_border_radius 0; 
-  border-left-width: 0;
-  &:rtl {
-    border-radius: $dash_border_radius 0 0 $dash_border_radius;
-    border-right-width: 0;
-  }
 
   .placeholder {
     // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
@@ -27,23 +25,38 @@ $dash_border_radius: $modal_radius * 1.5;
     width: $dash_placeholder_size;
     height: $dash_placeholder_size;
   }
+
+  .overview-icon {
+    padding: $dash_padding / 2;
+  }
+}
+
+.dash-background {
+  background-color: $dash_background_color;
+  margin-bottom: $dash_bottom_margin;
+  padding: $dash_padding;
+  border-radius: $dash_border_radius;
 }
 
 // Dash Items
-.dash-item-container > StWidget {
+.dash-item-container .app-well-app, .show-apps {
-  padding: ($dash_spacing / 2) $dash_spacing;
+  padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin;
+}
+
+.dash-separator {
+  width: 1px;
+  margin: 0 ($dash_spacing + ($dash_padding / 2)) $dash_bottom_margin;
+  background-color: transparentize($osd_fg_color,0.7);
 }
 
 // OSD Tooltip
 .dash-label {
-  background-color: transparentize($osd_bg_color,0.05);
-  border-radius: $base_border_radius + 2px;
-  border:none;
-  box-shadow:0 0 0 1px $osd_outer_borders_color;
   color: $osd_fg_color;
-  padding: $base_padding $base_padding + 2px;
+  background-color: $osd_bg_color;
+  border-radius: 99px;
+  padding: $base_padding $base_padding * 2;
   text-align: center;
-  -x-offset: $base_margin * 2; // distance from the dash edge
+  -y-offset: $base_margin * 3; // distance from the dash edge
 }
 
 // Show apps button
@@ -53,9 +66,8 @@ $dash_border_radius: $modal_radius * 1.5;
   &:focus,
   &:checked {
     .overview-icon {
-      background-color: darken($osd_bg_color,10%);
+      background-color: transparentize($osd_bg_color,0.5);
       color: $fg_color;
     }
   }
 }
-

data/gnome-shell-sass/widgets/_dialogs.scss

@@ -38,7 +38,7 @@
     font-size: 18pt;
     font-weight: 800;
 
-    &.leightweight {
+    &.lightweight {
       font-size: 13pt;
       font-weight: 800;
     }
@@ -135,10 +135,6 @@
   spacing: 8px;
   margin-bottom: 6px;
 
-  .polkit-dialog-user-icon {
-    border-radius: 99px;
-    background-size: contain;
-  }
   .polkit-dialog-user-root-label { color: $warning_color; }
 }
 
@@ -166,3 +162,12 @@
 .audio-selection-device-icon {
   icon-size: $base_icon_size * 4;
 }
+
+/* Welcome dialog */
+.welcome-dialog-image {
+  background-image: url("resource:///org/gnome/shell/theme/gnome-shell-start.svg");
+  background-size: contain;
+  /* Reasonable maximum dimensions */
+  height: 300px;
+  width: 300px;
+}

data/gnome-shell-sass/widgets/_entries.scss

@@ -3,7 +3,7 @@
 StEntry {
   border-radius: $base_border_radius;
   padding: 8px;
-  border-width: 1px;
+  border-width: 0;
   color: $fg_color;
   @include entry(normal);
   //&:hover { @include entry(hover);}

data/gnome-shell-sass/widgets/_login-dialog.scss

@@ -5,18 +5,19 @@
   max-width: 23em;
 }
 
-.login-dialog {
+.login-dialog,
+.unlock-dialog {
   //reset
   border: none;
   background-color: transparent;
 
-  $_gdm_bg: lighten(#2e3436, 19%);
+  $_gdm_bg: $system_bg_color;
 
   StEntry {
     @if $variant=='dark' {
-      $_gdm_entry_bg: transparentize(lighten(desaturate(#241f31, 20%), 2%), 0.5);
+      $_gdm_entry_bg: darken($system_bg_color, 3%);
       background-color: $_gdm_entry_bg;
-      color: $osd_fg_color;
+      color: $fg_color;
     }
   }
 
@@ -24,9 +25,9 @@
   .modal-dialog-button {
     padding: 4px 18px;
     box-shadow: 0 1px 3px rgba(0,0,0,0.2);
-    background-color: $_gdm_bg;
+    background-color: darken($system_bg_color, 3%);
-    border-color: $_gdm_bg;
+    border-color: darken($system_bg_color, 3%);
-    color: $fg_color;
+    color: $osd_fg_color;
 
     $_hover_c: lighten($_gdm_bg, 5%);
     &:hover, &:focus {
@@ -43,7 +44,7 @@
       @include button(insensitive);
       border-color: darken($_gdm_bg, 5%);
       background-color: darken($_gdm_bg, 5%);
-      color: transparentize($fg_color, 0.3);
+      color: transparentize($osd_fg_color, 0.3);
     }
     &:default {
       @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
@@ -76,8 +77,8 @@
     border-radius: 99px;
     width: $base_icon_size * 2;
     height: $base_icon_size * 2;
-    border-color: transparentize($bg_color,0.7);
+    border-color: darken($system_bg_color, 3%);
-    background-color: transparentize($bg_color,0.7);
+    background-color: darken($system_bg_color, 3%);
 
     StIcon { icon-size: $base_icon_size; }
   }
@@ -92,7 +93,6 @@
 .login-dialog-banner { color: darken($osd_fg_color,10%); }
 .login-dialog-button-box { width: 23em; spacing: 5px; }
 .login-dialog-message { text-align: center; }
-.login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
 .login-dialog-user-selection-box { padding: 100px 0px; }
 .login-dialog-not-listed-label {
   padding-left: 2px;
@@ -138,11 +138,10 @@
 .user-widget.horizontal .user-widget-label {
   @include fontsize($base_font_size + 2);
   font-weight: bold;
-  text-align: left;
   padding-left: 15px;
 
-  &:ltr { padding-left: 14px; }
+  &:ltr { padding-left: 14px; text-align: left; }
-  &:rtl { padding-right: 14px; }
+  &:rtl { padding-right: 14px; text-align: right; }
 }
 
 .user-widget.vertical .user-widget-label {
@@ -152,6 +151,11 @@
   padding-top: 16px;
 }
 
+.login-dialog-timed-login-indicator {
+    height: 2px;
+    background-color: darken($fg_color,40%);
+}
+
 .login-dialog-prompt-layout {
   padding-top: 24px;
   padding-bottom: 12px;

data/gnome-shell-sass/widgets/_looking-glass.scss

@@ -1,5 +1,7 @@
 /* Looking Glass */
 
+$text_fg_color: #ccc;
+
 // Dialog
 #LookingGlassDialog {
   background-color: $osd_bg_color;
@@ -52,6 +54,11 @@
     &:hover { color: lighten($link_color, 10%); }
     &:active { color: darken($link_color, 10%); }
    }
+  .actor-link {
+    color: $text_fg_color;
+    &:hover { color: lighten($text_fg_color, 20%); }
+    &:active { color: darken($text_fg_color, 20%); }
+   }
 }
 
 .lg-completions-text {

data/gnome-shell-sass/widgets/_message-list.scss

@@ -25,6 +25,20 @@
   // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
   padding: $base_margin;
   spacing: $base_spacing * 2;
+
+  .dnd-button {
+    // We need this because the focus outline isn't inset like for the buttons
+    // so the dnd button would grow when it gets focus if we didn't change only
+    // its color when focusing.
+    border-width: 2px;
+    border-color: transparent;
+    border-radius: 99px;
+    border-style: solid;
+
+    &:focus {
+      border-color: transparentize($selected_bg_color, 0.4);
+    }
+  }
 }
 
 // message bubbles
@@ -71,9 +85,11 @@
     > .event-time {
       color: transparentize($fg_color, 0.5);
       @include fontsize($base_font_size - 2);
-      text-align: right;
       /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
       padding-bottom: 0.13em;
+
+      &:ltr { text-align: right };
+      &:rtl { text-align: left };
     }
   }
 
@@ -97,7 +113,7 @@
 
 /* Media Controls */
 .message-media-control {
-  padding: $base_padding * 2 $base_padding * 4;
+  padding: $base_padding * 2 1.64em; // $base_padding * 4 = 24px
   color: darken($fg_color, 15%);
 
   // uses $hover_bg_color since the media controls are in a notification_bubble

data/gnome-shell-sass/widgets/_misc.scss

@@ -9,6 +9,7 @@
   background-size: contain;
   color: $osd_fg_color;
   border-radius: 99px;
+  icon-size: $base_icon_size * 4; // 64px
   &:hover {
     color: lighten($osd_fg_color,30%);
   }
@@ -16,6 +17,12 @@
   & StIcon {
     background-color: transparentize($osd_fg_color,0.95);
     border-radius: 99px;
+    padding: $base_padding * 2 ; // 12px
+    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
+  }
+
+  &.user-avatar {
+    border: 2px $osd_fg_color;
   }
 }
 
@@ -30,15 +37,6 @@
   }
 }
 
-.user-widget.horizontal .user-icon {
-  icon-size: $base_icon_size * 4; // 64px
-
-  & StIcon {
-    padding: $base_padding * 2 ; // 12px
-    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
-  }
-}
-
 .lightbox { background-color: black; }
 .flashspot { background-color: white; }
 
@@ -53,3 +51,9 @@
   @include fontsize($base_font_size - 1);
   color: $warning_color;
 }
+
+/* Workspace animation */
+
+.workspace-animation {
+  background-color: $system_bg_color;
+}

data/gnome-shell-sass/widgets/_notifications.scss

@@ -1,4 +1,4 @@
-/* Notifications & Mesage Tray */
+/* Notifications & Message Tray */
 
 $notification_banner_height: 64px;
 $notification_banner_width: 34em;

data/gnome-shell-sass/widgets/_overview.scss

@@ -1,10 +1,13 @@
 /* OVERVIEW */
 
-#overview {
+.controls-manager, .secondary-monitor-workspaces {
-  spacing: 24px;
+  spacing: $base_spacing * 2;
-  background-color: transparent;
+}
+
+#overviewGroup {
+  background-color: $system_bg_color;
 }
 
 .overview-controls {
   padding-bottom: 32px;
-}
+}

data/gnome-shell-sass/widgets/_panel.scss

@@ -3,43 +3,36 @@
 
 $panel_corner_radius: $base_border_radius+1;
 $panel_bg_color: #000;
-$panel_fg_color: #ccc;
+$panel_fg_color: #ddd;
-$panel_height: 1.86em;
+$panel_height: 2.2em;
-
+$panel_transition_duration: 250ms; // same as the overview transition duration
 
 #panel {
   background-color: $panel_bg_color;
   font-weight: bold;
   height: $panel_height;
   font-feature-settings: "tnum";
+  transition-duration: $panel_transition_duration;
 
   // transparent panel on lock & login screens
   &.unlock-screen,
-  &.login-screen {
+  &.login-screen,
+  &:overview {
     background-color: transparent;
 
     .panel-corner {
-      -panel-corner-radius: 0;
+      -panel-corner-opacity: 0;
-      -panel-corner-background-color: transparent;
-      -panel-corner-border-color: transparent;
     }
   }
 
-  // spacing between activities, app menu and such
-  #panelLeft, #panelCenter {
-    spacing: $base_spacing;
-  }
-
   // the rounded outset corners
   .panel-corner {
     -panel-corner-radius: $panel_corner_radius;
     -panel-corner-background-color: $panel_bg_color;
     -panel-corner-border-width: 2px;
     -panel-corner-border-color: transparent;
-
+    -panel-corner-opacity: 1;
-    &:active, &:overview, &:focus {
+    transition-duration: $panel_transition_duration;
-      -panel-corner-border-color: lighten($selected_bg_color,5%);
-    }
   }
 
   // panel menus
@@ -48,53 +41,69 @@ $panel_height: 1.86em;
     color: $panel_fg_color;
     -natural-hpadding: $base_padding * 2;
     -minimum-hpadding: $base_padding;
+    transition-duration: 150ms;
+    border: 3px solid transparent;
+    border-radius: 99px;
 
-    &:hover {
+    &.clock-display {
-      color: lighten($panel_fg_color, 20%);
+      .clock {
+        transition-duration: 150ms;
+        border: 3px solid transparent;
+        border-radius: 99px;
+      }
     }
 
-    &:active, &:overview, &:focus, &:checked {
+    &:hover, &:active, &:overview, &:focus, &:checked {
-      color: lighten($panel_fg_color, 20%);
+      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.20);
+
+      // The clock display needs to have the background on .clock because
+      // we want to exclude the do-not-disturb indicator from the background
+      &.clock-display {
+        box-shadow: none;
+
+        .clock {
+          box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.20);
+        }
+      }
     }
 
     // status area icons
     .system-status-icon {
       icon-size: $base_icon_size;
       padding: $base_padding - 1px;
+      margin: 0 $base_margin;
+    }
+
+    .panel-status-indicators-box .system-status-icon,
+    .panel-status-menu-box .system-status-icon {
+      margin: 0;
     }
 
     // app menu icon
     .app-menu-icon {
-      margin-left: $base_margin;
-      margin-right: $base_margin;
       -st-icon-style: symbolic;
       // dimensions of the icon are hardcoded
     }
 
-    // lock & login screen styles
+    &#panelActivities {
-    .unlock-screen &,
+      -natural-hpadding: $base_padding * 3;
-    .login-screen & {
-      color: lighten($fg_color, 10%);
-      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
     }
   }
 
-  .panel-button {
+  &.unlock-screen,
-    &:active, &:overview, &:focus, &:checked {
+  &.login-screen,
-      // Trick due to St limitations. It needs a background to draw a box-shadow
+  &:overview {
-      background-color: rgba(0, 0, 0, 0.01);
+    .panel-button {
-      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+      &:hover, &:active, &:overview, &:focus, &:checked {
-    }
+        box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15);
-  }
 
-  .panel-button.clock-display {
+        &.clock-display {
-    // Move highlight from .panel-button to .clock
+          box-shadow: none;
-    &:active, &:overview, &:focus, &:checked {
-      box-shadow: none;
 
-      .clock {
+          .clock {
-        background-color: rgba(0, 0, 0, 0.01);
+            box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15);
-        box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+          }
+        }
       }
     }
   }
@@ -119,3 +128,8 @@ $panel_height: 1.86em;
   spacing: $base_spacing;
   .label-shadow { color: transparent; }
 }
+
+#appMenu .panel-status-menu-box {
+  padding: 0 $base_padding;
+  spacing: $base_spacing;
+}

data/gnome-shell-sass/widgets/_popovers.scss

@@ -76,8 +76,10 @@ $popover_arrow_height: 12px;
 
 // container for radio and check boxes
 .popup-menu-ornament {
-  text-align: right;
   width: 1.2em;
+
+  &:ltr { text-align: right };
+  &:rtl { text-align: left };
 }
 
 // separator

data/gnome-shell-sass/widgets/_screen-shield.scss

@@ -66,7 +66,7 @@
 }
 
 #lockDialogGroup {
-  background-color: lighten(#2e3436, 8%);
+  background-color: $system_bg_color;
 }
 
 #unlockDialogNotifications {

data/gnome-shell-sass/widgets/_search-entry.scss

@@ -10,17 +10,16 @@ $search_entry_height: 36px;
   border-radius: $search_entry_height * 0.5; // half the height
   color: transparentize($fg_color,0.3);
   background-color: $bg_color;
-  border-color: $borders_color;
+  margin-top: $base_spacing * 2;
-
+  margin-bottom: $base_spacing;
+  border-width: 2px;
+  border-color: transparent;
   &:hover {
     background-color: $hover_bg_color;
-    border-color: $hover_borders_color;
     color: $hover_fg_color;
   }
 
   &:focus {
-    padding: $base_padding $base_padding+2; // 1px less to account for wider border
-    border-width: 2px;
     border-style: solid;
     border-color: $selected_bg_color;
     color: $fg_color;
@@ -32,4 +31,4 @@ $search_entry_height: 36px;
     padding: 0 4px;
     color: inherit;
   }
-}
+}

data/gnome-shell-sass/widgets/_search-results.scss

@@ -54,6 +54,10 @@
   @extend %status_text;
 }
 
+.grid-search-results {
+  spacing: $base_spacing * 6;
+}
+
 // Search results with icons
 .grid-search-result {
   @extend %app-well-app;

data/gnome-shell-sass/widgets/_slider.scss

@@ -16,7 +16,7 @@ $slider_size: 15px;
   -barlevel-overdrive-color: $destructive_color;
   -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red;
   -barlevel-overdrive-separator-width:1px;
-  // slider hander
+  // slider handler
   -slider-handle-radius: $slider_size * 0.5; // half the size of the size
   -slider-handle-border-width: 1px;
   -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color);

data/gnome-shell-sass/widgets/_window-picker.scss

@@ -1,66 +1,52 @@
 /* Window Picker */
 
-$window_picker_spacing: $base_spacing * 2; // 16px
+$window_picker_spacing: $base_spacing; // 6px
-$window_picker_padding: $base_padding * 2; // 16px
+$window_picker_padding: $base_padding * 2; // 12px
 
-$window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);
+$window_thumbnail_label_color: transparentize($osd_bg_color, 0.4);
 
-$window_close_button_size: 24px;
+$window_close_button_size: 30px;
 $window_close_button_padding: 3px;
 
-
 // Window picker
 .window-picker {
   // Space between window thumbnails
-  -horizontal-spacing: $window_picker_spacing;
+  spacing: $window_picker_spacing;
-  -vertical-spacing: $window_picker_spacing;
-  // Padding for container around window thumbnails
-  padding: $window_picker_padding;
-
-  &.external-monitor { padding: $window_picker_padding; }
-}
-
-// Borders on window thumbnails
-.window-clone-border {
-  border-width: 6px;
-  border-style: solid;
-  border-color: $window_thumbnail_border_color;
-  border-radius: $base_border_radius + 2;
-  // For window decorations with round corners we can't match
-  // the exact shape when the window is scaled. So apply a shadow
-  // to fix that case
-  box-shadow: inset 0 0 0 1px transparentize($borders_color, 0.8);
 }
 
 // Window titles
 .window-caption {
   color: $osd_fg_color;
   background-color: $osd_bg_color;
-  border:1px solid $osd_outer_borders_color;
+  border-radius: 99px;
-  border-radius: $base_border_radius + 1;
   padding: $base_padding $base_padding * 2;
-  font-weight: bold;
-  @include fontsize($base_font_size + 1);
 }
 
 // Close button
 .window-close {
-  background-color: $selected_bg_color;
+  background-color: $osd_bg_color;
-  color: $selected_fg_color;
+  color: $osd_fg_color;
-  border: none;
   border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
   padding: $window_close_button_padding;
   height: $window_close_button_size;
   width: $window_close_button_size;
   box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
+  transition-duration: 300ms;
 
-  -shell-close-overlap: $window_close_button_size * 0.5;
+  & StIcon { icon-size: 24px; }
 
   &:hover {
-    background-color: lighten($selected_bg_color, 5%);
+    background-color: lighten($osd_bg_color, 15%);
   }
 
   &:active {
-    background-color: darken($selected_bg_color, 5%);
+    color: transparentize($osd_fg_color, 0.2);
+    background-color: darken($osd_bg_color, 5%);
   }
 }
+
+.workspace-background {
+  // keep in sync with BACKGROUND_CORNER_RADIUS_PIXELS in workspace.js
+  border-radius: 30px;
+  box-shadow: 0 4px 16px 4px transparentize(darken($osd_bg_color, 30%), 0.7);
+}

data/gnome-shell-sass/widgets/_workspace-thumbnails.scss

@@ -2,24 +2,20 @@
 
 // thumbnails in overview
 .workspace-thumbnails {
-  @extend %overview_panel;
   visible-width: 32px; //amount visible before hover
   spacing: $base_spacing;
   padding: $base_padding;
 
-  border-radius: $modal_radius 0 0 $modal_radius;
+  .workspace-thumbnail {
-  border-right-width: 0;
+    @extend %overview_panel;
-
+    border-radius: 3px;
-  &:rtl {
-    border-radius: 0 $modal_radius $modal_radius 0;
-    border-left-width: 0;
   }
 
   // drag and drop indicator
   .placeholder {
-    background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    background-image: url("resource:///org/gnome/shell/theme/workspace-placeholder.svg");
     background-size: contain;
-    height: 24px;
+    width: 18px;
   }
 }
 

data/meson.build

@@ -1,17 +1,33 @@
-sessions = [
+session_desktop_base = 'gnome-classic'
-  ['gnome-classic.session.desktop.in', sessiondir],
+
-  ['gnome-classic.desktop.in', xsessiondir]
+session_desktops = [
+  session_desktop_base,
+  session_desktop_base + '-xorg',
+  session_desktop_base + '-wayland',
 ]
-foreach s : sessions
+
-  name_array = s[0].split('.')
+foreach name: session_desktops
-  i18n.merge_file('',
+    session_desktop = name + '.desktop'
-    input:  s[0],
+    if name.endswith('-xorg')
-    output: '.'.join([name_array[0], name_array[1]]),
+        session_instdir = xsessiondir
-    po_dir: '../po',
+    elif name.endswith('-wayland')
-    install: true,
+        session_instdir = wlsessiondir
-    install_dir: s[1],
+    else
-    type: 'desktop'
+        # FIXME: The same target can not be copied into two directories.
-  )
+        #        There is a workaround in meson/session-post-install.py until proper
+        #        solution arises:
+        #        https://github.com/mesonbuild/meson/issues/2416
+        session_instdir = xsessiondir
+        #session_instdir = [ xesssiondir, wlsessiondir ]
+    endif
+    i18n.merge_file(
+      input:  session_desktop + '.in',
+      output: session_desktop,
+      po_dir: '../po',
+      install: true,
+      install_dir: session_instdir,
+      type: 'desktop'
+    )
 endforeach
 
 classic_uuids = []
@@ -34,7 +50,42 @@ theme_sources = files(
   'gnome-shell-sass/_colors.scss',
   'gnome-shell-sass/_common.scss',
   'gnome-shell-sass/_drawing.scss',
-  'gnome-shell-sass/_high-contrast-colors.scss'
+  'gnome-shell-sass/_high-contrast-colors.scss',
+  'gnome-shell-sass/_widgets.scss',
+  'gnome-shell-sass/widgets/_a11y.scss',
+  'gnome-shell-sass/widgets/_app-grid.scss',
+  'gnome-shell-sass/widgets/_base.scss',
+  'gnome-shell-sass/widgets/_buttons.scss',
+  'gnome-shell-sass/widgets/_calendar.scss',
+  'gnome-shell-sass/widgets/_check-box.scss',
+  'gnome-shell-sass/widgets/_corner-ripple.scss',
+  'gnome-shell-sass/widgets/_dash.scss',
+  'gnome-shell-sass/widgets/_dialogs.scss',
+  'gnome-shell-sass/widgets/_entries.scss',
+  'gnome-shell-sass/widgets/_hotplug.scss',
+  'gnome-shell-sass/widgets/_ibus-popup.scss',
+  'gnome-shell-sass/widgets/_keyboard.scss',
+  'gnome-shell-sass/widgets/_login-dialog.scss',
+  'gnome-shell-sass/widgets/_looking-glass.scss',
+  'gnome-shell-sass/widgets/_message-list.scss',
+  'gnome-shell-sass/widgets/_misc.scss',
+  'gnome-shell-sass/widgets/_network-dialog.scss',
+  'gnome-shell-sass/widgets/_notifications.scss',
+  'gnome-shell-sass/widgets/_osd.scss',
+  'gnome-shell-sass/widgets/_overview.scss',
+  'gnome-shell-sass/widgets/_panel.scss',
+  'gnome-shell-sass/widgets/_popovers.scss',
+  'gnome-shell-sass/widgets/_screen-shield.scss',
+  'gnome-shell-sass/widgets/_scrollbars.scss',
+  'gnome-shell-sass/widgets/_search-entry.scss',
+  'gnome-shell-sass/widgets/_search-results.scss',
+  'gnome-shell-sass/widgets/_slider.scss',
+  'gnome-shell-sass/widgets/_switcher-popup.scss',
+  'gnome-shell-sass/widgets/_switches.scss',
+  'gnome-shell-sass/widgets/_tiled-previews.scss',
+  'gnome-shell-sass/widgets/_window-picker.scss',
+  'gnome-shell-sass/widgets/_workspace-switcher.scss',
+  'gnome-shell-sass/widgets/_workspace-thumbnails.scss'
 )
 
 theme_data = [
@@ -47,15 +98,20 @@ theme_data = [
   'gnome-classic-high-contrast.css'
 ]
 
-style = 'gnome-classic'
+stylesheet = 'gnome-classic.css'
-custom_target(style + '.css',
+if fs.exists(stylesheet)
-  input: style + '.scss',
+  install_data(stylesheet, install_dir: themedir)
-  output: style + '.css',
+else
-  depend_files: theme_sources,
+  sassc = find_program('sassc', required: true)
-  command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
+  custom_target(stylesheet,
-  install: true,
+    input: fs.replace_suffix(stylesheet, '.scss'),
-  install_dir: themedir
+    output: stylesheet,
-)
+    depend_files: theme_sources,
+    command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: themedir
+  )
+endif
 
 install_data(theme_data, install_dir: themedir)
 

debian/changelog

@@ -0,0 +1,813 @@
+gnome-shell-extensions (42~beta-1) experimental; urgency=medium
+
+  * New upstream release:
+    - Use libadwaita for preferences
+    - window-list: Fix on-screen keyboard
+    - native-window-placement: Fix distorted layout in app grid
+  * debian/control: Depend on libadwaita and gtk-4 (instead of gtk-3)
+  * debian/patches: Drop applied upstream
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Wed, 23 Feb 2022 07:35:20 +0100
+
+gnome-shell-extensions (41.1-2) unstable; urgency=medium
+
+  * Team upload
+  * d/p/meson-Drop-unused-argument-for-i18n.merge_file.patch:
+    Backport patch from upstream to fix FBTFS with Meson 0.61
+    (Closes: #1005534)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 15 Feb 2022 11:18:30 +0000
+
+gnome-shell-extensions (41.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 12 Dec 2021 20:30:17 -0500
+
+gnome-shell-extensions (41.0-2) unstable; urgency=medium
+
+  * Team upload
+  * Upload to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Sat, 16 Oct 2021 20:06:04 +0100
+
+gnome-shell-extensions (41.0-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/control.in: Bump minimum meson to 0.53.0
+  * Bump Standards-Version to 4.6.0
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 10 Oct 2021 17:04:15 -0400
+
+gnome-shell-extensions (40.4-3) unstable; urgency=medium
+
+  * Team upload
+  * Release to unstable (transition: #992870)
+
+ -- Simon McVittie <smcv@debian.org>  Sat, 11 Sep 2021 21:52:59 +0100
+
+gnome-shell-extensions (40.4-2) experimental; urgency=medium
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * debian/copyright: Add gnome-classic.css to Files-Excluded
+  * Revert "debian/control: Don't build depend on sassc"
+  * This ensures we compile the CSS file from source.
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/control: Support pre-release versions of gnome-shell
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 29 Aug 2021 09:16:04 -0400
+
+gnome-shell-extensions (40.1-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/control:
+    - Update runtime dependencies to match code.
+      Found grepping code via:
+        grep "imports\.gi" --include "*.js" -rh -B2 . \
+           | grep -o "\b[A-Z][A-Za-z]\+\b" | sed "s/,\?\s*$//g" | sort -u
+    - Don't build depend on sassc.
+      Since we compile from tarball, this is not needed anymore given that
+      compiled css are provided already.
+    - Build-depend on dh-sequence-gnome 0.22.
+      It's the first version that supports new GNOME versioning schema.
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Sun, 30 May 2021 20:05:13 +0200
+
+gnome-shell-extensions (3.38.2-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Standards-Version: 4.5.1 (no changes required)
+  * d/gbp.conf: Use upstream/3.38.x branch.
+    Version 40~alpha was already released upstream.
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 03 Dec 2020 10:17:58 +0000
+
+gnome-shell-extensions (3.38.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Recommend gnome-shell-extension-prefs instead of gnome-tweaks
+
+ -- Jeremy Bicha <jbicha@debian.org>  Tue, 06 Oct 2020 17:44:30 -0400
+
+gnome-shell-extensions (3.38.0-2) unstable; urgency=medium
+
+  * Team upload
+  * Revert "debian/watch: Watch for unstable releases"
+  * Release to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 25 Sep 2020 23:00:58 +0100
+
+gnome-shell-extensions (3.38.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release
+    - Translation updates
+  * d/upstream/metadata: Add
+  * Update standards version to 4.5.0, no changes needed
+  * Fix gnome-classic regression in 3.37.91-1.
+    gnome-session no longer takes the `--session gnome-classic` argument
+    when running in classic mode.
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 22 Sep 2020 11:49:24 +0100
+
+gnome-shell-extensions (3.37.91-1) experimental; urgency=medium
+
+  * New upstream release:
+    - drive-menu: Emphasize eject buttons
+    - user-theme: Add preference dialog
+    - window-list:
+      + Fix inconsistent state in preference dialog
+      + auto-move: Modernize preference dialogs
+    - workspace-indicator: Overhaul preference dialog
+    - user-theme: Support session mode styles
+    - Adjust to gnome-shell changes
+  * debian/patches: Refresh
+  * debian/control: B-D on debhelper 13
+  * debian/rules: Don't override dh_missing equal default behavior
+  * debian/control: Remove useless dependency on clutter gir
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Thu, 27 Aug 2020 17:39:42 +0200
+
+gnome-shell-extensions (3.36.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 03 May 2020 10:02:18 +0200
+
+gnome-shell-extensions (3.36.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+    - Update Ukrainian translation
+    - Update Gnome Shell CSS
+  * Upload to unstable (part of transition: #954422)
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 10 Apr 2020 15:12:29 +0100
+
+gnome-shell-extensions (3.36.0-1) experimental; urgency=medium
+
+  * New upstream translation release
+
+ -- Iain Lane <laney@debian.org>  Mon, 16 Mar 2020 12:39:02 +0000
+
+gnome-shell-extensions (3.35.91-1) experimental; urgency=medium
+
+  * New upstream release
+    - Fixes and adjustments to latest gnome-shell
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Mon, 24 Feb 2020 18:29:29 +0000
+
+gnome-shell-extensions (3.34.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/control.in: Bump Standards-Version to 4.4.1 (no further changes)
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 30 Dec 2019 00:51:13 +0100
+
+gnome-shell-extensions (3.34.1-2) unstable; urgency=high
+
+  * New upstream release
+    - Fix GNOME Classic session's compatibility with gnome-setting-daemon 3.34
+
+ -- Jeremy Bicha <jbicha@debian.org>  Tue, 08 Oct 2019 22:49:14 -0400
+
+gnome-shell-extensions (3.34.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Mon, 30 Sep 2019 17:27:38 +0200
+
+gnome-shell-extensions (3.34.0-1) experimental; urgency=medium
+
+  * New upstream translation release
+
+ -- Iain Lane <laney@debian.org>  Tue, 10 Sep 2019 10:59:31 +0100
+
+gnome-shell-extensions (3.33.92-1) experimental; urgency=medium
+
+  * New upstream bugfix / translation releases
+
+ -- Iain Lane <laney@debian.org>  Thu, 05 Sep 2019 18:22:14 +0100
+
+gnome-shell-extensions (3.33.90-1) experimental; urgency=medium
+
+  [ Marco Trevisan (Treviño) ]
+  * New upstream release
+    + window-list: Support showing windows from all workspaces
+    + Make GNOME Classic more classic:
+      - Disable GNOME 3 overview
+      - Add window picker button to window list
+      - Style improvements and fixes
+      - Support horizontal workspace layout in window list
+      - Add draggable previews to window list workspace switcher
+      - Arrange workspaces horizontally
+    + workspace-indicator: Support horizontal workspace layout
+    + workspace-indicator: Add draggable previews
+    + Fix windowsNavigator extension after ES6 port
+    + screenshot-window-sizer: Add phone screenshot sizes
+
+  [ Iain Lane ]
+  * rules: Build all extensions via the upstream build system. We don't need
+    to hardcode the list to build, as the build system provides a way to build
+    'all' extensions.
+  * rules: Build with --fail-missing
+  * compat, control, rules: Move to compat 12 and specifying via build-deps
+
+ -- Iain Lane <laney@debian.org>  Tue, 13 Aug 2019 11:59:22 +0100
+
+gnome-shell-extensions (3.32.0-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Iain Lane <laney@debian.org>  Tue, 12 Mar 2019 16:34:14 +0000
+
+gnome-shell-extensions (3.31.92-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Iain Lane <laney@debian.org>  Wed, 06 Mar 2019 15:40:48 +0000
+
+gnome-shell-extensions (3.31.90-1) experimental; urgency=medium
+
+  * New upstream release
+    + Misc. bug fixes and cleanups
+    + Remove obsolete alternate-tab extension
+    + Adjust to gnome-shell changes
+  * debian/watch: Watch for unstable releases
+  * rules: alternate-tab is dropped; stop trying to enable it
+
+ -- Iain Lane <laney@debian.org>  Thu, 21 Feb 2019 10:33:12 +0000
+
+gnome-shell-extensions (3.30.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Bump Standards-Version to 4.2.1
+  * d/p/gnome-session-classic-wrapper-script.patch:
+    Re-word to avoid a Lintian warning
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 02 Nov 2018 09:26:47 +0000
+
+gnome-shell-extensions (3.30.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Wed, 05 Sep 2018 12:34:40 -0400
+
+gnome-shell-extensions (3.29.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream development release
+  * Bump Standards-Version to 4.2.0
+  * Sort dependency lists (wrap-and-sort -a)
+  * d/copyright: Remove unnecessary sentence fragment
+  * d/p/series: Remove commented-out line
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 20 Aug 2018 20:27:57 +0100
+
+gnome-shell-extensions (3.29.90-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream development release
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 02 Aug 2018 10:46:44 +0100
+
+gnome-shell-extensions (3.29.3+really3.29.3-1) experimental; urgency=medium
+
+  * Team upload
+  * d/watch: Watch for development versions
+  * Re-upload to experimental with a higher version than
+    3.29.3+really3.28.1-1, which reverted the incorrect upload of the
+    previous version to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:56:10 +0100
+
+gnome-shell-extensions (3.29.3-1) unstable; urgency=medium
+
+  * Team upload
+
+  [ Arnaud Rebillout ]
+  * New upstream release
+
+  [ Simon McVittie ]
+  * Bump Standards-Version to 4.1.5
+  * Set Rules-Requires-Root to no
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 09:37:34 +0100
+
+gnome-shell-extensions (3.28.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.1.4
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 14 May 2018 21:51:46 -0400
+
+gnome-shell-extensions (3.28.0-2) unstable; urgency=medium
+
+  * Fix typo in configure flag that resulted in missing
+    auto-move-windows, native-window-placement, & user-theme extensions
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 19 Mar 2018 18:20:53 -0400
+
+gnome-shell-extensions (3.28.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 18 Mar 2018 20:17:17 -0400
+
+gnome-shell-extensions (3.27.92-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sat, 10 Mar 2018 19:37:45 -0500
+
+gnome-shell-extensions (3.27.92-1) experimental; urgency=medium
+
+  [ Jeremy Bicha ]
+  * New upstream release candidate
+  * Drop explicit dependency on mutter's gir. gnome-shell-extensions depends
+    on gnome-shell which depends on the gir. Dropping it will make transitions
+    easier.
+
+  [ Simon McVittie ]
+  * Recommend gnome-tweaks instead of transitional gnome-tweak-tool
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 05 Mar 2018 21:02:01 -0500
+
+gnome-shell-extensions (3.27.91-1) experimental; urgency=medium
+
+  * New upstream development release
+  * Build with meson
+  * Build-Depend on sassc
+  * Bump debhelper compat to 11
+  * Drop places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch &
+    dont-require-nautilus-classic.patch: Applied in new release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 23 Feb 2018 19:49:59 -0500
+
+gnome-shell-extensions (3.26.2-3) unstable; urgency=medium
+
+  * Team upload
+
+  [ Jeremy Bicha ]
+  * Update Vcs fields for migration to https://salsa.debian.org/
+
+  [ Simon McVittie ]
+  * d/patches: Re-export with gbp pq export
+  * d/p/places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch:
+    Take patch from upstream to avoid frequent tracebacks from the Places
+    menu with gjs >= 1.50.2-3 (Closes: #888608)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 30 Jan 2018 09:15:54 +0000
+
+gnome-shell-extensions (3.26.2-2) unstable; urgency=medium
+
+  * Update Vcs fields for conversion to git
+  * Add debian/gbp.conf
+  * Bump Standards-Version to 4.1.2
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 15 Dec 2017 15:19:14 -0500
+
+gnome-shell-extensions (3.26.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 05 Nov 2017 20:17:03 +0100
+
+gnome-shell-extensions (3.26.1-2) unstable; urgency=medium
+
+  * Release to unstable
+  * Bump Standards-Version to 4.1.1
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 13 Oct 2017 16:49:30 -0400
+
+gnome-shell-extensions (3.26.1-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 Oct 2017 11:01:11 +0100
+
+gnome-shell-extensions (3.26.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 13 Sep 2017 11:33:19 +0100
+
+gnome-shell-extensions (3.25.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release, for GNOME Shell 3.25.91
+    - d/p/adapt-to-gsd324.patch: Drop, applied upstream
+    - Switch dependency to gir1.2-mutter-1
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 05 Sep 2017 16:43:01 +0100
+
+gnome-shell-extensions (3.22.2-2) unstable; urgency=medium
+
+  * Add adapt-to-gsd324.patch (Closes: #869948):
+    - Adjust gnome-session file for gnome-settings-daemon 3.24
+  * debian/control.in:
+    - Bump Standards-Version to 4.0.0
+    - Explicitly depend on gnome-settings-daemon >= 3.24
+    - Drop version from gnome-tweak-tool recommends
+    - Depend on gnome-session-bin instead of gnome-session (LP: #1702832)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 06 Aug 2017 17:38:06 -0400
+
+gnome-shell-extensions (3.22.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 10 Nov 2016 19:36:44 +0100
+
+gnome-shell-extensions (3.22.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 11 Oct 2016 17:58:31 +0200
+
+gnome-shell-extensions (3.22.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 20 Sep 2016 01:59:50 +0200
+
+gnome-shell-extensions (3.21.92-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Replace Build-Depends gnome-common with pkg-config and gettext.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 13 Sep 2016 22:13:19 +0200
+
+gnome-shell-extensions (3.21.91-1) unstable; urgency=medium
+
+  * New upstream beta release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 30 Aug 2016 19:57:32 +0200
+
+gnome-shell-extensions (3.21.90-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream beta release.
+  * Update build-dependencies according to configure.ac changes:
+    - drop intltool, now gettext is used instead.
+
+  [ Jeremy Bicha ]
+  * Convert from cdbs to dh
+  * Add debian/docs to install NEWS and README
+  * Bump dh compat to 10
+  * Update Vcs fields
+  * Refresh patches
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sun, 21 Aug 2016 05:36:17 +0200
+
+gnome-shell-extensions (3.21.4-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Stop hard-coding Victor Seva in the Uploaders field
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 12 Aug 2016 16:28:33 +0200
+
+gnome-shell-extensions (3.20.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 11 May 2016 15:21:35 +0200
+
+gnome-shell-extensions (3.20.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 17 Apr 2016 00:25:25 +0200
+
+gnome-shell-extensions (3.20.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 25 Mar 2016 10:48:00 +0100
+
+gnome-shell-extensions (3.19.92-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update dont-require-nautilus-classic.patch to apply.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Thu, 17 Mar 2016 12:51:13 +0100
+
+gnome-shell-extensions (3.18.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.7.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 06 Mar 2016 22:38:57 +0100
+
+gnome-shell-extensions (3.18.3-2) unstable; urgency=medium
+
+  * Add Breaks/Replaces gnome-shell-common (<< 3.18) (Closes: #808906)
+    - Helps upgrades from Jessie by allowing overwriting
+      /usr/share/gnome-shell/theme/calendar-today.svg et.al.
+      which was previously shipped in gnome-shell-common.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 10 Feb 2016 01:24:42 +0100
+
+gnome-shell-extensions (3.18.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 14 Jan 2016 22:49:16 +0100
+
+gnome-shell-extensions (3.18.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Nov 2015 00:04:09 +0100
+
+gnome-shell-extensions (3.18.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 16 Oct 2015 22:09:01 +0200
+
+gnome-shell-extensions (3.18.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 11 Oct 2015 16:29:18 +0200
+
+gnome-shell-extensions (3.17.92-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 18 Sep 2015 17:28:06 +0200
+
+gnome-shell-extensions (3.16.2-1) unstable; urgency=medium
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/gnome-shell-extensions.gsettings-override:
+    + Dropped, no longer needed as the enabled extension no longer exists.
+      Thanks Artur Rona for noticing. (Closes: #782747)
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Update Homepage.
+  * Bump debhelper compatibility level to 9.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 02 Jul 2015 19:13:32 +0200
+
+gnome-shell-extensions (3.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in,
+    debian/rules:
+    + The system monitor extension was removed. Drop the libgtop
+      build and runtime dependencies and stop enabling it.
+  * debian/patches/apps-center-labels.patch,
+    debian/patches/window-list-pointerInNotification.patch,
+    debian/patches/menu-arrows-icons.patch:
+    + Dropped, merged upstream.
+  * debian/patches/dont-require-nautilus-classic.patch:
+    + Updated for the new version.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 14 Jun 2015 15:23:59 +0200
+
+gnome-shell-extensions (3.14.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * menu-arrows-icons: new patch. Make arrows consistent with the rest
+    of the shell.
+  * apps-center-labels.patch: patch from upstream git. Center labels
+    vertically in the applications menu.
+  * window-list-pointerInNotification.patch: patch from upstream git.
+    Update window-list extension for an older shell API change.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 30 Nov 2014 16:06:59 +0100
+
+gnome-shell-extensions (3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
+  * Add missing dependencies against gir packages, including gir1.2-gmenu-3.0,
+    this should fix the apps-menu extension for some people (Closes: #765460).
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 19 Oct 2014 21:17:58 +0200
+
+gnome-shell-extensions (3.14.0-2) unstable; urgency=medium
+
+  * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed
+    upstream.
+  * Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 24 Sep 2014 01:15:32 +0200
+
+gnome-shell-extensions (3.14.0-1) unstable; urgency=medium
+
+  * debian/watch: only scan for stable releases.
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 23 Sep 2014 15:46:30 +0200
+
+gnome-shell-extensions (3.13.91-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sat, 06 Sep 2014 11:16:39 -0700
+
+gnome-shell-extensions (3.12.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 15 Jul 2014 00:06:09 +0200
+
+gnome-shell-extensions (3.12.0-1) experimental; urgency=low
+
+  [ Jean Schurger ]
+  * New upstream release (3.10.1)
+  * debian/rules: remove one of the 'windowsNavigator' extension listed twice
+    and the 'alternative-system-menu' extension (does not exists anymore)
+  * debian/copyright: Update 'Format:' line
+
+  [ Andreas Henriksson ]
+  * New upstream release (3.12.0)
+  * debian/local/gnome-session-classic,
+    debian/patches/gnome-session-classic-wrapper-script.patch:
+    - update script to include new GNOME_SHELL_SESSION_MODE env variable
+      and update patch to apply again.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 04 Apr 2014 21:43:18 +0200
+
+gnome-shell-extensions (3.8.4-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 13 Oct 2013 18:11:33 +0200
+
+gnome-shell-extensions (3.8.4-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * Dropped patches applied in new version:
+    - fix-hibernate.patch
+    - fix-applications-menu-resolution-change.patch
+    - look-in-data-home-for-themes.patch
+
+  [ Michael Biebl ]
+  * Add a wrapper script to start the GNOME Classic session as currently
+    Xsession doesn't allow to run gnome-session with custom arguments due to
+    #653327.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Oct 2013 18:55:23 +0200
+
+gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+    - default-min-max and static-workspaces extensions have been dropped.
+      Use Classic Mode or tweak org.gnome.shell.overrides in dconf-editor
+  * debian/control.in:
+    - Depend on gnome-session 3.8, required for the new Classic mode.
+    - Update homepage
+  * debian/patches/dont-require-nautilus-classic.patch:
+    - Don't require nautilus-classic since it forces desktop icons
+  * debian/patches/fix-applications-menu-resolution-change.patch:
+    - Backport commit to not break applications menu when screen resolution
+      changes
+  * debian/patches/fix-hibernate.patch:
+    - Backport patch to fix checking whether hibernate is allowed
+  * debian/patches/look-in-data-home-for-themes.patch:
+    - Backport commit to also look in XDG_DATA_HOME (usually ~/.local/share/)
+      for user themes
+  * debian/rules:
+    - Run autoreconf
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 16 Aug 2013 20:25:30 +0200
+
+gnome-shell-extensions (3.8.2-1) experimental; urgency=low
+
+  * Team upload
+
+  [ Victor Seva ]
+  * Recommends gnome-tweak-tool
+
+  [ Jean Schurger ]
+  * New upstream release 3.7.92 (LP: #1017979, #1059152).
+  * Enabled new extensions.
+  * Dropped 'dock' and 'gajim'.
+  * Use ./configure instead of autoreconf.
+  * Bumped Standards-Version to 3.9.4.
+  * Updated Vcs-Svn.
+  * debian/control.in
+    - Added runtime dependency to 'gvfs' (>= 1.16.0).
+      The 'Places' extension rely on a 'gvfs' linked to 'udisks2'.
+
+  [ Simon McVittie ]
+  * New upstream release 3.8.2.
+  * Install the "classic mode"
+  * Enable windowNavigator extension (this means we have everything except
+    example and xrandr, the same as in the Ubuntu gnome3-team's PPA)
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 23 May 2013 09:07:23 +0100
+
+gnome-shell-extensions (3.4.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 30 May 2012 13:22:54 +0200
+
+gnome-shell-extensions (3.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Remove 01_status-menu_disable_accounts.patch: The alternative-status-menu
+    extension no longer recreates the complete user menu but reuses the one
+    from gnome-shell, so we can't easily get rid of the "Online Accounts" menu
+    entry. We will patch gnome-shell directly instead.
+  * Remove 02-Revert-all-remove-all-GSettings-usage.patch and
+    03-Revert-Remove-all-references-to-localedir-from-metad.patch, no longer
+    required.
+  * Bump Standards-Version to 3.9.3
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 21 May 2012 00:24:56 +0200
+
+gnome-shell-extensions (3.2.3-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * gnome-shell-extensions.gsettings-override: enable the alternative
+    status menu by default. Closes: #648112.
+  * Use ${gnome:Version} to generate strict dependencies, it’s very
+    unlikely that extensions remain compatible after a major upgrade.
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+
+  [ Josselin Mouette ]
+  * 01_status-menu_disable_accounts.patch: new patch. Drop the unusable
+    advertisement for Google. It is already available in the control
+    center anyway.
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Drop patches which have been merged upstream:
+    - debian/patches/upstream/*
+    - debian/patches/fix-*
+  * Refresh 01_status-menu_disable_accounts.patch.
+  * Add 02-Revert-all-remove-all-GSettings-usage.patch: Use GSettings since we
+    install the extensions system-wide.
+  * Use dh-autoreconf to generate the build system.
+  * Add 03-Revert-Remove-all-references-to-localedir-from-metad.patch: Use
+    locales from system-wide location.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 11 Feb 2012 23:28:53 +0100
+
+gnome-shell-extensions (3.2.0-1) experimental; urgency=low
+
+  [ Victor Seva ]
+  * Initial release (Closes: #627515)
+    Package based on the work by Bilal Akhtar <bilalakhtar@ubuntu.com>
+  * debian/copyright
+    - Added myself
+    - Fixed syntax-error-in-dep5-copyright syntax error
+  * debian/control.in
+    - Added myself as maintainer.
+    - Fix gnome-shell dependency.
+    - Fix gir1.2-gtop-2.0 dependency for systemMonitor ext.
+  * debian/rules
+    - Added uploaders.mk gnome-version.mk includes.
+    - Removed unused variables.
+  * debian/watch added.
+  * No more gnome-shell-extension-* packages.
+  * debian/patches/upstream
+    - patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff
+      popup menu fix
+    - patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff
+      dock fix.
+    - patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff
+      patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff
+      systemMonitor: Properly enable/disable
+  * debian/patches
+    - fix_dock_gnome-shell_version.diff
+    - fix_alternate-tab_661281.diff
+    - fix_alternate-tab_gnome-shell_version.diff
+  * debian/rules
+    - EXTENSIONS_ENABLED, EXTENSIONS_DISABLED variables
+    - disabled xrandr-indicator
+
+  [ Michael Biebl ]
+  * debian/watch: Track .xz tarballs.
+  * debian/control.in:
+    - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer and add
+      Victor Seva <linuxmaniac@torreviejawireless.org> to Uploaders.
+    - Wrap (Build-)Depends.
+    - Add Vcs-Svn and Vcs-Browser field.
+  * debian/rules:
+    - Include gnome-get-source.mk.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 12 Nov 2011 18:32:22 +0100

debian/control

@@ -0,0 +1,49 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-gnome (>= 0.22),
+               meson (>= 0.53.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.6.0
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: gir1.2-adw-1,
+         gir1.2-atk-1.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-graphene-1.0 (>= 1.10.2),
+         gir1.2-gtk-4.0,
+         gir1.2-pango-1.0,
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24),
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}~),
+         gvfs (>= 1.16.0),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.

debian/control.in

@@ -0,0 +1,45 @@
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-gnome (>= 0.22),
+               meson (>= 0.53.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.6.0
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: gir1.2-adw-1,
+         gir1.2-atk-1.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-graphene-1.0 (>= 1.10.2),
+         gir1.2-gtk-4.0,
+         gir1.2-pango-1.0,
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24),
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}~),
+         gvfs (>= 1.16.0),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.

debian/copyright

@@ -0,0 +1,30 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gnome-shell-extensions
+Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+Source: https://download.gnome.org/sources/gnome-shell-extensions/
+Files-Excluded: data/gnome-classic.css
+Comment: Build that generated file from source
+
+Files: *
+Copyright: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+    2011 Victor Seva <linuxmaniac@torreviejawireless.org>
+    2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/docs

@@ -0,0 +1,2 @@
+NEWS
+README.md

debian/gbp.conf

@@ -0,0 +1,17 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/master
+upstream-branch = upstream/latest
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+upstream-vcs-tag = %(version%~%.)s
+
+[pq]
+patch-numbers = False

debian/install

@@ -0,0 +1 @@
+debian/local/gnome-session-classic usr/bin

debian/local/gnome-session-classic

@@ -0,0 +1,2 @@
+#! /bin/sh
+env GNOME_SHELL_SESSION_MODE=classic gnome-session "$@"

debian/patches/gnome-session-classic-wrapper-script.patch

@@ -0,0 +1,30 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 30 Jan 2018 09:04:03 +0000
+Subject: Use a wrapper script to start GNOME classic session
+
+Xsession currently doesn't allow passing more then one argument, as it
+otherwise fails with
+Xsession: unable to launch "gnome-session --session classic" X session ---
+"gnome-session --session classic" not found; falling back to default session.
+
+This is due to [1]. Add a wrapper script to start the GNOME classic session
+as a workaround. Once [1] is fixed, this should be removed again.
+
+[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327.
+---
+ data/gnome-classic.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in
+index 13da2b5..d627655 100644
+--- a/data/gnome-classic.desktop.in
++++ b/data/gnome-classic.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=GNOME Classic
+ Comment=This session logs you into GNOME Classic
+-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
++Exec=gnome-session-classic
+ TryExec=gnome-session
+ Type=Application
+ DesktopNames=GNOME-Classic;GNOME;

debian/patches/series

@@ -0,0 +1 @@
+gnome-session-classic-wrapper-script.patch

debian/rules

@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-Dextension_set=all \
+		-Dclassic_mode=true

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/upstream/metadata

@@ -0,0 +1,5 @@
+---
+Bug-Database: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
+Bug-Submit: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/new
+Repository: https://gitlab.gnome.org/GNOME/gnome-shell-extensions.git
+Repository-Browse: https://gitlab.gnome.org/GNOME/gnome-shell-extensions

debian/watch

@@ -0,0 +1,4 @@
+version=4
+opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/" \
+https://download.gnome.org/sources/@PACKAGE@/cache.json \
+	[\d.]+/@PACKAGE@-@ANY_VERSION@@ARCHIVE_EXT@

export-zips.sh

@@ -7,30 +7,40 @@ builddir=`mktemp -p $srcdir -d _build.XXXXXX` || exit 1
 installdir=`mktemp -p $srcdir -d _install.XXXXXX` || exit 1
 
 meson setup --prefix=$installdir -Dextension_set=all $srcdir $builddir
-ninja -C$builddir install
+meson install -C $builddir
 
 rm -rf $srcdir/zip-files
 mkdir $srcdir/zip-files
 
 extensiondir=$installdir/share/gnome-shell/extensions
 schemadir=$installdir/share/glib-2.0/schemas
-localedir=$installdir/share/locale
 
 for f in $extensiondir/*; do
   name=`basename ${f%%@*}`
   uuid=$name@gnome-shell-extensions.gcampax.github.com
   schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml
 
-  cp $srcdir/NEWS $srcdir/COPYING $f
+  olddomain=gnome-shell-extensions
-  cp -r $localedir $f
+  newdomain=gnome-shell-extension-$name
+  sed -i "/gettext-domain/ s:$olddomain:$newdomain:" $f/metadata.json
 
-  if [ -f $schema ]; then
+  xgettext --from-code=UTF-8 --output-dir=$builddir --output=$name.pot $f/*.js
-    mkdir $f/schemas
+
-    cp $schema $f/schemas;
+  if [ -f $builddir/$name.pot ]; then
-    glib-compile-schemas $f/schemas
+    mkdir $f/po
+    for l in $(<$srcdir/po/LINGUAS); do
+      msgmerge --quiet --output-file=$f/po/$l.po \
+        $srcdir/po/$l.po $builddir/$name.pot
+    done
   fi
 
-  (cd $f && zip -rmq $srcdir/zip-files/$uuid.shell-extension.zip .)
+  cp $srcdir/NEWS $srcdir/COPYING $f
+  sources=(NEWS COPYING $(cd $f; ls *.js))
+
+  [ -f $schema ] || unset schema
+
+  gnome-extensions pack ${sources[@]/#/--extra-source=} \
+    ${schema:+--schema=$schema} --out-dir=$srcdir/zip-files $f
 done
 
 rm -rf $builddir

extensions/apps-menu/extension.js

@@ -12,8 +12,7 @@ const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = ExtensionUtils.gettext;
-const _ = Gettext.gettext;
 
 const appSys = Shell.AppSystem.get_default();
 
@@ -181,11 +180,14 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _onMotionEvent(actor, event) {
-        let device = event.get_device();
+        if (!this._grab) {
-        if (!device.get_grabbed_actor()) {
             this._oldX = -1;
             this._oldY = -1;
-            device.grab(this);
+            const grab = global.stage.grab(this);
+            if (grab.get_seat_state() !== Clutter.GrabState.NONE)
+                this._grab = grab;
+            else
+                grab.dismiss();
         }
         this.hover = true;
 
@@ -195,7 +197,8 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._oldX = -1;
         this._oldY = -1;
         this.hover = false;
-        device.ungrab();
+        this._grab?.dismiss();
+        delete this._grab;
 
         let source = event.get_source();
         if (source instanceof St.Widget)
@@ -363,17 +366,13 @@ class ApplicationsButton extends PanelMenu.Button {
         // role ATK_ROLE_MENU like other elements of the panel.
         this.accessible_role = Atk.Role.LABEL;
 
-        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,
         });
-        hbox.add_child(this._label);
-        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
-        this.add_actor(hbox);
+        this.add_actor(this._label);
         this.name = 'panelApplications';
         this.label_actor = this._label;
 
@@ -383,9 +382,12 @@ class ApplicationsButton extends PanelMenu.Button {
         this._hidingId = Main.overview.connect('hiding', () => {
             this.remove_accessible_state(Atk.StateType.CHECKED);
         });
-        Main.layoutManager.connect('startup-complete',
+        Main.wm.addKeybinding(
-            this._setKeybinding.bind(this));
+            'apps-menu-toggle-menu',
-        this._setKeybinding();
+            ExtensionUtils.getSettings(),
+            Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
+            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
+            () => this.menu.toggle());
 
         this._desktopTarget = new DesktopTarget();
         this._desktopTarget.connect('app-dropped', () => {
@@ -436,11 +438,7 @@ class ApplicationsButton extends PanelMenu.Button {
         this._tree.disconnect(this._treeChangedId);
         this._tree = null;
 
-        Main.wm.setCustomKeybindingHandler('panel-main-menu',
+        Main.wm.removeKeybinding('apps-menu-toggle-menu');
-            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
-            Main.sessionMode.hasOverview
-                ? Main.overview.toggle.bind(Main.overview)
-                : null);
 
         this._desktopTarget.destroy();
     }
@@ -482,12 +480,6 @@ class ApplicationsButton extends PanelMenu.Button {
         super._onOpenStateChanged(menu, open);
     }
 
-    _setKeybinding() {
-        Main.wm.setCustomKeybindingHandler('panel-main-menu',
-            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
-            () => this.menu.toggle());
-    }
-
     _redisplay() {
         this.applicationsBox.destroy_all_children();
         this.categoriesBox.destroy_all_children();
@@ -677,17 +669,20 @@ class ApplicationsButton extends PanelMenu.Button {
 
 let appsMenuButton;
 
+/** */
 function enable() {
     appsMenuButton = new ApplicationsButton();
     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();
 }
 
+/** */
 function init() {
     ExtensionUtils.initTranslations();
 }

extensions/apps-menu/meson.build

@@ -3,3 +3,4 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
+extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/apps-menu/metadata.json.in

@@ -1,6 +1,7 @@
 {
 "extension-id": "@extension_id@",
 "uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Applications Menu",
 "description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",

extensions/apps-menu/org.gnome.shell.extensions.apps-menu.gschema.xml

@@ -0,0 +1,12 @@
+<schemalist gettext-domain="gnome-shell-extensions">
+  <schema id="org.gnome.shell.extensions.apps-menu"
+          path="/org/gnome/shell/extensions/apps-menu/">
+    <key name="apps-menu-toggle-menu" type="as">
+      <default>["&lt;Alt&gt;F1"]</default>
+      <summary>Keybinding to open the applications menu</summary>
+      <description>
+        Keybinding to open the applications menu.
+      </description>
+    </key>
+  </schema>
+</schemalist>

extensions/auto-move-windows/extension.js

@@ -35,17 +35,16 @@ class WindowMover {
 
     _updateAppData() {
         let ids = [...this._appConfigs.keys()];
-        let removedApps = [...this._appData.keys()].filter(
+        let removedApps = [...this._appData.keys()]
-            a => !ids.includes(a.id)
+            .filter(a => !ids.includes(a.id));
-        );
         removedApps.forEach(app => {
             app.disconnect(this._appData.get(app).windowsChangedId);
             this._appData.delete(app);
         });
 
-        let addedApps = ids.map(id => this._appSystem.lookup_app(id)).filter(
+        let addedApps = ids
-            app => app && !this._appData.has(app)
+            .map(id => this._appSystem.lookup_app(id))
-        );
+            .filter(app => app && !this._appData.has(app));
         addedApps.forEach(app => {
             let data = {
                 windowsChangedId: app.connect('windows-changed',
@@ -73,7 +72,7 @@ class WindowMover {
     }
 
     _moveWindow(window, workspaceNum) {
-        if (window.skip_taskbar)
+        if (window.skip_taskbar || window.is_on_all_workspaces())
             return;
 
         // ensure we have the required number of workspaces
@@ -94,9 +93,9 @@ class WindowMover {
         // the window still exists and is just moved to a different workspace
         // or something; assume it'll be added back immediately, so keep it
         // to avoid moving it again
-        windows.push(...data.windows.filter(
+        windows.push(...data.windows.filter(w => {
-            w => !windows.includes(w) && w.get_compositor_private() !== null
+            return !windows.includes(w) && w.get_compositor_private() !== null;
-        ));
+        }));
 
         let workspaceNum = this._appConfigs.get(app.id);
         windows.filter(w => !data.windows.includes(w)).forEach(window => {
@@ -109,18 +108,24 @@ class WindowMover {
 let prevCheckWorkspaces;
 let winMover;
 
+/** */
 function init() {
     ExtensionUtils.initTranslations();
 }
 
+/**
+ * @returns {bool} - false (used as MetaLater handler)
+ */
 function myCheckWorkspaces() {
     let keepAliveWorkspaces = [];
     let foundNonEmpty = false;
     for (let i = this._workspaces.length - 1; i >= 0; i--) {
-        if (!foundNonEmpty)
+        if (!foundNonEmpty) {
-            foundNonEmpty = this._workspaces[i].list_windows().length > 0;
+            foundNonEmpty = this._workspaces[i].list_windows().some(
-        else if (!this._workspaces[i]._keepAliveId)
+                w => !w.is_on_all_workspaces());
+        } else if (!this._workspaces[i]._keepAliveId) {
             keepAliveWorkspaces.push(this._workspaces[i]);
+        }
     }
 
     // make sure the original method only removes empty workspaces at the end
@@ -131,6 +136,7 @@ function myCheckWorkspaces() {
     return false;
 }
 
+/** */
 function enable() {
     prevCheckWorkspaces = Main.wm._workspaceTracker._checkWorkspaces;
     Main.wm._workspaceTracker._checkWorkspaces = myCheckWorkspaces;
@@ -138,6 +144,7 @@ function enable() {
     winMover = new WindowMover();
 }
 
+/** */
 function disable() {
     Main.wm._workspaceTracker._checkWorkspaces = prevCheckWorkspaces;
     winMover.destroy();

extensions/auto-move-windows/prefs.js

@@ -2,281 +2,286 @@
 // Start apps on custom workspaces
 /* exported init buildPrefsWidget */
 
-const { Gio, GObject, Gtk } = imports.gi;
+const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-const N_ = e => e;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 
+const _ = ExtensionUtils.gettext;
+
 const SETTINGS_KEY = 'application-list';
 
 const WORKSPACE_MAX = 36; // compiled in limit of mutter
 
-const Columns = {
+const AutoMoveSettingsWidget = GObject.registerClass(
-    APPINFO: 0,
+class AutoMoveSettingsWidget extends Adw.PreferencesGroup {
-    DISPLAY_NAME: 1,
+    _init() {
-    ICON: 2,
+        super._init({
-    WORKSPACE: 3,
+            title: _('Workspace Rules'),
-    ADJUSTMENT: 4,
+        });
-};
 
-const Widget = GObject.registerClass(
+        this._list = new Gtk.ListBox({
-class Widget extends Gtk.Grid {
+            selection_mode: Gtk.SelectionMode.NONE,
-    _init(params) {
+            css_classes: ['boxed-list'],
-        super._init(params);
+        });
-        this.set_orientation(Gtk.Orientation.VERTICAL);
+        this.add(this._list);
+
+        this._list.append(new NewRuleRow());
+
+        this._actionGroup = new Gio.SimpleActionGroup();
+        this._list.insert_action_group('rules', this._actionGroup);
+
+        let action;
+        action = new Gio.SimpleAction({ name: 'add' });
+        action.connect('activate', this._onAddActivated.bind(this));
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({
+            name: 'remove',
+            parameter_type: new GLib.VariantType('s'),
+        });
+        action.connect('activate', this._onRemoveActivated.bind(this));
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({ name: 'update' });
+        action.connect('activate', () => {
+            this._settings.set_strv(SETTINGS_KEY,
+                this._getRuleRows().map(row => `${row.id}:${row.value}`));
+        });
+        this._actionGroup.add_action(action);
+        this._updateAction = action;
 
         this._settings = ExtensionUtils.getSettings();
-        this._settings.connect('changed', this._refresh.bind(this));
+        this._changedId = this._settings.connect('changed',
-        this._changedPermitted = false;
+            this._sync.bind(this));
+        this._sync();
 
-        this._store = new Gtk.ListStore();
+        this.connect('destroy', () => this._settings.run_dispose());
-        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.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
-
-        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);
-        let nameRenderer = new Gtk.CellRendererText();
-        appColumn.pack_start(nameRenderer, true);
-        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 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);
-        this._treeView.append_column(workspaceColumn);
-
-        scrolled.add(this._treeView);
-
-        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
-        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,
-        });
-        newButton.connect('clicked', this._createNew.bind(this));
-        toolbar.add(newButton);
-
-        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
-        delButton.connect('clicked', this._deleteSelected.bind(this));
-        toolbar.add(delButton);
-
-        let selection = this._treeView.get_selection();
-        selection.connect('changed', () => {
-            delButton.sensitive = selection.count_selected_rows() > 0;
-        });
-        delButton.sensitive = selection.count_selected_rows() > 0;
-
-        this._changedPermitted = true;
-        this._refresh();
     }
 
-    _createNew() {
+    _onAddActivated() {
-        let dialog = new Gtk.Dialog({
+        const dialog = new NewRuleDialog(this.get_root());
-            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);
-        dialog.set_default_response(Gtk.ResponseType.OK);
-
-        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());
-        });
-        let appInfo = dialog._appChooser.get_app_info();
-        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,
-            snap_to_ticks: true,
-        });
-        dialog._spin.set_value(1);
-        grid.attach(dialog._spin, 1, 1, 1, 1);
-        dialog.get_content_area().add(grid);
-
         dialog.connect('response', (dlg, id) => {
-            if (id !== Gtk.ResponseType.OK) {
+            const appInfo = id === Gtk.ResponseType.OK
-                dialog.destroy();
+                ? dialog.get_widget().get_app_info() : null;
-                return;
+            if (appInfo) {
+                this._settings.set_strv(SETTINGS_KEY, [
+                    ...this._settings.get_strv(SETTINGS_KEY),
+                    `${appInfo.get_id()}:1`,
+                ]);
             }
-
-            appInfo = dialog._appChooser.get_app_info();
-            if (!appInfo)
-                return;
-            let index = Math.floor(dialog._spin.value);
-            if (isNaN(index) || index < 0)
-                index = 1;
-
-            this._changedPermitted = false;
-            this._appendItem(appInfo.get_id(), index);
-            this._changedPermitted = true;
-
-            this._appendRow(appInfo, index);
-
             dialog.destroy();
         });
-        dialog.show_all();
+        dialog.show();
     }
 
-    _deleteSelected() {
+    _onRemoveActivated(action, param) {
-        let [any, model_, iter] = this._treeView.get_selection().get_selected();
+        const removed = param.deepUnpack();
-
+        this._settings.set_strv(SETTINGS_KEY,
-        if (any) {
+            this._settings.get_strv(SETTINGS_KEY).filter(entry => {
-            let appInfo = this._store.get_value(iter, Columns.APPINFO);
+                const [id] = entry.split(':');
-
+                return id !== removed;
-            this._changedPermitted = false;
+            }));
-            this._removeItem(appInfo.get_id());
-            this._changedPermitted = true;
-            this._store.remove(iter);
-        }
     }
 
-    _workspaceEdited(renderer, pathString, text) {
+    _getRuleRows() {
-        let index = parseInt(text);
+        return [...this._list].filter(row => !!row.id);
-        if (isNaN(index) || index < 0)
-            index = 1;
-        let path = Gtk.TreePath.new_from_string(pathString);
-        let [model_, iter] = this._store.get_iter(path);
-        let appInfo = this._store.get_value(iter, Columns.APPINFO);
-
-        this._changedPermitted = false;
-        this._changeItem(appInfo.get_id(), index);
-        this._store.set_value(iter, Columns.WORKSPACE, index);
-        this._changedPermitted = true;
     }
 
-    _refresh() {
+    _sync() {
-        if (!this._changedPermitted)
+        const oldRules = this._getRuleRows();
-            // Ignore this notification, model is being modified outside
+        const newRules = this._settings.get_strv(SETTINGS_KEY).map(entry => {
-            return;
+            const [id, value] = entry.split(':');
-
+            return { id, value };
-        this._store.clear();
-
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let validItems = [];
-        for (let i = 0; i < currentItems.length; i++) {
-            let [id, index] = currentItems[i].split(':');
-            let appInfo = Gio.DesktopAppInfo.new(id);
-            if (!appInfo)
-                continue;
-            validItems.push(currentItems[i]);
-
-            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) {
+        this._settings.block_signal_handler(this._changedId);
-        let items = this._settings.get_strv(SETTINGS_KEY);
+        this._updateAction.enabled = false;
-        return !items.some(i => i.startsWith(`${id}:`));
-    }
 
-    _appendItem(id, workspace) {
+        newRules.forEach(({ id, value }, index) => {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+            const row = oldRules.find(r => r.id === id);
-        currentItems.push(`${id}:${workspace}`);
+            const appInfo = row
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
+                ? null : Gio.DesktopAppInfo.new(id);
-    }
 
-    _removeItem(id) {
+            if (row)
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+                row.set({ value });
-        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+            else if (appInfo)
+                this._list.insert(new RuleRow(appInfo, value), index);
+        });
 
-        if (index < 0)
+        const removed = oldRules.filter(
-            return;
+            ({ id }) => !newRules.find(r => r.id === id));
-        currentItems.splice(index, 1);
+        removed.forEach(r => this._list.remove(r));
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
-    }
 
-    _changeItem(id, workspace) {
+        this._settings.unblock_signal_handler(this._changedId);
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        this._updateAction.enabled = true;
-        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
-
-        if (index < 0)
-            currentItems.push(`${id}:${workspace}`);
-        else
-            currentItems[index] = `${id}:${workspace}`;
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
     }
 });
 
+const WorkspaceSelector = GObject.registerClass({
+    Properties: {
+        'number': GObject.ParamSpec.uint(
+            'number', 'number', 'number',
+            GObject.ParamFlags.READWRITE,
+            1, WORKSPACE_MAX, 1),
+    },
+}, class WorkspaceSelector extends Gtk.Widget {
+    static _classInit(klass) {
+        super._classInit(klass);
 
+        klass.set_layout_manager_type(Gtk.BoxLayout);
+
+        return klass;
+    }
+
+    _init() {
+        super._init();
+
+        this.layout_manager.spacing = 6;
+
+        const label = new Gtk.Label({
+            xalign: 1,
+            margin_end: 6,
+        });
+        this.bind_property('number',
+            label, 'label',
+            GObject.BindingFlags.SYNC_CREATE);
+        label.set_parent(this);
+
+        const buttonProps = {
+            css_classes: ['circular'],
+            valign: Gtk.Align.CENTER,
+        };
+
+        this._decButton = new Gtk.Button({
+            icon_name: 'list-remove-symbolic',
+            ...buttonProps,
+        });
+        this._decButton.set_parent(this);
+        this._decButton.connect('clicked', () => this.number--);
+
+        this._incButton = new Gtk.Button({
+            icon_name: 'list-add-symbolic',
+            ...buttonProps,
+        });
+        this._incButton.set_parent(this);
+        this._incButton.connect('clicked', () => this.number++);
+
+        this.connect('notify::number', () => this._syncButtons());
+        this._syncButtons();
+    }
+
+    _syncButtons() {
+        this._decButton.sensitive = this.number > 1;
+        this._incButton.sensitive = this.number < WORKSPACE_MAX;
+    }
+});
+
+const RuleRow = GObject.registerClass({
+    Properties: {
+        'id': GObject.ParamSpec.string(
+            'id', 'id', 'id',
+            GObject.ParamFlags.READABLE,
+            ''),
+        'value': GObject.ParamSpec.uint(
+            'value', 'value', 'value',
+            GObject.ParamFlags.READWRITE,
+            1, WORKSPACE_MAX, 1),
+    },
+}, class RuleRow extends Adw.ActionRow {
+    _init(appInfo, value) {
+        super._init({
+            activatable: false,
+            title: appInfo.get_display_name(),
+            value,
+        });
+        this._appInfo = appInfo;
+
+        const icon = new Gtk.Image({
+            css_classes: ['icon-dropshadow'],
+            gicon: appInfo.get_icon(),
+            pixel_size: 32,
+        });
+        this.add_prefix(icon);
+
+        const wsButton = new WorkspaceSelector();
+        this.bind_property('value',
+            wsButton, 'number',
+            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
+        this.add_suffix(wsButton);
+
+        const button = new Gtk.Button({
+            action_name: 'rules.remove',
+            action_target: new GLib.Variant('s', this.id),
+            icon_name: 'edit-delete-symbolic',
+            has_frame: false,
+            valign: Gtk.Align.CENTER,
+        });
+        this.add_suffix(button);
+
+        this.connect('notify::value',
+            () => this.activate_action('rules.update', null));
+    }
+
+    get id() {
+        return this._appInfo.get_id();
+    }
+});
+
+const NewRuleRow = GObject.registerClass(
+class NewRuleRow extends Gtk.ListBoxRow {
+    _init() {
+        super._init({
+            action_name: 'rules.add',
+            child: new Gtk.Image({
+                icon_name: 'list-add-symbolic',
+                pixel_size: 16,
+                margin_top: 12,
+                margin_bottom: 12,
+                margin_start: 12,
+                margin_end: 12,
+            }),
+        });
+        this.update_property(
+            [Gtk.AccessibleProperty.LABEL], [_('Add Rule')]);
+    }
+});
+
+const NewRuleDialog = GObject.registerClass(
+class NewRuleDialog extends Gtk.AppChooserDialog {
+    _init(parent) {
+        super._init({
+            transient_for: parent,
+            modal: true,
+        });
+
+        this._settings = ExtensionUtils.getSettings();
+
+        this.get_widget().set({
+            show_all: true,
+            show_other: true, // hide more button
+        });
+
+        this.get_widget().connect('application-selected',
+            this._updateSensitivity.bind(this));
+        this._updateSensitivity();
+    }
+
+    _updateSensitivity() {
+        const rules = this._settings.get_strv(SETTINGS_KEY);
+        const appInfo = this.get_widget().get_app_info();
+        this.set_response_sensitive(Gtk.ResponseType.OK,
+            appInfo && !rules.some(i => i.startsWith(appInfo.get_id())));
+    }
+});
+
+/** */
 function init() {
     ExtensionUtils.initTranslations();
 }
 
+/**
+ * @returns {Gtk.Widget} - the prefs widget
+ */
 function buildPrefsWidget() {
-    let widget = new Widget({ margin: 12 });
+    return new AutoMoveSettingsWidget();
-    widget.show_all();
-
-    return widget;
 }

extensions/drive-menu/extension.js

@@ -1,9 +1,6 @@
 /* exported init enable disable */
 // Drive menu extension
-const { Gio, GObject, Shell, St } = imports.gi;
+const { Clutter, 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;
@@ -11,12 +8,22 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
+const _ = ExtensionUtils.gettext;
+
+Gio._promisify(Gio.File.prototype, 'query_filesystem_info_async');
+
 var MountMenuItem = GObject.registerClass(
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     _init(mount) {
-        super._init();
+        super._init({
+            style_class: 'drive-menu-item',
+        });
 
-        this.label = new St.Label({ text: mount.get_name() });
+        this.label = new St.Label({
+            text: mount.get_name(),
+            x_expand: true,
+            y_align: Clutter.ActorAlign.CENTER,
+        });
         this.add_child(this.label);
         this.label_actor = this.label;
 
@@ -28,10 +35,15 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
             icon_name: 'media-eject-symbolic',
             style_class: 'popup-menu-icon',
         });
-        let ejectButton = new St.Button({ child: ejectIcon });
+        let ejectButton = new St.Button({
+            child: ejectIcon,
+            style_class: 'button',
+        });
         ejectButton.connect('clicked', this._eject.bind(this));
         this.add(ejectButton);
 
+        this.hide();
+
         this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
         this._syncVisibility();
     }
@@ -45,7 +57,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
         super.destroy();
     }
 
-    _isInteresting() {
+    async _isInteresting() {
         if (!this.mount.can_eject() && !this.mount.can_unmount())
             return false;
         if (this.mount.is_shadowed())
@@ -53,17 +65,25 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         let volume = this.mount.get_volume();
 
-        if (!volume) {
+        if (volume)
-            // probably a GDaemonMount, could be network or
+            return volume.get_identifier('class') !== 'network';
-            // local, but we can't tell; assume it's local for now
+
-            return true;
+        const root = this.mount.get_root();
+
+        try {
+            const attr = Gio.FILE_ATTRIBUTE_FILESYSTEM_REMOTE;
+            const info = await root.query_filesystem_info_async(attr, null);
+            return !info.get_attribute_boolean(attr);
+        } catch (e) {
+            log(`Failed to query filesystem: ${e.message}`);
         }
 
-        return volume.get_identifier('class') !== 'network';
+        // Hack, fall back to looking at GType
+        return Gio._LocalFilePrototype.isPrototypeOf(root);
     }
 
-    _syncVisibility() {
+    async _syncVisibility() {
-        this.visible = this._isInteresting();
+        this.visible = await this._isInteresting();
     }
 
     _eject() {
@@ -118,21 +138,16 @@ class DriveMenu extends PanelMenu.Button {
     _init() {
         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',
         });
 
-        hbox.add_child(icon);
+        this.add_child(icon);
-        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-        this.add_child(hbox);
 
         this._monitor = Gio.VolumeMonitor.get();
-        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
+        this._addedId = this._monitor.connect('mount-added',
-            this._addMount(mount);
+            (monitor, mount) => this._addMount(mount));
-            this._updateMenuVisibility();
-        });
         this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
             this._removeMount(mount);
             this._updateMenuVisibility();
@@ -163,6 +178,8 @@ class DriveMenu extends PanelMenu.Button {
         let item = new MountMenuItem(mount);
         this._mounts.unshift(item);
         this.menu.addMenuItem(item, 0);
+
+        item.connect('notify::visible', () => this._updateMenuVisibility());
     }
 
     _removeMount(mount) {
@@ -189,17 +206,20 @@ class DriveMenu extends PanelMenu.Button {
     }
 });
 
+/** */
 function init() {
     ExtensionUtils.initTranslations();
 }
 
 let _indicator;
 
+/** */
 function enable() {
     _indicator = new DriveMenu();
     Main.panel.addToStatusArea('drive-menu', _indicator);
 }
 
+/** */
 function disable() {
     _indicator.destroy();
 }

extensions/drive-menu/stylesheet.css

@@ -1 +1,7 @@
-/* This extensions requires no custom styling */
+.drive-menu-item { spacing: 12px; }
+
+.drive-menu-item .button {
+  border-radius: 99px;
+  padding: 3px;
+  min-height: auto;
+}

extensions/horizontal-workspaces/extension.js

@@ -1,38 +0,0 @@
-/* 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

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

extensions/horizontal-workspaces/metadata.json.in

@@ -1,10 +0,0 @@
-{
-"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

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

extensions/launch-new-instance/extension.js

@@ -3,6 +3,7 @@ const AppDisplay = imports.ui.appDisplay;
 
 let _activateOriginal = null;
 
+/** */
 function enable() {
     _activateOriginal = AppDisplay.AppIcon.prototype.activate;
     AppDisplay.AppIcon.prototype.activate = function () {
@@ -10,6 +11,7 @@ function enable() {
     };
 }
 
+/** */
 function disable() {
     AppDisplay.AppIcon.prototype.activate = _activateOriginal;
 }

extensions/meson.build

@@ -3,7 +3,7 @@ js_sources = []
 
 metadata_name = 'metadata.json'
 
-foreach e : all_extensions
+foreach e : enabled_extensions
   uuid = e + uuid_suffix
 
   metadata_conf = configuration_data()
@@ -19,27 +19,11 @@ foreach e : all_extensions
 
   subdir(e)
 
-  js_sources += extension_sources
+  install_data (extension_sources + extension_data,
-
+    install_dir: join_paths(extensiondir, uuid)
-  if (enabled_extensions.contains(e))
+  )
-    install_data (extension_sources + extension_data,
-      install_dir: join_paths(extensiondir, uuid)
-    )
-  endif
 endforeach
 
 install_data (extension_schemas,
   install_dir: schemadir
 )
-
-foreach js_source : js_sources
-  if (js68.found())
-    path_array = '@0@'.format(js_source).split('/')
-    name = join_paths(path_array[-2], path_array[-1])
-
-    test('Checking syntax of ' + name, js68,
-      args: ['-s', '-c', js_source],
-      workdir: meson.current_source_dir()
-    )
-  endif
-endforeach

extensions/native-window-placement/extension.js

@@ -1,6 +1,10 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported enable disable */
+const { Clutter } = imports.gi;
+
 const ExtensionUtils = imports.misc.extensionUtils;
+const Main = imports.ui.main;
+const { WindowPreview } = imports.ui.windowPreview;
 const Workspace = imports.ui.workspace;
 
 // testing settings for natural window placement strategy:
@@ -63,13 +67,15 @@ class Rect {
 }
 
 class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
-    constructor(settings) {
+    constructor(params, settings) {
-        super();
+        super(params);
         this._settings = settings;
     }
 
-    computeLayout(windows, layout) {
+    computeLayout(windows, _params) {
-        layout.windows = windows;
+        return {
+            windows,
+        };
     }
 
     /*
@@ -100,7 +106,6 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
             direction++;
             if (direction === 4)
                 direction = 0;
-
         }
 
         let loopCounter = 0;
@@ -221,8 +226,10 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
         for (let i = 0; i < rects.length; i++) {
             rects[i].x = rects[i].x * scale + areaRect.x;
             rects[i].y = rects[i].y * scale + areaRect.y;
+            rects[i].width *= scale;
+            rects[i].height *= scale;
 
-            slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
+            slots.push([rects[i].x, rects[i].y, rects[i].width, rects[i].height, clones[i]]);
         }
 
         return slots;
@@ -231,37 +238,57 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
 
 let winInjections, workspaceInjections;
 
+/** */
 function resetState() {
     winInjections = { };
     workspaceInjections = { };
 }
 
+/** */
 function enable() {
     resetState();
 
     let settings = ExtensionUtils.getSettings();
 
-    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
+    workspaceInjections['_createBestLayout'] = Workspace.WorkspaceLayout.prototype._createBestLayout;
-    Workspace.Workspace.prototype._getBestLayout = function (windows) {
+    Workspace.WorkspaceLayout.prototype._createBestLayout = function (_area) {
-        let strategy = new NaturalLayoutStrategy(settings);
+        this._layoutStrategy = new NaturalLayoutStrategy({
-        let layout = { strategy };
+            monitor: Main.layoutManager.monitors[this._monitorIndex],
-        strategy.computeLayout(windows, layout);
+        }, settings);
-
+        return this._layoutStrategy.computeLayout(this._sortedWindows);
-        return layout;
     };
 
     // position window titles on top of windows in overlay
-    winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+    winInjections['_init'] = WindowPreview.prototype._init;
-    Workspace.WindowOverlay.prototype.relayout = function (animate) {
+    WindowPreview.prototype._init = function (...args) {
-        if (settings.get_boolean('window-captions-on-top')) {
+        winInjections['_init'].call(this, ...args);
-            let [, , , cloneHeight] = this._windowClone.slot;
-            this.title.translation_y = -cloneHeight;
-        }
 
-        winInjections['relayout'].call(this, animate);
+        if (!settings.get_boolean('window-captions-on-top'))
+            return;
+
+        const alignConstraint = this._title.get_constraints().find(
+            c => c.align_axis && c.align_axis === Clutter.AlignAxis.Y_AXIS);
+        alignConstraint.factor = 0;
+
+        const bindConstraint = this._title.get_constraints().find(
+            c => c.coordinate && c.coordinate === Clutter.BindCoordinate.Y);
+        bindConstraint.offset = 0;
+    };
+    winInjections['_adjustOverlayOffsets'] =
+        WindowPreview.prototype._adjustOverlayOffsets;
+    WindowPreview.prototype._adjustOverlayOffsets = function (...args) {
+        winInjections['_adjustOverlayOffsets'].call(this, ...args);
+
+        if (settings.get_boolean('window-captions-on-top'))
+            this._title.translation_y = -this._title.translation_y;
     };
 }
 
+/**
+ * @param {Object} object - object that was modified
+ * @param {Object} injection - the map of previous injections
+ * @param {string} name - the @injection key that should be removed
+ */
 function removeInjection(object, injection, name) {
     if (injection[name] === undefined)
         delete object[name];
@@ -269,13 +296,14 @@ function removeInjection(object, injection, name) {
         object[name] = injection[name];
 }
 
+/** */
 function disable() {
     var i;
 
     for (i in workspaceInjections)
-        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
+        removeInjection(Workspace.WorkspaceLayout.prototype, workspaceInjections, i);
     for (i in winInjections)
-        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
+        removeInjection(WindowPreview.prototype, winInjections, i);
 
     global.stage.queue_relayout();
     resetState();

extensions/native-window-placement/stylesheet.css

@@ -1,9 +1 @@
-.window-caption {
+/* This extensions requires no special styling */
-    -shell-caption-spacing: 13px;		/* current caption height is 26px => set it to half of it. TODO: better solution needed */
-}
-
-.window-picker {
-    -horizontal-spacing: 32px;
-    -vertical-spacing: 32px;
-    padding: 64px 32px;
-}

extensions/places-menu/extension.js

@@ -8,19 +8,20 @@ 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 N_ = x => x;
-
 const Me = ExtensionUtils.getCurrentExtension();
 const PlaceDisplay = Me.imports.placeDisplay;
 
+const _ = ExtensionUtils.gettext;
+const N_ = x => x;
+
 const PLACE_ICON_SIZE = 16;
 
 var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
     _init(info) {
-        super._init();
+        super._init({
+            style_class: 'place-menu-item',
+        });
         this._info = info;
 
         this._icon = new St.Icon({
@@ -29,7 +30,11 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
         });
         this.add_child(this._icon);
 
-        this._label = new St.Label({ text: info.name, x_expand: true });
+        this._label = new St.Label({
+            text: info.name,
+            x_expand: true,
+            y_align: Clutter.ActorAlign.CENTER,
+        });
         this.add_child(this._label);
 
         if (info.isRemovable()) {
@@ -37,7 +42,10 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
                 icon_name: 'media-eject-symbolic',
                 style_class: 'popup-menu-icon',
             });
-            this._ejectButton = new St.Button({ child: this._ejectIcon });
+            this._ejectButton = new St.Button({
+                child: this._ejectIcon,
+                style_class: 'button',
+            });
             this._ejectButton.connect('clicked', info.eject.bind(info));
             this.add_child(this._ejectButton);
         }
@@ -79,15 +87,12 @@ class PlacesMenu extends PanelMenu.Button {
     _init() {
         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,
         });
-        hbox.add_child(label);
+        this.add_actor(label);
-        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-        this.add_actor(hbox);
 
         this.placesManager = new PlaceDisplay.PlacesManager();
 
@@ -127,12 +132,14 @@ class PlacesMenu extends PanelMenu.Button {
     }
 });
 
+/** */
 function init() {
     ExtensionUtils.initTranslations();
 }
 
 let _indicator;
 
+/** */
 function enable() {
     _indicator = new PlacesMenu();
 
@@ -142,6 +149,7 @@ function enable() {
     Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }
 
+/** */
 function disable() {
     _indicator.destroy();
 }

extensions/places-menu/placeDisplay.js

@@ -3,13 +3,16 @@
 const { Gio, GLib, Shell } = imports.gi;
 const Signals = imports.signals;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = ExtensionUtils.gettext;
-const _ = Gettext.gettext;
 const N_ = x => x;
 
+Gio._promisify(Gio.AppInfo, 'launch_default_for_uri_async');
+Gio._promisify(Gio.File.prototype, 'mount_enclosing_volume');
+
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
 
 const Hostname1Iface = '<node> \
@@ -40,7 +43,7 @@ class PlaceInfo {
 
     async _ensureMountAndLaunch(context, tryMount) {
         try {
-            await this._launchDefaultForUri(this.file.get_uri(), context, null);
+            await Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(), context, null);
         } catch (err) {
             if (!err.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
                 Main.notifyError(_('Failed to launch “%s”').format(this.name), err.message);
@@ -52,7 +55,7 @@ class PlaceInfo {
             };
             let op = new ShellMountOperation.ShellMountOperation(source);
             try {
-                await this._mountEnclosingVolume(0, op.mountOp, null);
+                await this.file.mount_enclosing_volume(0, op.mountOp, null);
 
                 if (tryMount)
                     this._ensureMountAndLaunch(context, false);
@@ -114,32 +117,6 @@ 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);
 
@@ -194,7 +171,7 @@ class PlaceDeviceInfo extends PlaceInfo {
     }
 
     isRemovable() {
-        return this._mount.can_eject();
+        return this._mount.can_eject() || this._mount.can_unmount();
     }
 
     eject() {
@@ -486,7 +463,6 @@ var PlacesManager = class {
     }
 
     _reloadBookmarks() {
-
         this._bookmarks = [];
 
         let content = Shell.get_file_contents_utf8_sync(this._bookmarksFile.get_path());

extensions/places-menu/stylesheet.css

@@ -1 +1,8 @@
-/* none used*/
+.place-menu-item .button {
+  border-radius: 99px;
+  padding: 3px;
+  min-height: auto;
+}
+
+.place-menu-item .button:ltr { margin-left: 6px; }
+.place-menu-item .button:rtl { margin-right: 6px; }

extensions/screenshot-window-sizer/extension.js

@@ -28,11 +28,15 @@ const MESSAGE_FADE_TIME = 2000;
 
 let text;
 
+/** */
 function hideMessage() {
     text.destroy();
     text = null;
 }
 
+/**
+ * @param {string} message - the message to flash
+ */
 function flashMessage(message) {
     if (!text) {
         text = new St.Label({ style_class: 'screenshot-sizer-message' });
@@ -67,6 +71,11 @@ let SIZES = [
     [720, 360], // Phone landscape fullscreen
 ];
 
+/**
+ * @param {Meta.Display} display - the display
+ * @param {Meta.Window=} window - for per-window bindings, the window
+ * @param {Meta.KeyBinding} binding - the key binding
+ */
 function cycleScreenshotSizes(display, window, binding) {
     // Probably this isn't useful with 5 sizes, but you can decrease instead
     // of increase by holding down shift.
@@ -133,6 +142,7 @@ function cycleScreenshotSizes(display, window, binding) {
     flashMessage(message);
 }
 
+/** */
 function enable() {
     Main.wm.addKeybinding(
         'cycle-screenshot-sizes',
@@ -148,6 +158,7 @@ function enable() {
         cycleScreenshotSizes);
 }
 
+/** */
 function disable() {
     Main.wm.removeKeybinding('cycle-screenshot-sizes');
     Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');

extensions/user-theme/extension.js

@@ -2,28 +2,26 @@
 // Load shell theme from ~/.local/share/themes/name/gnome-shell
 /* exported init */
 
-const { Gio, GLib } = imports.gi;
+const { Gio } = imports.gi;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 
+const Me = ExtensionUtils.getCurrentExtension();
+const Util = Me.imports.util;
+
 const SETTINGS_KEY = 'name';
 
 class ThemeManager {
-    constructor() {
-        this._settings = ExtensionUtils.getSettings();
-    }
-
     enable() {
-        this._changedId = this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
+        this._settings = ExtensionUtils.getSettings();
+        this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
         this._changeTheme();
     }
 
     disable() {
-        if (this._changedId) {
+        this._settings?.run_dispose();
-            this._settings.disconnect(this._changedId);
+        this._settings = null;
-            this._changedId = 0;
-        }
 
         Main.setThemeStylesheet(null);
         Main.loadTheme();
@@ -34,13 +32,11 @@ class ThemeManager {
         let themeName = this._settings.get_string(SETTINGS_KEY);
 
         if (themeName) {
-            let stylesheetPaths = [
+            const stylesheetPaths = Util.getThemeDirs()
-                [GLib.get_home_dir(), '.themes'],
+                .map(dir => `${dir}/${themeName}/gnome-shell/gnome-shell.css`);
-                [GLib.get_user_data_dir(), 'themes'],
+
-                ...GLib.get_system_data_dirs().map(dir => [dir, 'themes']),
+            stylesheetPaths.push(...Util.getModeThemeDirs()
-            ].map(themeDir => GLib.build_filenamev([
+                .map(dir => `${dir}/${themeName}.css`));
-                ...themeDir, themeName, 'gnome-shell', 'gnome-shell.css',
-            ]));
 
             stylesheet = stylesheetPaths.find(path => {
                 let file = Gio.file_new_for_path(path);
@@ -57,6 +53,9 @@ class ThemeManager {
     }
 }
 
+/**
+ * @returns {ThemeManager} - the extension state object
+ */
 function init() {
     return new ThemeManager();
 }

extensions/user-theme/meson.build

@@ -4,4 +4,5 @@ extension_data += configure_file(
   configuration: metadata_conf
 )
 
+extension_sources += files('prefs.js', 'util.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/user-theme/prefs.js

@@ -0,0 +1,131 @@
+// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
+
+// we use async/await here to not block the mainloop, not to parallelize
+/* eslint-disable no-await-in-loop */
+
+const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+
+const Me = ExtensionUtils.getCurrentExtension();
+const Util = Me.imports.util;
+
+Gio._promisify(Gio.File.prototype, 'enumerate_children_async');
+Gio._promisify(Gio.File.prototype, 'query_info_async');
+Gio._promisify(Gio.FileEnumerator.prototype, 'next_files_async');
+
+const UserThemePrefsWidget = GObject.registerClass(
+class UserThemePrefsWidget extends Adw.PreferencesGroup {
+    _init() {
+        super._init({ title: 'Themes' });
+
+        this._actionGroup = new Gio.SimpleActionGroup();
+        this.insert_action_group('theme', this._actionGroup);
+
+        this._settings = ExtensionUtils.getSettings();
+        this._actionGroup.add_action(
+            this._settings.create_action('name'));
+
+        this.connect('destroy', () => this._settings.run_dispose());
+
+        this._rows = new Map();
+        this._addTheme(''); // default
+
+        this._collectThemes();
+    }
+
+    async _collectThemes() {
+        for (const dirName of Util.getThemeDirs()) {
+            const dir = Gio.File.new_for_path(dirName);
+            for (const name of await this._enumerateDir(dir)) {
+                if (this._rows.has(name))
+                    continue;
+
+                const file = dir.resolve_relative_path(
+                    `${name}/gnome-shell/gnome-shell.css`);
+                try {
+                    await file.query_info_async(
+                        Gio.FILE_ATTRIBUTE_STANDARD_NAME,
+                        Gio.FileQueryInfoFlags.NONE,
+                        GLib.PRIORITY_DEFAULT, null);
+                    this._addTheme(name);
+                } catch (e) {
+                    if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                        logError(e);
+                }
+            }
+        }
+
+        for (const dirName of Util.getModeThemeDirs()) {
+            const dir = Gio.File.new_for_path(dirName);
+            for (const filename of await this._enumerateDir(dir)) {
+                if (!filename.endsWith('.css'))
+                    continue;
+
+                const name = filename.slice(0, -4);
+                if (!this._rows.has(name))
+                    this._addTheme(name);
+            }
+        }
+    }
+
+    _addTheme(name) {
+        const row = new ThemeRow(name);
+        this._rows.set(name, row);
+
+        this.add(row);
+    }
+
+    async _enumerateDir(dir) {
+        const fileInfos = [];
+        let fileEnum;
+
+        try {
+            fileEnum = await dir.enumerate_children_async(
+                Gio.FILE_ATTRIBUTE_STANDARD_NAME,
+                Gio.FileQueryInfoFlags.NONE,
+                GLib.PRIORITY_DEFAULT, null);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                logError(e);
+            return [];
+        }
+
+        let infos;
+        do {
+            infos = await fileEnum.next_files_async(100,
+                GLib.PRIORITY_DEFAULT, null);
+            fileInfos.push(...infos);
+        } while (infos.length > 0);
+
+        return fileInfos.map(info => info.get_name());
+    }
+});
+
+const ThemeRow = GObject.registerClass(
+class ThemeRow extends Adw.ActionRow {
+    _init(name) {
+        const check = new Gtk.CheckButton({
+            action_name: 'theme.name',
+            action_target: new GLib.Variant('s', name),
+        });
+
+        super._init({
+            title: name || 'Default',
+            activatable_widget: check,
+        });
+        this.add_prefix(check);
+    }
+});
+
+/** */
+function init() {
+}
+
+/**
+ * @returns {Gtk.Widget} - the prefs widget
+ */
+function buildPrefsWidget() {
+    return new UserThemePrefsWidget();
+}

extensions/user-theme/util.js

@@ -0,0 +1,23 @@
+/* exported getThemeDirs getModeThemeDirs */
+const { GLib } = imports.gi;
+
+const fn = (...args) => GLib.build_filenamev(args);
+
+/**
+ * @returns {string[]} - an ordered list of theme directories
+ */
+function getThemeDirs() {
+    return [
+        fn(GLib.get_home_dir(), '.themes'),
+        fn(GLib.get_user_data_dir(), 'themes'),
+        ...GLib.get_system_data_dirs().map(dir => fn(dir, 'themes')),
+    ];
+}
+
+/**
+ * @returns {string[]} - an ordered list of mode theme directories
+ */
+function getModeThemeDirs() {
+    return GLib.get_system_data_dirs()
+        .map(dir => fn(dir, 'gnome-shell', 'theme'));
+}

extensions/window-list/classic.css

@@ -50,11 +50,12 @@
 
 /* workspace switcher */
 .window-list-workspace-indicator .workspace {
-  background-color: #ddd;
+  border: 2px solid #f6f5f4;
+  background-color: #ccc;
 }
 
 .window-list-workspace-indicator .workspace.active {
-  background-color: #ccc;
+  border-color: #888;
 }
 
 .window-list-window-preview {
@@ -64,5 +65,4 @@
 
 .window-list-window-preview.active {
   background-color: #f6f5f4;
-  border: 2px solid #888;
 }

extensions/window-list/extension.js

@@ -11,8 +11,7 @@ const Me = ExtensionUtils.getCurrentExtension();
 const { WindowPicker, WindowPickerToggle } = Me.imports.windowPicker;
 const { WorkspaceIndicator } = Me.imports.workspaceIndicator;
 
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = ExtensionUtils.gettext;
-const _ = Gettext.gettext;
 
 const ICON_TEXTURE_SIZE = 24;
 const DND_ACTIVATE_TIMEOUT = 500;
@@ -23,34 +22,10 @@ const GroupingMode = {
     ALWAYS: 2,
 };
 
-
+/**
-function _minimizeOrActivateWindow(window) {
+ * @param {Shell.App} app - an app
-    let focusWindow = global.display.focus_window;
+ * @returns {number} - the smallest stable sequence of the app's windows
-    if (focusWindow === window ||
+ */
-        focusWindow && focusWindow.get_transient_for() === window)
-        window.minimize();
-    else
-        window.activate(global.get_current_time());
-}
-
-function _openMenu(menu) {
-    menu.open();
-
-    let event = Clutter.get_current_event();
-    if (event && event.type() === Clutter.EventType.KEY_RELEASE)
-        menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-}
-
-function _onMenuStateChanged(menu, isOpen) {
-    if (isOpen)
-        return;
-
-    let [x, y] = global.get_pointer();
-    let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
-    if (Me.stateObj.someWindowListContains(actor))
-        actor.sync_hover();
-}
-
 function _getAppStableSequence(app) {
     let windows = app.get_windows().filter(w => !w.skip_taskbar);
     return windows.reduce((prev, cur) => {
@@ -58,7 +33,6 @@ function _getAppStableSequence(app) {
     }, Infinity);
 }
 
-
 class WindowContextMenu extends PopupMenu.PopupMenu {
     constructor(source, metaWindow) {
         super(source, 0.5, St.Side.BOTTOM);
@@ -220,13 +194,12 @@ const BaseButton = GObject.registerClass({
 
         super._init({
             style_class: 'window-button',
-            x_fill: true,
-            y_fill: true,
             can_focus: true,
+            x_expand: true,
             button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
         });
 
-        this.connect('allocation-changed',
+        this.connect('notify::allocation',
             this._updateIconGeometry.bind(this));
         this.connect('clicked', this._onClicked.bind(this));
         this.connect('destroy', this._onDestroy.bind(this));
@@ -283,10 +256,37 @@ const BaseButton = GObject.registerClass({
         return true;
     }
 
+    _openMenu(menu) {
+        menu.open();
+
+        let event = Clutter.get_current_event();
+        if (event && event.type() === Clutter.EventType.KEY_RELEASE)
+            menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+    }
+
+    _minimizeOrActivateWindow(window) {
+        let focusWindow = global.display.focus_window;
+        if (focusWindow === window ||
+            focusWindow && focusWindow.get_transient_for() === window)
+            window.minimize();
+        else
+            window.activate(global.get_current_time());
+    }
+
+    _onMenuStateChanged(menu, isOpen) {
+        if (isOpen)
+            return;
+
+        let [x, y] = global.get_pointer();
+        let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
+        if (Me.stateObj.someWindowListContains(actor))
+            actor.sync_hover();
+    }
+
     _onPopupMenu(_actor) {
         if (!this._canOpenPopupMenu() || this._contextMenu.isOpen)
             return;
-        _openMenu(this._contextMenu);
+        this._openMenu(this._contextMenu);
     }
 
     _isFocused() {
@@ -353,6 +353,9 @@ class WindowButton extends BaseButton {
         super._init(perMonitor, monitorIndex);
 
         this.metaWindow = metaWindow;
+        this._skipTaskbarId = metaWindow.connect('notify::skip-taskbar', () => {
+            this._updateVisibility();
+        });
         this._updateVisibility();
 
         this._windowTitle = new WindowTitle(this.metaWindow);
@@ -360,7 +363,8 @@ class WindowButton extends BaseButton {
         this.label_actor = this._windowTitle.label_actor;
 
         this._contextMenu = new WindowContextMenu(this, this.metaWindow);
-        this._contextMenu.connect('open-state-changed', _onMenuStateChanged);
+        this._contextMenu.connect('open-state-changed',
+            this._onMenuStateChanged.bind(this));
         this._contextMenu.actor.hide();
         this._contextMenuManager.addMenu(this._contextMenu);
         Main.uiGroup.add_actor(this._contextMenu.actor);
@@ -380,9 +384,9 @@ class WindowButton extends BaseButton {
         }
 
         if (button === 1)
-            _minimizeOrActivateWindow(this.metaWindow);
+            this._minimizeOrActivateWindow(this.metaWindow);
         else
-            _openMenu(this._contextMenu);
+            this._openMenu(this._contextMenu);
     }
 
     _isFocused() {
@@ -413,6 +417,7 @@ class WindowButton extends BaseButton {
 
     _onDestroy() {
         super._onDestroy();
+        this.metaWindow.disconnect(this._skipTaskbarId);
         this.metaWindow.disconnect(this._workspaceChangedId);
         global.display.disconnect(this._notifyFocusId);
         this._contextMenu.destroy();
@@ -491,8 +496,6 @@ class AppButton extends BaseButton {
 
         this._singleWindowTitle = new St.Bin({
             x_expand: true,
-            y_fill: true,
-            x_align: St.Align.START,
         });
         stack.add_actor(this._singleWindowTitle);
 
@@ -517,14 +520,16 @@ class AppButton extends BaseButton {
 
         this._menuManager = new PopupMenu.PopupMenuManager(this);
         this._menu = new PopupMenu.PopupMenu(this, 0.5, St.Side.BOTTOM);
-        this._menu.connect('open-state-changed', _onMenuStateChanged);
+        this._menu.connect('open-state-changed',
+            this._onMenuStateChanged.bind(this));
         this._menu.actor.hide();
         this._menu.connect('activate', this._onMenuActivate.bind(this));
         this._menuManager.addMenu(this._menu);
         Main.uiGroup.add_actor(this._menu.actor);
 
         this._appContextMenu = new AppContextMenu(this);
-        this._appContextMenu.connect('open-state-changed', _onMenuStateChanged);
+        this._appContextMenu.connect('open-state-changed',
+            this._onMenuStateChanged.bind(this));
         this._appContextMenu.actor.hide();
         Main.uiGroup.add_actor(this._appContextMenu.actor);
 
@@ -591,7 +596,7 @@ class AppButton extends BaseButton {
                 this._singleWindowTitle.child = this._windowTitle;
                 this._windowContextMenu = new WindowContextMenu(this, this.metaWindow);
                 this._windowContextMenu.connect(
-                    'open-state-changed', _onMenuStateChanged);
+                    'open-state-changed', this._onMenuStateChanged.bind(this));
                 Main.uiGroup.add_actor(this._windowContextMenu.actor);
                 this._windowContextMenu.actor.hide();
                 this._contextMenuManager.addMenu(this._windowContextMenu);
@@ -611,7 +616,6 @@ class AppButton extends BaseButton {
             this._contextMenuManager.addMenu(this._appContextMenu);
             this.label_actor = this._multiWindowTitle.label_actor;
         }
-
     }
 
     _onClicked(actor, button) {
@@ -631,7 +635,7 @@ class AppButton extends BaseButton {
             if (windows.length === 1) {
                 if (contextMenuWasOpen)
                     return;
-                _minimizeOrActivateWindow(windows[0]);
+                this._minimizeOrActivateWindow(windows[0]);
             } else {
                 this._menu.removeAll();
 
@@ -642,12 +646,12 @@ class AppButton extends BaseButton {
                     item._window = windows[i];
                     this._menu.addMenuItem(item);
                 }
-                _openMenu(this._menu);
+                this._openMenu(this._menu);
             }
         } else {
             if (contextMenuWasOpen)
                 return;
-            _openMenu(this._contextMenu);
+            this._openMenu(this._contextMenu);
         }
     }
 
@@ -744,28 +748,26 @@ class WindowList extends St.Widget {
         this._appStateChangedId = this._appSystem.connect(
             'app-state-changed', this._onAppStateChanged.bind(this));
 
-        this._keyboardVisiblechangedId = Main.layoutManager.connect(
+        // Hack: OSK gesture is tied to visibility, piggy-back on that
-            'keyboard-visible-changed',
+        this._keyboardVisiblechangedId =
-            (o, state) => {
+            Main.keyboard._bottomDragAction.connect('notify::enabled',
-                Main.layoutManager.keyboardBox.visible = state;
+                action => {
-                let { keyboardBox } = Main.layoutManager;
+                    const visible = !action.enabled;
-                keyboardBox.visible = state;
+                    if (visible) {
-                if (state) {
+                        Main.uiGroup.set_child_above_sibling(
-                    Main.uiGroup.set_child_above_sibling(
+                            this, Main.layoutManager.keyboardBox);
-                        this, keyboardBox);
+                    } else {
-                } else {
+                        Main.uiGroup.set_child_above_sibling(
-                    Main.uiGroup.set_child_above_sibling(
+                            this, Main.layoutManager.panelBox);
-                        this, Main.layoutManager.panelBox);
+                    }
-                }
+                    this._updateKeyboardAnchor();
-                this._updateKeyboardAnchor();
+                });
-            });
 
         let workspaceManager = global.workspace_manager;
 
-        this._workspaceSignals = new Map();
         this._nWorkspacesChangedId = workspaceManager.connect(
-            'notify::n-workspaces', this._onWorkspacesChanged.bind(this));
+            'notify::n-workspaces', this._updateWorkspaceIndicatorVisibility.bind(this));
-        this._onWorkspacesChanged();
+        this._updateWorkspaceIndicatorVisibility();
 
         this._switchWorkspaceId = global.window_manager.connect(
             'switch-workspace', this._checkGrouping.bind(this));
@@ -775,20 +777,27 @@ class WindowList extends St.Widget {
             this._updateKeyboardAnchor();
         });
 
-        this._overviewHidingId = Main.overview.connect('hiding', () => {
+        this._overviewHidingId = Main.overview.connect('hidden', () => {
             this.visible = !Main.layoutManager.primaryMonitor.inFullscreen;
             this._updateKeyboardAnchor();
         });
 
         this._fullscreenChangedId =
             global.display.connect('in-fullscreen-changed', () => {
+                // Work-around for initial change from unknown to !fullscreen
+                if (Main.overview.visible)
+                    this.hide();
                 this._updateKeyboardAnchor();
             });
 
+        this._windowSignals = new Map();
+        this._windowCreatedId = global.display.connect(
+            'window-created', (dsp, win) => this._addWindow(win));
+
         this._dragBeginId = Main.xdndHandler.connect('drag-begin',
-            this._onDragBegin.bind(this));
+            this._monitorDrag.bind(this));
         this._dragEndId = Main.xdndHandler.connect('drag-end',
-            this._onDragEnd.bind(this));
+            this._stopMonitoringDrag.bind(this));
         this._dragMonitor = {
             dragMotion: this._onDragMotion.bind(this),
         };
@@ -907,7 +916,7 @@ class WindowList extends St.Widget {
                        w2.metaWindow.get_stable_sequence();
             });
             for (let i = 0; i < windows.length; i++)
-                this._onWindowAdded(null, windows[i].metaWindow);
+                this._addWindow(windows[i].metaWindow);
         } else {
             let apps = this._appSystem.get_running().sort((a1, a2) => {
                 return _getAppStableSequence(a1) -
@@ -919,11 +928,8 @@ class WindowList extends St.Widget {
     }
 
     _updateKeyboardAnchor() {
-        if (!Main.keyboard.keyboardActor)
+        const translationY = Main.overview.visible ? 0 : this.height;
-            return;
+        Main.layoutManager.keyboardBox.translation_y = -translationY;
-
-        let translationY = Main.overview.visible ? 0 : this.height;
-        Main.keyboard.keyboardActor.translation_y = -translationY;
     }
 
     _onAppStateChanged(appSys, app) {
@@ -940,10 +946,7 @@ class WindowList extends St.Widget {
         let button = new AppButton(app, this._perMonitor, this._monitor.index);
         this._settings.bind('display-all-workspaces',
             button, 'ignore-workspace', Gio.SettingsBindFlags.GET);
-        this._windowList.layout_manager.pack(button,
+        this._windowList.add_child(button);
-            true, true, true,
-            Clutter.BoxAlignment.START,
-            Clutter.BoxAlignment.START);
     }
 
     _removeApp(app) {
@@ -953,10 +956,7 @@ class WindowList extends St.Widget {
             child.destroy();
     }
 
-    _onWindowAdded(ws, win) {
+    _addWindow(win) {
-        if (win.skip_taskbar)
-            return;
-
         if (!this._grouped)
             this._checkGrouping();
 
@@ -967,24 +967,26 @@ class WindowList extends St.Widget {
         if (children.find(c => c.metaWindow === win))
             return;
 
+        this._windowSignals.set(
+            win, win.connect('unmanaged', () => this._removeWindow(win)));
+
         let button = new WindowButton(win, this._perMonitor, this._monitor.index);
         this._settings.bind('display-all-workspaces',
             button, 'ignore-workspace', Gio.SettingsBindFlags.GET);
-        this._windowList.layout_manager.pack(button,
+        this._windowList.add_child(button);
-            true, true, true,
-            Clutter.BoxAlignment.START,
-            Clutter.BoxAlignment.START);
     }
 
-    _onWindowRemoved(ws, win) {
+    _removeWindow(win) {
         if (this._grouped)
             this._checkGrouping();
 
         if (this._grouped)
             return;
 
-        if (win.get_compositor_private())
+        const id = this._windowSignals.get(win);
-            return; // not actually removed, just moved to another workspace
+        if (id)
+            win.disconnect(id);
+        this._windowSignals.delete(id);
 
         let children = this._windowList.get_children();
         let child = children.find(c => c.metaWindow === win);
@@ -992,44 +994,11 @@ class WindowList extends St.Widget {
             child.destroy();
     }
 
-    _onWorkspacesChanged() {
+    _monitorDrag() {
-        let workspaceManager = global.workspace_manager;
-        let numWorkspaces = workspaceManager.n_workspaces;
-
-        for (let i = 0; i < numWorkspaces; i++) {
-            let workspace = workspaceManager.get_workspace_by_index(i);
-            if (this._workspaceSignals.has(workspace))
-                continue;
-
-            let signals = { windowAddedId: 0, windowRemovedId: 0 };
-            signals._windowAddedId = workspace.connect_after(
-                'window-added', this._onWindowAdded.bind(this));
-            signals._windowRemovedId = workspace.connect(
-                'window-removed', this._onWindowRemoved.bind(this));
-            this._workspaceSignals.set(workspace, signals);
-        }
-
-        this._updateWorkspaceIndicatorVisibility();
-    }
-
-    _disconnectWorkspaceSignals() {
-        let workspaceManager = global.workspace_manager;
-        let numWorkspaces = workspaceManager.n_workspaces;
-
-        for (let i = 0; i < numWorkspaces; i++) {
-            let workspace = workspaceManager.get_workspace_by_index(i);
-            let signals = this._workspaceSignals.get(workspace);
-            this._workspaceSignals.delete(workspace);
-            workspace.disconnect(signals._windowAddedId);
-            workspace.disconnect(signals._windowRemovedId);
-        }
-    }
-
-    _onDragBegin() {
         DND.addDragMonitor(this._dragMonitor);
     }
 
-    _onDragEnd() {
+    _stopMonitoringDrag() {
         DND.removeDragMonitor(this._dragMonitor);
         this._removeActivateTimeout();
     }
@@ -1085,24 +1054,25 @@ class WindowList extends St.Widget {
         this._appSystem.disconnect(this._appStateChangedId);
         this._appStateChangedId = 0;
 
-        Main.layoutManager.disconnect(this._keyboardVisiblechangedId);
+        Main.keyboard._bottomDragAction.disconnect(this._keyboardVisiblechangedId);
         this._keyboardVisiblechangedId = 0;
 
-        Main.layoutManager.hideKeyboard();
-
-        this._disconnectWorkspaceSignals();
         global.workspace_manager.disconnect(this._nWorkspacesChangedId);
         this._nWorkspacesChangedId = 0;
 
         global.window_manager.disconnect(this._switchWorkspaceId);
         this._switchWorkspaceId = 0;
 
+        this._windowSignals.forEach((id, win) => win.disconnect(id));
+        this._windowSignals.clear();
 
         Main.overview.disconnect(this._overviewShowingId);
         Main.overview.disconnect(this._overviewHidingId);
 
         global.display.disconnect(this._fullscreenChangedId);
+        global.display.disconnect(this._windowCreatedId);
 
+        this._stopMonitoringDrag();
         Main.xdndHandler.disconnect(this._dragBeginId);
         Main.xdndHandler.disconnect(this._dragEndId);
 
@@ -1116,6 +1086,8 @@ class WindowList extends St.Widget {
 
 class Extension {
     constructor() {
+        ExtensionUtils.initTranslations();
+
         this._windowLists = null;
         this._hideOverviewOrig = Main.overview.hide;
     }
@@ -1179,6 +1151,9 @@ class Extension {
     }
 }
 
+/**
+ * @returns {Extension} - the extension's state object
+ */
 function init() {
     return new Extension();
 }

extensions/window-list/prefs.js

@@ -1,95 +1,89 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init buildPrefsWidget */
 
-const { Gio, GObject, Gtk } = imports.gi;
+const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 
+const _ = ExtensionUtils.gettext;
 
+/** */
 function init() {
     ExtensionUtils.initTranslations();
 }
 
 const WindowListPrefsWidget = GObject.registerClass(
-class WindowListPrefsWidget extends Gtk.Grid {
+class WindowListPrefsWidget extends Adw.PreferencesPage {
-    _init(params) {
+    _init() {
-        super._init(params);
+        super._init();
 
-        this.margin = 24;
+        this._actionGroup = new Gio.SimpleActionGroup();
-        this.row_spacing = 6;
+        this.insert_action_group('window-list', this._actionGroup);
-        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 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,
-        });
-        align.add(grid);
 
         this._settings = ExtensionUtils.getSettings();
-        let currentMode = this._settings.get_string('grouping-mode');
+        this._actionGroup.add_action(
-        let range = this._settings.get_range('grouping-mode');
+            this._settings.create_action('grouping-mode'));
-        let modes = range.deep_unpack()[1].deep_unpack();
+        this._actionGroup.add_action(
+            this._settings.create_action('show-on-all-monitors'));
+        this._actionGroup.add_action(
+            this._settings.create_action('display-all-workspaces'));
 
-        let modeLabels = {
+        const groupingGroup = new Adw.PreferencesGroup({
-            'never': _('Never group windows'),
+            title: _('Window Grouping'),
-            'auto': _('Group windows when space is limited'),
+        });
-            'always': _('Always group windows'),
+        this.add(groupingGroup);
-        };
 
-        let radio = null;
+        const modes = [
-        for (let i = 0; i < modes.length; i++) {
+            { mode: 'never', title: _('Never group windows') },
-            let mode = modes[i];
+            { mode: 'auto', title: _('Group windows when space is limited') },
-            let label = modeLabels[mode];
+            { mode: 'always', title: _('Always group windows') },
-            if (!label) {
+        ];
-                log('Unhandled option "%s" for grouping-mode'.format(mode));
-                continue;
-            }
 
-            radio = new Gtk.RadioButton({
+        for (const { mode, title } of modes) {
-                active: currentMode === mode,
+            const check = new Gtk.CheckButton({
-                label,
+                action_name: 'window-list.grouping-mode',
-                group: radio,
+                action_target: new GLib.Variant('s', mode),
             });
-            grid.add(radio);
+            const row = new Adw.ActionRow({
-
+                activatable_widget: check,
-            radio.connect('toggled', button => {
+                title,
-                if (button.active)
-                    this._settings.set_string('grouping-mode', mode);
             });
+            row.add_prefix(check);
+            groupingGroup.add(row);
         }
 
-        let check = new Gtk.CheckButton({
+        const miscGroup = new Adw.PreferencesGroup();
-            label: _('Show on all monitors'),
+        this.add(miscGroup);
-            margin_top: 6,
-        });
-        this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
-        this.add(check);
 
-        check = new Gtk.CheckButton({
+        let toggle = new Gtk.Switch({
-            label: _('Show windows from all workspaces'),
+            action_name: 'window-list.show-on-all-monitors',
-            margin_top: 6,
+            valign: Gtk.Align.CENTER,
         });
-        this._settings.bind('display-all-workspaces', check, 'active', Gio.SettingsBindFlags.DEFAULT);
+        let row = new Adw.ActionRow({
-        this.add(check);
+            title: _('Show on all monitors'),
+            activatable_widget: toggle,
+        });
+        row.add_suffix(toggle);
+        miscGroup.add(row);
+
+        toggle = new Gtk.Switch({
+            action_name: 'window-list.display-all-workspaces',
+            valign: Gtk.Align.CENTER,
+        });
+        this._settings.bind('display-all-workspaces',
+            toggle, 'active', Gio.SettingsBindFlags.DEFAULT);
+        row = new Adw.ActionRow({
+            title: _('Show windows from all workspaces'),
+            activatable_widget: toggle,
+        });
+        row.add_suffix(toggle);
+        miscGroup.add(row);
     }
 });
 
+/**
+ * @returns {Gtk.Widget} - the prefs widget
+ */
 function buildPrefsWidget() {
-    let widget = new WindowListPrefsWidget();
+    return new WindowListPrefsWidget();
-    widget.show_all();
-
-    return widget;
 }

extensions/window-list/stylesheet.css

@@ -1,10 +1,3 @@
-.bottom-panel {
-  /* .window-button-icon height +
-     .window-button vertical padding +
-     .window-button > StWidget vertical padding) */
-  height: 2.25em;
-}
-
 .window-list {
   spacing: 2px;
   font-size: 10pt;
@@ -30,7 +23,7 @@
 .window-picker-toggle > StWidget {
   color: #bbb;
   background-color: black;
-  border-radius: 4px;
+  border-radius: 2px;
   padding: 3px 6px 1px;
   box-shadow: inset 1px 1px 4px rgba(255,255,255,0.5);
   text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
@@ -89,7 +82,7 @@
   background-color: rgba(200, 200, 200, .3);
   border: 1px solid #cccccc;
   padding: 0 3px;
-  margin: 3px 0;
+  margin: 3px;
 }
 
 .window-list-workspace-indicator .workspaces-box {
@@ -98,37 +91,23 @@
 }
 
 .window-list-workspace-indicator .workspace {
-  border: 1px solid #cccccc;
+  border: 2px solid #000;
   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;
-}
+  background-color: #595959;
-
-.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);
+  border-color: #fff;
 }
 
 .window-list-window-preview {
-  background-color: #252525;
+  background-color: #bebebe;
-  border: 1px solid #ccc;
+  border: 1px solid #828282;
 }
 
 .window-list-window-preview.active {
-  background-color: #353535;
+  background-color: #d4d4d4;
-  border: 2px solid #ccc;
 }
 
 .notification {

extensions/window-list/windowPicker.js

@@ -1,16 +1,24 @@
 /* exported WindowPicker, WindowPickerToggle */
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, GObject, Shell, St } = imports.gi;
 
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
-const Overview = imports.ui.overview;
 const { WorkspacesDisplay } = imports.ui.workspacesView;
+const Workspace = imports.ui.workspace;
+
+const { VIGNETTE_BRIGHTNESS } = imports.ui.lightbox;
+const {
+    SIDE_CONTROLS_ANIMATION_TIME,
+    OverviewAdjustment,
+    ControlsState,
+} = imports.ui.overviewControls;
 
 let MyWorkspacesDisplay = GObject.registerClass(
 class MyWorkspacesDisplay extends WorkspacesDisplay {
-    _init() {
+    _init(controls, overviewAdjustment) {
         let workspaceManager = global.workspace_manager;
 
+        this._overviewAdjustment = overviewAdjustment;
         this._workspaceAdjustment = new St.Adjustment({
             value: workspaceManager.get_active_workspace_index(),
             lower: 0,
@@ -24,40 +32,32 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
             workspaceManager.connect('notify::n-workspaces',
                 this._updateAdjustment.bind(this));
 
-        super._init(this._workspaceAdjustment);
+        super._init(controls, this._workspaceAdjustment, this._overviewAdjustment);
+
+        this._workspaceAdjustment.actor = this;
 
         this.add_constraint(
             new Layout.MonitorConstraint({
                 primary: true,
                 work_area: true,
             }));
-
-        this._workareasChangedId = global.display.connect('workareas-changed',
-            this._onWorkAreasChanged.bind(this));
-        this._onWorkAreasChanged();
     }
 
-    show(...args) {
+    prepareToEnterOverview(...args) {
         if (!this._scrollEventId) {
             this._scrollEventId = Main.windowPicker.connect('scroll-event',
                 this._onScrollEvent.bind(this));
         }
 
-        super.show(...args);
+        super.prepareToEnterOverview(...args);
     }
 
-    hide(...args) {
+    vfunc_hide(...args) {
         if (this._scrollEventId > 0)
             Main.windowPicker.disconnect(this._scrollEventId);
         this._scrollEventId = 0;
 
-        super.hide(...args);
+        super.vfunc_hide(...args);
-    }
-
-    _onWorkAreasChanged() {
-        let { primaryIndex } = Main.layoutManager;
-        let workarea = Main.layoutManager.getWorkAreaForMonitor(primaryIndex);
-        this.setWorkspacesFullGeometry(workarea);
     }
 
     _updateAdjustment() {
@@ -68,20 +68,7 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
         });
     }
 
-    _updateWorkspacesViews() {
-        super._updateWorkspacesViews();
-
-        this._workspacesViews.forEach(v => {
-            Main.layoutManager.overviewGroup.remove_actor(v);
-            Main.windowPicker.add_actor(v);
-        });
-    }
-
     _onDestroy() {
-        if (this._workareasChangedId)
-            global.display.disconnect(this._workareasChangedId);
-        this._workareasChangedId = 0;
-
         if (this._nWorkspacesChangedId)
             global.workspace_manager.disconnect(this._nWorkspacesChangedId);
         this._nWorkspacesChangedId = 0;
@@ -90,6 +77,69 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
     }
 });
 
+const MyWorkspace = GObject.registerClass(
+class MyWorkspace extends Workspace.Workspace {
+    _init(...args) {
+        super._init(...args);
+
+        this._adjChangedId =
+            this._overviewAdjustment.connect('notify::value', () => {
+                const { value: progress } = this._overviewAdjustment;
+                const brightness = 1 - (1 - VIGNETTE_BRIGHTNESS) * progress;
+                for (const bg of this._background?._backgroundGroup ?? []) {
+                    bg.content.set({
+                        vignette: true,
+                        brightness,
+                    });
+                }
+            });
+    }
+
+    _onDestroy() {
+        super._onDestroy();
+
+        if (this._adjChangedId)
+            this._overviewAdjustment.disconnect(this._adjChangedId);
+        this._adjChangedId = 0;
+    }
+});
+
+const MyWorkspaceBackground = GObject.registerClass(
+class MyWorkspaceBackground extends Workspace.WorkspaceBackground {
+    _updateBorderRadius() {
+    }
+
+    vfunc_allocate(box) {
+        this.set_allocation(box);
+
+        const themeNode = this.get_theme_node();
+        const contentBox = themeNode.get_content_box(box);
+
+        this._bin.allocate(contentBox);
+
+        const [contentWidth, contentHeight] = contentBox.get_size();
+        const monitor = Main.layoutManager.monitors[this._monitorIndex];
+        const xRatio = contentWidth / this._workarea.width;
+        const yRatio = contentHeight / this._workarea.height;
+
+        const right = area => area.x + area.width;
+        const bottom = area => area.y + area.height;
+
+        const offsets = {
+            left: xRatio * (this._workarea.x - monitor.x),
+            right: xRatio * (right(monitor) - right(this._workarea)),
+            top: yRatio * (this._workarea.y - monitor.y),
+            bottom: yRatio * (bottom(monitor) - bottom(this._workarea)),
+        };
+
+        contentBox.set_origin(-offsets.left, -offsets.top);
+        contentBox.set_size(
+            offsets.left + contentWidth + offsets.right,
+            offsets.top + contentHeight + offsets.bottom);
+        this._backgroundGroup.allocate(contentBox);
+    }
+});
+
 var WindowPicker = GObject.registerClass({
     Signals: {
         'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
@@ -102,7 +152,9 @@ var WindowPicker = GObject.registerClass({
         this._overlayKeyId = 0;
         this._stageKeyPressId = 0;
 
-        super._init();
+        super._init({ reactive: true });
+
+        this._adjustment = new OverviewAdjustment(this);
 
         this.connect('destroy', this._onDestroy.bind(this));
 
@@ -113,31 +165,14 @@ var WindowPicker = GObject.registerClass({
             this, 'height',
             GObject.BindingFlags.SYNC_CREATE);
 
-        this._backgroundGroup = new Meta.BackgroundGroup({ reactive: true });
+        this._workspacesDisplay = new MyWorkspacesDisplay(this, this._adjustment);
-        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);
 
-        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._injectBackgroundShade();
+
             this._overlayKeyId = global.display.connect('overlay-key', () => {
                 if (!this._visible)
                     this.open();
@@ -147,6 +182,14 @@ var WindowPicker = GObject.registerClass({
         }
     }
 
+    _injectBackgroundShade() {
+        this._origWorkspace = Workspace.Workspace;
+        this._origWorkspaceBackground = Workspace.WorkspaceBackground;
+
+        Workspace.Workspace = MyWorkspace;
+        Workspace.WorkspaceBackground = MyWorkspaceBackground;
+    }
+
     get visible() {
         return this._visible;
     }
@@ -161,9 +204,15 @@ var WindowPicker = GObject.registerClass({
             return;
 
         this._fakeOverviewVisible(true);
-        this._shadeBackgrounds();
+        this._workspacesDisplay.prepareToEnterOverview();
-        this._fakeOverviewAnimation();
+        Main.overview._animationInProgress = true;
-        this._workspacesDisplay.show(false);
+
+        this._adjustment.value = ControlsState.HIDDEN;
+        this._adjustment.ease(ControlsState.WINDOW_PICKER, {
+            duration: SIDE_CONTROLS_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => (Main.overview._animationInProgress = false),
+        });
 
         this._stageKeyPressId = global.stage.connect('key-press-event',
             (a, event) => {
@@ -187,11 +236,17 @@ var WindowPicker = GObject.registerClass({
         if (!this._syncGrab())
             return;
 
-        this._workspacesDisplay.animateFromOverview(false);
+        this._workspacesDisplay.prepareToLeaveOverview();
-        this._unshadeBackgrounds();
+
-        this._fakeOverviewAnimation(() => {
+        Main.overview._animationInProgress = true;
-            this._workspacesDisplay.hide();
+        this._adjustment.ease(ControlsState.HIDDEN, {
-            this._fakeOverviewVisible(false);
+            duration: SIDE_CONTROLS_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => {
+                Main.overview._animationInProgress = false;
+                this._workspacesDisplay.hide();
+                this._fakeOverviewVisible(false);
+            },
         });
 
         global.stage.disconnect(this._stageKeyPressId);
@@ -200,16 +255,8 @@ var WindowPicker = GObject.registerClass({
         this.emit('open-state-changed', this._visible);
     }
 
-    _fakeOverviewAnimation(onComplete) {
+    getWorkspacesBoxForState() {
-        Main.overview._animationInProgress = true;
+        return this.allocation;
-        GLib.timeout_add(
-            GLib.PRIORITY_DEFAULT,
-            Overview.ANIMATION_TIME,
-            () => {
-                Main.overview._animationInProgress = false;
-                if (onComplete)
-                    onComplete();
-            });
     }
 
     _fakeOverviewVisible(visible) {
@@ -226,22 +273,32 @@ var WindowPicker = GObject.registerClass({
             if (this._modal)
                 return true;
 
-            this._modal = Main.pushModal(this, {
+            const grab = Main.pushModal(global.stage, {
                 actionMode: Shell.ActionMode.OVERVIEW,
             });
-
+            if (grab.get_seat_state() !== Clutter.GrabState.NONE) {
-            if (!this._modal) {
+                this._grab = grab;
+                this._modal = true;
+            } else {
+                Main.popModal(grab);
                 this.hide();
                 return false;
             }
         } else if (this._modal) {
-            Main.popModal(this);
+            Main.popModal(this._grab);
             this._modal = false;
+            this._grab = null;
         }
         return true;
     }
 
     _onDestroy() {
+        if (this._origWorkspace)
+            Workspace.Workspace = this._origWorkspace;
+
+        if (this._origWorkspaceBackground)
+            Workspace.WorkspaceBackground = this._origWorkspaceBackground;
+
         if (this._monitorsChangedId)
             Main.layoutManager.disconnect(this._monitorsChangedId);
         this._monitorsChangedId = 0;
@@ -254,18 +311,6 @@ var WindowPicker = GObject.registerClass({
             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(
@@ -286,8 +331,6 @@ class WindowPickerToggle extends St.Button {
             style_class: 'window-picker-toggle',
             child: iconBin,
             visible: !Main.sessionMode.hasOverview,
-            x_fill: true,
-            y_fill: true,
             toggle_mode: true,
         });
 

extensions/window-list/workspaceIndicator.js

@@ -2,12 +2,17 @@
 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 _ = ExtensionUtils.gettext;
-const _ = Gettext.gettext;
+
+const TOOLTIP_OFFSET = 6;
+const TOOLTIP_ANIMATION_TIME = 150;
+
+const MAX_THUMBNAILS = 6;
 
 let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
@@ -24,27 +29,14 @@ class WindowPreview extends St.Button {
         this.connect('destroy', this._onDestroy.bind(this));
 
         this._sizeChangedId = this._window.connect('size-changed',
-            this._relayout.bind(this));
+            () => this.queue_relayout());
         this._positionChangedId = this._window.connect('position-changed',
-            this._relayout.bind(this));
+            () => {
-        this._minimizedChangedId = this._window.connect('notify::minimized',
+                this._updateVisible();
-            this._relayout.bind(this));
+                this.queue_relayout();
-        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._minimizedChangedId = this._window.connect('notify::minimized',
+            this._updateVisible.bind(this));
 
         this._focusChangedId = global.display.connect('notify::focus-window',
             this._onFocusChanged.bind(this));
@@ -52,19 +44,15 @@ class WindowPreview extends St.Button {
     }
 
     // needed for DND
-    get realWindow() {
+    get metaWindow() {
-        return this._window.get_compositor_private();
+        return this._window;
     }
 
     _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() {
@@ -74,26 +62,42 @@ class WindowPreview extends St.Button {
             this.remove_style_class_name('active');
     }
 
-    _relayout() {
+    _updateVisible() {
-        let monitor = Main.layoutManager.findIndexForActor(this);
+        const monitor = Main.layoutManager.findIndexForActor(this);
-        this.visible = monitor === this._window.get_monitor() &&
+        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+        this.visible = this._window.get_frame_rect().overlap(workArea) &&
             this._window.window_type !== Meta.WindowType.DESKTOP &&
             this._window.showing_on_its_workspace();
+    }
+});
 
-        if (!this.visible)
+let WorkspaceLayout = GObject.registerClass(
-            return;
+class WorkspaceLayout extends Clutter.LayoutManager {
+    vfunc_get_preferred_width() {
+        return [0, 0];
+    }
 
-        let workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+    vfunc_get_preferred_height() {
-        let hscale = this.get_parent().allocation.get_width() / workArea.width;
+        return [0, 0];
-        let vscale = this.get_parent().allocation.get_height() / workArea.height;
+    }
 
-        let frameRect = this._window.get_frame_rect();
+    vfunc_allocate(container, box) {
-        this.set_size(
+        const monitor = Main.layoutManager.findIndexForActor(container);
-            Math.round(Math.min(frameRect.width, workArea.width) * hscale),
+        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-            Math.round(Math.min(frameRect.height, workArea.height) * vscale));
+        const hscale = box.get_width() / workArea.width;
-        this.set_position(
+        const vscale = box.get_height() / workArea.height;
-            Math.round(frameRect.x * hscale),
+
-            Math.round(frameRect.y * vscale));
+        for (const child of container) {
+            const childBox = new Clutter.ActorBox();
+            const frameRect = child.metaWindow.get_frame_rect();
+            childBox.set_size(
+                Math.round(Math.min(frameRect.width, workArea.width) * hscale),
+                Math.round(Math.min(frameRect.height, workArea.height) * vscale));
+            childBox.set_origin(
+                Math.round((frameRect.x - workArea.x) * hscale),
+                Math.round((frameRect.y - workArea.y)  * vscale));
+            child.allocate(childBox);
+        }
     }
 });
 
@@ -103,14 +107,19 @@ class WorkspaceThumbnail extends St.Button {
         super._init({
             style_class: 'workspace',
             child: new Clutter.Actor({
-                layout_manager: new Clutter.BinLayout(),
+                layout_manager: new WorkspaceLayout(),
                 clip_to_allocation: true,
             }),
-            x_fill: true,
-            y_fill: true,
         });
 
+        this._tooltip = new St.Label({
+            style_class: 'dash-label',
+            visible: false,
+        });
+        Main.uiGroup.add_child(this._tooltip);
+
         this.connect('destroy', this._onDestroy.bind(this));
+        this.connect('notify::hover', this._syncTooltip.bind(this));
 
         this._index = index;
         this._delegate = this; // needed for DND
@@ -136,16 +145,15 @@ class WorkspaceThumbnail extends St.Button {
     }
 
     acceptDrop(source) {
-        if (!source.realWindow)
+        if (!source.metaWindow)
             return false;
 
-        let window = source.realWindow.get_meta_window();
+        this._moveWindow(source.metaWindow);
-        this._moveWindow(window);
         return true;
     }
 
     handleDragOver(source) {
-        if (source.realWindow)
+        if (source.metaWindow)
             return DND.DragMotionResult.MOVE_DROP;
         else
             return DND.DragMotionResult.CONTINUE;
@@ -196,7 +204,39 @@ class WorkspaceThumbnail extends St.Button {
             ws.activate(global.get_current_time());
     }
 
+    _syncTooltip() {
+        if (this.hover) {
+            this._tooltip.set({
+                text: Meta.prefs_get_workspace_name(this._index),
+                visible: true,
+                opacity: 0,
+            });
+
+            const [stageX, stageY] = this.get_transformed_position();
+            const thumbWidth = this.allocation.get_width();
+            const tipWidth = this._tooltip.width;
+            const tipHeight = this._tooltip.height;
+            const xOffset = Math.floor((thumbWidth - tipWidth) / 2);
+            const monitor = Main.layoutManager.findMonitorForActor(this);
+            const x = Math.clamp(
+                stageX + xOffset,
+                monitor.x,
+                monitor.x + monitor.width - tipWidth);
+            const y = stageY - tipHeight - TOOLTIP_OFFSET;
+            this._tooltip.set_position(x, y);
+        }
+
+        this._tooltip.ease({
+            opacity: this.hover ? 255 : 0,
+            duration: TOOLTIP_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => (this._tooltip.visible = this.hover),
+        });
+    }
+
     _onDestroy() {
+        this._tooltip.destroy();
+
         this._workspace.disconnect(this._windowAddedId);
         this._workspace.disconnect(this._windowRemovedId);
         global.display.disconnect(this._restackedId);
@@ -209,6 +249,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
         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.remove_style_class_name('panel-button');
         this.menu.actor.remove_style_class_name('panel-menu');
 
         let container = new St.Widget({
@@ -248,13 +289,13 @@ class WorkspaceIndicator extends PanelMenu.Button {
             workspaceManager.connect_after('workspace-switched',
                 this._onWorkspaceSwitched.bind(this)),
             workspaceManager.connect('notify::layout-rows',
-                this._onWorkspaceOrientationChanged.bind(this)),
+                this._updateThumbnailVisibility.bind(this)),
         ];
 
         this.connect('scroll-event', this._onScrollEvent.bind(this));
         this._updateMenu();
         this._updateThumbnails();
-        this._onWorkspaceOrientationChanged();
+        this._updateThumbnailVisibility();
 
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
         this._settingsChangedId = this._settings.connect(
@@ -273,12 +314,15 @@ class WorkspaceIndicator extends PanelMenu.Button {
         super._onDestroy();
     }
 
-    _onWorkspaceOrientationChanged() {
+    _updateThumbnailVisibility() {
-        let vertical = global.workspace_manager.layout_rows === -1;
+        const { workspaceManager } = global;
-        this.reactive = vertical;
+        const vertical = workspaceManager.layout_rows === -1;
+        const useMenu =
+            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
+        this.reactive = useMenu;
 
-        this._statusBin.visible = vertical;
+        this._statusBin.visible = useMenu;
-        this._thumbnailsBox.visible = !vertical;
+        this._thumbnailsBox.visible = !useMenu;
     }
 
     _onWorkspaceSwitched() {
@@ -294,6 +338,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
     _nWorkspacesChanged() {
         this._updateMenu();
         this._updateThumbnails();
+        this._updateThumbnailVisibility();
     }
 
     _updateMenuOrnament() {
@@ -390,10 +435,5 @@ class WorkspaceIndicator extends PanelMenu.Button {
         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,52 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported init */
-const { Clutter, GObject, St } = imports.gi;
+const { Clutter, Graphene, GObject, St } = imports.gi;
 
 const Main = imports.ui.main;
+const OverviewControls = imports.ui.overviewControls;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;
 
-class MyWindowOverlay extends Workspace.WindowOverlay {
+const WINDOW_SLOT = 4;
-    constructor(windowClone, parentActor) {
-        super(windowClone, parentActor);
-
-        this._id = null;
-        this._text = new St.Label({
-            style_class: 'extension-windowsNavigator-window-tooltip',
-            visible: false,
-        });
-        parentActor.add_actor(this._text);
-    }
-
-    showTooltip() {
-        this._parentActor.set_child_below_sibling(this._text, null);
-        this._text.show();
-        this._text.text = (this._windowClone.slotId + 1).toString();
-    }
-
-    hideTooltip() {
-        if (this._text && this._text.visible)
-            this._text.hide();
-    }
-
-    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._parentActor.set_child_below_sibling(this._text, null);
-    }
-}
 
 var MyWorkspace = GObject.registerClass(
 class MyWorkspace extends Workspace.Workspace {
-    _init(metaWorkspace, monitorIndex) {
+    _init(...args) {
-        super._init(metaWorkspace, monitorIndex);
+        super._init(...args);
 
-        if (metaWorkspace && metaWorkspace.index() < 9) {
+        if (this.metaWorkspace && this.metaWorkspace.index() < 9) {
             this._tip = new St.Label({
                 style_class: 'extension-windowsNavigator-window-tooltip',
                 visible: false,
@@ -61,63 +29,98 @@ class MyWorkspace extends Workspace.Workspace {
         }
     }
 
+    vfunc_allocate(box) {
+        super.vfunc_allocate(box);
+
+        if (this._tip)
+            this._tip.allocate_preferred_size(0, 0);
+    }
+
     showTooltip() {
-        if (!this._tip || !this._actualGeometry)
+        if (!this._tip)
             return;
         this._tip.text = (this.metaWorkspace.index() + 1).toString();
-
-        // Hand code this instead of using _getSpacingAndPadding
-        // because that fails on empty workspaces
-        let node = this.get_theme_node();
-        let padding = {
-            left: node.get_padding(St.Side.LEFT),
-            top: node.get_padding(St.Side.TOP),
-            bottom: node.get_padding(St.Side.BOTTOM),
-            right: node.get_padding(St.Side.RIGHT),
-        };
-
-        let area = Workspace.padArea(this._actualGeometry, padding);
-        this._tip.x = area.x;
-        this._tip.y = area.y;
         this._tip.show();
         this.set_child_below_sibling(this._tip, null);
     }
 
     hideTooltip() {
-        if (!this._tip)
+        if (this._tip)
-            return;
+            this._tip.hide();
-        if (!this._tip.get_parent())
-            return;
-        this._tip.hide();
     }
 
     getWindowWithTooltip(id) {
-        for (let i = 0; i < this._windows.length; i++) {
+        const { layoutManager } = this._container;
-            if (this._windows[i].slotId + 1 === id)
+        const slot = layoutManager._windowSlots[id - 1];
-                return this._windows[i].metaWindow;
+        return slot ? slot[WINDOW_SLOT].metaWindow : null;
-        }
-        return null;
     }
 
     showWindowsTooltips() {
-        for (let i in this._windowOverlays) {
+        const { layoutManager } = this._container;
-            if (this._windowOverlays[i])
+        for (let i = 0; i < layoutManager._windowSlots.length; i++) {
-                this._windowOverlays[i].showTooltip();
+            if (layoutManager._windowSlots[i])
+                layoutManager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
         }
     }
 
     hideWindowsTooltips() {
-        for (let i in this._windowOverlays) {
+        const { layoutManager } = this._container;
-            if (this._windowOverlays[i])
+        for (let i in layoutManager._windowSlots) {
-                this._windowOverlays[i].hideTooltip();
+            if (layoutManager._windowSlots[i])
+                layoutManager._windowSlots[i][WINDOW_SLOT].hideTooltip();
         }
     }
+
+    // overriding _addWindowClone to apply the tooltip patch on the cloned
+    // windowPreview
+    _addWindowClone(metaWindow) {
+        const clone = super._addWindowClone(metaWindow);
+
+        // appling the tooltip patch
+        (function patchPreview() {
+            this._text = new St.Label({
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false,
+            });
+
+            this._text.add_constraint(new Clutter.BindConstraint({
+                source: this.windowContainer,
+                coordinate: Clutter.BindCoordinate.POSITION,
+            }));
+            this._text.add_constraint(new Clutter.AlignConstraint({
+                source: this.windowContainer,
+                align_axis: Clutter.AlignAxis.X_AXIS,
+                pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
+                factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
+            }));
+            this._text.add_constraint(new Clutter.AlignConstraint({
+                source: this.windowContainer,
+                align_axis: Clutter.AlignAxis.Y_AXIS,
+                pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
+                factor: 0,
+            }));
+
+            this.add_child(this._text);
+        }).call(clone);
+
+        clone.showTooltip = function (text) {
+            this._text.set({ text });
+            this._text.show();
+        };
+
+        clone.hideTooltip = function () {
+            if (this._text && this._text.visible)
+                this._text.hide();
+        };
+
+        return clone;
+    }
 });
 
 var MyWorkspacesView = GObject.registerClass(
 class MyWorkspacesView extends WorkspacesView.WorkspacesView {
-    _init(width, height, x, y, workspaces) {
+    _init(...args) {
-        super._init(width, height, x, y, workspaces);
+        super._init(...args);
 
         this._pickWorkspace = false;
         this._pickWindow = false;
@@ -161,8 +164,8 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
     }
 
     _onKeyPress(s, o) {
-        let { viewSelector } = Main.overview;
+        const { ControlsState } = OverviewControls;
-        if (viewSelector._activePage !== viewSelector._workspacesPage)
+        if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
             return false;
 
         let workspaceManager = global.workspace_manager;
@@ -244,24 +247,24 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
 
 class Extension {
     constructor() {
-        this._origWindowOverlay = Workspace.WindowOverlay;
         this._origWorkspace = Workspace.Workspace;
         this._origWorkspacesView = WorkspacesView.WorkspacesView;
     }
 
     enable() {
-        Workspace.WindowOverlay = MyWindowOverlay;
         Workspace.Workspace = MyWorkspace;
         WorkspacesView.WorkspacesView = MyWorkspacesView;
     }
 
     disable() {
-        Workspace.WindowOverlay = this._origWindowOverlay;
         Workspace.Workspace = this._origWorkspace;
         WorkspacesView.WorkspacesView = this._origWorkspacesView;
     }
 }
 
+/**
+ * @returns {Extension} - the extension's state object
+ */
 function init() {
     return new Extension();
 }

extensions/workspace-indicator/extension.js

@@ -9,12 +9,16 @@ const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = ExtensionUtils.gettext;
-const _ = Gettext.gettext;
 
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
+const TOOLTIP_OFFSET = 6;
+const TOOLTIP_ANIMATION_TIME = 150;
+
+const MAX_THUMBNAILS = 6;
+
 let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
     _init(window) {
@@ -30,27 +34,14 @@ class WindowPreview extends St.Button {
         this.connect('destroy', this._onDestroy.bind(this));
 
         this._sizeChangedId = this._window.connect('size-changed',
-            this._relayout.bind(this));
+            () => this.queue_relayout());
         this._positionChangedId = this._window.connect('position-changed',
-            this._relayout.bind(this));
+            () => {
-        this._minimizedChangedId = this._window.connect('notify::minimized',
+                this._updateVisible();
-            this._relayout.bind(this));
+                this.queue_relayout();
-        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._minimizedChangedId = this._window.connect('notify::minimized',
+            this._updateVisible.bind(this));
 
         this._focusChangedId = global.display.connect('notify::focus-window',
             this._onFocusChanged.bind(this));
@@ -58,19 +49,15 @@ class WindowPreview extends St.Button {
     }
 
     // needed for DND
-    get realWindow() {
+    get metaWindow() {
-        return this._window.get_compositor_private();
+        return this._window;
     }
 
     _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() {
@@ -80,26 +67,42 @@ class WindowPreview extends St.Button {
             this.remove_style_class_name('active');
     }
 
-    _relayout() {
+    _updateVisible() {
-        let monitor = Main.layoutManager.findIndexForActor(this);
+        const monitor = Main.layoutManager.findIndexForActor(this);
-        this.visible = monitor === this._window.get_monitor() &&
+        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+        this.visible = this._window.get_frame_rect().overlap(workArea) &&
             this._window.window_type !== Meta.WindowType.DESKTOP &&
             this._window.showing_on_its_workspace();
+    }
+});
 
-        if (!this.visible)
+let WorkspaceLayout = GObject.registerClass(
-            return;
+class WorkspaceLayout extends Clutter.LayoutManager {
+    vfunc_get_preferred_width() {
+        return [0, 0];
+    }
 
-        let workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+    vfunc_get_preferred_height() {
-        let hscale = this.get_parent().allocation.get_width() / workArea.width;
+        return [0, 0];
-        let vscale = this.get_parent().allocation.get_height() / workArea.height;
+    }
 
-        let frameRect = this._window.get_frame_rect();
+    vfunc_allocate(container, box) {
-        this.set_size(
+        const monitor = Main.layoutManager.findIndexForActor(container);
-            Math.round(Math.min(frameRect.width, workArea.width) * hscale),
+        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-            Math.round(Math.min(frameRect.height, workArea.height) * vscale));
+        const hscale = box.get_width() / workArea.width;
-        this.set_position(
+        const vscale = box.get_height() / workArea.height;
-            Math.round(frameRect.x * hscale),
+
-            Math.round(frameRect.y * vscale));
+        for (const child of container) {
+            const childBox = new Clutter.ActorBox();
+            const frameRect = child.metaWindow.get_frame_rect();
+            childBox.set_size(
+                Math.round(Math.min(frameRect.width, workArea.width) * hscale),
+                Math.round(Math.min(frameRect.height, workArea.height) * vscale));
+            childBox.set_origin(
+                Math.round((frameRect.x - workArea.x) * hscale),
+                Math.round((frameRect.y - workArea.y) * vscale));
+            child.allocate(childBox);
+        }
     }
 });
 
@@ -109,14 +112,19 @@ class WorkspaceThumbnail extends St.Button {
         super._init({
             style_class: 'workspace',
             child: new Clutter.Actor({
-                layout_manager: new Clutter.BinLayout(),
+                layout_manager: new WorkspaceLayout(),
                 clip_to_allocation: true,
             }),
-            x_fill: true,
-            y_fill: true,
         });
 
+        this._tooltip = new St.Label({
+            style_class: 'dash-label',
+            visible: false,
+        });
+        Main.uiGroup.add_child(this._tooltip);
+
         this.connect('destroy', this._onDestroy.bind(this));
+        this.connect('notify::hover', this._syncTooltip.bind(this));
 
         this._index = index;
         this._delegate = this; // needed for DND
@@ -142,16 +150,15 @@ class WorkspaceThumbnail extends St.Button {
     }
 
     acceptDrop(source) {
-        if (!source.realWindow)
+        if (!source.metaWindow)
             return false;
 
-        let window = source.realWindow.get_meta_window();
+        this._moveWindow(source.metaWindow);
-        this._moveWindow(window);
         return true;
     }
 
     handleDragOver(source) {
-        if (source.realWindow)
+        if (source.metaWindow)
             return DND.DragMotionResult.MOVE_DROP;
         else
             return DND.DragMotionResult.CONTINUE;
@@ -202,7 +209,39 @@ class WorkspaceThumbnail extends St.Button {
             ws.activate(global.get_current_time());
     }
 
+    _syncTooltip() {
+        if (this.hover) {
+            this._tooltip.set({
+                text: Meta.prefs_get_workspace_name(this._index),
+                visible: true,
+                opacity: 0,
+            });
+
+            const [stageX, stageY] = this.get_transformed_position();
+            const thumbWidth = this.allocation.get_width();
+            const thumbHeight = this.allocation.get_height();
+            const tipWidth = this._tooltip.width;
+            const xOffset = Math.floor((thumbWidth - tipWidth) / 2);
+            const monitor = Main.layoutManager.findMonitorForActor(this);
+            const x = Math.clamp(
+                stageX + xOffset,
+                monitor.x,
+                monitor.x + monitor.width - tipWidth);
+            const y = stageY + thumbHeight + TOOLTIP_OFFSET;
+            this._tooltip.set_position(x, y);
+        }
+
+        this._tooltip.ease({
+            opacity: this.hover ? 255 : 0,
+            duration: TOOLTIP_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => (this._tooltip.visible = this.hover),
+        });
+    }
+
     _onDestroy() {
+        this._tooltip.destroy();
+
         this._workspace.disconnect(this._windowAddedId);
         this._workspace.disconnect(this._windowRemovedId);
         global.display.disconnect(this._restackedId);
@@ -250,14 +289,14 @@ class WorkspaceIndicator extends PanelMenu.Button {
             workspaceManager.connect_after('workspace-switched',
                 this._onWorkspaceSwitched.bind(this)),
             workspaceManager.connect('notify::layout-rows',
-                this._onWorkspaceOrientationChanged.bind(this)),
+                this._updateThumbnailVisibility.bind(this)),
         ];
 
         this.connect('scroll-event', this._onScrollEvent.bind(this));
         this._thumbnailsBox.connect('scroll-event', this._onScrollEvent.bind(this));
         this._createWorkspacesSection();
         this._updateThumbnails();
-        this._onWorkspaceOrientationChanged();
+        this._updateThumbnailVisibility();
 
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
         this._settingsChangedId = this._settings.connect(
@@ -279,16 +318,19 @@ class WorkspaceIndicator extends PanelMenu.Button {
         super._onDestroy();
     }
 
-    _onWorkspaceOrientationChanged() {
+    _updateThumbnailVisibility() {
-        let vertical = global.workspace_manager.layout_rows === -1;
+        const { workspaceManager } = global;
-        this.reactive = vertical;
+        const vertical = workspaceManager.layout_rows === -1;
+        const useMenu =
+            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
+        this.reactive = useMenu;
 
-        this._statusLabel.visible = vertical;
+        this._statusLabel.visible = useMenu;
-        this._thumbnailsBox.visible = !vertical;
+        this._thumbnailsBox.visible = !useMenu;
 
         // Disable offscreen-redirect when showing the workspace switcher
         // so that clip-to-allocation works
-        Main.panel.set_offscreen_redirect(vertical
+        Main.panel.set_offscreen_redirect(useMenu
             ? Clutter.OffscreenRedirect.ALWAYS
             : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
     }
@@ -305,6 +347,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
     _nWorkspacesChanged() {
         this._createWorkspacesSection();
         this._updateThumbnails();
+        this._updateThumbnailVisibility();
     }
 
     _updateMenuOrnament() {
@@ -399,17 +442,20 @@ class WorkspaceIndicator extends PanelMenu.Button {
     }
 });
 
+/** */
 function init() {
     ExtensionUtils.initTranslations();
 }
 
 let _indicator;
 
+/** */
 function enable() {
     _indicator = new WorkspaceIndicator();
     Main.panel.addToStatusArea('workspace-indicator', _indicator);
 }
 
+/** */
 function disable() {
     _indicator.destroy();
 }

extensions/workspace-indicator/prefs.js

@@ -1,210 +1,198 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init buildPrefsWidget */
 
-const { Gio, GObject, Gtk } = imports.gi;
+const { Adw, Gio, GLib, GObject, Gtk, Pango } = imports.gi;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-const N_ = e => e;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 
+const _ = ExtensionUtils.gettext;
+const N_ = e => e;
+
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
-const WorkspaceNameModel = GObject.registerClass(
-class WorkspaceNameModel extends Gtk.ListStore {
-    _init(params) {
-        super._init(params);
-        this.set_column_types([GObject.TYPE_STRING]);
-
-        this.Columns = {
-            LABEL: 0,
-        };
-
-        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        this._reloadFromSettings();
-
-        // overriding class closure doesn't work, because GtkTreeModel
-        // plays tricks with marshallers and class closures
-        this.connect('row-changed', this._onRowChanged.bind(this));
-        this.connect('row-inserted', this._onRowInserted.bind(this));
-        this.connect('row-deleted', this._onRowDeleted.bind(this));
-    }
-
-    _reloadFromSettings() {
-        if (this._preventChanges)
-            return;
-        this._preventChanges = true;
-
-        let newNames = this._settings.get_strv(WORKSPACE_KEY);
-
-        let i = 0;
-        let [ok, iter] = this.get_iter_first();
-        while (ok && i < newNames.length) {
-            this.set(iter, [this.Columns.LABEL], [newNames[i]]);
-
-            ok = this.iter_next(iter);
-            i++;
-        }
-
-        while (ok)
-            ok = this.remove(iter);
-
-        for (; i < newNames.length; i++) {
-            iter = this.append();
-            this.set(iter, [this.Columns.LABEL], [newNames[i]]);
-        }
-
-        this._preventChanges = false;
-    }
-
-    _onRowChanged(self, path, iter) {
-        if (this._preventChanges)
-            return;
-        this._preventChanges = true;
-
-        let index = path.get_indices()[0];
-        let names = this._settings.get_strv(WORKSPACE_KEY);
-
-        if (index >= names.length) {
-            // fill with blanks
-            for (let i = names.length; i <= index; i++)
-                names[i] = '';
-        }
-
-        names[index] = this.get_value(iter, this.Columns.LABEL);
-
-        this._settings.set_strv(WORKSPACE_KEY, names);
-
-        this._preventChanges = false;
-    }
-
-    _onRowInserted(self, path, iter) {
-        if (this._preventChanges)
-            return;
-        this._preventChanges = true;
-
-        let index = path.get_indices()[0];
-        let names = this._settings.get_strv(WORKSPACE_KEY);
-        let label = this.get_value(iter, this.Columns.LABEL) || '';
-        names.splice(index, 0, label);
-
-        this._settings.set_strv(WORKSPACE_KEY, names);
-
-        this._preventChanges = false;
-    }
-
-    _onRowDeleted(self, path) {
-        if (this._preventChanges)
-            return;
-        this._preventChanges = true;
-
-        let index = path.get_indices()[0];
-        let names = this._settings.get_strv(WORKSPACE_KEY);
-
-        if (index >= names.length)
-            return;
-
-        names.splice(index, 1);
-
-        // compact the array
-        for (let i = names.length - 1; i >= 0 && !names[i]; i++)
-            names.pop();
-
-        this._settings.set_strv(WORKSPACE_KEY, names);
-
-        this._preventChanges = false;
-    }
-});
-
 const WorkspaceSettingsWidget = GObject.registerClass(
-class WorkspaceSettingsWidget extends Gtk.Grid {
+class WorkspaceSettingsWidget extends Adw.PreferencesGroup {
-    _init(params) {
+    _init() {
-        super._init(params);
+        super._init({
-        this.margin = 12;
+            title: _('Workspace Names'),
-        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,
-        }));
-
-        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,
         });
 
-        let column = new Gtk.TreeViewColumn({ title: _('Name') });
+        this._list = new Gtk.ListBox({
-        let renderer = new Gtk.CellRendererText({ editable: true });
+            selection_mode: Gtk.SelectionMode.NONE,
-        renderer.connect('edited', this._cellEdited.bind(this));
+            css_classes: ['boxed-list'],
-        column.pack_start(renderer, true);
-        column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
-        this._treeView.append_column(column);
-
-        scrolled.add(this._treeView);
-
-        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
-        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-
-        let newButton = new Gtk.ToolButton({ icon_name: 'list-add-symbolic' });
-        newButton.connect('clicked', this._newClicked.bind(this));
-        toolbar.add(newButton);
-
-        let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
-        delButton.connect('clicked', this._delClicked.bind(this));
-        toolbar.add(delButton);
-
-        let selection = this._treeView.get_selection();
-        selection.connect('changed', () => {
-            delButton.sensitive = selection.count_selected_rows() > 0;
         });
-        delButton.sensitive = selection.count_selected_rows() > 0;
+        this._list.connect('row-activated', (l, row) => row.edit());
+        this.add(this._list);
 
-        this.add(toolbar);
+        this._list.append(new NewWorkspaceRow());
+
+        this._actionGroup = new Gio.SimpleActionGroup();
+        this._list.insert_action_group('workspaces', this._actionGroup);
+
+        let action;
+        action = new Gio.SimpleAction({ name: 'add' });
+        action.connect('activate', () => {
+            const names = this._settings.get_strv(WORKSPACE_KEY);
+            this._settings.set_strv(WORKSPACE_KEY, [
+                ...names,
+                _('Workspace %d').format(names.length + 1),
+            ]);
+        });
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({
+            name: 'remove',
+            parameter_type: new GLib.VariantType('s'),
+        });
+        action.connect('activate', (a, param) => {
+            const removed = param.deepUnpack();
+            this._settings.set_strv(WORKSPACE_KEY,
+                this._settings.get_strv(WORKSPACE_KEY)
+                    .filter(name => name !== removed));
+        });
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({ name: 'update' });
+        action.connect('activate', () => {
+            const names = this._getWorkspaceRows().map(row => row.name);
+            this._settings.set_strv(WORKSPACE_KEY, names);
+        });
+        this._actionGroup.add_action(action);
+
+        this._settings = new Gio.Settings({
+            schema_id: WORKSPACE_SCHEMA,
+        });
+        this._settings.connect(`changed::${WORKSPACE_KEY}`,
+            this._sync.bind(this));
+        this._sync();
     }
 
-    _cellEdited(renderer, path, newText) {
+    _getWorkspaceRows() {
-        let [ok, iter] = this._store.get_iter_from_string(path);
+        return [...this._list].filter(row => row.name);
-
-        if (ok)
-            this._store.set(iter, [this._store.Columns.LABEL], [newText]);
     }
 
-    _newClicked() {
+    _sync() {
-        let iter = this._store.append();
+        const rows = this._getWorkspaceRows();
-        let index = this._store.get_path(iter).get_indices()[0];
 
-        let label = _('Workspace %d').format(index + 1);
+        const oldNames = rows.map(row => row.name);
-        this._store.set(iter, [this._store.Columns.LABEL], [label]);
+        const newNames = this._settings.get_strv(WORKSPACE_KEY);
-    }
 
-    _delClicked() {
+        const removed = oldNames.filter(n => !newNames.includes(n));
-        let [any, model_, iter] = this._treeView.get_selection().get_selected();
+        const added = newNames.filter(n => !oldNames.includes(n));
 
-        if (any)
+        removed.forEach(n => this._list.remove(rows.find(r => r.name === n)));
-            this._store.remove(iter);
+        added.forEach(n => {
+            this._list.insert(new WorkspaceRow(n), newNames.indexOf(n));
+        });
     }
 });
 
+const WorkspaceRow = GObject.registerClass(
+class WorkspaceRow extends Adw.PreferencesRow {
+    _init(name) {
+        super._init({ name });
+
+        const box = new Gtk.Box({
+            spacing: 12,
+            margin_top: 6,
+            margin_bottom: 6,
+            margin_start: 6,
+            margin_end: 6,
+        });
+
+        const label = new Gtk.Label({
+            hexpand: true,
+            xalign: 0,
+            max_width_chars: 25,
+            ellipsize: Pango.EllipsizeMode.END,
+        });
+        this.bind_property('name', label, 'label',
+            GObject.BindingFlags.SYNC_CREATE);
+        box.append(label);
+
+        const button = new Gtk.Button({
+            action_name: 'workspaces.remove',
+            action_target: new GLib.Variant('s', name),
+            icon_name: 'edit-delete-symbolic',
+            has_frame: false,
+        });
+        box.append(button);
+
+        this._entry = new Gtk.Entry({
+            max_width_chars: 25,
+        });
+
+        const controller = new Gtk.ShortcutController();
+        controller.add_shortcut(new Gtk.Shortcut({
+            trigger: Gtk.ShortcutTrigger.parse_string('Escape'),
+            action: Gtk.CallbackAction.new(() => {
+                this._stopEdit();
+                return true;
+            }),
+        }));
+        this._entry.add_controller(controller);
+
+        this._stack = new Gtk.Stack();
+        this._stack.add_named(box, 'display');
+        this._stack.add_named(this._entry, 'edit');
+        this.child = this._stack;
+
+        this._entry.connect('activate', () => {
+            this.name = this._entry.text;
+            this._stopEdit();
+        });
+        this._entry.connect('notify::has-focus', () => {
+            if (this._entry.has_focus)
+                return;
+            this._stopEdit();
+        });
+
+        this.connect('notify::name', () => {
+            button.action_target = new GLib.Variant('s', this.name);
+            this.activate_action('workspaces.update', null);
+        });
+    }
+
+    edit() {
+        this._entry.text = this.name;
+        this._entry.grab_focus();
+        this._stack.visible_child_name = 'edit';
+    }
+
+    _stopEdit() {
+        this.grab_focus();
+        this._stack.visible_child_name = 'display';
+    }
+});
+
+const NewWorkspaceRow = GObject.registerClass(
+class NewWorkspaceRow extends Adw.PreferencesRow {
+    _init() {
+        super._init({
+            action_name: 'workspaces.add',
+            child: new Gtk.Image({
+                icon_name: 'list-add-symbolic',
+                pixel_size: 16,
+                margin_top: 12,
+                margin_bottom: 12,
+                margin_start: 12,
+                margin_end: 12,
+            }),
+        });
+        this.update_property(
+            [Gtk.AccessibleProperty.LABEL], [_('Add Workspace')]);
+    }
+});
+
+/** */
 function init() {
     ExtensionUtils.initTranslations();
 }
 
+/**
+ * @returns {Gtk.Widget} - the prefs widget
+ */
 function buildPrefsWidget() {
-    let widget = new WorkspaceSettingsWidget();
+    return new WorkspaceSettingsWidget();
-    widget.show_all();
-
-    return widget;
 }

extensions/workspace-indicator/stylesheet.css

@@ -1,40 +1,28 @@
 .panel-workspace-indicator {
-	padding: 0 8px;
+  padding: 0 8px;
 }
 
 .panel-workspace-indicator-box {
-	padding: 2px 0;
+  padding: 4px 0;
+  spacing: 4px;
 }
 
 .panel-workspace-indicator-box .workspace {
-	width: 40px;
+  width: 40px;
+  border: 2px solid #000;
+  border-radius: 2px;
+  background-color: #595959;
 }
 
-.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);
+  border-color: #fff;
-}
-
-.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;
+  background-color: #bebebe;
-    border: 1px solid #ccc;
+  border: 1px solid #828282;
 }
 
 .workspace-indicator-window-preview.active {
-    background-color: #353535;
+  background-color: #d4d4d4;
-    border: 2px solid #ccc;
 }

gnome-shell-extensions.doap

@@ -34,4 +34,10 @@ and will be picked automatically at next login.
       <gnome:userid>fmuellner</gnome:userid>
     </foaf:Person>
   </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Marge Bot</foaf:name>
+      <gnome:userid>marge-bot</gnome:userid>
+    </foaf:Person>
+  </maintainer>
 </Project>

lint/eslintrc-gjs.yml

@@ -1,7 +1,12 @@
 ---
+# SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2018 Claudio André <claudioandre.br@gmail.com>
 env:
   es6: true
+  es2020: true
 extends: 'eslint:recommended'
+plugins:
+  - jsdoc
 rules:
   array-bracket-newline:
     - error
@@ -24,7 +29,9 @@ rules:
   #     allow: [^vfunc_, ^on_, _instance_init]
   comma-dangle:
     - error
-    - always-multiline
+    - arrays: always-multiline
+      objects: always-multiline
+      functions: never
   comma-spacing:
     - error
     - before: false
@@ -57,6 +64,17 @@ rules:
       - 'CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child'
       # Allow dedenting chained member expressions
       MemberExpression: 'off'
+  jsdoc/check-alignment: error
+  jsdoc/check-param-names: error
+  jsdoc/check-tag-names: error
+  jsdoc/check-types: error
+  jsdoc/implements-on-classes: error
+  jsdoc/newline-after-description: error
+  jsdoc/require-jsdoc: error
+  jsdoc/require-param: error
+  jsdoc/require-param-description: error
+  jsdoc/require-param-name: error
+  jsdoc/require-param-type: error
   key-spacing:
     - error
     - beforeColon: false
@@ -87,6 +105,7 @@ rules:
     - error
     - all
     - conditionalAssign: false
+      nestedBinaryExpressions: false
       returnAssign: false
   no-implicit-coercion:
     - error
@@ -103,17 +122,24 @@ rules:
   no-octal-escape: error
   no-proto: error
   no-prototype-builtins: 'off'
+  no-restricted-globals: [error, window]
   no-restricted-properties:
     - error
+    - object: imports
+      property: format
+      message: Use template strings
+    - object: pkg
+      property: initFormat
+      message: Use template strings
+    - object: Lang
+      property: copyProperties
+      message: Use Object.assign()
     - object: Lang
       property: bind
       message: Use arrow notation or Function.prototype.bind()
     - object: Lang
       property: Class
       message: Use ES6 classes
-    - object: imports
-      property: mainloop
-      message: Use GLib main loops and timeouts
   no-restricted-syntax:
     - error
     - selector: >-
@@ -129,6 +155,8 @@ rules:
         BlockStatement[body.length=1]
         CallExpression[arguments.length=0][callee.object.type="Super"][callee.property.name="_init"]
       message: _init() that only calls super._init() is unnecessary
+    - selector: BinaryExpression[operator="instanceof"][right.name="Array"]
+      message: Use Array.isArray()
   no-return-assign: error
   no-return-await: error
   no-self-compare: error
@@ -161,10 +189,14 @@ rules:
   object-curly-newline:
     - error
     - consistent: true
+      multiline: true
   object-curly-spacing: error
   object-shorthand: error
   operator-assignment: error
   operator-linebreak: error
+  padded-blocks:
+    - error
+    - never
   # These may be a bit controversial, we can try them out and enable them later
   # prefer-const: error
   # prefer-destructuring: error
@@ -205,18 +237,19 @@ rules:
   template-curly-spacing: error
   template-tag-spacing: error
   unicode-bom: error
-  valid-jsdoc:
-    - error
-    - requireReturn: false
   wrap-iife:
     - error
     - inside
   yield-star-spacing: error
   yoda: error
+settings:
+  jsdoc:
+    mode: typescript
 globals:
   ARGV: readonly
   Debugger: readonly
   GIRepositoryGType: readonly
+  globalThis: readonly
   imports: readonly
   Intl: readonly
   log: readonly
@@ -224,5 +257,7 @@ globals:
   print: readonly
   printerr: readonly
   window: readonly
+  TextEncoder: readonly
+  TextDecoder: readonly
 parserOptions:
-  ecmaVersion: 2017
+  ecmaVersion: 2020

meson.build

@@ -1,11 +1,12 @@
 project('gnome-shell-extensions',
-  version: '3.36.2',
+  version: '42.beta',
-  meson_version: '>= 0.44.0',
+  meson_version: '>= 0.53.0',
   license: 'GPL2+'
 )
 
 gettext_domain = meson.project_name()
 
+fs = import('fs')
 gnome = import('gnome')
 i18n = import('i18n')
 
@@ -19,21 +20,15 @@ themedir = join_paths(shelldir, 'theme')
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
 xsessiondir = join_paths(datadir, 'xsessions')
-
+wlsessiondir = join_paths(datadir, 'wayland-sessions')
-js68 = find_program('js68', required: false)
 
 ver_arr = meson.project_version().split('.')
-if ver_arr[1].to_int().is_even()
+shell_version = ver_arr[0]
-  shell_version = '@0@.@1@'.format(ver_arr[0], ver_arr[1])
-else
-  shell_version = '.'.join(ver_arr)
-endif
 
 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
 
 classic_extensions = [
   'apps-menu',
-  'horizontal-workspaces',
   'places-menu',
   'launch-new-instance',
   'window-list'
@@ -88,9 +83,17 @@ foreach e : enabled_extensions
 endforeach
 
 if classic_mode_enabled
-  sassc = find_program('sassc', required: true)
   subdir('data')
+  meson.add_install_script(
+    'meson/session-post-install.py',
+    join_paths(get_option('prefix'), datadir)
+  )
 endif
 
 subdir('extensions')
 subdir('po')
+
+meson.add_dist_script('meson/generate-stylesheets.py')
+meson.add_dist_script('meson/check-version.py',
+  meson.project_version(),
+  'NEWS')

meson/check-version.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+import os, sys
+from pathlib import Path
+import argparse, subprocess
+
+def check_version(version, file, type='news'):
+    if type == 'news':
+        line = file.open().readline()
+        ok = line.startswith(version)
+        print("{}: {}".format(file, "OK" if ok else "FAILED"))
+        if not ok:
+            raise Exception("{} does not start with {}".format(file, version))
+    elif type == 'metainfo':
+        subprocess.run(['appstream-util', 'validate-version', file, version],
+                       check=True)
+    else:
+        raise Exception('Not implemented')
+
+parser = argparse.ArgumentParser(description='Check release version information.')
+parser.add_argument('--type', choices=['metainfo','news'], default='news')
+parser.add_argument('version', help='the version to check for')
+parser.add_argument('files', nargs='+', help='files to check')
+args = parser.parse_args()
+
+distroot = os.environ.get('MESON_DIST_ROOT', './')
+
+try:
+    for file in args.files:
+        check_version(args.version, Path(distroot, file), args.type)
+except:
+    sys.exit(1)

meson/generate-stylesheets.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+import os
+from pathlib import PurePath
+import subprocess
+
+sourceroot = os.environ.get('MESON_SOURCE_ROOT')
+distroot = os.environ.get('MESON_DIST_ROOT')
+
+stylesheet_path = PurePath('data/gnome-classic.css')
+src = PurePath(sourceroot, stylesheet_path.with_suffix('.scss'))
+dst = PurePath(distroot, stylesheet_path)
+subprocess.run(['sassc', '-a', src, dst], check=True)

meson/session-post-install.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+import os
+import shutil
+import sys
+
+if os.environ.get('DESTDIR'):
+  install_root = os.environ.get('DESTDIR') + os.path.abspath(sys.argv[1])
+else:
+  install_root = sys.argv[1]
+
+# FIXME: Meson is unable to copy a generated target file:
+#        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
+dst_dir = os.path.join(install_root, 'wayland-sessions')
+if not os.path.exists(dst_dir):
+  os.makedirs(dst_dir)
+
+src = os.path.join(install_root, 'xsessions', 'gnome-classic.desktop')
+dst = os.path.join(dst_dir, 'gnome-classic.desktop')
+shutil.copyfile(src, dst)

po/LINGUAS

@@ -1,3 +1,4 @@
+ab
 af
 an
 ar
@@ -32,6 +33,7 @@ id
 is
 it
 ja
+kab
 kk
 km
 kn

po/POTFILES.in

@@ -1,5 +1,6 @@
 data/gnome-classic.desktop.in
-data/gnome-classic.session.desktop.in
+data/gnome-classic-wayland.desktop.in
+data/gnome-classic-xorg.desktop.in
 extensions/apps-menu/extension.js
 extensions/auto-move-windows/extension.js
 extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml
@@ -10,7 +11,6 @@ extensions/native-window-placement/org.gnome.shell.extensions.native-window-plac
 extensions/places-menu/extension.js
 extensions/places-menu/placeDisplay.js
 extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
-extensions/user-theme/extension.js
 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

po/ab.po

@@ -0,0 +1,261 @@
+# Abkhazian translation for gnome-shell-extensions.
+# Copyright (C) 2022 gnome-shell-extensions's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-shell-extensions package.
+# Нанба Наала <naala-nanba@rambler.ru>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-shell-extensions main\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2022-02-12 02:08+0000\n"
+"PO-Revision-Date: 2022-02-12 02:08+0000\n"
+"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>, 2022\n"
+"Language-Team: Abkhazian <ab@li.org>\n"
+"Language: ab\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: data/gnome-classic.desktop.in:3
+msgid "GNOME Classic"
+msgstr "Аклассикатә GNOME"
+
+#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic-xorg.desktop.in:4
+msgid "This session logs you into GNOME Classic"
+msgstr "Ари асеанс аклассикатә усуратә еишәа GNOME хархәагас иамоуп "
+
+#: data/gnome-classic-wayland.desktop.in:3
+msgid "GNOME Classic on Wayland"
+msgstr "Аклассикатә GNOME Wayland аҟны"
+
+#: data/gnome-classic-xorg.desktop.in:3
+msgid "GNOME Classic on Xorg"
+msgstr "Аклассикатә GNOME Xorg аҟны"
+
+#: extensions/apps-menu/extension.js:112
+msgid "Favorites"
+msgstr "Иалкаау"
+
+#: extensions/apps-menu/extension.js:370
+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 "Ацәаҳәақәа рыхьӡынҵа аиԥшрагәаҭага аԥшьы (desktop-фаил ахьӡ )"
+"змоу, зашьҭахь ҩ-кәаԥки аусуратә ҭыԥ аномери гылоу "
+
+#: extensions/auto-move-windows/prefs.js:19
+msgid "Workspace Rules"
+msgstr "Аусуратә ҵакыра аԥҟаррақәа"
+
+#: extensions/auto-move-windows/prefs.js:245
+msgid "Add Rule"
+msgstr "Аԥҟара ацҵара"
+
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:123
+#: extensions/places-menu/placeDisplay.js:210
+#, javascript-format
+msgid "Ejecting drive “%s” failed:"
+msgstr "Адиск «%s» аҭыгара залымшахеит:"
+
+#: extensions/drive-menu/extension.js:139
+msgid "Removable devices"
+msgstr "Иаҿыҵуа аиҿартәырақәа"
+
+#: extensions/drive-menu/extension.js:161
+msgid "Open Files"
+msgstr "Афаил аартра"
+
+#: 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 "Шәхы иашәырхәа изыцҵоу аекран аҵакыра аминиатиура атыԥаркразы"
+"аекран аганқәа реизышәара ԥсахуа аҭыԥыркра шәыржәпала, анаҩс адаԥа ҳәаақәызҵо ашәагаа архәыҷразы"
+"ари ахышәара ахархәара аиуоит аминиатиура «natural» аҭыԥыркра алгоритм  ахархәараан"
+
+#: 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 "Иалхзар, ахқәа аминиатиура хыхьтәи ахәҭаҟны аҭыԥ ааныркылалоит"
+"(ишыҟоу еиԥш ахқәа ҵаҟатәи аҭыԥ ааныркылоит).Ари ахышәара аԥсахраан,"
+"уи аус аура иалагарцазы, иаҭахуп Shell аиҭарура."
+
+#: extensions/places-menu/extension.js:88
+#: extensions/places-menu/extension.js:91
+msgid "Places"
+msgstr "Аҭыԥқәа"
+
+#: extensions/places-menu/placeDisplay.js:49
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr " «%s» аус арура залшом"
+
+#: extensions/places-menu/placeDisplay.js:64
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr "Иамоуӡит атом аибыҭара «%s» азы"
+
+#: extensions/places-menu/placeDisplay.js:125
+#: extensions/places-menu/placeDisplay.js:148
+msgid "Computer"
+msgstr "Акомпиутер"
+
+#: extensions/places-menu/placeDisplay.js:336
+msgid "Home"
+msgstr "Аҩнытәи аҭаӡ"
+
+#: extensions/places-menu/placeDisplay.js:381
+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 "Атема ахьӡ"
+
+#: 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:72
+msgid "Close"
+msgstr "Аркра"
+
+#: extensions/window-list/extension.js:92
+msgid "Unminimize"
+msgstr "Архынҳәра"
+
+#: extensions/window-list/extension.js:92
+msgid "Minimize"
+msgstr "Аиҟәырҳәра"
+
+#: extensions/window-list/extension.js:99
+msgid "Unmaximize"
+msgstr "Аиҭашьақәыргылара"
+
+#: extensions/window-list/extension.js:99
+msgid "Maximize"
+msgstr "Аиҵыхра"
+
+#: extensions/window-list/extension.js:434
+msgid "Minimize all"
+msgstr "Зегьы реиҟәырҳәра"
+
+#: extensions/window-list/extension.js:440
+msgid "Unminimize all"
+msgstr "Зегьы рырхынҳәра"
+
+#: extensions/window-list/extension.js:446
+msgid "Maximize all"
+msgstr "Зегьы реиҵыхра"
+
+#: extensions/window-list/extension.js:454
+msgid "Unmaximize all"
+msgstr "Зегьы реиҭашьақәыргылара"
+
+#: extensions/window-list/extension.js:462
+msgid "Close all"
+msgstr "Зегьы рыркра"
+
+#: extensions/window-list/extension.js:741
+msgid "Window List"
+msgstr "Аԥенџьырқәа рыхьӡынҵа"
+
+#: 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:13
+msgid ""
+"Decides when to group windows from the same application on the window list. "
+"Possible values are “never”, “auto” and “always”."
+msgstr "Иҳәаақәнаҵоит, ианаҭаху  ԥшьык иаҵанакуа аԥенџьырқәа реидыргәыԥлара, аԥенџьырқәа рыхьӡынҵаҟны"
+" Иҟалар зылшо аҵакқәа : «never» — ахаан; «auto» — автоматла; «always» — есқьынгьы"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: extensions/window-list/prefs.js:76
+msgid "Show windows from all workspaces"
+msgstr "Аҵакырақәа зегьы рҟынтә аԥенџьырқәа раарԥшра"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid "Whether to show windows from all workspaces or only the current one."
+msgstr 
+"Аԥенџьырқәа рыхьӡынҵа аусуратә ҵакырақәа зегь рҟынтә акәу,мамзар уажәтәи аҟынтә акәу ишаарԥшлатәу"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
+msgid "Show the window list on all monitors"
+msgstr "Аԥенџьырқәа рыхьӡынҵа амониторқәа зегьы рҟны рырбара"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr 
+"Аԥенџьырқәа рыхьӡынҵа иаҿаку амониторқәа зегьы рыҟноума иахьаарԥшлатәу , мамзар ихадоу аҟны акәу."
+
+#: extensions/window-list/prefs.js:32
+msgid "Window Grouping"
+msgstr "Аԥенџьырқәа  реидыргәыԥлара"
+
+#: extensions/window-list/prefs.js:37
+msgid "Never group windows"
+msgstr "Ахаангьы аԥенџьырқәа реидмыргәыԥлара"
+
+#: extensions/window-list/prefs.js:38
+msgid "Group windows when space is limited"
+msgstr "Аҭыԥ маҷхазар, аԥенџьырқәа еидшәыргәыԥла"
+
+#: extensions/window-list/prefs.js:39
+msgid "Always group windows"
+msgstr "Еснагь аԥенџьырқәа реидыргәыԥлара"
+
+#: extensions/window-list/prefs.js:63
+msgid "Show on all monitors"
+msgstr "Амониторқәа зегьы рҟны рырбара"
+
+#: extensions/window-list/workspaceIndicator.js:249
+#: extensions/workspace-indicator/extension.js:254
+msgid "Workspace Indicator"
+msgstr "Аусуратә ҵакыра аиндикатор"
+
+#: extensions/workspace-indicator/prefs.js:18
+msgid "Workspace Names"
+msgstr "Аусуратә ҵакырақәа рыхьӡқәа"
+
+#: extensions/workspace-indicator/prefs.js:39
+#, javascript-format
+msgid "Workspace %d"
+msgstr "Аусуратә ҵакыра %d"
+
+#: extensions/workspace-indicator/prefs.js:184
+msgid "Add Workspace"
+msgstr "Аусуратә ҵакыра ацҵара"

po/be.po

@@ -6,11 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"shell&keywords=I18N+L10N&component=extensions\n"
+"issues\n"
-"POT-Creation-Date: 2017-08-19 16:41+0000\n"
+"POT-Creation-Date: 2021-01-20 23:03+0000\n"
-"PO-Revision-Date: 2017-09-01 17:56+0300\n"
+"PO-Revision-Date: 2021-01-24 15:33+0300\n"
-"Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
+"Last-Translator: Launchpad translators\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.4.2\n"
 
-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: data/gnome-classic.desktop.in:3
 msgid "GNOME Classic"
 msgstr "Класічны GNOME"
 
@@ -28,171 +28,69 @@ msgstr "Класічны GNOME"
 msgid "This session logs you into GNOME Classic"
 msgstr "Гэты сеанс выкарыстоўвае класічны GNOME"
 
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+#: extensions/apps-menu/extension.js:113
-msgid "Attach modal dialog to the parent window"
-msgstr "Прымацаваць мадальны дыялог да бацькоўскага акна"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "Гэты ключ засланяе ключ у org.gnome.mutter калі запушчаны GNOME Shell."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Парадак кнопак у загалоўнай стужцы"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Гэты ключ засланяе ключ у org.gnome.desktop.wm.preferences калі запушчаны "
-"GNOME Shell."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Аўтаматычна змяняць памеры акна пры перамяшчэнні да края экрана"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
-msgid "Workspaces only on primary monitor"
-msgstr "Працоўныя прасторы толькі на асноўным маніторы"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-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:41
-msgid "Activities Overview"
-msgstr "Агляд заняткаў"
-
-#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
-msgstr "Упадабаныя"
+msgstr "Абраныя"
 
-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Праграмы"
 
 #: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
-msgstr "Праграма і спіс працоўных прастораў"
+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 ""
-"Спіс радкоў, кожны з якіх утрымлівае ідэнтыфікатар праграмы (імя *.desktop "
+"Спіс радкоў, кожны з якіх змяшчае ідэнтыфікатар праграмы (імя файла *."
-"файла), затым двукроп'е і нумар працоўнай прасторы"
+"desktop), затым двукроп'е і нумар працоўнай прасторы"
 
-#: extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:35
-msgid "Application"
+msgid "Workspace Rules"
-msgstr "Праграма"
+msgstr "Правілы для працоўнай прасторы"
 
-#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:237
-#: extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "Працоўная прастора"
-
-#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Дадаць правіла"
 
-#: extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "Стварыць новае правіла адпаведнасці"
-
-#: extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "Дадаць"
-
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:112
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
-msgstr "Не ўдалося выняць прывод \"%s\":"
+msgstr "Не ўдалося выняць дыск «%s»:"
 
-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
-msgstr "Зменныя прыстасаванні"
+msgstr "Здымныя прылады"
 
-#: extensions/drive-menu/extension.js:150
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Адкрыць файлы"
 
-#: extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Прывітанне, свет!"
-
-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
-msgid "Alternative greeting text."
-msgstr "Альтэрнатыўны тэкст вітання."
-
-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
-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"
-msgstr "Паведамленне"
-
-#. TRANSLATORS: Example is the name of the extension, should not be
-#. translated
-#: 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 ""
-"Example пакажа як ствараць пашырэнні для Shell. Сам па сабе ён мае мала "
-"функцыянальнасці.\n"
-"Тым не менш, можна змяніць тэкст прывітання."
-
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#, fuzzy
 msgid "Use more screen for windows"
 msgstr "Выкарыстоўваць большую плошчу экрана для вокнаў"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#, fuzzy
 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 "Змяшчаць загалоўкі вокнаў зверху"
+msgstr "Размяшчаць подпіс акна зверху"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
@@ -200,156 +98,243 @@ msgid ""
 "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:78
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Месцы"
 
-#: extensions/places-menu/placeDisplay.js:65
+#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Не ўдалося прымацаваць том для \"%s\"."
-
-#: extensions/places-menu/placeDisplay.js:78
 #, javascript-format
 msgid "Failed to launch “%s”"
-msgstr "Не ўдалося запусціць \"%s\""
+msgstr "Не ўдалося запусціць «%s»"
 
-#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:61
-#: extensions/places-menu/placeDisplay.js:160
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr "Не ўдалося прымацаваць том для «%s»."
+
+#: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Камп'ютар"
 
-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
-msgstr "Дамашняя папка"
+msgstr "Хатняя папка"
 
-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Агляд сеткі"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
-msgstr "Чаргаваць памеры экраннага здымка"
+msgstr "Паслядоўнасць змены памераў для здымка экрана"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
 msgid "Cycle Screenshot Sizes Backward"
-msgstr "Чаргаваць памеры экраннага здымка ў адваротным напрамку"
+msgstr "Адваротная паслядоўнасць змены памераў для здымка экрана"
 
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
-msgstr "Імя матыву аздаблення"
+msgstr "Назва тэмы"
 
 #: 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 ""
+msgstr "Назва тэмы, што загрузіцца з ~/.themes/name/gnome-shell"
-"Імя матыву аздаблення, які будзе загружаны з ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Закрыць"
 
-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
-msgstr "Скасаваць мінімалізацыю"
+msgstr "Скасаваць згортванне"
 
-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
-msgstr "Мінімалізаваць"
+msgstr "Згарнуць"
 
-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
-msgstr "Скасаваць максімалізацыю"
+msgstr "Скасаваць разгортванне"
 
-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
-msgstr "Максімалізаваць"
+msgstr "Разгарнуць"
 
-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:432
 msgid "Minimize all"
-msgstr "Мінімалізаваць усе"
+msgstr "Згарнуць усе"
 
-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:438
 msgid "Unminimize all"
-msgstr "Скасаваць мінімалізацыю для ўсіх"
+msgstr "Скасаваць згортванне для ўсіх"
 
-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:444
 msgid "Maximize all"
-msgstr "Максімалізаваць усе"
+msgstr "Разгарнуць усе"
 
-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:452
 msgid "Unmaximize all"
-msgstr "Скасаваць максімалізацыю для ўсіх"
+msgstr "Скасаваць разгортванне для ўсіх"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:460
 msgid "Close all"
 msgstr "Закрыць усе"
 
-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:737
-#: extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Індыкатар працоўнай прасторы"
-
-#: extensions/window-list/extension.js:842
 msgid "Window List"
 msgstr "Спіс вокнаў"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
-msgstr "Калі групаваць вокны"
+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”."
 msgstr ""
-"Вырашае калі групаваць вокны адной праграмы ў спісе вокнаў. Магчымыя "
+"Вызначае калі групаваць вокны адной праграмы ў спісе вокнаў. Магчымыя "
-"значэнні: \"never\" (ніколі), \"auto\" (аўтаматычна), \"always\" (заўсёды)."
+"значэнні: «never» (ніколі), «auto» (аўтаматычна), «always» (заўсёды)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-msgid "Show the window list on all monitors"
+#: extensions/window-list/prefs.js:100
-msgstr "Паказаць спіс вокнаў на ўсіх маніторах"
+msgid "Show windows from all workspaces"
+msgstr "Паказваць вокны з усіх працоўных прастор"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid "Whether to show windows from all workspaces or only the current one."
+msgstr "Паказваць вокны з усіх працоўных прастор ці толькі з бягучай."
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
+msgid "Show the window list on all monitors"
+msgstr "Паказваць спіс вокнаў на ўсіх маніторах"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
 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:29
 msgid "Window Grouping"
 msgstr "Групаванне вокнаў"
 
-#: extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Ніколі не групаваць вокны"
 
-#: extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Групаваць вокны калі не хапае месца"
 
-#: extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Заўсёды групаваць вокны"
 
-#: extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
-msgstr "Паказаць усе маніторы"
+msgstr "Паказваць на ўсіх маніторах"
 
-#: extensions/workspace-indicator/prefs.js:141
+#: extensions/window-list/workspaceIndicator.js:247
+#: extensions/workspace-indicator/extension.js:253
+msgid "Workspace Indicator"
+msgstr "Індыкатар працоўнай прасторы"
+
+#: extensions/workspace-indicator/prefs.js:34
 msgid "Workspace Names"
-msgstr "Назвы працоўных прастораў"
+msgstr "Назвы працоўных прастор"
 
-#: extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:67
-msgid "Name"
-msgstr "Імя"
-
-#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Працоўная прастора %d"
+
+#: extensions/workspace-indicator/prefs.js:208
+msgid "Add Workspace"
+msgstr "Дадаць працоўную прастору"
+
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Прымацаваць мадальны дыялог да бацькоўскага акна"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "Гэты ключ засланяе ключ у org.gnome.mutter калі запушчаны GNOME Shell."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Парадак кнопак у загалоўнай стужцы"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "Гэты ключ засланяе ключ у org.gnome.desktop.wm.preferences калі запушчаны "
+#~ "GNOME Shell."
+
+#~ 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 "Activities Overview"
+#~ msgstr "Агляд заняткаў"
+
+#~ msgid "Application"
+#~ msgstr "Праграма"
+
+#~ msgid "Create new matching rule"
+#~ msgstr "Стварыць новае правіла адпаведнасці"
+
+#~ msgid "Add"
+#~ 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"
+#~ 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 ""
+#~ "Example пакажа як ствараць пашырэнні для Shell. Сам па сабе ён мае мала "
+#~ "функцыянальнасці.\n"
+#~ "Тым не менш, можна змяніць тэкст прывітання."
+
+#~ msgid "Name"
+#~ msgstr "Імя"

po/bg.po

@@ -1,359 +1,272 @@
-# Bulgarian translation for gnome-shell-extensions po-file.
+# Bulgarian translation for gnome-shell-extensions po-file.
-# Copyright (C) 2014, 2015, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2015, 2017 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell-extensions package.
+# Copyright (C) 2021, 2022 Alexander Shopov <ash@kambanaria.org>.
-# Ivaylo Valkov <ivaylo@e-valkov.org>, 2014.
+# This file is distributed under the same license as the gnome-shell-extensions package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015.
+# Ivaylo Valkov <ivaylo@e-valkov.org>, 2014.
-# Lyubomir Vasilev <lyubomirv@abv.bg>, 2017.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2021, 2022.
-msgid ""
+# Lyubomir Vasilev <lyubomirv@abv.bg>, 2017.
-msgstr ""
+msgid ""
-"Project-Id-Version: gnome-shell-extensions master\n"
+msgstr ""
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Project-Id-Version: gnome-shell-extensions master\n"
-"shell&keywords=I18N+L10N&component=extensions\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"POT-Creation-Date: 2017-09-09 15:20+0000\n"
+"issues\n"
-"PO-Revision-Date: 2017-09-08 08:47+0300\n"
+"POT-Creation-Date: 2022-02-12 20:25+0000\n"
-"Last-Translator: Lyubomir Vasilev <lyubomirv@abv.bg>\n"
+"PO-Revision-Date: 2022-02-13 11:40+0100\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
-"Language: bg\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"MIME-Version: 1.0\n"
+"Language: bg\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Content-Transfer-Encoding: 8bit\n"
-
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+
-msgid "GNOME Classic"
+#: data/gnome-classic.desktop.in:3
-msgstr "Класически GNOME"
+msgid "GNOME Classic"
-
+msgstr "Класически GNOME"
-#: data/gnome-classic.desktop.in:4
+
-msgid "This session logs you into GNOME Classic"
+#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
-msgstr "Работната среда изглежда като класическия GNOME (2.x)"
+#: data/gnome-classic-xorg.desktop.in:4
-
+msgid "This session logs you into GNOME Classic"
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgstr "Работната среда изглежда като класическия GNOME (2.x)"
-msgid "Attach modal dialog to the parent window"
+
-msgstr "Прикрепяне на модалните прозорци към родителските им прозорци"
+#: data/gnome-classic-wayland.desktop.in:3
-
+msgid "GNOME Classic on Wayland"
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+msgstr "Класически GNOME в Wayland"
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/gnome-classic-xorg.desktop.in:3
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+msgid "GNOME Classic on Xorg"
-msgid ""
+msgstr "Класически GNOME в Xorg"
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+
-msgstr ""
+#: extensions/apps-menu/extension.js:112
-"Този ключ при е с по-голям приоритет от „org.gnome.mutter“ при изпълнението "
+msgid "Favorites"
-"на обвивката на GNOME."
+msgstr "Любими"
-
+
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+#: extensions/apps-menu/extension.js:370
-msgid "Arrangement of buttons on the titlebar"
+msgid "Applications"
-msgstr "Подредба на бутоните на заглавната лента"
+msgstr "Програми"
-
+
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
-msgid ""
+msgid "Application and workspace list"
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+msgstr "Списък с програмите и работните плотове"
-"GNOME Shell."
+
-msgstr ""
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
-"Този ключ при е с по-голям приоритет от „org.gnome.desktop.wm.preferences“ "
+msgid ""
-"при изпълнението на обвивката на GNOME."
+"A list of strings, each containing an application id (desktop file name), "
-
+"followed by a colon and the workspace number"
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgstr ""
-msgid "Enable edge tiling when dropping windows on screen edges"
+"Списък от низове. Всеки съдържа идентификатор на програма (име на файл „."
-msgstr ""
+"desktop“), следван от знака „:“ и номер на работен плот"
-"Включване на специална подредба при приближаване на прозорец до ръбовете на "
+
-"екрана"
+#: extensions/auto-move-windows/prefs.js:19
-
+msgid "Workspace Rules"
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgstr "Правила за работните плотове"
-msgid "Workspaces only on primary monitor"
+
-msgstr "Работни плотове само на основния екран"
+#: extensions/auto-move-windows/prefs.js:245
-
+msgid "Add Rule"
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgstr "Добавяне на правило"
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
+
-msgstr "Забавяне на смяната на фокуса до спирането на движението на показалеца"
+#. TRANSLATORS: %s is the filesystem name
-
+#: extensions/drive-menu/extension.js:123
-#: extensions/alternate-tab/prefs.js:20
+#: extensions/places-menu/placeDisplay.js:210
-msgid "Thumbnail only"
+#, javascript-format
-msgstr "Само миниатюри"
+msgid "Ejecting drive “%s” failed:"
-
+msgstr "Неуспешно изваждане на устройство „%s“:"
-#: extensions/alternate-tab/prefs.js:21
+
-msgid "Application icon only"
+#: extensions/drive-menu/extension.js:139
-msgstr "Само икони на приложенията"
+msgid "Removable devices"
-
+msgstr "Преносими медии"
-#: extensions/alternate-tab/prefs.js:22
+
-msgid "Thumbnail and application icon"
+#: extensions/drive-menu/extension.js:161
-msgstr "Миниатюри и икони на приложенията"
+msgid "Open Files"
-
+msgstr "Отваряне на файлове"
-#: extensions/alternate-tab/prefs.js:38
+
-msgid "Present windows as"
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-msgstr "Показване на прозорците като"
+msgid "Use more screen for windows"
-
+msgstr "Повече пространство за прозорците"
-#: extensions/alternate-tab/prefs.js:69
+
-msgid "Show only windows in the current workspace"
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
-msgstr "Да се показват само прозорците на текущия работен плот"
+msgid ""
-
+"Try to use more screen for placing window thumbnails by adapting to screen "
-#: extensions/apps-menu/extension.js:41
+"aspect ratio, and consolidating them further to reduce the bounding box. "
-msgid "Activities Overview"
+"This setting applies only with the natural placement strategy."
-msgstr "Показване на програмите"
+msgstr ""
-
+"Използване на по-голяма част от екрана за поставянето на мини изображения "
-#: extensions/apps-menu/extension.js:141
+"чрез промяна на съотношението на страните и допълнително обединяване за "
-msgid "Favorites"
+"смаляване на обхващащия ги правоъгълник. Тази настройка се прилага само при "
-msgstr "Любими"
+"естествената стратегия за поставяне на прозорците."
-
+
-#: extensions/apps-menu/extension.js:436
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
-msgid "Applications"
+msgid "Place window captions on top"
-msgstr "Програми"
+msgstr "Заглавия на прозорците отгоре"
-
+
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
-msgid "Application and workspace list"
+msgid ""
-msgstr "Списък с програмите и работните плотове"
+"If true, place window captions on top the respective thumbnail, overriding "
-
+"shell default of placing it at the bottom. Changing this setting requires "
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+"restarting the shell to have any effect."
-msgid ""
+msgstr ""
-"A list of strings, each containing an application id (desktop file name), "
+"Ако е истина, заглавията на прозорците се поставят над мини изображенията "
-"followed by a colon and the workspace number"
+"им, а не както е стандартно — отдолу. За прилагане на промяната на "
-msgstr ""
+"настройката трябва да рестартирате обвивката на GNOME."
-"Списък от низове. Всеки съдържа идентификатор на програма (име на файл „."
+
-"desktop“ file name), следван от знака „:“ и номер на работен плот"
+#: extensions/places-menu/extension.js:88
-
+#: extensions/places-menu/extension.js:91
-#: extensions/auto-move-windows/prefs.js:60
+msgid "Places"
-msgid "Application"
+msgstr "Места"
-msgstr "Програма"
+
-
+#: extensions/places-menu/placeDisplay.js:49
-#: extensions/auto-move-windows/prefs.js:69
+#, javascript-format
-#: extensions/auto-move-windows/prefs.js:127
+msgid "Failed to launch “%s”"
-msgid "Workspace"
+msgstr "Неуспешно стартиране на „%s“"
-msgstr "Работен плот"
+
-
+#: extensions/places-menu/placeDisplay.js:64
-#: extensions/auto-move-windows/prefs.js:85
+#, javascript-format
-msgid "Add Rule"
+msgid "Failed to mount volume for “%s”"
-msgstr "Добавяне на правило"
+msgstr "Неуспешно монтиране на тома „%s“"
-
+
-#: extensions/auto-move-windows/prefs.js:106
+#: extensions/places-menu/placeDisplay.js:125
-msgid "Create new matching rule"
+#: extensions/places-menu/placeDisplay.js:148
-msgstr "Създаване на правило за съвпадение"
+msgid "Computer"
-
+msgstr "Компютър"
-#: extensions/auto-move-windows/prefs.js:111
+
-msgid "Add"
+#: extensions/places-menu/placeDisplay.js:336
-msgstr "Добавяне"
+msgid "Home"
-
+msgstr "Домашна папка"
-#. TRANSLATORS: %s is the filesystem name
+
-#: extensions/drive-menu/extension.js:107
+#: extensions/places-menu/placeDisplay.js:381
-#, javascript-format
+msgid "Browse Network"
-msgid "Ejecting drive “%s” failed:"
+msgstr "Мрежа"
-msgstr "Неуспешно изваждане на устройство „%s“:"
+
-
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
-#: extensions/drive-menu/extension.js:125
+msgid "Cycle Screenshot Sizes"
-msgid "Removable devices"
+msgstr "Смяна на размерите на снимката на екрана"
-msgstr "Преносими медии"
+
-
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#: extensions/drive-menu/extension.js:150
+msgid "Cycle Screenshot Sizes Backward"
-msgid "Open Files"
+msgstr "Смяна на размерите на снимката на екрана наобратно"
-msgstr "Отваряне на файлове"
+
-
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
-#: extensions/example/extension.js:17
+msgid "Theme name"
-msgid "Hello, world!"
+msgstr "Име на темата"
-msgstr "Здравей, свят!"
+
-
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgid "Alternative greeting text."
+msgstr ""
-msgstr "Друго приветстващо съобщение."
+"Името на темата, която да бъде заредена от „~/.themes/name/gnome-shell“"
-
+
-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: extensions/window-list/extension.js:72
-msgid ""
+msgid "Close"
-"If not empty, it contains the text that will be shown when clicking on the "
+msgstr "Затваряне"
-"panel."
+
-msgstr ""
+#: extensions/window-list/extension.js:92
-"Ако ключът не е празен, съдържанието му се извежда при натискането на панела."
+msgid "Unminimize"
-
+msgstr "Деминимизиране"
-#: extensions/example/prefs.js:30
+
-msgid "Message"
+#: extensions/window-list/extension.js:92
-msgstr "Съобщение"
+msgid "Minimize"
-
+msgstr "Минимизиране"
-#. TRANSLATORS: Example is the name of the extension, should not be
+
-#. translated
+#: extensions/window-list/extension.js:99
-#: extensions/example/prefs.js:43
+msgid "Unmaximize"
-msgid ""
+msgstr "Демаксимизиране"
-"Example aims to show how to build well behaved extensions for the Shell and "
+
-"as such it has little functionality on its own.\n"
+#: extensions/window-list/extension.js:99
-"Nevertheless it’s possible to customize the greeting message."
+msgid "Maximize"
-msgstr ""
+msgstr "Максимизиране"
-"Това е пример за добре работещо разширение на обвивката на GNOME и има "
+
-"минимална функционалност.\n"
+#: extensions/window-list/extension.js:434
-"С него можете да промените приветстващото съобщение на панела."
+msgid "Minimize all"
-
+msgstr "Минимизиране на всички"
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+
-msgid "Use more screen for windows"
+#: extensions/window-list/extension.js:440
-msgstr "Повече пространство за прозорците"
+msgid "Unminimize all"
-
+msgstr "Деминимизиране на всички"
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+
-msgid ""
+#: extensions/window-list/extension.js:446
-"Try to use more screen for placing window thumbnails by adapting to screen "
+msgid "Maximize all"
-"aspect ratio, and consolidating them further to reduce the bounding box. "
+msgstr "Максимизиране на всички"
-"This setting applies only with the natural placement strategy."
+
-msgstr ""
+#: extensions/window-list/extension.js:454
-"Използване на по-голяма част от екрана за поставянето на мини изображения "
+msgid "Unmaximize all"
-"чрез промяна на съотношението на страните и допълнително обединяване за "
+msgstr "Демаксимизиране на всички"
-"смаляване на обхващащия ги правоъгълник. Тази настройка се прилага само при "
+
-"естествената стратегия за поставяне на прозорците."
+#: extensions/window-list/extension.js:462
-
+msgid "Close all"
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+msgstr "Затваряне на всички"
-msgid "Place window captions on top"
+
-msgstr "Заглавия на прозорците отгоре"
+#: extensions/window-list/extension.js:741
-
+msgid "Window List"
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+msgstr "Списък на прозорците"
-msgid ""
+
-"If true, place window captions on top the respective thumbnail, overriding "
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
-"shell default of placing it at the bottom. Changing this setting requires "
+msgid "When to group windows"
-"restarting the shell to have any effect."
+msgstr "Кога прозорците да се групират"
-msgstr ""
+
-"Ако е истина, заглавията на прозорците се поставят над мини изображенията "
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
-"им, а не както е стандартно — отдолу. За прилагане на промяната на "
+msgid ""
-"настройката трябва да рестартирате обвивката на GNOME."
+"Decides when to group windows from the same application on the window list. "
-
+"Possible values are “never”, “auto” and “always”."
-#: extensions/places-menu/extension.js:78
+msgstr ""
-#: extensions/places-menu/extension.js:81
+"Кога прозорците на една програма да се групират в списъка с прозорците. "
-msgid "Places"
+"Възможните стойности са „never“ (никога), „auto“ (автоматично) и "
-msgstr "Места"
+"„always“ (винаги)."
-
+
-#: extensions/places-menu/placeDisplay.js:65
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#, javascript-format
+#: extensions/window-list/prefs.js:76
-msgid "Failed to mount volume for “%s”"
+msgid "Show windows from all workspaces"
-msgstr "Неуспешно монтиране на тома „%s“"
+msgstr "Да се показват прозорците от всички работни плотове"
-
+
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-#, javascript-format
+msgid "Whether to show windows from all workspaces or only the current one."
-msgid "Failed to launch “%s”"
+msgstr ""
-msgstr "Неуспешно стартиране на „%s“"
+"Дали да се показват прозорците от всички работни плотове или само от текущия."
-
+
-#: extensions/places-menu/placeDisplay.js:137
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
-#: extensions/places-menu/placeDisplay.js:160
+msgid "Show the window list on all monitors"
-msgid "Computer"
+msgstr "Извеждане на списъка с прозорци на всички монитори"
-msgstr "Компютър"
+
-
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
-#: extensions/places-menu/placeDisplay.js:303
+msgid ""
-msgid "Home"
+"Whether to show the window list on all connected monitors or only on the "
-msgstr "Домашна папка"
+"primary one."
-
+msgstr ""
-#: extensions/places-menu/placeDisplay.js:347
+"Дали списъкът с прозорци да се извежда на всички монитори или само на "
-msgid "Browse Network"
+"основния"
-msgstr "Мрежа"
+
-
+#: extensions/window-list/prefs.js:32
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+msgid "Window Grouping"
-msgid "Cycle Screenshot Sizes"
+msgstr "Групиране на прозорци"
-msgstr "Смяна на размерите на снимката на екрана"
+
-
+#: extensions/window-list/prefs.js:37
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Never group windows"
-msgid "Cycle Screenshot Sizes Backward"
+msgstr "Никога да не се групират"
-msgstr "Смяна на размерите на снимката на екрана наобратно"
+
-
+#: extensions/window-list/prefs.js:38
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+msgid "Group windows when space is limited"
-msgid "Theme name"
+msgstr "Групиране при ограничено място"
-msgstr "Име на темата"
+
-
+#: extensions/window-list/prefs.js:39
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+msgid "Always group windows"
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
+msgstr "Винаги да се групират"
-msgstr ""
+
-"Името на темата, която да бъде заредена от „~/.themes/name/gnome-shell“"
+#: extensions/window-list/prefs.js:63
-
+msgid "Show on all monitors"
-#: extensions/window-list/extension.js:110
+msgstr "На всички монитори"
-msgid "Close"
+
-msgstr "Затваряне"
+#: extensions/window-list/workspaceIndicator.js:249
-
+#: extensions/workspace-indicator/extension.js:254
-#: extensions/window-list/extension.js:129
+msgid "Workspace Indicator"
-msgid "Unminimize"
+msgstr "Индикатор на работните плотове"
-msgstr "Деминимизиране"
+
-
+#: extensions/workspace-indicator/prefs.js:18
-#: extensions/window-list/extension.js:130
+msgid "Workspace Names"
-msgid "Minimize"
+msgstr "Имена на работните плотове"
-msgstr "Минимизиране"
+
-
+#: extensions/workspace-indicator/prefs.js:39
-#: extensions/window-list/extension.js:136
+#, javascript-format
-msgid "Unmaximize"
+msgid "Workspace %d"
-msgstr "Демаксимизиране"
+msgstr "Работен плот %d"
-
+
-#: extensions/window-list/extension.js:137
+#: extensions/workspace-indicator/prefs.js:184
-msgid "Maximize"
+msgid "Add Workspace"
-msgstr "Максимизиране"
+msgstr "Добавяне на работен плот"
-
-#: extensions/window-list/extension.js:420
-msgid "Minimize all"
-msgstr "Минимизиране на всички"
-
-#: extensions/window-list/extension.js:428
-msgid "Unminimize all"
-msgstr "Деминимизиране на всички"
-
-#: extensions/window-list/extension.js:436
-msgid "Maximize all"
-msgstr "Максимизиране на всички"
-
-#: extensions/window-list/extension.js:445
-msgid "Unmaximize all"
-msgstr "Демаксимизиране на всички"
-
-#: extensions/window-list/extension.js:454
-msgid "Close all"
-msgstr "Затваряне на всички"
-
-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Индикатор на работните плотове"
-
-#: extensions/window-list/extension.js:842
-msgid "Window List"
-msgstr "Списък на прозорците"
-
-#: 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:13
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
-msgstr ""
-"Кога да се групират прозорците на една програма в списъка с прозорците. "
-"Възможните стойности са „never“ (никога), „auto“ (автоматично) и "
-"„always“ (винаги)."
-
-#: 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:32
-msgid "Window Grouping"
-msgstr "Групиране на прозорци"
-
-#: extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "Никога да не се групират"
-
-#: extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "Групиране при ограничено място"
-
-#: extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "Винаги да се групират"
-
-#: extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "На всички монитори"
-
-#: extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Имена на работните плотове"
-
-#: extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "Име"
-
-#: extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Работен плот %d"

po/bn_IN.po

@@ -1,360 +1,350 @@
 # sray <sray@redhat.com>, 2013, 2014. #zanata.
+# Akarshan Biswas <akarshan.biswas@hotmail.com>, 2020.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: unnamed project\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"shell&keywords=I18N+L10N&component=extensions\n"
+"issues\n"
-"POT-Creation-Date: 2014-09-22 07:38+0000\n"
+"POT-Creation-Date: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2014-09-22 16:37+0000\n"
+"PO-Revision-Date: 2020-08-13 10:03+0530\n"
-"Last-Translator: \n"
+"Last-Translator: Akarshan Biswas <akarshan.biswas@hotmail.com>\n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
 "Language: bn_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-DamnedLies-Scope: partial\n"
+"X-Generator: Gtranslator 3.36.0\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
-#: ../data/gnome-classic.session.desktop.in.in.h:1
 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 ক্লাসিকে লগ করায়"
+msgstr "এই সেশন আপনাকে GNOME ক্লাসিকে লগ করায়"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:1
-msgid "GNOME Shell Classic"
-msgstr "GNOME সেল ক্লাসিক"
-
-# auto translated by TM merge from project: gnome-shell, version: 3.8.4, DocId: gnome-shell
-#: ../data/gnome-shell-classic.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "উইন্ডো পরিচালনা ও অ্যাপ্লিকেশন প্রারম্ভ"
-
-#: ../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 সেল চালানোর ক্ষেত্রে এই কী in 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 ""
-"GNOME সেল চালানোর সময়ে এই কী org.gnome.desktop.wm.preferences-এর কী ওভাররাইড "
-"করে।"
-
-#: ../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
-msgid "Activities Overview"
-msgstr "ক্রিয়াকলাপের পূর্বরূপ"
 
 # auto translated by TM merge from project: system-config-printer, version: 1.1.16-23, DocId: system-config-printer
-#: ../extensions/apps-menu/extension.js:113
+#: extensions/apps-menu/extension.js:113
 msgid "Favorites"
 msgstr "বিশেষ"
 
 # auto translated by TM merge from project: gnome-menus, version: 3.8.0, DocId: gnome-menus-3.0
-#: ../extensions/apps-menu/extension.js:282
+#: extensions/apps-menu/extension.js:369
 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
+#: 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 ""
-"স্ট্রীঙের একটি তালিকা, প্রতিটিতে থাকে একটি অ্যাপ্লিকেশন অাইডি (ডেস্কটপ ফাইল "
+"স্ট্রীঙের একটি তালিকা, প্রতিটিতে থাকে একটি অ্যাপ্লিকেশন আইডি (ডেস্কটপ ফাইল নাম), "
-"নাম), "
 "সংগে থাকে যতিচিহ্ন এবং ওয়ার্কস্পেস নম্বর"
 
-# auto translated by TM merge from project: yelp, version: 3.8.1, DocId: yelp
+#: extensions/auto-move-windows/prefs.js:35
-#: ../extensions/auto-move-windows/prefs.js:60
+#| msgid "Workspace Names"
-msgid "Application"
+msgid "Workspace Rules"
-msgstr "অ্যাপ্লিকেশন"
+msgstr "ওয়ার্কস্পেস নিয়মগুলি"
-
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "ওয়ার্কস্পেস"
 
 # auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32
-#: ../extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:243
-#| msgid "Add rule"
 msgid "Add Rule"
 msgstr "নিয়ম যোগ করুন"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#. TRANSLATORS: %s is the filesystem name
-msgid "Create new matching rule"
+#: extensions/drive-menu/extension.js:112
-msgstr "মেলানোর নতুন নিয়ম তৈরি করুন"
+#: extensions/places-menu/placeDisplay.js:233
-
-# auto translated by TM merge from project: file-roller, version: 3.8.3, DocId: file-roller
-#: ../extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "যোগ করুন"
-
-#: ../extensions/drive-menu/extension.js:106
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
+#| msgid "Ejecting drive '%s' failed:"
-msgstr "'%s' ড্রাইভ ইজেক্ট করা গেল না:"
+msgid "Ejecting drive “%s” failed:"
+msgstr "'%s' ড্রাইভ ইজেক্ট করতে ব্যর্থ :"
 
-#: ../extensions/drive-menu/extension.js:123
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "অপসারণযোগ্য ডিভাইসগুলি"
 
 # auto translated by TM merge from project: gnome-user-share, version: 3.8, DocId: gnome-user-share
-#: ../extensions/drive-menu/extension.js:150
+#: extensions/drive-menu/extension.js:155
-msgid "Open File"
+#| msgid "Open File"
+msgid "Open Files"
 msgstr "ফাইল খুলুন"
 
-#: ../extensions/example/extension.js:17
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-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
 msgid "Use more screen for windows"
-msgstr "উইন্ডোর জন্য অারো স্ক্রীন ব্যবহার করুন"
+msgstr "উইন্ডোর জন্য আরো স্ক্রীন ব্যবহার করুন"
 
-#: ../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. "
 "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
+#: 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 ""
-"যদি সত্য হয়, তলায় রাখার সেল ডিফল্ট ওভাররাইড করে সংশ্লিষ্ট থাম্বনেইলের শীর্ষে "
+"যদি সত্য হয়, তলায় রাখার সেল ডিফল্ট ওভাররাইড করে সংশ্লিষ্ট থাম্বনেইলের শীর্ষে উইন্ডো "
-"উইন্ডো "
+"ক্যাপশন রাখুন। এই সেটিং পরিবর্তন করলে তা প্রয়োগ করতে সেল বন্ধ করে চালু করতে হবে।"
-"ক্যাপশন রাখুন। এই সেটিং পরিবর্তন করলে তা প্রয়োগ করতে সেল বন্ধ করে চালু করতে "
-"হবে।"
 
 # auto translated by TM merge from project: file-roller, version: 3.8.3, DocId: file-roller
-#: ../extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:89
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "অবস্থান"
 
-#: ../extensions/places-menu/placeDisplay.js:57
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
-msgid "Failed to launch \"%s\""
+#| msgid "Failed to launch \"%s\""
-msgstr "\"%s\" লঞ্চ করা গেল না"
+msgid "Failed to launch “%s”"
+msgstr "\"%s\" লঞ্চ করতে ব্যর্থ "
+
+#: extensions/places-menu/placeDisplay.js:61
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr "\"%s\" এর জন্য ভলিউম মাউন্ট করতে ব্যর্থ"
 
 # auto translated by TM merge from project: gvfs, version: 1.16.3, DocId: gvfs
-#: ../extensions/places-menu/placeDisplay.js:99
+#: extensions/places-menu/placeDisplay.js:148
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "কম্পিউটার"
 
 # auto translated by TM merge from project: rhsm-web, version: 0.0, DocId: management
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "প্রথম পাতা"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "নেটওয়ার্ক ব্রাউজ"
 
-# auto translated by TM merge from project: gnome-system-monitor, version: 3.8.2.1, DocId: gnome-system-monitor
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "CPU"
-
-# auto translated by TM merge from project: RHEV Installation Guide, version: 3.1, DocId: topics/Planning_your_Data_Center
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "মেমরি"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 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:110
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "বন্ধ করুন"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
-msgstr "অান-মিনিমাইজ"
+msgstr "আন-মিনিমাইজ"
 
-#: ../extensions/window-list/extension.js:121
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "ছোট করুন"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
-msgstr "অান-ম্যাক্সিমাইজ"
+msgstr "আন-ম্যাক্সিমাইজ"
 
-#: ../extensions/window-list/extension.js:128
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "বড় করুন"
 
-#: ../extensions/window-list/extension.js:300
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "সকল ছোট করুন"
 
-#: ../extensions/window-list/extension.js:308
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
-msgstr "সকল অান-মিনিমাইজ করুন"
+msgstr "সকল আন-মিনিমাইজ করুন"
 
-#: ../extensions/window-list/extension.js:316
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "সকল বড় করুন"
 
-#: ../extensions/window-list/extension.js:325
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
-msgstr "সকল অান-ম্যাক্সিমাইজ করুন"
+msgstr "সকল আন-ম্যাক্সিমাইজ করুন"
 
-#: ../extensions/window-list/extension.js:334
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "সকল বন্ধ করুন"
 
-#: ../extensions/window-list/extension.js:644
+#: extensions/window-list/extension.js:734
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "ওয়ার্কস্পেস সূচক"
-
-#: ../extensions/window-list/extension.js:808
-#| msgid "Window Grouping"
 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
+#: 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\"."
+"Possible values are “never”, “auto” and “always”."
 msgstr ""
-"উইন্ডো তালিকায় একই অ্যাপ্লিকেশন থেকে কখন উইন্ডো দলভুক্ত করা হবে তার সিদ্ধান্ত "
+"উইন্ডো তালিকার একই অ্যাপ্লিকেশন থেকে কখন উইন্ডোজকে গ্রুপ করবেন তা সিদ্ধান্ত নেয়। "
-"নেয়। "
+"সম্ভাব্য মানগুলি হ'ল \"কখনই\", \"স্বয়ং\" এবং \"সর্বদা\"।"
-"সম্ভাব্য মানগুলি হল \"কখনও নয়\", \"স্বয়ংক্রিয়\" এবং \"সর্বদা\"।"
 
-#: ../extensions/window-list/prefs.js:30
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: extensions/window-list/prefs.js:100
+#| msgid "Show only windows in the current workspace"
+msgid "Show windows from all workspaces"
+msgstr "সমস্ত ওয়ার্কস্পেসে থেকে উইন্ডো প্রদর্শন করুন"
+
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "উইন্ডো দলভুক্তকরণ"
 
-#: ../extensions/window-list/prefs.js:49
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "উইন্ডো কখনও দলভুক্ত করবেন না"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "স্থান কম থাকলে উইন্ডো দলভুক্ত করুন"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "উইন্ডো সর্বদা দলভুক্ত করুন"
 
-#: ../extensions/workspace-indicator/prefs.js:141
+#: extensions/window-list/prefs.js:94
-#| msgid "Workspace names:"
+msgid "Show on all monitors"
+msgstr "সমস্ত মনিটরের উপর দেখান"
+
+#: extensions/window-list/workspaceIndicator.js:207
+#: extensions/workspace-indicator/extension.js:213
+msgid "Workspace Indicator"
+msgstr "ওয়ার্কস্পেস সূচক"
+
+#: extensions/workspace-indicator/prefs.js:34
 msgid "Workspace Names"
 msgstr "ওয়ার্কস্পেস নামগুলি"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:67
-msgid "Name"
-msgstr "নাম"
-
-#: ../extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "ওয়ার্কস্পেস %d"
 
+#: extensions/workspace-indicator/prefs.js:218
+#| msgid "Workspace"
+msgid "Add Workspace"
+msgstr "ওয়ার্কস্পেস যোগ করুন"
+
+#~ msgid "GNOME Shell Classic"
+#~ msgstr "GNOME সেল ক্লাসিক"
+
+# auto translated by TM merge from project: gnome-shell, version: 3.8.4, DocId: gnome-shell
+#~ msgid "Window management and application launching"
+#~ msgstr "উইন্ডো পরিচালনা ও অ্যাপ্লিকেশন প্রারম্ভ"
+
+#~ 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 সেল চালানোর ক্ষেত্রে এই কী in 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 ""
+#~ "GNOME সেল চালানোর সময়ে এই কী org.gnome.desktop.wm.preferences-এর কী "
+#~ "ওভাররাইড করে।"
+
+#~ 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 "Activities Overview"
+#~ msgstr "ক্রিয়াকলাপের পূর্বরূপ"
+
+# auto translated by TM merge from project: yelp, version: 3.8.1, DocId: yelp
+#~ msgid "Application"
+#~ msgstr "অ্যাপ্লিকেশন"
+
+#~ msgid "Create new matching rule"
+#~ msgstr "মেলানোর নতুন নিয়ম তৈরি করুন"
+
+# auto translated by TM merge from project: file-roller, version: 3.8.3, DocId: file-roller
+#~ msgid "Add"
+#~ 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"
+#~ "উপরন্তু অভিভাদন বার্তা নিজের পছন্দ মতোও করে নেওয়া যায়।"
+
+# auto translated by TM merge from project: gnome-system-monitor, version: 3.8.2.1, DocId: gnome-system-monitor
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+# auto translated by TM merge from project: RHEV Installation Guide, version: 3.1, DocId: topics/Planning_your_Data_Center
+#~ msgid "Memory"
+#~ msgstr "মেমরি"
+
+#~ msgid "Name"
+#~ msgstr "নাম"
+
 # auto translated by TM merge from project: gdm, version: 3.8.4, DocId: gdm
 #~ msgid "Suspend"
 #~ msgstr "স্থগিত করুন"
@@ -370,13 +360,13 @@ msgstr "ওয়ার্কস্পেস %d"
 #~ msgstr "স্থগিত সক্রিয় করুন"
 
 #~ msgid "Control the visibility of the Suspend menu item"
-#~ msgstr "স্থগিত মেনু অাইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"
+#~ msgstr "স্থগিত মেনু আইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"
 
 #~ msgid "Enable hibernating"
 #~ msgstr "নিদ্রিত অবস্থা সক্রিয় করুন"
 
 #~ msgid "Control the visibility of the Hibernate menu item"
-#~ msgstr "নিদ্রিত অবস্থা মেনু অাইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"
+#~ msgstr "নিদ্রিত অবস্থা মেনু আইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"
 
 #~ msgid "Normal"
 #~ msgstr "স্বাভাবিক"