3.29.3+really3.28.1-1

${gnome:Version} doesn't understand the +really workaround.

.eslintrc.yml

@@ -1,3 +0,0 @@
-extends:
- - ./lint/eslintrc-gjs.yml
- - ./lint/eslintrc-shell.yml

.gitlab-ci.yml

@@ -1,169 +0,0 @@
-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"
-
-stages:
-  - pre_review
-  - prepare
-  - review
-  - build
-  - deploy
-
-default:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/35:2022-02-18.0
-  # 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"
-
-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:
-    - gjs-check-syntax
-
-eslint:
-  stage: review
-  <<: *prereview_req
-  script:
-    - export NODE_PATH=$(npm root -g)
-    - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} --format junit --stdout
-  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
-  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
-  variables:
-    GIT_SUBMODULE_STRATEGY: normal
-  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

@@ -1,13 +0,0 @@
-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

.gitlab-ci/run-eslint

@@ -1,54 +0,0 @@
-#!/usr/bin/env node
-
-const {ESLint} = require('eslint');
-
-console.log(`Running ESLint version ${ESLint.version}...`);
-
-const fs = require('fs');
-const path = require('path');
-
-function hasOption(...names) {
-    return process.argv.some(arg => names.includes(arg));
-}
-
-function getOption(...names) {
-    const optIndex =
-        process.argv.findIndex(arg => names.includes(arg)) + 1;
-
-    if (optIndex === 0)
-        return undefined;
-
-    return process.argv[optIndex];
-}
-
-(async function main() {
-    const outputOption = getOption('--output-file', '-o');
-    const outputPath = outputOption ? path.resolve(outputOption) : null;
-
-    const sourceDir = path.dirname(process.argv[1]);
-    process.chdir(path.resolve(sourceDir, '..'));
-
-    const sources = ['extensions'];
-    const eslint = new ESLint();
-
-    const results = await eslint.lintFiles(sources);
-    const formatter = await eslint.loadFormatter(getOption('--format', '-f'));
-    const resultText = formatter.format(results);
-
-    if (outputPath) {
-        fs.mkdirSync(path.dirname(outputPath), {recursive: true});
-        fs.writeFileSync(outputPath, resultText);
-
-        if (hasOption('--stdout')) {
-            const consoleFormatter = await eslint.loadFormatter();
-            console.log(consoleFormatter.format(results));
-        }
-    } else {
-        console.log(resultText);
-    }
-
-    process.exitCode = results.some(r => r.errorCount > 0) ? 1 : 0;
-})().catch((error) => {
-    process.exitCode = 1;
-    console.error(error);
-});

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/HEAD/doc/Style_Guide.md
+[coding-style]: https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Style_Guide.md

NEWS

@@ -1,595 +1,3 @@
-45.beta
-=======
-* Port extensions to ESM [Florian; !259, !266, !268, !269]
-* Misc. bug fixes and cleanups [Florian; !260, !261, !262, !263, !264]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Efstathios Iosifidis [el]
-
-45.alpha
-========
-* window-list: Modernize default styling [Alexander; !253]
-* Replace classic styling with built-in light style [Florian; !254]
-* window-list: Add tooltip for long window titles [Arik; !251]
-* light-style: New extension [Florian; !256]
-* Misc. bug fixes and cleanups [Florian; !255, !257]
-
-Contributors:
-  Florian Müllner, Arik W, Alexander Weichart
-
-44.0
-====
-* Bump version
-
-44.rc
-=====
-* Bump version
-
-44.beta
-=======
-* Tweak menu alignment [robxnano; !246]
-
-Contributors:
-  Florian Müllner, robxnano
-
-Translators:
-  Vasil Pupkin [be]
-
-43.1
-====
-* Fixed crash [Florian; !243]
-* Misc. bug fixes and cleanups [mowemcfc; !244]
-
-Contributors:
-  Florian Müllner, mowemcfc
-
-Translators:
-  Sabri Ünal [tr]
-
-43.0
-====
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Pawan Chitrakar [ne], Zurab Kargareteli [ka], Aleksandr Melman [ru]
-
-43.rc
-=====
-* Misc. bug fixes and cleanups [Florian; !240]
-
-Contributors:
-  Florian Müllner
-
-43.beta
-=======
-* Misc. bug fixes and cleanups [Florian; !237, !238]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Nart Tlisha [ab]
-
-43.alpha
-========
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Marco Ciampa [it]
-
-42.3
-====
-* screenshot-window-sizer: Fix reported sizes on wayland [Florian; !232]
-* window-list: Improve touch support [Florian; !233]
-
-Contributors:
-  Florian Müllner
-
-42.2
-====
-* native-window-placement: Adjust to gnome-shell 42 changes [Florian; !229]
-* window-list: Fix visibility on non-primary monitors [Jason; !230]
-
-Contributors:
-  Jason Lynch, Florian Müllner
-
-Translators:
-  Cheng-Chia Tseng [zh_TW]
-
-42.1
-====
-* Misc. bug fixes and cleanups [Florian; !223, !222, !225]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Milo Casagrande [it], Rūdolfs Mazurs [lv], Nathan Follens [nl],
-  Ngọc Quân Trần [vi], Zurab Kargareteli [ka]
-
-42.0
-====
-
-Translators:
-  Philipp Kiemle [de], Balázs Úr [hu], Марко Костић [sr], sicklylife [ja],
-  Baurzhan Muftakhidinov [kk]
-
-42.rc
-=====
-* Misc. bug fixes and cleanups [Florian; !215, !218]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Marek Černocký [cs], Dušan Kazik [sk], Piotr Drąg [pl], Jiri Grönroos [fi],
-  Luna Jernberg [sv], Alan Mortensen [da], Charles Monzat [fr],
-  Changwoo Ryu [ko]
-
-42.beta
-=======
-* 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:
-  Jan Beich, Florian Müllner, Naala Nanba
-
-Translators:
-  Boyuan Yang [zh_CN], Matej Urbančič [sl], Naala Nanba [ab],
-  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:
-  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
-======
-
-Contributors:
-  Florian Müllner
-
-3.35.91
-=======
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Zander Brown [en_GB]
-
-3.35.90
-=======
-* Adjust to gnome-shell changes [Florian; !100, !101, !102]
-* Force single-line window titles in window list [Florian; #202]
-* Misc. bug fixes and cleanup [Florian; !104, !105]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  sicklylife [ja], Umarzuki Bin Mochlis Moktar [ms]
-
-3.35.3
-======
-
-Translators:
-  Fran Dieguez [gl]
-
-3.35.2
-======
-* Adjust to gnome-shell changes [Marco, Florian; !89, !95, !96]
-* window-list, workspace-indicator: Exclude DESKTOP windows from previews
-  [Florian; !93]
-* screenshot-window-sizer: Fix cycling through all valid sizes [Willy; !97]
-
-Contributors:
-  Marco Trevisan (Treviño), Florian Müllner, Willy Stadnick
-
-3.34.1
-======
-* Adjust to gnome-settings-daemon plugin removals [Xiaoguang; !94]
-
-Contributors:
-  Florian Müllner, Xiaoguang Wang
-
-Translators:
-  Nathan Follens [nl], Dušan Kazik [sk], Ask Hjorth Larsen [da],
-  Yi-Jyun Pan [zh_TW]
-
-3.34.0
-======
-
-Translators:
-  Rafael Fontenelle [pt_BR], Efstathios Iosifidis [el], Milo Casagrande [it],
-  Sabri Ünal [tr]
-
-3.33.92
-=======
-
-Translators:
-  Марко Костић [sr], Tim Sabsch [de], Rūdolfs Mazurs [lv], Matej Urbančič [sl],
-  Balázs Úr [hu], Claude Paroz [fr], Fran Dieguez [gl], Changwoo Ryu [ko],
-  Ryuta Fujii [ja], Fabio Tomat [fur], Goran Vidović [hr]
-
-3.33.91
-=======
-* Misc. bug fixes and cleanups [Florian; !88, !90, !91, !92]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Asier Sarasua Garmendia [eu], Anders Jonsson [sv], Marek Černocký [cs],
-  Kukuh Syafaat [id], Jiri Grönroos [fi], Florentina Mușat [ro],
-  Aurimas Černius [lt], Daniel Mustieles [es], Piotr Drąg [pl], Jordi Mas [ca],
-  Danial Behzadi [fa]
-3.33.90
-=======
-* window-list: Support showing windows from all workspaces [Florian; #154]
-* Misc. bug fixes and cleanups [Florian; !86, !87]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Jor Teron [mjw]
-
-3.33.4
-======
-* Make GNOME Classic more classic:
-  - Disable GNOME 3 overview [Florian; !69]
-  - Add window picker button to window list [Florian; !73, !80]
-  - Style improvements and fixes [Jakub; #169, !82]
-  - Support horizontal workspace layout in window list [Florian; !70]
-  - Add draggable previews to window list workspace switcher [Florian; !74]
-  - Arrange workspaces horizontally [Florian; !72]
-* workspace-indicator: Support horizontal workspace layout [Florian; !71]
-* workspace-indicator: Add draggable previews [Florian; !77]
-* Misc. bug fixes and cleanups [Florian; !75, !76, !79, !78, #168, !84]
-
-Contributors:
-  Florian Müllner, Jakub Steiner, Jor Teron
-
-Translators:
-  Jor Teron [mjw]
-
-3.33.3
-======
-* Misc. bug fixes [Florian, Marco; !67, !68]
-
-Contributors:
-  Florian Müllner, Marco Trevisan (Treviño)
-
-3.33.2
-======
-* Misc. bug fixes and cleanups [Florian; !66]
-
-Contributors:
-  Florian Müllner
-
-3.33.1
-======
-* Misc. bug fixes [Florian; !64]
-
-Contributors:
-  Florian Müllner
-
-3.32.1
-======
-* Fix windowsNavigator extension after ES6 port [Florian; #143]
-* screenshot-window-sizer: Add phone screenshot sizes [Adrien; !65]
-* Misc. bug fixes and cleanups [Fabian; !62]
-
-Contributors:
-  Florian Müllner, Adrien Plazas, Fabian P. Schmidt
-
-3.32.0
-======
-
-Contributors:
-  Florian Müllner
-
-Translations:
-  Victor Ibragimov [tg], Kristjan SCHMIDT [eo], Mart Raudsepp [et]
-
-3.31.92
-=======
-* Misc. bug fixes and cleanups [Florian; !57, !58, !59, !60]
-
-Contributors:
-  Florian Müllner
-
-3.31.91
-=======
-* apps-menu: Remove outdated legacy-tray handling [Florian; !53]
-* user-theme: Allow using XDG user data dir [Tomasz; !55]
-* Misc. bug fixes and cleanups [Florian; !52, !54, !56]
-
-Contributors:
-  Tomasz Gąsior, Florian Müllner
-
-Translators:
-  Matej Urbančič [sl], Gun Chleoc [gd]
-
-3.31.90
-=======
-* Misc. bug fixes and cleanups [Florian; !49, !50, !51]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Ryuta Fujii [ja], Charles Monzat [fr], Pieter Schalk Schoeman [af]
-
-3.31.2
-======
-* Remove obsolete alternate-tab extension [Florian; #786496]
-* Adjust to gnome-shell changes [Florian; #113]
-
-Contributors:
-  Florian Müllner
-
-3.30.1
-======
-* apps-menu: Fix height on HiDPI systems [Florian; #102]
-* window-list: Only switch between windows on active workspace when scrolling
-  [Florian; #78]
-
-Contributors:
-  Florian Müllner
-
-3.30.0
-======
-* Bump version
-
-3.29.91
-=======
-* Misc. bug fixes [Florian; #90]
-
-Contributors:
-  Florian Müllner
-
-3.29.90
-=======
-* Misc. bug fixes [Florian; #786496]
-
-Contributors:
-  Florian Müllner
-
-3.29.3
-======
-* Adjust to global.screen removal [Jonas; #759538]
-
-Contributors:
-  Jonas Ådahl, Florian Müllner
-
-3.29.2
-======
-* Misc. bug fixes [Florian; #69]
-
-Contributors:
-  Florian Müllner
-
 3.28.1
 ======
 * Misc. bug fixes [Xiaoguang, Florian; #59, #62]

README.md

@@ -15,11 +15,9 @@ Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
 
 ## Extensions
 
- * alternate-tab (**OBSOLETE**)
+ * alternate-tab
  
      Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
-     This extension is obsolete since GNOME 3.30, see [this blogpost][alternatetab-post]
-     for further details.
 
  * apps-menu
 
@@ -36,6 +34,10 @@ GSettings key.
      Shows a status menu for rapid unmount and power off of external storage devices
   (i.e. pendrives)
 
+ * example
+
+     A minimal example illustrating how to write extensions.
+
  * launch-new-instance
 
      Changes application icons to always launch a new instance when activated.
@@ -69,19 +71,6 @@ 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
@@ -93,4 +82,3 @@ file for details.
 [shell-page]: https://wiki.gnome.org/Projects/GnomeShell
 [bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
 [license]: COPYING
-[alternatetab-post]: https://blogs.gnome.org/fmuellner/2018/10/11/the-future-of-alternatetab-and-why-you-need-not-worry/

data/00_org.gnome.shell.extensions.classic.gschema.override

@@ -1,9 +0,0 @@
-[org.gnome.mutter:GNOME-Classic]
-dynamic-workspaces=false
-
-[org.gnome.desktop.wm.preferences:GNOME-Classic]
-button-layout='appmenu:minimize,maximize,close'
-
-[org.gnome.desktop.wm.keybindings:GNOME-Classic]
-switch-applications=[]
-switch-windows=['<Super>Tab','<Alt>Tab']

data/calendar-today.svg

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg10621"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="calendar-today.svg">
+  <defs
+     id="defs10623">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient99561-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient34508-1-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop34510-1-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop34512-4-5" />
+    </linearGradient>
+    <radialGradient
+       r="42"
+       fy="30"
+       fx="51"
+       cy="30"
+       cx="51"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10592"
+       xlink:href="#linearGradient34508-1-3"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3007"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3067"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3072"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient2997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#d3d3d3"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-55.349829"
+     inkscape:cy="-31.442864"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="2133"
+     inkscape:window-height="1241"
+     inkscape:window-x="238"
+     inkscape:window-y="89"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3109"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata10626">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-469.08263,-537.99307)">
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#555753;fill-opacity:0.23756906;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path7305"
+       cx="481.57138"
+       cy="559.4649"
+       r="1.5" />
+  </g>
+</svg>

data/classic-toggle-off-intl.svg

@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg10865"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="classic-toggle-off-intl.svg">
+  <defs
+     id="defs10867">
+    <linearGradient
+       id="linearGradient62852-6-5">
+      <stop
+         id="stop62854-6-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.97726452"
+         id="stop62858-8-0" />
+      <stop
+         id="stop62860-5-3"
+         offset="1"
+         style="stop-color:#f5f5f4;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect62989-8-0"
+       effect="spiro" />
+    <linearGradient
+       id="linearGradient62821-5-8">
+      <stop
+         id="stop62823-2-4"
+         offset="0"
+         style="stop-color:#d1d3d1;stop-opacity:1;" />
+      <stop
+         id="stop62825-3-8"
+         offset="1"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient62852-6-5-3">
+      <stop
+         id="stop62854-6-7-6"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.97726452"
+         id="stop62858-8-0-3" />
+      <stop
+         id="stop62860-5-3-9"
+         offset="1"
+         style="stop-color:#f5f5f4;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect62829-6-8-0"
+       is_visible="true" />
+    <linearGradient
+       id="linearGradient62821-5-8-1">
+      <stop
+         id="stop62823-2-4-2"
+         offset="0"
+         style="stop-color:#d1d3d1;stop-opacity:1;" />
+      <stop
+         id="stop62825-3-8-9"
+         offset="1"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="507.42715"
+       x2="702.58966"
+       y1="484.49405"
+       x1="702.58966"
+       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11647"
+       xlink:href="#linearGradient62821-5-8-1"
+       inkscape:collect="always" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath65663">
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         id="rect65665"
+         width="96.999924"
+         height="24.292892"
+         x="708.71954"
+         y="406.96973"
+         rx="3.1139846"
+         ry="1.9595497"
+         inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/content selection/content-selection.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
+       id="linearGradient65582"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5250827,0,0,0.72144839,620.16092,156.4917)"
+       x1="207.17195"
+       y1="497.39584"
+       x2="207.17195"
+       y2="531.48669" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9">
+      <stop
+         style="stop-color:#f4f6f4;stop-opacity:1"
+         offset="0"
+         id="stop5380-6-1-1-9-3-6-3-6-45-6-4-4-9-9-8-9" />
+      <stop
+         style="stop-color:#d7dad7;stop-opacity:1"
+         offset="1"
+         id="stop5382-06-3-6-4-2-4-6-8-0-9-6-8-7-7-6-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient65584">
+      <stop
+         style="stop-color:#f1f1f1;stop-opacity:1"
+         offset="0"
+         id="stop65586" />
+      <stop
+         style="stop-color:#a7aba7;stop-opacity:0;"
+         offset="1"
+         id="stop65588" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
+       id="linearGradient65582-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5250827,0,0,0.72144839,-75.348673,-359.16458)"
+       x1="207.17195"
+       y1="497.39584"
+       x2="207.17195"
+       y2="531.48669" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient65584"
+       id="linearGradient65590-6"
+       x1="716.62506"
+       y1="537.23358"
+       x2="716.62506"
+       y2="535.23358"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0139469,0,0,1.0139469,-705.52354,-521.99915)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="23.565368"
+     inkscape:cy="19.596892"
+     inkscape:document-units="px"
+     inkscape:current-layer="g62929"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-others="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1342"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11512" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata10870">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1030.3622)">
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/system-settings/network/network-panel-summary.png"
+       style="display:inline"
+       id="g62929"
+       transform="translate(-643.91421,517.29894)">
+      <g
+         transform="translate(0,30)"
+         id="g62931">
+        <rect
+           style="fill:#cecece;fill-opacity:1;stroke:#a7a7a7;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;solid-opacity:1;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
+           id="rect62935"
+           width="63.856125"
+           height="21.093594"
+           x="644.5"
+           y="483.5"
+           rx="2"
+           ry="2" />
+        <rect
+           style="fill:url(#linearGradient65582);fill-opacity:1;stroke:#a7a7a7;stroke-width:0.97313344;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;color:#000000;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect62937"
+           width="29.97398"
+           height="17.022524"
+           x="646.55896"
+           y="485.61429"
+           rx="1"
+           ry="1" />
+        <g
+           transform="translate(-38.048674,-1.9445437)"
+           id="g62939" />
+        <path
+           inkscape:connector-curvature="0"
+           inkscape:original-d="m 647.78241,486.57192 27.73523,0"
+           inkscape:path-effect="#path-effect62989-8-0"
+           id="path62947"
+           d="m 647.78241,486.57192 27.73523,0"
+           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         id="g11665"
+         transform="matrix(0.78906097,0,0,0.78906097,178.78814,111.57844)" />
+      <path
+         sodipodi:type="arc"
+         id="path3016"
+         sodipodi:cx="50.375"
+         sodipodi:cy="11.875"
+         sodipodi:rx="4.625"
+         sodipodi:ry="4.625"
+         d="M 55,11.875 A 4.625,4.625 0 0 1 50.375,16.5 4.625,4.625 0 0 1 45.75,11.875 4.625,4.625 0 0 1 50.375,7.25 4.625,4.625 0 0 1 55,11.875 Z"
+         transform="translate(642.41421,512.02037)"
+         style="fill:none;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>

data/classic-toggle-off-us.svg

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg10865"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="classic-toggle-off-us.svg">
+  <defs
+     id="defs10867">
+    <linearGradient
+       id="linearGradient62852-6-5">
+      <stop
+         id="stop62854-6-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.97726452"
+         id="stop62858-8-0" />
+      <stop
+         id="stop62860-5-3"
+         offset="1"
+         style="stop-color:#f5f5f4;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect62989-8-0"
+       effect="spiro" />
+    <linearGradient
+       id="linearGradient62821-5-8">
+      <stop
+         id="stop62823-2-4"
+         offset="0"
+         style="stop-color:#d1d3d1;stop-opacity:1;" />
+      <stop
+         id="stop62825-3-8"
+         offset="1"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient62852-6-5-3">
+      <stop
+         id="stop62854-6-7-6"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.97726452"
+         id="stop62858-8-0-3" />
+      <stop
+         id="stop62860-5-3-9"
+         offset="1"
+         style="stop-color:#f5f5f4;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect62829-6-8-0"
+       is_visible="true" />
+    <linearGradient
+       id="linearGradient62821-5-8-1">
+      <stop
+         id="stop62823-2-4-2"
+         offset="0"
+         style="stop-color:#d1d3d1;stop-opacity:1;" />
+      <stop
+         id="stop62825-3-8-9"
+         offset="1"
+         style="stop-color:#ebebeb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="507.42715"
+       x2="702.58966"
+       y1="484.49405"
+       x1="702.58966"
+       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11647"
+       xlink:href="#linearGradient62821-5-8-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
+       id="linearGradient65582"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5250827,0,0,0.72144839,620.16092,156.4917)"
+       x1="207.17195"
+       y1="497.39584"
+       x2="207.17195"
+       y2="531.48669" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9">
+      <stop
+         style="stop-color:#f4f6f4;stop-opacity:1"
+         offset="0"
+         id="stop5380-6-1-1-9-3-6-3-6-45-6-4-4-9-9-8-9" />
+      <stop
+         style="stop-color:#d7dad7;stop-opacity:1"
+         offset="1"
+         id="stop5382-06-3-6-4-2-4-6-8-0-9-6-8-7-7-6-7" />
+    </linearGradient>
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect62989-8-0-6"
+       effect="spiro" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="78.222729"
+     inkscape:cy="-3.6620078"
+     inkscape:document-units="px"
+     inkscape:current-layer="g62929"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-others="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1342"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11512" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata10870">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1030.3622)">
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/system-settings/network/network-panel-summary.png"
+       style="display:inline"
+       id="g62929"
+       transform="translate(-643.91421,517.29894)">
+      <g
+         style="display:inline"
+         transform="translate(0,30)"
+         id="g62931">
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cecece;fill-opacity:1;fill-rule:nonzero;stroke:#a7a7a7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+           id="rect62935"
+           width="63.856125"
+           height="21.093594"
+           x="644.5"
+           y="483.5"
+           rx="2"
+           ry="2" />
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient65582);fill-opacity:1;fill-rule:nonzero;stroke:#a7a7a7;stroke-width:0.97313344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect62937"
+           width="29.97398"
+           height="17.022524"
+           x="646.55896"
+           y="485.61429"
+           rx="1"
+           ry="1" />
+        <g
+           transform="translate(-38.048674,-1.9445437)"
+           id="g62939" />
+        <path
+           inkscape:connector-curvature="0"
+           inkscape:original-d="m 647.78241,486.57192 27.73523,0"
+           inkscape:path-effect="#path-effect62989-8-0-6"
+           id="path62947"
+           d="m 647.78241,486.57192 27.73523,0"
+           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         id="g11665"
+         transform="matrix(0.78906097,0,0,0.78906097,167.78814,111.57844)">
+        <text
+           xml:space="preserve"
+           style="font-size:12.69556618px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           x="644.46393"
+           y="533.87158"
+           id="text62949"
+           sodipodi:linespacing="125%"
+           transform="scale(1.0113976,0.98873084)"><tspan
+             sodipodi:role="line"
+             id="tspan62951"
+             x="644.46393"
+             y="533.87158">OFF</tspan></text>
+      </g>
+    </g>
+  </g>
+</svg>

data/classic-toggle-on-intl.svg

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg10865"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="classic-toggle-on-intl.svg">
+  <defs
+     id="defs10867">
+    <linearGradient
+       id="linearGradient62852-6-5">
+      <stop
+         id="stop62854-6-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.97726452"
+         id="stop62858-8-0" />
+      <stop
+         id="stop62860-5-3"
+         offset="1"
+         style="stop-color:#f5f5f4;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect62989-8-0"
+       effect="spiro" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient38513"
+       id="linearGradient38519"
+       x1="690"
+       y1="506.25049"
+       x2="690"
+       y2="480.93414"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient38513">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop38515" />
+      <stop
+         style="stop-color:#6f9ccd;stop-opacity:1"
+         offset="1"
+         id="stop38517" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62852-6-5"
+       id="linearGradient62981-1-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85639946,0,0,0.81059641,57.747905,92.132229)"
+       x1="740"
+       y1="486.10501"
+       x2="740"
+       y2="505.3204" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect62989-8-0-8"
+       effect="spiro" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="9.3225163"
+     inkscape:cy="-0.1588306"
+     inkscape:document-units="px"
+     inkscape:current-layer="g62929"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-others="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1342"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11512" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata10870">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1030.3622)">
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/system-settings/network/network-panel-summary.png"
+       style="display:inline"
+       id="g62929"
+       transform="translate(-643.91421,517.29894)">
+      <g
+         style="display:inline"
+         transform="translate(0,30)"
+         id="g62931">
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient38519);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect62935"
+           width="63.856125"
+           height="21.093594"
+           x="644.5"
+           y="483.5"
+           rx="2"
+           ry="2" />
+        <rect
+           style="display:inline;fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect62937"
+           width="29.97398"
+           height="17.022524"
+           x="676.49646"
+           y="485.67679"
+           rx="1"
+           ry="1" />
+        <g
+           transform="translate(-7.9861743,-1.9445437)"
+           id="g62939" />
+        <path
+           inkscape:connector-curvature="0"
+           inkscape:original-d="m 677.59874,486.57192 27.94632,0"
+           inkscape:path-effect="#path-effect62989-8-0-8"
+           id="path62947"
+           d="m 677.59874,486.57192 27.94632,0"
+           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path4444"
+         d="m 661.91421,522.09451 0,7"
+         style="fill:#3465a4;stroke:#3465a4;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;fill-opacity:1;fill-rule:nonzero;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 18,7.96875 0,7"
+         id="path3922"
+         inkscape:connector-curvature="0"
+         transform="translate(643.91421,513.06326)" />
+    </g>
+  </g>
+</svg>

data/classic-toggle-on-us.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65"
+   height="22"
+   id="svg10865"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="classic-toggle-on-us.svg">
+  <defs
+     id="defs10867">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62852-6-5"
+       id="linearGradient62981-1-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85639946,0,0,0.81059641,57.747905,92.132229)"
+       x1="740"
+       y1="486.10501"
+       x2="740"
+       y2="505.3204" />
+    <linearGradient
+       id="linearGradient62852-6-5">
+      <stop
+         id="stop62854-6-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.97726452"
+         id="stop62858-8-0" />
+      <stop
+         id="stop62860-5-3"
+         offset="1"
+         style="stop-color:#f5f5f4;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect62989-8-0"
+       effect="spiro" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath65663">
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         id="rect65665"
+         width="96.999924"
+         height="24.292892"
+         x="708.71954"
+         y="406.96973"
+         rx="3.1139846"
+         ry="1.9595497"
+         inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/content selection/content-selection.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient38513"
+       id="linearGradient38519"
+       x1="690"
+       y1="506.25049"
+       x2="690"
+       y2="480.93414"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient38513">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop38515" />
+      <stop
+         style="stop-color:#6f9ccd;stop-opacity:1"
+         offset="1"
+         id="stop38517" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-644,-483)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient38513"
+       id="linearGradient38519-3"
+       x1="690"
+       y1="506.25049"
+       x2="690"
+       y2="480.93414"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="20.775745"
+     inkscape:cy="7.0434022"
+     inkscape:document-units="px"
+     inkscape:current-layer="g62929"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-others="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1342"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11512" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata10870">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1030.3622)">
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/system-settings/network/network-panel-summary.png"
+       style="display:inline"
+       id="g62929"
+       transform="translate(-643.91421,517.29894)">
+      <g
+         transform="translate(0,30)"
+         id="g62931">
+        <rect
+           style="fill:url(#linearGradient38519);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect62935"
+           width="63.856125"
+           height="21.093594"
+           x="644.5"
+           y="483.5"
+           rx="2"
+           ry="2" />
+        <rect
+           style="fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+           id="rect62937"
+           width="29.97398"
+           height="17.022524"
+           x="676.49646"
+           y="485.67679"
+           rx="1"
+           ry="1" />
+        <g
+           transform="translate(-7.9861743,-1.9445437)"
+           id="g62939" />
+        <path
+           inkscape:connector-curvature="0"
+           inkscape:original-d="m 677.59874,486.57192 27.94632,0"
+           inkscape:path-effect="#path-effect62989-8-0"
+           id="path62947"
+           d="m 677.59874,486.57192 27.94632,0"
+           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <text
+         transform="scale(1.0113976,0.98873084)"
+         sodipodi:linespacing="125%"
+         id="text62949-7"
+         y="534.96918"
+         x="646.71399"
+         style="font-size:10.01104736px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3465a4;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold;"
+         xml:space="preserve"><tspan
+           y="534.96918"
+           x="646.71399"
+           id="tspan62951-7"
+           sodipodi:role="line">ON</tspan></text>
+      <text
+         transform="scale(1.0113976,0.98873084)"
+         sodipodi:linespacing="125%"
+         id="text62949"
+         y="533.94482"
+         x="646.71399"
+         style="font-size:10.01104736px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         xml:space="preserve"><tspan
+           y="533.94482"
+           x="646.71399"
+           id="tspan62951"
+           sodipodi:role="line">ON</tspan></text>
+    </g>
+  </g>
+</svg>

data/classic.json.in

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

data/gnome-classic-high-contrast.css

@@ -0,0 +1,5 @@
+@import url("gnome-classic.css");
+
+stage {
+  -st-icon-style: symbolic;
+}

data/gnome-classic-wayland.desktop.in

@@ -1,8 +0,0 @@
-[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

@@ -1,8 +0,0 @@
-[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,8 +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=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 TryExec=gnome-session
 Type=Application
 DesktopNames=GNOME-Classic;GNOME;
-X-GDM-SessionRegisters=true

data/gnome-classic.scss

@@ -0,0 +1,105 @@
+/* Use the gnome-shell theme, but with light colors */
+$variant: 'light';
+
+@import "gnome-shell-sass/_colors"; //use gtk colors
+@import "gnome-shell-sass/_drawing";
+@import "gnome-shell-sass/_common";
+
+/* Overrides */
+
+#panel, #panel.solid {
+  font-weight: normal;
+  background-color: $bg_color;
+  background-gradient-direction: vertical;
+  background-gradient-end: darken($bg_color,5%);
+  border-top-color: #666; /* we don't support non-uniform border-colors and
+                             use the top border color for any border, so we
+                             need to set it even if all we want is a bottom
+                             border */
+  border-bottom: 1px solid #666;
+  app-icon-bottom-clip: 0px;
+  &:overview {
+    background-color: #000;
+    background-gradient-end: #000;
+    border-top-color: #000;
+    border-bottom: 1px solid #000;
+    .panel-button { color: #fff; }
+  }
+
+  .panel-button {
+    -natural-hpadding: 8px;
+    -minimum-hpadding: 4px;
+    font-weight: normal;
+    color: $fg_color;
+    text-shadow: none;
+    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw
+      // a box-shadow
+      background-color: $selected_bg_color !important;
+      color: $selected_fg_color !important;
+      box-shadow: none;
+      & > .system-status-icon { icon-shadow: none; }
+    }
+    &:hover {
+      text-shadow: none;
+      & .system-status-icon { icon-shadow: none; }
+    }
+    .app-menu-icon { width: 0; height: 0; margin: 0; } // shell's display:none; :D
+
+    .system-status-icon {
+      icon-shadow: none;
+    }
+  }
+
+  .panel-corner,
+  .panel-corner:active,
+  .panel-corner:overview,
+  .panel-corner:focus {
+    -panel-corner-radius: 0;
+  }
+  &.lock-screen,
+  &.unlock-screen, 
+  &.login-screen { 
+    background-color: transparentize($_bubble_bg_color, 0.5);
+    background-gradient-start: transparentize($_bubble_bg_color, 0.5);
+    background-gradient-end: transparentize($_bubble_bg_color, 0.5);
+    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"); 
+}
+.tile-preview-left.on-primary,
+.tile-preview-right.on-primary,
+.tile-preview-left.tile-preview-right.on-primary {
+    /* keep in sync with -panel-corner-radius */
+    border-radius: 0;
+}
+
+@each $v in us, intl {
+  .toggle-switch-#{$v} {
+    background-image: url("classic-toggle-off-#{$v}.svg");
+    &:checked { background-image: url("classic-toggle-on-#{$v}.svg"); }
+  }
+}
+
+.calendar-day-with-events {
+  background-image: url("calendar-today.svg");
+}
+
+.message-list-clear-button.button {
+  color: $fg_color
+}
+
+.notification-banner {
+  background-color: $bg_color !important;
+  color: $fg_color;
+  .notification-button {
+    background-color: darken($bg_color,5%);
+    &:hover, &focus { background-color: darken($bg_color,2%); }
+  }
+}

data/gnome-classic.session.desktop.in

@@ -0,0 +1,3 @@
+[GNOME Session]
+Name=GNOME Classic
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;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/COPYING

@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

data/gnome-shell-sass/HACKING

@@ -0,0 +1,6 @@
+--- Generating the css file ---
+
+You need sass to generate the css file.
+
+To generate them run from a command line in the project directory:
+sass --sourcemap=none --update ./

data/gnome-shell-sass/README

@@ -0,0 +1,7 @@
+GNOME Shell Sass is a project intended to allow the sharing of the theme sources in sass between gnome-shell and other projects like gnome-shell-extensions.
+
+License
+=======
+GNOME Shell Sass is distributed under the terms of the GNU General Public License,
+version 2 or later. See the COPYING file for details.
+

data/gnome-shell-sass/_colors.scss

@@ -0,0 +1,44 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: if($variant =='light', #ffffff, #292929);
+$bg_color: if($variant =='light', #ededed, #393f3f);
+$fg_color: if($variant =='light', #2e3436, #eeeeec);
+
+$selected_fg_color: #ffffff;
+$selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9,20%));
+$selected_borders_color: if($variant=='light', darken($selected_bg_color, 30%),
+                                               darken($selected_bg_color, 20%));
+$borders_color: if($variant =='light', darken($bg_color,30%), darken($bg_color,12%));
+$borders_edge: if($variant =='light', white, transparentize($fg_color, 0.9));
+$link_color: if($variant == 'light', darken($selected_bg_color,10%),
+                                     lighten($selected_bg_color,20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
+                                     lighten($selected_bg_color,10%));
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #cc0000;
+$success_color: if($variant =='light', #73d216, darken(#73d216,10%));
+$destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
+
+$osd_fg_color: #eeeeec;
+$osd_bg_color: #2e3436;
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.9);
+
+$tooltip_borders_color: $osd_outer_borders_color;
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);

data/gnome-shell-sass/_drawing.scss

@@ -0,0 +1,221 @@
+// Drawing mixins
+
+// generic drawing of more complex things
+
+@function _widget_edge($c:$borders_edge) {
+// outer highlight "used" on most widgets
+  @return 0 1px $c;
+}
+
+// provide font size in rem, with px fallback
+@mixin fontsize($size: 24, $base: 16) {
+  font-size: round($size) + pt;
+  //font-size: ($size / $base) * 1rem;
+}
+
+@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
+//
+// Helper function to stack up to 4 box-shadows;
+//
+  @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
+  @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
+  @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
+  @else { box-shadow: $shadow1; }
+}
+
+// entries
+
+@mixin entry($t, $fc:$selected_bg_color, $edge: $borders_edge) {
+//
+// Entries drawing function
+//
+// $t: entry type
+// $fc: focus color
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
+//
+// possible $t values:
+// normal, focus, insensitive
+//
+  $_inner_shadows: inset 0 2px 4px transparentize(black, 0.6);
+
+  @if $t==normal {
+    background-color: $base_color;
+    border-color: $borders_color;
+    @include _shadows($_inner_shadows);
+
+  }
+  @if $t==focus {
+    @include _shadows($_inner_shadows);
+    border-color: if($fc==$selected_bg_color,
+                     $selected_borders_color,
+                     darken($fc,35%));
+  }
+  @if $t==hover { }
+  @if $t==insensitive {
+    color: $insensitive_fg_color;
+    border-color: $insensitive_bg_color;
+    box-shadow: none;
+  }
+}
+
+// buttons
+
+@function _border_color ($c) { @return darken($c,25%); } // colored buttons want
+                                                         // the border form the
+                                                         // base color
+
+@function _text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
+//
+// calculate the color of text shadows
+//
+// $tc is the text color
+// $bg is the background color
+//
+  $_lbg: lightness($bg)/100%;
+  @if lightness($tc)<50% { @return transparentize(white,1-$_lbg/($_lbg*1.3)); }
+  @else { @return transparentize(black,$_lbg*0.8); }
+}
+
+@function _button_hilight_color($c) {
+//
+// calculate the right top hilight color for buttons
+//
+// $c: base color;
+//
+  @if lightness($c)>90% { @return white; }
+  @else if lightness($c)>80% { @return transparentize(white, 0.3); }
+  @else if lightness($c)>50% { @return transparentize(white, 0.5); }
+  @else if lightness($c)>40% { @return transparentize(white, 0.7); }
+  @else { @return transparentize(white, 0.9); }
+}
+
+@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
+//
+// helper function for the text emboss effect
+//
+// $tc is the optional text color, not the shadow color
+//
+// TODO: this functions needs a way to deal with special cases
+//
+
+  $_shadow: _text_shadow_color($tc, $bg);
+
+  @if lightness($tc)<50% {
+    text-shadow: 0 1px $_shadow;
+    icon-shadow: 0 1px $_shadow;
+  }
+  @else {
+    text-shadow: 0 -1px $_shadow;
+    icon-shadow: 0 -1px $_shadow;
+  }
+}
+
+@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
+//
+// Button drawing function
+//
+// $t:    button type,
+// $c:    base button color for colored* types
+// $tc:   optional text color for colored* types
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
+//
+// possible $t values:
+// normal, hover, active, insensitive, insensitive-active,
+// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
+// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
+//
+
+  $_hilight_color: _button_hilight_color($c);
+  $_button_edge: if($edge == none, none, _widget_edge($edge));
+  $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
+
+
+  @if $t==normal {
+  //
+  // normal button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
+                            $osd_bg_color);
+
+    color: $osd_fg_color;
+    background-color: $_bg;
+    border-color: $osd_borders_color;
+    box-shadow: inset 0 1px lighten($osd_bg_color,10%);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+  }
+  @if $t==focus {
+  //
+  // focused button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
+                          $osd_bg_color);
+
+    color: $osd_fg_color;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
+  }
+
+  @else if $t==hover {
+  //
+  // active osd button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+                            lighten($osd_bg_color,10%));
+
+    color: white;
+    border-color: $osd_borders_color;
+    background-color: $_bg;
+    box-shadow: inset 0 1px lighten($osd_bg_color,20%);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+
+  }
+  @else if $t==active {
+  //
+  // active osd button
+  //
+    $_bg: if($c!=$bg_color, $c, $osd_borders_color);
+
+    color: white;
+    border-color: $osd_borders_color;
+    background-color: darken($_bg,5%);
+    // This should be none, but it's creating some issues with borders, so to
+    // workaround it for now, use inset wich goes through a different code path.
+    // see https://bugzilla.gnome.org/show_bug.cgi?id=752934
+    box-shadow: inset 0 0 black;
+    text-shadow: none;
+    icon-shadow: none;
+  }
+  @else if $t==insensitive {
+  //
+  // insensitive osd button
+  //
+    $_bg: transparentize(mix($insensitive_fg_color,$osd_bg_color,20%),0.3);
+
+    color: $insensitive_fg_color;
+    border-color: $osd_borders_color;
+    background-color: $_bg;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+  }
+  @else if $t==undecorated {
+  //
+  // reset
+  //
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      $_blank_edge);
+
+    text-shadow: none;
+    icon-shadow: none;
+  }
+}
+

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

