releasing package gnome-shell-extensions version 48.3-1

Update to upstream version '48.3'
with Debian dir 9dc43a912c

.editorconfig

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2024 Florian Müllner <fmuellner@gnome.org>
+# SPDX-License-Identifier: CC0-1.0
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.js]
+indent_size = 4
+
+[meson.build]
+indent_size = 2

.gitlab-ci.yml

@@ -3,8 +3,17 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 include:
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
+  - project: Infrastructure/freedesktop-ci-templates
-  - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml"
+    file: templates/fedora.yml
+  - project: Infrastructure/freedesktop-ci-templates
+    file: templates/ci-fairy.yml
+  - project: GNOME/citemplates
+    file: templates/default-rules.yml
+  - component: gitlab.gnome.org/GNOME/citemplates/release-service@master
+    inputs:
+      job-stage: deploy
+      dist-job-name: fedora-dist-tarball
+      tarball-artifact-path: "$TARBALL_ARTIFACT_PATH"
 
 stages:
   - pre_review
@@ -14,27 +23,12 @@ stages:
   - deploy
 
 default:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/35:2022-02-18.0
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/41:2024-10-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"
+  MESON_BUILD_DIR: build
-
+  TARBALL_ARTIFACT_PATH: "${MESON_BUILD_DIR}/meson-dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz"
-workflow:
-  rules:
-    - if: '$CI_MERGE_REQUEST_IID'
-    - if: '$CI_COMMIT_TAG'
-    - if: '$CI_COMMIT_BRANCH'
 
 .pipeline_guard: &pipeline_guard
   rules:
@@ -44,13 +38,6 @@ workflow:
     - 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
@@ -102,13 +89,6 @@ check-reuse:
   script:
     - reuse lint
 
-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
@@ -118,14 +98,25 @@ js_check:
 eslint:
   stage: review
   <<: *prereview_req
+  variables:
+    LINT_LOG: "eslint-report.xml"
   script:
     - export NODE_PATH=$(npm root -g)
-    - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} --format junit --stdout
+    - ./.gitlab-ci/run-eslint --output-file "$LINT_LOG" --format junit --stdout
   artifacts:
     paths:
-      - ${LINT_LOG}
+      - "$LINT_LOG"
     reports:
-      junit: ${LINT_LOG}
+      junit: "$LINT_LOG"
+
+potfile_js_check:
+  stage: review
+  <<: *prereview_req
+  script:
+    - gjs-check-potfiles
+  artifacts:
+    reports:
+      junit: gjs-check-potfiles.junit.xml
 
 build-bundles:
   stage: build
@@ -139,32 +130,25 @@ build-bundles:
       - zip-files/
 
 fedora-build:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .gnome-shell-extensions.fedora:34
   stage: build
-  needs:
+  <<: *prereview_req
-    - build-fedora-container
   script:
-    - meson setup build --werror -Dextension_set=all -Dclassic_mode=true
+    - meson setup "$MESON_BUILD_DIR" --werror -Dextension_set=all -Dclassic_mode=true
-    - meson compile -C build
+    - meson compile -C "$MESON_BUILD_DIR"
-    - meson test -C build
+    - meson test -C "$MESON_BUILD_DIR"
-    - meson install -C build
+    - meson install -C "$MESON_BUILD_DIR"
   artifacts:
     paths:
-      - build
+      - "$MESON_BUILD_DIR"
 
 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
+    - meson dist -C "$MESON_BUILD_DIR"
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:
@@ -175,7 +159,9 @@ fedora-dist-tarball:
   extends: fedora-dist
   artifacts:
     expose_as: 'Get tarball here'
+    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: always
     paths:
-      - build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz
+      - "$TARBALL_ARTIFACT_PATH"
   rules:
     - if: '$CI_COMMIT_TAG'

.gitlab/issue_templates/Default.md

@@ -0,0 +1,72 @@
+<!--
+Please read https://handbook.gnome.org/issues/reporting.html
+first to ensure that you create a clear and specific issue.
+-->
+
+### Which extension
+
+<!--
+Which extension is the issue about?
+
+See the project README for a complete list of extensions:
+https://gitlab.gnome.org/GNOME/gnome-shell-extensions#extensions
+
+Do not report issues for any other extensions here.
+
+Report general issues about gnome-shell's extension support to
+https://gitlab.gnome.org/GNOME/gnome-shell.
+
+Report issues with the extensions.gnome.org website to
+https://gitlab.gnome.org/Infrastructure/extensions-web/
+-->
+
+### Affected version
+
+<!--
+Provide at least the following information:
+* Your OS and version
+* Extension version
+* Affected GNOME Shell version
+-->
+
+### Bug summary
+
+<!-- 
+Provide a short summary of the bug you encountered.
+-->
+
+### Steps to reproduce
+
+<!-- 
+1. Step one
+2. Step two
+3. ...
+-->
+
+### What happened
+
+<!-- 
+What did the extension do that was unexpected?
+-->
+
+### What did you expect to happen
+
+<!-- 
+What did you expect the extension to do?
+-->
+
+### Relevant logs, screenshots, screencasts etc.
+
+<!-- 
+If you have further information, such as technical documentation, logs,
+screenshots or screencasts related, please provide them here.
+
+If the bug is a crash, please obtain a stack trace with installed debug
+symbols (at least for GNOME Shell and Mutter) and attach it to
+this issue following the instructions on
+https://handbook.gnome.org/issues/stack-traces.html.
+-->
+
+
+<!-- Do not remove the following line. -->
+/label ~"1. Bug"

.gitlab/issue_templates/Default.md.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2024 Florian Müllner <fmuellner@gnome.org>
+SPDX-License-Identifier: CC-BY-SA-4.0

.gitlab/issue_templates/Feature.md

@@ -0,0 +1,47 @@
+<!--
+Please read https://handbook.gnome.org/issues/reporting.html
+first to ensure that you create a clear and specific issue.
+-->
+
+### Which extension
+
+<!--
+Which extension is the issue about?
+
+See the project README for a complete list of extensions:
+https://gitlab.gnome.org/GNOME/gnome-shell-extensions#extensions
+
+Do not report issues for any other extensions here.
+
+Report general issues about gnome-shell's extension support to
+https://gitlab.gnome.org/GNOME/gnome-shell.
+
+Report issues with the extensions.gnome.org website to
+https://gitlab.gnome.org/Infrastructure/extensions-web/
+-->
+
+### Feature summary
+
+<!-- 
+Describe what you would like to be able to do with the extension
+that you currently cannot do.
+-->
+
+### How would you like it to work
+
+<!-- 
+If you can think of a way the extension might be able to do this,
+let us know here.
+-->
+
+### Relevant links, screenshots, screencasts etc.
+
+<!-- 
+If you have further information, such as technical documentation,
+code, mockups or a similar feature in another desktop environments,
+please provide them here.
+-->
+
+
+<!-- Do not remove the following line. -->
+/label ~"1. Feature"

.gitlab/issue_templates/Feature.md.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Florian Müllner <fmuellner@gnome.org>
+SPDX-License-Identifier: CC-BY-SA-4.0
+

.reuse/dep5

@@ -1,22 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: gnome-shell-extensions
-Upstream-Contact: Florian Müllner <fmuellner@gnome.org>
-Source: https://gitlab.gnome.org/GNOME/gnome-shell-extensions
-
-Files: NEWS README.md HACKING.md data/HACKING
-Copyright: No rights reserved
-License: CC0-1.0
-
-Files: *.json.in *.desktop.in *.gschema.override
-Copyright: Florian Müllner <fmuellner@gnome.org>
-License: GPL-2.0-or-later
-
-# managed by translation teams
-Files: po/*.po
-Copyright: GNOME Translation Teams <i18n@gnome.org>
-License: GPL-2.0-or-later
-
-# managed by translation teams
-Files: po/LINGUAS po/POTFILES.in
-Copyright: No rights reserved
-License: CC0-1.0

HACKING.md

@@ -1,3 +1,9 @@
+<!--
+SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>"""
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
 ## Creating a New Extension
 
 To create a new extension, add a subdirectory in extensions. Then create
@@ -20,9 +26,6 @@ need in gnome-shell.
 Generally, we follow [GJS coding style][coding-style], which in short is:
 indent 4 spaces, no tabs, space after comma, no space after function call.
 
-The Emacs mode line for this
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
 Imports should be at the top, in two groups, one for standard
 imports (like imports.lang or imports.dbus) and introspection,
 the other for Shell API. Within the same group, put everything

LICENSES/CC-BY-SA-4.0.txt

@@ -0,0 +1,170 @@
+Creative Commons Attribution-ShareAlike 4.0 International
+
+ Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
+
+Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
+
+Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described.
+
+Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
+
+Creative Commons Attribution-ShareAlike 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+Section 1 – Definitions.
+
+     a.	Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+
+     b.	Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+
+     c.	BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
+
+     d.	Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+     e.	Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+
+     f.	Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+
+     g.	License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
+
+     h.	Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+     i.	Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+
+     j.	Licensor means the individual(s) or entity(ies) granting rights under this Public License.
+
+     k.	Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+
+     l.	Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+
+     m.	You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+Section 2 – Scope.
+
+     a.	License grant.
+
+          1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+
+               A. reproduce and Share the Licensed Material, in whole or in part; and
+
+               B. produce, reproduce, and Share Adapted Material.
+
+          2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+
+          3. Term. The term of this Public License is specified in Section 6(a).
+
+          4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+
+          5. Downstream recipients.
+
+               A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+
+               B. Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
+
+               C. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+
+          6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+     b.	Other rights.
+
+          1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+
+          2. Patent and trademark rights are not licensed under this Public License.
+
+          3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+     a.	Attribution.
+
+          1. If You Share the Licensed Material (including in modified form), You must:
+
+               A. retain the following if it is supplied by the Licensor with the Licensed Material:
+
+                    i.	identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+
+                    ii.	a copyright notice;
+
+                    iii. a notice that refers to this Public License;
+
+                    iv.	a notice that refers to the disclaimer of warranties;
+
+                    v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+               B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+
+               C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+
+          2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+
+          3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+     b.	ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
+
+          1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
+
+          2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
+
+          3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
+
+Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+     a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
+
+     b.	if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
+
+     c.	You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+     a.	Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
+
+     b.	To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
+
+     c.	The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+Section 6 – Term and Termination.
+
+     a.	This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+     b.	Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+          1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+
+          2. upon express reinstatement by the Licensor.
+
+     c.	For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+
+     d.	For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+
+     e.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+Section 7 – Other Terms and Conditions.
+
+     a.	The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+
+     b.	Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+Section 8 – Interpretation.
+
+     a.	For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+
+     b.	To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+
+     c.	No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+
+     d.	Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
+
+Creative Commons may be contacted at creativecommons.org.

NEWS

@@ -1,3 +1,213 @@
+48.3
+====
+* Misc. bug fixes and cleanups [Florian; !409, !411, !405, !413]
+
+Contributors:
+  Florian Müllner
+
+48.2
+====
+* windowsNavigator: Fix handling keyboard shortcuts [Daniel; !395]
+* build: Allow disabling the X11 session [Neal; !396, !400]
+
+Contributors:
+  Daniel Buch Hansen, Neal Gompa
+
+48.1
+====
+
+Translators:
+  Hugo Carvalho [pt], Danial Behzadi [fa]
+
+48.0
+====
+* apps-menu: Fix scrolling items into view on keynav [Victor; !391]
+* Misc. bug fixes and cleanups [Florian, Stuart; !390, !392]
+
+Contributors:
+  Stuart Hayhurst, Victor Kareh, Florian Müllner
+
+48.rc
+=====
+* Misc. bug fixes and cleanups [Florian; !385, !388]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Emilio Sepúlveda [ia], Mathews M [ml], Daniel Rusek [cs], Piotr Drąg [pl],
+  Anders Jonsson [sv], Ekaterine Papava [ka], Yuri Chornoivan [uk],
+  Aurimas Černius [lt], Luming Zh [zh_CN], Jiri Grönroos [fi]
+
+48.beta
+=======
+* window-list: Fix regression in chrome tracking [Florian; !379]
+* Misc. bug fixes and cleanups [Florian; !380]
+
+Contributors:
+  Florian Müllner, Emilio Sepúlveda
+
+Translators:
+  Rafael Fontenelle [pt_BR], Emilio Sepúlveda [ia]
+
+48.alpha
+========
+* classic: Add missing top-bar indicators [Florian; !339]
+* window-list: Fix window state styling [Florian; !342]
+* window-list: Fix "ignore-workspace" setting getting reset [Florian; !341]
+* window-list: Allow rearranging window buttons [Florian, Jakub; !338]
+* window-list: Add workspaces page to preference dialog [Florian; !344]
+* places-menu: Sync list of places with nautilus [Florian; !340]
+* places-menu: Fix a11y labelling [Florian; #542]
+* places-menu: Fix opening drives with mount operations [Florian; !361]
+* window-list: Fix hiding when entering overview with gestures [Florian; !364]
+* workspace-indicator: Only show previews of regular windows [Florian; !363]
+* window-list: Add attention indicator [Florian; !366]
+* Misc. bug fixes and cleanups [Florian, Bartłomiej; !337, !343, !345, !347,
+  !348, !349, !351, !352, !353, !354, !358, !362, !365, !367, !368, !370, !375]
+
+Contributors:
+  Florian Müllner, Bartłomiej Piotrowski, Jakub Steiner
+
+Translators:
+  Fabio Tomat [fur], Martin [sl], Jordi Mas i Hernandez [ca], Vasil Pupkin [be],
+  Nathan Follens [nl], Artur S0 [ru], Марко Костић [sr],
+  Yaron Shahrabani [he], Sabri Ünal [tr], Yi-Jyun Pan [zh_TW]
+
+47.0
+====
+
+Translators:
+  twlvnn kraftwerk [bg], Alexander Shopov [bg], Fran Dieguez [gl],
+  Aurimas Černius [lt], Daniel [es], Andika Triwidada [id],
+  Andi Chandler [en_GB], Ask Hjorth Larsen [da], Aefgh Threenine [th],
+  Dušan Kazik [sk], Rūdolfs Mazurs [lv], Irénée THIRION [fr]
+
+47.rc
+=====
+* Misc. bug fixes and cleanups [Sophie; !333]
+
+Contributors:
+  Sophie Herold
+
+Translators:
+  Daniel Șerbănescu [ro], Giannis Antypas [el], Ekaterine Papava [ka],
+  Jordi Mas i Hernandez [ca], Yuri Chornoivan [uk], Jiri Grönroos [fi],
+  Daniel Rusek [cs], Vasil Pupkin [be], Luming Zh [zh_CN], Brage Fuglseth [nb],
+  Asier Sarasua Garmendia [eu], Danial Behzadi [fa], Rafael Fontenelle [pt_BR],
+  Quentin PAGÈS [oc], Anders Jonsson [sv], Jürgen Benvenuti [de],
+  Changwoo Ryu [ko], Hugo Carvalho [pt], Piotr Drąg [pl], Sabri Ünal [tr]
+
+47.beta
+=======
+* window-list: Modernize styling [Jakub; !330]
+* Include "status-icons" extension [Florian; !194]
+* Misc. bug fixes and cleanups [Florian; !328, !331, !327]
+
+Contributors:
+  Florian Müllner, Jakub Steiner
+
+Translators:
+  Sabri Ünal [tr], Chao-Hsiung Liao [zh_TW]
+
+47.alpha
+========
+* Improve workspace previews in window-list and workspace-indicator
+  [Florian; !307, !316]
+* apps-menu: Fix a11y of category labels [Florian; !319]
+* window-list: Fix long-press support [Florian; !320]
+* window-list: Animate transitions [Florian; !325]
+* Misc. bug fixes and cleanups [Florian; !315, !321, !324]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Jordi Mas i Hernandez [ca], Martin [sl], Hugo Carvalho [pt], Jose Riha [sk],
+  Scrambled 777 [hi], Artur S0 [ru], Милош Поповић [sr], Yosef Or Boczko [he],
+  Balázs Úr [hu]
+
+46.1
+====
+* screenshot-window-sizer: Add flathub-recommended size [Florian; !317]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Rachida SACI [kab], Matheus Polkorny [pt_BR], Fabio Tomat [fur]
+
+46.0
+====
+* system-monitor: Fix net speed [Florian; !313]
+* Misc. bug fixes and cleanups [Aral; !311]
+
+Contributors:
+  Aral Balkan, Florian Müllner
+
+Translators:
+  Anders Jonsson [sv], Piotr Drąg [pl], Balázs Úr [hu], Milo Casagrande [it],
+  Quentin PAGÈS [oc], Athmane MOKRAOUI [kab], Changwoo Ryu [ko],
+  Ask Hjorth Larsen [da]
+
+46.rc
+=====
+* Fix window previews in workspace indicator [Florian; !304]
+* Fix menu ornament in workspace indicator [Florian; !305]
+* Misc. bug fixes and cleanups [Florian; !306, !309]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Danial Behzadi [fa], Ekaterine Papava [ka], Sabri Ünal [tr], Artur S0 [ru],
+  Yuri Chornoivan [uk], Vasil Pupkin [be], Asier Sarasua Garmendia [eu],
+  Yaron Shahrabani [he], Brage Fuglseth [nb], Nathan Follens [nl],
+  Aurimas Černius [lt], Matej Urbančič [sl], Boyuan Yang [zh_CN],
+  Kukuh Syafaat [id], Fran Dieguez [gl], Andi Chandler [en_GB],
+  Baurzhan Muftakhidinov [kk], Rūdolfs Mazurs [lv], Guillaume Bernard [fr],
+  Daniel Mustieles [es], Jiri Grönroos [fi]
+
+46.beta
+=======
+* apps-menu: Rename Applications to Apps [Allan; !299]
+* Misc. bug fixes and cleanups [Florian; !296, !297, !300, !301, !302]
+
+Contributors:
+  Allan Day, Florian Müllner
+
+Translators:
+  Gabriel Brand [de], Daniel Rusek [cs], Fran Dieguez [gl],
+  Aefgh Threenine [th], Vasil Pupkin [be], Artur S0 [ru], Yosef Or Boczko [he],
+  Sabri Ünal [tr]
+
+46.alpha
+========
+* workspace-indicator: Fix initial preview visibility [Florian; !280, !292]
+* screenshot-window-sizer: Fix cycling between sizes backwards [Florian; !284]
+* Add back overview in Classic session [Florian; !287]
+* Allow running Classic session headless [Jonas; !289]
+* window-list: Fix buttons not being clickable at the screen edge
+  [Florian; !291]
+* Add system-monitor extension [Florian; !277]
+* Fixed crash [Florian; !290]
+* Misc. bug fixes and cleanups [Florian; !276, !275, !278, !281, !286, !288]
+
+Contributors:
+  Jonas Ådahl, Florian Müllner
+
+Translators:
+  Kristjan SCHMIDT [eo], Brage Fuglseth [nb]
+
+45.0
+====
+
+Contributors:
+  Andre Klapper
+
+Translators:
+  Bruce Cowan [en_GB]
+
 45.rc
 =====
 * Misc. bug fixes and cleanups [Florian; !267, !224, !272]

README.md

@@ -1,25 +1,34 @@
+<!--
+SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+SPDX-FileCopyrightText: 2011 Adam Dingle <adam@yorba.org>
+SPDX-FileCopyrightText: 2011 Vamsi Krishna Brahmajosyula <vamsikrishna.brahmajosyula@gmail.com>
+SPDX-FileCopyrightText: 2014 Michael Catanzaro <mcatanzaro@gnome.org>
+SPDX-FileCopyrightText: 2015 Florian Müllner <fmuellner@gnome.org>
+SPDX-FileCopyrightText: 2019 Fabian P. Schmidt <kerel-fs@gmx.de>
+SPDX-FileCopyrightText: 2024 Aral Balkan <aral@aralbalkan.com>"""
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
 # GNOME Shell Extensions
 
 GNOME Shell Extensions is a collection of extensions providing additional
 and optional functionality to GNOME Shell.
 
-Since GNOME Shell is not API stable, extensions work only against a very
+The extensions in this package are supported by GNOME and will be updated
-specific version of the shell, usually the same as this package (see
+to reflect future API changes in GNOME Shell.
-"configure --version"). The extensions in this package are supported by GNOME
-and will be updated to reflect future API changes in GNOME Shell.
 
-The GNOME wiki has more information about [GNOME Shell Extensions][project-page],
+Both the most recent stable release and the previous stable release of
-as well as some general information about [GNOME Shell][shell-page].
+GNOME Shell are actively supported, as well as the current development
+branch.
 
-Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
+Please refer to the [schedule] to see when a new version will be released.
+
+[schedule]: https://release.gnome.org/calendar
 
 ## Extensions
 
- * alternate-tab (**OBSOLETE**)
+The following is a complete list of extensions that are provided by this
- 
+project.
-     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
 
@@ -28,8 +37,7 @@ Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
  * auto-move-windows
 
      Lets you manage your workspaces more easily, assigning a specific workspace to
-each application as soon as it creates a window, in a manner configurable with a
+     each application as soon as it creates a window.
-GSettings key.
 
  * drive-menu
  
@@ -40,6 +48,11 @@ GSettings key.
 
      Changes application icons to always launch a new instance when activated.
 
+ * light-style
+
+    Changes the default shell style to "light", while still following the
+    system-wide "dark" preference.
+
  * native-window-placement
 
      An alternative algorithm for layouting the thumbnails in the windows overview, that
@@ -51,11 +64,19 @@ GSettings key.
 
  * screenshot-window-sizer
 
-     Adds a shortcut for resizing the focus window to a size that is suitable for GNOME Software screenshots
+     Adds a shortcut for resizing the focus window to a size that is suitable for GNOME Software screenshots. Ctrl + Alt + s cycles forwards through the available sizes and Ctrl + Alt + Shift + s cycles backwards.
+
+ * status-icons
+
+    Show (XEmbed) status icons in the top bar.
+
+ * system-monitor
+
+    Shows system usage information in the top bar.
 
  * user-theme
 
-     Loads a shell theme from ~/.themes/<name>/gnome-shell.
+     Loads a shell theme from `$XDG_DATA_HOME/themes/<name>/gnome-shell`.
 
  * window-list
 
@@ -69,18 +90,49 @@ GSettings key.
 
      Adds a simple workspace switcher to the top bar.
 
-## Default branch
+### Ex-Extensions
 
-The default development branch is `main`. If you still have a local
+  Occasionally over the years, some extensions were removed.
-checkout under the old name, use:
+
-```sh
+  The following list is not complete, but limited to cases that
-git checkout master
+  are notable for some reason; either the removal happened
-git branch -m master main
+  relatively recently, or the extension used to be particularly
-git fetch
+  popular in the past.
-git branch --unset-upstream
+
-git branch -u origin/master
+ * alternate-tab
-git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
+
-```
+     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.
+
+[alternatetab-post]: https://blogs.gnome.org/fmuellner/2018/10/11/the-future-of-alternatetab-and-why-you-need-not-worry/
+
+## Reporting bugs
+
+Bugs should be reported to the [issue tracking system][bug-tracker].
+
+The [GNOME handbook][bug-handbook] has useful information for creating
+effective issue reports.
+
+Please note that the issue tracker is meant to be used for
+actionable issues only.
+
+For support questions, feedback on changes or general discussions,
+you can use:
+
+ - the [#gnome-shell matrix room][matrix-room]
+ - the `Desktop` category or `extensions` and `shell` tags on [GNOME Discourse][discourse]
+
+[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
+[bug-handbook]: https://handbook.gnome.org/issues/reporting.html
+[matrix-room]: https://matrix.to/#/#gnome-shell:gnome.org
+[discourse]: https://discourse.gnome.org
+
+## Code of Conduct
+
+All interactions with the project should follow the [Code of Conduct][conduct].
+
+[conduct]: https://conduct.gnome.org/
 
 ## License
 
@@ -89,8 +141,4 @@ Public License, version 2 or later. See the [COPYING file][license] for details.
 Individual extensions may be licensed under different terms, see each source
 file for details.
 
-[project-page]: https://wiki.gnome.org/Projects/GnomeShell/Extensions
-[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/

REUSE.toml

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2024 Florian Müllner <fmuellner@gnome.org>
+# SPDX-License-Identifier: CC0-1.0
+
+version = 1
+SPDX-PackageName = "gnome-shell-extensions"
+SPDX-PackageSupplier = "Florian Müllner <fmuellner@gnome.org>"
+SPDX-PackageDownloadLocation = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions"
+
+[[annotations]]
+path = "NEWS"
+SPDX-FileCopyrightText = """
+2011 Giovanni Campagna <gcampagna@src.gnome.org>
+2013 Florian Müllner <fmuellner@gnome.org>"""
+SPDX-License-Identifier = "CC-BY-SA-4.0"
+
+[[annotations]]
+path = ["**.json.in", "**.desktop.in", "**.gschema.override"]
+SPDX-FileCopyrightText = "Florian Müllner <fmuellner@gnome.org>"
+SPDX-License-Identifier = "GPL-2.0-or-later"
+
+[[annotations]]
+# managed by translation teams
+path = "po/**.po"
+SPDX-FileCopyrightText = "GNOME Translation Teams <i18n@gnome.org>"
+SPDX-License-Identifier = "GPL-2.0-or-later"
+
+[[annotations]]
+# managed by translation teams
+path = ["po/LINGUAS", "po/POTFILES.in"]
+SPDX-FileCopyrightText = "No rights reserved"
+SPDX-License-Identifier = "CC0-1.0"

data/HACKING

@@ -1,2 +0,0 @@
-To update the gnome-shell-sass submodule to latest upstream commit:
-git submodule update --rebase

data/classic.json.in

@@ -1,11 +1,10 @@
 {
     "parentMode": "user",
     "colorScheme": "force-light",
-    "hasOverview": false,
     "showWelcomeDialog": false,
     "enabledExtensions": [@CLASSIC_EXTENSIONS@],
-    "panel": { "left": [],
+    "panel": { "left": ["activities"],
                "center": [],
-               "right": ["a11y", "keyboard", "dateMenu", "quickSettings"]
+               "right": ["screenRecording", "screenSharing", "dwellClick", "a11y", "keyboard", "dateMenu", "quickSettings"]
              }
 }

data/gnome-classic-wayland.desktop.in

@@ -6,3 +6,4 @@ TryExec=gnome-session
 Type=Application
 DesktopNames=GNOME-Classic;GNOME;
 X-GDM-SessionRegisters=true
+X-GDM-CanRunHeadless=true

data/gnome-classic.desktop.in

@@ -6,3 +6,4 @@ TryExec=gnome-session
 Type=Application
 DesktopNames=GNOME-Classic;GNOME;
 X-GDM-SessionRegisters=true
+X-GDM-CanRunHeadless=true

data/meson.build

@@ -2,41 +2,46 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+have_x11 = get_option('x11')
+
 session_desktop_base = 'gnome-classic'
 
 session_desktops = [
   session_desktop_base,
-  session_desktop_base + '-xorg',
   session_desktop_base + '-wayland',
 ]
 
-foreach name: session_desktops
+if have_x11
-    session_desktop = name + '.desktop'
+  session_desktops += [session_desktop_base + '-xorg']
-    if name.endswith('-xorg')
+endif
-        session_instdir = xsessiondir
+
-    elif name.endswith('-wayland')
+foreach name : session_desktops
-        session_instdir = wlsessiondir
+  session_desktop = name + '.desktop'
-    else
+  if name.endswith('-xorg')
-        # FIXME: The same target can not be copied into two directories.
+    session_instdir = xsessiondir
-        #        There is a workaround in meson/session-post-install.py until proper
+  elif name.endswith('-wayland')
-        #        solution arises:
+    session_instdir = wlsessiondir
-        #        https://github.com/mesonbuild/meson/issues/2416
+  else
-        session_instdir = xsessiondir
+# FIXME: The same target can not be copied into two directories.
-        #session_instdir = [ xesssiondir, wlsessiondir ]
+    #        There is a workaround in meson/session-post-install.py until proper
-    endif
+    #        solution arises:
-    i18n.merge_file(
+    #        https://github.com/mesonbuild/meson/issues/2416
-      input:  session_desktop + '.in',
+    session_instdir = wlsessiondir
-      output: session_desktop,
+  #session_instdir = [ xesssiondir, wlsessiondir ]
-      po_dir: '../po',
+  endif
-      install: true,
+  i18n.merge_file(
-      install_dir: session_instdir,
+    input: session_desktop + '.in',
-      type: 'desktop'
+    output: session_desktop,
-    )
+    po_dir: '../po',
+    install: true,
+    install_dir: session_instdir,
+    type: 'desktop',
+  )
 endforeach
 
 classic_uuids = []
 foreach e : classic_extensions
-    classic_uuids += e + uuid_suffix
+  classic_uuids += e + uuid_suffix
 endforeach
 
 mode_conf = configuration_data()
@@ -47,7 +52,7 @@ configure_file(
   input: mode_file + '.in',
   output: mode_file,
   configuration: mode_conf,
-  install_dir: modedir
+  install_dir: modedir,
 )
 
 classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'

debian/control

@@ -0,0 +1,309 @@
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Iain Lane <laney@debian.org>, Jeremy Bícha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>, Marco Trevisan (Treviño) <marco@ubuntu.com>
+Build-Depends: debhelper-compat (= 13),
+               dh-sequence-gnome,
+               dpkg-build-api (= 1),
+               libglib2.0-bin,
+               meson (>= 1.1.0),
+               sassc
+Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git -b debian/forky
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Section: oldlibs
+Architecture: all
+Depends: gnome-shell-extension-apps-menu,
+         gnome-shell-extension-auto-move-windows,
+         gnome-shell-extension-drive-menu,
+         gnome-shell-extension-launch-new-instance,
+         gnome-shell-extension-light-style,
+         gnome-shell-extension-native-window-placement,
+         gnome-shell-extension-places-menu,
+         gnome-shell-extensions-common,
+         gnome-shell-extension-screenshot-window-sizer,
+         gnome-shell-extension-system-monitor,
+         gnome-shell-extension-user-theme,
+         gnome-shell-extension-window-list,
+         gnome-shell-extension-windows-navigator,
+         gnome-shell-extension-workspace-indicator,
+         ${misc:Depends}
+Recommends: gnome-classic
+Description: Extensions to extend functionality of GNOME Shell
+ GNOME Shell is extensible using extensions. This package contains
+ all the official GNOME Shell extensions.
+ .
+ This is an empty transitional package and will likely be removed
+ in the future.
+
+Package: gnome-classic
+Architecture: all
+Depends: fonts-cantarell,
+         gnome-session,
+         gnome-session-bin (>= 46),
+         gnome-session-common (>= 46),
+         gnome-shell-extension-apps-menu,
+         gnome-shell-extension-places-menu,
+         gnome-shell-extension-launch-new-instance,
+         gnome-shell-extension-window-list,
+         xdg-desktop-portal-gnome,
+         ${misc:Depends}
+Recommends: gnome-classic-xsession
+Provides: x-session-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: Classic version of the GNOME desktop
+ This package contains the required components for the GNOME Classic
+ session, based on the GNOME Shell. It can be started from a display
+ manager such as GDM, and requires 3D acceleration to work properly.
+ .
+ The GNOME Shell provides core interface functions like switching
+ windows, launching applications or see your notifications. It takes
+ advantage of the capabilities of modern graphics hardware and
+ introduces innovative user interface concepts to provide a
+ delightful and easy to use experience. GNOME Shell is the defining
+ technology of the GNOME user experience.
+ .
+ GNOME Classic provides an alternative version of GNOME Shell that uses
+ more traditional design elements.
+
+Package: gnome-classic-xsession
+Architecture: all
+Depends: gnome-classic,
+         ${misc:Depends}
+Provides: x-session-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: Classic version of the GNOME desktop using Xorg
+ This package contains the required components for the GNOME Classic on Xorg
+ session, based on the GNOME Shell. It can be started from a display
+ manager such as GDM, and requires 3D acceleration to work properly.
+ .
+ The GNOME Shell provides core interface functions like switching
+ windows, launching applications or see your notifications. It takes
+ advantage of the capabilities of modern graphics hardware and
+ introduces innovative user interface concepts to provide a
+ delightful and easy to use experience. GNOME Shell is the defining
+ technology of the GNOME user experience.
+ .
+ GNOME Classic provides an alternative version of GNOME Shell that uses
+ more traditional design elements.
+
+Package: gnome-shell-extensions-common
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: common files for official GNOME Shell extensions
+ GNOME Shell is extensible using extensions. This package contains
+ common data files such as translations for the official GNOME Shell
+ extensions.
+
+Package: gnome-shell-extension-apps-menu
+Architecture: all
+Depends: gir1.2-gmenu-3.0,
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: Category based app menu for GNOME Shell
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to add a category based Apps menu
+ similar to what is found in classic desktops.
+ .
+ This package is part of the GNOME Classic default set of extensions.
+
+Package: gnome-shell-extension-auto-move-windows
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: GNOME Shell extension to move apps to specific workspaces
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to move apps to specific workspaces when
+ they create windows.
+
+Package: gnome-shell-extension-drive-menu
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: Removable drive status menu for GNOME Shell
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to add a status menu for accessing and
+ unmounting removable devices.
+
+Package: gnome-shell-extension-launch-new-instance
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: GNOME Shell extension to launch new instances of apps
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to always launch a new instance of an
+ app when clicking in the Dash or the application view.
+ .
+ This package is part of the GNOME Classic default set of extensions.
+
+Package: gnome-shell-extension-light-style
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: GNOME Shell extension to switch the Shell to light style
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to switch GNOME Shell to use a light
+ style instead of the default.
+
+Package: gnome-shell-extension-native-window-placement
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: GNOME Shell extension to arrange windows in a more compact way
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to arrange windows in the GNOME Shell
+ overview in a more compact way.
+
+Package: gnome-shell-extension-places-menu
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: Places menu for GNOME Shell
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to add a menu for quickly navigating to
+ places in the system, similar to the menu in GNOME 2.
+ .
+ This package is part of the GNOME Classic default set of extensions.
+
+Package: gnome-shell-extension-screenshot-window-sizer
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: GNOME Shell extension to resize windows for GNOME Software screenshots
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to resize windows to the recommended
+ size for creating screenshots for use in the GNOME Software app.
+
+Package: gnome-shell-extension-status-icons
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Description: GNOME Shell extension to show some status icons in the top bar
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to show some status icons in the top bar.
+
+Package: gnome-shell-extension-system-monitor
+Architecture: all
+Depends: gir1.2-gtop-2.0,
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: Display system information in GNOME Shell status bar
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to display system information such as
+ memory usage, cpu usage, network rates and more in the top bar.
+
+Package: gnome-shell-extension-user-theme
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: GNOME Shell extension to load alternative GNOME Shell themes
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to allow switching to alternative
+ GNOME Shell themes.
+
+Package: gnome-shell-extension-window-list
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: GNOME Shell extension to display a window list
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to display a window list at the bottom
+ of the screen.
+ .
+ This package is part of the GNOME Classic default set of extensions.
+
+Package: gnome-shell-extension-windows-navigator
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: GNOME Shell extension to allow keyboard selection in overlay mode
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to allow keyboard selections of windows
+ and workspaces in overlay mode. Ctrl+number selects a workspace and
+ Alt+number selects a window.
+
+Package: gnome-shell-extension-workspace-indicator
+Architecture: all
+Depends: gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gnome-shell-extensions-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
+Breaks: gnome-shell-extensions (<< 47)
+Replaces: gnome-shell-extensions (<< 47)
+Description: Workspace indicator for GNOME Shell
+ GNOME Shell is extensible using extensions. This package contains an
+ official GNOME Shell extension to add an indicator to the panel to
+ show what workspace you are using and allow you to switch to a different
+ workspace.

debian/copyright

@@ -0,0 +1,169 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://download.gnome.org/sources/gnome-shell-extensions/
+
+Files: *
+Copyright: 2011-2013 Giovanni Campagna
+           2013-2024 Florian Müllner
+           2011 Iranian Free Software Users Group (IFSUG.org) translation team
+           2021-2022 Alexander Shopov
+           2011-2023 Red Hat, Inc
+           2013 Rosetta Contributors and Canonical Ltd
+           Free Software Foundation, Inc
+           Rūdofls Mazurs
+           Ville-Pekka Vainio
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2011 Victor Seva <linuxmaniac@torreviejawireless.org>
+           2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
+License: GPL-2+
+
+Files: extensions/apps-menu/extension.js
+Copyright: 2011 Giovanni Campagna
+           2011 Vamsi Krishna Brahmajosyula
+           2013 Debarshi Ray
+           2013 Florian Müllner
+License: GPL-2+
+
+Files: extensions/auto-move-windows/extension.js
+Copyright: 2011 Alessandro Crismani
+           2011 Giovanni Campagna
+           2014 Florian Müllner
+License: GPL-2+
+
+Files: extensions/launch-new-instance/extension.js
+Copyright: 2013 Florian Müllner
+           2013 Gabriel Rossetti
+License: GPL-2+
+
+Files: extensions/native-window-placement/extension.js
+Copyright: 2011 Giovanni Campagna
+           2011 Stefano Facchini
+           2011 Wepmaschda
+           2015 Florian Müllner 
+License: GPL-2+
+
+Files: extensions/places-menu/extension.js
+Copyright: 2011 Giovanni Campagna
+           2011 Vamsi Krishna Brahmajosyula
+           2013 Florian Müllner
+           2016 Rémy Lefevre
+License: GPL-2+
+
+Files: extensions/places-menu/placeDisplay.js
+Copyright: 2012 Giovanni Campagna
+           2013 Debarshi Ray
+           2015 Florian Müllner
+           2016 Rémy Lefevre
+           2017 Christian Kellner
+License: GPL-2+
+
+Files: extensions/screenshot-window-sizer/extension.js
+Copyright: 2013 Owen Taylor
+           2013 Richard Hughes
+           2014 Florian Müllner
+           2016 Will Thompson
+           2017 Florian Müllner
+           2019 Adrien Plazas
+           2019 Willy Stadnick
+License: GPL-2+
+
+Files: extensions/status-icons/extension.js
+Copyright: 2018 Adel Gadllah
+           2018 Florian Müllner
+License: GPL-2+
+
+Files: extensions/system-monitor/icons/*
+Copyright: GNOME Design Team Icon Development Kit
+License: CC0-1.0
+
+Files: extensions/user-theme/extension.js
+Copyright: 2011 Elad Alfassa
+           2011 Giovanni Campagna
+           2011 John Stowers
+           2014 Florian Müllner
+License: GPL-2+
+
+Files: extensions/window-list/prefs.js
+Copyright: 2013 Florian Müllner
+           2014 Sylvain Pasche
+License: GPL-2+
+
+Files: extensions/window-list/stylesheet-light.css
+       extensions/workspace-indicator/stylesheet-light.css
+Copyright: 2011-2013 Giovanni Campagna
+           2013-2024 Florian Müllner
+License: GPL-2+
+
+Files: extensions/windowsNavigator/extension.js
+Copyright: 2011 Giovanni Campagna
+           2011, Maxim Ermilov
+           2017, Florian Müllner
+           2019, Marco Trevisan (Treviño)
+           2020, Thun Pin
+License: GPL-2+
+
+Files: extensions/windowsNavigator/stylesheet.css
+Copyright: 2011 Maxim Ermilov
+License: GPL-2+
+
+Files: extensions/workspace-indicator/stylesheet-dark.css
+Copyright: 2011 Erick Pérez Castellanos
+           2019 Florian Müllner
+License: GPL-2+
+
+Files: lint/eslintrc-gjs.yml
+Copyright: 2018 Claudio André
+License: Expat
+
+Files: lint/eslintrc-shell.yml
+Copyright: 2019 Florian Müllner
+License: Expat
+
+Files: meson/session-post-install.py
+Copyright: 2021, Neal Gompa
+License: GPL-2+
+
+License: CC0-1.0
+ To the extent possible under law, the author(s) have dedicated all copyright
+ and related and neighboring rights to this software to the public domain
+ worldwide. This software is distributed without any warranty.
+ .
+ You should have received a copy of the CC0 Public Domain Dedication along with
+ this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ .
+ On Debian systems, the complete text of the CC0 1.0 Universal license can be
+ found in "/usr/share/common-licenses/CC0-1.0".
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/docs

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

debian/gbp.conf

@@ -0,0 +1,17 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/forky
+upstream-branch = upstream/48.x
+
+[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/gnome-classic-xsession.install

@@ -0,0 +1 @@
+usr/share/xsessions

debian/gnome-classic.install

@@ -0,0 +1,4 @@
+debian/local/gnome-session-classic usr/bin
+usr/share/glib-2.0/schemas/00_org.gnome.shell.extensions.classic.gschema.override
+usr/share/gnome-shell/modes/classic.json
+usr/share/wayland-sessions

debian/gnome-shell-extension-apps-menu.install

@@ -0,0 +1,2 @@
+usr/share/glib-2.0/schemas/org.gnome.shell.extensions.apps-menu.gschema.xml
+usr/share/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-auto-move-windows.install

@@ -0,0 +1,2 @@
+usr/share/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
+usr/share/gnome-shell/extensions/auto-move-windows@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-drive-menu.install

@@ -0,0 +1 @@
+usr/share/gnome-shell/extensions/drive-menu@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-launch-new-instance.install

@@ -0,0 +1 @@
+usr/share/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-light-style.install

@@ -0,0 +1 @@
+usr/share/gnome-shell/extensions/light-style@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-native-window-placement.install

@@ -0,0 +1,2 @@
+usr/share/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
+usr/share/gnome-shell/extensions/native-window-placement@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-places-menu.install

@@ -0,0 +1 @@
+usr/share/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-screenshot-window-sizer.install

@@ -0,0 +1,2 @@
+usr/share/glib-2.0/schemas/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
+usr/share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-status-icons.install

@@ -0,0 +1 @@
+usr/share/gnome-shell/extensions/status-icons@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-system-monitor.install

@@ -0,0 +1,2 @@
+usr/share/glib-2.0/schemas/org.gnome.shell.extensions.system-monitor.gschema.xml
+usr/share/gnome-shell/extensions/system-monitor@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-user-theme.install

@@ -0,0 +1,2 @@
+usr/share/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
+usr/share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-window-list.install

@@ -0,0 +1,2 @@
+usr/share/glib-2.0/schemas/org.gnome.shell.extensions.window-list.gschema.xml
+usr/share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-windows-navigator.install

@@ -0,0 +1 @@
+usr/share/gnome-shell/extensions/windowsNavigator@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-workspace-indicator.install

@@ -0,0 +1,2 @@
+usr/share/glib-2.0/schemas/org.gnome.shell.extensions.workspace-indicator.gschema.xml
+usr/share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extensions-common.install

@@ -0,0 +1 @@
+usr/share/locale

debian/local/gnome-session-classic

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

debian/rules

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

debian/source/format

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

debian/upstream/metadata

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

debian/watch

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

export-zips.sh

@@ -8,16 +8,16 @@ srcdir=`dirname $0`
 srcdir=`(cd $srcdir && pwd)`
 
 builddir=`mktemp -p $srcdir -d _build.XXXXXX` || exit 1
-installdir=`mktemp -p $srcdir -d _install.XXXXXX` || exit 1
+destdir=`mktemp -p $srcdir -d _dest.XXXXXX` || exit 1
 
-meson setup --prefix=$installdir -Dextension_set=all $srcdir $builddir
+meson setup --prefix=/usr -Dextension_set=all $srcdir $builddir
-meson install -C $builddir
+meson install --destdir $destdir -C $builddir
 
 rm -rf $srcdir/zip-files
 mkdir $srcdir/zip-files
 
-extensiondir=$installdir/share/gnome-shell/extensions
+extensiondir=$destdir/usr/share/gnome-shell/extensions
-schemadir=$installdir/share/glib-2.0/schemas
+schemadir=$destdir/usr/share/glib-2.0/schemas
 
 for f in $extensiondir/*; do
   name=`basename ${f%%@*}`
@@ -39,7 +39,9 @@ for f in $extensiondir/*; do
   fi
 
   cp $srcdir/NEWS $srcdir/COPYING $f
-  sources=(NEWS COPYING $(cd $f; ls *.js))
+  sources=(NEWS COPYING $(cd $f; ls *.js *.css 2>/dev/null))
+
+  [ -d $f/icons ] && sources+=(icons)
 
   [ -f $schema ] || unset schema
 
@@ -48,4 +50,4 @@ for f in $extensiondir/*; do
 done
 
 rm -rf $builddir
-rm -rf $installdir
+rm -rf $destdir

extensions/apps-menu/extension.js

@@ -5,7 +5,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-/* -*- 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';
@@ -45,8 +44,9 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._app = app;
         this._button = button;
 
-        this._iconBin = new St.Bin();
+        this._icon = this.getDragActor();
-        this.add_child(this._iconBin);
+        this._icon.style_class = 'icon-dropshadow';
+        this.add_child(this._icon);
 
         let appLabel = new St.Label({
             text: app.get_name(),
@@ -56,11 +56,6 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         this.add_child(appLabel);
         this.label_actor = appLabel;
 
-        let textureCache = St.TextureCache.get_default();
-        textureCache.connectObject('icon-theme-changed',
-            () => this._updateIcon(), this);
-        this._updateIcon();
-
         this._delegate = this;
         let draggable = DND.makeDraggable(this);
 
@@ -70,6 +65,8 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
                 return maybeStartDrag.call(draggable, event);
             return false;
         };
+
+        this.connect('notify::active', this._onActiveChanged.bind(this));
     }
 
     activate(event) {
@@ -81,10 +78,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         Main.overview.hide();
     }
 
-    setActive(active, params) {
+    _onActiveChanged() {
-        if (active)
+        if (!this.active)
-            this._button.scrollToButton(this);
+            return;
-        super.setActive(active, params);
+
+        this._button.scrollToButton(this);
     }
 
     setDragEnabled(enabled) {
@@ -96,13 +94,7 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     getDragActorSource() {
-        return this._iconBin;
+        return this._icon;
-    }
-
-    _updateIcon() {
-        let icon = this.getDragActor();
-        icon.style_class = 'icon-dropshadow';
-        this._iconBin.set_child(icon);
     }
 }
 
@@ -125,7 +117,10 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         else
             name = _('Favorites');
 
-        this.add_child(new St.Label({text: name}));
+        const label = new St.Label({text: name});
+        this.add_child(label);
+        this.actor.label_actor = label;
+
         this.connect('motion-event', this._onMotionEvent.bind(this));
         this.connect('notify::active', this._onActiveChanged.bind(this));
     }
@@ -214,9 +209,9 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._grab?.dismiss();
         delete this._grab;
 
-        let source = event.get_source();
+        const targetActor = global.stage.get_event_actor(event);
-        if (source instanceof St.Widget)
+        if (targetActor instanceof St.Widget)
-            source.sync_hover();
+            targetActor.sync_hover();
 
         return false;
     }
@@ -255,7 +250,7 @@ class DesktopTarget extends EventEmitter {
         this._desktopDestroyedId = 0;
 
         this._windowAddedId =
-            global.window_group.connect('actor-added',
+            global.window_group.connect('child-added',
                 this._onWindowAdded.bind(this));
 
         global.get_window_actors().forEach(a => {
@@ -363,6 +358,20 @@ class DesktopTarget extends EventEmitter {
     }
 }
 
+class MainLayout extends Clutter.BoxLayout {
+    static {
+        GObject.registerClass(this);
+    }
+
+    vfunc_get_preferred_height(container, forWidth) {
+        const [mainChild] = container;
+        const [minHeight, natHeight] =
+            mainChild.get_preferred_height(forWidth);
+
+        return [minHeight, natHeight + MENU_HEIGHT_OFFSET];
+    }
+}
+
 class ApplicationsButton extends PanelMenu.Button {
     static {
         GObject.registerClass(this);
@@ -380,12 +389,12 @@ class ApplicationsButton extends PanelMenu.Button {
         this.accessible_role = Atk.Role.LABEL;
 
         this._label = new St.Label({
-            text: _('Applications'),
+            text: _('Apps'),
             y_expand: true,
             y_align: Clutter.ActorAlign.CENTER,
         });
 
-        this.add_actor(this._label);
+        this.add_child(this._label);
         this.name = 'panelApplications';
         this.label_actor = this._label;
 
@@ -432,15 +441,6 @@ class ApplicationsButton extends PanelMenu.Button {
         }
     }
 
-    _createVertSeparator() {
-        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();
 
@@ -462,21 +462,6 @@ class ApplicationsButton extends PanelMenu.Button {
         return super._onMenuKeyPress(actor, event);
     }
 
-    _onVertSepRepaint(area) {
-        let cr = area.get_context();
-        let themeNode = area.get_theme_node();
-        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;
-        cr.moveTo(x, 0);
-        cr.lineTo(x, height);
-        Clutter.cairo_set_source_color(cr, stippleColor);
-        cr.setDash([1, 3], 1); // Hard-code for now
-        cr.setLineWidth(stippleWidth);
-        cr.stroke();
-    }
-
     _onOpenStateChanged(menu, open) {
         if (open) {
             if (this.reloadFlag) {
@@ -503,7 +488,7 @@ class ApplicationsButton extends PanelMenu.Button {
                 let id;
                 try {
                     id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
-                } catch (e) {
+                } catch {
                     continue;
                 }
                 let app = appSys.lookup_app(id);
@@ -522,7 +507,7 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     scrollToButton(button) {
-        let appsScrollBoxAdj = this.applicationsScrollBox.get_vscroll_bar().get_adjustment();
+        let appsScrollBoxAdj = this.applicationsScrollBox.get_vadjustment();
         let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
         let currentScrollValue = appsScrollBoxAdj.get_value();
         let boxHeight = appsScrollBoxAlloc.y2 - appsScrollBoxAlloc.y1;
@@ -537,7 +522,7 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     scrollToCatButton(button) {
-        let catsScrollBoxAdj = this.categoriesScrollBox.get_vscroll_bar().get_adjustment();
+        let catsScrollBoxAdj = this.categoriesScrollBox.get_vadjustment();
         let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
         let currentScrollValue = catsScrollBoxAdj.get_value();
         let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
@@ -554,43 +539,35 @@ class ApplicationsButton extends PanelMenu.Button {
     _createLayout() {
         let section = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(section);
-        this.mainBox = new St.BoxLayout({vertical: false});
+        this.mainBox = new St.BoxLayout({layoutManager: new MainLayout()});
-        this.leftBox = new St.BoxLayout({vertical: true});
+        this.leftBox = new St.BoxLayout({
+            orientation: Clutter.Orientation.VERTICAL,
+        });
         this.applicationsScrollBox = new St.ScrollView({
             style_class: 'apps-menu vfade',
             x_expand: true,
         });
-        this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        let vscroll = this.applicationsScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => {
-            this.menu.passEvents = true;
-        });
-        vscroll.connect('scroll-stop', () => {
-            this.menu.passEvents = false;
-        });
         this.categoriesScrollBox = new St.ScrollView({
             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);
 
-        this.applicationsBox = new St.BoxLayout({vertical: true});
+        this.applicationsBox = new St.BoxLayout({
-        this.applicationsScrollBox.add_actor(this.applicationsBox);
+            orientation: Clutter.Orientation.VERTICAL,
-        this.categoriesBox = new St.BoxLayout({vertical: true});
+        });
-        this.categoriesScrollBox.add_actor(this.categoriesBox);
+        this.applicationsScrollBox.set_child(this.applicationsBox);
+        this.categoriesBox = new St.BoxLayout({
+            orientation: Clutter.Orientation.VERTICAL,
+        });
+        this.categoriesScrollBox.set_child(this.categoriesBox);
 
-        this.mainBox.add(this.leftBox);
+        this.mainBox.add_child(this.leftBox);
-        this.mainBox.add_child(this._createVertSeparator());
         this.mainBox.add_child(this.applicationsScrollBox);
-        section.actor.add_actor(this.mainBox);
+        section.actor.add_child(this.mainBox);
     }
 
     _display() {
         this._applicationsButtons.clear();
-        this.mainBox.style = 'width: 35em;';
         this.mainBox.hide();
 
         // Load categories
@@ -598,7 +575,7 @@ class ApplicationsButton extends PanelMenu.Button {
         this._tree.load_sync();
         let root = this._tree.get_root_directory();
         let categoryMenuItem = new CategoryMenuItem(this, null);
-        this.categoriesBox.add_actor(categoryMenuItem);
+        this.categoriesBox.add_child(categoryMenuItem);
         let iter = root.iter();
         let nextType;
         while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) {
@@ -614,18 +591,12 @@ class ApplicationsButton extends PanelMenu.Button {
             this._loadCategory(categoryId, dir);
             if (this.applicationsByCategory[categoryId].length > 0) {
                 categoryMenuItem = new CategoryMenuItem(this, dir);
-                this.categoriesBox.add_actor(categoryMenuItem);
+                this.categoriesBox.add_child(categoryMenuItem);
             }
         }
 
         // 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`;
     }
 
     selectCategory(dir) {
@@ -633,7 +604,7 @@ class ApplicationsButton extends PanelMenu.Button {
             if (c._delegate instanceof PopupMenu.PopupSeparatorMenuItem)
                 c._delegate.destroy();
             else
-                this.applicationsBox.remove_actor(c);
+                this.applicationsBox.remove_child(c);
         });
 
         if (dir)
@@ -656,7 +627,7 @@ class ApplicationsButton extends PanelMenu.Button {
                 this._applicationsButtons.set(app, item);
             }
             if (!item.get_parent())
-                this.applicationsBox.add_actor(item);
+                this.applicationsBox.add_child(item);
         }
     }
 

extensions/apps-menu/metadata.json.in

@@ -3,8 +3,8 @@
 "uuid": "@uuid@",
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
-"name": "Applications Menu",
+"name": "Apps 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.",
+"description": "Add a category-based menu for apps.\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": [ "e2002@bk.ru", "debarshir@gnome.org" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"

extensions/apps-menu/stylesheet.css

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+.apps-menu {width: 26em;}
+
 .apps-menu:ltr {
     padding-right: 3px;
 }

extensions/auto-move-windows/extension.js

@@ -4,9 +4,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// Start apps on custom workspaces
-
 import Shell from 'gi://Shell';
 
 import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
@@ -22,7 +19,8 @@ class WindowMover {
         this._appSystem.connectObject('installed-changed',
             () => this._updateAppData(), this);
 
-        this._settings.connect('changed', this._updateAppConfigs.bind(this));
+        this._settings.connectObject('changed',
+            this._updateAppConfigs.bind(this), this);
         this._updateAppConfigs();
     }
 
@@ -58,11 +56,8 @@ class WindowMover {
 
     destroy() {
         this._appSystem.disconnectObject(this);
-
+        this._settings.disconnectObject(this);
-        if (this._settings) {
+        this._settings = null;
-            this._settings.run_dispose();
-            this._settings = null;
-        }
 
         this._appConfigs.clear();
         this._updateAppData();

extensions/auto-move-windows/prefs.js

@@ -3,9 +3,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- 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';
@@ -45,11 +42,11 @@ class NewItemModel extends GObject.Object {
 class Rule extends GObject.Object {
     static [GObject.properties] = {
         'app-info': GObject.ParamSpec.object(
-            'app-info', 'app-info', 'app-info',
+            'app-info', null, null,
             GObject.ParamFlags.READWRITE,
             Gio.DesktopAppInfo),
         'workspace': GObject.ParamSpec.uint(
-            'workspace', 'workspace', 'workspace',
+            'workspace', null, null,
             GObject.ParamFlags.READWRITE,
             1, WORKSPACE_MAX, 1),
     };
@@ -196,7 +193,7 @@ class AutoMoveSettingsWidget extends Adw.PreferencesGroup {
 class WorkspaceSelector extends Gtk.Widget {
     static [GObject.properties] = {
         'number': GObject.ParamSpec.uint(
-            'number', 'number', 'number',
+            'number', null, null,
             GObject.ParamFlags.READWRITE,
             1, WORKSPACE_MAX, 1),
     };

extensions/drive-menu/extension.js

@@ -39,8 +39,6 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         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',
@@ -50,7 +48,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
             style_class: 'button',
         });
         ejectButton.connect('clicked', this._eject.bind(this));
-        this.add(ejectButton);
+        this.add_child(ejectButton);
 
         this.hide();
 

extensions/launch-new-instance/metadata.json.in

@@ -3,7 +3,7 @@
 "uuid": "@uuid@",
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
-"name": "Launch new instance",
+"name": "Launch New Instance",
 "description": "Always launch a new instance when clicking in the dash or the application view.\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.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"

extensions/meson.build

@@ -16,18 +16,20 @@ foreach e : enabled_extensions
   metadata_conf.set('gschemaname', 'org.gnome.shell.extensions.' + e)
   metadata_conf.set('gettext_domain', gettext_domain)
   metadata_conf.set('shell_current', shell_version)
-  metadata_conf.set('url', 'https://gitlab.gnome.org/GNOME/gnome-shell-extensions')
+  metadata_conf.set(
+    'url',
+    'https://gitlab.gnome.org/GNOME/gnome-shell-extensions',
+  )
 
   extension_sources = files(e + '/extension.js')
   extension_data = []
 
   subdir(e)
 
-  install_data (extension_sources + extension_data,
+  install_data(
-    install_dir: join_paths(extensiondir, uuid)
+    extension_sources + extension_data,
+    install_dir: join_paths(extensiondir, uuid),
   )
 endforeach
 
-install_data (extension_schemas,
+install_data(extension_schemas, install_dir: schemadir)
-  install_dir: schemadir
-)

extensions/native-window-placement/extension.js

@@ -5,7 +5,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 import Clutter from 'gi://Clutter';
 
 import {Extension, InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';

extensions/places-menu/extension.js

@@ -5,7 +5,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-/* -*- 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';
@@ -20,32 +19,17 @@ import {PlacesManager} from './placeDisplay.js';
 
 const N_ = x => x;
 
-const PLACE_ICON_SIZE = 16;
+class PlaceMenuItem extends PopupMenu.PopupImageMenuItem {
-
-class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
     static {
         GObject.registerClass(this);
     }
 
     constructor(info) {
-        super({
+        super(info.name, info.icon, {
             style_class: 'place-menu-item',
         });
         this._info = info;
 
-        this._icon = new St.Icon({
-            gicon: info.icon,
-            icon_size: PLACE_ICON_SIZE,
-        });
-        this.add_child(this._icon);
-
-        this._label = new St.Label({
-            text: info.name,
-            x_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
-        this.add_child(this._label);
-
         if (info.isRemovable()) {
             this._ejectIcon = new St.Icon({
                 icon_name: 'media-eject-symbolic',
@@ -70,8 +54,8 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _propertiesChanged(info) {
-        this._icon.gicon = info.icon;
+        this.setIcon(info.icon);
-        this._label.text = info.name;
+        this.label.text = info.name;
     }
 }
 
@@ -95,7 +79,7 @@ class PlacesMenu extends PanelMenu.Button {
             y_expand: true,
             y_align: Clutter.ActorAlign.CENTER,
         });
-        this.add_actor(label);
+        this.add_child(label);
 
         this.placesManager = new PlacesManager();
 

extensions/places-menu/placeDisplay.js

@@ -6,7 +6,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- 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';
@@ -24,13 +23,6 @@ Gio._promisify(Gio.File.prototype, 'mount_enclosing_volume');
 
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
 
-const Hostname1Iface = '<node> \
-<interface name="org.freedesktop.hostname1"> \
-<property name="PrettyHostname" type="s" access="read" /> \
-</interface> \
-</node>';
-const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);
-
 class PlaceInfo extends EventEmitter {
     constructor(...params) {
         super();
@@ -61,15 +53,15 @@ class PlaceInfo extends EventEmitter {
                 return;
             }
 
-            let source = {
+            const source = {
-                get_icon: () => this.icon,
+                get_drive: () => null,
             };
             let op = new ShellMountOperation.ShellMountOperation(source);
             try {
                 await this.file.mount_enclosing_volume(0, op.mountOp, null);
 
                 if (tryMount)
-                    this._ensureMountAndLaunch(context, false);
+                    this._ensureMountAndLaunch(context, false).catch(logError);
             } catch (e) {
                 if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
                     Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message);
@@ -81,7 +73,7 @@ class PlaceInfo extends EventEmitter {
 
     launch(timestamp) {
         let launchContext = global.create_app_launch_context(timestamp, -1);
-        this._ensureMountAndLaunch(launchContext, true);
+        this._ensureMountAndLaunch(launchContext, true).catch(logError);
     }
 
     getIcon() {
@@ -130,46 +122,20 @@ class PlaceInfo extends EventEmitter {
     }
 }
 
-class RootInfo extends PlaceInfo {
+class NautilusSpecialInfo extends PlaceInfo {
-    _init() {
+    constructor(file, name, icon) {
-        super._init('devices', Gio.File.new_for_path('/'), _('Computer'));
+        super('special', file, name, icon);
 
-        let busName = 'org.freedesktop.hostname1';
+        const appSystem = Shell.AppSystem.get_default();
-        let objPath = '/org/freedesktop/hostname1';
+        this._app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
-        new Hostname1(Gio.DBus.system, busName, objPath, (obj, error) => {
-            if (error)
-                return;
-
-            this._proxy = obj;
-            this._proxy.connect('g-properties-changed',
-                this._propertiesChanged.bind(this));
-            this._propertiesChanged(obj);
-        });
     }
 
-    getIcon() {
+    launch(timestamp) {
-        return new Gio.ThemedIcon({name: 'drive-harddisk-symbolic'});
+        const launchContext = global.create_app_launch_context(timestamp, -1);
-    }
+        this._app.appInfo.launch([this.file], launchContext);
-
-    _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.emit('changed');
-        }
-    }
-
-    destroy() {
-        if (this._proxy) {
-            this._proxy.run_dispose();
-            this._proxy = null;
-        }
-        super.destroy();
     }
 }
 
-
 class PlaceDeviceInfo extends PlaceInfo {
     _init(kind, mount) {
         this._mount = mount;
@@ -248,14 +214,6 @@ class PlaceVolumeInfo extends PlaceInfo {
     }
 }
 
-const DEFAULT_DIRECTORIES = [
-    GLib.UserDirectory.DIRECTORY_DOCUMENTS,
-    GLib.UserDirectory.DIRECTORY_PICTURES,
-    GLib.UserDirectory.DIRECTORY_MUSIC,
-    GLib.UserDirectory.DIRECTORY_DOWNLOAD,
-    GLib.UserDirectory.DIRECTORY_VIDEOS,
-];
-
 export class PlacesManager extends EventEmitter {
     constructor() {
         super();
@@ -270,6 +228,12 @@ export class PlacesManager extends EventEmitter {
         this._settings = new Gio.Settings({schema_id: BACKGROUND_SCHEMA});
         this._settings.connectObject('changed::show-desktop-icons',
             () => this._updateSpecials(), this);
+
+        this._privacySettings = new Gio.Settings({
+            schema_id: 'org.gnome.desktop.privacy',
+        });
+        this._privacySettings.connectObject('changed::remember-recent-files',
+            () => this._updateSpecials(), this);
         this._updateSpecials();
 
         /*
@@ -315,6 +279,9 @@ export class PlacesManager extends EventEmitter {
         this._settings?.disconnectObject(this);
         this._settings = null;
 
+        this._privacySettings.disconnectObject(this);
+        this._privacySettings = null;
+
         this._volumeMonitor.disconnectObject(this);
 
         if (this._monitor)
@@ -323,42 +290,68 @@ export class PlacesManager extends EventEmitter {
             GLib.source_remove(this._bookmarkTimeoutId);
     }
 
+    _shouldShowRecent() {
+        const vfs = Gio.Vfs.get_default();
+        const schemes = vfs.get_supported_uri_schemes();
+        return this._privacySettings.get_boolean('remember-recent-files') &&
+            schemes.includes('recent');
+    }
+
     _updateSpecials() {
         this._places.special.forEach(p => p.destroy());
         this._places.special = [];
 
-        let homePath = GLib.get_home_dir();
+        const appSystem = Shell.AppSystem.get_default();
+        const nautilusApp = appSystem.lookup_app('org.gnome.Nautilus.desktop');
+        const defaultFm = Gio.AppInfo.get_default_for_type('inode/directory', true);
+        const showNautilusSpecials =
+            nautilusApp && defaultFm && nautilusApp.appInfo.equal(defaultFm);
+
+        const homeFile = Gio.File.new_for_path(GLib.get_home_dir());
 
         this._places.special.push(new PlaceInfo(
             'special',
-            Gio.File.new_for_path(homePath),
+            homeFile,
             _('Home')));
 
-        let specials = [];
+        if (this._shouldShowRecent()) {
-        let dirs = DEFAULT_DIRECTORIES.slice();
+            this._places.special.push(new PlaceInfo(
-
+                'special',
-        if (this._settings.get_boolean('show-desktop-icons'))
+                Gio.File.new_for_uri('recent:///'),
-            dirs.push(GLib.UserDirectory.DIRECTORY_DESKTOP);
+                _('Recent')));
-
-        for (let i = 0; i < dirs.length; i++) {
-            let specialPath = GLib.get_user_special_dir(dirs[i]);
-            if (!specialPath || 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;
-            }
-
-            specials.push(info);
         }
 
-        specials.sort((a, b) => GLib.utf8_collate(a.name, b.name));
+        if (showNautilusSpecials) {
-        this._places.special = this._places.special.concat(specials);
+            this._places.special.push(new NautilusSpecialInfo(
+                Gio.File.new_for_uri('starred:///'),
+                _('Starred'),
+                'starred-symbolic'));
+        }
+
+        if (this._settings.get_boolean('show-desktop-icons')) {
+            const desktopPath = GLib.get_user_special_dir(
+                GLib.UserDirectory.DIRECTORY_DESKTOP);
+            const desktopFile = desktopPath
+                ? Gio.File.new_for_path(desktopPath)
+                : null;
+
+            if (desktopFile && !desktopFile.equal(homeFile)) {
+                this._places.special.push(
+                    new PlaceInfo('special', desktopFile));
+            }
+        }
+
+        if (showNautilusSpecials) {
+            this._places.special.push(new NautilusSpecialInfo(
+                Gio.File.new_for_uri('x-network-view:///'),
+                _('Network'),
+                'network-workgroup-symbolic'));
+        }
+
+        this._places.special.push(new PlaceInfo(
+            'special',
+            Gio.File.new_for_uri('trash:///'),
+            _('Trash')));
 
         this.emit('special-updated');
     }
@@ -372,14 +365,6 @@ export class PlacesManager extends EventEmitter {
         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'));
-
         /* first go through all connected drives */
         let drives = this._volumeMonitor.get_connected_drives();
         for (let i = 0; i < drives.length; i++) {
@@ -511,30 +496,12 @@ export class PlacesManager extends EventEmitter {
     }
 
     _addMount(kind, mount) {
-        let devItem;
+        const devItem = new PlaceDeviceInfo(kind, mount);
-
-        try {
-            devItem = new PlaceDeviceInfo(kind, mount);
-        } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                return;
-            throw e;
-        }
-
         this._places[kind].push(devItem);
     }
 
     _addVolume(kind, volume) {
-        let volItem;
+        const volItem = new PlaceVolumeInfo(kind, volume);
-
-        try {
-            volItem = new PlaceVolumeInfo(kind, volume);
-        } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                return;
-            throw e;
-        }
-
         this._places[kind].push(volItem);
     }
 