@@ -0,0 +1,41 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: #222;
+$bg_color: #000;
+$fg_color: #fff;
+
+$selected_fg_color: #ffffff;
+$selected_bg_color: darken(#4a90d9,20%);
+$selected_borders_color: darken($selected_bg_color, 20%);
+$borders_color: darken($bg_color,12%);
+$borders_edge: transparentize($fg_color, 0.9);
+$link_color: lighten($selected_bg_color,20%);
+$link_visited_color: lighten($selected_bg_color,10%);
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #cc0000;
+$success_color: darken(#73d216,10%);
+$destructive_color: darken(#ef2929,10%);
+
+$osd_fg_color: #eeeeec;
+$osd_bg_color: #2e3436;
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.9);
+
+$tooltip_borders_color: $osd_outer_borders_color;
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: lighten($base_color,1%);
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: lighten($backdrop_bg_color,15%);
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);

data/gnome-shell-sass/gnome-shell-sass.doap

@@ -0,0 +1,37 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:gnome="http://api.gnome.org/doap-extensions#"
+         xmlns="http://usefulinc.com/ns/doap#">
+
+  <name xml:lang="en">GNOME Shell Sass</name>
+  <shortdesc xml:lang="en">Sass sources of GNOME Shell</shortdesc>
+  <description>GNOME Shell Sass is a project intended to allow the sharing of the
+ sass theme sources between gnome-shell and other projects like gnome-shell-extensions.</description>
+
+  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
+  <programming-language>sass</programming-language>
+  <programming-language>css</programming-language>
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Carlos Soriano</foaf:name>
+      <foaf:mbox rdf:resource="mailto:csoriano@gnome.org" />
+      <gnome:userid>csoriano</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Florian Müllner</foaf:name>
+      <foaf:mbox rdf:resource="mailto:fmuellner@gnome.org" />
+      <gnome:userid>fmuellner</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Jakub Steiner</foaf:name>
+      <foaf:mbox rdf:resource="mailto:jimmac@gmail.com" />
+      <gnome:userid>jimmac</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+</Project>

data/meson.build

@@ -1,33 +1,17 @@
-session_desktop_base = 'gnome-classic'
-
-session_desktops = [
-  session_desktop_base,
-  session_desktop_base + '-xorg',
-  session_desktop_base + '-wayland',
+sessions = [
+  ['gnome-classic.session.desktop.in', sessiondir],
+  ['gnome-classic.desktop.in', xsessiondir]
 ]
-
-foreach name: session_desktops
-    session_desktop = name + '.desktop'
-    if name.endswith('-xorg')
-        session_instdir = xsessiondir
-    elif name.endswith('-wayland')
-        session_instdir = wlsessiondir
-    else
-        # 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'
-    )
+foreach s : sessions
+  name_array = s[0].split('.')
+  i18n.merge_file('',
+    input:  s[0],
+    output: '.'.join([name_array[0], name_array[1]]),
+    po_dir: '../po',
+    install: true,
+    install_dir: s[1],
+    type: 'desktop'
+  )
 endforeach
 
 classic_uuids = []
@@ -46,5 +30,34 @@ configure_file(
   install_dir: modedir
 )
 
-classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
-install_data(classic_override, install_dir: schemadir)
+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'
+)
+
+theme_data = [
+  'calendar-today.svg',
+  'classic-process-working.svg',
+  'classic-toggle-off-intl.svg',
+  'classic-toggle-off-us.svg',
+  'classic-toggle-on-intl.svg',
+  'classic-toggle-on-us.svg',
+  'gnome-classic-high-contrast.css'
+]
+
+style = 'gnome-classic'
+custom_target(style + '.css',
+  input: style + '.scss',
+  output: style + '.css',
+  depend_files: theme_sources,
+  command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
+  install: true,
+  install_dir: themedir
+)
+
+install_data(theme_data, install_dir: themedir)
+
+classic_schema = 'org.gnome.shell.extensions.classic-overrides.gschema.xml'
+install_data(classic_schema, install_dir: schemadir)

data/org.gnome.shell.extensions.classic-overrides.gschema.xml

@@ -0,0 +1,46 @@
+<schemalist>
+  <schema id="org.gnome.shell.extensions.classic-overrides"
+          path="/org/gnome/shell/extensions/classic-overrides/"
+	  gettext-domain="gnome-shell-extensions">
+    <key name="attach-modal-dialogs" type="b">
+      <default>true</default>
+      <summary>Attach modal dialog to the parent window</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running
+        GNOME Shell.
+      </description>
+    </key>
+
+    <key name="button-layout" type="s">
+      <default>"appmenu:minimize,maximize,close"</default>
+      <summary>Arrangement of buttons on the titlebar</summary>
+      <description>
+        This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell.
+      </description>
+    </key>
+
+    <key name="edge-tiling" type="b">
+      <default>true</default>
+      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+
+    <key name="workspaces-only-on-primary" type="b">
+      <default>true</default>
+      <summary>Workspaces only on primary monitor</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+
+    <key name="focus-change-on-pointer-rest" type="b">
+      <default>true</default>
+      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+  </schema>
+</schemalist>

debian/changelog

@@ -1,407 +1,14 @@
-gnome-shell-extensions (45~beta-1) experimental; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 21 Aug 2023 10:17:23 -0400
-
-gnome-shell-extensions (44.0-2) unstable; urgency=medium
+gnome-shell-extensions (3.29.3+really3.28.1-1) unstable; urgency=medium
 
   * Team upload
-  * Upload to unstable (part of transition: #1043144)
-
- -- Simon McVittie <smcv@debian.org>  Sun, 20 Aug 2023 23:04:08 +0100
-
-gnome-shell-extensions (44.0-1) experimental; urgency=medium
-
-  * New upstream release
-  * debian/control.in: Bump minimum meson to 0.58.0
-  * debian/control.in: Build-Depend on libglib2.0-bin
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 27 Mar 2023 08:50:32 -0400
-
-gnome-shell-extensions (44~rc-1) experimental; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 07 Mar 2023 12:20:00 -0500
-
-gnome-shell-extensions (44~beta-1) experimental; urgency=medium
-
-  [ Jeremy Bicha ]
-  * New upstream release
-
-  [ Debian Janitor ]
-  * Remove constraints unnecessary since buster (oldstable)
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 15 Feb 2023 11:01:26 -0500
-
-gnome-shell-extensions (43.1-1) unstable; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 22 Nov 2022 14:14:48 -0500
-
-gnome-shell-extensions (43.0-2) unstable; urgency=medium
-
-  * Release to unstable
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 27 Sep 2022 19:13:41 -0400
-
-gnome-shell-extensions (43.0-1) experimental; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 19 Sep 2022 10:57:41 -0400
-
-gnome-shell-extensions (43~rc-1) experimental; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 06 Sep 2022 14:39:00 -0400
-
-gnome-shell-extensions (43~beta-1) experimental; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 21 Aug 2022 10:59:20 -0400
-
-gnome-shell-extensions (42.3-1) unstable; urgency=medium
-
-  * New upstream release (LP: #1981606)
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 13 Jul 2022 17:49:05 +0200
-
-gnome-shell-extensions (42.2-1) unstable; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 03 Jun 2022 09:23:28 -0400
-
-gnome-shell-extensions (42.1-1) unstable; urgency=medium
-
-  * New upstream release (LP: #1972365)
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 09 May 2022 08:09:32 -0400
-
-gnome-shell-extensions (42.0-2) unstable; urgency=medium
-
-  * Release to unstable
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 28 Mar 2022 11:18:12 -0400
-
-gnome-shell-extensions (42.0-1) experimental; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jeremy.bicha@canonical.com>  Mon, 14 Mar 2022 11:30:18 -0400
-
-gnome-shell-extensions (42~rc-1) experimental; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jeremy.bicha@canonical.com>  Tue, 08 Mar 2022 17:54:41 -0500
-
-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 ]
+  * Revert unintended upload of 3.29.3 to unstable
+  * d/gbp.conf: Use debian/unstable and upstream/3.28.x branches
   * Bump Standards-Version to 4.1.5
   * Set Rules-Requires-Root to no
+  * Hard-code compatible Shell versions for this branch since
+    ${gnome:Version} doesn't understand the +really workaround
 
- -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 09:37:34 +0100
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:47:37 +0100
 
 gnome-shell-extensions (3.28.1-1) unstable; urgency=medium
 

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -6,34 +6,33 @@ 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>, Laurent Bigonville <bigon@debian.org>, Marco Trevisan (Treviño) <marco@ubuntu.com>
-Build-Depends: debhelper-compat (= 13),
-               dh-sequence-gnome (>= 0.22),
-               libglib2.0-bin,
-               meson (>= 0.58.0),
+Uploaders: Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>
+Build-Depends: debhelper (>= 11.1.3),
+               gnome-pkg-tools,
+               meson (>= 0.44.0),
                sassc
 Rules-Requires-Root: no
-Standards-Version: 4.6.0
+Standards-Version: 4.1.5
 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,
+Depends: ${misc:Depends},
+         gnome-shell (>= 3.28),
+         gnome-shell (<< 3.29),
          gir1.2-atk-1.0,
+         gir1.2-clutter-1.0,
+         gir1.2-gdkpixbuf-2.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-gtk-3.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
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24)
+Recommends: gnome-tweaks
 Replaces: gnome-shell-common (<< 3.18)
 Breaks: gnome-shell-common (<< 3.18)
 Description: Extensions to extend functionality of GNOME Shell

debian/control.in

@@ -3,33 +3,32 @@ 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),
-               libglib2.0-bin,
-               meson (>= 0.58.0),
+Build-Depends: debhelper (>= 11.1.3),
+               gnome-pkg-tools,
+               meson (>= 0.44.0),
                sassc
 Rules-Requires-Root: no
-Standards-Version: 4.6.0
+Standards-Version: 4.1.5
 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,
+Depends: ${misc:Depends},
+         gnome-shell (>= 3.28),
+         gnome-shell (<< 3.29),
          gir1.2-atk-1.0,
+         gir1.2-clutter-1.0,
+         gir1.2-gdkpixbuf-2.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-gtk-3.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
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24)
+Recommends: gnome-tweaks
 Replaces: gnome-shell-common (<< 3.18)
 Breaks: gnome-shell-common (<< 3.18)
 Description: Extensions to extend functionality of GNOME Shell

debian/copyright

@@ -2,8 +2,6 @@ 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>
@@ -26,5 +24,8 @@ License: GPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see 
+ .
  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/gbp.conf

@@ -1,17 +1,5 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/latest
-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-branch = debian/unstable
+upstream-branch = upstream/3.28.x
+upstream-vcs-tag = %(version)s

debian/local/gnome-session-classic

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

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

@@ -2,7 +2,7 @@ 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
+Xsession currently doesn't allow to pass 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.
@@ -16,14 +16,14 @@ as a workaround. Once [1] is fixed, this should be removed again.
  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
+index 055ce64..34827ee 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=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 +Exec=gnome-session-classic
  TryExec=gnome-session
  Type=Application

debian/patches/series

@@ -1 +1,2 @@
+#dont-require-nautilus-classic.patch
 gnome-session-classic-wrapper-script.patch

debian/rules

@@ -1,9 +1,17 @@
 #!/usr/bin/make -f
 
+EXTENSIONS_ENABLED='alternate-tab, apps-menu, places-menu, \
+ launch-new-instance, window-list, \
+ drive-menu, screenshot-window-sizer, \
+ windowsNavigator, workspace-indicator, \
+ auto-move-windows, native-window-placement, user-theme'
+
+EXTENSIONS_DISABLED='example'
+
 %:
-	dh $@
+	dh $@ --with gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-Dextension_set=all \
+		-Denable_extensions=$(EXTENSIONS_ENABLED) \
 		-Dclassic_mode=true

debian/upstream/metadata

@@ -1,5 +0,0 @@
----
-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

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

export-zips.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 srcdir=`dirname $0`
 srcdir=`(cd $srcdir && pwd)`
@@ -7,40 +7,29 @@ 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
-meson install -C $builddir
+ninja -C$builddir install
 
 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
 
-  olddomain=gnome-shell-extensions
-  newdomain=gnome-shell-extension-$name
-  sed -i "/gettext-domain/ s:$olddomain:$newdomain:" $f/metadata.json
+  cp $srcdir/NEWS $srcdir/COPYING $f
 
-  xgettext --from-code=UTF-8 --output-dir=$builddir --output=$name.pot $f/*.js
-
-  if [ -f $builddir/$name.pot ]; then
-    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
+  if [ -f $schema ]; then
+    mkdir $f/schemas
+    cp $schema $f/schemas;
+    glib-compile-schemas $f/schemas
   fi
 
-  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
+  (cd $f && zip -rmq $srcdir/zip-files/$uuid.shell-extension.zip .)
 done
 
 rm -rf $builddir

extensions/alternate-tab/extension.js

@@ -0,0 +1,62 @@
+/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+
+const AltTab = imports.ui.altTab;
+const Main = imports.ui.main;
+const WindowManager = imports.ui.windowManager;
+
+let injections = {};
+
+function init(metadata) {
+}
+
+function setKeybinding(name, func) {
+    Main.wm.setCustomKeybindingHandler(name, Shell.ActionMode.NORMAL, func);
+}
+
+function enable() {
+    injections['_keyPressHandler'] = AltTab.WindowSwitcherPopup.prototype._keyPressHandler;
+    AltTab.WindowSwitcherPopup.prototype._keyPressHandler = function(keysym, action) {
+        switch(action) {
+            case Meta.KeyBindingAction.SWITCH_APPLICATIONS:
+              action = Meta.KeyBindingAction.SWITCH_WINDOWS;
+              break;
+            case Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD:
+              action = Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD;
+              break;
+        }
+        return injections['_keyPressHandler'].call(this, keysym, action);
+    };
+
+    Main.wm._forcedWindowSwitcher = function(display, screen, window, binding) {
+        /* prevent a corner case where both popups show up at once */
+        if (this._workspaceSwitcherPopup != null)
+            this._workspaceSwitcherPopup.destroy();
+
+        let tabPopup = new AltTab.WindowSwitcherPopup();
+
+        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
+            tabPopup.destroy();
+    };
+
+    setKeybinding('switch-applications',
+                  Main.wm._forcedWindowSwitcher.bind(Main.wm));
+    setKeybinding('switch-applications-backward',
+                  Main.wm._forcedWindowSwitcher.bind(Main.wm));
+}
+
+function disable() {
+    var prop;
+
+    setKeybinding('switch-applications',
+                  Main.wm._startSwitcher.bind(Main.wm));
+    setKeybinding('switch-applications-backward',
+                  Main.wm._startSwitcher.bind(Main.wm));
+
+    for (prop in injections)
+        AltTab.WindowSwitcherPopup.prototype[prop] = injections[prop];
+    delete Main.wm._forcedWindowSwitcher;
+}

extensions/alternate-tab/meson.build

@@ -3,3 +3,5 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
+
+extension_sources += files('prefs.js')

extensions/alternate-tab/metadata.json.in

@@ -0,0 +1,11 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "AlternateTab",
+"description": "Substitute Alt-Tab with a window based switcher that does not group by application.\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.",
+"original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}

extensions/alternate-tab/prefs.js

@@ -0,0 +1,81 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+const GObject = imports.gi.GObject;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+const N_ = e => e;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+const SETTINGS_APP_ICON_MODE = 'app-icon-mode';
+const SETTINGS_CURRENT_WORKSPACE_ONLY = 'current-workspace-only';
+
+const MODES = {
+    'thumbnail-only': N_("Thumbnail only"),
+    'app-icon-only': N_("Application icon only"),
+    'both': N_("Thumbnail and application icon"),
+};
+
+const AltTabSettingsWidget = GObject.registerClass(
+class AltTabSettingsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.margin = 24;
+        this.row_spacing = 6;
+        this.orientation = Gtk.Orientation.VERTICAL;
+
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
+
+        let presentLabel = '<b>' + _("Present windows as") + '</b>';
+        this.add(new Gtk.Label({ label: presentLabel, 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);
+
+        let radio = null;
+        let currentMode = this._settings.get_string(SETTINGS_APP_ICON_MODE);
+        for (let mode in MODES) {
+            // copy the mode variable because it has function scope, not block scope
+            // so cannot be used in a closure
+            let modeCapture = mode;
+            let name = Gettext.gettext(MODES[mode]);
+
+            radio = new Gtk.RadioButton({ group: radio, label: name, valign: Gtk.Align.START });
+            radio.connect('toggled', widget => {
+                if (widget.active)
+                    this._settings.set_string(SETTINGS_APP_ICON_MODE, modeCapture);
+            });
+            grid.add(radio);
+
+            if (mode == currentMode)
+                radio.active = true;
+        }
+
+        let check = new Gtk.CheckButton({ label: _("Show only windows in the current workspace"),
+                                          margin_top: 6 });
+        this._settings.bind(SETTINGS_CURRENT_WORKSPACE_ONLY, check, 'active', Gio.SettingsBindFlags.DEFAULT);
+        this.add(check);
+    }
+});
+
+function init() {
+    Convenience.initTranslations();
+}
+
+function buildPrefsWidget() {
+    let widget = new AltTabSettingsWidget();
+    widget.show_all();
+
+    return widget;
+}

extensions/alternate-tab/stylesheet.css

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

extensions/apps-menu/extension.js

@@ -1,22 +1,27 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-import Atk from 'gi://Atk';
-import Clutter from 'gi://Clutter';
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GMenu from 'gi://GMenu';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
-import Meta from 'gi://Meta';
-import Shell from 'gi://Shell';
-import St from 'gi://St';
-import {EventEmitter} from 'resource:///org/gnome/shell/misc/signals.js';
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const Atk = imports.gi.Atk;
+const DND = imports.ui.dnd;
+const GMenu = imports.gi.GMenu;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Clutter = imports.gi.Clutter;
+const Main = imports.ui.main;
+const Meta = imports.gi.Meta;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Gtk = imports.gi.Gtk;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Signals = imports.signals;
+const Pango = imports.gi.Pango;
 