extensions/screenshot-window-sizer/extension.js

@@ -24,6 +24,7 @@ export default class ScreenshotWindowSizerExtension extends Extension {
         [624, 351],
         [800, 450],
         [1024, 576],
+        [1000, 700],
         [1200, 675],
         [1600, 900],
         [360, 654], // Phone portrait maximized
@@ -33,7 +34,7 @@ export default class ScreenshotWindowSizerExtension extends Extension {
     _flashMessage(message) {
         if (!this._text) {
             this._text = new St.Label({style_class: 'screenshot-sizer-message'});
-            Main.uiGroup.add_actor(this._text);
+            Main.uiGroup.add_child(this._text);
         }
 
         this._text.remove_all_transitions();
@@ -62,13 +63,11 @@ export default class ScreenshotWindowSizerExtension extends Extension {
     /**
      * @param {Meta.Display} display - the display
      * @param {Meta.Window=} window - for per-window bindings, the window
+     * @param {Clutter.Event} event - the triggering event
      * @param {Meta.KeyBinding} binding - the key binding
      */
-    _cycleScreenshotSizes(display, window, binding) {
+    _cycleScreenshotSizes(display, window, event, binding) {
-        // Probably this isn't useful with 5 sizes, but you can decrease instead
+        const backwards = binding.is_reversed();
-        // 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)
@@ -99,7 +98,7 @@ export default class ScreenshotWindowSizerExtension extends Extension {
 
         // get the next size up or down from ideal
         let newIndex = (nearestIndex + (backwards ? -1 : 1)) % scaledSizes.length;
-        let [newWidth, newHeight] = scaledSizes[newIndex];
+        let [newWidth, newHeight] = scaledSizes.at(newIndex);
 
         // Push the window onscreen if it would be resized offscreen
         let newX = outerRect.x;

extensions/screenshot-window-sizer/metadata.json.in

@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Screenshot Window Sizer",
-"description": "Resize windows for GNOME Software screenshots",
+"description": "Resize windows for GNOME Software screenshots with Ctrl+Alt+s shortcut",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }

extensions/status-icons/extension.js

@@ -0,0 +1,91 @@
+// SPDX-FileCopyrightText: 2018 Adel Gadllah <adel.gadllah@gmail.com>
+// SPDX-FileCopyrightText: 2018 Florian Müllner <fmuellner@gnome.org>
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import Clutter from 'gi://Clutter';
+import Shell from 'gi://Shell';
+import St from 'gi://St';
+
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import {Button as PanelButton} from 'resource:///org/gnome/shell/ui/panelMenu.js';
+
+const PANEL_ICON_SIZE = 16;
+
+const STANDARD_TRAY_ICON_IMPLEMENTATIONS = [
+    'bluetooth-applet',
+    'gnome-sound-applet',
+    'nm-applet',
+    'gnome-power-manager',
+    'keyboard',
+    'a11y-keyboard',
+    'kbd-scrolllock',
+    'kbd-numlock',
+    'kbd-capslock',
+    'ibus-ui-gtk',
+];
+
+export default class SysTray {
+    constructor() {
+        this._icons = new Map();
+        this._tray = null;
+    }
+
+    _onTrayIconAdded(o, icon) {
+        let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
+        if (STANDARD_TRAY_ICON_IMPLEMENTATIONS.includes(wmClass))
+            return;
+
+        let button = new PanelButton(0.5, null, true);
+
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        let iconSize = PANEL_ICON_SIZE * scaleFactor;
+
+        icon.set({
+            width: iconSize,
+            height: iconSize,
+            x_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER,
+        });
+
+        let iconBin = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            style_class: 'system-status-icon',
+        });
+        iconBin.add_child(icon);
+        button.add_child(iconBin);
+
+        this._icons.set(icon, button);
+
+        button.connect('button-release-event',
+            (actor, event) => icon.click(event));
+        button.connect('key-press-event',
+            (actor, event) => icon.click(event));
+
+        const role = `${icon}`;
+        Main.panel.addToStatusArea(role, button);
+    }
+
+    _onTrayIconRemoved(o, icon) {
+        const button = this._icons.get(icon);
+        button?.destroy();
+        this._icons.delete(icon);
+    }
+
+    enable() {
+        this._tray = new Shell.TrayManager();
+        this._tray.connect('tray-icon-added',
+            this._onTrayIconAdded.bind(this));
+        this._tray.connect('tray-icon-removed',
+            this._onTrayIconRemoved.bind(this));
+        this._tray.manage_screen(Main.panel);
+    }
+
+    disable() {
+        this._icons.forEach(button => button.destroy());
+        this._icons.clear();
+
+        this._tray.unmanage_screen();
+        this._tray = null;
+    }
+}

extensions/status-icons/meson.build

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2018 Florian Müllner <fmuellner@gnome.org>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)

extensions/status-icons/metadata.json.in

@@ -0,0 +1,10 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "Status Icons",
+"description": "Show status icons in the top bar",
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}

extensions/system-monitor/extension.js

@@ -0,0 +1,489 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Florian Müllner <fmuellner@gnome.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+import Clutter from 'gi://Clutter';
+import Gio from 'gi://Gio';
+import GLib from 'gi://GLib';
+import GObject from 'gi://GObject';
+import GTop from 'gi://GTop';
+import Pango from 'gi://Pango';
+import Shell from 'gi://Shell';
+import St from 'gi://St';
+
+import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.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 Main from 'resource:///org/gnome/shell/ui/main.js';
+
+const THRESHOLD_HIGH = 0.80;
+
+// adapted from load-graph.cpp in gnome-system-monitor
+/**
+ * @param {string} str
+ * @returns {number}
+ */
+function strHash(str) {
+    let hash = 0xcbf29ce484222325n;
+
+    for (const c of str)
+        hash = (hash * 0x00000100000001B3n) ^ BigInt(c.codePointAt(0));
+    return hash;
+}
+
+class StatSection extends St.BoxLayout {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(iconName, accessibleName) {
+        super({
+            style_class: 'system-monitor-stat-section',
+            accessibleName,
+        });
+
+        const ext = Extension.lookupByURL(import.meta.url);
+        const file =
+            ext.dir.resolve_relative_path(`icons/${iconName}.svg`);
+
+        this._icon = new St.Icon({
+            style_class: 'system-monitor-stat-section-icon',
+            gicon: new Gio.FileIcon({file}),
+        });
+        this.add_child(this._icon);
+
+        this.label = new St.Label({
+            style_class: 'system-monitor-stat-section-label',
+            y_align: Clutter.ActorAlign.CENTER,
+        });
+        this.label.clutter_text.set({
+            ellipsize: Pango.EllipsizeMode.NONE,
+            x_align: Clutter.ActorAlign.CENTER,
+        });
+        this.add_child(this.label);
+
+        this.connect('destroy', () => this._clearTimeout());
+        this.connect('notify::visible', () => this._sync());
+        this._sync();
+    }
+
+    _ensureTimeout() {
+        if (this._updateId)
+            return;
+
+        this._updateId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 1,
+            () => {
+                this._update();
+                return GLib.SOURCE_CONTINUE;
+            });
+    }
+
+    _clearTimeout() {
+        if (this._updateId)
+            GLib.source_remove(this._updateId);
+        delete this._updateId;
+    }
+
+    _sync() {
+        if (this.visible)
+            this._ensureTimeout();
+        else
+            this._clearTimeout();
+
+        if (this.visible)
+            this._update();
+    }
+
+    _update() {
+    }
+}
+
+class LoadStatSection extends StatSection {
+    static {
+        GObject.registerClass(this);
+    }
+
+    #formatter = new Intl.NumberFormat(undefined, {
+        style: 'percent',
+    });
+
+    _getLoadValue() {
+    }
+
+    _update() {
+        const load = this._getLoadValue();
+        this.label.text = this.#formatter.format(load);
+
+        if (load >= THRESHOLD_HIGH)
+            this.add_style_class_name('high-usage');
+        else
+            this.remove_style_class_name('high-usage');
+    }
+}
+
+class CpuSection extends LoadStatSection {
+    static {
+        GObject.registerClass(this);
+    }
+
+    #prevCpu = new GTop.glibtop_cpu();
+
+    constructor() {
+        super('processor-symbolic', _('CPU stats'));
+    }
+
+    _getLoadValue() {
+        const cpu = new GTop.glibtop_cpu();
+        GTop.glibtop_get_cpu(cpu);
+
+        const total = cpu.total - this.#prevCpu.total;
+        const user = cpu.user - this.#prevCpu.user;
+        const sys = cpu.sys - this.#prevCpu.sys;
+        const nice = cpu.nice - this.#prevCpu.nice;
+
+        this.#prevCpu = cpu;
+
+        return (user + sys + nice) / Math.max(total, 1.0);
+    }
+}
+
+class MemSection extends LoadStatSection {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super('memory-symbolic', _('Memory stats'));
+    }
+
+    _getLoadValue() {
+        const mem = new GTop.glibtop_mem();
+        GTop.glibtop_get_mem(mem);
+
+        const {user, total} = mem;
+        return user / Math.max(total, 1.0);
+    }
+}
+
+class SwapSection extends LoadStatSection {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super('swap-symbolic', _('Swap stats'));
+    }
+
+    _getLoadValue() {
+        const swap = new GTop.glibtop_swap();
+        GTop.glibtop_get_swap(swap);
+
+        const {used, total} = swap;
+        return used / Math.max(total, 1.0);
+    }
+}
+
+class NetStatSection extends StatSection {
+    static {
+        GObject.registerClass(this);
+    }
+
+    #formats = [{
+        factor: 1000,
+        unitFactor: 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'kilobyte',
+            maximumFractionDigits: 1,
+            minimumFractionDigits: 1,
+        }),
+    }, {
+        factor: 1000 * 10,
+        unitFactor: 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'kilobyte',
+            maximumFractionDigits: 0,
+        }),
+    }, {
+        factor: 1000 * 1000,
+        unitFactor: 1000 * 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'megabyte',
+            maximumFractionDigits: 1,
+            minimumFractionDigits: 1,
+        }),
+    }, {
+        factor: 1000 * 1000 * 10,
+        unitFactor: 1000 * 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'megabyte',
+            maximumFractionDigits: 0,
+        }),
+    }, {
+        factor: 1000 * 1000 * 1000,
+        unitFactor: 1000 * 1000 * 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'gigabyte',
+            maximumFractionDigits: 1,
+            minimumFractionDigits: 1,
+        }),
+    }, {
+        factor: 1000 * 1000 * 1000 * 10,
+        unitFactor: 1000 * 1000 * 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'gigabyte',
+            maximumFractionDigits: 0,
+        }),
+    }, {
+        factor: 1000 * 1000 * 1000 * 1000,
+        unitFactor: 1000 * 1000 * 1000 * 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'terabyte',
+            maximumFractionDigits: 1,
+            minimumFractionDigits: 1,
+        }),
+    }, {
+        factor: 1000 * 1000 * 1000 * 1000 * 10,
+        unitFactor: 1000 * 1000 * 1000 * 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'terabyte',
+            maximumFractionDigits: 0,
+        }),
+    }, {
+        factor: 1000 * 1000 * 1000 * 1000 * 1000,
+        unitFactor: 1000 * 1000 * 1000 * 1000 * 1000,
+        formatter: new Intl.NumberFormat(undefined, {
+            style: 'unit',
+            unit: 'petabyte',
+            maximumFractionDigits: 1,
+            minimumFractionDigits: 1,
+        }),
+    }];
+
+    #lastBytes = 0;
+    #lastHash = 0;
+    #lastTime = 0;
+
+    _getBytes(_netload) {
+    }
+
+    _getFormat(bytes) {
+        for (let i = 1; i < this.#formats.length; i++) {
+            if (bytes < this.#formats.at(i).factor)
+                return this.#formats.at(i - 1);
+        }
+        return this.#formats.at(-1);
+    }
+
+    _update() {
+        const FLAG_LOOPBACK = 1 << 4; // GTop sucks
+
+        const netlist = new GTop.glibtop_netlist();
+        const ifnames = GTop.glibtop_get_netlist(netlist);
+
+        let bytes = 0;
+        let hash = 1n;
+
+        for (const ifname of ifnames) {
+            const netload = new GTop.glibtop_netload();
+            GTop.glibtop_get_netload(netload, ifname);
+
+            if (netload.if_flags & FLAG_LOOPBACK)
+                continue;
+
+            bytes += this._getBytes(netload);
+            hash += strHash(ifname);
+        }
+
+        const time = GLib.get_monotonic_time();
+
+        let dbytes = 0;
+
+        // Skip calculation if new data is less than old (interface
+        // removed, counters reset, ...) or if it is the first time
+        if (bytes >= this.#lastBytes &&
+            hash === this.#lastHash &&
+            this.#lastTime !== 0) {
+            const dtime = (time - this.#lastTime) / GLib.USEC_PER_SEC;
+            dbytes = (bytes - this.#lastBytes) / dtime;
+        }
+
+        this.#lastBytes = bytes;
+        this.#lastTime = time;
+        this.#lastHash = hash;
+
+        const {unitFactor, formatter} = this._getFormat(dbytes);
+        this.label.text = formatter.format(dbytes / unitFactor);
+    }
+}
+
+class UploadSection extends NetStatSection {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super('upload-symbolic', _('Upload stats'));
+    }
+
+    _getBytes(netload) {
+        return netload.bytes_out;
+    }
+}
+
+class DownloadSection extends NetStatSection {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor() {
+        super('download-symbolic', _('Download stats'));
+    }
+
+    _getBytes(netload) {
+        return netload.bytes_in;
+    }
+}
+
+class Indicator extends PanelMenu.Button {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(settings) {
+        super(0.5, _('System stats'));
+
+        this._settings = settings;
+        this.connect('destroy',
+            () => (this._settings = null));
+
+        const box = new St.BoxLayout({
+            styleClass: 'system-monitor-stat-sections',
+        });
+
+        this.add_child(box);
+
+        this._placeholder = new St.Icon({
+            styleClass: 'system-status-icon system-monitor-placeholder',
+        });
+        box.add_child(this._placeholder);
+
+        this._cpuSection = new CpuSection();
+        this._settings.bind('show-cpu',
+            this._cpuSection, 'visible',
+            Gio.SettingsBindFlags.GET);
+        box.add_child(this._cpuSection);
+
+        this._memSection = new MemSection();
+        this._settings.bind('show-memory',
+            this._memSection, 'visible',
+            Gio.SettingsBindFlags.GET);
+        box.add_child(this._memSection);
+
+        this._swapSection = new SwapSection();
+        this._settings.bind('show-swap',
+            this._swapSection, 'visible',
+            Gio.SettingsBindFlags.GET);
+        box.add_child(this._swapSection);
+
+        this._ulSection = new UploadSection();
+        this._settings.bind('show-upload',
+            this._ulSection, 'visible',
+            Gio.SettingsBindFlags.GET);
+        box.add_child(this._ulSection);
+
+        this._dlSection = new DownloadSection();
+        this._settings.bind('show-download',
+            this._dlSection, 'visible',
+            Gio.SettingsBindFlags.GET);
+        box.add_child(this._dlSection);
+
+        this.menu.addMenuItem(
+            new PopupMenu.PopupSeparatorMenuItem(_('Show')));
+
+        this._cpuItem = this.menu.addAction(_('CPU'),
+            () => this._toggleSettings('show-cpu'));
+        this._memItem = this.menu.addAction(_('Memory'),
+            () => this._toggleSettings('show-memory'));
+        this._swapItem = this.menu.addAction(_('Swap'),
+            () => this._toggleSettings('show-swap'));
+        this._ulItem = this.menu.addAction(_('Upload'),
+            () => this._toggleSettings('show-upload'));
+        this._dlItem = this.menu.addAction(_('Download'),
+            () => this._toggleSettings('show-download'));
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        this._appMenuItem = this.menu.addAction(_('Open System Monitor'),
+            () => this._openSystemMonitor());
+
+        const appSystem = Shell.AppSystem.get_default();
+        appSystem.connectObject('installed-changed',
+            () => this._updateSystemMonitorApp(), this);
+        this._updateSystemMonitorApp();
+
+        this._settings.connectObject('changed',
+            () => this._sync(), this);
+        this._sync();
+    }
+
+    _updateSystemMonitorApp() {
+        const appSystem = Shell.AppSystem.get_default();
+        this._systemMonitorApp =
+            appSystem.lookup_app('org.gnome.SystemMonitor.desktop');
+        this._placeholder.gicon = this._systemMonitorApp?.icon ?? null;
+        this.visible = this._systemMonitorApp != null;
+    }
+
+    _openSystemMonitor() {
+        this._systemMonitorApp.activate();
+        Main.overview.hide();
+    }
+
+    _toggleSettings(key) {
+        this._settings.set_boolean(key, !this._settings.get_boolean(key));
+    }
+
+    _sync() {
+        this._cpuItem.setOrnament(this._settings.get_boolean('show-cpu')
+            ? PopupMenu.Ornament.CHECK
+            : PopupMenu.Ornament.NONE);
+        this._memItem.setOrnament(this._settings.get_boolean('show-memory')
+            ? PopupMenu.Ornament.CHECK
+            : PopupMenu.Ornament.NONE);
+        this._swapItem.setOrnament(this._settings.get_boolean('show-swap')
+            ? PopupMenu.Ornament.CHECK
+            : PopupMenu.Ornament.NONE);
+        this._ulItem.setOrnament(this._settings.get_boolean('show-upload')
+            ? PopupMenu.Ornament.CHECK
+            : PopupMenu.Ornament.NONE);
+        this._dlItem.setOrnament(this._settings.get_boolean('show-download')
+            ? PopupMenu.Ornament.CHECK
+            : PopupMenu.Ornament.NONE);
+
+        this._placeholder.visible =
+            this._settings.list_keys().every(key => !this._settings.get_boolean(key));
+    }
+}
+
+export default class SystemMonitorExtension extends Extension {
+    enable() {
+        this._indicator = new Indicator(this.getSettings());
+        Main.panel.addToStatusArea(this.uuid, this._indicator);
+    }
+
+    disable() {
+        this._indicator.destroy();
+        this._indicator = null;
+    }
+}

extensions/system-monitor/icons/download-symbolic.svg

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <filter id="a" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix color-interpolation-filters="sRGB" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="b">
+        <g filter="url(#a)">
+            <path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.5"/>
+        </g>
+    </mask>
+    <clipPath id="c">
+        <path d="m 0 0 h 1600 v 1200 h -1600 z"/>
+    </clipPath>
+    <mask id="d">
+        <g filter="url(#a)">
+            <path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.7"/>
+        </g>
+    </mask>
+    <clipPath id="e">
+        <path d="m 0 0 h 1600 v 1200 h -1600 z"/>
+    </clipPath>
+    <mask id="f">
+        <g filter="url(#a)">
+            <path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="g">
+        <path d="m 0 0 h 1600 v 1200 h -1600 z"/>
+    </clipPath>
+    <g mask="url(#b)">
+        <g clip-path="url(#c)" transform="matrix(1 0 0 1 -920 -120)">
+            <path d="m 550 182 c -0.351562 0.003906 -0.695312 0.101562 -1 0.28125 v 3.4375 c 0.304688 0.179688 0.648438 0.277344 1 0.28125 c 1.105469 0 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 5 c -0.339844 0 -0.679688 0.058594 -1 0.175781 v 6.824219 h 4 v -4 c 0 -1.65625 -1.34375 -3 -3 -3 z m 0 0"/>
+        </g>
+    </g>
+    <g mask="url(#d)">
+        <g clip-path="url(#e)" transform="matrix(1 0 0 1 -920 -120)">
+            <path d="m 569 182 v 4 c 1.105469 0 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 5 v 7 h 3 v -4 c 0 -1.65625 -1.34375 -3 -3 -3 z m 0 0"/>
+        </g>
+    </g>
+    <g mask="url(#f)">
+        <g clip-path="url(#g)" transform="matrix(1 0 0 1 -920 -120)">
+            <path d="m 573 182.269531 v 3.449219 c 0.613281 -0.355469 0.996094 -1.007812 1 -1.71875 c 0 -0.714844 -0.382812 -1.375 -1 -1.730469 z m 0 4.90625 v 6.824219 h 2 v -4 c 0 -1.269531 -0.800781 -2.402344 -2 -2.824219 z m 0 0"/>
+        </g>
+    </g>
+    <path d="m 7.984375 1 c -0.550781 0 -1 0.449219 -1 1 v 8.585938 l -2.292969 -2.292969 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 s -0.519531 0.105469 -0.707031 0.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 l 4 4 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 l 4 -4 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 s -1.023437 -0.390625 -1.414062 0 l -2.292969 2.292969 v -8.585938 c 0 -0.550781 -0.445313 -1 -1 -1 z m 0 0"/>
+</svg>

extensions/system-monitor/icons/download-symbolic.svg.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: Icon Development Kit
+
+SPDX-License-Identifier: CC0-1.0

extensions/system-monitor/icons/memory-symbolic.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 3 2 c -1.660156 0 -3 1.339844 -3 3 v 4 c 0 1.660156 1.339844 3 3 3 h 10 c 1.660156 0 3 -1.339844 3 -3 v -4 c 0 -1.660156 -1.339844 -3 -3 -3 z m 0 2 h 10 c 0.554688 0 1 0.445312 1 1 v 4 c 0 0.554688 -0.445312 1 -1 1 h -10 c -0.554688 0 -1 -0.445312 -1 -1 v -4 c 0 -0.554688 0.445312 -1 1 -1 z m 0 0"/><path d="m 2 10 h 12 v 4 h -12 z m 0 0"/><g fill-opacity="0.501961"><path d="m 4 5 h 2 v 4 h -2 z m 0 0"/><path d="m 7 5 h 2 v 4 h -2 z m 0 0"/><path d="m 10 5 h 2 v 4 h -2 z m 0 0"/></g></svg>

extensions/system-monitor/icons/memory-symbolic.svg.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: Icon Development Kit
+
+SPDX-License-Identifier: CC0-1.0

extensions/system-monitor/icons/processor-symbolic.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 5 5 h 6 v 6 h -6 z m 0 0"/><path d="m 13 5 h 3 v 1 h -3 z m 0 0"/><path d="m 13 7 h 3 v 1 h -3 z m 0 0"/><path d="m 13 9 h 3 v 1 h -3 z m 0 0"/><path d="m 0 6 h 3 v 1 h -3 z m 0 0"/><path d="m 0 8 h 3 v 1 h -3 z m 0 0"/><path d="m 0 10 h 3 v 1 h -3 z m 0 0"/><path d="m 5 0 h 1 v 3 h -1 z m 0 0"/><path d="m 7 0 h 1 v 3 h -1 z m 0 0"/><path d="m 9 0 h 1 v 3 h -1 z m 0 0"/><path d="m 10 13 h 1 v 3 h -1 z m 0 0"/><path d="m 8 13 h 1 v 3 h -1 z m 0 0"/><path d="m 6 13 h 1 v 3 h -1 z m 0 0"/><path d="m 5 2 c -1.644531 0 -3 1.355469 -3 3 v 6 c 0 1.644531 1.355469 3 3 3 h 6 c 1.644531 0 3 -1.355469 3 -3 v -6 c 0 -1.644531 -1.355469 -3 -3 -3 z m 0 2 h 6 c 0.570312 0 1 0.429688 1 1 v 6 c 0 0.570312 -0.429688 1 -1 1 h -6 c -0.570312 0 -1 -0.429688 -1 -1 v -6 c 0 -0.570312 0.429688 -1 1 -1 z m 0 0"/></svg>

extensions/system-monitor/icons/processor-symbolic.svg.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: Icon Development Kit
+
+SPDX-License-Identifier: CC0-1.0

extensions/system-monitor/icons/swap-symbolic.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 5 7 c -0.308594 0 -0.613281 0.089844 -0.8125 0.28125 l -3.59375 3.71875 l 3.65625 3.71875 c 0.199219 0.191406 0.441406 0.28125 0.75 0.28125 h 1 v -1 c 0 -0.257812 -0.128906 -0.527344 -0.3125 -0.71875 l -1.28125 -1.28125 h 4.59375 c 0.527344 0.007812 1 -0.472656 1 -1 s -0.472656 -1.007812 -1 -1 h -4.625 l 1.21875 -1.28125 c 0.183594 -0.191406 0.40625 -0.460938 0.40625 -0.71875 v -1 z m 0 0"/><path d="m 11 9 c 0.308594 0 0.613281 -0.089844 0.8125 -0.28125 l 3.59375 -3.71875 l -3.65625 -3.71875 c -0.199219 -0.191406 -0.441406 -0.28125 -0.75 -0.28125 h -1 v 1 c 0 0.257812 0.128906 0.527344 0.3125 0.71875 l 1.28125 1.28125 h -4.59375 c -0.527344 -0.007812 -1 0.472656 -1 1 s 0.472656 1.007812 1 1 h 4.625 l -1.21875 1.28125 c -0.183594 0.191406 -0.40625 0.460938 -0.40625 0.71875 v 1 z m 0 0"/></svg>

extensions/system-monitor/icons/swap-symbolic.svg.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: Icon Development Kit
+
+SPDX-License-Identifier: CC0-1.0

extensions/system-monitor/icons/upload-symbolic.svg

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <filter id="a" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix color-interpolation-filters="sRGB" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="b">
+        <g filter="url(#a)">
+            <path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.5"/>
+        </g>
+    </mask>
+    <clipPath id="c">
+        <path d="m 0 0 h 1600 v 1200 h -1600 z"/>
+    </clipPath>
+    <mask id="d">
+        <g filter="url(#a)">
+            <path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.7"/>
+        </g>
+    </mask>
+    <clipPath id="e">
+        <path d="m 0 0 h 1600 v 1200 h -1600 z"/>
+    </clipPath>
+    <mask id="f">
+        <g filter="url(#a)">
+            <path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.35"/>
+        </g>
+    </mask>
+    <clipPath id="g">
+        <path d="m 0 0 h 1600 v 1200 h -1600 z"/>
+    </clipPath>
+    <g mask="url(#b)">
+        <g clip-path="url(#c)" transform="matrix(1 0 0 1 -900 -120)">
+            <path d="m 550 182 c -0.351562 0.003906 -0.695312 0.101562 -1 0.28125 v 3.4375 c 0.304688 0.179688 0.648438 0.277344 1 0.28125 c 1.105469 0 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 5 c -0.339844 0 -0.679688 0.058594 -1 0.175781 v 6.824219 h 4 v -4 c 0 -1.65625 -1.34375 -3 -3 -3 z m 0 0"/>
+        </g>
+    </g>
+    <g mask="url(#d)">
+        <g clip-path="url(#e)" transform="matrix(1 0 0 1 -900 -120)">
+            <path d="m 569 182 v 4 c 1.105469 0 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 5 v 7 h 3 v -4 c 0 -1.65625 -1.34375 -3 -3 -3 z m 0 0"/>
+        </g>
+    </g>
+    <g mask="url(#f)">
+        <g clip-path="url(#g)" transform="matrix(1 0 0 1 -900 -120)">
+            <path d="m 573 182.269531 v 3.449219 c 0.613281 -0.355469 0.996094 -1.007812 1 -1.71875 c 0 -0.714844 -0.382812 -1.375 -1 -1.730469 z m 0 4.90625 v 6.824219 h 2 v -4 c 0 -1.269531 -0.800781 -2.402344 -2 -2.824219 z m 0 0"/>
+        </g>
+    </g>
+    <path d="m 8.015625 15 c 0.550781 0 1 -0.449219 1 -1 v -8.585938 l 2.292969 2.292969 c 0.1875 0.1875 0.441406 0.292969 0.707031 0.292969 s 0.519531 -0.105469 0.707031 -0.292969 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 l -4 -4 c -0.390625 -0.390625 -1.023437 -0.390625 -1.414062 0 l -4 4 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 s 1.023437 0.390625 1.414062 0 l 2.292969 -2.292969 v 8.585938 c 0 0.550781 0.445313 1 1 1 z m 0 0"/>
+</svg>

extensions/system-monitor/icons/upload-symbolic.svg.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: Icon Development Kit
+
+SPDX-License-Identifier: CC0-1.0

extensions/system-monitor/meson.build

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)
+
+extension_data += files('stylesheet.css')
+extension_schemas += files('schemas/' + metadata_conf.get('gschemaname') + '.gschema.xml')
+
+install_subdir('icons', install_dir: join_paths(extensiondir, uuid))