-import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
 
 const appSys = Shell.AppSystem.get_default();
 
@@ -25,53 +30,65 @@ const HORIZ_FACTOR = 5;
 const MENU_HEIGHT_OFFSET = 132;
 const NAVIGATION_REGION_OVERSHOOT = 50;
 
-Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
-Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');
-
-class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    static {
-        GObject.registerClass(this);
+class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
+    constructor(button) {
+        super();
+        this._button = button;
+        this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
     }
 
+    activate(event) {
+        this._button.menu.toggle();
+        Main.overview.toggle();
+        super.activate(event);
+    }
+};
+
+class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     constructor(button, app) {
         super();
         this._app = app;
         this._button = button;
 
         this._iconBin = new St.Bin();
-        this.add_child(this._iconBin);
+        this.actor.add_child(this._iconBin);
 
-        let appLabel = new St.Label({
-            text: app.get_name(),
-            y_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
-        this.add_child(appLabel);
-        this.label_actor = appLabel;
+        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
+                                      y_align: Clutter.ActorAlign.CENTER });
+        this.actor.add_child(appLabel);
+        this.actor.label_actor = appLabel;
 
         let textureCache = St.TextureCache.get_default();
-        textureCache.connectObject('icon-theme-changed',
-            () => this._updateIcon(), this);
+        let iconThemeChangedId = textureCache.connect('icon-theme-changed',
+                                                      this._updateIcon.bind(this));
+        this.actor.connect('destroy', () => {
+            textureCache.disconnect(iconThemeChangedId);
+        });
         this._updateIcon();
 
-        this._delegate = this;
-        let draggable = DND.makeDraggable(this);
+        this.actor._delegate = this;
+        let draggable = DND.makeDraggable(this.actor);
 
         let maybeStartDrag = draggable._maybeStartDrag;
-        draggable._maybeStartDrag = event => {
+        draggable._maybeStartDrag = (event) => {
             if (this._dragEnabled)
                 return maybeStartDrag.call(draggable, event);
             return false;
         };
+
+        draggable.connect('drag-begin', () => {
+            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, true);
+        });
+        draggable.connect('drag-end', () => {
+            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, false);
+        });
     }
 
     activate(event) {
         this._app.open_new_window(-1);
-        this._button.selectCategory(null);
+        this._button.selectCategory(null, null);
         this._button.menu.toggle();
         super.activate(event);
-
-        Main.overview.hide();
     }
 
     setActive(active, params) {
@@ -80,8 +97,8 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         super.setActive(active, params);
     }
 