extensions/system-monitor/metadata.json.in

@@ -0,0 +1,10 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "System Monitor",
+"description": "Monitor system from the top bar",
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}

extensions/system-monitor/schemas/org.gnome.shell.extensions.system-monitor.gschema.xml

@@ -0,0 +1,31 @@
+<!--
+SPDX-FileCopyrightText: 2023 Florian Müllner <fmuellner@gnome.org>
+
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
+
+<schemalist gettext-domain="gnome-shell-extensions">
+  <schema id="org.gnome.shell.extensions.system-monitor"
+          path="/org/gnome/shell/extensions/system-monitor/">
+    <key name="show-cpu" type="b">
+      <default>true</default>
+      <summary>Show CPU usage</summary>
+    </key>
+    <key name="show-memory" type="b">
+      <default>true</default>
+      <summary>Show memory usage</summary>
+    </key>
+    <key name="show-swap" type="b">
+      <default>true</default>
+      <summary>Show swap usage</summary>
+    </key>
+    <key name="show-upload" type="b">
+      <default>true</default>
+      <summary>Show upload</summary>
+    </key>
+    <key name="show-download" type="b">
+      <default>true</default>
+      <summary>Show download</summary>
+    </key>
+  </schema>
+</schemalist>

extensions/system-monitor/stylesheet.css

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Florian Müllner <fmuellner@gnome.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+.system-monitor-stat-section {
+  padding: 0 6px;
+}
+
+.system-monitor-stat-section-icon {icon-size: 1.08em;}
+.system-monitor-stat-section-label {
+  min-width: 3.0em;
+  font-size: 0.9em;
+ }
+.system-monitor-placeholder {-st-icon-style: symbolic;}
+
+.panel-button .high-usage {color: #ff7800;}

extensions/user-theme/extension.js

@@ -5,9 +5,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// Load shell theme from ~/.local/share/themes/name/gnome-shell
-
 import Gio from 'gi://Gio';
 
 import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
@@ -21,12 +18,13 @@ const SETTINGS_KEY = 'name';
 export default class ThemeManager extends Extension {
     enable() {
         this._settings = this.getSettings();
-        this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
+        this._settings.connectObject(`changed::${SETTINGS_KEY}`,
+            this._changeTheme.bind(this), this);
         this._changeTheme();
     }
 
     disable() {
-        this._settings?.run_dispose();
+        this._settings?.disconnectObject();
         this._settings = null;
 
         Main.setThemeStylesheet(null);

extensions/user-theme/prefs.js

@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- 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 */
 
@@ -36,7 +34,7 @@ class UserThemePrefsWidget extends Adw.PreferencesGroup {
         this._actionGroup.add_action(
             this._settings.create_action('name'));
 
-        this.connect('destroy', () => this._settings.run_dispose());
+        this.connect('destroy', () => (this._settings = null));
 
         this._rows = new Map();
         this._addTheme(''); // default

extensions/window-list/meson.build

@@ -12,5 +12,33 @@ extension_data += files(
   'stylesheet-light.css'
 )
 
-extension_sources += files('prefs.js', 'windowPicker.js', 'workspaceIndicator.js')
+transform_stylesheet = [
+   'sed', '-E',
+   '-e', 's:^\.(workspace-indicator):.window-list-\\1:',
+   '-e', '/^@import/d',
+   '@INPUT@',
+ ]
+
+workspaceIndicatorSources = [
+  configure_file(
+    input: '../workspace-indicator/workspaceIndicator.js',
+    output: '@PLAINNAME@',
+    copy: true,
+  ),
+ configure_file(
+   input: '../workspace-indicator/stylesheet-dark.css',
+   output: 'stylesheet-workspace-switcher-dark.css',
+   command: transform_stylesheet,
+   capture: true,
+ ),
+ configure_file(
+   input: '../workspace-indicator/stylesheet-light.css',
+   output: 'stylesheet-workspace-switcher-light.css',
+   command: transform_stylesheet,
+   capture: true,
+ ),
+ files('../workspace-indicator/workspacePrefs.js'),
+]
+
+extension_sources += files('prefs.js') + workspaceIndicatorSources
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

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

@@ -36,5 +36,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
         only on the primary one.
       </description>
     </key>
+    <key name="embed-previews" type="b">
+      <default>true</default>
+      <summary>Show workspace previews in window list</summary>
+    </key>
   </schema>
 </schemalist>

extensions/window-list/prefs.js

@@ -3,7 +3,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- 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';
@@ -12,13 +11,18 @@ import Gtk from 'gi://Gtk';
 
 import {ExtensionPreferences, gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
 
-class WindowListPrefsWidget extends Adw.PreferencesPage {
+import {WorkspacesPage} from './workspacePrefs.js';
+
+class WindowListPage extends Adw.PreferencesPage {
     static {
         GObject.registerClass(this);
     }
 
     constructor(settings) {
-        super();
+        super({
+            title: _('Window List'),
+            icon_name: 'focus-windows-symbolic',
+        });
 
         this._actionGroup = new Gio.SimpleActionGroup();
         this.insert_action_group('window-list', this._actionGroup);
@@ -30,6 +34,8 @@ class WindowListPrefsWidget extends Adw.PreferencesPage {
             this._settings.create_action('show-on-all-monitors'));
         this._actionGroup.add_action(
             this._settings.create_action('display-all-workspaces'));
+        this._actionGroup.add_action(
+            this._settings.create_action('embed-previews'));
 
         const groupingGroup = new Adw.PreferencesGroup({
             title: _('Window Grouping'),
@@ -58,34 +64,24 @@ class WindowListPrefsWidget extends Adw.PreferencesPage {
         const miscGroup = new Adw.PreferencesGroup();
         this.add(miscGroup);
 
-        let toggle = new Gtk.Switch({
+        let row = new Adw.SwitchRow({
-            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,
+            action_name: 'window-list.show-on-all-monitors',
         });
-        row.add_suffix(toggle);
         miscGroup.add(row);
 
-        toggle = new Gtk.Switch({
+        row = new Adw.SwitchRow({
-            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,
+            action_name: 'window-list.display-all-workspaces',
         });
-        row.add_suffix(toggle);
         miscGroup.add(row);
     }
 }
 
 export default class WindowListPrefs extends ExtensionPreferences {
-    getPreferencesWidget() {
+    fillPreferencesWindow(window) {
-        return new WindowListPrefsWidget(this.getSettings());
+        const settings = this.getSettings();
+        window.add(new WindowListPage(settings));
+        window.add(new WorkspacesPage(settings));
     }
 }

extensions/window-list/stylesheet-dark.css

@@ -4,117 +4,111 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+@import url("stylesheet-workspace-switcher-dark.css");
 
 .window-list {
-	spacing: 2px;
+  spacing: 2px;
-	font-size: 10pt;
+  font-size: 10pt;
 }
 
 .bottom-panel {
-	background-color: #000000;
+  background-color: #000000;
-	border-top-width: 0px;
+  border-top-width: 0px;
-	padding: 2px;
+  height: 2.45em;
 }
 
-.window-button {
+.window-button,
-	padding: 2px, 1px;
+.window-button-drag-actor {
+  padding: 4px, 3px;
+}
+
+.window-button-drag-actor {
+  background-color: #444;
+  border-radius: 7px;
+  border-width: 2px;
+  border-color: #fff;
+  box-shadow: 0 1px 2px rgba(0,0,0,0.1);
 }
 
 .window-button:first-child:ltr {
-	padding-left: 2px;
+  padding-left: 2px;
 }
 
 .window-button:last-child:rtl {
-	padding-right: 2px;
+  padding-right: 2px;
 }
 
 .window-button-box {
-	spacing: 4px;
+  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;
+  color: #fff;
-	max-width: 18.75em;
+  background-color: transparent;
+  border-radius: 4px;
+  padding: 3px 6px 1px;
+  transition: 100ms ease;
 }
 
-.window-button:hover > StWidget,
+.window-button > StWidget,
-.window-picker-toggle:hover > StWidget {
+.window-list .placeholder {
-	color: #fff;
+  -st-natural-width: 18.75em;
-	background-color: #303030;
+  max-width: 18.75em;
+}
+
+.window-list .placeholder {
+  border: 1px solid rgba(255,255,255,0.4);
+  border-radius: 7px;
+  margin: 4px;
+}
+
+.window-button:hover > StWidget {
+  background-color: #303030;
 }
 
 .window-button:active > StWidget,
 .window-button:focus > StWidget {
-	color: #fff;
+  background-color: st-lighten(#303030, 5%);
-	background-color: #3f3f3f;
 }
 
-.window-button.focused > StWidget,
+.window-button.focused > StWidget {
-.window-picker-toggle:checked > StWidget {
+  background-color: #5b5b5b;
-	color: #fff;
-	background-color: #3f3f3f;
 }
 
-.window-button.focused:active > StWidget,
+  .window-button.focused:hover > StWidget {
-.window-picker-toggle:checked:active > StWidget {
+    background-color: st-lighten(#5b5b5b, 5%);
-	color: #fff;
+  }
-	background-color: #3f3f3f;
+
-}
+  .window-button.focused:active > StWidget {
+    background-color: st-lighten(#5b5b5b, 10%);
+  }
 
 .window-button.minimized > StWidget {
-	color: #666;
+  color: #666;
-	background-color: #161616;
+  background-color: #161616;
 }
 
 .window-button.minimized:active > StWidget {
-	color: #666;
+  color: #666;
-	background-color: #161616;
+  background-color: #161616;
 }
 
 .window-button-icon {
-	width: 24px;
+  width: 24px;
-	height: 24px;
+  height: 24px;
 }
 
-.window-list-workspace-indicator .status-label-bin {
+.window-button-abstract-label {
-	background-color: rgba(200, 200, 200, 0.3);
+  background-color: #888;
-	padding: 0 3px;
+  border-radius: 99px;
-	margin: 3px;
+  margin: 6px;
 }
 
-.window-list-workspace-indicator .workspaces-box {
+.window-button-attention-indicator {
-	spacing: 3px;
+  background-color: -st-accent-color;
-	padding: 3px;
+  height: 2px;
 }
 
-.window-list-workspace-indicator .workspace {
+.window-button.minimized .window-button-attention-indicator {
-	width: 52px;
+  background-color: st-transparentize(-st-accent-color, 0.4);
-	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

@@ -6,70 +6,61 @@
  */
 
 @import url("stylesheet-dark.css");
+@import url("stylesheet-workspace-switcher-light.css");
 
 #panel.bottom-panel {
     border-top-width: 1px;
     border-bottom-width: 0px;
-    height: 2.25em ;
+    height: 2.5em;
-    padding: 2px;
   }
 
-  .bottom-panel .window-button > StWidget,
+  .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 {
+ .window-button > StWidget {
-    -st-natural-width: 18.7em;
+  color: #000;
-    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 {
+.window-button:hover > StWidget {
-  border-color: #888;
+  background-color: st-darken(#eee,5%);
 }
 
-.window-list-window-preview {
+.window-button:active > StWidget,
-  background-color: #ededed;
+.window-button:focus > StWidget {
-  border: 1px solid #ccc;
+  background-color: st-darken(#eee, 10%);
 }
 
-.window-list-window-preview.active {
+.window-button.focused > StWidget {
-  background-color: #f6f5f4;
+  background-color: st-darken(#eee,15%);
+}
+
+  .window-button.focused:hover > StWidget {
+    background-color: st-darken(#eee, 20%);
+  }
+
+  .window-button.focused:active > StWidget {
+    background-color: st-darken(#eee, 25%);
+  }
+
+.window-button.minimized > StWidget {
+  color: #aaa;
+  background-color: #f9f9f9;
+}
+
+.window-button.minimized:active > StWidget {
+  color: #aaa;
+  background-color: #f9f9f9;
+}
+
+.window-button-drag-actor {
+  background-color: #ddd;
+    border-color: #888;
+}
+
+.window-list .placeholder {
+  border-color: rgba(0,0,0,0.5);
 }

extensions/window-list/windowPicker.js

@@ -1,342 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Florian Müllner <fmuellner@gnome.org>
-// SPDX-FileCopyrightText: 2019 Marco Trevisan (Treviño) <mail@3v1n0.net>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-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,424 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-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

@@ -6,7 +6,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-/* -*- 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';
@@ -86,7 +85,7 @@ export default class Extension {
                         style_class: 'extension-windowsNavigator-window-tooltip',
                         visible: false,
                     });
-                    this.add_actor(this._tip);
+                    this.add_child(this._tip);
 
                     this.connect('notify::scale-x', () => {
                         this._tip.set_scale(1 / this.scale_x, 1 / this.scale_x);
@@ -174,7 +173,7 @@ export default class Extension {
         this._injectionManager.overrideMethod(viewProto, '_hideTooltips', () => {
             /* eslint-disable no-invalid-this */
             return function () {
-                if (global.stage.get_key_focus() === global.stage)
+                if (global.stage.get_key_focus() === null)
                     global.stage.set_key_focus(this._prevFocusActor);
                 this._pickWindow = false;
                 for (let i = 0; i < this._workspaces.length; i++)
@@ -236,7 +235,7 @@ export default class Extension {
                     return true;
                 }
 
-                if (global.stage.get_key_focus() !== global.stage)
+                if (global.stage.get_key_focus() !== null)
                     return false;
 
                 // ignore shift presses, they're required to get numerals in azerty keyboards

extensions/windowsNavigator/metadata.json.in

@@ -5,7 +5,7 @@
     "settings-schema": "@gschemaname@",
     "gettext-domain": "@gettext_domain@",
     "original-author": "zaspire@rambler.ru",
-    "name": "windowNavigator",
+    "name": "Window Navigator",
     "description": "Allow keyboard selection of windows and workspaces in overlay mode. <Ctrl>number selects a workspace, and <Alt>number selects a window.",
     "url": "@url@"
 }

extensions/workspace-indicator/extension.js

@@ -4,437 +4,17 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
-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';
-
-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 WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
+import {WorkspaceIndicator} from './workspaceIndicator.js';
-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'));
-
-        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({
-            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._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.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._thumbnailsBox.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);
-    }
-
-    _onDestroy() {
-        Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
-
-        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);
-        }
-    }
-
-    _updateActiveThumbnail() {
-        let thumbs = this._thumbnailsBox.get_children();
-        for (let i = 0; i < thumbs.length; i++) {
-            if (i === this._currentWorkspace)
-                thumbs[i].add_style_class_name('active');
-            else
-                thumbs[i].remove_style_class_name('active');
-        }
-    }
-
-    _labelText(workspaceIndex) {
-        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();
-
-        let i = 0;
-        for (; i < workspaceManager.n_workspaces; i++) {
-            this._workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-            this._workspaceSection.addMenuItem(this._workspacesItems[i]);
-            this._workspacesItems[i].workspaceId = i;
-            this._workspacesItems[i].label_actor = this._statusLabel;
-            this._workspacesItems[i].connect('activate', (actor, _event) => {
-                this._activate(actor.workspaceId);
-            });
-
-            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();
-    }
-
-    _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 = global.workspace_manager.get_active_workspace_index() + diff;
-        this._activate(newIndex);
-    }
-}
 
 export default class WorkspaceIndicatorExtension extends Extension {
     enable() {
-        this._indicator = new WorkspaceIndicator();
+        this._indicator = new WorkspaceIndicator({
+            settings: this.getSettings(),
+        });
         Main.panel.addToStatusArea('workspace-indicator', this._indicator);
     }
 

extensions/workspace-indicator/meson.build

@@ -7,6 +7,10 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
-extension_data += files('stylesheet.css')
+extension_data += files(
+  'stylesheet-dark.css',
+  'stylesheet-light.css',
+)
+extension_schemas += files('schemas/' + metadata_conf.get('gschemaname') + '.gschema.xml')
 
-extension_sources += files('prefs.js')
+extension_sources += files('prefs.js', 'workspaceIndicator.js', 'workspacePrefs.js')

extensions/workspace-indicator/prefs.js

@@ -3,268 +3,12 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+import {ExtensionPreferences} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
-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';
+import {WorkspacesPage} from './workspacePrefs.js';
-
-const N_ = e => e;
-
-const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
-const WORKSPACE_KEY = 'workspace-names';
-
-class NewItem extends GObject.Object {}
-GObject.registerClass(NewItem);
-
-class NewItemModel extends GObject.Object {
-    static [GObject.interfaces] = [Gio.ListModel];
-    static {
-        GObject.registerClass(this);
-    }
-
-    #item = new NewItem();
-
-    vfunc_get_item_type() {
-        return NewItem;
-    }
-
-    vfunc_get_n_items() {
-        return 1;
-    }
-
-    vfunc_get_item(_pos) {
-        return this.#item;
-    }
-}
-
-class WorkspacesList extends GObject.Object {
-    static [GObject.interfaces] = [Gio.ListModel];
-    static {
-        GObject.registerClass(this);
-    }
-
-    #settings = new Gio.Settings({schema_id: WORKSPACE_SCHEMA});
-    #names = this.#settings.get_strv(WORKSPACE_KEY);
-    #items = Gtk.StringList.new(this.#names);
-    #changedId;
-
-    constructor() {
-        super();
-
-        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)
-            return;
-
-        this.#names.splice(pos, 1);
-
-        this.#settings.block_signal_handler(this.#changedId);
-        this.#settings.set_strv(WORKSPACE_KEY, this.#names);
-        this.#settings.unblock_signal_handler(this.#changedId);
-
-        this.#items.remove(pos);
-        this.items_changed(pos, 1, 0);
-    }
-
-    rename(oldName, newName) {
-        const pos = this.#names.indexOf(oldName);
-        if (pos < 0)
-            return;
-
-        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);
-    }
-
-    vfunc_get_item_type() {
-        return Gtk.StringObject;
-    }
-
-    vfunc_get_n_items() {
-        return this.#items.get_n_items();
-    }
-
-    vfunc_get_item(pos) {
-        return this.#items.get_item(pos);
-    }
-}
-
-class WorkspaceSettingsWidget extends Adw.PreferencesGroup {
-    static {
-        GObject.registerClass(this);
-
-        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 new WorkspacesPage(this.getSettings());
     }
 }

extensions/workspace-indicator/schemas/org.gnome.shell.extensions.workspace-indicator.gschema.xml

@@ -0,0 +1,15 @@
+<!--
+SPDX-FileCopyrightText: 2024 Florian Müllner <fmuellner@gnome.org>
+
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
+
+<schemalist gettext-domain="gnome-shell-extensions">
+  <schema id="org.gnome.shell.extensions.workspace-indicator"
+          path="/org/gnome/shell/extensions/workspace-indicator/">
+    <key name="embed-previews" type="b">
+      <default>true</default>
+      <summary>Show workspace previews in top bar</summary>
+    </key>
+  </schema>
+</schemalist>

extensions/workspace-indicator/stylesheet-dark.css

@@ -0,0 +1,76 @@
+/*
+ * SPDX-FileCopyrightText: 2011 Erick Pérez Castellanos <erick.red@gmail.com>
+ * SPDX-FileCopyrightText: 2019 Florian Müllner <fmuellner@gnome.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+.workspace-indicator .status-label {
+  padding: 0 8px;
+}
+
+.workspace-indicator .workspaces-view.hfade {
+  -st-hfade-offset: 20px;
+}
+
+.workspace-indicator-menu .workspaces-view {
+  max-width: 480px;
+}
+
+.workspace-indicator .workspaces-box {
+  spacing: 3px;
+}
+
+.workspace-indicator-menu .workspaces-box {
+  padding: 5px;
+  spacing: 6px;
+}
+
+.workspace-indicator .workspace-box {
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+.workspace-indicator StButton:first-child:ltr > .workspace-box,
+.workspace-indicator StButton:last-child:rtl > .workspace-box {
+  padding-left: 5px;
+}
+.workspace-indicator StButton:last-child:ltr > .workspace-box,
+.workspace-indicator StButton:first-child:rtl > .workspace-box {
+  padding-right: 5px;
+}
+
+.workspace-indicator-menu .workspace-box {
+  spacing: 6px;
+}
+
+.workspace-indicator-menu .workspace,
+.workspace-indicator .workspace {
+  border: 1px solid transparent;
+  border-radius: 4px;
+  background-color: #3f3f3f;
+}
+
+.workspace-indicator .workspace {
+  width: 52px;
+}
+
+.workspace-indicator-menu .workspace {
+  height: 80px;
+  width: 160px;
+}
+
+.workspace-indicator-menu .workspace.active,
+.workspace-indicator .workspace.active {
+  border-color: #fff;
+}
+
+.workspace-indicator-window-preview {
+  background-color: #bebebe;
+  border: 1px solid #828282;
+  border-radius: 1px;
+}
+
+.workspace-indicator-window-preview.active {
+  background-color: #d4d4d4;
+}

extensions/workspace-indicator/stylesheet-light.css

@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2013 Florian Müllner <fmuellner@gnome.org>
+ * SPDX-FileCopyrightText: 2015 Jakub Steiner <jimmac@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+@import url("stylesheet-dark.css");
+
+.workspace-indicator .workspace {
+  background-color: #ccc;
+}
+
+.workspace-indicator .workspace.active {
+  border-color: #888;
+}
+
+.workspace-indicator-window-preview {
+  background-color: #ededed;
+  border: 1px solid #ccc;
+}
+
+.workspace-indicator-window-preview.active {
+  background-color: #f6f5f4;
+}

extensions/workspace-indicator/stylesheet.css

@@ -1,35 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2011 Erick Pérez Castellanos <erick.red@gmail.com>
- * SPDX-FileCopyrightText: 2019 Florian Müllner <fmuellner@gnome.org>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-.panel-workspace-indicator {
-  padding: 0 8px;
-}
-
-.panel-workspace-indicator-box {
-  padding: 4px 0;
-  spacing: 4px;
-}
-
-.panel-workspace-indicator-box .workspace {
-  width: 40px;
-  border: 2px solid #000;
-  border-radius: 2px;
-  background-color: #595959;
-}
-
-.panel-workspace-indicator-box .workspace.active {
-  border-color: #fff;
-}
-
-.workspace-indicator-window-preview {
-  background-color: #bebebe;
-  border: 1px solid #828282;
-}
-
-.workspace-indicator-window-preview.active {
-  background-color: #d4d4d4;
-}

extensions/workspace-indicator/workspaceIndicator.js

@@ -0,0 +1,535 @@
+// SPDX-FileCopyrightText: 2011 Erick Pérez Castellanos <erick.red@gmail.com>
+// SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+// SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+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 SCROLL_TIME = 100;
+
+let baseStyleClassName = '';
+
+class WindowPreview extends St.Button {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(window) {
+        super({
+            style_class: `${baseStyleClassName}-window-preview`,
+        });
+
+        this._delegate = this;
+        DND.makeDraggable(this, {restoreOnSuccess: true});
+
+        this._window = window;
+
+        this._window.connectObject(
+            'size-changed', () => this._checkRelayout(),
+            'position-changed', () => this._checkRelayout(),
+            'notify::minimized', this._updateVisible.bind(this),
+            'notify::skip-taskbar', this._updateVisible.bind(this),
+            this);
+        this._updateVisible();
+
+        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');
+    }
+
+    _checkRelayout() {
+        const monitor = Main.layoutManager.findIndexForActor(this);
+        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+        if (this._window.get_frame_rect().overlap(workArea))
+            this.queue_relayout();
+    }
+
+    _updateVisible() {
+        this.visible = !this._window.skip_taskbar &&
+            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.properties] = {
+        'active': GObject.ParamSpec.boolean(
+            'active', null, null,
+            GObject.ParamFlags.READWRITE,
+            false),
+        'show-label': GObject.ParamSpec.boolean(
+            'show-label', null, null,
+            GObject.ParamFlags.READWRITE,
+            false),
+    };
+
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(index) {
+        super();
+
+        const box = new St.BoxLayout({
+            style_class: 'workspace-box',
+            y_expand: true,
+            orientation: Clutter.Orientation.VERTICAL,
+        });
+        this.set_child(box);
+
+        this._preview = new St.Bin({
+            style_class: 'workspace',
+            child: new Clutter.Actor({
+                layout_manager: new WorkspaceLayout(),
+                clip_to_allocation: true,
+                x_expand: true,
+                y_expand: true,
+            }),
+            y_expand: true,
+        });
+        box.add_child(this._preview);
+
+        this._label = new St.Label({
+            x_align: Clutter.ActorAlign.CENTER,
+            text: Meta.prefs_get_workspace_name(index),
+        });
+        box.add_child(this._label);
+
+        this._tooltip = new St.Label({
+            style_class: 'dash-label',
+            visible: false,
+        });
+        Main.uiGroup.add_child(this._tooltip);
+
+        this.bind_property('show-label',
+            this._label, 'visible',
+            GObject.BindingFlags.SYNC_CREATE);
+
+        this.connect('destroy', this._onDestroy.bind(this));
+        this.connect('notify::hover', this._syncTooltip.bind(this));
+
+        const desktopSettings =
+            new Gio.Settings({schema_id: 'org.gnome.desktop.wm.preferences'});
+        desktopSettings.connectObject('changed::workspace-names', () => {
+            this._label.text = Meta.prefs_get_workspace_name(index);
+        }, 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.bind_property('active',
+            this, 'active',
+            GObject.BindingFlags.SYNC_CREATE);
+
+        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();
+    }
+
+    get active() {
+        return this._preview.has_style_class_name('active');
+    }
+
+    set active(active) {
+        if (active)
+            this._preview.add_style_class_name('active');
+        else
+            this._preview.remove_style_class_name('active');
+        this.notify('active');
+    }
+
+    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._preview.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._preview.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.showLabel)
+            return;
+
+        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, thumbHeight] = this.allocation.get_size();
+            const [tipWidth, tipHeight] = this._tooltip.get_size();
+            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 - monitor.y > thumbHeight + TOOLTIP_OFFSET
+                ? stageY - tipHeight - TOOLTIP_OFFSET // show above
+                : stageY + thumbHeight + TOOLTIP_OFFSET; // show below
+            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 WorkspacePreviews extends Clutter.Actor {
+    static [GObject.properties] = {
+        'show-labels': GObject.ParamSpec.boolean(
+            'show-labels', null, null,
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            false),
+    };
+
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(params) {
+        super({
+            ...params,
+            layout_manager: new Clutter.BinLayout(),
+            reactive: true,
+            y_expand: true,
+        });
+
+        this.connect('scroll-event',
+            (a, event) => Main.wm.handleWorkspaceScroll(event));
+
+        const {workspaceManager} = global;
+
+        workspaceManager.connectObject(
+            'notify::n-workspaces', () => this._updateThumbnails(), GObject.ConnectFlags.AFTER,
+            'workspace-switched', () => this._updateScrollPosition(),
+            this);
+
+        this.connect('notify::mapped', () => {
+            if (this.mapped)
+                this._updateScrollPosition();
+        });
+
+        this._thumbnailsBox = new St.BoxLayout({
+            style_class: 'workspaces-box',
+            y_expand: true,
+        });
+
+        this._scrollView = new St.ScrollView({
+            style_class: 'workspaces-view hfade',
+            enable_mouse_scrolling: false,
+            hscrollbar_policy: St.PolicyType.EXTERNAL,
+            vscrollbar_policy: St.PolicyType.NEVER,
+            y_expand: true,
+            child: this._thumbnailsBox,
+        });
+
+        this.add_child(this._scrollView);
+
+        this._updateThumbnails();
+    }
+
+    _updateThumbnails() {
+        const {nWorkspaces} = global.workspace_manager;
+
+        this._thumbnailsBox.destroy_all_children();
+
+        for (let i = 0; i < nWorkspaces; i++) {
+            const thumb = new WorkspaceThumbnail(i);
+            this.bind_property('show-labels',
+                thumb, 'show-label',
+                GObject.BindingFlags.SYNC_CREATE);
+            this._thumbnailsBox.add_child(thumb);
+        }
+
+        if (this.mapped)
+            this._updateScrollPosition();
+    }
+
+    _updateScrollPosition() {
+        const adjustment = this._scrollView.hadjustment;
+        const {upper, pageSize} = adjustment;
+        let {value} = adjustment;
+
+        const activeWorkspace =
+            [...this._thumbnailsBox].find(a => a.active);
+
+        if (!activeWorkspace)
+            return;
+
+        let offset = 0;
+        const hfade = this._scrollView.get_effect('fade');
+        if (hfade)
+            offset = hfade.fade_margins.left;
+
+        let {x1, x2} = activeWorkspace.get_allocation_box();
+        let parent = activeWorkspace.get_parent();
+        while (parent !== this._scrollView) {
+            if (!parent)
+                throw new Error('actor not in scroll view');
+
+            const box = parent.get_allocation_box();
+            x1 += box.x1;
+            x2 += box.x1;
+            parent = parent.get_parent();
+        }
+
+        if (x1 < value + offset)
+            value = Math.max(0, x1 - offset);
+        else if (x2 > value + pageSize - offset)
+            value = Math.min(upper, x2 + offset - pageSize);
+        else
+            return;
+
+        adjustment.ease(value, {
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            duration: SCROLL_TIME,
+        });
+    }
+}
+
+export class WorkspaceIndicator extends PanelMenu.Button {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(params = {}) {
+        super(0.5, _('Workspace Indicator'), true);
+
+        const {
+            baseStyleClass = 'workspace-indicator',
+            settings,
+        } = params;
+
+        this._settings = settings;
+
+        baseStyleClassName = baseStyleClass;
+        this.add_style_class_name(baseStyleClassName);
+
+        let container = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            x_expand: true,
+            y_expand: true,
+        });
+        this.add_child(container);
+
+        let workspaceManager = global.workspace_manager;
+
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+        this._statusLabel = new St.Label({
+            style_class: 'status-label',
+            y_align: Clutter.ActorAlign.CENTER,
+            text: this._getStatusText(),
+        });
+        container.add_child(this._statusLabel);
+
+        this._thumbnails = new WorkspacePreviews();
+        container.add_child(this._thumbnails);
+
+        workspaceManager.connectObject(
+            'workspace-switched', this._onWorkspaceSwitched.bind(this), GObject.ConnectFlags.AFTER,
+            this);
+
+        this.connect('scroll-event',
+            (a, event) => Main.wm.handleWorkspaceScroll(event));
+
+        this._inTopBar = false;
+        this.connect('notify::realized', () => {
+            if (!this.realized)
+                return;
+
+            this._inTopBar = Main.panel.contains(this);
+            this._updateTopBarRedirect();
+        });
+
+        this._settings.connect('changed::embed-previews',
+            () => this._updateThumbnailVisibility());
+        this._updateThumbnailVisibility();
+    }
+
+    _onDestroy() {
+        if (this._inTopBar)
+            Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
+        this._inTopBar = false;
+
+        super._onDestroy();
+    }
+
+    _updateThumbnailVisibility() {
+        const useMenu = !this._settings.get_boolean('embed-previews');
+        this.reactive = useMenu;
+
+        this._statusLabel.visible = useMenu;
+        this._thumbnails.visible = !useMenu;
+
+        this.setMenu(useMenu
+            ? this._createPreviewMenu()
+            : null);
+
+        this._updateTopBarRedirect();
+    }
+
+    _updateTopBarRedirect() {
+        if (!this._inTopBar)
+            return;
+
+        // Disable offscreen-redirect when showing the workspace switcher
+        // so that clip-to-allocation works
+        Main.panel.set_offscreen_redirect(this._thumbnails.visible
+            ? Clutter.OffscreenRedirect.ALWAYS
+            : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
+    }
+
+    _onWorkspaceSwitched() {
+        this._currentWorkspace = global.workspace_manager.get_active_workspace_index();
+        this._statusLabel.set_text(this._getStatusText());
+    }
+
+    _getStatusText() {
+        const {nWorkspaces} = global.workspace_manager;
+        const current = this._currentWorkspace + 1;
+        return `${current} / ${nWorkspaces}`;
+    }
+
+    _createPreviewMenu() {
+        const menu = new PopupMenu.PopupMenu(this, 0.5, St.Side.TOP);
+
+        const previews = new WorkspacePreviews({show_labels: true});
+        menu.box.add_child(previews);
+        menu.actor.add_style_class_name(`${baseStyleClassName}-menu`);
+        return menu;
+    }
+}

extensions/workspace-indicator/workspacePrefs.js

@@ -0,0 +1,232 @@
+// SPDX-FileCopyrightText: 2012 Giovanni Campagna <gcampagna@src.gnome.org>
+// SPDX-FileCopyrightText: 2014 Florian Müllner <fmuellner@gnome.org>
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+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 {gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+
+const N_ = e => e;
+
+const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
+const WORKSPACE_KEY = 'workspace-names';
+
+class GeneralGroup extends Adw.PreferencesGroup {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(settings) {
+        super();
+
+        const row = new Adw.SwitchRow({
+            title: _('Show Previews'),
+        });
+        this.add(row);
+
+        settings.bind('embed-previews',
+            row, 'active',
+            Gio.SettingsBindFlags.DEFAULT);
+    }
+}
+
+class NewItem extends GObject.Object {}
+GObject.registerClass(NewItem);
+
+class NewItemModel extends GObject.Object {
+    static [GObject.interfaces] = [Gio.ListModel];
+    static {
+        GObject.registerClass(this);
+    }
+
+    #item = new NewItem();
+
+    vfunc_get_item_type() {
+        return NewItem;
+    }
+
+    vfunc_get_n_items() {
+        return 1;
+    }
+
+    vfunc_get_item(_pos) {
+        return this.#item;
+    }
+}
+
+class WorkspacesList extends GObject.Object {
+    static [GObject.interfaces] = [Gio.ListModel];
+    static {
+        GObject.registerClass(this);
+    }
+
+    #settings = new Gio.Settings({schema_id: WORKSPACE_SCHEMA});
+    #names = this.#settings.get_strv(WORKSPACE_KEY);
+    #items = Gtk.StringList.new(this.#names);
+    #changedId;
+
+    constructor() {
+        super();
+
+        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)
+            return;
+
+        this.#names.splice(pos, 1);
+
+        this.#settings.block_signal_handler(this.#changedId);
+        this.#settings.set_strv(WORKSPACE_KEY, this.#names);
+        this.#settings.unblock_signal_handler(this.#changedId);
+
+        this.#items.remove(pos);
+        this.items_changed(pos, 1, 0);
+    }
+
+    rename(oldName, newName) {
+        const pos = this.#names.indexOf(oldName);
+        if (pos < 0)
+            return;
+
+        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);
+    }
+
+    vfunc_get_item_type() {
+        return Gtk.StringObject;
+    }
+
+    vfunc_get_n_items() {
+        return this.#items.get_n_items();
+    }
+
+    vfunc_get_item(pos) {
+        return this.#items.get_item(pos);
+    }
+}
+
+class WorkspacesGroup extends Adw.PreferencesGroup {
+    static {
+        GObject.registerClass(this);
+
+        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.add(this._list);
+
+        const newRowProps = {
+            title: _('Add Workspace'),
+            action_name: 'workspaces.add',
+            start_icon_name: 'list-add-symbolic',
+        };
+
+        this._list.bind_model(listModel, item => {
+            return item instanceof NewItem
+                ? new Adw.ButtonRow({...newRowProps})
+                : new WorkspaceRow(item.string);
+        });
+    }
+}
+
+class WorkspaceRow extends Adw.EntryRow {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(name) {
+        super({
+            name,
+            text: name,
+        });
+
+        const button = new Gtk.Button({
+            tooltip_text: _('Remove'),
+            action_name: 'workspaces.remove',
+            icon_name: 'edit-delete-symbolic',
+            has_frame: false,
+            halign: Gtk.Align.CENTER,
+            valign: Gtk.Align.CENTER,
+        });
+        this.add_suffix(button);
+
+        this.bind_property_full('name',
+            button, 'action-target',
+            GObject.BindingFlags.SYNC_CREATE,
+            (bind, target) => [true, new GLib.Variant('s', target)],
+            null);
+
+        this.connect('changed', () => {
+            this.activate_action('workspaces.rename',
+                new GLib.Variant('(ss)', [this.name, this.text]));
+            this.name = this.text;
+        });
+    }
+}
+
+export class WorkspacesPage extends Adw.PreferencesPage {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(settings) {
+        super({
+            title: _('Workspaces'),
+            icon_name: 'view-grid-symbolic',
+        });
+
+        this.add(new GeneralGroup(settings));
+        this.add(new WorkspacesGroup());
+    }
+}

gnome-shell-extensions.doap

@@ -18,8 +18,8 @@ Most extensions can be installed by configuring --prefix=$HOME/.local,
 and will be picked automatically at next login.
   </description>
   <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell/Extensions" />
-  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
+  <support-forum rdf:resource="https://discourse.gnome.org/tag/shell" />
-  <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell-extensions/" />
+  <download-page rdf:resource="https://download.gnome.org/sources/gnome-shell-extensions/" />
   <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
@@ -32,10 +32,4 @@ and will be picked automatically at next login.
       <gnome:userid>fmuellner</gnome:userid>
     </foaf:Person>
   </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Marge Bot</foaf:name>
-      <gnome:userid>marge-bot</gnome:userid>
-    </foaf:Person>
-  </maintainer>
 </Project>

lint/eslintrc-gjs.yml

@@ -30,6 +30,7 @@ rules:
     - error
     - arrays: always-multiline
       objects: always-multiline
+      imports: always-multiline
       functions: never
   comma-spacing:
     - error