-    setDragEnabled(enabled) {
-        this._dragEnabled = enabled;
+    setDragEnabled(enable) {
+        this._dragEnabled = enable;
     }
 
     getDragActor() {
@@ -93,17 +110,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _updateIcon() {
-        let icon = this.getDragActor();
-        icon.style_class = 'icon-dropshadow';
-        this._iconBin.set_child(icon);
+        this._iconBin.set_child(this.getDragActor());
     }
-}
+};
 
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    static {
-        GObject.registerClass(this);
-    }
-
     constructor(button, category) {
         super();
         this._category = category;
@@ -116,23 +127,22 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         if (this._category)
             name = this._category.get_name();
         else
-            name = _('Favorites');
+            name = _("Favorites");
 
-        this.add_child(new St.Label({text: name}));
-        this.connect('motion-event', this._onMotionEvent.bind(this));
-        this.connect('notify::active', this._onActiveChanged.bind(this));
+        this.actor.add_child(new St.Label({ text: name }));
+        this.actor.connect('motion-event', this._onMotionEvent.bind(this));
     }
 
     activate(event) {
-        this._button.selectCategory(this._category);
+        this._button.selectCategory(this._category, this);
         this._button.scrollToCatButton(this);
         super.activate(event);
     }
 
     _isNavigatingSubmenu([x, y]) {
-        let [posX, posY] = this.get_transformed_position();
+        let [posX, posY] = this.actor.get_transformed_position();
 
-        if (this._oldX === -1) {
+        if (this._oldX == -1) {
             this._oldX = x;
             this._oldY = y;
             return true;
@@ -145,11 +155,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._oldY = y;
 
         // If it lies outside the x-coordinates then it is definitely outside.
-        if (posX > x || posX + this.width < x)
+        if (posX > x || posX + this.actor.width < x)
             return false;
 
         // If it lies inside the menu item then it is definitely inside.
-        if (posY <= y && posY + this.height >= y)
+        if (posY <= y && posY + this.actor.height >= y)
             return true;
 
         // We want the keep-up triangle only if the movement is more
@@ -170,42 +180,37 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         // only check for triangle ABC.
         if (posY > y) {
             let offset = posY - y;
-            y = posY + this.height + offset;
+            y = posY + this.actor.height + offset;
         }
 
         // Ensure that A is (0, 0).
         x -= posX;
-        y -= posY + this.height;
+        y -= posY + this.actor.height;
 
         // Check which side of line AB the point P lies on by taking the
         // cross-product of AB and AP. See:
         // http://stackoverflow.com/questions/3461453/determine-which-side-of-a-line-a-point-lies
-        if (this.width * y - NAVIGATION_REGION_OVERSHOOT * x <= 0)
-            return true;
+        if (((this.actor.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
+             return true;
 
         return false;
     }
 
     _onMotionEvent(actor, event) {
-        if (!this._grab) {
+        if (!Clutter.get_pointer_grab()) {
             this._oldX = -1;
             this._oldY = -1;
-            const grab = global.stage.grab(this);
-            if (grab.get_seat_state() !== Clutter.GrabState.NONE)
-                this._grab = grab;
-            else
-                grab.dismiss();
+            Clutter.grab_pointer(this.actor);
         }
-        this.hover = true;
+        this.actor.hover = true;
 
         if (this._isNavigatingSubmenu(event.get_coords()))
             return true;
 
         this._oldX = -1;
         this._oldY = -1;
-        this.hover = false;
-        this._grab?.dismiss();
-        delete this._grab;
+        this.actor.hover = false;
+        Clutter.ungrab_pointer();
 
         let source = event.get_source();
         if (source instanceof St.Widget)
@@ -214,14 +219,14 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         return false;
     }
 
-    _onActiveChanged() {
-        if (!this.active)
-            return;
-
-        this._button.selectCategory(this._category);
-        this._button.scrollToCatButton(this);
+    setActive(active, params) {
+        if (active) {
+            this._button.selectCategory(this._category, this);
+            this._button.scrollToCatButton(this);
+        }
+        super.setActive(active, params);
     }
-}
+};
 
 class ApplicationsMenu extends PopupMenu.PopupMenu {
     constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -233,23 +238,40 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
         return false;
     }
 
+    open(animate) {
+        this._button.hotCorner.setBarrierSize(0);
+        if (this._button.hotCorner.actor) // fallback corner
+            this._button.hotCorner.actor.hide();
+        super.open(animate);
+    }
+
+    close(animate) {
+        let size = Main.layoutManager.panelBox.height;
+        this._button.hotCorner.setBarrierSize(size);
+        if (this._button.hotCorner.actor) // fallback corner
+            this._button.hotCorner.actor.show();
+        super.close(animate);
+    }
+
     toggle() {
-        if (this.isOpen)
-            this._button.selectCategory(null);
+        if (this.isOpen) {
+            this._button.selectCategory(null, null);
+        } else {
+            if (Main.overview.visible)
+                Main.overview.hide();
+        }
         super.toggle();
     }
-}
+};
 
-class DesktopTarget extends EventEmitter {
+class DesktopTarget {
     constructor() {
-        super();
-
         this._desktop = null;
         this._desktopDestroyedId = 0;
 
         this._windowAddedId =
             global.window_group.connect('actor-added',
-                this._onWindowAdded.bind(this));
+                                        this._onWindowAdded.bind(this));
 
         global.get_window_actors().forEach(a => {
             this._onWindowAdded(a.get_parent(), a);
@@ -257,20 +279,22 @@ class DesktopTarget extends EventEmitter {
     }
 
     get hasDesktop() {
-        return this._desktop !== null;
+        return this._desktop != null;
     }
 
     _onWindowAdded(group, actor) {
         if (!(actor instanceof Meta.WindowActor))
             return;
 
-        if (actor.meta_window.get_window_type() === Meta.WindowType.DESKTOP)
+        if (actor.meta_window.get_window_type() == Meta.WindowType.DESKTOP)
             this._setDesktop(actor);
     }
 
     _setDesktop(desktop) {
         if (this._desktop) {
-            this._desktop.disconnectObject(this);
+            this._desktop.disconnect(this._desktopDestroyedId);
+            this._desktopDestroyedId = 0;
+
             delete this._desktop._delegate;
         }
 
@@ -278,9 +302,9 @@ class DesktopTarget extends EventEmitter {
         this.emit('desktop-changed');
 
         if (this._desktop) {
-            this._desktop.connectObject('destroy', () => {
+            this._desktopDestroyedId = this._desktop.connect('destroy', () => {
                 this._setDesktop(null);
-            }, this);
+            });
             this._desktop._delegate = this;
         }
     }
@@ -291,40 +315,59 @@ class DesktopTarget extends EventEmitter {
         return source._app.app_info;
     }
 
-    async _markTrusted(file) {
+    _touchFile(file) {
+        let queryFlags = Gio.FileQueryInfoFlags.NONE;
+        let ioPriority = GLib.PRIORITY_DEFAULT;
+
+        let info = new Gio.FileInfo();
+        info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
+                                  GLib.get_real_time());
+        file.set_attributes_async (info, queryFlags, ioPriority, null,
+            (o, res) => {
+                try {
+                    o.set_attributes_finish(res);
+                } catch(e) {
+                    log('Failed to update access time: ' + e.message);
+                }
+            });
+    }
+
+    _markTrusted(file) {
         let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
         let trustedAttr = 'metadata::trusted';
         let queryFlags = Gio.FileQueryInfoFlags.NONE;
         let ioPriority = GLib.PRIORITY_DEFAULT;
 
-        try {
-            let info = await file.query_info_async(modeAttr, queryFlags, ioPriority, null);
+        file.query_info_async(modeAttr, queryFlags, ioPriority, null,
+            (o, res) => {
+                try {
+                    let info = o.query_info_finish(res);
+                    let mode = info.get_attribute_uint32(modeAttr) | 0o100;
 
-            let mode = info.get_attribute_uint32(modeAttr) | 0o100;
-            info.set_attribute_uint32(modeAttr, mode);
-            info.set_attribute_string(trustedAttr, 'yes');
-            await file.set_attributes_async(info, queryFlags, ioPriority, null);
+                    info.set_attribute_uint32(modeAttr, mode);
+                    info.set_attribute_string(trustedAttr, 'yes');
+                    file.set_attributes_async (info, queryFlags, ioPriority, null,
+                        (o, res) => {
+                            o.set_attributes_finish(res);
 
-            // Hack: force nautilus to reload file info
-            info = new Gio.FileInfo();
-            info.set_attribute_uint64(
-                Gio.FILE_ATTRIBUTE_TIME_ACCESS, GLib.get_real_time());
-            try {
-                await file.set_attributes_async(info, queryFlags, ioPriority, null);
-            } catch (e) {
-                log(`Failed to update access time: ${e.message}`);
-            }
-        } catch (e) {
-            log(`Failed to mark file as trusted: ${e.message}`);
-        }
+                            // Hack: force nautilus to reload file info
+                            this._touchFile(file);
+                        });
+                } catch(e) {
+                    log('Failed to mark file as trusted: ' + e.message);
+                }
+            });
     }
 
     destroy() {
-        global.window_group.disconnectObject(this);
+        if (this._windowAddedId)
+            global.window_group.disconnect(this._windowAddedId);
+        this._windowAddedId = 0;
+
         this._setDesktop(null);
     }
 
-    handleDragOver(source, _actor, _x, _y, _time) {
+    handleDragOver(source, actor, x, y, time) {
         let appInfo = this._getSourceAppInfo(source);
         if (!appInfo)
             return DND.DragMotionResult.CONTINUE;
@@ -332,7 +375,7 @@ class DesktopTarget extends EventEmitter {
         return DND.DragMotionResult.COPY_DROP;
     }
 
-    acceptDrop(source, _actor, _x, _y, _time) {
+    acceptDrop(source, actor, x, y, time) {
         let appInfo = this._getSourceAppInfo(source);
         if (!appInfo)
             return false;
@@ -348,51 +391,51 @@ class DesktopTarget extends EventEmitter {
             // copy_async() isn't introspectable :-(
             src.copy(dst, Gio.FileCopyFlags.OVERWRITE, null, null);
             this._markTrusted(dst);
-        } catch (e) {
-            log(`Failed to copy to desktop: ${e.message}`);
+        } catch(e) {
+            log('Failed to copy to desktop: ' + e.message);
         }
 
         return true;
     }
-}
+};
+Signals.addSignalMethods(DesktopTarget.prototype);
 
 class ApplicationsButton extends PanelMenu.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
     constructor() {
         super(1.0, null, false);
 
-        this.setMenu(new ApplicationsMenu(this, 1.0, St.Side.TOP, this));
+        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this));
         Main.panel.menuManager.addMenu(this.menu);
 
         // At this moment applications menu is not keyboard navigable at
         // all (so not accessible), so it doesn't make sense to set as
         // role ATK_ROLE_MENU like other elements of the panel.
-        this.accessible_role = Atk.Role.LABEL;
+        this.actor.accessible_role = Atk.Role.LABEL;
 
-        this._label = new St.Label({
-            text: _('Applications'),
-            y_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
+        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.actor.add_actor(hbox);
+        this.actor.name = 'panelApplications';
+        this.actor.label_actor = this._label;
+
+        this.actor.connect('captured-event', this._onCapturedEvent.bind(this));
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+
+        this._showingId = Main.overview.connect('showing', () => {
+            this.actor.add_accessible_state (Atk.StateType.CHECKED);
         });
-
-        this.add_actor(this._label);
-        this.name = 'panelApplications';
-        this.label_actor = this._label;
-
-        Main.overview.connectObject(
-            'showing', () => this.add_accessible_state(Atk.StateType.CHECKED),
-            'hiding', () => this.remove_accessible_state(Atk.StateType.CHECKED),
-            this);
-
-        Main.wm.addKeybinding(
-            'apps-menu-toggle-menu',
-            Extension.lookupByURL(import.meta.url).getSettings(),
-            Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
-            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
-            () => this.menu.toggle());
+        this._hidingId = Main.overview.connect('hiding', () => {
+            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
+        });
+        Main.layoutManager.connect('startup-complete',
+                                   this._setKeybinding.bind(this));
+        this._setKeybinding();
 
         this._desktopTarget = new DesktopTarget();
         this._desktopTarget.connect('app-dropped', () => {
@@ -404,16 +447,16 @@ class ApplicationsButton extends PanelMenu.Button {
             });
         });
 
-        this._tree = new GMenu.Tree({menu_basename: 'applications.menu'});
-        this._tree.connectObject('changed',
-            () => this._onTreeChanged(), this);
+        this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
+        this._treeChangedId = this._tree.connect('changed',
+                                                 this._onTreeChanged.bind(this));
 
         this._applicationsButtons = new Map();
         this.reloadFlag = false;
         this._createLayout();
         this._display();
-        appSys.connectObject('installed-changed',
-            () => this._onTreeChanged(), this);
+        this._installedChangedId = appSys.connect('installed-changed',
+                                                  this._onTreeChanged.bind(this));
     }
 
     _onTreeChanged() {
@@ -425,30 +468,47 @@ class ApplicationsButton extends PanelMenu.Button {
         }
     }
 
+    get hotCorner() {
+        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
+    }
+
     _createVertSeparator() {
-        let separator = new St.DrawingArea({
-            style_class: 'calendar-vertical-separator',
-            pseudo_class: 'highlighted',
-        });
+        let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
+                                             pseudo_class: 'highlighted' });
         separator.connect('repaint', this._onVertSepRepaint.bind(this));
         return separator;
     }
 
     _onDestroy() {
-        super._onDestroy();
+        Main.overview.disconnect(this._showingId);
+        Main.overview.disconnect(this._hidingId);
+        appSys.disconnect(this._installedChangedId);
+        this._tree.disconnect(this._treeChangedId);
+        this._tree = null;
 
-        delete this._tree;
-
-        Main.wm.removeKeybinding('apps-menu-toggle-menu');
+        Main.wm.setCustomKeybindingHandler('panel-main-menu',
+                                           Shell.ActionMode.NORMAL |
+                                           Shell.ActionMode.OVERVIEW,
+                                           Main.sessionMode.hasOverview ?
+                                           Main.overview.toggle.bind(Main.overview) :
+                                           null);
 
         this._desktopTarget.destroy();
     }
 
+    _onCapturedEvent(actor, event) {
+        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
+            if (!Main.overview.shouldToggleByCornerOrButton())
+                return true;
+        }
+        return false;
+    }
+
     _onMenuKeyPress(actor, event) {
         let symbol = event.get_key_symbol();
-        if (symbol === Clutter.KEY_Left || symbol === Clutter.KEY_Right) {
-            let direction = symbol === Clutter.KEY_Left
-                ? Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
+        if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
+            let direction = symbol == Clutter.KEY_Left ? Gtk.DirectionType.LEFT
+                                                       : Gtk.DirectionType.RIGHT;
             if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                 return true;
         }
@@ -461,7 +521,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let [width, height] = area.get_surface_size();
         let stippleColor = themeNode.get_color('-stipple-color');
         let stippleWidth = themeNode.get_length('-stipple-width');
-        let x = Math.floor(width / 2) + 0.5;
+        let x = Math.floor(width/2) + 0.5;
         cr.moveTo(x, 0);
         cr.lineTo(x, height);
         Clutter.cairo_set_source_color(cr, stippleColor);
@@ -471,14 +531,21 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _onOpenStateChanged(menu, open) {
-        if (open) {
-            if (this.reloadFlag) {
-                this._redisplay();
-                this.reloadFlag = false;
-            }
-            this.mainBox.show();
-        }
-        super._onOpenStateChanged(menu, open);
+       if (open) {
+           if (this.reloadFlag) {
+               this._redisplay();
+               this.reloadFlag = false;
+           }
+           this.mainBox.show();
+       }
+       super._onOpenStateChanged(menu, open);
+    }
+
+    _setKeybinding() {
+        Main.wm.setCustomKeybindingHandler('panel-main-menu',
+                                           Shell.ActionMode.NORMAL |
+                                           Shell.ActionMode.OVERVIEW,
+                                           () => { this.menu.toggle(); });
     }
 
     _redisplay() {
@@ -490,23 +557,23 @@ class ApplicationsButton extends PanelMenu.Button {
     _loadCategory(categoryId, dir) {
         let iter = dir.iter();
         let nextType;
-        while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) {
-            if (nextType === GMenu.TreeItemType.ENTRY) {
+        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
+            if (nextType == GMenu.TreeItemType.ENTRY) {
                 let entry = iter.get_entry();
                 let id;
                 try {
                     id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
-                } catch (e) {
+                } catch(e) {
                     continue;
                 }
                 let app = appSys.lookup_app(id);
                 if (!app)
-                    app = new Shell.App({app_info: entry.get_app_info()});
+                    app = new Shell.App({ app_info: entry.get_app_info() });
                 if (app.get_app_info().should_show())
                     this.applicationsByCategory[categoryId].push(app);
-            } else if (nextType === GMenu.TreeItemType.SEPARATOR) {
+            } else if (nextType == GMenu.TreeItemType.SEPARATOR) {
                 this.applicationsByCategory[categoryId].push('separator');
-            } else if (nextType === GMenu.TreeItemType.DIRECTORY) {
+            } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                 let subdir = iter.get_directory();
                 if (!subdir.get_is_nodisplay())
                     this._loadCategory(categoryId, subdir);
@@ -519,13 +586,13 @@ class ApplicationsButton extends PanelMenu.Button {
         let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
         let currentScrollValue = appsScrollBoxAdj.get_value();
         let boxHeight = appsScrollBoxAlloc.y2 - appsScrollBoxAlloc.y1;
-        let buttonAlloc = button.get_allocation_box();
+        let buttonAlloc = button.actor.get_allocation_box();
         let newScrollValue = currentScrollValue;
         if (currentScrollValue > buttonAlloc.y1 - 10)
             newScrollValue = buttonAlloc.y1 - 10;
         if (boxHeight + currentScrollValue < buttonAlloc.y2 + 10)
             newScrollValue = buttonAlloc.y2 - boxHeight + 10;
-        if (newScrollValue !== currentScrollValue)
+        if (newScrollValue != currentScrollValue)
             appsScrollBoxAdj.set_value(newScrollValue);
     }
 
@@ -534,25 +601,24 @@ class ApplicationsButton extends PanelMenu.Button {
         let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
         let currentScrollValue = catsScrollBoxAdj.get_value();
         let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
-        let buttonAlloc = button.get_allocation_box();
+        let buttonAlloc = button.actor.get_allocation_box();
         let newScrollValue = currentScrollValue;
         if (currentScrollValue > buttonAlloc.y1 - 10)
             newScrollValue = buttonAlloc.y1 - 10;
         if (boxHeight + currentScrollValue < buttonAlloc.y2 + 10)
             newScrollValue = buttonAlloc.y2 - boxHeight + 10;
-        if (newScrollValue !== currentScrollValue)
+        if (newScrollValue != currentScrollValue)
             catsScrollBoxAdj.set_value(newScrollValue);
     }
 
     _createLayout() {
         let section = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(section);
-        this.mainBox = new St.BoxLayout({vertical: false});
-        this.leftBox = new St.BoxLayout({vertical: true});
-        this.applicationsScrollBox = new St.ScrollView({
-            style_class: 'apps-menu vfade',
-            x_expand: true,
-        });
+        this.mainBox = new St.BoxLayout({ vertical: false });
+        this.leftBox = new St.BoxLayout({ vertical: true });
+        this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
+                                                         y_align: St.Align.START,
+                                                         style_class: 'apps-menu vfade' });
         this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let vscroll = this.applicationsScrollBox.get_vscroll_bar();
         vscroll.connect('scroll-start', () => {
@@ -561,67 +627,69 @@ class ApplicationsButton extends PanelMenu.Button {
         vscroll.connect('scroll-stop', () => {
             this.menu.passEvents = false;
         });
-        this.categoriesScrollBox = new St.ScrollView({
-            style_class: 'vfade',
-        });
+        this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
+                                                       y_align: St.Align.START,
+                                                       style_class: 'vfade' });
         this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         vscroll = this.categoriesScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => (this.menu.passEvents = true));
-        vscroll.connect('scroll-stop', () => (this.menu.passEvents = false));
-        this.leftBox.add_child(this.categoriesScrollBox);
+        vscroll.connect('scroll-start', () => { this.menu.passEvents = true; });
+        vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; });
+        this.leftBox.add(this.categoriesScrollBox, { expand: true,
+                                                     x_fill: true, y_fill: true,
+                                                     y_align: St.Align.START });
 
-        this.applicationsBox = new St.BoxLayout({vertical: true});
+        let activities = new ActivitiesMenuItem(this);
+        this.leftBox.add(activities.actor, { expand: false,
+                                             x_fill: true, y_fill: false,
+                                             y_align: St.Align.START });
+
+        this.applicationsBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox.add_actor(this.applicationsBox);
-        this.categoriesBox = new St.BoxLayout({vertical: true});
+        this.categoriesBox = new St.BoxLayout({ vertical: true });
         this.categoriesScrollBox.add_actor(this.categoriesBox);
 
         this.mainBox.add(this.leftBox);
-        this.mainBox.add_child(this._createVertSeparator());
-        this.mainBox.add_child(this.applicationsScrollBox);
+        this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true});
+        this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true });
         section.actor.add_actor(this.mainBox);
     }
 
     _display() {
         this._applicationsButtons.clear();
-        this.mainBox.style = 'width: 35em;';
+        this.mainBox.style=('width: 35em;');
         this.mainBox.hide();
 
-        // Load categories
+        //Load categories
         this.applicationsByCategory = {};
         this._tree.load_sync();
         let root = this._tree.get_root_directory();
         let categoryMenuItem = new CategoryMenuItem(this, null);
-        this.categoriesBox.add_actor(categoryMenuItem);
+        this.categoriesBox.add_actor(categoryMenuItem.actor);
         let iter = root.iter();
         let nextType;
-        while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) {
-            if (nextType !== GMenu.TreeItemType.DIRECTORY)
-                continue;
-
-            let dir = iter.get_directory();
-            if (dir.get_is_nodisplay())
-                continue;
-
-            let categoryId = dir.get_menu_id();
-            this.applicationsByCategory[categoryId] = [];
-            this._loadCategory(categoryId, dir);
-            if (this.applicationsByCategory[categoryId].length > 0) {
-                categoryMenuItem = new CategoryMenuItem(this, dir);
-                this.categoriesBox.add_actor(categoryMenuItem);
+        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
+            if (nextType == GMenu.TreeItemType.DIRECTORY) {
+                let dir = iter.get_directory();
+                if (!dir.get_is_nodisplay()) {
+                    let categoryId = dir.get_menu_id();
+                    this.applicationsByCategory[categoryId] = [];
+                    this._loadCategory(categoryId, dir);
+                    if (this.applicationsByCategory[categoryId].length > 0) {
+                        let categoryMenuItem = new CategoryMenuItem(this, dir);
+                        this.categoriesBox.add_actor(categoryMenuItem.actor);
+                    }
+                }
             }
         }
 
-        // Load applications
+        //Load applications
         this._displayButtons(this._listApplications(null));
 
-        let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        let scaleFactor = themeContext.scale_factor;
-        let categoriesHeight = this.categoriesBox.height / scaleFactor;
-        let height = Math.round(categoriesHeight) + MENU_HEIGHT_OFFSET;
-        this.mainBox.style += `height: ${height}px`;
+        let height = this.categoriesBox.height + MENU_HEIGHT_OFFSET + 'px';
+        this.mainBox.style+=('height: ' + height);
     }
 
-    selectCategory(dir) {
+    selectCategory(dir, categoryMenuItem) {
         this.applicationsBox.get_children().forEach(c => {
             if (c._delegate instanceof PopupMenu.PopupSeparatorMenuItem)
                 c._delegate.destroy();
@@ -636,49 +704,64 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _displayButtons(apps) {
-        for (let i = 0; i < apps.length; i++) {
-            let app = apps[i];
-            let item;
-            if (app instanceof Shell.App)
-                item = this._applicationsButtons.get(app);
-            else
-                item = new PopupMenu.PopupSeparatorMenuItem();
-            if (!item) {
-                item = new ApplicationMenuItem(this, app);
-                item.setDragEnabled(this._desktopTarget.hasDesktop);
-                this._applicationsButtons.set(app, item);
+         if (apps) {
+            for (let i = 0; i < apps.length; i++) {
+               let app = apps[i];
+               let item;
+               if (app instanceof Shell.App)
+                   item = this._applicationsButtons.get(app);
+               else
+                   item = new PopupMenu.PopupSeparatorMenuItem();
+               if (!item) {
+                  item = new ApplicationMenuItem(this, app);
+                  item.setDragEnabled(this._desktopTarget.hasDesktop);
+                  this._applicationsButtons.set(app, item);
+               }
+               if (!item.actor.get_parent())
+                  this.applicationsBox.add_actor(item.actor);
             }
-            if (!item.get_parent())
-                this.applicationsBox.add_actor(item);
-        }
+         }
     }
 
-    _listApplications(categoryMenuId) {
+    _listApplications(category_menu_id) {
         let applist;
 
-        if (categoryMenuId) {
-            applist = this.applicationsByCategory[categoryMenuId];
+        if (category_menu_id) {
+            applist = this.applicationsByCategory[category_menu_id];
         } else {
-            applist = global.settings.get_strv('favorite-apps')
-               .map(id => appSys.lookup_app(id))
-               .filter(app => app);
+            applist = new Array();
+            let favorites = global.settings.get_strv('favorite-apps');
+            for (let i = 0; i < favorites.length; i++) {
+                let app = appSys.lookup_app(favorites[i]);
+                if (app)
+                    applist.push(app);
+            }
         }
 
         return applist;
     }
+
+    destroy() {
+        super.destroy();
+    }
+};
+
+let appsMenuButton;
+let activitiesButton;
+
+function enable() {
+    activitiesButton = Main.panel.statusArea['activities'];
+    activitiesButton.container.hide();
+    appsMenuButton = new ApplicationsButton();
+    Main.panel.addToStatusArea('apps-menu', appsMenuButton, 1, 'left');
 }
 
-export default class AppsMenuExtension extends Extension {
-    enable() {
-        this._appsMenuButton = new ApplicationsButton();
-        const index = Main.sessionMode.panel.left.indexOf('activities') + 1;
-        Main.panel.addToStatusArea(
-            'apps-menu', this._appsMenuButton, index, 'left');
-    }
-
-    disable() {
-        Main.panel.menuManager.removeMenu(this._appsMenuButton.menu);
-        this._appsMenuButton.destroy();
-        delete this._appsMenuButton;
-    }
+function disable() {
+    Main.panel.menuManager.removeMenu(appsMenuButton.menu);
+    appsMenuButton.destroy();
+    activitiesButton.container.show();
+}
+
+function init(metadata) {
+    Convenience.initTranslations();
 }

extensions/apps-menu/meson.build

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

extensions/apps-menu/metadata.json.in

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

@@ -1,12 +0,0 @@
-<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

@@ -1,20 +1,24 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
 
-import Shell from 'gi://Shell';
+const Shell = imports.gi.Shell;
 
-import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const Main = imports.ui.main;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
 
 class WindowMover {
-    constructor(settings) {
-        this._settings = settings;
+    constructor() {
+        this._settings = Convenience.getSettings();
         this._appSystem = Shell.AppSystem.get_default();
         this._appConfigs = new Map();
         this._appData = new Map();
 
-        this._appSystem.connectObject('installed-changed',
-            () => this._updateAppData(), this);
+        this._appsChangedId =
+            this._appSystem.connect('installed-changed',
+                                    this._updateAppData.bind(this));
 
         this._settings.connect('changed', this._updateAppConfigs.bind(this));
         this._updateAppConfigs();
@@ -33,25 +37,33 @@ class WindowMover {
 
     _updateAppData() {
         let ids = [...this._appConfigs.keys()];
-        let removedApps = [...this._appData.keys()]
-            .filter(a => !ids.includes(a.id));
+        let removedApps = [...this._appData.keys()].filter(
+            a => !ids.includes(a.id)
+        );
         removedApps.forEach(app => {
-            app.disconnectObject(this);
+            app.disconnect(this._appData.get(app).windowsChangedId);
             this._appData.delete(app);
         });
 
-        let addedApps = ids
-            .map(id => this._appSystem.lookup_app(id))
-            .filter(app => app && !this._appData.has(app));
+        let addedApps = ids.map(id => this._appSystem.lookup_app(id)).filter(
+            app => app != null && !this._appData.has(app)
+        );
         addedApps.forEach(app => {
-            app.connectObject('window-changed',
-                this._appWindowsChanged.bind(this), this);
-            this._appData.set(app, {windows: app.get_windows()});
+            let data = {
+                windowsChangedId: app.connect('windows-changed',
+                                              this._appWindowsChanged.bind(this)),
+                moveWindowsId: 0,
+                windows: app.get_windows()
+            }
+            this._appData.set(app, data);
         });
     }
 
     destroy() {
-        this._appSystem.disconnectObject(this);
+        if (this._appsChangedId) {
+            this._appSystem.disconnect(this._appsChangedId);
+            this._appsChangedId = 0;
+        }
 
         if (this._settings) {
             this._settings.run_dispose();
@@ -63,14 +75,13 @@ class WindowMover {
     }
 
     _moveWindow(window, workspaceNum) {
-        if (window.skip_taskbar || window.is_on_all_workspaces())
+        if (window.skip_taskbar)
             return;
 
         // ensure we have the required number of workspaces
-        let workspaceManager = global.workspace_manager;
-        for (let i = workspaceManager.n_workspaces; i <= workspaceNum; i++) {
+        for (let i = global.screen.n_workspaces; i <= workspaceNum; i++) {
             window.change_workspace_by_index(i - 1, false);
-            workspaceManager.append_new_workspace(false, 0);
+            global.screen.append_new_workspace(false, 0);
         }
 
         window.change_workspace_by_index(workspaceNum, false);
@@ -84,9 +95,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(w => {
-            return !windows.includes(w) && w.get_compositor_private() !== null;
-        }));
+        windows.push(...data.windows.filter(
+            w => !windows.includes(w) && w.get_compositor_private() != null
+        ));
 
         let workspaceNum = this._appConfigs.get(app.id);
         windows.filter(w => !data.windows.includes(w)).forEach(window => {
@@ -94,43 +105,41 @@ class WindowMover {
         });
         data.windows = windows;
     }
+};
+
+let prevCheckWorkspaces;
+let winMover;
+
+function init() {
+    Convenience.initTranslations();
 }
 
-export default class AutoMoveExtension extends Extension {
-    enable() {
-        this._prevCheckWorkspaces = Main.wm._workspaceTracker._checkWorkspaces;
-        Main.wm._workspaceTracker._checkWorkspaces =
-            this._getCheckWorkspaceOverride(this._prevCheckWorkspaces);
-        this._windowMover = new WindowMover(this.getSettings());
+function myCheckWorkspaces() {
+    let keepAliveWorkspaces = [];
+    let foundNonEmpty = false;
+    for (let i = this._workspaces.length - 1; i >= 0; i--) {
+        if (!foundNonEmpty)
+            foundNonEmpty = this._workspaces[i].list_windows().length > 0;
+        else if (!this._workspaces[i]._keepAliveId)
+            keepAliveWorkspaces.push(this._workspaces[i]);
     }
 
-    disable() {
-        Main.wm._workspaceTracker._checkWorkspaces = this._prevCheckWorkspaces;
-        this._windowMover.destroy();
-        delete this._windowMover;
-    }
+    // make sure the original method only removes empty workspaces at the end
+    keepAliveWorkspaces.forEach(ws => { ws._keepAliveId = 1; });
+    prevCheckWorkspaces.call(this);
+    keepAliveWorkspaces.forEach(ws => { delete ws._keepAliveId; });
 
-    _getCheckWorkspaceOverride(originalMethod) {
-        /* eslint-disable no-invalid-this */
-        return function () {
-            const keepAliveWorkspaces = [];
-            let foundNonEmpty = false;
-            for (let i = this._workspaces.length - 1; i >= 0; i--) {
-                if (!foundNonEmpty) {
-                    foundNonEmpty = this._workspaces[i].list_windows().some(
-                        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
-            keepAliveWorkspaces.forEach(ws => (ws._keepAliveId = 1));
-            originalMethod.call(this);
-            keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);
-
-            return false;
-        };
-        /* eslint-enable no-invalid-this */
-    }
+    return false;
+}
+
+function enable() {
+    prevCheckWorkspaces = Main.wm._workspaceTracker._checkWorkspaces;
+    Main.wm._workspaceTracker._checkWorkspaces = myCheckWorkspaces;
+
+    winMover = new WindowMover();
+}
+
+function disable() {
+    Main.wm._workspaceTracker._checkWorkspaces = prevCheckWorkspaces;
+    winMover.destroy();
 }

extensions/auto-move-windows/prefs.js

@@ -1,348 +1,260 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
 
-import Adw from 'gi://Adw';
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Gtk = imports.gi.Gtk;
 
-import {ExtensionPreferences, gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+const N_ = e => e;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
 
 const SETTINGS_KEY = 'application-list';
 
 const WORKSPACE_MAX = 36; // compiled in limit of mutter
 
-class NewItem extends GObject.Object {}
-GObject.registerClass(NewItem);
+const Columns = {
+    APPINFO: 0,
+    DISPLAY_NAME: 1,
+    ICON: 2,
+    WORKSPACE: 3,
+    ADJUSTMENT: 4
+};
 
-class NewItemModel extends GObject.Object {
-    static [GObject.interfaces] = [Gio.ListModel];
-    static {
-        GObject.registerClass(this);
-    }
+const Widget = GObject.registerClass({
+    GTypeName: 'AutoMoveWindowsPrefsWidget',
+}, class Widget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.set_orientation(Gtk.Orientation.VERTICAL);
 
-    #item = new NewItem();
+        this._settings = Convenience.getSettings();
+        this._settings.connect('changed', this._refresh.bind(this));
+        this._changedPermitted = false;
 
-    vfunc_get_item_type() {
-        return NewItem;
-    }
+        this._store = new Gtk.ListStore();
+        this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
+                                      Gtk.Adjustment]);
 
-    vfunc_get_n_items() {
-        return 1;
-    }
+        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN});
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        this.add(scrolled);
 
-    vfunc_get_item(_pos) {
-        return this.#item;
-    }
-}
 
-class Rule extends GObject.Object {
-    static [GObject.properties] = {
-        'app-info': GObject.ParamSpec.object(
-            'app-info', 'app-info', 'app-info',
-            GObject.ParamFlags.READWRITE,
-            Gio.DesktopAppInfo),
-        'workspace': GObject.ParamSpec.uint(
-            'workspace', 'workspace', 'workspace',
-            GObject.ParamFlags.READWRITE,
-            1, WORKSPACE_MAX, 1),
-    };
+        this._treeView = new Gtk.TreeView({ model: this._store,
+                                            hexpand: true, vexpand: true });
+        this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
 
-    static {
-        GObject.registerClass(this);
-    }
-}
+        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);
 
-class RulesList extends GObject.Object {
-    static [GObject.interfaces] = [Gio.ListModel];
-    static {
-        GObject.registerClass(this);
-    }
+        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);
 
-    #settings;
-    #rules = [];
-    #changedId;
+        scrolled.add(this._treeView);
 
-    constructor(settings) {
-        super();
+        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);
 
-        this.#settings = settings;
-        this.#changedId =
-            this.#settings.connect(`changed::${SETTINGS_KEY}`,
-                () => this.#sync());
-        this.#sync();
-    }
+        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);
 
-    append(appInfo) {
-        const pos = this.#rules.length;
+        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+        delButton.connect('clicked', this._deleteSelected.bind(this));
+        toolbar.add(delButton);
 
-        this.#rules.push(new Rule({appInfo}));
-        this.#saveRules();
-
-        this.items_changed(pos, 0, 1);
-    }
-
-    remove(id) {
-        const pos = this.#rules.findIndex(r => r.appInfo.get_id() === id);
-        if (pos < 0)
-            return;
-
-        this.#rules.splice(pos, 1);
-        this.#saveRules();
-
-        this.items_changed(pos, 1, 0);
-    }
-
-    changeWorkspace(id, workspace) {
-        const pos = this.#rules.findIndex(r => r.appInfo.get_id() === id);
-        if (pos < 0)
-            return;
-
-        this.#rules[pos].set({workspace});
-        this.#saveRules();
-    }
-
-    #saveRules() {
-        this.#settings.block_signal_handler(this.#changedId);
-        this.#settings.set_strv(SETTINGS_KEY,
-            this.#rules.map(r => `${r.app_info.get_id()}:${r.workspace}`));
-        this.#settings.unblock_signal_handler(this.#changedId);
-    }
-
-    #sync() {
-        const removed = this.#rules.length;
-
-        this.#rules = [];
-        for (const stringRule of this.#settings.get_strv(SETTINGS_KEY)) {
-            const [id, workspace] = stringRule.split(':');
-            const appInfo = Gio.DesktopAppInfo.new(id);
-            if (appInfo)
-                this.#rules.push(new Rule({appInfo, workspace}));
-            else
-                log(`Invalid ID ${id}`);
-        }
-        this.items_changed(0, removed, this.#rules.length);
-    }
-
-    vfunc_get_item_type() {
-        return Rule;
-    }
-
-    vfunc_get_n_items() {
-        return this.#rules.length;
-    }
-
-    vfunc_get_item(pos) {
-        return this.#rules[pos] ?? null;
-    }
-}
-
-class AutoMoveSettingsWidget extends Adw.PreferencesGroup {
-    static {
-        GObject.registerClass(this);
-
-        this.install_action('rules.add', null, self => self._addNewRule());
-        this.install_action('rules.remove', 's',
-            (self, name, param) => self._rules.remove(param.unpack()));
-        this.install_action('rules.change-workspace', '(si)',
-            (self, name, param) => self._rules.changeWorkspace(...param.deepUnpack()));
-    }
-
-    constructor(settings) {
-        super({
-            title: _('Workspace Rules'),
+        let selection = this._treeView.get_selection();
+        selection.connect('changed', () => {
+            delButton.sensitive = selection.count_selected_rows() > 0;
         });
+        delButton.sensitive = selection.count_selected_rows() > 0;
 
-        this._settings = settings;
-        this._rules = new RulesList(this._settings);
-
-        const store = new Gio.ListStore({item_type: Gio.ListModel});
-        const listModel = new Gtk.FlattenListModel({model: store});
-        store.append(this._rules);
-        store.append(new NewItemModel());
-
-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            css_classes: ['boxed-list'],
-        });
-        this.add(this._list);
-
-        this._list.bind_model(listModel, item => {
-            return item instanceof NewItem
-                ? new NewRuleRow()
-                : new RuleRow(item);
-        });
+        this._changedPermitted = true;
+        this._refresh();
     }
 
-    _addNewRule() {
-        const dialog = new NewRuleDialog(this.get_root(), this._settings);
-        dialog.connect('response', (dlg, id) => {
-            const appInfo = id === Gtk.ResponseType.OK
-                ? dialog.get_widget().get_app_info() : null;
-            if (appInfo)
-                this._rules.append(appInfo);
+    _createNew() {
+        let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
+                                      transient_for: this.get_toplevel(),
+                                      use_header_bar: true,
+                                      modal: true });
+        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+        let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+        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: 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', (dialog, id) => {
+            if (id != Gtk.ResponseType.OK) {
+                dialog.destroy();
+                return;
+            }
+
+            let 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;
+
+            let iter = this._store.append();
+            let adj = new Gtk.Adjustment({ lower: 1,
+                                           upper: WORKSPACE_MAX,
+                                           step_increment: 1,
+                                           value: index });
+            this._store.set(iter,
+                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
+                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
+
             dialog.destroy();
         });
-        dialog.show();
+        dialog.show_all();
     }
+
+    _deleteSelected() {
+        let [any, model, iter] = this._treeView.get_selection().get_selected();
+
+        if (any) {
+            let appInfo = this._store.get_value(iter, Columns.APPINFO);
+
+            this._changedPermitted = false;
+            this._removeItem(appInfo.get_id());
+            this._changedPermitted = true;
+            this._store.remove(iter);
+        }
+    }
+
+    _workspaceEdited(renderer, pathString, text) {
+        let index = parseInt(text);
+        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() {
+        if (!this._changedPermitted)
+            // Ignore this notification, model is being modified outside
+            return;
+
+        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]);
+
+            let iter = this._store.append();
+            let adj = new Gtk.Adjustment({ lower: 1,
+                                           upper: WORKSPACE_MAX,
+                                           step_increment: 1,
+                                           value: index });
+            this._store.set(iter,
+                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
+                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
+        }
+
+        if (validItems.length != currentItems.length) // some items were filtered out
+            this._settings.set_strv(SETTINGS_KEY, validItems);
+    }
+
+    _checkId(id) {
+        let items = this._settings.get_strv(SETTINGS_KEY);
+        return !items.some(i => i.startsWith(id + ':'));
+    }
+
+    _appendItem(id, workspace) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        currentItems.push(id + ':' + workspace);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
+    }
+
+    _removeItem(id) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+
+        if (index < 0)
+            return;
+        currentItems.splice(index, 1);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
+    }
+
+    _changeItem(id, workspace) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        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);
+    }
+});
+
+
+function init() {
+    Convenience.initTranslations();
 }
 
-class WorkspaceSelector extends Gtk.Widget {
-    static [GObject.properties] = {
-        'number': GObject.ParamSpec.uint(
-            'number', 'number', 'number',
-            GObject.ParamFlags.READWRITE,
-            1, WORKSPACE_MAX, 1),
-    };
+function buildPrefsWidget() {
+    let widget = new Widget({ margin: 12 });
+    widget.show_all();
 
-    static {
-        GObject.registerClass(this);
-
-        this.set_layout_manager_type(Gtk.BoxLayout);
-    }
-
-    constructor() {
-        super();
-
-        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;
-    }
-}
-
-class RuleRow extends Adw.ActionRow {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(rule) {
-        const {appInfo} = rule;
-        const id = appInfo.get_id();
-
-        super({
-            activatable: false,
-            title: rule.appInfo.get_display_name(),
-        });
-
-        const icon = new Gtk.Image({
-            css_classes: ['icon-dropshadow'],
-            gicon: appInfo.get_icon(),
-            pixel_size: 32,
-        });
-        this.add_prefix(icon);
-
-        const wsButton = new WorkspaceSelector();
-        rule.bind_property('workspace',
-            wsButton, 'number',
-            GObject.BindingFlags.SYNC_CREATE);
-        this.add_suffix(wsButton);
-
-        wsButton.connect('notify::number', () => {
-            this.activate_action('rules.change-workspace',
-                new GLib.Variant('(si)', [id, wsButton.number]));
-        });
-
-        const button = new Gtk.Button({
-            action_name: 'rules.remove',
-            action_target: new GLib.Variant('s', id),
-            icon_name: 'edit-delete-symbolic',
-            has_frame: false,
-            valign: Gtk.Align.CENTER,
-        });
-        this.add_suffix(button);
-    }
-}
-
-class NewRuleRow extends Gtk.ListBoxRow {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor() {
-        super({
-            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')]);
-    }
-}
-
-class NewRuleDialog extends Gtk.AppChooserDialog {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(parent, settings) {
-        super({
-            transient_for: parent,
-            modal: true,
-        });
-
-        this._settings = settings;
-
-        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())));
-    }
-}
-
-export default class AutoMovePrefs extends ExtensionPreferences {
-    getPreferencesWidget() {
-        return new AutoMoveSettingsWidget(this.getSettings());
-    }
+    return widget;
 }

extensions/auto-move-windows/stylesheet.css

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

extensions/drive-menu/extension.js

@@ -1,60 +1,52 @@
 // Drive menu extension
-import Clutter from 'gi://Clutter';
-import Gio from 'gi://Gio';
-import GObject from 'gi://GObject';
-import Shell from 'gi://Shell';
-import St from 'gi://St';
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
-import * as ShellMountOperation from 'resource:///org/gnome/shell/ui/shellMountOperation.js';
+const Main = imports.ui.main;
+const Panel = imports.ui.panel;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const ShellMountOperation = imports.ui.shellMountOperation;
 
-Gio._promisify(Gio.File.prototype, 'query_filesystem_info_async');
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
 
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    static {
-        GObject.registerClass(this);
-    }
-
     constructor(mount) {
-        super({
-            style_class: 'drive-menu-item',
-        });
+        super();
 
-        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;
+        this.label = new St.Label({ text: mount.get_name() });
+        this.actor.add(this.label, { expand: true });
+        this.actor.label_actor = this.label;
 
         this.mount = mount;
 
-        this.connect('destroy', this._onDestroy.bind(this));
-
-        let ejectIcon = new St.Icon({
-            icon_name: 'media-eject-symbolic',
-            style_class: 'popup-menu-icon',
-        });
-        let ejectButton = new St.Button({
-            child: ejectIcon,
-            style_class: 'button',
-        });
+        let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
+                                      style_class: 'popup-menu-icon ' });
+        let ejectButton = new St.Button({ child: ejectIcon });
         ejectButton.connect('clicked', this._eject.bind(this));
-        this.add(ejectButton);
+        this.actor.add(ejectButton);
 
-        this.hide();
-
-        mount.connectObject('changed',
-            () => this._syncVisibility(), this);
+        this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
         this._syncVisibility();
     }
 
-    async _isInteresting() {
+    destroy() {
+        if (this._changedId) {
+            this.mount.disconnect(this._changedId);
+            this._changedId = 0;
+        }
+
+        super.destroy();
+    }
+
+    _isInteresting() {
         if (!this.mount.can_eject() && !this.mount.can_unmount())
             return false;
         if (this.mount.is_shadowed())
@@ -62,47 +54,38 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         let volume = this.mount.get_volume();
 
-        if (volume)
-            return volume.get_identifier('class') !== 'network';
-
-        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}`);
+        if (volume == null) {
+            // probably a GDaemonMount, could be network or
+            // local, but we can't tell; assume it's local for now
+            return true;
         }
 
-        // Hack, fall back to looking at GType
-        return Gio._LocalFilePrototype.isPrototypeOf(root);
+        return volume.get_identifier('class') != 'network';
     }
 
-    async _syncVisibility() {
-        this.visible = await this._isInteresting();
+    _syncVisibility() {
+        this.actor.visible = this._isInteresting();
     }
 
     _eject() {
-        let unmountArgs = [
-            Gio.MountUnmountFlags.NONE,
-            new ShellMountOperation.ShellMountOperation(this.mount).mountOp,
-            null, // Gio.Cancellable
-        ];
+        let mountOp = new ShellMountOperation.ShellMountOperation(this.mount);
 
-        if (this.mount.can_eject()) {
-            this.mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
-        } else {
-            this.mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
-        }
+        if (this.mount.can_eject())
+            this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
+                                            mountOp.mountOp,
+                                            null, // Gio.Cancellable
+                                            this._ejectFinish.bind(this));
+        else
+            this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
+                                              mountOp.mountOp,
+                                              null, // Gio.Cancellable
+                                              this._unmountFinish.bind(this));
     }
 
     _unmountFinish(mount, result) {
         try {
             mount.unmount_with_operation_finish(result);
-        } catch (e) {
+        } catch(e) {
             this._reportFailure(e);
         }
     }
@@ -110,55 +93,54 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     _ejectFinish(mount, result) {
         try {
             mount.eject_with_operation_finish(result);
-        } catch (e) {
+        } catch(e) {
             this._reportFailure(e);
         }
     }
 
     _reportFailure(exception) {
         // TRANSLATORS: %s is the filesystem name
-        let msg = _('Ejecting drive “%s” failed:').format(this.mount.get_name());
+        let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
         Main.notifyError(msg, exception.message);
     }
 
     activate(event) {
-        let uri = this.mount.get_root().get_uri();
         let context = global.create_app_launch_context(event.get_time(), -1);
-        Gio.AppInfo.launch_default_for_uri(uri, context);
+        Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
+                                           context);
 
         super.activate(event);
     }
-}
+};
 
 class DriveMenu extends PanelMenu.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
     constructor() {
-        super(0.5, _('Removable devices'));
+        super(0.0, _("Removable devices"));
 
-        let icon = new St.Icon({
-            icon_name: 'media-eject-symbolic',
-            style_class: 'system-status-icon',
-        });
+        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' });
 
-        this.add_child(icon);
+        hbox.add_child(icon);
+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this.actor.add_child(hbox);
 
         this._monitor = Gio.VolumeMonitor.get();
-        this._monitor.connectObject(
-            'mount-added', (monitor, mount) => this._addMount(mount),
-            'mount-removed', (monitor, mount) => {
-                this._removeMount(mount);
-                this._updateMenuVisibility();
-            }, this);
+        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
+            this._addMount(mount);
+            this._updateMenuVisibility();
+        });
+        this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
+            this._removeMount(mount);
+            this._updateMenuVisibility();
+        });
 
-        this._mounts = [];
+        this._mounts = [ ];
 
         this._monitor.get_mounts().forEach(this._addMount.bind(this));
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_('Open Files'), event => {
+        this.menu.addAction(_("Open Files"), event => {
             let appSystem = Shell.AppSystem.get_default();
             let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
             app.activate_full(-1, event.get_time());
@@ -168,41 +150,53 @@ class DriveMenu extends PanelMenu.Button {
     }
 
     _updateMenuVisibility() {
-        if (this._mounts.filter(i => i.visible).length > 0)
-            this.show();
+        if (this._mounts.filter(i => i.actor.visible).length > 0)
+            this.actor.show();
         else
-            this.hide();
+            this.actor.hide();
     }
 
     _addMount(mount) {
         let item = new MountMenuItem(mount);
         this._mounts.unshift(item);
         this.menu.addMenuItem(item, 0);
-
-        item.connect('notify::visible', () => this._updateMenuVisibility());
     }
 
     _removeMount(mount) {
         for (let i = 0; i < this._mounts.length; i++) {
             let item = this._mounts[i];
-            if (item.mount === mount) {
+            if (item.mount == mount) {
                 item.destroy();
                 this._mounts.splice(i, 1);
                 return;
             }
         }
-        log('Removing a mount that was never added to the menu');
-    }
-}
-
-export default class PlaceMenuExtension extends Extension {
-    enable() {
-        this._indicator = new DriveMenu();
-        Main.panel.addToStatusArea('drive-menu', this._indicator);
+        log ('Removing a mount that was never added to the menu');
     }
 
-    disable() {
-        this._indicator.destroy();
-        delete this._indicator;
+    destroy() {
+        if (this._connectedId) {
+            this._monitor.disconnect(this._connectedId);
+            this._monitor.disconnect(this._disconnectedId);
+            this._connectedId = 0;
+            this._disconnectedId = 0;
+        }
+
+        super.destroy();
     }
+};
+
+function init() {
+    Convenience.initTranslations();
+}
+
+let _indicator;
+
+function enable() {
+    _indicator = new DriveMenu;
+    Main.panel.addToStatusArea('drive-menu', _indicator);
+}
+
+function disable() {
+    _indicator.destroy();
 }

extensions/drive-menu/meson.build

@@ -3,4 +3,3 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
-extension_data += files('stylesheet.css')

extensions/drive-menu/stylesheet.css

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

extensions/example/extension.js

@@ -0,0 +1,49 @@
+// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// Sample extension code, makes clicking on the panel show a message
+const St = imports.gi.St;
+const Mainloop = imports.mainloop;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const Main = imports.ui.main;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+function _showHello() {
+    let settings = Convenience.getSettings();
+    let text = settings.get_string('hello-text') || _("Hello, world!");
+
+    let label = new St.Label({ style_class: 'helloworld-label', text: text });
+    let monitor = Main.layoutManager.primaryMonitor;
+    global.stage.add_actor(label);
+    label.set_position(Math.floor (monitor.width / 2 - label.width / 2), Math.floor(monitor.height / 2 - label.height / 2));
+    Mainloop.timeout_add(3000, () => { label.destroy(); });
+}
+
+// Put your extension initialization code here
+function init(metadata) {
+    log ('Example extension initalized');
+
+    Convenience.initTranslations();
+}
+
+let signalId;
+
+function enable() {
+    log ('Example extension enabled');
+
+    Main.panel.actor.reactive = true;
+    signalId = Main.panel.actor.connect('button-release-event', _showHello);
+}
+
+function disable() {
+    log ('Example extension disabled');
+
+    if (signalId) {
+        Main.panel.actor.disconnect(signalId);
+        signalId = 0;
+    }
+}

extensions/example/meson.build

@@ -0,0 +1,8 @@
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)
+
+extension_sources += files('prefs.js')
+extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/example/metadata.json.in

@@ -0,0 +1,10 @@
+{
+ "extension-id": "@extension_id@",
+ "uuid": "@uuid@",
+ "settings-schema": "@gschemaname@",
+ "gettext-domain": "@gettext_domain@",
+ "name": "Hello, World!",
+ "description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.",
+ "shell-version": [ "@shell_current@" ],
+ "url": "@url@"
+}

extensions/example/org.gnome.shell.extensions.example.gschema.xml

@@ -0,0 +1,9 @@
+<schemalist gettext-domain="gnome-shell-extensions">
+  <schema id="org.gnome.shell.extensions.example" path="/org/gnome/shell/extensions/example/">
+    <key name="hello-text" type="s">
+      <default>''</default>
+      <summary>Alternative greeting text.</summary>
+      <description>If not empty, it contains the text that will be shown when clicking on the panel.</description>
+    </key>
+  </schema>
+</schemalist>

extensions/example/prefs.js

@@ -0,0 +1,54 @@
+// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+function init() {
+    Convenience.initTranslations();
+}
+
+const ExamplePrefsWidget = GObject.registerClass(
+class ExamplePrefsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.margin = 12;
+        this.row_spacing = this.column_spacing = 6;
+        this.set_orientation(Gtk.Orientation.VERTICAL);
+
+        this.add(new Gtk.Label({ label: '<b>' + _("Message") + '</b>',
+                                 use_markup: true,
+                                 halign: Gtk.Align.START }));
+
+        let entry = new Gtk.Entry({ hexpand: true,
+                                    margin_bottom: 12 });
+        this.add(entry);
+
+        this._settings = Convenience.getSettings();
+        this._settings.bind('hello-text', entry, 'text', Gio.SettingsBindFlags.DEFAULT);
+
+        // TRANSLATORS: Example is the name of the extension, should not be
+        // translated
+        let primaryText = _("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.");
+
+        this.add(new Gtk.Label({ label: primaryText,
+                                 wrap: true, xalign: 0 }));
+    }
+});
+
+function buildPrefsWidget() {
+    let widget = new ExamplePrefsWidget();
+    widget.show_all();
+
+    return widget;
+}

extensions/example/stylesheet.css

@@ -0,0 +1,8 @@
+/* Example stylesheet */
+.helloworld-label {
+    font-size: 36px;
+    font-weight: bold;
+    color: #ffffff;
+    background-color: rgba(10,10,10,0.7);
+    border-radius: 5px;
+}

extensions/launch-new-instance/extension.js

@@ -1,22 +1,17 @@
-import {AppIcon} from 'resource:///org/gnome/shell/ui/appDisplay.js';
-import {InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';
+const AppDisplay = imports.ui.appDisplay;
 
-export default class Extension {
-    constructor() {
-        this._injectionManager = new InjectionManager();
-    }
+let _activateOriginal = null;
 
-    enable() {
-        this._injectionManager.overrideMethod(AppIcon.prototype, 'activate',
-            originalMethod => {
-                return function () {
-                    // eslint-disable-next-line no-invalid-this
-                    originalMethod.call(this, 2);
-                };
-            });
-    }
-
-    disable() {
-        this._injectionManager.clear();
-    }
+function init() {
+}
+
+function enable() {
+  _activateOriginal = AppDisplay.AppIcon.prototype.activate;
+  AppDisplay.AppIcon.prototype.activate = function() {
+      _activateOriginal.call(this, 2);
+  };
+}
+
+function disable() {
+  AppDisplay.AppIcon.prototype.activate = _activateOriginal;
 }

extensions/launch-new-instance/stylesheet.css

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

extensions/light-style/extension.js

@@ -1,36 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-import St from 'gi://St';
-
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-
-export default class Extension {
-    _updateColorScheme(scheme) {
-        Main.sessionMode.colorScheme = scheme;
-        St.Settings.get().notify('color-scheme');
-    }
-
-    enable() {
-        this._savedColorScheme = Main.sessionMode.colorScheme;
-        this._updateColorScheme('prefer-light');
-    }
-
-    disable() {
-        this._updateColorScheme(this._savedColorScheme);
-    }
-}

extensions/light-style/metadata.json.in

@@ -1,10 +0,0 @@
-{
-"extension-id": "@extension_id@",
-"uuid": "@uuid@",
-"settings-schema": "@gschemaname@",
-"gettext-domain": "@gettext_domain@",
-"name": "Light Style",
-"description": "Switch default to light style",
-"shell-version": [ "@shell_current@" ],
-"url": "@url@"
-}

extensions/meson.build

@@ -1,9 +1,9 @@
 extension_schemas = []
-js_sources = []
+js_sources = extensionlib
 
 metadata_name = 'metadata.json'
 
-foreach e : enabled_extensions
+foreach e : all_extensions
   uuid = e + uuid_suffix
 
   metadata_conf = configuration_data()
@@ -15,15 +15,31 @@ foreach e : enabled_extensions
   metadata_conf.set('url', 'https://gitlab.gnome.org/GNOME/gnome-shell-extensions')
 
   extension_sources = files(e + '/extension.js')
-  extension_data = []
+  extension_data = files(e + '/stylesheet.css')
 
   subdir(e)
 
-  install_data (extension_sources + extension_data,
-    install_dir: join_paths(extensiondir, uuid)
-  )
+  js_sources += extension_sources
+
+  if (enabled_extensions.contains(e))
+    install_data (extension_sources + extension_data + extensionlib,
+      install_dir: join_paths(extensiondir, uuid)
+    )
+  endif
 endforeach
 
 install_data (extension_schemas,
   install_dir: schemadir
 )
+
+foreach js_source : js_sources
+  if (js52.found())
+    path_array = '@0@'.format(js_source).split('/')
+    name = join_paths(path_array[-2], path_array[-1])
+
+    test('Checking syntax of ' + name, js52,
+      args: ['-s', '-c', js_source],
+      workdir: meson.current_source_dir()
+    )
+  endif
+endforeach

extensions/meson.build.template

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

extensions/native-window-placement/extension.js

@@ -1,13 +1,13 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-import Clutter from 'gi://Clutter';
+const Workspace = imports.ui.workspace;
 
-import {Extension, InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';
-
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import {WindowPreview} from 'resource:///org/gnome/shell/ui/windowPreview.js';
-import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js';
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
 
 // testing settings for natural window placement strategy:
+const WINDOW_PLACEMENT_NATURAL_FILLGAPS = true;                     // enlarge windows at the end to fill gaps         // not implemented yet
+const WINDOW_PLACEMENT_NATURAL_GRID_FALLBACK = true;                // fallback to grid mode if all windows have the same size and positions.     // not implemented yet
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
 const WINDOW_PLACEMENT_NATURAL_GAPS = 5;                            // half of the minimum gap between windows
 const WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS = 5000;             // safety limit for preventing endless loop if something is wrong in the algorithm
@@ -17,25 +17,29 @@ class Rect {
         [this.x, this.y, this.width, this.height] = [x, y, width, height];
     }
 
-    // used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
+    /**
+     * used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
+     */
     copy() {
         return new Rect(this.x, this.y, this.width, this.height);
     }
 
     union(rect2) {
         let dest = this.copy();
-        if (rect2.x < dest.x) {
+        if (rect2.x < dest.x)
+          {
             dest.width += dest.x - rect2.x;
             dest.x = rect2.x;
-        }
-        if (rect2.y < dest.y) {
+          }
+        if (rect2.y < dest.y)
+          {
             dest.height += dest.y - rect2.y;
             dest.y = rect2.y;
-        }
+          }
         if (rect2.x + rect2.width > dest.x + dest.width)
-            dest.width = rect2.x + rect2.width - dest.x;
+          dest.width = rect2.x + rect2.width - dest.x;
         if (rect2.y + rect2.height > dest.y + dest.height)
-            dest.height = rect2.y + rect2.height - dest.y;
+          dest.height = rect2.y + rect2.height - dest.y;
 
         return dest;
     }
@@ -50,10 +54,10 @@ class Rect {
     }
 
     overlap(rect2) {
-        return !(this.x + this.width    <= rect2.x ||
-                 rect2.x + rect2.width  <= this.x ||
-                 this.y + this.height   <= rect2.y ||
-                 rect2.y + rect2.height <= this.y);
+        return !((this.x + this.width    <= rect2.x) ||
+                 (rect2.x + rect2.width  <= this.x) ||
+                 (this.y + this.height   <= rect2.y) ||
+                 (rect2.y + rect2.height <= this.y));
     }
 
     center() {
@@ -64,21 +68,19 @@ class Rect {
         this.x += dx;
         this.y += dy;
     }
-}
+};
 
 class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
-    constructor(params, settings) {
-        super(params);
+    constructor(settings) {
+        super();
         this._settings = settings;
     }
 
-    computeLayout(windows, _params) {
-        return {
-            windows,
-        };
+    computeLayout(windows, layout) {
+        layout.windows = windows;
     }
 
-    /*
+    /**
      * Returns clones with matching target coordinates and scales to arrange windows in a natural way that no overlap exists and relative window size is preserved.
      * This function is almost a 1:1 copy of the function
      * PresentWindowsEffect::calculateWindowTransformationsNatural() from KDE, see:
@@ -88,8 +90,8 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
         // As we are using pseudo-random movement (See "slot") we need to make sure the list
         // is always sorted the same way no matter which window is currently active.
 
-        let areaRect = new Rect(area.x, area.y, area.width, area.height);
-        let bounds = areaRect.copy();
+        let area_rect = new Rect(area.x, area.y, area.width, area.height);
+        let bounds = area_rect.copy();
         let clones = layout.windows;
 
         let direction = 0;
@@ -97,43 +99,43 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
         let rects = [];
         for (let i = 0; i < clones.length; i++) {
             // save rectangles into 4-dimensional arrays representing two corners of the rectangular: [left_x, top_y, right_x, bottom_y]
-            let rect = clones[i].boundingBox;
+            let rect = clones[i].metaWindow.get_frame_rect();
             rects[i] = new Rect(rect.x, rect.y, rect.width, rect.height);
             bounds = bounds.union(rects[i]);
 
             // This is used when the window is on the edge of the screen to try to use as much screen real estate as possible.
             directions[i] = direction;
             direction++;
-            if (direction === 4)
+            if (direction == 4) {
                 direction = 0;
+            }
         }
 
-        let loopCounter = 0;
+        let loop_counter = 0;
         let overlap;
         do {
             overlap = false;
             for (let i = 0; i < rects.length; i++) {
                 for (let j = 0; j < rects.length; j++) {
-                    let adjustments = [-1, -1, 1, 1]
-                        .map(v => (v *= WINDOW_PLACEMENT_NATURAL_GAPS));
-                    let iAdjusted = rects[i].adjusted(...adjustments);
-                    let jAdjusted = rects[j].adjusted(...adjustments);
-                    if (i !== j && iAdjusted.overlap(jAdjusted)) {
-                        loopCounter++;
+                    if (i != j && rects[i].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
+                                                    WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS).overlap(
+                                                     rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
+                                                                       WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) {
+                        loop_counter++;
                         overlap = true;
 
                         // TODO: something like a Point2D would be nicer here:
 
                         // Determine pushing direction
-                        let iCenter = rects[i].center();
-                        let jCenter = rects[j].center();
-                        let diff = [jCenter[0] - iCenter[0], jCenter[1] - iCenter[1]];
+                        let i_center = rects[i].center();
+                        let j_center = rects[j].center();
+                        let diff = [j_center[0] - i_center[0], j_center[1] - i_center[1]];
 
                         // Prevent dividing by zero and non-movement
-                        if (diff[0] === 0 && diff[1] === 0)
+                        if (diff[0] == 0 && diff[1] == 0)
                             diff[0] = 1;
                         // Try to keep screen/workspace aspect ratio
-                        if (bounds.height / bounds.width > areaRect.height / areaRect.width)
+                        if ( bounds.height / bounds.width > area_rect.height / area_rect.width )
                             diff[0] *= 2;
                         else
                             diff[1] *= 2;
@@ -162,33 +164,33 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                             let xSection = Math.round((rects[i].x - bounds.x) / (bounds.width / 3));
                             let ySection = Math.round((rects[i].y - bounds.y) / (bounds.height / 3));
 
-                            iCenter = rects[i].center();
+                            let i_center = rects[i].center();
                             diff[0] = 0;
                             diff[1] = 0;
-                            if (xSection !== 1 || ySection !== 1) { // Remove this if you want the center to pull as well
-                                if (xSection === 1)
-                                    xSection = directions[i] / 2 ? 2 : 0;
-                                if (ySection === 1)
-                                    ySection = directions[i] % 2 ? 2 : 0;
+                            if (xSection != 1 || ySection != 1) { // Remove this if you want the center to pull as well
+                                if (xSection == 1)
+                                    xSection = (directions[i] / 2 ? 2 : 0);
+                                if (ySection == 1)
+                                    ySection = (directions[i] % 2 ? 2 : 0);
                             }
-                            if (xSection === 0 && ySection === 0) {
-                                diff[0] = bounds.x - iCenter[0];
-                                diff[1] = bounds.y - iCenter[1];
+                            if (xSection == 0 && ySection == 0) {
+                                diff[0] = bounds.x - i_center[0];
+                                diff[1] = bounds.y - i_center[1];
                             }
-                            if (xSection === 2 && ySection === 0) {
-                                diff[0] = bounds.x + bounds.width - iCenter[0];
-                                diff[1] = bounds.y - iCenter[1];
+                            if (xSection == 2 && ySection == 0) {
+                                diff[0] = bounds.x + bounds.width - i_center[0];
+                                diff[1] = bounds.y - i_center[1];
                             }
-                            if (xSection === 2 && ySection === 2) {
-                                diff[0] = bounds.x + bounds.width - iCenter[0];
-                                diff[1] = bounds.y + bounds.height - iCenter[1];
+                            if (xSection == 2 && ySection == 2) {
+                                diff[0] = bounds.x + bounds.width - i_center[0];
+                                diff[1] = bounds.y + bounds.height - i_center[1];
                             }
-                            if (xSection === 0 && ySection === 2) {
-                                diff[0] = bounds.x - iCenter[0];
-                                diff[1] = bounds.y + bounds.height - iCenter[1];
+                            if (xSection == 0 && ySection == 2) {
+                                diff[0] = bounds.x - i_center[0];
+                                diff[1] = bounds.y + bounds.height - i_center[1];
                             }
-                            if (diff[0] !== 0 || diff[1] !== 0) {
-                                length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
+                            if (diff[0] != 0 || diff[1] != 0) {
+                                let length = Math.sqrt(diff[0]*diff[0] + diff[1]*diff[1]);
                                 diff[0] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;   // /2 to make it less influencing than the normal center-move above
                                 diff[1] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;
                                 rects[i].translate(diff[0], diff[1]);
@@ -201,99 +203,97 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                     }
                 }
             }
-        } while (overlap && loopCounter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);
+        } while (overlap && loop_counter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);
 
         // Work out scaling by getting the most top-left and most bottom-right window coords.
         let scale;
-        scale = Math.min(
-            areaRect.width / bounds.width,
-            areaRect.height / bounds.height,
-            1.0);
+        scale = Math.min(area_rect.width / bounds.width,
+                         area_rect.height / bounds.height,
+                         1.0);
 
         // Make bounding rect fill the screen size for later steps
-        bounds.x -= (areaRect.width - bounds.width * scale) / 2;
-        bounds.y -= (areaRect.height - bounds.height * scale) / 2;
-        bounds.width = areaRect.width / scale;
-        bounds.height = areaRect.height / scale;
+        bounds.x = bounds.x - (area_rect.width - bounds.width * scale) / 2;
+        bounds.y = bounds.y - (area_rect.height - bounds.height * scale) / 2;
+        bounds.width = area_rect.width / scale;
+        bounds.height = area_rect.height / scale;
 
         // Move all windows back onto the screen and set their scale
-        for (let i = 0; i < rects.length; i++)
+        for (let i = 0; i < rects.length; i++) {
             rects[i].translate(-bounds.x, -bounds.y);
+        }
 
+        // TODO: Implement the KDE part "Try to fill the gaps by enlarging windows if they have the space" here. (If this is wanted)
 
         // rescale to workspace
+        let scales = [];
+
+        let buttonOuterHeight, captionHeight;
+        let buttonOuterWidth = 0;
+
         let slots = [];
         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;
+            rects[i].x = rects[i].x * scale + area_rect.x;
+            rects[i].y = rects[i].y * scale + area_rect.y;
 
-            slots.push([rects[i].x, rects[i].y, rects[i].width, rects[i].height, clones[i]]);
+            slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
         }
 
         return slots;
     }
+};
+
+let winInjections, workspaceInjections;
+
+function resetState() {
+    winInjections = { };
+    workspaceInjections = { };
 }
 
-export default class NativeWindowPlacementExtension extends Extension {
-    constructor(metadata) {
-        super(metadata);
+function enable() {
+    resetState();
 
-        this._injectionManager = new InjectionManager();
+    let settings = Convenience.getSettings();
+
+    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
+    Workspace.Workspace.prototype._getBestLayout = function(windows) {
+        let strategy = new NaturalLayoutStrategy(settings);
+        let layout = { strategy };
+        strategy.computeLayout(windows, layout);
+
+        return layout;
     }
 
-    enable() {
-        const settings = this.getSettings();
+    /// position window titles on top of windows in overlay ////
+    winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+    Workspace.WindowOverlay.prototype.relayout = function(animate) {
+        if (settings.get_boolean('window-captions-on-top')) {
+            let [, , , cloneHeight] = this._windowClone.slot;
+            this.title.translation_y = -cloneHeight;
+        }
 
-        const layoutProto = Workspace.WorkspaceLayout.prototype;
-        const previewProto = WindowPreview.prototype;
-
-        this._injectionManager.overrideMethod(layoutProto, '_createBestLayout', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                this._layoutStrategy = new NaturalLayoutStrategy({
-                    monitor: Main.layoutManager.monitors[this._monitorIndex],
-                }, settings);
-                return this._layoutStrategy.computeLayout(this._sortedWindows);
-            };
-            /* eslint-enable no-invalid-this */
-        });
-
-        // position window titles on top of windows in overlay
-        this._injectionManager.overrideMethod(previewProto, '_init', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (...args) {
-                originalMethod.call(this, ...args);
-
-                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;
-            };
-            /* eslint-enable no-invalid-this */
-        });
-
-        this._injectionManager.overrideMethod(previewProto, '_adjustOverlayOffsets', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (...args) {
-                originalMethod.call(this, ...args);
-
-                if (settings.get_boolean('window-captions-on-top'))
-                    this._title.translation_y = -this._title.translation_y;
-            };
-            /* eslint-enable no-invalid-this */
-        });
-    }
-
-    disable() {
-        this._injectionManager.clear();
-        global.stage.queue_relayout();
-    }
+        winInjections['relayout'].call(this, animate);
+    };
+}
+
+function removeInjection(object, injection, name) {
+    if (injection[name] === undefined)
+        delete object[name];
+    else
+        object[name] = injection[name];
+}
+
+function disable() {
+    var i;
+
+    for (i in workspaceInjections)
+        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
+    for (i in winInjections)
+        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
+
+    global.stage.queue_relayout();
+    resetState();
+}
+
+function init() {
+    /* do nothing */
 }

extensions/native-window-placement/stylesheet.css

@@ -0,0 +1,9 @@
+.window-caption {
+    -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

@@ -1,59 +1,58 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-import Clutter from 'gi://Clutter';
-import GObject from 'gi://GObject';
-import St from 'gi://St';
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
-
-import {PlacesManager} from './placeDisplay.js';
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Panel = imports.ui.panel;
 
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
 const N_ = x => x;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+const PlaceDisplay = Me.imports.placeDisplay;
+
 const PLACE_ICON_SIZE = 16;
 
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    static {
-        GObject.registerClass(this);
-    }
-
     constructor(info) {
-        super({
-            style_class: 'place-menu-item',
-        });
+        super();
         this._info = info;
 
-        this._icon = new St.Icon({
-            gicon: info.icon,
-            icon_size: PLACE_ICON_SIZE,
-        });
-        this.add_child(this._icon);
+        this._icon = new St.Icon({ gicon: info.icon,
+                                   icon_size: PLACE_ICON_SIZE });
+        this.actor.add_child(this._icon);
 
-        this._label = new St.Label({
-            text: info.name,
-            x_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
-        this.add_child(this._label);
+        this._label = new St.Label({ text: info.name, x_expand: true });
+        this.actor.add_child(this._label);
 
         if (info.isRemovable()) {
-            this._ejectIcon = new St.Icon({
-                icon_name: 'media-eject-symbolic',
-                style_class: 'popup-menu-icon',
-            });
-            this._ejectButton = new St.Button({
-                child: this._ejectIcon,
-                style_class: 'button',
-            });
+            this._ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
+                                            style_class: 'popup-menu-icon ' });
+            this._ejectButton = new St.Button({ child: this._ejectIcon });
             this._ejectButton.connect('clicked', info.eject.bind(info));
-            this.add_child(this._ejectButton);
+            this.actor.add_child(this._ejectButton);
         }
 
-        info.connectObject('changed',
-            this._propertiesChanged.bind(this), this);
+        this._changedId = info.connect('changed',
+                                       this._propertiesChanged.bind(this));
+    }
+
+    destroy() {
+        if (this._changedId) {
+            this._info.disconnect(this._changedId);
+            this._changedId = 0;
+        }
+
+        super.destroy();
     }
 
     activate(event) {
@@ -66,38 +65,35 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._icon.gicon = info.icon;
         this._label.text = info.name;
     }
-}
+};
 
 const SECTIONS = [
     'special',
     'devices',
     'bookmarks',
-    'network',
-];
+    'network'
+]
 
 class PlacesMenu extends PanelMenu.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
     constructor() {
-        super(0.5, _('Places'));
+        super(0.0, _("Places"));
 
-        let label = new St.Label({
-            text: _('Places'),
-            y_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
-        this.add_actor(label);
+        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);
+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this.actor.add_actor(hbox);
 
-        this.placesManager = new PlacesManager();
+        this.placesManager = new PlaceDisplay.PlacesManager();
 
         this._sections = { };
 
-        for (let i = 0; i < SECTIONS.length; i++) {
+        for (let i=0; i < SECTIONS.length; i++) {
             let id = SECTIONS[i];
             this._sections[id] = new PopupMenu.PopupMenuSection();
-            this.placesManager.connect(`${id}-updated`, () => {
+            this.placesManager.connect(id + '-updated', () => {
                 this._redisplay(id);
             });
 
@@ -107,10 +103,10 @@ class PlacesMenu extends PanelMenu.Button {
         }
     }
 
-    _onDestroy() {
+    destroy() {
         this.placesManager.destroy();
 
-        super._onDestroy();
+        super.destroy();
     }
 
     _redisplay(id) {
@@ -126,20 +122,23 @@ class PlacesMenu extends PanelMenu.Button {
 
         this._sections[id].actor.visible = places.length > 0;
     }
+};
+
+function init() {
+    Convenience.initTranslations();
 }
 
-export default class PlacesMenuExtension extends Extension {
-    enable() {
-        this._indicator = new PlacesMenu();
+let _indicator;
 
-        let pos = Main.sessionMode.panel.left.length;
-        if ('apps-menu' in Main.panel.statusArea)
-            pos++;
-        Main.panel.addToStatusArea('places-menu', this._indicator, pos, 'left');
-    }
+function enable() {
+    _indicator = new PlacesMenu;
 
-    disable() {
-        this._indicator.destroy();
-        delete this._indicator;
-    }
+    let pos = 1;
+    if ('apps-menu' in Main.panel.statusArea)
+        pos = 2;
+    Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
+}
+
+function disable() {
+    _indicator.destroy();
 }

extensions/places-menu/meson.build

@@ -3,6 +3,5 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
-extension_data += files('stylesheet.css')
 
 extension_sources += files('placeDisplay.js')

extensions/places-menu/placeDisplay.js

@@ -1,19 +1,23 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import Shell from 'gi://Shell';
-import {EventEmitter} from 'resource:///org/gnome/shell/misc/signals.js';
 
-import {gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Shell = imports.gi.Shell;
+const Mainloop = imports.mainloop;
+const Signals = imports.signals;
+const St = imports.gi.St;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import * as ShellMountOperation from 'resource:///org/gnome/shell/ui/shellMountOperation.js';
+const DND = imports.ui.dnd;
+const Main = imports.ui.main;
+const Params = imports.misc.params;
+const Search = imports.ui.search;
+const ShellMountOperation = imports.ui.shellMountOperation;
+const Util = imports.misc.util;
 
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+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> \
@@ -23,18 +27,16 @@ const Hostname1Iface = '<node> \
 </node>';
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);
 
-class PlaceInfo extends EventEmitter {
-    constructor(...params) {
-        super();
-
-        this._init(...params);
+class PlaceInfo {
+    constructor() {
+        this._init.apply(this, arguments);
     }
 
     _init(kind, file, name, icon) {
         this.kind = kind;
         this.file = file;
         this.name = name || this._getFileName();
-        this.icon = icon ? new Gio.ThemedIcon({name: icon}) : this.getIcon();
+        this.icon = icon ? new Gio.ThemedIcon({ name: icon }) : this.getIcon();
     }
 
     destroy() {
@@ -44,69 +46,76 @@ class PlaceInfo extends EventEmitter {
         return false;
     }
 
-    async _ensureMountAndLaunch(context, tryMount) {
-        try {
-            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);
-                return;
-            }
-
-            let source = {
-                get_icon: () => this.icon,
-            };
-            let op = new ShellMountOperation.ShellMountOperation(source);
+    _createLaunchCallback(launchContext, tryMount) {
+        return (_ignored, result) => {
             try {
-                await this.file.mount_enclosing_volume(0, op.mountOp, null);
+                Gio.AppInfo.launch_default_for_uri_finish(result);
+            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+                let source = {
+                    get_icon: () => { return this.icon; }
+                };
+                let op = new ShellMountOperation.ShellMountOperation(source);
+                this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
+                    try {
+                        op.close();
+                        file.mount_enclosing_volume_finish(result);
+                    } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED)) {
+                        // e.g. user canceled the password dialog
+                        return;
+                    } catch(e) {
+                        Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
+                        return;
+                    }
 
-                if (tryMount)
-                    this._ensureMountAndLaunch(context, false);
-            } catch (e) {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                    Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message);
-            } finally {
-                op.close();
+                    if (tryMount) {
+                        let callback = this._createLaunchCallback(launchContext, false);
+                        Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
+                                                                 launchContext,
+                                                                 null,
+                                                                 callback);
+                    }
+                });
+            } catch(e) {
+                Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
             }
         }
     }
 
     launch(timestamp) {
         let launchContext = global.create_app_launch_context(timestamp, -1);
-        this._ensureMountAndLaunch(launchContext, true);
+        let callback = this._createLaunchCallback(launchContext, true);
+        Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(),
+                                                 launchContext,
+                                                 null,
+                                                 callback);
     }
 
     getIcon() {
-        this.file.query_info_async('standard::symbolic-icon',
-            Gio.FileQueryInfoFlags.NONE,
-            0,
-            null,
-            (file, result) => {
-                try {
-                    let info = file.query_info_finish(result);
-                    this.icon = info.get_symbolic_icon();
-                    this.emit('changed');
-                } catch (e) {
-                    if (e instanceof Gio.IOErrorEnum)
-                        return;
-                    throw e;
-                }
-            });
+        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
+                                   (file, result) => {
+                                       try {
+                                           let info = file.query_info_finish(result);
+                                           this.icon = info.get_symbolic_icon();
+                                           this.emit('changed');
+                                       } catch(e if e instanceof Gio.IOErrorEnum) {
+                                           return;
+                                       }
+                                   });
 
         // return a generic icon for this kind for now, until we have the
         // icon from the query info above
         switch (this.kind) {
         case 'network':
-            return new Gio.ThemedIcon({name: 'folder-remote-symbolic'});
+            return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
         case 'devices':
-            return new Gio.ThemedIcon({name: 'drive-harddisk-symbolic'});
+            return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
         case 'special':
         case 'bookmarks':
         default:
             if (!this.file.is_native())
-                return new Gio.ThemedIcon({name: 'folder-remote-symbolic'});
+                return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
             else
-                return new Gio.ThemedIcon({name: 'folder-symbolic'});
+                return new Gio.ThemedIcon({ name: 'folder-symbolic' });
         }
     }
 
@@ -114,17 +123,16 @@ class PlaceInfo extends EventEmitter {
         try {
             let info = this.file.query_info('standard::display-name', 0, null);
             return info.get_display_name();
-        } catch (e) {
-            if (e instanceof Gio.IOErrorEnum)
-                return this.file.get_basename();
-            throw e;
+        } catch(e if e instanceof Gio.IOErrorEnum) {
+            return this.file.get_basename();
         }
     }
-}
+};
+Signals.addSignalMethods(PlaceInfo.prototype);
 
 class RootInfo extends PlaceInfo {
     _init() {
-        super._init('devices', Gio.File.new_for_path('/'), _('Computer'));
+        super._init('devices', Gio.File.new_for_path('/'), _("Computer"));
 
         let busName = 'org.freedesktop.hostname1';
         let objPath = '/org/freedesktop/hostname1';
@@ -134,20 +142,20 @@ class RootInfo extends PlaceInfo {
 
             this._proxy = obj;
             this._proxy.connect('g-properties-changed',
-                this._propertiesChanged.bind(this));
+                                this._propertiesChanged.bind(this));
             this._propertiesChanged(obj);
         });
     }
 
     getIcon() {
-        return new Gio.ThemedIcon({name: 'drive-harddisk-symbolic'});
+        return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
     }
 
     _propertiesChanged(proxy) {
         // GDBusProxy will emit a g-properties-changed when hostname1 goes down
         // ignore it
         if (proxy.g_name_owner) {
-            this.name = proxy.PrettyHostname || _('Computer');
+            this.name = proxy.PrettyHostname || _("Computer");
             this.emit('changed');
         }
     }
@@ -159,7 +167,7 @@ class RootInfo extends PlaceInfo {
         }
         super.destroy();
     }
-}
+};
 
 
 class PlaceDeviceInfo extends PlaceInfo {
@@ -173,29 +181,28 @@ class PlaceDeviceInfo extends PlaceInfo {
     }
 
     isRemovable() {
-        return this._mount.can_eject() || this._mount.can_unmount();
+        return this._mount.can_eject();
     }
 
     eject() {
-        let unmountArgs = [
-            Gio.MountUnmountFlags.NONE,
-            new ShellMountOperation.ShellMountOperation(this._mount).mountOp,
-            null, // Gio.Cancellable
-        ];
+        let mountOp = new ShellMountOperation.ShellMountOperation(this._mount);
 
-        if (this._mount.can_eject()) {
-            this._mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
-        } else {
-            this._mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
-        }
+        if (this._mount.can_eject())
+            this._mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
+                                             mountOp.mountOp,
+                                             null, // Gio.Cancellable
+                                             this._ejectFinish.bind(this));
+        else
+            this._mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
+                                               mountOp.mountOp,
+                                               null, // Gio.Cancellable
+                                               this._unmountFinish.bind(this));
     }
 
     _ejectFinish(mount, result) {
         try {
             mount.eject_with_operation_finish(result);
-        } catch (e) {
+        } catch(e) {
             this._reportFailure(e);
         }
     }
@@ -203,16 +210,16 @@ class PlaceDeviceInfo extends PlaceInfo {
     _unmountFinish(mount, result) {
         try {
             mount.unmount_with_operation_finish(result);
-        } catch (e) {
+        } catch(e) {
             this._reportFailure(e);
         }
     }
 
     _reportFailure(exception) {
-        let msg = _('Ejecting drive “%s” failed:').format(this._mount.get_name());
+        let msg = _("Ejecting drive “%s” failed:").format(this._mount.get_name());
         Main.notifyError(msg, exception.message);
     }
-}
+};
 
 class PlaceVolumeInfo extends PlaceInfo {
     _init(kind, volume) {
@@ -238,7 +245,7 @@ class PlaceVolumeInfo extends PlaceInfo {
     getIcon() {
         return this._volume.get_symbolic_icon();
     }
-}
+};
 
 const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_DOCUMENTS,
@@ -248,10 +255,8 @@ const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_VIDEOS,
 ];
 
-export class PlacesManager extends EventEmitter {
+var PlacesManager = class {
     constructor() {
-        super();
-
         this._places = {
             special: [],
             devices: [],
@@ -259,29 +264,20 @@ export class PlacesManager extends EventEmitter {
             network: [],
         };
 
-        this._settings = new Gio.Settings({schema_id: BACKGROUND_SCHEMA});
-        this._settings.connectObject('changed::show-desktop-icons',
-            () => this._updateSpecials(), this);
+        this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
+        this._showDesktopIconsChangedId =
+            this._settings.connect('changed::show-desktop-icons',
+                                   this._updateSpecials.bind(this));
         this._updateSpecials();
 
         /*
         * Show devices, code more or less ported from nautilus-places-sidebar.c
         */
         this._volumeMonitor = Gio.VolumeMonitor.get();
-        this._volumeMonitor.connectObject(
-            'volume-added', () => this._updateMounts(),
-            'volume-removed', () => this._updateMounts(),
-            'volume-changed', () => this._updateMounts(),
-            'mount-added', () => this._updateMounts(),
-            'mount-removed', () => this._updateMounts(),
-            'mount-changed', () => this._updateMounts(),
-            'drive-connected', () => this._updateMounts(),
-            'drive-disconnected', () => this._updateMounts(),
-            'drive-changed', () => this._updateMounts(),
-            this);
+        this._connectVolumeMonitorSignals();
         this._updateMounts();
 
-        this._bookmarksFile = this._findBookmarksFile();
+        this._bookmarksFile = this._findBookmarksFile()
         this._bookmarkTimeoutId = 0;
         this._monitor = null;
 
@@ -291,40 +287,53 @@ export class PlacesManager extends EventEmitter {
                 if (this._bookmarkTimeoutId > 0)
                     return;
                 /* Defensive event compression */
-                this._bookmarkTimeoutId = GLib.timeout_add(
-                    GLib.PRIORITY_DEFAULT, 100, () => {
-                        this._bookmarkTimeoutId = 0;
-                        this._reloadBookmarks();
-                        return false;
-                    });
+                this._bookmarkTimeoutId = Mainloop.timeout_add(100, () => {
+                    this._bookmarkTimeoutId = 0;
+                    this._reloadBookmarks();
+                    return false;
+                });
             });
 
             this._reloadBookmarks();
         }
     }
 
+    _connectVolumeMonitorSignals() {
+        const signals = ['volume-added', 'volume-removed', 'volume-changed',
+                         'mount-added', 'mount-removed', 'mount-changed',
+                         'drive-connected', 'drive-disconnected', 'drive-changed'];
+
+        this._volumeMonitorSignals = [];
+        let func = this._updateMounts.bind(this);
+        for (let i = 0; i < signals.length; i++) {
+            let id = this._volumeMonitor.connect(signals[i], func);
+            this._volumeMonitorSignals.push(id);
+        }
+    }
+
     destroy() {
-        this._settings?.disconnectObject(this);
+        if (this._settings)
+            this._settings.disconnect(this._showDesktopIconsChangedId);
         this._settings = null;
 
-        this._volumeMonitor.disconnectObject(this);
+        for (let i = 0; i < this._volumeMonitorSignals.length; i++)
+            this._volumeMonitor.disconnect(this._volumeMonitorSignals[i]);
 
         if (this._monitor)
             this._monitor.cancel();
         if (this._bookmarkTimeoutId)
-            GLib.source_remove(this._bookmarkTimeoutId);
+            Mainloop.source_remove(this._bookmarkTimeoutId);
     }
 
     _updateSpecials() {
-        this._places.special.forEach(p => p.destroy());
+        this._places.special.forEach(p => { p.destroy(); });
         this._places.special = [];
 
         let homePath = GLib.get_home_dir();
 
-        this._places.special.push(new PlaceInfo(
-            'special',
-            Gio.File.new_for_path(homePath),
-            _('Home')));
+        this._places.special.push(new PlaceInfo('special',
+                                                Gio.File.new_for_path(homePath),
+                                                _("Home")));
 
         let specials = [];
         let dirs = DEFAULT_DIRECTORIES.slice();
@@ -334,16 +343,14 @@ export class PlacesManager extends EventEmitter {
 
         for (let i = 0; i < dirs.length; i++) {
             let specialPath = GLib.get_user_special_dir(dirs[i]);
-            if (!specialPath || specialPath === homePath)
+            if (specialPath == null || specialPath == homePath)
                 continue;
 
             let file = Gio.File.new_for_path(specialPath), info;
             try {
                 info = new PlaceInfo('special', file);
-            } catch (e) {
-                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                    continue;
-                throw e;
+            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+                continue;
             }
 
             specials.push(info);
@@ -359,31 +366,30 @@ export class PlacesManager extends EventEmitter {
         let networkMounts = [];
         let networkVolumes = [];
 
-        this._places.devices.forEach(p => p.destroy());
+        this._places.devices.forEach(p => { p.destroy(); });
         this._places.devices = [];
-        this._places.network.forEach(p => p.destroy());
+        this._places.network.forEach(p => { p.destroy(); });
         this._places.network = [];
 
         /* Add standard places */
         this._places.devices.push(new RootInfo());
-        this._places.network.push(new PlaceInfo(
-            'network',
-            Gio.File.new_for_uri('network:///'),
-            _('Browse Network'),
-            'network-workgroup-symbolic'));
+        this._places.network.push(new PlaceInfo('network',
+                                                Gio.File.new_for_uri('network:///'),
+                                                _("Browse Network"),
+                                                'network-workgroup-symbolic'));
 
         /* first go through all connected drives */
         let drives = this._volumeMonitor.get_connected_drives();
         for (let i = 0; i < drives.length; i++) {
             let volumes = drives[i].get_volumes();
 
-            for (let j = 0; j < volumes.length; j++) {
+            for(let j = 0; j < volumes.length; j++) {
                 let identifier = volumes[j].get_identifier('class');
                 if (identifier && identifier.includes('network')) {
                     networkVolumes.push(volumes[j]);
                 } else {
                     let mount = volumes[j].get_mount();
-                    if (mount)
+                    if(mount != null)
                         this._addMount('devices', mount);
                 }
             }
@@ -391,8 +397,8 @@ export class PlacesManager extends EventEmitter {
 
         /* add all volumes that is not associated with a drive */
         let volumes = this._volumeMonitor.get_volumes();
-        for (let i = 0; i < volumes.length; i++) {
-            if (volumes[i].get_drive())
+        for(let i = 0; i < volumes.length; i++) {
+            if(volumes[i].get_drive() != null)
                 continue;
 
             let identifier = volumes[i].get_identifier('class');
@@ -400,18 +406,18 @@ export class PlacesManager extends EventEmitter {
                 networkVolumes.push(volumes[i]);
             } else {
                 let mount = volumes[i].get_mount();
-                if (mount)
+                if(mount != null)
                     this._addMount('devices', mount);
             }
         }
 
         /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
         let mounts = this._volumeMonitor.get_mounts();
-        for (let i = 0; i < mounts.length; i++) {
-            if (mounts[i].is_shadowed())
+        for(let i = 0; i < mounts.length; i++) {
+            if(mounts[i].is_shadowed())
                 continue;
 
-            if (mounts[i].get_volume())
+            if(mounts[i].get_volume())
                 continue;
 
             let root = mounts[i].get_default_location();
@@ -431,9 +437,9 @@ export class PlacesManager extends EventEmitter {
             this._addVolume('network', networkVolumes[i]);
         }
 
-        for (let i = 0; i < networkMounts.length; i++)
+        for (let i = 0; i < networkMounts.length; i++) {
             this._addMount('network', networkMounts[i]);
-
+        }
 
         this.emit('devices-updated');
         this.emit('network-updated');
@@ -454,6 +460,7 @@ export class PlacesManager extends EventEmitter {
     }
 
     _reloadBookmarks() {
+
         this._bookmarks = [];
 
         let content = Shell.get_file_contents_utf8_sync(this._bookmarksFile.get_path());
@@ -463,7 +470,7 @@ export class PlacesManager extends EventEmitter {
         for (let i = 0; i < lines.length; i++) {
             let line = lines[i];
             let components = line.split(' ');
-            let [bookmark] = components;
+            let bookmark = components[0];
 
             if (!bookmark)
                 continue;
@@ -473,16 +480,16 @@ export class PlacesManager extends EventEmitter {
                 continue;
 
             let duplicate = false;
-            for (let j = 0; j < this._places.special.length; j++) {
-                if (file.equal(this._places.special[j].file)) {
+            for (let i = 0; i < this._places.special.length; i++) {
+                if (file.equal(this._places.special[i].file)) {
                     duplicate = true;
                     break;
                 }
             }
             if (duplicate)
                 continue;
-            for (let j = 0; j < bookmarks.length; j++) {
-                if (file.equal(bookmarks[j].file)) {
+            for (let i = 0; i < bookmarks.length; i++) {
+                if (file.equal(bookmarks[i].file)) {
                     duplicate = true;
                     break;
                 }
@@ -507,10 +514,8 @@ export class PlacesManager extends EventEmitter {
 
         try {
             devItem = new PlaceDeviceInfo(kind, mount);
-        } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                return;
-            throw e;
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+            return;
         }
 
         this._places[kind].push(devItem);
@@ -521,10 +526,8 @@ export class PlacesManager extends EventEmitter {
 
         try {
             volItem = new PlaceVolumeInfo(kind, volume);
-        } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                return;
-            throw e;
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+            return;
         }
 
         this._places[kind].push(volItem);
@@ -533,4 +536,5 @@ export class PlacesManager extends EventEmitter {
     get(kind) {
         return this._places[kind];
     }
-}
+};
+Signals.addSignalMethods(PlacesManager.prototype);

extensions/places-menu/stylesheet.css

@@ -1,8 +1 @@
-.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; }
+/* none used*/

extensions/screenshot-window-sizer/extension.js

@@ -18,151 +18,143 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import Clutter from 'gi://Clutter';
-import Meta from 'gi://Meta';
-import Shell from 'gi://Shell';
-import St from 'gi://St';
+const Gio = imports.gi.Gio;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
-import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
+const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
 
-const MESSAGE_FADE_TIME = 2000;
+const MESSAGE_FADE_TIME = 2;
 
-export default class ScreenshotWindowSizerExtension extends Extension {
-    SIZES = [
-        [624, 351],
-        [800, 450],
-        [1024, 576],
-        [1200, 675],
-        [1600, 900],
-        [360, 654], // Phone portrait maximized
-        [720, 360], // Phone landscape fullscreen
-    ];
+let text, button;
 
-    _flashMessage(message) {
-        if (!this._text) {
-            this._text = new St.Label({style_class: 'screenshot-sizer-message'});
-            Main.uiGroup.add_actor(this._text);
-        }
-
-        this._text.remove_all_transitions();
-        this._text.text = message;
-
-        this._text.opacity = 255;
-
-        const monitor = Main.layoutManager.primaryMonitor;
-        this._text.set_position(
-            monitor.x + Math.floor(monitor.width / 2 - this._text.width / 2),
-            monitor.y + Math.floor(monitor.height / 2 - this._text.height / 2));
-
-        this._text.ease({
-            opacity: 0,
-            duration: MESSAGE_FADE_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => this._hideMessage(),
-        });
-    }
-
-    _hideMessage() {
-        this._text.destroy();
-        delete this._text;
-    }
-
-    /**
-     * @param {Meta.Display} display - the display
-     * @param {Meta.Window=} window - for per-window bindings, the window
-     * @param {Meta.KeyBinding} binding - the key binding
-     */
-    _cycleScreenshotSizes(display, window, binding) {
-        // Probably this isn't useful with 5 sizes, but you can decrease instead
-        // of increase by holding down shift.
-        let modifiers = binding.get_modifiers();
-        let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) !== 0;
-
-        // Unmaximize first
-        if (window.get_maximized() !== 0)
-            window.unmaximize(Meta.MaximizeFlags.BOTH);
-
-        let workArea = window.get_work_area_current_monitor();
-        let outerRect = window.get_frame_rect();
-
-        // Double both axes if on a hidpi display
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        let scaledSizes = this.SIZES.map(size => size.map(wh => wh * scaleFactor))
-            .filter(([w, h]) => w <= workArea.width && h <= workArea.height);
-
-        // Find the nearest 16:9 size for the current window size
-        let nearestIndex;
-        let nearestError;
-
-        for (let i = 0; i < scaledSizes.length; i++) {
-            let [width, height] = scaledSizes[i];
-
-            // get the best initial window size
-            let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
-            if (nearestIndex === undefined || error < nearestError) {
-                nearestIndex = i;
-                nearestError = error;
-            }
-        }
-
-        // get the next size up or down from ideal
-        let newIndex = (nearestIndex + (backwards ? -1 : 1)) % scaledSizes.length;
-        let [newWidth, newHeight] = scaledSizes[newIndex];
-
-        // Push the window onscreen if it would be resized offscreen
-        let newX = outerRect.x;
-        let newY = outerRect.y;
-        if (newX + newWidth > workArea.x + workArea.width)
-            newX = Math.max(workArea.x + workArea.width - newWidth);
-        if (newY + newHeight > workArea.y + workArea.height)
-            newY = Math.max(workArea.y + workArea.height - newHeight);
-
-        const id = window.connect('size-changed', () => {
-            window.disconnect(id);
-            this._notifySizeChange(window);
-        });
-        window.move_resize_frame(true, newX, newY, newWidth, newHeight);
-    }
-
-    /**
-     * @param {Meta.Window} window - the window whose size changed
-     */
-    _notifySizeChange(window) {
-        const {scaleFactor} = St.ThemeContext.get_for_stage(global.stage);
-        let newOuterRect = window.get_frame_rect();
-        let message = '%d×%d'.format(
-            newOuterRect.width / scaleFactor,
-            newOuterRect.height / scaleFactor);
-
-        // The new size might have been constrained by geometry hints (e.g. for
-        // a terminal) - in that case, include the actual ratio to the message
-        // we flash
-        let actualNumerator = 9 * newOuterRect.width / newOuterRect.height;
-        if (Math.abs(actualNumerator - 16) > 0.01)
-            message += ' (%.2f:9)'.format(actualNumerator);
-
-        this._flashMessage(message);
-    }
-
-    enable() {
-        Main.wm.addKeybinding(
-            'cycle-screenshot-sizes',
-            this.getSettings(),
-            Meta.KeyBindingFlags.PER_WINDOW,
-            Shell.ActionMode.NORMAL,
-            this._cycleScreenshotSizes.bind(this));
-        Main.wm.addKeybinding(
-            'cycle-screenshot-sizes-backward',
-            this.getSettings(),
-            Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.IS_REVERSED,
-            Shell.ActionMode.NORMAL,
-            this._cycleScreenshotSizes.bind(this));
-    }
-
-    disable() {
-        Main.wm.removeKeybinding('cycle-screenshot-sizes');
-        Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');
-    }
+function hideMessage() {
+    text.destroy();
+    text = null;
+}
+
+function flashMessage(message) {
+    if (!text) {
+        text = new St.Label({ style_class: 'screenshot-sizer-message' });
+        Main.uiGroup.add_actor(text);
+    }
+
+    Tweener.removeTweens(text);
+    text.text = message;
+
+    text.opacity = 255;
+
+    let monitor = Main.layoutManager.primaryMonitor;
+    text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
+                      monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
+
+    Tweener.addTween(text,
+                     { opacity: 0,
+                       time: MESSAGE_FADE_TIME,
+                       transition: 'easeOutQuad',
+                       onComplete: hideMessage });
+}
+
+let SIZES = [
+    [624, 351],
+    [800, 450],
+    [1024, 576],
+    [1200, 675],
+    [1600, 900]
+];
+
+function cycleScreenshotSizes(display, screen, window, binding) {
+    // Probably this isn't useful with 5 sizes, but you can decrease instead
+    // of increase by holding down shift.
+    let modifiers = binding.get_modifiers();
+    let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) != 0;
+
+    // Unmaximize first
+    if (window.maximized_horizontally || window.maximizedVertically)
+        window.unmaximize(Meta.MaximizeFlags.HORIZONTAL | Meta.MaximizeFlags.VERTICAL);
+
+    let workArea = window.get_work_area_current_monitor();
+    let outerRect = window.get_frame_rect();
+
+    // Double both axes if on a hidpi display
+    let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+    let scaledSizes = SIZES.map(size => size.map(wh => wh * scaleFactor));
+
+    // Find the nearest 16:9 size for the current window size
+    let nearestIndex;
+    let nearestError;
+
+    for (let i = 0; i < scaledSizes.length; i++) {
+        let [width, height] = scaledSizes[i];
+
+        // ignore sizes bigger than the workArea
+        if (width > workArea.width || height > workArea.height)
+            continue;
+
+        // get the best initial window size
+        let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
+        if (nearestIndex == null || error < nearestError) {
+            nearestIndex = i;
+            nearestError = error;
+        }
+    }
+
+    // get the next size up or down from ideal
+    let newIndex = (nearestIndex + (backwards ? -1 : 1)) % scaledSizes.length;
+    let newWidth, newHeight;
+    [newWidth, newHeight] = scaledSizes[newIndex];
+    if (newWidth > workArea.width || newHeight > workArea.height)
+        [newWidth, newHeight] = scaledSizes[0];
+
+    // Push the window onscreen if it would be resized offscreen
+    let newX = outerRect.x;
+    let newY = outerRect.y;
+    if (newX + newWidth > workArea.x + workArea.width)
+        newX = Math.max(workArea.x + workArea.width - newWidth);
+    if (newY + newHeight > workArea.y + workArea.height)
+        newY = Math.max(workArea.y + workArea.height - newHeight);
+
+    window.move_resize_frame(true, newX, newY, newWidth, newHeight);
+
+    let newOuterRect = window.get_frame_rect();
+    let message = '%d×%d'.format(
+            (newOuterRect.width / scaleFactor),
+            (newOuterRect.height / scaleFactor));
+
+    // The new size might have been constrained by geometry hints (e.g. for
+    // a terminal) - in that case, include the actual ratio to the message
+    // we flash
+    let actualNumerator = (newOuterRect.width / newOuterRect.height) * 9;
+    if (Math.abs(actualNumerator - 16) > 0.01)
+        message += ' (%.2f:9)'.format(actualNumerator);
+
+    flashMessage(message);
+}
+
+function init() {
+}
+
+function enable() {
+    Main.wm.addKeybinding('cycle-screenshot-sizes',
+                          Convenience.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
+    Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
+                          Convenience.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW |
+                          Meta.KeyBindingFlags.IS_REVERSED,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
+}
+
+function disable() {
+    Main.wm.removeKeybinding('cycle-screenshot-sizes');
+    Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');
 }

extensions/screenshot-window-sizer/meson.build

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

extensions/user-theme/extension.js

@@ -1,53 +1,68 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// Load shell theme from ~/.local/share/themes/name/gnome-shell
+// Load shell theme from ~/.themes/name/gnome-shell
 
-import Gio from 'gi://Gio';
-
-import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
-
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-
-import {getThemeDirs, getModeThemeDirs} from './util.js';
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Main = imports.ui.main;
 
 const SETTINGS_KEY = 'name';
 
-export default class ThemeManager extends Extension {
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+class ThemeManager {
+    constructor() {
+        this._settings = Convenience.getSettings();
+    }
+
     enable() {
-        this._settings = this.getSettings();
-        this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
+        this._changedId = this._settings.connect('changed::'+SETTINGS_KEY, this._changeTheme.bind(this));
         this._changeTheme();
     }
 
     disable() {
-        this._settings?.run_dispose();
-        this._settings = null;
+        if (this._changedId) {
+            this._settings.disconnect(this._changedId);
+            this._changedId = 0;
+        }
 
         Main.setThemeStylesheet(null);
         Main.loadTheme();
     }
 
     _changeTheme() {
-        let stylesheet = null;
-        let themeName = this._settings.get_string(SETTINGS_KEY);
+        let _stylesheet = null;
+        let _themeName = this._settings.get_string(SETTINGS_KEY);
 
-        if (themeName) {
-            const stylesheetPaths = getThemeDirs()
-                .map(dir => `${dir}/${themeName}/gnome-shell/gnome-shell.css`);
-
-            stylesheetPaths.push(...getModeThemeDirs()
-                .map(dir => `${dir}/${themeName}.css`));
-
-            stylesheet = stylesheetPaths.find(path => {
-                let file = Gio.file_new_for_path(path);
-                return file.query_exists(null);
-            });
+        if (_themeName) {
+            let _userCssStylesheet = GLib.get_home_dir() + '/.themes/' + _themeName + '/gnome-shell/gnome-shell.css';
+            let file = Gio.file_new_for_path(_userCssStylesheet);
+            if (file.query_exists(null))
+                _stylesheet = _userCssStylesheet;
+            else {
+                let sysdirs = GLib.get_system_data_dirs();
+                sysdirs.unshift(GLib.get_user_data_dir());
+                for (let i = 0; i < sysdirs.length; i++) {
+                    _userCssStylesheet = sysdirs[i] + '/themes/' + _themeName + '/gnome-shell/gnome-shell.css';
+                    let file = Gio.file_new_for_path(_userCssStylesheet);
+                    if (file.query_exists(null)) {
+                        _stylesheet = _userCssStylesheet;
+                        break;
+                    }
+                }
+            }
         }
 
-        if (stylesheet)
-            log(`loading user theme: ${stylesheet}`);
+        if (_stylesheet)
+            global.log('loading user theme: ' + _stylesheet);
         else
-            log('loading default theme (Adwaita)');
-        Main.setThemeStylesheet(stylesheet);
+            global.log('loading default theme (Adwaita)');
+        Main.setThemeStylesheet(_stylesheet);
         Main.loadTheme();
     }
+};
+
+function init() {
+    return new ThemeManager();
 }

extensions/user-theme/meson.build

@@ -4,5 +4,4 @@ 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

@@ -1,134 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-
-// we use async/await here to not block the mainloop, not to parallelize
-/* eslint-disable no-await-in-loop */
-
-import Adw from 'gi://Adw';
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
-
-import {ExtensionPreferences} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
-
-import {getThemeDirs, getModeThemeDirs} from './util.js';
-
-Gio._promisify(Gio.File.prototype, 'enumerate_children_async');
-Gio._promisify(Gio.File.prototype, 'query_info_async');
-Gio._promisify(Gio.FileEnumerator.prototype, 'next_files_async');
-
-class UserThemePrefsWidget extends Adw.PreferencesGroup {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(settings) {
-        super({title: 'Themes'});
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this.insert_action_group('theme', this._actionGroup);
-
-        this._settings = settings;
-        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 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 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());
-    }
-}
-
-class ThemeRow extends Adw.ActionRow {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(name) {
-        const check = new Gtk.CheckButton({
-            action_name: 'theme.name',
-            action_target: new GLib.Variant('s', name),
-        });
-
-        super({
-            title: name || 'Default',
-            activatable_widget: check,
-        });
-        this.add_prefix(check);
-    }
-}
-
-export default class UserThemePrefs extends ExtensionPreferences {
-    getPreferencesWidget() {
-        return new UserThemePrefsWidget(this.getSettings());
-    }
-}

extensions/user-theme/stylesheet.css

@@ -0,0 +1 @@
+/* none used */

extensions/user-theme/util.js

@@ -1,22 +0,0 @@
-import GLib from 'gi://GLib';
-
-const fn = (...args) => GLib.build_filenamev(args);
-
-/**
- * @returns {string[]} - an ordered list of theme directories
- */
-export 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
- */
-export function getModeThemeDirs() {
-    return GLib.get_system_data_dirs()
-        .map(dir => fn(dir, 'gnome-shell', 'theme'));
-}

extensions/window-list/classic.css

@@ -0,0 +1,46 @@
+@import url("stylesheet.css");
+
+#panel.bottom-panel {
+    border-top-width: 1px;
+    border-bottom-width: 0px;
+    height: 2.25em ;
+  }
+
+  .bottom-panel .window-button > StWidget {
+    background-gradient-drection: vertical;
+    background-color: #fff;
+    background-gradient-start: #fff;
+    background-gradient-end: #eee;
+    color: #000;
+    -st-natural-width: 18.7em;
+    max-width: 18.75em;
+    color: #2e3436;
+    background-color: #eee;
+    border-radius: 2px;
+    padding: 3px 6px 1px;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+    text-shadow: 0 0 transparent;
+  }
+
+  .bottom-panel .window-button:hover > StWidget {
+    background-color: #f9f9f9;
+  }
+
+  .bottom-panel .window-button:active > StWidget,
+  .bottom-panel .window-button:focus > StWidget {
+    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
+  }
+
+  .bottom-panel .window-button.focused > StWidget {
+    background-color: #ddd;
+    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.5);
+  }
+
+  .bottom-panel .window-button.focused:hover > StWidget {
+    background-color: #e9e9e9;
+  }
+
+  .bottom-panel .window-button.minimized > StWidget {
+    color: #888;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+  }

extensions/window-list/meson.build

@@ -3,10 +3,10 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
-extension_data += files(
-  'stylesheet-dark.css',
-  'stylesheet-light.css'
-)
 
-extension_sources += files('prefs.js', 'windowPicker.js', 'workspaceIndicator.js')
+extension_sources += files('prefs.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
+
+if classic_mode_enabled
+  extension_data += files('classic.css')
+endif

extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml

@@ -15,13 +15,6 @@
         window list. Possible values are “never”, “auto” and “always”.
       </description>
     </key>
-    <key name="display-all-workspaces" type="b">
-      <default>false</default>
-      <summary>Show windows from all workspaces</summary>
-      <description>
-        Whether to show windows from all workspaces or only the current one.
-      </description>
-    </key>
     <key name="show-on-all-monitors" type="b">
       <default>false</default>
       <summary>Show the window list on all monitors</summary>

extensions/window-list/prefs.js

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

extensions/window-list/stylesheet-dark.css

@@ -1,113 +0,0 @@
-.window-list {
-	spacing: 2px;
-	font-size: 10pt;
-}
-
-.bottom-panel {
-	background-color: #000000;
-	border-top-width: 0px;
-	padding: 2px;
-}
-
-.window-button {
-	padding: 2px, 1px;
-}
-
-.window-button:first-child:ltr {
-	padding-left: 2px;
-}
-
-.window-button:last-child:rtl {
-	padding-right: 2px;
-}
-
-.window-button-box {
-	spacing: 4px;
-}
-
-.window-button > StWidget,
-.window-picker-toggle > StWidget {
-	color: #bbb;
-	background-color: #1d1d1d;
-	border-radius: 4px;
-	padding: 3px 6px 1px;
-    transition: 100ms ease;
-}
-
-.window-button > StWidget {
-	-st-natural-width: 18.75em;
-	max-width: 18.75em;
-}
-
-.window-button:hover > StWidget,
-.window-picker-toggle:hover > StWidget {
-	color: #fff;
-	background-color: #303030;
-}
-
-.window-button:active > StWidget,
-.window-button:focus > StWidget {
-	color: #fff;
-	background-color: #3f3f3f;
-}
-
-.window-button.focused > StWidget,
-.window-picker-toggle:checked > StWidget {
-	color: #fff;
-	background-color: #3f3f3f;
-}
-
-.window-button.focused:active > StWidget,
-.window-picker-toggle:checked:active > StWidget {
-	color: #fff;
-	background-color: #3f3f3f;
-}
-
-.window-button.minimized > StWidget {
-	color: #666;
-	background-color: #161616;
-}
-
-.window-button.minimized:active > StWidget {
-	color: #666;
-	background-color: #161616;
-}
-
-.window-button-icon {
-	width: 24px;
-	height: 24px;
-}
-
-.window-list-workspace-indicator .status-label-bin {
-	background-color: rgba(200, 200, 200, 0.3);
-	padding: 0 3px;
-	margin: 3px;
-}
-
-.window-list-workspace-indicator .workspaces-box {
-	spacing: 3px;
-	padding: 3px;
-}
-
-.window-list-workspace-indicator .workspace {
-	width: 52px;
-	border-radius: 4px;
-	background-color: #1e1e1e;
-}
-
-.window-list-workspace-indicator .workspace.active {
-	background-color: #3f3f3f;
-}
-
-.window-list-window-preview {
-	background-color: #bebebe;
-	border-radius: 1px;
-}
-
-.window-list-window-preview.active {
-	background-color: #d4d4d4;
-}
-
-.notification {
-	font-weight: normal;
-}

extensions/window-list/stylesheet-light.css

@@ -1,68 +0,0 @@
-@import url("stylesheet-dark.css");
-
-#panel.bottom-panel {
-    border-top-width: 1px;
-    border-bottom-width: 0px;
-    height: 2.25em ;
-    padding: 2px;
-  }
-
-  .bottom-panel .window-button > StWidget,
-  .bottom-panel .window-picker-toggle > StWidget {
-    color: #2e3436;
-    background-color: #eee;
-    border-radius: 3px;
-    padding: 3px 6px 1px;
-    box-shadow: none;
-    text-shadow: none;
-    border: 1px solid rgba(0,0,0,0.2);
-  }
-
-  .bottom-panel .window-button > StWidget {
-    -st-natural-width: 18.7em;
-    max-width: 18.75em;
-  }
-
-  .bottom-panel .window-button:hover > StWidget,
-  .bottom-panel .window-picker-toggle:hover > StWidget {
-    background-color: #f9f9f9;
-  }
-
-  .bottom-panel .window-button:active > StWidget,
-  .bottom-panel .window-button:focus > StWidget {
-    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
-  }
-
-  .bottom-panel .window-button.focused > StWidget,
-  .bottom-panel .window-picker-toggle:checked > StWidget {
-    background-color: #ccc;
-    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
-  }
-
-  .bottom-panel .window-button.focused:hover > StWidget {
-    background-color: #e9e9e9;
-  }
-
-  .bottom-panel .window-button.minimized > StWidget {
-    color: #888;
-    box-shadow: none;
-  }
-
-/* workspace switcher */
-.window-list-workspace-indicator .workspace {
-  border: 2px solid #f6f5f4;
-  background-color: #ccc;
-}
-
-.window-list-workspace-indicator .workspace.active {
-  border-color: #888;
-}
-
-.window-list-window-preview {
-  background-color: #ededed;
-  border: 1px solid #ccc;
-}
-
-.window-list-window-preview.active {
-  background-color: #f6f5f4;
-}

extensions/window-list/stylesheet.css

@@ -0,0 +1,84 @@
+.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;
+}
+
+.window-button {
+  padding: 1px;
+}
+
+.window-button:first-child:ltr {
+  padding-left: 2px;
+}
+
+.window-button:last-child:rtl {
+  padding-right: 2px;
+}
+
+.window-button-box {
+  spacing: 4px;
+}
+
+.window-button > StWidget {
+  -st-natural-width: 18.75em;
+  max-width: 18.75em;
+  color: #bbb;
+  background-color: black;
+  border-radius: 4px;
+  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);
+}
+
+.window-button:hover > StWidget {
+  color: white;
+  background-color: #1f1f1f;
+}
+
+.window-button:active > StWidget,
+.window-button:focus > StWidget {
+  box-shadow: inset 2px 2px 4px rgba(255,255,255,0.5);
+}
+
+.window-button.focused > StWidget {
+  color: white;
+  box-shadow: inset 1px 1px 4px rgba(255,255,255,0.7);
+}
+
+.window-button.focused:active > StWidget {
+  box-shadow: inset 2px 2px 4px rgba(255,255,255,0.7);
+}
+
+.window-button.minimized > StWidget {
+  color: #666;
+  box-shadow: inset -1px -1px 4px rgba(255,255,255,0.5);
+}
+
+.window-button.minimized:active > StWidget {
+  box-shadow: inset -2px -2px 4px rgba(255,255,255,0.5);
+}
+
+.window-button-icon {
+  width: 24px;
+  height: 24px;
+}
+
+.window-list-workspace-indicator {
+  padding: 3px;
+}
+
+.window-list-workspace-indicator > StWidget {
+  background-color: rgba(200, 200, 200, .3);
+  border: 1px solid #cccccc;
+}
+
+.notification {
+  font-weight: normal;
+}

extensions/window-list/windowPicker.js

@@ -1,337 +0,0 @@
-import Clutter from 'gi://Clutter';
-import GObject from 'gi://GObject';
-import Shell from 'gi://Shell';
-import St from 'gi://St';
-
-import {Extension, InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';
-import * as Layout from 'resource:///org/gnome/shell/ui/layout.js';
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import {WorkspacesDisplay} from 'resource:///org/gnome/shell/ui/workspacesView.js';
-import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js';
-
-import {VIGNETTE_BRIGHTNESS} from 'resource:///org/gnome/shell/ui/lightbox.js';
-import {
-    SIDE_CONTROLS_ANIMATION_TIME,
-    OverviewAdjustment,
-    ControlsState
-} from 'resource:///org/gnome/shell/ui/overviewControls.js';
-
-class MyWorkspacesDisplay extends WorkspacesDisplay {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(controls, overviewAdjustment) {
-        let workspaceManager = global.workspace_manager;
-
-        const workspaceAdjustment = new St.Adjustment({
-            value: workspaceManager.get_active_workspace_index(),
-            lower: 0,
-            page_increment: 1,
-            page_size: 1,
-            step_increment: 0,
-            upper: workspaceManager.n_workspaces,
-        });
-
-        super(controls, workspaceAdjustment, overviewAdjustment);
-
-        this._windowPicker = controls;
-
-        this._workspaceAdjustment = workspaceAdjustment;
-        this._workspaceAdjustment.actor = this;
-
-        workspaceManager.connectObject('notify::n-workspaces',
-            () => this._updateAdjustment(), this);
-
-        this.add_constraint(
-            new Layout.MonitorConstraint({
-                primary: true,
-                work_area: true,
-            }));
-    }
-
-    prepareToEnterOverview(...args) {
-        if (!this._scrollEventId) {
-            this._scrollEventId = this._windowPicker.connect('scroll-event',
-                this._onScrollEvent.bind(this));
-        }
-
-        super.prepareToEnterOverview(...args);
-    }
-
-    vfunc_hide(...args) {
-        if (this._scrollEventId > 0)
-            this._windowPicker.disconnect(this._scrollEventId);
-        this._scrollEventId = 0;
-
-        super.vfunc_hide(...args);
-    }
-
-    _updateAdjustment() {
-        let workspaceManager = global.workspace_manager;
-        this._workspaceAdjustment.set({
-            upper: workspaceManager.n_workspaces,
-            value: workspaceManager.get_active_workspace_index(),
-        });
-    }
-}
-
-export class WindowPicker extends Clutter.Actor {
-    static [GObject.signals] = {
-        'open-state-changed': {param_types: [GObject.TYPE_BOOLEAN]},
-    };
-
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor() {
-        super({reactive: true});
-
-        this._visible = false;
-        this._modal = false;
-
-        this._stageKeyPressId = 0;
-
-        this._adjustment = new OverviewAdjustment(this);
-
-        this._injectionManager = new InjectionManager();
-        this.connect('destroy', this._onDestroy.bind(this));
-
-        global.bind_property('screen-width',
-            this, 'width',
-            GObject.BindingFlags.SYNC_CREATE);
-        global.bind_property('screen-height',
-            this, 'height',
-            GObject.BindingFlags.SYNC_CREATE);
-
-        this._workspacesDisplay = new MyWorkspacesDisplay(this, this._adjustment);
-        this.add_child(this._workspacesDisplay);
-
-        Main.uiGroup.insert_child_below(this, global.window_group);
-
-        if (!Main.sessionMode.hasOverview) {
-            this._injectBackgroundShade();
-
-            global.display.connectObject('overlay-key', () => {
-                if (!this._visible)
-                    this.open();
-                else
-                    this.close();
-            }, this);
-        }
-    }
-
-    _injectBackgroundShade() {
-        const backgroundProto = Workspace.WorkspaceBackground.prototype;
-        this._injectionManager.overrideMethod(backgroundProto, '_updateBorderRadius',
-            () => {
-                return function () {};
-            });
-        this._injectionManager.overrideMethod(backgroundProto, 'vfunc_allocate',
-            () => {
-                /* eslint-disable no-invalid-this */
-                return function (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);
-                };
-                /* eslint-enable */
-            });
-        this._injectionManager.overrideMethod(backgroundProto, 'vfunc_parent_set',
-            () => {
-                /* eslint-disable no-invalid-this */
-                return function () {
-                    setTimeout(() => {
-                        const parent = this.get_parent();
-                        if (!parent)
-                            return;
-
-                        parent._overviewAdjustment.connectObject('notify::value', () => {
-                            const {value: progress} = parent._overviewAdjustment;
-                            const brightness = 1 - (1 - VIGNETTE_BRIGHTNESS) * progress;
-                            for (const bg of this._backgroundGroup ?? []) {
-                                bg.content.set({
-                                    vignette: true,
-                                    brightness,
-                                });
-                            }
-                        }, this);
-                    });
-                };
-                /* eslint-enable */
-            });
-    }
-
-    get visible() {
-        return this._visible;
-    }
-
-    open() {
-        if (this._visible)
-            return;
-
-        this._visible = true;
-
-        if (!this._syncGrab())
-            return;
-
-        this._fakeOverviewVisible(true);
-        this._workspacesDisplay.prepareToEnterOverview();
-        Main.overview._animationInProgress = true;
-
-        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) => {
-                let sym = event.get_key_symbol();
-                if (sym === Clutter.KEY_Escape) {
-                    this.close();
-                    return Clutter.EVENT_STOP;
-                }
-                return Clutter.EVENT_PROPAGATE;
-            });
-
-        this.emit('open-state-changed', this._visible);
-    }
-
-    close() {
-        if (!this._visible)
-            return;
-
-        this._visible = false;
-
-        if (!this._syncGrab())
-            return;
-
-        this._workspacesDisplay.prepareToLeaveOverview();
-
-        Main.overview._animationInProgress = true;
-        this._adjustment.ease(ControlsState.HIDDEN, {
-            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);
-        this._stageKeyPressId = 0;
-
-        this.emit('open-state-changed', this._visible);
-    }
-
-    getWorkspacesBoxForState() {
-        return this.allocation;
-    }
-
-    _fakeOverviewVisible(visible) {
-        // Fake overview state for WorkspacesDisplay
-        Main.overview._visible = visible;
-
-        // Hide real windows
-        Main.layoutManager._inOverview = visible;
-        Main.layoutManager._updateVisibility();
-    }
-
-    _syncGrab() {
-        if (this._visible) {
-            if (this._modal)
-                return true;
-
-            const grab = Main.pushModal(global.stage, {
-                actionMode: Shell.ActionMode.OVERVIEW,
-            });
-            if (grab.get_seat_state() !== Clutter.GrabState.NONE) {
-                this._grab = grab;
-                this._modal = true;
-            } else {
-                Main.popModal(grab);
-                this.hide();
-                return false;
-            }
-        } else if (this._modal) {
-            Main.popModal(this._grab);
-            this._modal = false;
-            this._grab = null;
-        }
-        return true;
-    }
-
-    _onDestroy() {
-        this._injectionManager.clear();
-
-        if (this._stageKeyPressId)
-            global.stage.disconnect(this._stageKeyPressId);
-        this._stageKeyPressId = 0;
-    }
-}
-
-export class WindowPickerToggle extends St.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor() {
-        let iconBin = new St.Widget({
-            layout_manager: new Clutter.BinLayout(),
-        });
-        iconBin.add_child(new St.Icon({
-            icon_name: 'focus-windows-symbolic',
-            icon_size: 16,
-            x_expand: true,
-            y_expand: true,
-            x_align: Clutter.ActorAlign.CENTER,
-            y_align: Clutter.ActorAlign.CENTER,
-        }));
-        super({
-            style_class: 'window-picker-toggle',
-            child: iconBin,
-            visible: !Main.sessionMode.hasOverview,
-            toggle_mode: true,
-        });
-
-        const {windowPicker} = Extension.lookupByURL(import.meta.url);
-        this.connect('notify::checked', () => {
-            if (this.checked)
-                windowPicker.open();
-            else
-                windowPicker.close();
-        });
-
-        windowPicker.connect('open-state-changed', () => {
-            this.checked = windowPicker.visible;
-        });
-    }
-}

extensions/window-list/workspaceIndicator.js

@@ -1,420 +0,0 @@
-import Clutter from 'gi://Clutter';
-import Gio from 'gi://Gio';
-import GObject from 'gi://GObject';
-import Meta from 'gi://Meta';
-import St from 'gi://St';
-
-import {gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
-
-import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
-
-const TOOLTIP_OFFSET = 6;
-const TOOLTIP_ANIMATION_TIME = 150;
-
-const MAX_THUMBNAILS = 6;
-
-class WindowPreview extends St.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(window) {
-        super({
-            style_class: 'window-list-window-preview',
-        });
-
-        this._delegate = this;
-        DND.makeDraggable(this, {restoreOnSuccess: true});
-
-        this._window = window;
-
-        this._window.connectObject(
-            'size-changed', () => this.queue_relayout(),
-            'position-changed', () => {
-                this._updateVisible();
-                this.queue_relayout();
-            },
-            'notify::minimized', this._updateVisible.bind(this),
-            this);
-
-        global.display.connectObject('notify::focus-window',
-            this._onFocusChanged.bind(this), this);
-        this._onFocusChanged();
-    }
-
-    // needed for DND
-    get metaWindow() {
-        return this._window;
-    }
-
-    _onFocusChanged() {
-        if (global.display.focus_window === this._window)
-            this.add_style_class_name('active');
-        else
-            this.remove_style_class_name('active');
-    }
-
-    _updateVisible() {
-        const monitor = Main.layoutManager.findIndexForActor(this);
-        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();
-    }
-}
-
-class WorkspaceLayout extends Clutter.LayoutManager {
-    static {
-        GObject.registerClass(this);
-    }
-
-    vfunc_get_preferred_width() {
-        return [0, 0];
-    }
-
-    vfunc_get_preferred_height() {
-        return [0, 0];
-    }
-
-    vfunc_allocate(container, box) {
-        const monitor = Main.layoutManager.findIndexForActor(container);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        const hscale = box.get_width() / workArea.width;
-        const vscale = box.get_height() / workArea.height;
-
-        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);
-        }
-    }
-}
-
-class WorkspaceThumbnail extends St.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(index) {
-        super({
-            style_class: 'workspace',
-            child: new Clutter.Actor({
-                layout_manager: new WorkspaceLayout(),
-                clip_to_allocation: 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
-
-        this._windowPreviews = new Map();
-
-        let workspaceManager = global.workspace_manager;
-        this._workspace = workspaceManager.get_workspace_by_index(index);
-
-        this._workspace.connectObject(
-            'window-added', (ws, window) => this._addWindow(window),
-            'window-removed', (ws, window) => this._removeWindow(window),
-            this);
-
-        global.display.connectObject('restacked',
-            this._onRestacked.bind(this), this);
-
-        this._workspace.list_windows().forEach(w => this._addWindow(w));
-        this._onRestacked();
-    }
-
-    acceptDrop(source) {
-        if (!source.metaWindow)
-            return false;
-
-        this._moveWindow(source.metaWindow);
-        return true;
-    }
-
-    handleDragOver(source) {
-        if (source.metaWindow)
-            return DND.DragMotionResult.MOVE_DROP;
-        else
-            return DND.DragMotionResult.CONTINUE;
-    }
-
-    _addWindow(window) {
-        if (this._windowPreviews.has(window))
-            return;
-
-        let preview = new WindowPreview(window);
-        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
-        this._windowPreviews.set(window, preview);
-        this.child.add_child(preview);
-    }
-
-    _removeWindow(window) {
-        let preview = this._windowPreviews.get(window);
-        if (!preview)
-            return;
-
-        this._windowPreviews.delete(window);
-        preview.destroy();
-    }
-
-    _onRestacked() {
-        let lastPreview = null;
-        let windows = global.get_window_actors().map(a => a.meta_window);
-        for (let i = 0; i < windows.length; i++) {
-            let preview = this._windowPreviews.get(windows[i]);
-            if (!preview)
-                continue;
-
-            this.child.set_child_above_sibling(preview, lastPreview);
-            lastPreview = preview;
-        }
-    }
-
-    _moveWindow(window) {
-        let monitorIndex = Main.layoutManager.findIndexForActor(this);
-        if (monitorIndex !== window.get_monitor())
-            window.move_to_monitor(monitorIndex);
-        window.change_workspace_by_index(this._index, false);
-    }
-
-    on_clicked() {
-        let ws = global.workspace_manager.get_workspace_by_index(this._index);
-        if (ws)
-            ws.activate(global.get_current_time());
-    }
-
-    _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();
-    }
-}
-
-export class WorkspaceIndicator extends PanelMenu.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor() {
-        super(0.5, _('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({
-            layout_manager: new Clutter.BinLayout(),
-            x_expand: true,
-            y_expand: true,
-        });
-        this.add_actor(container);
-
-        let workspaceManager = global.workspace_manager;
-
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-        this._statusLabel = new St.Label({text: this._getStatusText()});
-
-        this._statusBin = new St.Bin({
-            style_class: 'status-label-bin',
-            x_expand: true,
-            y_expand: true,
-            child: this._statusLabel,
-        });
-        container.add_actor(this._statusBin);
-
-        this._thumbnailsBox = new St.BoxLayout({
-            style_class: 'workspaces-box',
-            y_expand: true,
-            reactive: true,
-        });
-        this._thumbnailsBox.connect('scroll-event',
-            this._onScrollEvent.bind(this));
-        container.add_actor(this._thumbnailsBox);
-
-        this._workspacesItems = [];
-
-        workspaceManager.connectObject(
-            'notify::n-workspaces', this._nWorkspacesChanged.bind(this), GObject.ConnectFlags.AFTER,
-            'workspace-switched', this._onWorkspaceSwitched.bind(this), GObject.ConnectFlags.AFTER,
-            'notify::layout-rows', this._updateThumbnailVisibility.bind(this),
-            this);
-
-        this.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._updateMenu();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-
-        this._settings = new Gio.Settings({schema_id: 'org.gnome.desktop.wm.preferences'});
-        this._settings.connectObject('changed::workspace-names',
-            () => this._updateMenuLabels(), this);
-    }
-
-    _updateThumbnailVisibility() {
-        const {workspaceManager} = global;
-        const vertical = workspaceManager.layout_rows === -1;
-        const useMenu =
-            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
-        this.reactive = useMenu;
-
-        this._statusBin.visible = useMenu;
-        this._thumbnailsBox.visible = !useMenu;
-    }
-
-    _onWorkspaceSwitched() {
-        let workspaceManager = global.workspace_manager;
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-
-        this._updateMenuOrnament();
-        this._updateActiveThumbnail();
-
-        this._statusLabel.set_text(this._getStatusText());
-    }
-
-    _nWorkspacesChanged() {
-        this._updateMenu();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-    }
-
-    _updateMenuOrnament() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            this._workspacesItems[i].setOrnament(i === this._currentWorkspace
-                ? PopupMenu.Ornament.DOT
-                : PopupMenu.Ornament.NONE);
-        }
-    }
-
-    _updateActiveThumbnail() {
-        let thumbs = this._thumbnailsBox.get_children();
-        for (let i = 0; i < thumbs.length; i++) {
-            if (i === this._currentWorkspace)
-                thumbs[i].add_style_class_name('active');
-            else
-                thumbs[i].remove_style_class_name('active');
-        }
-    }
-
-    _getStatusText() {
-        let workspaceManager = global.workspace_manager;
-        let current = workspaceManager.get_active_workspace_index();
-        let total = workspaceManager.n_workspaces;
-
-        return '%d / %d'.format(current + 1, total);
-    }
-
-    _updateMenuLabels() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            let item = this._workspacesItems[i];
-            let name = Meta.prefs_get_workspace_name(i);
-            item.label.text = name;
-        }
-    }
-
-    _updateMenu() {
-        let workspaceManager = global.workspace_manager;
-
-        this.menu.removeAll();
-        this._workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let name = Meta.prefs_get_workspace_name(i);
-            let item = new PopupMenu.PopupMenuItem(name);
-            item.workspaceId = i;
-
-            item.connect('activate', () => {
-                this._activate(item.workspaceId);
-            });
-
-            if (i === this._currentWorkspace)
-                item.setOrnament(PopupMenu.Ornament.DOT);
-
-            this.menu.addMenuItem(item);
-            this._workspacesItems[i] = item;
-        }
-
-        this._statusLabel.set_text(this._getStatusText());
-    }
-
-    _updateThumbnails() {
-        let workspaceManager = global.workspace_manager;
-
-        this._thumbnailsBox.destroy_all_children();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let thumb = new WorkspaceThumbnail(i);
-            this._thumbnailsBox.add_actor(thumb);
-        }
-        this._updateActiveThumbnail();
-    }
-
-    _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if (index >= 0 && index < workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
-            metaWorkspace.activate(global.get_current_time());
-        }
-    }
-
-    _onScrollEvent(actor, event) {
-        let direction = event.get_scroll_direction();
-        let diff = 0;
-        if (direction === Clutter.ScrollDirection.DOWN)
-            diff = 1;
-        else if (direction === Clutter.ScrollDirection.UP)
-            diff = -1;
-        else
-            return;
-
-        let newIndex = this._currentWorkspace + diff;
-        this._activate(newIndex);
-    }
-}

extensions/windowsNavigator/extension.js

@@ -1,290 +1,289 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-import Clutter from 'gi://Clutter';
-import Graphene from 'gi://Graphene';
-import St from 'gi://St';
+const Clutter = imports.gi.Clutter;
+const Mainloop = imports.mainloop;
+const St = imports.gi.St;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import * as OverviewControls from 'resource:///org/gnome/shell/ui/overviewControls.js';
-import {InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';
-import {WindowPreview} from 'resource:///org/gnome/shell/ui/windowPreview.js';
-import {Workspace} from 'resource:///org/gnome/shell/ui/workspace.js';
-import {WorkspacesView} from 'resource:///org/gnome/shell/ui/workspacesView.js';
+const Main = imports.ui.main;
+const Workspace = imports.ui.workspace;
+const WorkspacesView = imports.ui.workspacesView;
 
-const WINDOW_SLOT = 4;
-
-export default class Extension {
-    constructor() {
-        this._injectionManager = new InjectionManager();
-    }
-
-    enable() {
-        const previewProto = WindowPreview.prototype;
-
-        this._injectionManager.overrideMethod(previewProto, '_init', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (...args) {
-                originalMethod.call(this, ...args);
-
-                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);
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(previewProto, 'showTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function (text) {
-                this._text.set({text});
-                this._text.show();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(previewProto, 'hideTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                this._text?.hide();
-            };
-            /* eslint-enable */
-        });
-
-        const workspaceProto = Workspace.prototype;
-        this._injectionManager.overrideMethod(workspaceProto, '_init', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (...args) {
-                originalMethod.call(this, ...args);
-
-                if (this.metaWorkspace && this.metaWorkspace.index() < 9) {
-                    this._tip = new St.Label({
-                        style_class: 'extension-windowsNavigator-window-tooltip',
-                        visible: false,
-                    });
-                    this.add_actor(this._tip);
-
-                    this.connect('notify::scale-x', () => {
-                        this._tip.set_scale(1 / this.scale_x, 1 / this.scale_x);
-                    });
-                } else {
-                    this._tip = null;
-                }
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'vfunc_allocate', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (box) {
-                originalMethod.call(this, box);
-
-                this._tip?.allocate_preferred_size(0, 0);
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'showTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                if (!this._tip)
-                    return;
-                this._tip.text = (this.metaWorkspace.index() + 1).toString();
-                this._tip.show();
-                this.set_child_below_sibling(this._tip, null);
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'hideTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                this._tip?.hide();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'getWindowWithTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function (id) {
-                const {layoutManager} = this._container;
-                const slot = layoutManager._windowSlots[id - 1];
-                return slot ? slot[WINDOW_SLOT].metaWindow : null;
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'showWindowsTooltips', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                const {layoutManager} = this._container;
-                for (let i = 0; i < layoutManager._windowSlots.length; i++) {
-                    if (layoutManager._windowSlots[i])
-                        layoutManager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
-                }
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'hideWindowsTooltips', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                const {layoutManager} = this._container;
-                for (let i in layoutManager._windowSlots) {
-                    if (layoutManager._windowSlots[i])
-                        layoutManager._windowSlots[i][WINDOW_SLOT].hideTooltip();
-                }
-            };
-            /* eslint-enable */
-        });
-
-        const viewProto = WorkspacesView.prototype;
-        this._injectionManager.overrideMethod(viewProto, '_init', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (...args) {
-                originalMethod.call(this, ...args);
-
-                this._pickWorkspace = false;
-                this._pickWindow = false;
-                global.stage.connectObject(
-                    'key-press-event', this._onKeyPress.bind(this),
-                    'key-release-event', this._onKeyRelease.bind(this),
-                    this);
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(viewProto, '_hideTooltips', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                if (global.stage.get_key_focus() === global.stage)
-                    global.stage.set_key_focus(this._prevFocusActor);
-                this._pickWindow = false;
-                for (let i = 0; i < this._workspaces.length; i++)
-                    this._workspaces[i].hideWindowsTooltips();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(viewProto, '_hideWorkspacesTooltips', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                global.stage.set_key_focus(this._prevFocusActor);
-                this._pickWorkspace = false;
-                for (let i = 0; i < this._workspaces.length; i++)
-                    this._workspaces[i].hideTooltip();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(viewProto, '_onKeyRelease', () => {
-            /* eslint-disable no-invalid-this */
-            return function (actor, event) {
-                if (this._pickWindow &&
-                    (event.get_key_symbol() === Clutter.KEY_Alt_L ||
-                     event.get_key_symbol() === Clutter.KEY_Alt_R))
-                    this._hideTooltips();
-                if (this._pickWorkspace &&
-                    (event.get_key_symbol() === Clutter.KEY_Control_L ||
-                     event.get_key_symbol() === Clutter.KEY_Control_R))
-                    this._hideWorkspacesTooltips();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(viewProto, '_onKeyPress', () => {
-            /* eslint-disable no-invalid-this */
-            return function (actor, event) {
-                const {ControlsState} = OverviewControls;
-                if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
-                    return false;
-
-                let workspaceManager = global.workspace_manager;
-
-                if ((event.get_key_symbol() === Clutter.KEY_Alt_L ||
-                     event.get_key_symbol() === Clutter.KEY_Alt_R) &&
-                    !this._pickWorkspace) {
-                    this._prevFocusActor = global.stage.get_key_focus();
-                    global.stage.set_key_focus(null);
-                    this._active = workspaceManager.get_active_workspace_index();
-                    this._pickWindow = true;
-                    this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
-                    return true;
-                }
-                if ((event.get_key_symbol() === Clutter.KEY_Control_L ||
-                     event.get_key_symbol() === Clutter.KEY_Control_R) &&
-                    !this._pickWindow) {
-                    this._prevFocusActor = global.stage.get_key_focus();
-                    global.stage.set_key_focus(null);
-                    this._pickWorkspace = true;
-                    for (let i = 0; i < this._workspaces.length; i++)
-                        this._workspaces[i].showTooltip();
-                    return true;
-                }
-
-                if (global.stage.get_key_focus() !== global.stage)
-                    return false;
-
-                // ignore shift presses, they're required to get numerals in azerty keyboards
-                if ((this._pickWindow || this._pickWorkspace) &&
-                    (event.get_key_symbol() === Clutter.KEY_Shift_L ||
-                     event.get_key_symbol() === Clutter.KEY_Shift_R))
-                    return true;
-
-                if (this._pickWindow) {
-                    if (this._active !== workspaceManager.get_active_workspace_index()) {
-                        this._hideTooltips();
-                        return false;
-                    }
-
-                    let c = event.get_key_symbol() - Clutter.KEY_KP_0;
-                    if (c > 9 || c <= 0) {
-                        c = event.get_key_symbol() - Clutter.KEY_0;
-                        if (c > 9 || c <= 0) {
-                            this._hideTooltips();
-                            log(c);
-                            return false;
-                        }
-                    }
-
-                    let win = this._workspaces[this._active].getWindowWithTooltip(c);
-                    this._hideTooltips();
-
-                    if (win)
-                        Main.activateWindow(win, global.get_current_time());
-
-                    return true;
-                }
-                if (this._pickWorkspace) {
-                    let c = event.get_key_symbol() - Clutter.KEY_KP_0;
-                    if (c > 9 || c <= 0) {
-                        c = event.get_key_symbol() - Clutter.KEY_0;
-                        if (c > 9 || c <= 0) {
-                            this._hideWorkspacesTooltips();
-                            return false;
-                        }
-                    }
-
-                    let workspace = this._workspaces[c - 1];
-                    if (workspace !== undefined)
-                        workspace.metaWorkspace.activate(global.get_current_time());
-
-                    this._hideWorkspacesTooltips();
-                    return true;
-                }
-                return false;
-            };
-            /* eslint-enable */
-        });
-    }
-
-    disable() {
-        this._injectionManager.clear();
+function injectToFunction(parent, name, func) {
+    let origin = parent[name];
+    parent[name] = function() {
+        let ret;
+        ret = origin.apply(this, arguments);
+        if (ret === undefined)
+            ret = func.apply(this, arguments);
+        return ret;
     }
+    return origin;
+}
+
+let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;
+
+function resetState() {
+    winInjections = { };
+    workspaceInjections = { };
+    workViewInjections = { };
+    createdActors = [ ];
+    connectedSignals = [ ];
+}
+
+function enable() {
+    resetState();
+
+    Workspace.WindowOverlay.prototype.showTooltip = function() {
+        this._text.raise_top();
+        this._text.show();
+        this._text.text = (this._windowClone.slotId + 1).toString();
+    }
+    winInjections['showTooltip'] = undefined;
+
+    Workspace.WindowOverlay.prototype.hideTooltip = function() {
+        if (this._text && this._text.visible)
+            this._text.hide();
+    }
+    winInjections['hideTooltip'] = undefined;
+
+    Workspace.Workspace.prototype.showTooltip = function() {
+        if (this._tip == null || this._actualGeometry == null)
+            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.actor.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._tip.raise_top();
+    }
+    workspaceInjections['showTooltip'] = undefined;
+
+    Workspace.Workspace.prototype.hideTooltip = function() {
+        if (this._tip == null)
+            return;
+        if (!this._tip.get_parent())
+            return;
+        this._tip.hide();
+    }
+    workspaceInjections['hideTooltip'] = undefined;
+
+    Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
+        for (let i = 0; i < this._windows.length; i++) {
+            if ((this._windows[i].slotId + 1) == id)
+                return this._windows[i].metaWindow;
+        }
+        return null;
+    }
+    workspaceInjections['getWindowWithTooltip'] = undefined;
+
+    Workspace.Workspace.prototype.showWindowsTooltips = function() {
+        for (let i in this._windowOverlays) {
+            if (this._windowOverlays[i] != null)
+                this._windowOverlays[i].showTooltip();
+        }
+    }
+    workspaceInjections['showWindowsTooltips'] = undefined;
+
+    Workspace.Workspace.prototype.hideWindowsTooltips = function() {
+        for (let i in this._windowOverlays) {
+            if (this._windowOverlays[i] != null)
+                this._windowOverlays[i].hideTooltip();
+        }
+    }
+    workspaceInjections['hideWindowsTooltips'] = undefined;
+
+    WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
+        if (global.stage.get_key_focus() == global.stage)
+            global.stage.set_key_focus(this._prevFocusActor);
+        this._pickWindow = false;
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].hideWindowsTooltips();
+    }
+    workViewInjections['_hideTooltips'] = undefined;
+
+    WorkspacesView.WorkspacesView.prototype._hideWorkspacesTooltips = function() {
+        global.stage.set_key_focus(this._prevFocusActor);
+        this._pickWorkspace = false;
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].hideTooltip();
+    }
+    workViewInjections['_hideWorkspacesTooltips'] = undefined;
+
+    WorkspacesView.WorkspacesView.prototype._onKeyRelease = function(s, o) {
+        if (this._pickWindow &&
+            (o.get_key_symbol() == Clutter.KEY_Alt_L ||
+             o.get_key_symbol() == Clutter.KEY_Alt_R))
+            this._hideTooltips();
+        if (this._pickWorkspace &&
+            (o.get_key_symbol() == Clutter.KEY_Control_L ||
+             o.get_key_symbol() == Clutter.KEY_Control_R))
+            this._hideWorkspacesTooltips();
+    }
+    workViewInjections['_onKeyRelease'] = undefined;
+
+    WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
+        if(Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
+            return false;
+
+        if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
+             o.get_key_symbol() == Clutter.KEY_Alt_R)
+            && !this._pickWorkspace) {
+            this._prevFocusActor = global.stage.get_key_focus();
+            global.stage.set_key_focus(null);
+            this._active = global.screen.get_active_workspace_index();
+            this._pickWindow = true;
+            this._workspaces[global.screen.get_active_workspace_index()].showWindowsTooltips();
+            return true;
+        }
+        if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
+             o.get_key_symbol() == Clutter.KEY_Control_R)
+            && !this._pickWindow) {
+            this._prevFocusActor = global.stage.get_key_focus();
+            global.stage.set_key_focus(null);
+            this._pickWorkspace = true;
+            for (let i = 0; i < this._workspaces.length; i++)
+                this._workspaces[i].showTooltip();
+            return true;
+        }
+
+        if (global.stage.get_key_focus() != global.stage)
+            return false;
+
+        // ignore shift presses, they're required to get numerals in azerty keyboards
+        if ((this._pickWindow || this._pickWorkspace) &&
+            (o.get_key_symbol() == Clutter.KEY_Shift_L ||
+             o.get_key_symbol() == Clutter.KEY_Shift_R))
+            return true;
+
+        if (this._pickWindow) {
+            if (this._active != global.screen.get_active_workspace_index()) {
+                this._hideTooltips();
+                return false;
+            }
+
+            let c = o.get_key_symbol() - Clutter.KEY_KP_0;
+            if (c > 9 || c <= 0) {
+                c = o.get_key_symbol() - Clutter.KEY_0;
+                if (c > 9 || c <= 0) {
+                    this._hideTooltips();
+                    global.log(c);
+                    return false;
+                }
+            }
+
+            let win = this._workspaces[this._active].getWindowWithTooltip(c);
+            this._hideTooltips();
+
+            if (win)
+                Main.activateWindow(win, global.get_current_time());
+
+            return true;
+        }
+        if (this._pickWorkspace) {
+            let c = o.get_key_symbol() - Clutter.KEY_KP_0;
+            if (c > 9 || c <= 0) {
+                c = o.get_key_symbol() - Clutter.KEY_0;
+                if (c > 9 || c <= 0) {
+                    this._hideWorkspacesTooltips();
+                    return false;
+                }
+            }
+
+            let workspace = this._workspaces[c - 1];
+            if (workspace !== undefined)
+                workspace.metaWorkspace.activate(global.get_current_time());
+
+            this._hideWorkspacesTooltips();
+            return true;
+        }
+        return false;
+    }
+    workViewInjections['_onKeyPress'] = undefined;
+
+    winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
+        this._id = null;
+        createdActors.push(this._text = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip' }));
+        this._text.hide();
+        parentActor.add_actor(this._text);
+    });
+
+    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(animate) {
+        let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
+
+        let textX = cloneX - 2;
+        let textY = cloneY - 2;
+        this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
+        this._text.raise_top();
+    });
+
+    workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
+        if (metaWorkspace && metaWorkspace.index() < 9) {
+            createdActors.push(this._tip = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip',
+                                                          visible: false }));
+
+            this.actor.add_actor(this._tip);
+            let signalId = this.actor.connect('notify::scale-x', () => {
+                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
+            });
+            connectedSignals.push({ obj: this.actor, id: signalId });
+        } else
+            this._tip = null;
+    });
+
+    workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(width, height, x, y, workspaces) {
+        this._pickWorkspace = false;
+        this._pickWindow = false;
+        this._keyPressEventId =
+            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
+        this._keyReleaseEventId =
+            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
+        connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
+        connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
+    });
+
+    workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
+        global.stage.disconnect(this._keyPressEventId);
+        global.stage.disconnect(this._keyReleaseEventId);
+        connectedSignals = [ ];
+    });
+}
+
+function removeInjection(object, injection, name) {
+    if (injection[name] === undefined)
+        delete object[name];
+    else
+        object[name] = injection[name];
+}
+
+function disable() {
+    let i;
+
+    for (i in workspaceInjections)
+        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
+    for (i in winInjections)
+        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
+    for (i in workViewInjections)
+        removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
+
+    for (i of connectedSignals)
+        i.obj.disconnect(i.id);
+
+    for (i of createdActors)
+        i.destroy();
+
+    resetState();
+}
+
+function init() {
+    /* do nothing */
 }

extensions/windowsNavigator/meson.build

@@ -3,4 +3,3 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
-extension_data += files('stylesheet.css')

extensions/workspace-indicator/extension.js

@@ -1,411 +1,113 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-import Clutter from 'gi://Clutter';
-import Gio from 'gi://Gio';
-import GObject from 'gi://GObject';
-import Meta from 'gi://Meta';
-import St from 'gi://St';
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const Gio = imports.gi.Gio;
+const Meta = imports.gi.Meta;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+const Mainloop = imports.mainloop;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Panel = imports.ui.panel;
 
-import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const Main = imports.ui.main;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
 
 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;
-
-class WindowPreview extends St.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(window) {
-        super({
-            style_class: 'workspace-indicator-window-preview',
-        });
-
-        this._delegate = this;
-        DND.makeDraggable(this, {restoreOnSuccess: true});
-
-        this._window = window;
-
-        this._window.connectObject(
-            'size-changed', () => this.queue_relayout(),
-            'position-changed', () => {
-                this._updateVisible();
-                this.queue_relayout();
-            },
-            'notify::minimized', this._updateVisible.bind(this),
-            this);
-
-        global.display.connectObject('notify::focus-window',
-            this._onFocusChanged.bind(this), this);
-        this._onFocusChanged();
-    }
-
-    // needed for DND
-    get metaWindow() {
-        return this._window;
-    }
-
-    _onFocusChanged() {
-        if (global.display.focus_window === this._window)
-            this.add_style_class_name('active');
-        else
-            this.remove_style_class_name('active');
-    }
-
-    _updateVisible() {
-        const monitor = Main.layoutManager.findIndexForActor(this);
-        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();
-    }
-}
-
-class WorkspaceLayout extends Clutter.LayoutManager {
-    static {
-        GObject.registerClass(this);
-    }
-
-    vfunc_get_preferred_width() {
-        return [0, 0];
-    }
-
-    vfunc_get_preferred_height() {
-        return [0, 0];
-    }
-
-    vfunc_allocate(container, box) {
-        const monitor = Main.layoutManager.findIndexForActor(container);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        const hscale = box.get_width() / workArea.width;
-        const vscale = box.get_height() / workArea.height;
-
-        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);
-        }
-    }
-}
-
-class WorkspaceThumbnail extends St.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(index) {
-        super({
-            style_class: 'workspace',
-            child: new Clutter.Actor({
-                layout_manager: new WorkspaceLayout(),
-                clip_to_allocation: 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
-
-        this._windowPreviews = new Map();
-
-        let workspaceManager = global.workspace_manager;
-        this._workspace = workspaceManager.get_workspace_by_index(index);
-
-        this._workspace.connectObject(
-            'window-added', (ws, window) => this._addWindow(window),
-            'window-removed', (ws, window) => this._removeWindow(window),
-            this);
-
-        global.display.connectObject('restacked',
-            this._onRestacked.bind(this), this);
-
-        this._workspace.list_windows().forEach(w => this._addWindow(w));
-        this._onRestacked();
-    }
-
-    acceptDrop(source) {
-        if (!source.metaWindow)
-            return false;
-
-        this._moveWindow(source.metaWindow);
-        return true;
-    }
-
-    handleDragOver(source) {
-        if (source.metaWindow)
-            return DND.DragMotionResult.MOVE_DROP;
-        else
-            return DND.DragMotionResult.CONTINUE;
-    }
-
-    _addWindow(window) {
-        if (this._windowPreviews.has(window))
-            return;
-
-        let preview = new WindowPreview(window);
-        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
-        this._windowPreviews.set(window, preview);
-        this.child.add_child(preview);
-    }
-
-    _removeWindow(window) {
-        let preview = this._windowPreviews.get(window);
-        if (!preview)
-            return;
-
-        this._windowPreviews.delete(window);
-        preview.destroy();
-    }
-
-    _onRestacked() {
-        let lastPreview = null;
-        let windows = global.get_window_actors().map(a => a.meta_window);
-        for (let i = 0; i < windows.length; i++) {
-            let preview = this._windowPreviews.get(windows[i]);
-            if (!preview)
-                continue;
-
-            this.child.set_child_above_sibling(preview, lastPreview);
-            lastPreview = preview;
-        }
-    }
-
-    _moveWindow(window) {
-        let monitorIndex = Main.layoutManager.findIndexForActor(this);
-        if (monitorIndex !== window.get_monitor())
-            window.move_to_monitor(monitorIndex);
-        window.change_workspace_by_index(this._index, false);
-    }
-
-    on_clicked() {
-        let ws = global.workspace_manager.get_workspace_by_index(this._index);
-        if (ws)
-            ws.activate(global.get_current_time());
-    }
-
-    _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();
-    }
-}
-
 class WorkspaceIndicator extends PanelMenu.Button {
-    static {
-        GObject.registerClass(this);
-    }
-
     constructor() {
-        super(0.5, _('Workspace Indicator'));
+        super(0.0, _("Workspace Indicator"));
 
-        let container = new St.Widget({
-            layout_manager: new Clutter.BinLayout(),
-            x_expand: true,
-            y_expand: true,
-        });
-        this.add_actor(container);
+        this._currentWorkspace = global.screen.get_active_workspace().index();
+        this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
+                                          text: this._labelText() });
 
-        let workspaceManager = global.workspace_manager;
+        this.actor.add_actor(this.statusLabel);
 
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-        this._statusLabel = new St.Label({
-            style_class: 'panel-workspace-indicator',
-            y_align: Clutter.ActorAlign.CENTER,
-            text: this._labelText(),
-        });
-
-        container.add_actor(this._statusLabel);
-
-        this._thumbnailsBox = new St.BoxLayout({
-            style_class: 'panel-workspace-indicator-box',
-            y_expand: true,
-            reactive: true,
-        });
-
-        container.add_actor(this._thumbnailsBox);
-
-        this._workspacesItems = [];
+        this.workspacesItems = [];
         this._workspaceSection = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(this._workspaceSection);
 
-        workspaceManager.connectObject(
-            'notify::n-workspaces', this._nWorkspacesChanged.bind(this), GObject.ConnectFlags.AFTER,
-            'workspace-switched', this._onWorkspaceSwitched.bind(this), GObject.ConnectFlags.AFTER,
-            'notify::layout-rows', this._updateThumbnailVisibility.bind(this),
-            this);
+        this._screenSignals = [];
+        this._screenSignals.push(global.screen.connect_after('workspace-added',                                                              this._createWorkspacesSection.bind(this)));
+        this._screenSignals.push(global.screen.connect_after('workspace-removed',
+                                                             this._createWorkspacesSection.bind(this)));
+        this._screenSignals.push(global.screen.connect_after('workspace-switched',
+                                                             this._updateIndicator.bind(this)));
 
-        this.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._thumbnailsBox.connect('scroll-event', this._onScrollEvent.bind(this));
+        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
         this._createWorkspacesSection();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
 
-        this._settings = new Gio.Settings({schema_id: WORKSPACE_SCHEMA});
-        this._settings.connectObject(`changed::${WORKSPACE_KEY}`,
-            this._updateMenuLabels.bind(this), this);
+        //styling
+        this.statusLabel.add_style_class_name('panel-workspace-indicator');
+
+        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
+        this._settingsChangedId =
+            this._settings.connect('changed::' + WORKSPACE_KEY,
+                                   this._createWorkspacesSection.bind(this));
     }
 
-    _onDestroy() {
-        Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
+    destroy() {
+        for (let i = 0; i < this._screenSignals.length; i++)
+            global.screen.disconnect(this._screenSignals[i]);
 
-        super._onDestroy();
-    }
-
-    _updateThumbnailVisibility() {
-        const {workspaceManager} = global;
-        const vertical = workspaceManager.layout_rows === -1;
-        const useMenu =
-            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
-        this.reactive = useMenu;
-
-        this._statusLabel.visible = useMenu;
-        this._thumbnailsBox.visible = !useMenu;
-
-        // Disable offscreen-redirect when showing the workspace switcher
-        // so that clip-to-allocation works
-        Main.panel.set_offscreen_redirect(useMenu
-            ? Clutter.OffscreenRedirect.ALWAYS
-            : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
-    }
-
-    _onWorkspaceSwitched() {
-        this._currentWorkspace = global.workspace_manager.get_active_workspace_index();
-
-        this._updateMenuOrnament();
-        this._updateActiveThumbnail();
-
-        this._statusLabel.set_text(this._labelText());
-    }
-
-    _nWorkspacesChanged() {
-        this._createWorkspacesSection();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-    }
-
-    _updateMenuOrnament() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            this._workspacesItems[i].setOrnament(i === this._currentWorkspace
-                ? PopupMenu.Ornament.DOT
-                : PopupMenu.Ornament.NONE);
+        if (this._settingsChangedId) {
+            this._settings.disconnect(this._settingsChangedId);
+            this._settingsChangedId = 0;
         }
+
+        super.destroy();
     }
 
-    _updateActiveThumbnail() {
-        let thumbs = this._thumbnailsBox.get_children();
-        for (let i = 0; i < thumbs.length; i++) {
-            if (i === this._currentWorkspace)
-                thumbs[i].add_style_class_name('active');
-            else
-                thumbs[i].remove_style_class_name('active');
-        }
+    _updateIndicator() {
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+        this._currentWorkspace = global.screen.get_active_workspace().index();
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+
+        this.statusLabel.set_text(this._labelText());
     }
 
     _labelText(workspaceIndex) {
-        if (workspaceIndex === undefined) {
+        if(workspaceIndex == undefined) {
             workspaceIndex = this._currentWorkspace;
             return (workspaceIndex + 1).toString();
         }
         return Meta.prefs_get_workspace_name(workspaceIndex);
     }
 
-    _updateMenuLabels() {
-        for (let i = 0; i < this._workspacesItems.length; i++)
-            this._workspacesItems[i].label.text = this._labelText(i);
-    }
-
     _createWorkspacesSection() {
-        let workspaceManager = global.workspace_manager;
-
         this._workspaceSection.removeAll();
-        this._workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+        this.workspacesItems = [];
+        this._currentWorkspace = global.screen.get_active_workspace().index();
 
         let i = 0;
-        for (; i < workspaceManager.n_workspaces; i++) {
-            this._workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-            this._workspaceSection.addMenuItem(this._workspacesItems[i]);
-            this._workspacesItems[i].workspaceId = i;
-            this._workspacesItems[i].label_actor = this._statusLabel;
-            this._workspacesItems[i].connect('activate', (actor, _event) => {
+        for(; i < global.screen.n_workspaces; i++) {
+            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
+            this.workspacesItems[i].workspaceId = i;
+            this.workspacesItems[i].label_actor = this.statusLabel;
+            let self = this;
+            this.workspacesItems[i].connect('activate', (actor, event) => {
                 this._activate(actor.workspaceId);
             });
 
-            if (i === this._currentWorkspace)
-                this._workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+            if (i == this._currentWorkspace)
+                this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
         }
 
-        this._statusLabel.set_text(this._labelText());
-    }
-
-    _updateThumbnails() {
-        let workspaceManager = global.workspace_manager;
-
-        this._thumbnailsBox.destroy_all_children();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let thumb = new WorkspaceThumbnail(i);
-            this._thumbnailsBox.add_actor(thumb);
-        }
-        this._updateActiveThumbnail();
+        this.statusLabel.set_text(this._labelText());
     }
 
     _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if (index >= 0 && index < workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
+        if(index >= 0 && index <  global.screen.n_workspaces) {
+            let metaWorkspace = global.screen.get_workspace_by_index(index);
             metaWorkspace.activate(global.get_current_time());
         }
     }
@@ -413,27 +115,30 @@ class WorkspaceIndicator extends PanelMenu.Button {
     _onScrollEvent(actor, event) {
         let direction = event.get_scroll_direction();
         let diff = 0;
-        if (direction === Clutter.ScrollDirection.DOWN)
+        if (direction == Clutter.ScrollDirection.DOWN) {
             diff = 1;
-        else if (direction === Clutter.ScrollDirection.UP)
+        } else if (direction == Clutter.ScrollDirection.UP) {
             diff = -1;
-        else
+        } else {
             return;
+        }
 
-
-        let newIndex = global.workspace_manager.get_active_workspace_index() + diff;
+        let newIndex = global.screen.get_active_workspace().index() + diff;
         this._activate(newIndex);
     }
+};
+
+function init(meta) {
+    Convenience.initTranslations();
 }
 
-export default class WorkspaceIndicatorExtension extends Extension {
-    enable() {
-        this._indicator = new WorkspaceIndicator();
-        Main.panel.addToStatusArea('workspace-indicator', this._indicator);
-    }
+let _indicator;
 
-    disable() {
-        this._indicator.destroy();
-        delete this._indicator;
-    }
+function enable() {
+    _indicator = new WorkspaceIndicator;
+    Main.panel.addToStatusArea('workspace-indicator', _indicator);
+}
+
+function disable() {
+    _indicator.destroy();
 }

extensions/workspace-indicator/meson.build

@@ -3,6 +3,5 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
-extension_data += files('stylesheet.css')
 
 extension_sources += files('prefs.js')

extensions/workspace-indicator/prefs.js

@@ -1,265 +1,211 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-import Adw from 'gi://Adw';
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
-import Pango from 'gi://Pango';
 
-import {ExtensionPreferences, gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gtk = imports.gi.Gtk;
 
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
 const N_ = e => e;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
-class NewItem extends GObject.Object {}
-GObject.registerClass(NewItem);
+const WorkspaceNameModel = GObject.registerClass(
+class WorkspaceNameModel extends Gtk.ListStore {
+    _init(params) {
+        super._init(params);
+        this.set_column_types([GObject.TYPE_STRING]);
 
-class NewItemModel extends GObject.Object {
-    static [GObject.interfaces] = [Gio.ListModel];
-    static {
-        GObject.registerClass(this);
+        this.Columns = {
+            LABEL: 0,
+        };
+
+        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
+        //this._settings.connect('changed::workspace-names', this._reloadFromSettings.bind(this));
+
+        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));
     }
 
-    #item = new NewItem();
+    _reloadFromSettings() {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
 
-    vfunc_get_item_type() {
-        return NewItem;
+        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;
     }
 
-    vfunc_get_n_items() {
-        return 1;
+    _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;
     }
 
-    vfunc_get_item(_pos) {
-        return this.#item;
-    }
-}
+    _onRowInserted(self, path, iter) {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
 
-class WorkspacesList extends GObject.Object {
-    static [GObject.interfaces] = [Gio.ListModel];
-    static {
-        GObject.registerClass(this);
+        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;
     }
 
-    #settings = new Gio.Settings({schema_id: WORKSPACE_SCHEMA});
-    #names = this.#settings.get_strv(WORKSPACE_KEY);
-    #items = Gtk.StringList.new(this.#names);
-    #changedId;
+    _onRowDeleted(self, path) {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
 
-    constructor() {
-        super();
+        let index = path.get_indices()[0];
+        let names = this._settings.get_strv(WORKSPACE_KEY);
 
-        this.#changedId =
-            this.#settings.connect(`changed::${WORKSPACE_KEY}`, () => {
-                const removed = this.#names.length;
-                this.#names = this.#settings.get_strv(WORKSPACE_KEY);
-                this.#items.splice(0, removed, this.#names);
-                this.items_changed(0, removed, this.#names.length);
-            });
-    }
-
-    append() {
-        const name = _('Workspace %d').format(this.#names.length + 1);
-
-        this.#names.push(name);
-        this.#settings.block_signal_handler(this.#changedId);
-        this.#settings.set_strv(WORKSPACE_KEY, this.#names);
-        this.#settings.unblock_signal_handler(this.#changedId);
-
-        const pos = this.#items.get_n_items();
-        this.#items.append(name);
-        this.items_changed(pos, 0, 1);
-    }
-
-    remove(name) {
-        const pos = this.#names.indexOf(name);
-        if (pos < 0)
+        if (index >= names.length)
             return;
 
-        this.#names.splice(pos, 1);
+        names.splice(index, 1);
 
-        this.#settings.block_signal_handler(this.#changedId);
-        this.#settings.set_strv(WORKSPACE_KEY, this.#names);
-        this.#settings.unblock_signal_handler(this.#changedId);
+        // compact the array
+        for (let i = names.length -1; i >= 0 && !names[i]; i++)
+            names.pop();
 
-        this.#items.remove(pos);
-        this.items_changed(pos, 1, 0);
+        this._settings.set_strv(WORKSPACE_KEY, names);
+
+        this._preventChanges = false;
+    }
+});
+
+const WorkspaceSettingsWidget = GObject.registerClass(
+class WorkspaceSettingsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.margin = 12;
+        this.orientation = Gtk.Orientation.VERTICAL;
+
+        this.add(new Gtk.Label({ label: '<b>' + _("Workspace Names") + '</b>',
+                                 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") });
+        let renderer = new Gtk.CellRendererText({ editable: true });
+        renderer.connect('edited', this._cellEdited.bind(this));
+        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.add(toolbar);
     }
 
-    rename(oldName, newName) {
-        const pos = this.#names.indexOf(oldName);
-        if (pos < 0)
-            return;
+    _cellEdited(renderer, path, new_text) {
+        let [ok, iter] = this._store.get_iter_from_string(path);
 
-        this.#names.splice(pos, 1, newName);
-        this.#items.splice(pos, 1, [newName]);
-
-        this.#settings.block_signal_handler(this.#changedId);
-        this.#settings.set_strv(WORKSPACE_KEY, this.#names);
-        this.#settings.unblock_signal_handler(this.#changedId);
+        if (ok)
+            this._store.set(iter, [this._store.Columns.LABEL], [new_text]);
     }
 
-    vfunc_get_item_type() {
-        return Gtk.StringObject;
+    _newClicked() {
+        let iter = this._store.append();
+        let index = this._store.get_path(iter).get_indices()[0];
+
+        let label = _("Workspace %d").format(index + 1);
+        this._store.set(iter, [this._store.Columns.LABEL], [label]);
     }
 
-    vfunc_get_n_items() {
-        return this.#items.get_n_items();
-    }
+    _delClicked() {
+        let [any, model, iter] = this._treeView.get_selection().get_selected();
 
-    vfunc_get_item(pos) {
-        return this.#items.get_item(pos);
+        if (any)
+            this._store.remove(iter);
     }
+});
+
+function init() {
+    Convenience.initTranslations();
 }
 
-class WorkspaceSettingsWidget extends Adw.PreferencesGroup {
-    static {
-        GObject.registerClass(this);
+function buildPrefsWidget() {
+    let widget = new WorkspaceSettingsWidget();
+    widget.show_all();
 
-        this.install_action('workspaces.add', null,
-            self => self._workspaces.append());
-        this.install_action('workspaces.remove', 's',
-            (self, name, param) => self._workspaces.remove(param.unpack()));
-        this.install_action('workspaces.rename', '(ss)',
-            (self, name, param) => self._workspaces.rename(...param.deepUnpack()));
-    }
-
-    constructor() {
-        super({
-            title: _('Workspace Names'),
-        });
-
-        this._workspaces = new WorkspacesList();
-
-        const store = new Gio.ListStore({item_type: Gio.ListModel});
-        const listModel = new Gtk.FlattenListModel({model: store});
-        store.append(this._workspaces);
-        store.append(new NewItemModel());
-
-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            css_classes: ['boxed-list'],
-        });
-        this._list.connect('row-activated', (l, row) => row.edit());
-        this.add(this._list);
-
-        this._list.bind_model(listModel, item => {
-            return item instanceof NewItem
-                ? new NewWorkspaceRow()
-                : new WorkspaceRow(item.string);
-        });
-    }
-}
-
-class WorkspaceRow extends Adw.PreferencesRow {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(name) {
-        super({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',
-            icon_name: 'edit-delete-symbolic',
-            has_frame: false,
-        });
-        box.append(button);
-
-        this.bind_property_full('name',
-            button, 'action-target',
-            GObject.BindingFlags.SYNC_CREATE,
-            (bind, target) => [true, new GLib.Variant('s', target)],
-            null);
-
-        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.activate_action('workspaces.rename',
-                new GLib.Variant('(ss)', [this.name, this._entry.text]));
-            this.name = this._entry.text;
-            this._stopEdit();
-        });
-        this._entry.connect('notify::has-focus', () => {
-            if (this._entry.has_focus)
-                return;
-            this._stopEdit();
-        });
-    }
-
-    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';
-    }
-}
-
-class NewWorkspaceRow extends Adw.PreferencesRow {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor() {
-        super({
-            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')]);
-    }
-}
-
-export default class WorkspaceIndicatorPrefs extends ExtensionPreferences {
-    getPreferencesWidget() {
-        return new WorkspaceSettingsWidget();
-    }
+    return widget;
 }