Bump version to 41.2

Update NEWS.

.eslintrc.yml

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2019 Florian Müllner <fmuellner@gnome.org>
-#
-# SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
-
 extends:
  - ./lint/eslintrc-gjs.yml
  - ./lint/eslintrc-shell.yml

.gitignore

@@ -0,0 +1,29 @@
+ABOUT-NLS
+Makefile
+Makefile.in
+Makefile.in.in
+aclocal.m4
+autom4te.cache/
+config/
+configure
+config.log
+config.status
+data/*.json
+m4/
+po/*.header
+po/*.sed
+po/*.sin
+po/Makevars.template
+po/POTFILES
+po/Rules-quot
+po/gnome-shell-extensions.pot
+po/stamp-it
+staging/
+zip-files/
+
+*~
+*.gmo
+metadata.json
+*.desktop
+*.gschema.valid
+*.session

.gitlab-ci.yml

@@ -1,11 +1,9 @@
-# SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 include:
   - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
   - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml"
 
+image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/34:2021-08-12.0
+
 stages:
   - pre_review
   - prepare
@@ -14,7 +12,6 @@ stages:
   - deploy
 
 default:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/35:2022-02-18.0
   # Cancel jobs if newer commits are pushed to the branch
   interruptible: true
   # Auto-retry jobs in case of infra failures
@@ -29,6 +26,7 @@ default:
 variables:
   FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions
   LINT_LOG: "eslint-report.xml"
+  JS_LOG: "js-report.txt"
 
 workflow:
   rules:
@@ -94,14 +92,6 @@ check-merge-request:
     reports:
       junit: check-merge-request-report.xml
 
-check-reuse:
-  stage: pre_review
-  image:
-    name: fsfe/reuse:latest
-    entrypoint: [""]
-  script:
-    - reuse lint
-
 build-fedora-container:
   extends:
     - .fdo.container-build@fedora@x86_64
@@ -113,14 +103,18 @@ js_check:
   stage: review
   <<: *prereview_req
   script:
-    - gjs-check-syntax
+    - find extensions -name '*.js' -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG
+    - (! grep -q . $JS_LOG)
+  artifacts:
+    paths:
+      - ${JS_LOG}
+    when: on_failure
 
 eslint:
   stage: review
   <<: *prereview_req
   script:
-    - export NODE_PATH=$(npm root -g)
+    - eslint -o $LINT_LOG -f junit --resolve-plugins-relative-to $(npm root -g) extensions
-    - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} --format junit --stdout
   artifacts:
     paths:
       - ${LINT_LOG}
@@ -145,6 +139,8 @@ fedora-build:
   stage: build
   needs:
     - build-fedora-container
+  before_script:
+    - git submodule update --init
   script:
     - meson setup build --werror -Dextension_set=all -Dclassic_mode=true
     - meson compile -C build
@@ -161,8 +157,8 @@ fedora-dist:
   stage: deploy
   needs:
     - fedora-build
-  variables:
+  before_script:
-    GIT_SUBMODULE_STRATEGY: normal
+    - git submodule update --init
   script:
     - meson dist -C build
   rules:

.gitlab-ci/commit-rules.yml

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021 Florian Müllner <fmuellner@gnome.org>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 patterns:
   deny:
     - regex: '^$CI_MERGE_REQUEST_PROJECT_URL/(-/)?merge_requests/$CI_MERGE_REQUEST_IID$'

.gitlab-ci/run-eslint

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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "data/gnome-shell-sass"]
+	path = data/gnome-shell-sass
+	url = https://gitlab.gnome.org/GNOME/gnome-shell-sass.git

.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

LICENSES/CC0-1.0.txt

@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.

LICENSES/GPL-2.0-or-later.txt

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

LICENSES/LGPL-2.0-or-later.txt

@@ -1,174 +0,0 @@
-GNU LIBRARY GENERAL PUBLIC LICENSE
-
-Version 2, June 1991
-
-Copyright (C) 1991 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
-
-This license, the Library General Public License, applies to some specially designated Free Software Foundation software, and to any other libraries whose authors decide to use it. You can use it for your libraries, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library, or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link a program with the library, you must provide complete object files to the recipients so that they can relink them with the library, after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
-
-Our method of protecting your rights has two steps: (1) copyright the library, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the library.
-
-Also, for each distributor's protection, we want to make certain that everyone understands that there is no warranty for this free library. If the library is modified by someone else and passed on, we want its recipients to know that what they have is not the original version, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that companies distributing free software will individually obtain patent licenses, thus in effect transforming the program into proprietary software. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License, which was designed for utility programs. This license, the GNU Library General Public License, applies to certain designated libraries. This license is quite different from the ordinary one; be sure to read it in full, and don't assume that anything in it is the same as in the ordinary license.
-
-The reason we have a separate public license for some libraries is that they blur the distinction we usually make between modifying or adding to a program and simply using it. Linking a program with a library, without changing the library, is in some sense simply using the library, and is analogous to running a utility program or application program. However, in a textual and legal sense, the linked executable is a combined work, a derivative of the original library, and the ordinary General Public License treats it as such.
-
-Because of this blurred distinction, using the ordinary General Public License for libraries did not effectively promote software sharing, because most developers did not use the libraries. We concluded that weaker conditions might promote sharing better.
-
-However, unrestricted linking of non-free programs would deprive the users of those programs of all benefit from the free status of the libraries themselves. This Library General Public License is intended to permit developers of non-free programs to use free libraries, while preserving your freedom as a user of such programs to change the free libraries that are incorporated in them. (We have not seen how to achieve this as regards changes in header files, but we have achieved it as regards changes in the actual functions of the Library.) The hope is that this will lead to faster development of free libraries.
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, while the latter only works together with the library.
-
-Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License Agreement applies to any software library which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Library General Public License (also called "this License"). Each licensee is addressed as "you".
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-     a) The modified work must itself be a software library.
-
-     b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
-
-     c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
-
-     d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
-
-(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
-
-     a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
-
-     b) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
-
-     c) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
-
-     d) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
-
-     a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
-
-     b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
-
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new versions of the Library General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Libraries
-
-If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).
-
-To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
-     one line to give the library's name and an idea of what it does.
-     Copyright (C) year  name of author
-
-     This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-     This library 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 Library General Public License for more details.
-
-     You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in
-the library `Frob' (a library for tweaking knobs) written
-by James Random Hacker.
-
-signature of Ty Coon, 1 April 1990
-Ty Coon, President of Vice
-
-That's all there is to it!

LICENSES/MIT.txt

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) <year> <copyright holders>
-
-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.

NEWS

@@ -1,211 +1,21 @@
-45.2
+41.2
 ====
-* window-list: Fix buttons not being clickable at the screen edge
+* window-list: Update window tracking to avoid missing icons [Florian; #372]
-  [Florian; !291]
-* window-list: Really fix initial preview visibility [Florian; !292]
-* workspace-indicator: Really fix initial preview visibility [Florian; !292]
-* Misc. bug fixes and cleanups [Florian; !290]
 
 Contributors:
   Florian Müllner
 
-45.1
+41.1
 ====
-* workspace-indicator: Fix initial preview visibility [Florian; !280]
-* screenshot-window-sizer: Fix cycling between sizes backwards [Florian; !284]
-* Misc. bug fixes and cleanups [Florian; !276, !275, !278, !281]
-
-Contributors:
-  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]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Sabri Ünal [tr], Florentina Musat [ro], A S Alam [pa]
-
-45.beta
-=======
-* Port extensions to ESM [Florian; !259, !266, !268, !269]
-* Misc. bug fixes and cleanups [Florian; !260, !261, !262, !263, !264]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Efstathios Iosifidis [el]
-
-45.alpha
-========
-* window-list: Modernize default styling [Alexander; !253]
-* Replace classic styling with built-in light style [Florian; !254]
-* window-list: Add tooltip for long window titles [Arik; !251]
-* light-style: New extension [Florian; !256]
-* Misc. bug fixes and cleanups [Florian; !255, !257]
-
-Contributors:
-  Florian Müllner, Arik W, Alexander Weichart
-
-44.0
-====
-* Bump version
-
-44.rc
-=====
-* Bump version
-
-44.beta
-=======
-* Tweak menu alignment [robxnano; !246]
-
-Contributors:
-  Florian Müllner, robxnano
-
-Translators:
-  Vasil Pupkin [be]
-
-43.1
-====
-* Fixed crash [Florian; !243]
-* Misc. bug fixes and cleanups [mowemcfc; !244]
-
-Contributors:
-  Florian Müllner, mowemcfc
-
-Translators:
-  Sabri Ünal [tr]
-
-43.0
-====
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Pawan Chitrakar [ne], Zurab Kargareteli [ka], Aleksandr Melman [ru]
-
-43.rc
-=====
-* Misc. bug fixes and cleanups [Florian; !240]
-
-Contributors:
-  Florian Müllner
-
-43.beta
-=======
-* Misc. bug fixes and cleanups [Florian; !237, !238]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Nart Tlisha [ab]
-
-43.alpha
-========
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Marco Ciampa [it]
-
-42.3
-====
-* screenshot-window-sizer: Fix reported sizes on wayland [Florian; !232]
-* window-list: Improve touch support [Florian; !233]
-
-Contributors:
-  Florian Müllner
-
-42.2
-====
-* native-window-placement: Adjust to gnome-shell 42 changes [Florian; !229]
-* window-list: Fix visibility on non-primary monitors [Jason; !230]
-
-Contributors:
-  Jason Lynch, Florian Müllner
-
-Translators:
-  Cheng-Chia Tseng [zh_TW]
-
-42.1
-====
-* Misc. bug fixes and cleanups [Florian; !223, !222, !225]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Milo Casagrande [it], Rūdolfs Mazurs [lv], Nathan Follens [nl],
-  Ngọc Quân Trần [vi], Zurab Kargareteli [ka]
-
-42.0
-====
-
-Translators:
-  Philipp Kiemle [de], Balázs Úr [hu], Марко Костић [sr], sicklylife [ja],
-  Baurzhan Muftakhidinov [kk]
-
-42.rc
-=====
-* Misc. bug fixes and cleanups [Florian; !215, !218]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Marek Černocký [cs], Dušan Kazik [sk], Piotr Drąg [pl], Jiri Grönroos [fi],
-  Luna Jernberg [sv], Alan Mortensen [da], Charles Monzat [fr],
-  Changwoo Ryu [ko]
-
-42.beta
-=======
-* workspace-indicator: Fix cancelling editing with Esc [Florian; !208]
-* window-list: Update window tracking to avoid missing icons [Florian; !207]
-* Use libadwaita for preferences [Florian; !209, !213]
-* Adapt to Clutter grab API changes [Florian; !212]
-* Misc. bug fixes and cleanups [Jan, Florian; !210, !214]
-
-Contributors:
-  Jan Beich, Florian Müllner, Naala Nanba
-
-Translators:
-  Boyuan Yang [zh_CN], Matej Urbančič [sl], Naala Nanba [ab],
-  Alexander Shopov [bg], Emin Tufan Çetin [tr]
-
-42.alpha
-========
 * native-window-placement: Fix distorted layout in app grid [Sebastian; !189]
 * window-list: Fix on-screen keyboard [Florian; !199]
-* Misc. bug fixes and cleanups [Neal; Just; !195, !197]
+* Misc. bug fixes [Neal; !195]
 
 Contributors:
-  Piotr Drąg, Neal Gompa, Sebastian Keller, Florian Müllner, Just Perfection
+  Neal Gompa, Sebastian Keller, Florian Müllner
 
 Translators:
-  Goran Vidović [hr], Sveinn í Felli [is], Yuri Chornoivan [uk],
+  Goran Vidović [hr], Sveinn í Felli [is]
-  Fabio Tomat [fur], Quentin PAGÈS [oc], Hugo Carvalho [pt],
-  Yaron Shahrabani [he], Jordi Mas i Hernandez [ca], MohammadSaleh Kamyab [fa],
-  Fran Dieguez [gl], Daniel Mustieles [es], Aleksandr Melman [ru],
-  Aurimas Černius [lt], Asier Sarasua Garmendia [eu], Kukuh Syafaat [id],
-  Rafael Fontenelle [pt_BR]
 
 41.0
 ====

data/calendar-today.svg

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

data/classic-toggle-off-intl.svg

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

data/classic-toggle-off-us.svg

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

data/classic-toggle-on-intl.svg

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

data/classic-toggle-on-us.svg

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

data/classic.json.in

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

data/gnome-classic-high-contrast.css

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

data/gnome-classic-wayland.desktop.in

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

data/gnome-classic-xorg.desktop.in

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

data/gnome-classic.scss

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

data/meson.build

@@ -1,38 +1,12 @@
-# SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
+session_desktop = 'gnome-classic.desktop'
-#
+i18n.merge_file('',
-# SPDX-License-Identifier: GPL-2.0-or-later
+  input:  session_desktop + '.in',
-
+  output: session_desktop,
-session_desktop_base = 'gnome-classic'
+  po_dir: '../po',
-
+  install: true,
-session_desktops = [
+  install_dir: xsessiondir,
-  session_desktop_base,
+  type: 'desktop'
-  session_desktop_base + '-xorg',
+)
-  session_desktop_base + '-wayland',
-]
-
-foreach name: session_desktops
-    session_desktop = name + '.desktop'
-    if name.endswith('-xorg')
-        session_instdir = xsessiondir
-    elif name.endswith('-wayland')
-        session_instdir = wlsessiondir
-    else
-        # FIXME: The same target can not be copied into two directories.
-        #        There is a workaround in meson/session-post-install.py until proper
-        #        solution arises:
-        #        https://github.com/mesonbuild/meson/issues/2416
-        session_instdir = xsessiondir
-        #session_instdir = [ xesssiondir, wlsessiondir ]
-    endif
-    i18n.merge_file(
-      input:  session_desktop + '.in',
-      output: session_desktop,
-      po_dir: '../po',
-      install: true,
-      install_dir: session_instdir,
-      type: 'desktop'
-    )
-endforeach
 
 classic_uuids = []
 foreach e : classic_extensions
@@ -50,5 +24,74 @@ configure_file(
   install_dir: modedir
 )
 
+theme_sources = files(
+  'gnome-shell-sass/_colors.scss',
+  'gnome-shell-sass/_common.scss',
+  'gnome-shell-sass/_drawing.scss',
+  'gnome-shell-sass/_high-contrast-colors.scss',
+  'gnome-shell-sass/_widgets.scss',
+  'gnome-shell-sass/widgets/_a11y.scss',
+  'gnome-shell-sass/widgets/_app-grid.scss',
+  'gnome-shell-sass/widgets/_base.scss',
+  'gnome-shell-sass/widgets/_buttons.scss',
+  'gnome-shell-sass/widgets/_calendar.scss',
+  'gnome-shell-sass/widgets/_check-box.scss',
+  'gnome-shell-sass/widgets/_corner-ripple.scss',
+  'gnome-shell-sass/widgets/_dash.scss',
+  'gnome-shell-sass/widgets/_dialogs.scss',
+  'gnome-shell-sass/widgets/_entries.scss',
+  'gnome-shell-sass/widgets/_hotplug.scss',
+  'gnome-shell-sass/widgets/_ibus-popup.scss',
+  'gnome-shell-sass/widgets/_keyboard.scss',
+  'gnome-shell-sass/widgets/_login-dialog.scss',
+  'gnome-shell-sass/widgets/_looking-glass.scss',
+  'gnome-shell-sass/widgets/_message-list.scss',
+  'gnome-shell-sass/widgets/_misc.scss',
+  'gnome-shell-sass/widgets/_network-dialog.scss',
+  'gnome-shell-sass/widgets/_notifications.scss',
+  'gnome-shell-sass/widgets/_osd.scss',
+  'gnome-shell-sass/widgets/_overview.scss',
+  'gnome-shell-sass/widgets/_panel.scss',
+  'gnome-shell-sass/widgets/_popovers.scss',
+  'gnome-shell-sass/widgets/_screen-shield.scss',
+  'gnome-shell-sass/widgets/_scrollbars.scss',
+  'gnome-shell-sass/widgets/_search-entry.scss',
+  'gnome-shell-sass/widgets/_search-results.scss',
+  'gnome-shell-sass/widgets/_slider.scss',
+  'gnome-shell-sass/widgets/_switcher-popup.scss',
+  'gnome-shell-sass/widgets/_switches.scss',
+  'gnome-shell-sass/widgets/_tiled-previews.scss',
+  'gnome-shell-sass/widgets/_window-picker.scss',
+  'gnome-shell-sass/widgets/_workspace-switcher.scss',
+  'gnome-shell-sass/widgets/_workspace-thumbnails.scss'
+)
+
+theme_data = [
+  'calendar-today.svg',
+  'classic-process-working.svg',
+  'classic-toggle-off-intl.svg',
+  'classic-toggle-off-us.svg',
+  'classic-toggle-on-intl.svg',
+  'classic-toggle-on-us.svg',
+  'gnome-classic-high-contrast.css'
+]
+
+stylesheet = 'gnome-classic.css'
+if fs.exists(stylesheet)
+  install_data(stylesheet, install_dir: themedir)
+else
+  sassc = find_program('sassc', required: true)
+  custom_target(stylesheet,
+    input: fs.replace_suffix(stylesheet, '.scss'),
+    output: stylesheet,
+    depend_files: theme_sources,
+    command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: themedir
+  )
+endif
+
+install_data(theme_data, install_dir: themedir)
+
 classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
 install_data(classic_override, install_dir: schemadir)

export-zips.sh

@@ -1,8 +1,4 @@
-#!/bin/bash
+#!/bin/sh
-
-# SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
 
 srcdir=`dirname $0`
 srcdir=`(cd $srcdir && pwd)`

extensions/apps-menu/extension.js

@@ -1,29 +1,18 @@
-// SPDX-FileCopyrightText: 2011 Vamsi Krishna Brahmajosyula <vamsikrishna.brahmajosyula@gmail.com>
-// SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-// SPDX-FileCopyrightText: 2013 Debarshi Ray <debarshir@gnome.org>
-// SPDX-FileCopyrightText: 2013 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-import Atk from 'gi://Atk';
+/* exported init enable disable */
-import Clutter from 'gi://Clutter';
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GMenu from 'gi://GMenu';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
-import Meta from 'gi://Meta';
-import Shell from 'gi://Shell';
-import St from 'gi://St';
-import {EventEmitter} from 'resource:///org/gnome/shell/misc/signals.js';
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const {
+    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St,
+} = imports.gi;
+const Signals = imports.signals;
 
-import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
+const DND = imports.ui.dnd;
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const ExtensionUtils = imports.misc.extensionUtils;
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
+const Main = imports.ui.main;
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const _ = ExtensionUtils.gettext;
 
 const appSys = Shell.AppSystem.get_default();
 
@@ -35,13 +24,10 @@ const NAVIGATION_REGION_OVERSHOOT = 50;
 Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
 Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');
 
+var ApplicationMenuItem = GObject.registerClass(
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    static {
+    _init(button, app) {
-        GObject.registerClass(this);
+        super._init();
-    }
-
-    constructor(button, app) {
-        super();
         this._app = app;
         this._button = button;
 
@@ -57,8 +43,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         this.label_actor = appLabel;
 
         let textureCache = St.TextureCache.get_default();
-        textureCache.connectObject('icon-theme-changed',
+        let iconThemeChangedId = textureCache.connect('icon-theme-changed',
-            () => this._updateIcon(), this);
+            this._updateIcon.bind(this));
+        this.connect('destroy', () => {
+            textureCache.disconnect(iconThemeChangedId);
+        });
         this._updateIcon();
 
         this._delegate = this;
@@ -104,15 +93,12 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         icon.style_class = 'icon-dropshadow';
         this._iconBin.set_child(icon);
     }
-}
+});
 
+var CategoryMenuItem = GObject.registerClass(
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    static {
+    _init(button, category) {
-        GObject.registerClass(this);
+        super._init();
-    }
-
-    constructor(button, category) {
-        super();
         this._category = category;
         this._button = button;
 
@@ -125,7 +111,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         else
             name = _('Favorites');
 
-        this.add_child(new St.Label({text: name}));
+        this.add_child(new St.Label({ text: name }));
         this.connect('motion-event', this._onMotionEvent.bind(this));
         this.connect('notify::active', this._onActiveChanged.bind(this));
     }
@@ -194,14 +180,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _onMotionEvent(actor, event) {
-        if (!this._grab) {
+        let device = event.get_device();
+        if (!device.get_grabbed_actor()) {
             this._oldX = -1;
             this._oldY = -1;
-            const grab = global.stage.grab(this);
+            device.grab(this);
-            if (grab.get_seat_state() !== Clutter.GrabState.NONE)
-                this._grab = grab;
-            else
-                grab.dismiss();
         }
         this.hover = true;
 
@@ -211,12 +194,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._oldX = -1;
         this._oldY = -1;
         this.hover = false;
-        this._grab?.dismiss();
+        device.ungrab();
-        delete this._grab;
 
-        const targetActor = global.stage.get_event_actor(event);
+        let source = event.get_source();
-        if (targetActor instanceof St.Widget)
+        if (source instanceof St.Widget)
-            targetActor.sync_hover();
+            source.sync_hover();
 
         return false;
     }
@@ -228,7 +210,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._button.selectCategory(this._category);
         this._button.scrollToCatButton(this);
     }
-}
+});
 
 class ApplicationsMenu extends PopupMenu.PopupMenu {
     constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -247,10 +229,8 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
     }
 }
 
-class DesktopTarget extends EventEmitter {
+class DesktopTarget {
     constructor() {
-        super();
-
         this._desktop = null;
         this._desktopDestroyedId = 0;
 
@@ -277,7 +257,9 @@ class DesktopTarget extends EventEmitter {
 
     _setDesktop(desktop) {
         if (this._desktop) {
-            this._desktop.disconnectObject(this);
+            this._desktop.disconnect(this._desktopDestroyedId);
+            this._desktopDestroyedId = 0;
+
             delete this._desktop._delegate;
         }
 
@@ -285,9 +267,9 @@ class DesktopTarget extends EventEmitter {
         this.emit('desktop-changed');
 
         if (this._desktop) {
-            this._desktop.connectObject('destroy', () => {
+            this._desktopDestroyedId = this._desktop.connect('destroy', () => {
                 this._setDesktop(null);
-            }, this);
+            });
             this._desktop._delegate = this;
         }
     }
@@ -327,7 +309,10 @@ class DesktopTarget extends EventEmitter {
     }
 
     destroy() {
-        global.window_group.disconnectObject(this);
+        if (this._windowAddedId)
+            global.window_group.disconnect(this._windowAddedId);
+        this._windowAddedId = 0;
+
         this._setDesktop(null);
     }
 
@@ -362,28 +347,12 @@ class DesktopTarget extends EventEmitter {
         return true;
     }
 }
+Signals.addSignalMethods(DesktopTarget.prototype);
 
-class MainLayout extends Clutter.BoxLayout {
+let ApplicationsButton = GObject.registerClass(
-    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 {
+    _init() {
-        GObject.registerClass(this);
+        super._init(1.0, null, false);
-    }
-
-    constructor() {
-        super(1.0, null, false);
 
         this.setMenu(new ApplicationsMenu(this, 1.0, St.Side.TOP, this));
         Main.panel.menuManager.addMenu(this.menu);
@@ -403,14 +372,15 @@ class ApplicationsButton extends PanelMenu.Button {
         this.name = 'panelApplications';
         this.label_actor = this._label;
 
-        Main.overview.connectObject(
+        this._showingId = Main.overview.connect('showing', () => {
-            'showing', () => this.add_accessible_state(Atk.StateType.CHECKED),
+            this.add_accessible_state(Atk.StateType.CHECKED);
-            'hiding', () => this.remove_accessible_state(Atk.StateType.CHECKED),
+        });
-            this);
+        this._hidingId = Main.overview.connect('hiding', () => {
-
+            this.remove_accessible_state(Atk.StateType.CHECKED);
+        });
         Main.wm.addKeybinding(
             'apps-menu-toggle-menu',
-            Extension.lookupByURL(import.meta.url).getSettings(),
+            ExtensionUtils.getSettings(),
             Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
             Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
             () => this.menu.toggle());
@@ -425,16 +395,16 @@ class ApplicationsButton extends PanelMenu.Button {
             });
         });
 
-        this._tree = new GMenu.Tree({menu_basename: 'applications.menu'});
+        this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
-        this._tree.connectObject('changed',
+        this._treeChangedId = this._tree.connect('changed',
-            () => this._onTreeChanged(), this);
+            this._onTreeChanged.bind(this));
 
         this._applicationsButtons = new Map();
         this.reloadFlag = false;
         this._createLayout();
         this._display();
-        appSys.connectObject('installed-changed',
+        this._installedChangedId = appSys.connect('installed-changed',
-            () => this._onTreeChanged(), this);
+            this._onTreeChanged.bind(this));
     }
 
     _onTreeChanged() {
@@ -446,10 +416,23 @@ 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();
 
-        delete this._tree;
+        Main.overview.disconnect(this._showingId);
+        Main.overview.disconnect(this._hidingId);
+        appSys.disconnect(this._installedChangedId);
+        this._tree.disconnect(this._treeChangedId);
+        this._tree = null;
 
         Main.wm.removeKeybinding('apps-menu-toggle-menu');
 
@@ -467,6 +450,21 @@ 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) {
@@ -498,7 +496,7 @@ class ApplicationsButton extends PanelMenu.Button {
                 }
                 let app = appSys.lookup_app(id);
                 if (!app)
-                    app = new Shell.App({app_info: entry.get_app_info()});
+                    app = new Shell.App({ app_info: entry.get_app_info() });
                 if (app.get_app_info().should_show())
                     this.applicationsByCategory[categoryId].push(app);
             } else if (nextType === GMenu.TreeItemType.SEPARATOR) {
@@ -544,8 +542,8 @@ class ApplicationsButton extends PanelMenu.Button {
     _createLayout() {
         let section = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(section);
-        this.mainBox = new St.BoxLayout({layoutManager: new MainLayout()});
+        this.mainBox = new St.BoxLayout({ vertical: false });
-        this.leftBox = new St.BoxLayout({vertical: true});
+        this.leftBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox = new St.ScrollView({
             style_class: 'apps-menu vfade',
             x_expand: true,
@@ -567,18 +565,20 @@ class ApplicationsButton extends PanelMenu.Button {
         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({ vertical: true });
         this.applicationsScrollBox.add_actor(this.applicationsBox);
-        this.categoriesBox = new St.BoxLayout({vertical: true});
+        this.categoriesBox = new St.BoxLayout({ vertical: true });
         this.categoriesScrollBox.add_actor(this.categoriesBox);
 
         this.mainBox.add(this.leftBox);
+        this.mainBox.add_child(this._createVertSeparator());
         this.mainBox.add_child(this.applicationsScrollBox);
         section.actor.add_actor(this.mainBox);
     }
 
     _display() {
         this._applicationsButtons.clear();
+        this.mainBox.style = 'width: 35em;';
         this.mainBox.hide();
 
         // Load categories
@@ -608,6 +608,12 @@ class ApplicationsButton extends PanelMenu.Button {
 
         // 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) {
@@ -655,19 +661,24 @@ class ApplicationsButton extends PanelMenu.Button {
 
         return applist;
     }
+});
+
+let appsMenuButton;
+
+/** */
+function enable() {
+    appsMenuButton = new ApplicationsButton();
+    let index = Main.sessionMode.panel.left.indexOf('activities') + 1;
+    Main.panel.addToStatusArea('apps-menu', appsMenuButton, index, 'left');
 }
 
-export default class AppsMenuExtension extends Extension {
+/** */
-    enable() {
+function disable() {
-        this._appsMenuButton = new ApplicationsButton();
+    Main.panel.menuManager.removeMenu(appsMenuButton.menu);
-        const index = Main.sessionMode.panel.left.indexOf('activities') + 1;
+    appsMenuButton.destroy();
-        Main.panel.addToStatusArea(
+}
-            'apps-menu', this._appsMenuButton, index, 'left');
+
-    }
+/** */
-
+function init() {
-    disable() {
+    ExtensionUtils.initTranslations();
-        Main.panel.menuManager.removeMenu(this._appsMenuButton.menu);
-        this._appsMenuButton.destroy();
-        delete this._appsMenuButton;
-    }
 }

extensions/apps-menu/meson.build

@@ -1,11 +1,6 @@
-# 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(metadata_conf.get('gschemaname') + '.gschema.xml')

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

@@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2021 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.apps-menu"
           path="/org/gnome/shell/extensions/apps-menu/">

extensions/apps-menu/stylesheet.css

@@ -1,11 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2013 Florian Müllner <fmuellner@gnome.org>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-.apps-menu {width: 26em;}
-
 .apps-menu:ltr {
     padding-right: 3px;
 }

extensions/auto-move-windows/extension.js

@@ -1,29 +1,24 @@
-// SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-// SPDX-FileCopyrightText: 2011 Alessandro Crismani <alessandro.crismani@gmail.com>
-// SPDX-FileCopyrightText: 2014 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
+/* exported init enable disable */
 
-import Shell from 'gi://Shell';
+const { Shell } = imports.gi;
 
-import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
+const ExtensionUtils = imports.misc.extensionUtils;
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const Main = imports.ui.main;
 
 class WindowMover {
-    constructor(settings) {
+    constructor() {
-        this._settings = settings;
+        this._settings = ExtensionUtils.getSettings();
         this._appSystem = Shell.AppSystem.get_default();
         this._appConfigs = new Map();
         this._appData = new Map();
 
-        this._appSystem.connectObject('installed-changed',
+        this._appsChangedId =
-            () => this._updateAppData(), this);
+            this._appSystem.connect('installed-changed',
+                this._updateAppData.bind(this));
 
-        this._settings.connectObject('changed',
+        this._settings.connect('changed', this._updateAppConfigs.bind(this));
-            this._updateAppConfigs.bind(this), this);
         this._updateAppConfigs();
     }
 
@@ -43,7 +38,7 @@ class WindowMover {
         let removedApps = [...this._appData.keys()]
             .filter(a => !ids.includes(a.id));
         removedApps.forEach(app => {
-            app.disconnectObject(this);
+            app.disconnect(this._appData.get(app).windowsChangedId);
             this._appData.delete(app);
         });
 
@@ -51,16 +46,26 @@ class WindowMover {
             .map(id => this._appSystem.lookup_app(id))
             .filter(app => app && !this._appData.has(app));
         addedApps.forEach(app => {
-            app.connectObject('windows-changed',
+            let data = {
-                this._appWindowsChanged.bind(this), this);
+                windowsChangedId: app.connect('windows-changed',
-            this._appData.set(app, {windows: app.get_windows()});
+                    this._appWindowsChanged.bind(this)),
+                moveWindowsId: 0,
+                windows: app.get_windows(),
+            };
+            this._appData.set(app, data);
         });
     }
 
     destroy() {
-        this._appSystem.disconnectObject(this);
+        if (this._appsChangedId) {
-        this._settings.disconnectObject(this);
+            this._appSystem.disconnect(this._appsChangedId);
-        this._settings = null;
+            this._appsChangedId = 0;
+        }
+
+        if (this._settings) {
+            this._settings.run_dispose();
+            this._settings = null;
+        }
 
         this._appConfigs.clear();
         this._updateAppData();
@@ -100,41 +105,47 @@ class WindowMover {
     }
 }
 
-export default class AutoMoveExtension extends Extension {
+let prevCheckWorkspaces;
-    enable() {
+let winMover;
-        this._prevCheckWorkspaces = Main.wm._workspaceTracker._checkWorkspaces;
-        Main.wm._workspaceTracker._checkWorkspaces =
-            this._getCheckWorkspaceOverride(this._prevCheckWorkspaces);
-        this._windowMover = new WindowMover(this.getSettings());
-    }
 
-    disable() {
+/** */
-        Main.wm._workspaceTracker._checkWorkspaces = this._prevCheckWorkspaces;
+function init() {
-        this._windowMover.destroy();
+    ExtensionUtils.initTranslations();
-        delete this._windowMover;
+}
-    }
+
-
+/**
-    _getCheckWorkspaceOverride(originalMethod) {
+ * @returns {bool} - false (used as MetaLater handler)
-        /* eslint-disable no-invalid-this */
+ */
-        return function () {
+function myCheckWorkspaces() {
-            const keepAliveWorkspaces = [];
+    let keepAliveWorkspaces = [];
-            let foundNonEmpty = false;
+    let foundNonEmpty = false;
-            for (let i = this._workspaces.length - 1; i >= 0; i--) {
+    for (let i = this._workspaces.length - 1; i >= 0; i--) {
-                if (!foundNonEmpty) {
+        if (!foundNonEmpty) {
-                    foundNonEmpty = this._workspaces[i].list_windows().some(
+            foundNonEmpty = this._workspaces[i].list_windows().some(
-                        w => !w.is_on_all_workspaces());
+                w => !w.is_on_all_workspaces());
-                } else if (!this._workspaces[i]._keepAliveId) {
+        } else if (!this._workspaces[i]._keepAliveId) {
-                    keepAliveWorkspaces.push(this._workspaces[i]);
+            keepAliveWorkspaces.push(this._workspaces[i]);
-                }
+        }
-            }
+    }
-
+
-            // make sure the original method only removes empty workspaces at the end
+    // make sure the original method only removes empty workspaces at the end
-            keepAliveWorkspaces.forEach(ws => (ws._keepAliveId = 1));
+    keepAliveWorkspaces.forEach(ws => (ws._keepAliveId = 1));
-            originalMethod.call(this);
+    prevCheckWorkspaces.call(this);
-            keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);
+    keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);
-
+
-            return false;
+    return false;
-        };
+}
-        /* eslint-enable no-invalid-this */
+
-    }
+/** */
+function enable() {
+    prevCheckWorkspaces = Main.wm._workspaceTracker._checkWorkspaces;
+    Main.wm._workspaceTracker._checkWorkspaces = myCheckWorkspaces;
+
+    winMover = new WindowMover();
+}
+
+/** */
+function disable() {
+    Main.wm._workspaceTracker._checkWorkspaces = prevCheckWorkspaces;
+    winMover.destroy();
 }

extensions/auto-move-windows/meson.build

@@ -1,7 +1,3 @@
-# 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,

extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml

@@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2016 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.auto-move-windows" path="/org/gnome/shell/extensions/auto-move-windows/">
     <key name="application-list" type="as">

extensions/auto-move-windows/prefs.js

@@ -1,305 +1,227 @@
-// 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
-
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
+/* exported init buildPrefsWidget */
 
-import Adw from 'gi://Adw';
+const { Gio, GLib, GObject, Gtk, Pango } = imports.gi;
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
 
-import {ExtensionPreferences, gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+const ExtensionUtils = imports.misc.extensionUtils;
+
+const _ = ExtensionUtils.gettext;
 
 const SETTINGS_KEY = 'application-list';
 
 const WORKSPACE_MAX = 36; // compiled in limit of mutter
 
-class NewItem extends GObject.Object {}
+const AutoMoveSettingsWidget = GObject.registerClass(
-GObject.registerClass(NewItem);
+class AutoMoveSettingsWidget extends Gtk.ScrolledWindow {
-
+    _init() {
-class NewItemModel extends GObject.Object {
+        super._init({
-    static [GObject.interfaces] = [Gio.ListModel];
+            hscrollbar_policy: Gtk.PolicyType.NEVER,
-    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 Rule extends GObject.Object {
-    static [GObject.properties] = {
-        'app-info': GObject.ParamSpec.object(
-            'app-info', 'app-info', 'app-info',
-            GObject.ParamFlags.READWRITE,
-            Gio.DesktopAppInfo),
-        'workspace': GObject.ParamSpec.uint(
-            'workspace', 'workspace', 'workspace',
-            GObject.ParamFlags.READWRITE,
-            1, WORKSPACE_MAX, 1),
-    };
-
-    static {
-        GObject.registerClass(this);
-    }
-}
-
-class RulesList extends GObject.Object {
-    static [GObject.interfaces] = [Gio.ListModel];
-    static {
-        GObject.registerClass(this);
-    }
-
-    #settings;
-    #rules = [];
-    #changedId;
-
-    constructor(settings) {
-        super();
-
-        this.#settings = settings;
-        this.#changedId =
-            this.#settings.connect(`changed::${SETTINGS_KEY}`,
-                () => this.#sync());
-        this.#sync();
-    }
-
-    append(appInfo) {
-        const pos = this.#rules.length;
-
-        this.#rules.push(new Rule({appInfo}));
-        this.#saveRules();
-
-        this.items_changed(pos, 0, 1);
-    }
-
-    remove(id) {
-        const pos = this.#rules.findIndex(r => r.appInfo.get_id() === id);
-        if (pos < 0)
-            return;
-
-        this.#rules.splice(pos, 1);
-        this.#saveRules();
-
-        this.items_changed(pos, 1, 0);
-    }
-
-    changeWorkspace(id, workspace) {
-        const pos = this.#rules.findIndex(r => r.appInfo.get_id() === id);
-        if (pos < 0)
-            return;
-
-        this.#rules[pos].set({workspace});
-        this.#saveRules();
-    }
-
-    #saveRules() {
-        this.#settings.block_signal_handler(this.#changedId);
-        this.#settings.set_strv(SETTINGS_KEY,
-            this.#rules.map(r => `${r.app_info.get_id()}:${r.workspace}`));
-        this.#settings.unblock_signal_handler(this.#changedId);
-    }
-
-    #sync() {
-        const removed = this.#rules.length;
-
-        this.#rules = [];
-        for (const stringRule of this.#settings.get_strv(SETTINGS_KEY)) {
-            const [id, workspace] = stringRule.split(':');
-            const appInfo = Gio.DesktopAppInfo.new(id);
-            if (appInfo)
-                this.#rules.push(new Rule({appInfo, workspace}));
-            else
-                log(`Invalid ID ${id}`);
-        }
-        this.items_changed(0, removed, this.#rules.length);
-    }
-
-    vfunc_get_item_type() {
-        return Rule;
-    }
-
-    vfunc_get_n_items() {
-        return this.#rules.length;
-    }
-
-    vfunc_get_item(pos) {
-        return this.#rules[pos] ?? null;
-    }
-}
-
-class AutoMoveSettingsWidget extends Adw.PreferencesGroup {
-    static {
-        GObject.registerClass(this);
-
-        this.install_action('rules.add', null, self => self._addNewRule());
-        this.install_action('rules.remove', 's',
-            (self, name, param) => self._rules.remove(param.unpack()));
-        this.install_action('rules.change-workspace', '(si)',
-            (self, name, param) => self._rules.changeWorkspace(...param.deepUnpack()));
-    }
-
-    constructor(settings) {
-        super({
-            title: _('Workspace Rules'),
         });
 
-        this._settings = settings;
+        const box = new Gtk.Box({
-        this._rules = new RulesList(this._settings);
+            orientation: Gtk.Orientation.VERTICAL,
+            halign: Gtk.Align.CENTER,
+            spacing: 12,
+            margin_top: 36,
+            margin_bottom: 36,
+            margin_start: 36,
+            margin_end: 36,
+        });
+        this.set_child(box);
 
-        const store = new Gio.ListStore({item_type: Gio.ListModel});
+        box.append(new Gtk.Label({
-        const listModel = new Gtk.FlattenListModel({model: store});
+            label: '<b>%s</b>'.format(_('Workspace Rules')),
-        store.append(this._rules);
+            use_markup: true,
-        store.append(new NewItemModel());
+            halign: Gtk.Align.START,
+        }));
 
         this._list = new Gtk.ListBox({
             selection_mode: Gtk.SelectionMode.NONE,
-            css_classes: ['boxed-list'],
+            valign: Gtk.Align.START,
+            show_separators: true,
         });
-        this.add(this._list);
+        box.append(this._list);
 
-        this._list.bind_model(listModel, item => {
+        const context = this._list.get_style_context();
-            return item instanceof NewItem
+        const cssProvider = new Gtk.CssProvider();
-                ? new NewRuleRow()
+        cssProvider.load_from_data(
-                : new RuleRow(item);
+            'list { min-width: 30em; }');
+
+        context.add_provider(cssProvider,
+            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        context.add_class('frame');
+
+        this._list.append(new NewRuleRow());
+
+        this._actionGroup = new Gio.SimpleActionGroup();
+        this._list.insert_action_group('rules', this._actionGroup);
+
+        let action;
+        action = new Gio.SimpleAction({ name: 'add' });
+        action.connect('activate', this._onAddActivated.bind(this));
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({
+            name: 'remove',
+            parameter_type: new GLib.VariantType('s'),
         });
+        action.connect('activate', this._onRemoveActivated.bind(this));
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({ name: 'update' });
+        action.connect('activate', () => {
+            this._settings.set_strv(SETTINGS_KEY,
+                this._getRuleRows().map(row => `${row.id}:${row.value}`));
+        });
+        this._actionGroup.add_action(action);
+        this._updateAction = action;
+
+        this._settings = ExtensionUtils.getSettings();
+        this._changedId = this._settings.connect('changed',
+            this._sync.bind(this));
+        this._sync();
+
+        this.connect('destroy', () => this._settings.run_dispose());
     }
 
-    _addNewRule() {
+    _onAddActivated() {
-        const dialog = new NewRuleDialog(this.get_root(), this._settings);
+        const dialog = new NewRuleDialog(this.get_root());
         dialog.connect('response', (dlg, id) => {
             const appInfo = id === Gtk.ResponseType.OK
                 ? dialog.get_widget().get_app_info() : null;
-            if (appInfo)
+            if (appInfo) {
-                this._rules.append(appInfo);
+                this._settings.set_strv(SETTINGS_KEY, [
+                    ...this._settings.get_strv(SETTINGS_KEY),
+                    `${appInfo.get_id()}:1`,
+                ]);
+            }
             dialog.destroy();
         });
         dialog.show();
     }
-}
 
-class WorkspaceSelector extends Gtk.Widget {
+    _onRemoveActivated(action, param) {
-    static [GObject.properties] = {
+        const removed = param.deepUnpack();
-        'number': GObject.ParamSpec.uint(
+        this._settings.set_strv(SETTINGS_KEY,
-            'number', 'number', 'number',
+            this._settings.get_strv(SETTINGS_KEY).filter(entry => {
+                const [id] = entry.split(':');
+                return id !== removed;
+            }));
+    }
+
+    _getRuleRows() {
+        return [...this._list].filter(row => !!row.id);
+    }
+
+    _sync() {
+        const oldRules = this._getRuleRows();
+        const newRules = this._settings.get_strv(SETTINGS_KEY).map(entry => {
+            const [id, value] = entry.split(':');
+            return { id, value };
+        });
+
+        this._settings.block_signal_handler(this._changedId);
+        this._updateAction.enabled = false;
+
+        newRules.forEach(({ id, value }, index) => {
+            const row = oldRules.find(r => r.id === id);
+            const appInfo = row
+                ? null : Gio.DesktopAppInfo.new(id);
+
+            if (row)
+                row.set({ value });
+            else if (appInfo)
+                this._list.insert(new RuleRow(appInfo, value), index);
+        });
+
+        const removed = oldRules.filter(
+            ({ id }) => !newRules.find(r => r.id === id));
+        removed.forEach(r => this._list.remove(r));
+
+        this._settings.unblock_signal_handler(this._changedId);
+        this._updateAction.enabled = true;
+    }
+});
+
+const RuleRow = GObject.registerClass({
+    Properties: {
+        'id': GObject.ParamSpec.string(
+            'id', 'id', 'id',
+            GObject.ParamFlags.READABLE,
+            ''),
+        'value': GObject.ParamSpec.uint(
+            'value', 'value', 'value',
             GObject.ParamFlags.READWRITE,
             1, WORKSPACE_MAX, 1),
-    };
+    },
-
+}, class RuleRow extends Gtk.ListBoxRow {
-    static {
+    _init(appInfo, value) {
-        GObject.registerClass(this);
+        const box = new Gtk.Box({
-
+            spacing: 6,
-        this.set_layout_manager_type(Gtk.BoxLayout);
+            margin_top: 6,
-    }
+            margin_bottom: 6,
-
+            margin_start: 6,
-    constructor() {
-        super();
-
-        this.layout_manager.spacing = 6;
-
-        const label = new Gtk.Label({
-            xalign: 1,
             margin_end: 6,
         });
-        this.bind_property('number',
-            label, 'label',
-            GObject.BindingFlags.SYNC_CREATE);
-        label.set_parent(this);
 
-        const buttonProps = {
+        super._init({
-            css_classes: ['circular'],
-            valign: Gtk.Align.CENTER,
-        };
-
-        this._decButton = new Gtk.Button({
-            icon_name: 'list-remove-symbolic',
-            ...buttonProps,
-        });
-        this._decButton.set_parent(this);
-        this._decButton.connect('clicked', () => this.number--);
-
-        this._incButton = new Gtk.Button({
-            icon_name: 'list-add-symbolic',
-            ...buttonProps,
-        });
-        this._incButton.set_parent(this);
-        this._incButton.connect('clicked', () => this.number++);
-
-        this.connect('notify::number', () => this._syncButtons());
-        this._syncButtons();
-    }
-
-    _syncButtons() {
-        this._decButton.sensitive = this.number > 1;
-        this._incButton.sensitive = this.number < WORKSPACE_MAX;
-    }
-}
-
-class RuleRow extends Adw.ActionRow {
-    static {
-        GObject.registerClass(this);
-    }
-
-    constructor(rule) {
-        const {appInfo} = rule;
-        const id = appInfo.get_id();
-
-        super({
             activatable: false,
-            title: rule.appInfo.get_display_name(),
+            value,
+            child: box,
         });
+        this._appInfo = appInfo;
 
         const icon = new Gtk.Image({
-            css_classes: ['icon-dropshadow'],
             gicon: appInfo.get_icon(),
             pixel_size: 32,
         });
-        this.add_prefix(icon);
+        icon.get_style_context().add_class('icon-dropshadow');
+        box.append(icon);
 
-        const wsButton = new WorkspaceSelector();
+        const label = new Gtk.Label({
-        rule.bind_property('workspace',
+            label: appInfo.get_display_name(),
-            wsButton, 'number',
+            halign: Gtk.Align.START,
-            GObject.BindingFlags.SYNC_CREATE);
+            hexpand: true,
-        this.add_suffix(wsButton);
+            max_width_chars: 20,
-
+            ellipsize: Pango.EllipsizeMode.END,
-        wsButton.connect('notify::number', () => {
-            this.activate_action('rules.change-workspace',
-                new GLib.Variant('(si)', [id, wsButton.number]));
         });
+        box.append(label);
+
+        const spinButton = new Gtk.SpinButton({
+            adjustment: new Gtk.Adjustment({
+                lower: 1,
+                upper: WORKSPACE_MAX,
+                step_increment: 1,
+            }),
+            snap_to_ticks: true,
+            margin_end: 6,
+        });
+        this.bind_property('value',
+            spinButton, 'value',
+            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
+        box.append(spinButton);
 
         const button = new Gtk.Button({
             action_name: 'rules.remove',
-            action_target: new GLib.Variant('s', id),
+            action_target: new GLib.Variant('s', this.id),
             icon_name: 'edit-delete-symbolic',
-            has_frame: false,
-            valign: Gtk.Align.CENTER,
         });
-        this.add_suffix(button);
+        box.append(button);
-    }
-}
 
+        this.connect('notify::value',
+            () => this.activate_action('rules.update', null));
+    }
+
+    get id() {
+        return this._appInfo.get_id();
+    }
+});
+
+const NewRuleRow = GObject.registerClass(
 class NewRuleRow extends Gtk.ListBoxRow {
-    static {
+    _init() {
-        GObject.registerClass(this);
+        super._init({
-    }
-
-    constructor() {
-        super({
             action_name: 'rules.add',
             child: new Gtk.Image({
                 icon_name: 'list-add-symbolic',
@@ -313,20 +235,17 @@ class NewRuleRow extends Gtk.ListBoxRow {
         this.update_property(
             [Gtk.AccessibleProperty.LABEL], [_('Add Rule')]);
     }
-}
+});
 
+const NewRuleDialog = GObject.registerClass(
 class NewRuleDialog extends Gtk.AppChooserDialog {
-    static {
+    _init(parent) {
-        GObject.registerClass(this);
+        super._init({
-    }
-
-    constructor(parent, settings) {
-        super({
             transient_for: parent,
             modal: true,
         });
 
-        this._settings = settings;
+        this._settings = ExtensionUtils.getSettings();
 
         this.get_widget().set({
             show_all: true,
@@ -344,10 +263,16 @@ class NewRuleDialog extends Gtk.AppChooserDialog {
         this.set_response_sensitive(Gtk.ResponseType.OK,
             appInfo && !rules.some(i => i.startsWith(appInfo.get_id())));
     }
+});
+
+/** */
+function init() {
+    ExtensionUtils.initTranslations();
 }
 
-export default class AutoMovePrefs extends ExtensionPreferences {
+/**
-    getPreferencesWidget() {
+ * @returns {Gtk.Widget} - the prefs widget
-        return new AutoMoveSettingsWidget(this.getSettings());
+ */
-    }
+function buildPrefsWidget() {
+    return new AutoMoveSettingsWidget();
 }

extensions/auto-move-windows/stylesheet.css

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

extensions/drive-menu/extension.js

@@ -1,31 +1,19 @@
-// SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+/* exported init enable disable */
-// SPDX-FileCopyrightText: 2018 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 // Drive menu extension
-import Clutter from 'gi://Clutter';
+const { Clutter, Gio, GObject, Shell, St } = imports.gi;
-import Gio from 'gi://Gio';
-import GObject from 'gi://GObject';
-import Shell from 'gi://Shell';
-import St from 'gi://St';
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const ExtensionUtils = imports.misc.extensionUtils;
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const ShellMountOperation = imports.ui.shellMountOperation;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const _ = ExtensionUtils.gettext;
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
-import * as ShellMountOperation from 'resource:///org/gnome/shell/ui/shellMountOperation.js';
-
-Gio._promisify(Gio.File.prototype, 'query_filesystem_info_async');
 
+var MountMenuItem = GObject.registerClass(
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    static {
+    _init(mount) {
-        GObject.registerClass(this);
+        super._init({
-    }
-
-    constructor(mount) {
-        super({
             style_class: 'drive-menu-item',
         });
 
@@ -39,6 +27,8 @@ 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',
@@ -52,11 +42,33 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         this.hide();
 
-        mount.connectObject('changed',
+        this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
-            () => this._syncVisibility(), this);
         this._syncVisibility();
     }
 
+    _onDestroy() {
+        if (this._changedId) {
+            this.mount.disconnect(this._changedId);
+            this._changedId = 0;
+        }
+
+        super.destroy();
+    }
+
+    _fsIsRemote(root) {
+        return new Promise((resolve, reject) => {
+            const attr = Gio.FILE_ATTRIBUTE_FILESYSTEM_REMOTE;
+            root.query_filesystem_info_async(attr, null, (o, res) => {
+                try {
+                    const info = root.query_filesystem_info_finish(res);
+                    resolve(!info.get_attribute_boolean(attr));
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+
     async _isInteresting() {
         if (!this.mount.can_eject() && !this.mount.can_unmount())
             return false;
@@ -71,9 +83,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
         const root = this.mount.get_root();
 
         try {
-            const attr = Gio.FILE_ATTRIBUTE_FILESYSTEM_REMOTE;
+            return await this._fsIsRemote(root);
-            const info = await root.query_filesystem_info_async(attr, null);
-            return !info.get_attribute_boolean(attr);
         } catch (e) {
             log(`Failed to query filesystem: ${e.message}`);
         }
@@ -131,15 +141,12 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         super.activate(event);
     }
-}
+});
 
+let DriveMenu = GObject.registerClass(
 class DriveMenu extends PanelMenu.Button {
-    static {
+    _init() {
-        GObject.registerClass(this);
+        super._init(0.0, _('Removable devices'));
-    }
-
-    constructor() {
-        super(0.5, _('Removable devices'));
 
         let icon = new St.Icon({
             icon_name: 'media-eject-symbolic',
@@ -149,12 +156,12 @@ class DriveMenu extends PanelMenu.Button {
         this.add_child(icon);
 
         this._monitor = Gio.VolumeMonitor.get();
-        this._monitor.connectObject(
+        this._addedId = this._monitor.connect('mount-added',
-            'mount-added', (monitor, mount) => this._addMount(mount),
+            (monitor, mount) => this._addMount(mount));
-            'mount-removed', (monitor, mount) => {
+        this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
-                this._removeMount(mount);
+            this._removeMount(mount);
-                this._updateMenuVisibility();
+            this._updateMenuVisibility();
-            }, this);
+        });
 
         this._mounts = [];
 
@@ -196,16 +203,33 @@ class DriveMenu extends PanelMenu.Button {
         }
         log('Removing a mount that was never added to the menu');
     }
+
+    _onDestroy() {
+        if (this._addedId) {
+            this._monitor.disconnect(this._addedId);
+            this._monitor.disconnect(this._removedId);
+            this._addedId = 0;
+            this._removedId = 0;
+        }
+
+        super._onDestroy();
+    }
+});
+
+/** */
+function init() {
+    ExtensionUtils.initTranslations();
 }
 
-export default class PlaceMenuExtension extends Extension {
+let _indicator;
-    enable() {
-        this._indicator = new DriveMenu();
-        Main.panel.addToStatusArea('drive-menu', this._indicator);
-    }
 
-    disable() {
+/** */
-        this._indicator.destroy();
+function enable() {
-        delete this._indicator;
+    _indicator = new DriveMenu();
-    }
+    Main.panel.addToStatusArea('drive-menu', _indicator);
+}
+
+/** */
+function disable() {
+    _indicator.destroy();
 }

extensions/drive-menu/meson.build

@@ -1,10 +1,5 @@
-# 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')

extensions/drive-menu/stylesheet.css

@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2020 Florian Müllner <fmuellner@gnome.org>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 .drive-menu-item { spacing: 12px; }
 
 .drive-menu-item .button {

extensions/launch-new-instance/extension.js

@@ -1,27 +1,17 @@
-// SPDX-FileCopyrightText: 2013 Gabriel Rossetti <rossetti.gabriel@gmail.com>
+/* exported enable disable */
-// SPDX-FileCopyrightText: 2013 Florian Müllner <fmuellner@gnome.org>
+const AppDisplay = imports.ui.appDisplay;
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
 
-import {AppIcon} from 'resource:///org/gnome/shell/ui/appDisplay.js';
+let _activateOriginal = null;
-import {InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';
 
-export default class Extension {
+/** */
-    constructor() {
+function enable() {
-        this._injectionManager = new InjectionManager();
+    _activateOriginal = AppDisplay.AppIcon.prototype.activate;
-    }
+    AppDisplay.AppIcon.prototype.activate = function () {
-
+        _activateOriginal.call(this, 2);
-    enable() {
+    };
-        this._injectionManager.overrideMethod(AppIcon.prototype, 'activate',
+}
-            originalMethod => {
+
-                return function () {
+/** */
-                    // eslint-disable-next-line no-invalid-this
+function disable() {
-                    originalMethod.call(this, 2);
+    AppDisplay.AppIcon.prototype.activate = _activateOriginal;
-                };
-            });
-    }
-
-    disable() {
-        this._injectionManager.clear();
-    }
 }

extensions/launch-new-instance/meson.build

@@ -1,7 +1,3 @@
-# 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,

extensions/launch-new-instance/stylesheet.css

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

extensions/light-style/extension.js

@@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import St from 'gi://St';
-
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-
-export default class Extension {
-    _updateColorScheme(scheme) {
-        Main.sessionMode.colorScheme = scheme;
-        St.Settings.get().notify('color-scheme');
-    }
-
-    enable() {
-        this._savedColorScheme = Main.sessionMode.colorScheme;
-        this._updateColorScheme('prefer-light');
-    }
-
-    disable() {
-        this._updateColorScheme(this._savedColorScheme);
-    }
-}

extensions/light-style/meson.build

@@ -1,9 +0,0 @@
-# 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
-)

extensions/light-style/metadata.json.in

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

extensions/meson.build

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 extension_schemas = []
 js_sources = []
 
@@ -19,7 +15,7 @@ foreach e : enabled_extensions
   metadata_conf.set('url', 'https://gitlab.gnome.org/GNOME/gnome-shell-extensions')
 
   extension_sources = files(e + '/extension.js')
-  extension_data = []
+  extension_data = files(e + '/stylesheet.css')
 
   subdir(e)
 

extensions/meson.build.template

@@ -1,13 +1,8 @@
-# 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_sources += files('prefs.js')
 # extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/native-window-placement/extension.js

@@ -1,18 +1,11 @@
-// SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-// SPDX-FileCopyrightText: 2011 Stefano Facchini <stefano.facchini@gmail.com>
-// SPDX-FileCopyrightText: 2011 Wepmaschda <wepmaschda@gmx.de>
-// SPDX-FileCopyrightText: 2015 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-import Clutter from 'gi://Clutter';
+/* exported enable disable */
+const { Clutter } = imports.gi;
 
-import {Extension, InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';
+const ExtensionUtils = imports.misc.extensionUtils;
-
+const Main = imports.ui.main;
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const { WindowPreview } = imports.ui.windowPreview;
-import {WindowPreview} from 'resource:///org/gnome/shell/ui/windowPreview.js';
+const Workspace = imports.ui.workspace;
-import * as Workspace from 'resource:///org/gnome/shell/ui/workspace.js';
 
 // testing settings for natural window placement strategy:
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
@@ -104,7 +97,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
         let rects = [];
         for (let i = 0; i < clones.length; i++) {
             // save rectangles into 4-dimensional arrays representing two corners of the rectangular: [left_x, top_y, right_x, bottom_y]
-            let rect = clones[i].boundingBox;
+            let rect = clones[i].metaWindow.get_frame_rect();
             rects[i] = new Rect(rect.x, rect.y, rect.width, rect.height);
             bounds = bounds.union(rects[i]);
 
@@ -243,64 +236,75 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
     }
 }
 
-export default class NativeWindowPlacementExtension extends Extension {
+let winInjections, workspaceInjections;
-    constructor(metadata) {
-        super(metadata);
 
-        this._injectionManager = new InjectionManager();
+/** */
-    }
+function resetState() {
-
+    winInjections = { };
-    enable() {
+    workspaceInjections = { };
-        const settings = this.getSettings();
+}
-
+
-        const layoutProto = Workspace.WorkspaceLayout.prototype;
+/** */
-        const previewProto = WindowPreview.prototype;
+function enable() {
-
+    resetState();
-        this._injectionManager.overrideMethod(layoutProto, '_createBestLayout', () => {
+
-            /* eslint-disable no-invalid-this */
+    let settings = ExtensionUtils.getSettings();
-            return function () {
+
-                this._layoutStrategy = new NaturalLayoutStrategy({
+    workspaceInjections['_createBestLayout'] = Workspace.WorkspaceLayout.prototype._createBestLayout;
-                    monitor: Main.layoutManager.monitors[this._monitorIndex],
+    Workspace.WorkspaceLayout.prototype._createBestLayout = function (_area) {
-                }, settings);
+        this._layoutStrategy = new NaturalLayoutStrategy({
-                return this._layoutStrategy.computeLayout(this._sortedWindows);
+            monitor: Main.layoutManager.monitors[this._monitorIndex],
-            };
+        }, settings);
-            /* eslint-enable no-invalid-this */
+        return this._layoutStrategy.computeLayout(this._sortedWindows);
-        });
+    };
-
+
-        // position window titles on top of windows in overlay
+    // position window titles on top of windows in overlay
-        this._injectionManager.overrideMethod(previewProto, '_init', originalMethod => {
+    winInjections['_init'] = WindowPreview.prototype._init;
-            /* eslint-disable no-invalid-this */
+    WindowPreview.prototype._init = function (...args) {
-            return function (...args) {
+        winInjections['_init'].call(this, ...args);
-                originalMethod.call(this, ...args);
+
-
+        if (!settings.get_boolean('window-captions-on-top'))
-                if (!settings.get_boolean('window-captions-on-top'))
+            return;
-                    return;
+
-
+        const alignConstraint = this._title.get_constraints().find(
-                const alignConstraint = this._title.get_constraints().find(
+            c => c.align_axis && c.align_axis === Clutter.AlignAxis.Y_AXIS);
-                    c => c.align_axis && c.align_axis === Clutter.AlignAxis.Y_AXIS);
+        alignConstraint.factor = 0;
-                alignConstraint.factor = 0;
+
-
+        const bindConstraint = this._title.get_constraints().find(
-                const bindConstraint = this._title.get_constraints().find(
+            c => c.coordinate && c.coordinate === Clutter.BindCoordinate.Y);
-                    c => c.coordinate && c.coordinate === Clutter.BindCoordinate.Y);
+        bindConstraint.offset = 0;
-                bindConstraint.offset = 0;
+    };
-            };
+    winInjections['_adjustOverlayOffsets'] =
-            /* eslint-enable no-invalid-this */
+        WindowPreview.prototype._adjustOverlayOffsets;
-        });
+    WindowPreview.prototype._adjustOverlayOffsets = function (...args) {
-
+        winInjections['_adjustOverlayOffsets'].call(this, ...args);
-        this._injectionManager.overrideMethod(previewProto, '_adjustOverlayOffsets', originalMethod => {
+
-            /* eslint-disable no-invalid-this */
+        if (settings.get_boolean('window-captions-on-top'))
-            return function (...args) {
+            this._title.translation_y = -this._title.translation_y;
-                originalMethod.call(this, ...args);
+    };
-
+}
-                if (settings.get_boolean('window-captions-on-top'))
+
-                    this._title.translation_y = -this._title.translation_y;
+/**
-            };
+ * @param {Object} object - object that was modified
-            /* eslint-enable no-invalid-this */
+ * @param {Object} injection - the map of previous injections
-        });
+ * @param {string} name - the @injection key that should be removed
-    }
+ */
-
+function removeInjection(object, injection, name) {
-    disable() {
+    if (injection[name] === undefined)
-        this._injectionManager.clear();
+        delete object[name];
-        global.stage.queue_relayout();
+    else
-    }
+        object[name] = injection[name];
+}
+
+/** */
+function disable() {
+    var i;
+
+    for (i in workspaceInjections)
+        removeInjection(Workspace.WorkspaceLayout.prototype, workspaceInjections, i);
+    for (i in winInjections)
+        removeInjection(WindowPreview.prototype, winInjections, i);
+
+    global.stage.queue_relayout();
+    resetState();
 }

extensions/native-window-placement/meson.build

@@ -1,7 +1,3 @@
-# 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,

extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml

@@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2016 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.native-window-placement" path="/org/gnome/shell/extensions/native-window-placement/">
     <key name="use-more-screen" type="b">

extensions/native-window-placement/stylesheet.css

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

extensions/places-menu/extension.js

@@ -1,34 +1,25 @@
-// SPDX-FileCopyrightText: 2011 Vamsi Krishna Brahmajosyula <vamsikrishna.brahmajosyula@gmail.com>
-// SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-// SPDX-FileCopyrightText: 2013 Florian Müllner <fmuellner@gnome.org>
-// SPDX-FileCopyrightText: 2016 Rémy Lefevre <lefevreremy@gmail.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-import Clutter from 'gi://Clutter';
+/* exported init enable disable */
-import GObject from 'gi://GObject';
-import St from 'gi://St';
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const { Clutter, GObject, St } = imports.gi;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const ExtensionUtils = imports.misc.extensionUtils;
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
+const Main = imports.ui.main;
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
 
-import {PlacesManager} from './placeDisplay.js';
+const Me = ExtensionUtils.getCurrentExtension();
+const PlaceDisplay = Me.imports.placeDisplay;
 
+const _ = ExtensionUtils.gettext;
 const N_ = x => x;
 
 const PLACE_ICON_SIZE = 16;
 
+var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    static {
+    _init(info) {
-        GObject.registerClass(this);
+        super._init({
-    }
-
-    constructor(info) {
-        super({
             style_class: 'place-menu-item',
         });
         this._info = info;
@@ -59,8 +50,17 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
             this.add_child(this._ejectButton);
         }
 
-        info.connectObject('changed',
+        this._changedId = info.connect('changed',
-            this._propertiesChanged.bind(this), this);
+            this._propertiesChanged.bind(this));
+    }
+
+    destroy() {
+        if (this._changedId) {
+            this._info.disconnect(this._changedId);
+            this._changedId = 0;
+        }
+
+        super.destroy();
     }
 
     activate(event) {
@@ -73,7 +73,7 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._icon.gicon = info.icon;
         this._label.text = info.name;
     }
-}
+});
 
 const SECTIONS = [
     'special',
@@ -82,13 +82,10 @@ const SECTIONS = [
     'network',
 ];
 
+let PlacesMenu = GObject.registerClass(
 class PlacesMenu extends PanelMenu.Button {
-    static {
+    _init() {
-        GObject.registerClass(this);
+        super._init(0.0, _('Places'));
-    }
-
-    constructor() {
-        super(0.5, _('Places'));
 
         let label = new St.Label({
             text: _('Places'),
@@ -97,7 +94,7 @@ class PlacesMenu extends PanelMenu.Button {
         });
         this.add_actor(label);
 
-        this.placesManager = new PlacesManager();
+        this.placesManager = new PlaceDisplay.PlacesManager();
 
         this._sections = { };
 
@@ -133,20 +130,26 @@ class PlacesMenu extends PanelMenu.Button {
 
         this._sections[id].actor.visible = places.length > 0;
     }
+});
+
+/** */
+function init() {
+    ExtensionUtils.initTranslations();
 }
 
-export default class PlacesMenuExtension extends Extension {
+let _indicator;
-    enable() {
-        this._indicator = new PlacesMenu();
 
-        let pos = Main.sessionMode.panel.left.length;
+/** */
-        if ('apps-menu' in Main.panel.statusArea)
+function enable() {
-            pos++;
+    _indicator = new PlacesMenu();
-        Main.panel.addToStatusArea('places-menu', this._indicator, pos, 'left');
-    }
 
-    disable() {
+    let pos = Main.sessionMode.panel.left.indexOf('appMenu');
-        this._indicator.destroy();
+    if ('apps-menu' in Main.panel.statusArea)
-        delete this._indicator;
+        pos++;
-    }
+    Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
+}
+
+/** */
+function disable() {
+    _indicator.destroy();
 }

extensions/places-menu/meson.build

@@ -1,12 +1,7 @@
-# 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_sources += files('placeDisplay.js')

extensions/places-menu/placeDisplay.js

@@ -1,27 +1,15 @@
-// SPDX-FileCopyrightText: 2012 Giovanni Campagna <gcampagna@src.gnome.org>
-// SPDX-FileCopyrightText: 2013 Debarshi Ray <debarshir@gnome.org>
-// SPDX-FileCopyrightText: 2015 Florian Müllner <fmuellner@gnome.org>
-// SPDX-FileCopyrightText: 2016 Rémy Lefevre <lefevreremy@gmail.com>
-// SPDX-FileCopyrightText: 2017 Christian Kellner <christian@kellner.me>
-//
-// 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';
-import {EventEmitter} from 'resource:///org/gnome/shell/misc/signals.js';
 
-import {gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const { Gio, GLib, Shell } = imports.gi;
+const Signals = imports.signals;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const ExtensionUtils = imports.misc.extensionUtils;
-import * as ShellMountOperation from 'resource:///org/gnome/shell/ui/shellMountOperation.js';
+const Main = imports.ui.main;
+const ShellMountOperation = imports.ui.shellMountOperation;
 
+const _ = ExtensionUtils.gettext;
 const N_ = x => x;
 
-Gio._promisify(Gio.AppInfo, 'launch_default_for_uri_async');
-Gio._promisify(Gio.File.prototype, 'mount_enclosing_volume');
-
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
 
 const Hostname1Iface = '<node> \
@@ -31,10 +19,8 @@ const Hostname1Iface = '<node> \
 </node>';
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);
 
-class PlaceInfo extends EventEmitter {
+class PlaceInfo {
     constructor(...params) {
-        super();
-
         this._init(...params);
     }
 
@@ -42,7 +28,7 @@ class PlaceInfo extends EventEmitter {
         this.kind = kind;
         this.file = file;
         this.name = name || this._getFileName();
-        this.icon = icon ? new Gio.ThemedIcon({name: icon}) : this.getIcon();
+        this.icon = icon ? new Gio.ThemedIcon({ name: icon }) : this.getIcon();
     }
 
     destroy() {
@@ -54,7 +40,7 @@ class PlaceInfo extends EventEmitter {
 
     async _ensureMountAndLaunch(context, tryMount) {
         try {
-            await Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(), context, null);
+            await this._launchDefaultForUri(this.file.get_uri(), context, null);
         } catch (err) {
             if (!err.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
                 Main.notifyError(_('Failed to launch “%s”').format(this.name), err.message);
@@ -66,7 +52,7 @@ class PlaceInfo extends EventEmitter {
             };
             let op = new ShellMountOperation.ShellMountOperation(source);
             try {
-                await this.file.mount_enclosing_volume(0, op.mountOp, null);
+                await this._mountEnclosingVolume(0, op.mountOp, null);
 
                 if (tryMount)
                     this._ensureMountAndLaunch(context, false);
@@ -105,16 +91,16 @@ class PlaceInfo extends EventEmitter {
         // icon from the query info above
         switch (this.kind) {
         case 'network':
-            return new Gio.ThemedIcon({name: 'folder-remote-symbolic'});
+            return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
         case 'devices':
-            return new Gio.ThemedIcon({name: 'drive-harddisk-symbolic'});
+            return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
         case 'special':
         case 'bookmarks':
         default:
             if (!this.file.is_native())
-                return new Gio.ThemedIcon({name: 'folder-remote-symbolic'});
+                return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
             else
-                return new Gio.ThemedIcon({name: 'folder-symbolic'});
+                return new Gio.ThemedIcon({ name: 'folder-symbolic' });
         }
     }
 
@@ -128,7 +114,34 @@ class PlaceInfo extends EventEmitter {
             throw e;
         }
     }
+
+    _launchDefaultForUri(uri, context, cancel) {
+        return new Promise((resolve, reject) => {
+            Gio.AppInfo.launch_default_for_uri_async(uri, context, cancel, (o, res) => {
+                try {
+                    Gio.AppInfo.launch_default_for_uri_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+
+    _mountEnclosingVolume(flags, mountOp, cancel) {
+        return new Promise((resolve, reject) => {
+            this.file.mount_enclosing_volume(flags, mountOp, cancel, (o, res) => {
+                try {
+                    this.file.mount_enclosing_volume_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
 }
+Signals.addSignalMethods(PlaceInfo.prototype);
 
 class RootInfo extends PlaceInfo {
     _init() {
@@ -141,14 +154,14 @@ class RootInfo extends PlaceInfo {
                 return;
 
             this._proxy = obj;
-            this._proxy.connectObject('g-properties-changed',
+            this._proxy.connect('g-properties-changed',
-                this._propertiesChanged.bind(this), this);
+                this._propertiesChanged.bind(this));
             this._propertiesChanged(obj);
         });
     }
 
     getIcon() {
-        return new Gio.ThemedIcon({name: 'drive-harddisk-symbolic'});
+        return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
     }
 
     _propertiesChanged(proxy) {
@@ -161,8 +174,10 @@ class RootInfo extends PlaceInfo {
     }
 
     destroy() {
-        this._proxy?.disconnectObject(this);
+        if (this._proxy) {
-        this._proxy = null;
+            this._proxy.run_dispose();
+            this._proxy = null;
+        }
         super.destroy();
     }
 }
@@ -254,10 +269,8 @@ const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_VIDEOS,
 ];
 
-export class PlacesManager extends EventEmitter {
+var PlacesManager = class {
     constructor() {
-        super();
-
         this._places = {
             special: [],
             devices: [],
@@ -265,26 +278,16 @@ export class PlacesManager extends EventEmitter {
             network: [],
         };
 
-        this._settings = new Gio.Settings({schema_id: BACKGROUND_SCHEMA});
+        this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
-        this._settings.connectObject('changed::show-desktop-icons',
+        this._showDesktopIconsChangedId = this._settings.connect(
-            () => this._updateSpecials(), this);
+            'changed::show-desktop-icons', this._updateSpecials.bind(this));
         this._updateSpecials();
 
         /*
         * Show devices, code more or less ported from nautilus-places-sidebar.c
         */
         this._volumeMonitor = Gio.VolumeMonitor.get();
-        this._volumeMonitor.connectObject(
+        this._connectVolumeMonitorSignals();
-            'volume-added', () => this._updateMounts(),
-            'volume-removed', () => this._updateMounts(),
-            'volume-changed', () => this._updateMounts(),
-            'mount-added', () => this._updateMounts(),
-            'mount-removed', () => this._updateMounts(),
-            'mount-changed', () => this._updateMounts(),
-            'drive-connected', () => this._updateMounts(),
-            'drive-disconnected', () => this._updateMounts(),
-            'drive-changed', () => this._updateMounts(),
-            this);
         this._updateMounts();
 
         this._bookmarksFile = this._findBookmarksFile();
@@ -309,11 +312,34 @@ export class PlacesManager extends EventEmitter {
         }
     }
 
+    _connectVolumeMonitorSignals() {
+        const signals = [
+            'volume-added',
+            'volume-removed',
+            'volume-changed',
+            'mount-added',
+            'mount-removed',
+            'mount-changed',
+            'drive-connected',
+            'drive-disconnected',
+            'drive-changed',
+        ];
+
+        this._volumeMonitorSignals = [];
+        let func = this._updateMounts.bind(this);
+        for (let i = 0; i < signals.length; i++) {
+            let id = this._volumeMonitor.connect(signals[i], func);
+            this._volumeMonitorSignals.push(id);
+        }
+    }
+
     destroy() {
-        this._settings?.disconnectObject(this);
+        if (this._settings)
+            this._settings.disconnect(this._showDesktopIconsChangedId);
         this._settings = null;
 
-        this._volumeMonitor.disconnectObject(this);
+        for (let i = 0; i < this._volumeMonitorSignals.length; i++)
+            this._volumeMonitor.disconnect(this._volumeMonitorSignals[i]);
 
         if (this._monitor)
             this._monitor.cancel();
@@ -539,4 +565,5 @@ export class PlacesManager extends EventEmitter {
     get(kind) {
         return this._places[kind];
     }
-}
+};
+Signals.addSignalMethods(PlacesManager.prototype);

extensions/places-menu/stylesheet.css

@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2020 Florian Müllner <fmuellner@gnome.org>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 .place-menu-item .button {
   border-radius: 99px;
   padding: 3px;

extensions/screenshot-window-sizer/extension.js

@@ -1,155 +1,165 @@
-// SPDX-FileCopyrightText: 2013 Owen Taylor <otaylor@redhat.com>
+/* exported enable disable */
-// SPDX-FileCopyrightText: 2013 Richard Hughes <richard@hughsie.com>
+/* Screenshot Window Sizer for Gnome Shell
-// SPDX-FileCopyrightText: 2014 Florian Müllner <fmuellner@gnome.org>
+ *
-// SPDX-FileCopyrightText: 2016 Will Thompson <will@willthompson.co.uk>
+ * Copyright (c) 2013 Owen Taylor <otaylor@redhat.com>
-// SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
+ * Copyright (c) 2013 Richard Hughes <richard@hughsie.com>
-// SPDX-FileCopyrightText: 2019 Adrien Plazas <kekun.plazas@laposte.net>
+ *
-// SPDX-FileCopyrightText: 2019 Willy Stadnick <willy.stadnick@gmail.com>
+ * This program is free software; you can redistribute it and/or
-//
+ * modify it under the terms of the GNU General Public License
-// SPDX-License-Identifier: GPL-2.0-or-later
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 
-import Clutter from 'gi://Clutter';
+const { Clutter, Meta, Shell, St } = imports.gi;
-import Meta from 'gi://Meta';
-import Shell from 'gi://Shell';
-import St from 'gi://St';
 
-import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
+const ExtensionUtils = imports.misc.extensionUtils;
-
+const Main = imports.ui.main;
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 
 const MESSAGE_FADE_TIME = 2000;
 
-export default class ScreenshotWindowSizerExtension extends Extension {
+let text;
-    SIZES = [
-        [624, 351],
-        [800, 450],
-        [1024, 576],
-        [1200, 675],
-        [1600, 900],
-        [360, 654], // Phone portrait maximized
-        [720, 360], // Phone landscape fullscreen
-    ];
 
-    _flashMessage(message) {
+/** */
-        if (!this._text) {
+function hideMessage() {
-            this._text = new St.Label({style_class: 'screenshot-sizer-message'});
+    text.destroy();
-            Main.uiGroup.add_actor(this._text);
+    text = null;
-        }
+}
-
+
-        this._text.remove_all_transitions();
+/**
-        this._text.text = message;
+ * @param {string} message - the message to flash
-
+ */
-        this._text.opacity = 255;
+function flashMessage(message) {
-
+    if (!text) {
-        const monitor = Main.layoutManager.primaryMonitor;
+        text = new St.Label({ style_class: 'screenshot-sizer-message' });
-        this._text.set_position(
+        Main.uiGroup.add_actor(text);
-            monitor.x + Math.floor(monitor.width / 2 - this._text.width / 2),
+    }
-            monitor.y + Math.floor(monitor.height / 2 - this._text.height / 2));
+
-
+    text.remove_all_transitions();
-        this._text.ease({
+    text.text = message;
-            opacity: 0,
+
-            duration: MESSAGE_FADE_TIME,
+    text.opacity = 255;
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+
-            onComplete: () => this._hideMessage(),
+    let monitor = Main.layoutManager.primaryMonitor;
-        });
+    text.set_position(
-    }
+        monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
-
+        monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
-    _hideMessage() {
+
-        this._text.destroy();
+    text.ease({
-        delete this._text;
+        opacity: 0,
-    }
+        duration: MESSAGE_FADE_TIME,
-
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-    /**
+        onComplete: hideMessage,
-     * @param {Meta.Display} display - the display
+    });
-     * @param {Meta.Window=} window - for per-window bindings, the window
+}
-     * @param {Meta.KeyBinding} binding - the key binding
+
-     */
+let SIZES = [
-    _cycleScreenshotSizes(display, window, binding) {
+    [624, 351],
-        const backwards = binding.is_reversed();
+    [800, 450],
-
+    [1024, 576],
-        // Unmaximize first
+    [1200, 675],
-        if (window.get_maximized() !== 0)
+    [1600, 900],
-            window.unmaximize(Meta.MaximizeFlags.BOTH);
+    [360, 654], // Phone portrait maximized
-
+    [720, 360], // Phone landscape fullscreen
-        let workArea = window.get_work_area_current_monitor();
+];
-        let outerRect = window.get_frame_rect();
+
-
+/**
-        // Double both axes if on a hidpi display
+ * @param {Meta.Display} display - the display
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+ * @param {Meta.Window=} window - for per-window bindings, the window
-        let scaledSizes = this.SIZES.map(size => size.map(wh => wh * scaleFactor))
+ * @param {Meta.KeyBinding} binding - the key binding
-            .filter(([w, h]) => w <= workArea.width && h <= workArea.height);
+ */
-
+function cycleScreenshotSizes(display, window, binding) {
-        // Find the nearest 16:9 size for the current window size
+    // Probably this isn't useful with 5 sizes, but you can decrease instead
-        let nearestIndex;
+    // of increase by holding down shift.
-        let nearestError;
+    let modifiers = binding.get_modifiers();
-
+    let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) !== 0;
-        for (let i = 0; i < scaledSizes.length; i++) {
+
-            let [width, height] = scaledSizes[i];
+    // Unmaximize first
-
+    if (window.get_maximized() !== 0)
-            // get the best initial window size
+        window.unmaximize(Meta.MaximizeFlags.BOTH);
-            let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
+
-            if (nearestIndex === undefined || error < nearestError) {
+    let workArea = window.get_work_area_current_monitor();
-                nearestIndex = i;
+    let outerRect = window.get_frame_rect();
-                nearestError = error;
+
-            }
+    // Double both axes if on a hidpi display
-        }
+    let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-
+    let scaledSizes = SIZES.map(size => size.map(wh => wh * scaleFactor))
-        // get the next size up or down from ideal
+        .filter(([w, h]) => w <= workArea.width && h <= workArea.height);
-        let newIndex = (nearestIndex + (backwards ? -1 : 1)) % scaledSizes.length;
+
-        let [newWidth, newHeight] = scaledSizes.at(newIndex);
+    // Find the nearest 16:9 size for the current window size
-
+    let nearestIndex;
-        // Push the window onscreen if it would be resized offscreen
+    let nearestError;
-        let newX = outerRect.x;
+
-        let newY = outerRect.y;
+    for (let i = 0; i < scaledSizes.length; i++) {
-        if (newX + newWidth > workArea.x + workArea.width)
+        let [width, height] = scaledSizes[i];
-            newX = Math.max(workArea.x + workArea.width - newWidth);
+
-        if (newY + newHeight > workArea.y + workArea.height)
+        // ignore sizes bigger than the workArea
-            newY = Math.max(workArea.y + workArea.height - newHeight);
+        if (width > workArea.width || height > workArea.height)
-
+            continue;
-        const id = window.connect('size-changed', () => {
+
-            window.disconnect(id);
+        // get the best initial window size
-            this._notifySizeChange(window);
+        let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
-        });
+        if (nearestIndex === undefined || error < nearestError) {
-        window.move_resize_frame(true, newX, newY, newWidth, newHeight);
+            nearestIndex = i;
-    }
+            nearestError = error;
-
+        }
-    /**
+    }
-     * @param {Meta.Window} window - the window whose size changed
+
-     */
+    // get the next size up or down from ideal
-    _notifySizeChange(window) {
+    let newIndex = (nearestIndex + (backwards ? -1 : 1)) % scaledSizes.length;
-        const {scaleFactor} = St.ThemeContext.get_for_stage(global.stage);
+    let [newWidth, newHeight] = scaledSizes[newIndex];
-        let newOuterRect = window.get_frame_rect();
+
-        let message = '%d×%d'.format(
+    // Push the window onscreen if it would be resized offscreen
-            newOuterRect.width / scaleFactor,
+    let newX = outerRect.x;
-            newOuterRect.height / scaleFactor);
+    let newY = outerRect.y;
-
+    if (newX + newWidth > workArea.x + workArea.width)
-        // The new size might have been constrained by geometry hints (e.g. for
+        newX = Math.max(workArea.x + workArea.width - newWidth);
-        // a terminal) - in that case, include the actual ratio to the message
+    if (newY + newHeight > workArea.y + workArea.height)
-        // we flash
+        newY = Math.max(workArea.y + workArea.height - newHeight);
-        let actualNumerator = 9 * newOuterRect.width / newOuterRect.height;
+
-        if (Math.abs(actualNumerator - 16) > 0.01)
+    window.move_resize_frame(true, newX, newY, newWidth, newHeight);
-            message += ' (%.2f:9)'.format(actualNumerator);
+
-
+    let newOuterRect = window.get_frame_rect();
-        this._flashMessage(message);
+    let message = '%d×%d'.format(
-    }
+        newOuterRect.width / scaleFactor,
-
+        newOuterRect.height / scaleFactor);
-    enable() {
+
-        Main.wm.addKeybinding(
+    // The new size might have been constrained by geometry hints (e.g. for
-            'cycle-screenshot-sizes',
+    // a terminal) - in that case, include the actual ratio to the message
-            this.getSettings(),
+    // we flash
-            Meta.KeyBindingFlags.PER_WINDOW,
+    let actualNumerator = 9 * newOuterRect.width / newOuterRect.height;
-            Shell.ActionMode.NORMAL,
+    if (Math.abs(actualNumerator - 16) > 0.01)
-            this._cycleScreenshotSizes.bind(this));
+        message += ' (%.2f:9)'.format(actualNumerator);
-        Main.wm.addKeybinding(
+
-            'cycle-screenshot-sizes-backward',
+    flashMessage(message);
-            this.getSettings(),
+}
-            Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.IS_REVERSED,
+
-            Shell.ActionMode.NORMAL,
+/** */
-            this._cycleScreenshotSizes.bind(this));
+function enable() {
-    }
+    Main.wm.addKeybinding(
-
+        'cycle-screenshot-sizes',
-    disable() {
+        ExtensionUtils.getSettings(),
-        Main.wm.removeKeybinding('cycle-screenshot-sizes');
+        Meta.KeyBindingFlags.PER_WINDOW,
-        Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');
+        Shell.ActionMode.NORMAL,
-    }
+        cycleScreenshotSizes);
+    Main.wm.addKeybinding(
+        'cycle-screenshot-sizes-backward',
+        ExtensionUtils.getSettings(),
+        Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.IS_REVERSED,
+        Shell.ActionMode.NORMAL,
+        cycleScreenshotSizes);
+}
+
+/** */
+function disable() {
+    Main.wm.removeKeybinding('cycle-screenshot-sizes');
+    Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');
 }

extensions/screenshot-window-sizer/meson.build

@@ -1,12 +1,7 @@
-# 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(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-SPDX-FileCopyrightText: 2016 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.screenshot-window-sizer"
           path="/org/gnome/shell/extensions/screenshot-window-sizer/">

extensions/screenshot-window-sizer/stylesheet.css

@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2014 Florian Müllner <fmuellner@gnome.org>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 .screenshot-sizer-message {
     font-size: 36px;
     font-weight: bold;

extensions/user-theme/extension.js

@@ -1,34 +1,32 @@
-// SPDX-FileCopyrightText: 2011 John Stowers <john.stowers@gmail.com>
-// SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-// SPDX-FileCopyrightText: 2011 Elad Alfassa <el.il@doom.co.il>
-// SPDX-FileCopyrightText: 2014 Florian Müllner <fmuellner@gnome.org>
-//
-// 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
+/* exported init */
 
-import Gio from 'gi://Gio';
+const { Gio } = imports.gi;
 
-import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
+const ExtensionUtils = imports.misc.extensionUtils;
+const Main = imports.ui.main;
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const Me = ExtensionUtils.getCurrentExtension();
-
+const Util = Me.imports.util;
-import {getThemeDirs, getModeThemeDirs} from './util.js';
 
 const SETTINGS_KEY = 'name';
 
-export default class ThemeManager extends Extension {
+class ThemeManager {
+    constructor() {
+        this._settings = ExtensionUtils.getSettings();
+    }
+
     enable() {
-        this._settings = this.getSettings();
+        this._changedId = 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?.disconnectObject();
+        if (this._changedId) {
-        this._settings = null;
+            this._settings.disconnect(this._changedId);
+            this._changedId = 0;
+        }
 
         Main.setThemeStylesheet(null);
         Main.loadTheme();
@@ -39,10 +37,10 @@ export default class ThemeManager extends Extension {
         let themeName = this._settings.get_string(SETTINGS_KEY);
 
         if (themeName) {
-            const stylesheetPaths = getThemeDirs()
+            const stylesheetPaths = Util.getThemeDirs()
                 .map(dir => `${dir}/${themeName}/gnome-shell/gnome-shell.css`);
 
-            stylesheetPaths.push(...getModeThemeDirs()
+            stylesheetPaths.push(...Util.getModeThemeDirs()
                 .map(dir => `${dir}/${themeName}.css`));
 
             stylesheet = stylesheetPaths.find(path => {
@@ -52,10 +50,17 @@ export default class ThemeManager extends Extension {
         }
 
         if (stylesheet)
-            log(`loading user theme: ${stylesheet}`);
+            global.log(`loading user theme: ${stylesheet}`);
         else
-            log('loading default theme (Adwaita)');
+            global.log('loading default theme (Adwaita)');
         Main.setThemeStylesheet(stylesheet);
         Main.loadTheme();
     }
 }
+
+/**
+ * @returns {ThemeManager} - the extension state object
+ */
+function init() {
+    return new ThemeManager();
+}

extensions/user-theme/meson.build

@@ -1,7 +1,3 @@
-# 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,

extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml

@@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2016 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.user-theme" path="/org/gnome/shell/extensions/user-theme/">
     <key name="name" type="s">

extensions/user-theme/prefs.js

@@ -1,42 +1,55 @@
-// SPDX-FileCopyrightText: 2020 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
 
 // we use async/await here to not block the mainloop, not to parallelize
 /* eslint-disable no-await-in-loop */
 
-import Adw from 'gi://Adw';
+const { Gio, GLib, GObject, Gtk } = imports.gi;
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
 
-import {ExtensionPreferences} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+const ExtensionUtils = imports.misc.extensionUtils;
 
-import {getThemeDirs, getModeThemeDirs} from './util.js';
+const Me = ExtensionUtils.getCurrentExtension();
+const Util = Me.imports.util;
 
-Gio._promisify(Gio.File.prototype, 'enumerate_children_async');
+Gio._promisify(Gio._LocalFilePrototype,
-Gio._promisify(Gio.File.prototype, 'query_info_async');
+    'enumerate_children_async', 'enumerate_children_finish');
-Gio._promisify(Gio.FileEnumerator.prototype, 'next_files_async');
+Gio._promisify(Gio._LocalFilePrototype,
+    'query_info_async', 'query_info_finish');
+Gio._promisify(Gio.FileEnumerator.prototype,
+    'next_files_async', 'next_files_finish');
 
-class UserThemePrefsWidget extends Adw.PreferencesGroup {
+const UserThemePrefsWidget = GObject.registerClass(
-    static {
+class UserThemePrefsWidget extends Gtk.ScrolledWindow {
-        GObject.registerClass(this);
+    _init() {
-    }
+        super._init({
+            hscrollbar_policy: Gtk.PolicyType.NEVER,
+        });
 
-    constructor(settings) {
+        const box = new Gtk.Box();
-        super({title: 'Themes'});
+        this.set_child(box);
+
+        this._list = new Gtk.ListBox({
+            selection_mode: Gtk.SelectionMode.NONE,
+            show_separators: true,
+            halign: Gtk.Align.CENTER,
+            valign: Gtk.Align.START,
+            hexpand: true,
+            margin_start: 60,
+            margin_end: 60,
+            margin_top: 60,
+            margin_bottom: 60,
+        });
+        this._list.get_style_context().add_class('frame');
+        box.append(this._list);
 
         this._actionGroup = new Gio.SimpleActionGroup();
-        this.insert_action_group('theme', this._actionGroup);
+        this._list.insert_action_group('theme', this._actionGroup);
 
-        this._settings = settings;
+        this._settings = ExtensionUtils.getSettings();
         this._actionGroup.add_action(
             this._settings.create_action('name'));
 
-        this.connect('destroy', () => (this._settings = null));
+        this.connect('destroy', () => this._settings.run_dispose());
 
         this._rows = new Map();
         this._addTheme(''); // default
@@ -45,7 +58,7 @@ class UserThemePrefsWidget extends Adw.PreferencesGroup {
     }
 
     async _collectThemes() {
-        for (const dirName of getThemeDirs()) {
+        for (const dirName of Util.getThemeDirs()) {
             const dir = Gio.File.new_for_path(dirName);
             for (const name of await this._enumerateDir(dir)) {
                 if (this._rows.has(name))
@@ -66,7 +79,7 @@ class UserThemePrefsWidget extends Adw.PreferencesGroup {
             }
         }
 
-        for (const dirName of getModeThemeDirs()) {
+        for (const dirName of Util.getModeThemeDirs()) {
             const dir = Gio.File.new_for_path(dirName);
             for (const filename of await this._enumerateDir(dir)) {
                 if (!filename.endsWith('.css'))
@@ -80,10 +93,10 @@ class UserThemePrefsWidget extends Adw.PreferencesGroup {
     }
 
     _addTheme(name) {
-        const row = new ThemeRow(name);
+        const row = new ThemeRow(name, this._settings);
         this._rows.set(name, row);
 
-        this.add(row);
+        this._list.append(row);
     }
 
     async _enumerateDir(dir) {
@@ -110,29 +123,64 @@ class UserThemePrefsWidget extends Adw.PreferencesGroup {
 
         return fileInfos.map(info => info.get_name());
     }
-}
+});
 
-class ThemeRow extends Adw.ActionRow {
+const ThemeRow = GObject.registerClass(
-    static {
+class ThemeRow extends Gtk.ListBoxRow {
-        GObject.registerClass(this);
+    _init(name, settings) {
-    }
+        this._name = name;
+        this._settings = settings;
 
-    constructor(name) {
+        const box = new Gtk.Box({
-        const check = new Gtk.CheckButton({
+            spacing: 12,
+            margin_start: 12,
+            margin_end: 12,
+            margin_top: 12,
+            margin_bottom: 12,
+        });
+        super._init({
             action_name: 'theme.name',
             action_target: new GLib.Variant('s', name),
+            child: box,
         });
 
-        super({
+        box.append(new Gtk.Label({
-            title: name || 'Default',
+            label: name || 'Default',
-            activatable_widget: check,
+            hexpand: true,
+            xalign: 0,
+            max_width_chars: 25,
+            width_chars: 25,
+        }));
+
+        this._checkmark = new Gtk.Image({
+            icon_name: 'emblem-ok-symbolic',
+            pixel_size: 16,
+        });
+        box.append(this._checkmark);
+
+        const id = this._settings.connect('changed::name',
+            this._syncCheckmark.bind(this));
+        this._syncCheckmark();
+
+        this.connect('destroy', () => {
+            this._settings.disconnect(id);
+            this._settings = null;
         });
-        this.add_prefix(check);
     }
+
+    _syncCheckmark() {
+        const visible = this._name === this._settings.get_string('name');
+        this._checkmark.opacity = visible ? 1. : 0;
+    }
+});
+
+/** */
+function init() {
 }
 
-export default class UserThemePrefs extends ExtensionPreferences {
+/**
-    getPreferencesWidget() {
+ * @returns {Gtk.Widget} - the prefs widget
-        return new UserThemePrefsWidget(this.getSettings());
+ */
-    }
+function buildPrefsWidget() {
+    return new UserThemePrefsWidget();
 }

extensions/user-theme/stylesheet.css

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

extensions/user-theme/util.js

@@ -1,15 +1,12 @@
-// SPDX-FileCopyrightText: 2020 Florian Müllner <fmuellner@gnome.org>
+/* exported getThemeDirs getModeThemeDirs */
-//
+const { GLib } = imports.gi;
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import GLib from 'gi://GLib';
 
 const fn = (...args) => GLib.build_filenamev(args);
 
 /**
  * @returns {string[]} - an ordered list of theme directories
  */
-export function getThemeDirs() {
+function getThemeDirs() {
     return [
         fn(GLib.get_home_dir(), '.themes'),
         fn(GLib.get_user_data_dir(), 'themes'),
@@ -20,7 +17,7 @@ export function getThemeDirs() {
 /**
  * @returns {string[]} - an ordered list of mode theme directories
  */
-export function getModeThemeDirs() {
+function getModeThemeDirs() {
     return GLib.get_system_data_dirs()
         .map(dir => fn(dir, 'gnome-shell', 'theme'));
 }

extensions/window-list/classic.css

@@ -1,16 +1,10 @@
-/*
+@import url("stylesheet.css");
- * 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");
 
 #panel.bottom-panel {
     border-top-width: 1px;
     border-bottom-width: 0px;
-    height: 2.5em;
+    height: 2.25em ;
+    padding: 2px;
   }
 
   .bottom-panel .window-button > StWidget,

extensions/window-list/extension.js

@@ -1,34 +1,21 @@
-// SPDX-FileCopyrightText: 2012 Florian Müllner <fmuellner@gnome.org>
+/* exported init */
-// SPDX-FileCopyrightText: 2013 Giovanni Campagna <gcampagna@src.gnome.org>
+const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
-// SPDX-FileCopyrightText: 2014 Sylvain Pasche <sylvain.pasche@gmail.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
 
-import Clutter from 'gi://Clutter';
+const DND = imports.ui.dnd;
-import Gio from 'gi://Gio';
+const ExtensionUtils = imports.misc.extensionUtils;
-import GLib from 'gi://GLib';
+const Main = imports.ui.main;
-import GObject from 'gi://GObject';
+const Overview = imports.ui.overview;
-import Gtk from 'gi://Gtk';
+const PopupMenu = imports.ui.popupMenu;
-import Meta from 'gi://Meta';
-import Shell from 'gi://Shell';
-import St from 'gi://St';
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const Me = ExtensionUtils.getCurrentExtension();
+const { WindowPicker, WindowPickerToggle } = Me.imports.windowPicker;
+const { WorkspaceIndicator } = Me.imports.workspaceIndicator;
 
-import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
+const _ = ExtensionUtils.gettext;
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
-import * as Overview from 'resource:///org/gnome/shell/ui/overview.js';
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
-
-import {WindowPicker, WindowPickerToggle} from './windowPicker.js';
-import {WorkspaceIndicator} from './workspaceIndicator.js';
 
 const ICON_TEXTURE_SIZE = 24;
 const DND_ACTIVATE_TIMEOUT = 500;
 
-const TOOLTIP_OFFSET = 6;
-const TOOLTIP_ANIMATION_TIME = 150;
-
 const GroupingMode = {
     NEVER: 0,
     AUTO: 1,
@@ -61,6 +48,10 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
         });
         this.addMenuItem(this._minimizeItem);
 
+        this._notifyMinimizedId = this._metaWindow.connect(
+            'notify::minimized', this._updateMinimizeItem.bind(this));
+        this._updateMinimizeItem();
+
         this._maximizeItem = new PopupMenu.PopupMenuItem('');
         this._maximizeItem.connect('activate', () => {
             if (this._metaWindow.get_maximized() === Meta.MaximizeFlags.BOTH)
@@ -70,20 +61,21 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
         });
         this.addMenuItem(this._maximizeItem);
 
+        this._notifyMaximizedHId = this._metaWindow.connect(
+            'notify::maximized-horizontally',
+            this._updateMaximizeItem.bind(this));
+        this._notifyMaximizedVId = this._metaWindow.connect(
+            'notify::maximized-vertically',
+            this._updateMaximizeItem.bind(this));
+        this._updateMaximizeItem();
+
         this._closeItem = new PopupMenu.PopupMenuItem(_('Close'));
         this._closeItem.connect('activate', () => {
             this._metaWindow.delete(global.get_current_time());
         });
         this.addMenuItem(this._closeItem);
 
-        this._metaWindow.connectObject(
+        this.actor.connect('destroy', this._onDestroy.bind(this));
-            'notify::minimized', this._updateMinimizeItem.bind(this),
-            'notify::maximized-horizontally', this._updateMaximizeItem.bind(this),
-            'notify::maximized-vertically', this._updateMaximizeItem.bind(this),
-            this);
-
-        this._updateMinimizeItem();
-        this._updateMaximizeItem();
 
         this.connect('open-state-changed', () => {
             if (!this.isOpen)
@@ -106,42 +98,46 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
         this._maximizeItem.label.text = maximized
             ? _('Unmaximize') : _('Maximize');
     }
+
+    _onDestroy() {
+        this._metaWindow.disconnect(this._notifyMinimizedId);
+        this._metaWindow.disconnect(this._notifyMaximizedHId);
+        this._metaWindow.disconnect(this._notifyMaximizedVId);
+    }
 }
 
+const WindowTitle = GObject.registerClass(
 class WindowTitle extends St.BoxLayout {
-    static {
+    _init(metaWindow) {
-        GObject.registerClass(this);
+        this._metaWindow = metaWindow;
-    }
 
-    constructor(metaWindow) {
+        super._init({
-        super({
             style_class: 'window-button-box',
             x_expand: true,
             y_expand: true,
         });
 
-        this._metaWindow = metaWindow;
+        this._icon = new St.Bin({ style_class: 'window-button-icon' });
-
-        this._icon = new St.Bin({style_class: 'window-button-icon'});
         this.add(this._icon);
-        this.label_actor = new St.Label({y_align: Clutter.ActorAlign.CENTER});
+        this.label_actor = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
         this.label_actor.clutter_text.single_line_mode = true;
         this.add(this.label_actor);
 
         this._textureCache = St.TextureCache.get_default();
-        this._textureCache.connectObject('icon-theme-changed',
+        this._iconThemeChangedId = this._textureCache.connect(
-            () => this._updateIcon(), this);
+            'icon-theme-changed', this._updateIcon.bind(this));
-
+        this._notifyWmClass = this._metaWindow.connect_after(
-        this._metaWindow.connectObject(
+            'notify::wm-class', this._updateIcon.bind(this));
-            'notify::wm-class',
+        this._notifyAppId = this._metaWindow.connect_after(
-            () => this._updateIcon(), GObject.ConnectFlags.AFTER,
+            'notify::gtk-application-id', this._updateIcon.bind(this));
-            'notify::gtk-application-id',
-            () => this._updateIcon(), GObject.ConnectFlags.AFTER,
-            'notify::title', () => this._updateTitle(),
-            'notify::minimized', () => this._minimizedChanged(),
-            this);
-
         this._updateIcon();
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._notifyTitleId = this._metaWindow.connect(
+            'notify::title', this._updateTitle.bind(this));
+        this._notifyMinimizedId = this._metaWindow.connect(
+            'notify::minimized', this._minimizedChanged.bind(this));
         this._minimizedChanged();
     }
 
@@ -171,33 +167,38 @@ class WindowTitle extends St.BoxLayout {
             });
         }
     }
-}
 
-class BaseButton extends St.Button {
+    _onDestroy() {
-    static {
+        this._textureCache.disconnect(this._iconThemeChangedId);
-        GObject.registerClass({
+        this._metaWindow.disconnect(this._notifyTitleId);
-            GTypeFlags: GObject.TypeFlags.ABSTRACT,
+        this._metaWindow.disconnect(this._notifyMinimizedId);
-            Properties: {
+        this._metaWindow.disconnect(this._notifyWmClass);
-                'ignore-workspace': GObject.ParamSpec.boolean(
+        this._metaWindow.disconnect(this._notifyAppId);
-                    'ignore-workspace', 'ignore-workspace', 'ignore-workspace',
-                    GObject.ParamFlags.READWRITE,
-                    false),
-            },
-        }, this);
     }
+});
 
-    constructor(perMonitor, monitorIndex) {
+
-        super({
+const BaseButton = GObject.registerClass({
+    GTypeFlags: GObject.TypeFlags.ABSTRACT,
+    Properties: {
+        'ignore-workspace': GObject.ParamSpec.boolean(
+            'ignore-workspace', 'ignore-workspace', 'ignore-workspace',
+            GObject.ParamFlags.READWRITE,
+            false),
+    },
+}, class BaseButton extends St.Button {
+    _init(perMonitor, monitorIndex) {
+        this._perMonitor = perMonitor;
+        this._monitorIndex = monitorIndex;
+        this._ignoreWorkspace = false;
+
+        super._init({
             style_class: 'window-button',
             can_focus: true,
             x_expand: true,
             button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
         });
 
-        this._perMonitor = perMonitor;
-        this._monitorIndex = monitorIndex;
-        this._ignoreWorkspace = false;
-
         this.connect('notify::allocation',
             this._updateIconGeometry.bind(this));
         this.connect('clicked', this._onClicked.bind(this));
@@ -206,23 +207,17 @@ class BaseButton extends St.Button {
 
         this._contextMenuManager = new PopupMenu.PopupMenuManager(this);
 
-        global.window_manager.connectObject('switch-workspace',
+        this._switchWorkspaceId = global.window_manager.connect(
-            () => this._updateVisibility(), this);
+            'switch-workspace', this._updateVisibility.bind(this));
 
         if (this._perMonitor) {
-            global.display.connectObject(
+            this._windowEnteredMonitorId = global.display.connect(
                 'window-entered-monitor',
-                this._windowEnteredOrLeftMonitor.bind(this),
+                this._windowEnteredOrLeftMonitor.bind(this));
+            this._windowLeftMonitorId = global.display.connect(
                 'window-left-monitor',
-                this._windowEnteredOrLeftMonitor.bind(this),
+                this._windowEnteredOrLeftMonitor.bind(this));
-                this);
         }
-
-        this._tooltip = new Tooltip(this, {
-            style_class: 'dash-label',
-            visible: false,
-        });
-        Main.uiGroup.add_child(this._tooltip);
     }
 
     get active() {
@@ -245,48 +240,6 @@ class BaseButton extends St.Button {
         this._updateVisibility();
     }
 
-    _setLongPressTimeout() {
-        if (this._longPressTimeoutId)
-            return;
-
-        const {longPressDuration} = Clutter.Settings.get_default();
-        this._longPressTimeoutId =
-            GLib.timeout_add(GLib.PRIORITY_DEFAULT, longPressDuration, () => {
-                delete this._longPressTimeoutId;
-
-                if (this._canOpenPopupMenu() && !this._contextMenu.isOpen)
-                    this._openMenu(this._contextMenu);
-                return GLib.SOURCE_REMOVE;
-            });
-    }
-
-    _removeLongPressTimeout() {
-        if (!this._longPressTimeoutId)
-            return;
-        GLib.source_remove(this._longPressTimeoutId);
-        delete this._longPressTimeoutId;
-    }
-
-    vfunc_button_press_event(buttonEvent) {
-        if (buttonEvent.button === 1)
-            this._setLongPressTimeout();
-        return super.vfunc_button_press_event(buttonEvent);
-    }
-
-    vfunc_button_release_event(buttonEvent) {
-        this._removeLongPressTimeout();
-
-        return super.vfunc_button_release_event(buttonEvent);
-    }
-
-    vfunc_touch_event(touchEvent) {
-        if (touchEvent.type === Clutter.EventType.TOUCH_BEGIN)
-            this._setLongPressTimeout();
-        else if (touchEvent.type === Clutter.EventType.TOUCH_END)
-            this._removeLongPressTimeout();
-        return super.vfunc_touch_event(touchEvent);
-    }
-
     activate() {
         if (this.active)
             return;
@@ -324,11 +277,9 @@ class BaseButton extends St.Button {
         if (isOpen)
             return;
 
-        const extension = Extension.lookupByURL(import.meta.url);
-
         let [x, y] = global.get_pointer();
         let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
-        if (extension.someWindowListContains(actor))
+        if (Me.stateObj.someWindowListContains(actor))
             actor.sync_hover();
     }
 
@@ -383,24 +334,28 @@ class BaseButton extends St.Button {
     }
 
     _onDestroy() {
-        this._tooltip.destroy();
+        global.window_manager.disconnect(this._switchWorkspaceId);
-    }
-}
 
+        if (this._windowEnteredMonitorId)
+            global.display.disconnect(this._windowEnteredMonitorId);
+        this._windowEnteredMonitorId = 0;
+
+        if (this._windowLeftMonitorId)
+            global.display.disconnect(this._windowLeftMonitorId);
+        this._windowLeftMonitorId = 0;
+    }
+});
+
+
+const WindowButton = GObject.registerClass(
 class WindowButton extends BaseButton {
-    static {
+    _init(metaWindow, perMonitor, monitorIndex) {
-        GObject.registerClass(this);
+        super._init(perMonitor, monitorIndex);
-    }
-
-    constructor(metaWindow, perMonitor, monitorIndex) {
-        super(perMonitor, monitorIndex);
 
         this.metaWindow = metaWindow;
-        metaWindow.connectObject(
+        this._skipTaskbarId = metaWindow.connect('notify::skip-taskbar', () => {
-            'notify::skip-taskbar', () => this._updateVisibility(),
+            this._updateVisibility();
-            'workspace-changed', () => this._updateVisibility(),
+        });
-            this);
-
         this._updateVisibility();
 
         this._windowTitle = new WindowTitle(this.metaWindow);
@@ -414,8 +369,11 @@ class WindowButton extends BaseButton {
         this._contextMenuManager.addMenu(this._contextMenu);
         Main.uiGroup.add_actor(this._contextMenu.actor);
 
-        global.display.connectObject('notify::focus-window',
+        this._workspaceChangedId = this.metaWindow.connect(
-            () => this._updateStyle(), this);
+            'workspace-changed', this._updateVisibility.bind(this));
+
+        this._notifyFocusId = global.display.connect(
+            'notify::focus-window', this._updateStyle.bind(this));
         this._updateStyle();
     }
 
@@ -425,7 +383,7 @@ class WindowButton extends BaseButton {
             return;
         }
 
-        if (!button || button === 1)
+        if (button === 1)
             this._minimizeOrActivateWindow(this.metaWindow);
         else
             this._openMenu(this._contextMenu);
@@ -459,9 +417,13 @@ class WindowButton extends BaseButton {
 
     _onDestroy() {
         super._onDestroy();
+        this.metaWindow.disconnect(this._skipTaskbarId);
+        this.metaWindow.disconnect(this._workspaceChangedId);
+        global.display.disconnect(this._notifyFocusId);
         this._contextMenu.destroy();
     }
-}
+});
+
 
 class AppContextMenu extends PopupMenu.PopupMenu {
     constructor(source) {
@@ -521,18 +483,15 @@ class AppContextMenu extends PopupMenu.PopupMenu {
     }
 }
 
+const AppButton = GObject.registerClass(
 class AppButton extends BaseButton {
-    static {
+    _init(app, perMonitor, monitorIndex) {
-        GObject.registerClass(this);
+        super._init(perMonitor, monitorIndex);
-    }
-
-    constructor(app, perMonitor, monitorIndex) {
-        super(perMonitor, monitorIndex);
 
         this.app = app;
         this._updateVisibility();
 
-        let stack = new St.Widget({layout_manager: new Clutter.BinLayout()});
+        let stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
         this.set_child(stack);
 
         this._singleWindowTitle = new St.Bin({
@@ -575,17 +534,18 @@ class AppButton extends BaseButton {
         Main.uiGroup.add_actor(this._appContextMenu.actor);
 
         this._textureCache = St.TextureCache.get_default();
-        this._textureCache.connectObject('icon-theme-changed', () => {
+        this._iconThemeChangedId =
-            this._icon.child = app.create_icon_texture(ICON_TEXTURE_SIZE);
+            this._textureCache.connect('icon-theme-changed', () => {
-        }, this);
+                this._icon.child = app.create_icon_texture(ICON_TEXTURE_SIZE);
+            });
 
-        this.app.connectObject('windows-changed',
+        this._windowsChangedId = this.app.connect(
-            () => this._windowsChanged(), this);
+            'windows-changed', this._windowsChanged.bind(this));
         this._windowsChanged();
 
         this._windowTracker = Shell.WindowTracker.get_default();
-        this._windowTracker.connectObject('notify::focus-app',
+        this._notifyFocusId = this._windowTracker.connect(
-            () => this._updateStyle(), this);
+            'notify::focus-app', this._updateStyle.bind(this));
         this._updateStyle();
     }
 
@@ -667,7 +627,7 @@ class AppButton extends BaseButton {
         if (contextMenuWasOpen)
             this._contextMenu.close();
 
-        if (!button || button === 1) {
+        if (button === 1) {
             if (menuWasOpen)
                 return;
 
@@ -705,17 +665,21 @@ class AppButton extends BaseButton {
 
     _onDestroy() {
         super._onDestroy();
+        this._textureCache.disconnect(this._iconThemeChangedId);
+        this._windowTracker.disconnect(this._notifyFocusId);
+        this.app.disconnect(this._windowsChangedId);
         this._menu.destroy();
     }
-}
+});
 
+
+const WindowList = GObject.registerClass(
 class WindowList extends St.Widget {
-    static {
+    _init(perMonitor, monitor) {
-        GObject.registerClass(this);
+        this._perMonitor = perMonitor;
-    }
+        this._monitor = monitor;
 
-    constructor(perMonitor, monitor, settings) {
+        super._init({
-        super({
             name: 'panel',
             style_class: 'bottom-panel solid',
             reactive: true,
@@ -724,10 +688,7 @@ class WindowList extends St.Widget {
         });
         this.connect('destroy', this._onDestroy.bind(this));
 
-        this._perMonitor = perMonitor;
+        let box = new St.BoxLayout({ x_expand: true, y_expand: true });
-        this._monitor = monitor;
-
-        let box = new St.BoxLayout({x_expand: true, y_expand: true});
         this.add_actor(box);
 
         let toggle = new WindowPickerToggle();
@@ -736,7 +697,7 @@ class WindowList extends St.Widget {
         toggle.connect('notify::checked',
             this._updateWindowListVisibility.bind(this));
 
-        let layout = new Clutter.BoxLayout({homogeneous: true});
+        let layout = new Clutter.BoxLayout({ homogeneous: true });
         this._windowList = new St.Widget({
             style_class: 'window-list',
             reactive: true,
@@ -754,19 +715,19 @@ class WindowList extends St.Widget {
         });
         this._windowList.connect('scroll-event', this._onScrollEvent.bind(this));
 
-        let indicatorsBox = new St.BoxLayout({x_align: Clutter.ActorAlign.END});
+        let indicatorsBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.END });
         box.add(indicatorsBox);
 
         this._workspaceIndicator = new WorkspaceIndicator();
         indicatorsBox.add_child(this._workspaceIndicator.container);
 
-        this._mutterSettings = new Gio.Settings({schema_id: 'org.gnome.mutter'});
+        this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
-        this._mutterSettings.connectObject(
+        this._workspacesOnlyOnPrimaryChangedId = this._mutterSettings.connect(
             'changed::workspaces-only-on-primary',
-            () => this._updateWorkspaceIndicatorVisibility(),
+            this._updateWorkspaceIndicatorVisibility.bind(this));
+        this._dynamicWorkspacesChangedId = this._mutterSettings.connect(
             'changed::dynamic-workspaces',
-            () => this._updateWorkspaceIndicatorVisibility(),
+            this._updateWorkspaceIndicatorVisibility.bind(this));
-            this);
         this._updateWorkspaceIndicatorVisibility();
 
         this._menuManager = new PopupMenu.PopupMenuManager(this);
@@ -784,58 +745,59 @@ class WindowList extends St.Widget {
         this._updatePosition();
 
         this._appSystem = Shell.AppSystem.get_default();
-        this._appSystem.connectObject('app-state-changed',
+        this._appStateChangedId = this._appSystem.connect(
-            this._onAppStateChanged.bind(this), this);
+            'app-state-changed', this._onAppStateChanged.bind(this));
 
         // Hack: OSK gesture is tied to visibility, piggy-back on that
-        Main.keyboard._bottomDragAction.connectObject('notify::enabled',
+        this._keyboardVisiblechangedId =
-            action => {
+            Main.keyboard._bottomDragAction.connect('notify::enabled',
-                const visible = !action.enabled;
+                action => {
-                if (visible) {
+                    const visible = !action.enabled;
-                    Main.uiGroup.set_child_above_sibling(
+                    if (visible) {
-                        this, Main.layoutManager.keyboardBox);
+                        Main.uiGroup.set_child_above_sibling(
-                } else {
+                            this, Main.layoutManager.keyboardBox);
-                    Main.uiGroup.set_child_above_sibling(
+                    } else {
-                        this, Main.layoutManager.panelBox);
+                        Main.uiGroup.set_child_above_sibling(
-                }
+                            this, Main.layoutManager.panelBox);
-                this._updateKeyboardAnchor();
+                    }
-            }, this);
+                    this._updateKeyboardAnchor();
+                });
 
         let workspaceManager = global.workspace_manager;
 
-        workspaceManager.connectObject('notify::n-workspaces',
+        this._nWorkspacesChangedId = workspaceManager.connect(
-            () => this._updateWorkspaceIndicatorVisibility(), this);
+            'notify::n-workspaces', this._updateWorkspaceIndicatorVisibility.bind(this));
         this._updateWorkspaceIndicatorVisibility();
 
-        global.window_manager.connectObject('switch-workspace',
+        this._switchWorkspaceId = global.window_manager.connect(
-            () => this._checkGrouping(), this);
+            'switch-workspace', this._checkGrouping.bind(this));
 
-        Main.overview.connectObject(
+        this._overviewShowingId = Main.overview.connect('showing', () => {
-            'showing', () => {
+            this.hide();
-                this.hide();
-                this._updateKeyboardAnchor();
-            },
-            'hidden', () => {
-                this.visible = !this._monitor.inFullscreen;
-                this._updateKeyboardAnchor();
-            }, this);
-
-        global.display.connectObject('in-fullscreen-changed', () => {
-            // Work-around for initial change from unknown to !fullscreen
-            if (Main.overview.visible)
-                this.hide();
             this._updateKeyboardAnchor();
-        }, this);
+        });
+
+        this._overviewHidingId = Main.overview.connect('hidden', () => {
+            this.visible = !Main.layoutManager.primaryMonitor.inFullscreen;
+            this._updateKeyboardAnchor();
+        });
+
+        this._fullscreenChangedId =
+            global.display.connect('in-fullscreen-changed', () => {
+                // Work-around for initial change from unknown to !fullscreen
+                if (Main.overview.visible)
+                    this.hide();
+                this._updateKeyboardAnchor();
+            });
 
         this._windowSignals = new Map();
-        global.display.connectObject(
+        this._windowCreatedId = global.display.connect(
-            'window-created', (dsp, win) => this._addWindow(win), this);
+            'window-created', (dsp, win) => this._addWindow(win));
-
-        Main.xdndHandler.connectObject(
-            'drag-begin', () => this._monitorDrag(),
-            'drag-end', () => this._stopMonitoringDrag(),
-            this);
 
+        this._dragBeginId = Main.xdndHandler.connect('drag-begin',
+            this._monitorDrag.bind(this));
+        this._dragEndId = Main.xdndHandler.connect('drag-end',
+            this._stopMonitoringDrag.bind(this));
         this._dragMonitor = {
             dragMotion: this._onDragMotion.bind(this),
         };
@@ -843,9 +805,9 @@ class WindowList extends St.Widget {
         this._dndTimeoutId = 0;
         this._dndWindow = null;
 
-        this._settings = settings;
+        this._settings = ExtensionUtils.getSettings();
-        this._settings.connectObject('changed::grouping-mode',
+        this._groupingModeChangedId = this._settings.connect(
-            () => this._groupingModeChanged(), this);
+            'changed::grouping-mode', this._groupingModeChanged.bind(this));
         this._grouped = undefined;
         this._groupingModeChanged();
     }
@@ -884,8 +846,7 @@ class WindowList extends St.Widget {
     }
 
     _updateWindowListVisibility() {
-        const {windowPicker} = Extension.lookupByURL(import.meta.url);
+        let visible = !Main.windowPicker.visible;
-        const visible = !windowPicker.visible;
 
         this._windowList.ease({
             opacity: visible ? 255 : 0,
@@ -903,7 +864,7 @@ class WindowList extends St.Widget {
 
         let children = this._windowList.get_children();
         let [, childWidth] = children[0].get_preferred_width(-1);
-        let {spacing} = this._windowList.layout_manager;
+        let { spacing } = this._windowList.layout_manager;
 
         let workspace = global.workspace_manager.get_active_workspace();
         let windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
@@ -1025,7 +986,7 @@ class WindowList extends St.Widget {
         const id = this._windowSignals.get(win);
         if (id)
             win.disconnect(id);
-        this._windowSignals.delete(win);
+        this._windowSignals.delete(id);
 
         let children = this._windowList.get_children();
         let child = children.find(c => c.metaWindow === win);
@@ -1083,27 +1044,49 @@ class WindowList extends St.Widget {
     }
 
     _onDestroy() {
+        this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
+        this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId);
+
         this._workspaceIndicator.destroy();
 
         Main.ctrlAltTabManager.removeGroup(this);
 
+        this._appSystem.disconnect(this._appStateChangedId);
+        this._appStateChangedId = 0;
+
+        Main.keyboard._bottomDragAction.disconnect(this._keyboardVisiblechangedId);
+        this._keyboardVisiblechangedId = 0;
+
+        global.workspace_manager.disconnect(this._nWorkspacesChangedId);
+        this._nWorkspacesChangedId = 0;
+
+        global.window_manager.disconnect(this._switchWorkspaceId);
+        this._switchWorkspaceId = 0;
+
         this._windowSignals.forEach((id, win) => win.disconnect(id));
         this._windowSignals.clear();
 
-        this._stopMonitoringDrag();
+        Main.overview.disconnect(this._overviewShowingId);
+        Main.overview.disconnect(this._overviewHidingId);
 
-        this._settings.disconnectObject();
+        global.display.disconnect(this._fullscreenChangedId);
-        this._settings = null;
+        global.display.disconnect(this._windowCreatedId);
+
+        this._stopMonitoringDrag();
+        Main.xdndHandler.disconnect(this._dragBeginId);
+        Main.xdndHandler.disconnect(this._dragEndId);
+
+        this._settings.disconnect(this._groupingModeChangedId);
 
         let windows = global.get_window_actors();
         for (let i = 0; i < windows.length; i++)
             windows[i].metaWindow.set_icon_geometry(null);
     }
-}
+});
 
-export default class WindowListExtension extends Extension {
+class Extension {
-    constructor(metadata) {
+    constructor() {
-        super(metadata);
+        ExtensionUtils.initTranslations();
 
         this._windowLists = null;
         this._hideOverviewOrig = Main.overview.hide;
@@ -1112,17 +1095,17 @@ export default class WindowListExtension extends Extension {
     enable() {
         this._windowLists = [];
 
-        this._settings = this.getSettings();
+        this._settings = ExtensionUtils.getSettings();
-        this._settings.connectObject('changed::show-on-all-monitors',
+        this._showOnAllMonitorsChangedId = this._settings.connect(
-            () => this._buildWindowLists(), this);
+            'changed::show-on-all-monitors', this._buildWindowLists.bind(this));
 
-        Main.layoutManager.connectObject('monitors-changed',
+        this._monitorsChangedId = Main.layoutManager.connect(
-            () => this._buildWindowLists(), this);
+            'monitors-changed', this._buildWindowLists.bind(this));
 
-        this.windowPicker = new WindowPicker();
+        Main.windowPicker = new WindowPicker();
 
         Main.overview.hide = () => {
-            this.windowPicker.close();
+            Main.windowPicker.close();
             this._hideOverviewOrig.call(Main.overview);
         };
 
@@ -1137,7 +1120,7 @@ export default class WindowListExtension extends Extension {
 
         Main.layoutManager.monitors.forEach(monitor => {
             if (showOnAllMonitors || monitor === Main.layoutManager.primaryMonitor)
-                this._windowLists.push(new WindowList(showOnAllMonitors, monitor, this.getSettings()));
+                this._windowLists.push(new WindowList(showOnAllMonitors, monitor));
         });
     }
 
@@ -1145,9 +1128,11 @@ export default class WindowListExtension extends Extension {
         if (!this._windowLists)
             return;
 
-        Main.layoutManager.disconnectObject(this);
+        this._settings.disconnect(this._showOnAllMonitorsChangedId);
-        this._settings.disconnectObject(this);
+        this._showOnAllMonitorsChangedId = 0;
-        this._settings = null;
+
+        Main.layoutManager.disconnect(this._monitorsChangedId);
+        this._monitorsChangedId = 0;
 
         this._windowLists.forEach(windowList => {
             windowList.hide();
@@ -1155,8 +1140,8 @@ export default class WindowListExtension extends Extension {
         });
         this._windowLists = null;
 
-        this.windowPicker.destroy();
+        Main.windowPicker.destroy();
-        delete this.windowPicker;
+        delete Main.windowPicker;
 
         Main.overview.hide = this._hideOverviewOrig;
     }
@@ -1166,66 +1151,9 @@ export default class WindowListExtension extends Extension {
     }
 }
 
-class Tooltip extends St.Label {
+/**
-    static {
+ * @returns {Extension} - the extension's state object
-        GObject.registerClass(this);
+ */
-    }
+function init() {
-
+    return new Extension();
-    constructor(widget, params) {
-        super(params);
-
-        this._widget = widget;
-
-        this._widget.connect('notify::hover', () => {
-            if (this._widget.hover)
-                this.open();
-            else
-                this.close();
-        });
-    }
-
-    open() {
-        const buttonTitleWidget = this._widget.label_actor;
-        const [, , preferredTitleWidth] = buttonTitleWidget.get_preferred_size();
-        const maxTitleWidth = buttonTitleWidget.allocation.get_width();
-        const isTitleFullyShown = preferredTitleWidth <= maxTitleWidth;
-
-        if (isTitleFullyShown)
-            return;
-
-        this.set({
-            text: this._widget.label_actor.get_text(),
-            visible: true,
-            opacity: 0,
-        });
-
-        const [stageX, stageY] = this._widget.get_transformed_position();
-        const thumbWidth = this._widget.allocation.get_width();
-        const tipWidth = this.width;
-        const tipHeight = this.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.set_position(x, y);
-
-        this.ease({
-            opacity: 255,
-            duration: TOOLTIP_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => (this.visible = this._widget.hover),
-        });
-    }
-
-    close() {
-        this.ease({
-            opacity: 0,
-            duration: TOOLTIP_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => (this.visible = this._widget.hover),
-        });
-    }
 }

extensions/window-list/meson.build

@@ -1,16 +1,12 @@
-# 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-dark.css',
-  'stylesheet-light.css'
-)
 
 extension_sources += files('prefs.js', 'windowPicker.js', 'workspaceIndicator.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
+
+if classic_mode_enabled
+  extension_data += files('classic.css')
+endif

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

@@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2016 Florian Müllner <fmuellner@gnome.org>
-
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
 <schemalist gettext-domain="gnome-shell-extensions">
   <enum id="org.gnome.shell.extensions.window-list.GroupingMode">
     <value value="0" nick="never"/>

extensions/window-list/prefs.js

@@ -1,29 +1,34 @@
-// SPDX-FileCopyrightText: 2013 Florian Müllner <fmuellner@gnome.org>
-// SPDX-FileCopyrightText: 2014 Sylvain Pasche <sylvain.pasche@gmail.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-import Adw from 'gi://Adw';
+/* exported init buildPrefsWidget */
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
 
-import {ExtensionPreferences, gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+const { Gio, GLib, GObject, Gtk } = imports.gi;
 
-class WindowListPrefsWidget extends Adw.PreferencesPage {
+const ExtensionUtils = imports.misc.extensionUtils;
-    static {
-        GObject.registerClass(this);
-    }
 
-    constructor(settings) {
+const _ = ExtensionUtils.gettext;
-        super();
+
+/** */
+function init() {
+    ExtensionUtils.initTranslations();
+}
+
+const WindowListPrefsWidget = GObject.registerClass(
+class WindowListPrefsWidget extends Gtk.Box {
+    _init() {
+        super._init({
+            orientation: Gtk.Orientation.VERTICAL,
+            spacing: 6,
+            margin_top: 36,
+            margin_bottom: 36,
+            margin_start: 36,
+            margin_end: 36,
+            halign: Gtk.Align.CENTER,
+        });
 
         this._actionGroup = new Gio.SimpleActionGroup();
         this.insert_action_group('window-list', this._actionGroup);
 
-        this._settings = settings;
+        this._settings = ExtensionUtils.getSettings();
         this._actionGroup.add_action(
             this._settings.create_action('grouping-mode'));
         this._actionGroup.add_action(
@@ -31,61 +36,62 @@ class WindowListPrefsWidget extends Adw.PreferencesPage {
         this._actionGroup.add_action(
             this._settings.create_action('display-all-workspaces'));
 
-        const groupingGroup = new Adw.PreferencesGroup({
+        let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
-            title: _('Window Grouping'),
+        this.append(new Gtk.Label({
+            label: groupingLabel, use_markup: true,
+            halign: Gtk.Align.START,
+        }));
+
+        const box = new Gtk.Box({
+            orientation: Gtk.Orientation.VERTICAL,
+            spacing: 12,
+            margin_bottom: 12,
         });
-        this.add(groupingGroup);
+        this.append(box);
+
+        const context = box.get_style_context();
+        const cssProvider = new Gtk.CssProvider();
+        cssProvider.load_from_data(
+            'box { padding: 12px; }');
+
+        context.add_provider(cssProvider,
+            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        context.add_class('frame');
+        context.add_class('view');
 
         const modes = [
-            {mode: 'never', title: _('Never group windows')},
+            { mode: 'never', label: _('Never group windows') },
-            {mode: 'auto', title: _('Group windows when space is limited')},
+            { mode: 'auto', label: _('Group windows when space is limited') },
-            {mode: 'always', title: _('Always group windows')},
+            { mode: 'always', label: _('Always group windows') },
         ];
-
+        let group = null;
-        for (const {mode, title} of modes) {
+        for (const { mode, label } of modes) {
             const check = new Gtk.CheckButton({
                 action_name: 'window-list.grouping-mode',
                 action_target: new GLib.Variant('s', mode),
+                label,
+                group,
+                margin_end: 12,
             });
-            const row = new Adw.ActionRow({
+            group = check;
-                activatable_widget: check,
+            box.append(check);
-                title,
-            });
-            row.add_prefix(check);
-            groupingGroup.add(row);
         }
 
-        const miscGroup = new Adw.PreferencesGroup();
+        this.append(new Gtk.CheckButton({
-        this.add(miscGroup);
+            label: _('Show on all monitors'),
-
-        let toggle = new Gtk.Switch({
             action_name: 'window-list.show-on-all-monitors',
-            valign: Gtk.Align.CENTER,
+        }));
-        });
-        let row = new Adw.ActionRow({
-            title: _('Show on all monitors'),
-            activatable_widget: toggle,
-        });
-        row.add_suffix(toggle);
-        miscGroup.add(row);
 
-        toggle = new Gtk.Switch({
+        this.append(new Gtk.CheckButton({
+            label: _('Show windows from all workspaces'),
             action_name: 'window-list.display-all-workspaces',
-            valign: Gtk.Align.CENTER,
+        }));
-        });
-        this._settings.bind('display-all-workspaces',
-            toggle, 'active', Gio.SettingsBindFlags.DEFAULT);
-        row = new Adw.ActionRow({
-            title: _('Show windows from all workspaces'),
-            activatable_widget: toggle,
-        });
-        row.add_suffix(toggle);
-        miscGroup.add(row);
     }
-}
+});
 
-export default class WindowListPrefs extends ExtensionPreferences {
+/**
-    getPreferencesWidget() {
+ * @returns {Gtk.Widget} - the prefs widget
-        return new WindowListPrefsWidget(this.getSettings());
+ */
-    }
+function buildPrefsWidget() {
+    return new WindowListPrefsWidget();
 }

extensions/window-list/stylesheet.css

@@ -1,23 +1,10 @@
-/*
- * SPDX-FileCopyrightText: 2012 Florian Müllner <fmuellner@gnome.org>
- * SPDX-FileCopyrightText: 2013 Giovanni Campagna <gcampagna@src.gnome.org>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 .window-list {
   spacing: 2px;
   font-size: 10pt;
 }
 
-.bottom-panel {
-  background-color: #000000;
-  border-top-width: 0px;
-  height: 2.45em;
-}
-
 .window-button {
-  padding: 4px, 3px;
+  padding: 1px;
 }
 
 .window-button:first-child:ltr {
@@ -35,10 +22,19 @@
 .window-button > StWidget,
 .window-picker-toggle > StWidget {
   color: #bbb;
-  background-color: #1d1d1d;
+  background-color: black;
-  border-radius: 4px;
+  border-radius: 2px;
   padding: 3px 6px 1px;
-  transition: 100ms ease;
+  box-shadow: inset 1px 1px 4px rgba(255,255,255,0.5);
+  text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
+}
+
+.window-picker-toggle {
+  padding: 3px;
+}
+
+.window-picker-toggle > StWidet {
+  border: 1px solid rgba(255,255,255,0.3);
 }
 
 .window-button > StWidget {
@@ -48,36 +44,33 @@
 
 .window-button:hover > StWidget,
 .window-picker-toggle:hover > StWidget {
-  color: #fff;
+  color: white;
-  background-color: #303030;
+  background-color: #1f1f1f;
 }
 
 .window-button:active > StWidget,
 .window-button:focus > StWidget {
-  color: #fff;
+  box-shadow: inset 2px 2px 4px rgba(255,255,255,0.5);
-  background-color: #3f3f3f;
 }
 
 .window-button.focused > StWidget,
 .window-picker-toggle:checked > StWidget {
-  color: #fff;
+  color: white;
-  background-color: #3f3f3f;
+  box-shadow: inset 1px 1px 4px rgba(255,255,255,0.7);
 }
 
 .window-button.focused:active > StWidget,
 .window-picker-toggle:checked:active > StWidget {
-  color: #fff;
+  box-shadow: inset 2px 2px 4px rgba(255,255,255,0.7);
-  background-color: #3f3f3f;
 }
 
 .window-button.minimized > StWidget {
   color: #666;
-  background-color: #161616;
+  box-shadow: inset -1px -1px 4px rgba(255,255,255,0.5);
 }
 
 .window-button.minimized:active > StWidget {
-  color: #666;
+  box-shadow: inset -2px -2px 4px rgba(255,255,255,0.5);
-  background-color: #161616;
 }
 
 .window-button-icon {
@@ -86,29 +79,31 @@
 }
 
 .window-list-workspace-indicator .status-label-bin {
-  background-color: rgba(200, 200, 200, 0.3);
+  background-color: rgba(200, 200, 200, .3);
-  padding: 5px;
+  border: 1px solid #cccccc;
+  padding: 0 3px;
   margin: 3px;
 }
 
 .window-list-workspace-indicator .workspaces-box {
   spacing: 3px;
-  padding: 5px;
+  padding: 3px;
 }
 
 .window-list-workspace-indicator .workspace {
+  border: 2px solid #000;
   width: 52px;
   border-radius: 4px;
-  background-color: #1e1e1e;
+  background-color: #595959;
 }
 
 .window-list-workspace-indicator .workspace.active {
-  background-color: #3f3f3f;
+  border-color: #fff;
 }
 
 .window-list-window-preview {
   background-color: #bebebe;
-  border-radius: 1px;
+  border: 1px solid #828282;
 }
 
 .window-list-window-preview.active {

extensions/window-list/windowPicker.js

@@ -1,35 +1,25 @@
-// SPDX-FileCopyrightText: 2019 Florian Müllner <fmuellner@gnome.org>
+/* exported WindowPicker, WindowPickerToggle */
-// SPDX-FileCopyrightText: 2019 Marco Trevisan (Treviño) <mail@3v1n0.net>
+const { Clutter, GObject, Shell, St } = imports.gi;
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
 
-import Clutter from 'gi://Clutter';
+const Layout = imports.ui.layout;
-import GObject from 'gi://GObject';
+const Main = imports.ui.main;
-import Shell from 'gi://Shell';
+const { WorkspacesDisplay } = imports.ui.workspacesView;
-import St from 'gi://St';
+const Workspace = imports.ui.workspace;
 
-import {Extension, InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';
+const { VIGNETTE_BRIGHTNESS } = imports.ui.lightbox;
-import * as Layout from 'resource:///org/gnome/shell/ui/layout.js';
+const {
-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
+    ControlsState,
-} from 'resource:///org/gnome/shell/ui/overviewControls.js';
+} = imports.ui.overviewControls;
 
+let MyWorkspacesDisplay = GObject.registerClass(
 class MyWorkspacesDisplay extends WorkspacesDisplay {
-    static {
+    _init(controls, overviewAdjustment) {
-        GObject.registerClass(this);
-    }
-
-    constructor(controls, overviewAdjustment) {
         let workspaceManager = global.workspace_manager;
 
-        const workspaceAdjustment = new St.Adjustment({
+        this._overviewAdjustment = overviewAdjustment;
+        this._workspaceAdjustment = new St.Adjustment({
             value: workspaceManager.get_active_workspace_index(),
             lower: 0,
             page_increment: 1,
@@ -38,16 +28,14 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
             upper: workspaceManager.n_workspaces,
         });
 
-        super(controls, workspaceAdjustment, overviewAdjustment);
+        this._nWorkspacesChangedId =
+            workspaceManager.connect('notify::n-workspaces',
+                this._updateAdjustment.bind(this));
 
-        this._windowPicker = controls;
+        super._init(controls, this._workspaceAdjustment, this._overviewAdjustment);
 
-        this._workspaceAdjustment = workspaceAdjustment;
         this._workspaceAdjustment.actor = this;
 
-        workspaceManager.connectObject('notify::n-workspaces',
-            () => this._updateAdjustment(), this);
-
         this.add_constraint(
             new Layout.MonitorConstraint({
                 primary: true,
@@ -57,7 +45,7 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
 
     prepareToEnterOverview(...args) {
         if (!this._scrollEventId) {
-            this._scrollEventId = this._windowPicker.connect('scroll-event',
+            this._scrollEventId = Main.windowPicker.connect('scroll-event',
                 this._onScrollEvent.bind(this));
         }
 
@@ -66,7 +54,7 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
 
     vfunc_hide(...args) {
         if (this._scrollEventId > 0)
-            this._windowPicker.disconnect(this._scrollEventId);
+            Main.windowPicker.disconnect(this._scrollEventId);
         this._scrollEventId = 0;
 
         super.vfunc_hide(...args);
@@ -79,28 +67,95 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
             value: workspaceManager.get_active_workspace_index(),
         });
     }
-}
 
-export class WindowPicker extends Clutter.Actor {
+    _onDestroy() {
-    static [GObject.signals] = {
+        if (this._nWorkspacesChangedId)
-        'open-state-changed': {param_types: [GObject.TYPE_BOOLEAN]},
+            global.workspace_manager.disconnect(this._nWorkspacesChangedId);
-    };
+        this._nWorkspacesChangedId = 0;
 
-    static {
+        super._onDestroy();
-        GObject.registerClass(this);
+    }
+});
+
+const MyWorkspace = GObject.registerClass(
+class MyWorkspace extends Workspace.Workspace {
+    _init(...args) {
+        super._init(...args);
+
+        this._adjChangedId =
+            this._overviewAdjustment.connect('notify::value', () => {
+                const { value: progress } = this._overviewAdjustment;
+                const brightness = 1 - (1 - VIGNETTE_BRIGHTNESS) * progress;
+                for (const bg of this._background?._backgroundGroup ?? []) {
+                    bg.content.set({
+                        vignette: true,
+                        brightness,
+                    });
+                }
+            });
     }
 
-    constructor() {
+    _onDestroy() {
-        super({reactive: true});
+        super._onDestroy();
 
+        if (this._adjChangedId)
+            this._overviewAdjustment.disconnect(this._adjChangedId);
+        this._adjChangedId = 0;
+    }
+});
+
+const MyWorkspaceBackground = GObject.registerClass(
+class MyWorkspaceBackground extends Workspace.WorkspaceBackground {
+    _updateBorderRadius() {
+    }
+
+    vfunc_allocate(box) {
+        this.set_allocation(box);
+
+        const themeNode = this.get_theme_node();
+        const contentBox = themeNode.get_content_box(box);
+
+        this._bin.allocate(contentBox);
+
+        const [contentWidth, contentHeight] = contentBox.get_size();
+        const monitor = Main.layoutManager.monitors[this._monitorIndex];
+        const xRatio = contentWidth / this._workarea.width;
+        const yRatio = contentHeight / this._workarea.height;
+
+        const right = area => area.x + area.width;
+        const bottom = area => area.y + area.height;
+
+        const offsets = {
+            left: xRatio * (this._workarea.x - monitor.x),
+            right: xRatio * (right(monitor) - right(this._workarea)),
+            top: yRatio * (this._workarea.y - monitor.y),
+            bottom: yRatio * (bottom(monitor) - bottom(this._workarea)),
+        };
+
+        contentBox.set_origin(-offsets.left, -offsets.top);
+        contentBox.set_size(
+            offsets.left + contentWidth + offsets.right,
+            offsets.top + contentHeight + offsets.bottom);
+        this._backgroundGroup.allocate(contentBox);
+    }
+});
+
+var WindowPicker = GObject.registerClass({
+    Signals: {
+        'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
+    },
+}, class extends Clutter.Actor {
+    _init() {
         this._visible = false;
         this._modal = false;
 
+        this._overlayKeyId = 0;
         this._stageKeyPressId = 0;
 
+        super._init({ reactive: true });
+
         this._adjustment = new OverviewAdjustment(this);
 
-        this._injectionManager = new InjectionManager();
         this.connect('destroy', this._onDestroy.bind(this));
 
         global.bind_property('screen-width',
@@ -118,78 +173,21 @@ export class WindowPicker extends Clutter.Actor {
         if (!Main.sessionMode.hasOverview) {
             this._injectBackgroundShade();
 
-            global.display.connectObject('overlay-key', () => {
+            this._overlayKeyId = global.display.connect('overlay-key', () => {
                 if (!this._visible)
                     this.open();
                 else
                     this.close();
-            }, this);
+            });
         }
     }
 
     _injectBackgroundShade() {
-        const backgroundProto = Workspace.WorkspaceBackground.prototype;
+        this._origWorkspace = Workspace.Workspace;
-        this._injectionManager.overrideMethod(backgroundProto, '_updateBorderRadius',
+        this._origWorkspaceBackground = Workspace.WorkspaceBackground;
-            () => {
-                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();
+        Workspace.Workspace = MyWorkspace;
-                    const contentBox = themeNode.get_content_box(box);
+        Workspace.WorkspaceBackground = MyWorkspaceBackground;
-
-                    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() {
@@ -275,40 +273,45 @@ export class WindowPicker extends Clutter.Actor {
             if (this._modal)
                 return true;
 
-            const grab = Main.pushModal(global.stage, {
+            this._modal = Main.pushModal(this, {
                 actionMode: Shell.ActionMode.OVERVIEW,
             });
-            if (grab.get_seat_state() !== Clutter.GrabState.NONE) {
+
-                this._grab = grab;
+            if (!this._modal) {
-                this._modal = true;
-            } else {
-                Main.popModal(grab);
                 this.hide();
                 return false;
             }
         } else if (this._modal) {
-            Main.popModal(this._grab);
+            Main.popModal(this);
             this._modal = false;
-            this._grab = null;
         }
         return true;
     }
 
     _onDestroy() {
-        this._injectionManager.clear();
+        if (this._origWorkspace)
+            Workspace.Workspace = this._origWorkspace;
+
+        if (this._origWorkspaceBackground)
+            Workspace.WorkspaceBackground = this._origWorkspaceBackground;
+
+        if (this._monitorsChangedId)
+            Main.layoutManager.disconnect(this._monitorsChangedId);
+        this._monitorsChangedId = 0;
+
+        if (this._overlayKeyId)
+            global.display.disconnect(this._overlayKeyId);
+        this._overlayKeyId = 0;
 
         if (this._stageKeyPressId)
             global.stage.disconnect(this._stageKeyPressId);
         this._stageKeyPressId = 0;
     }
-}
+});
 
-export class WindowPickerToggle extends St.Button {
+var WindowPickerToggle = GObject.registerClass(
-    static {
+class WindowPickerToggle extends St.Button {
-        GObject.registerClass(this);
+    _init() {
-    }
-
-    constructor() {
         let iconBin = new St.Widget({
             layout_manager: new Clutter.BinLayout(),
         });
@@ -320,23 +323,22 @@ export class WindowPickerToggle extends St.Button {
             x_align: Clutter.ActorAlign.CENTER,
             y_align: Clutter.ActorAlign.CENTER,
         }));
-        super({
+        super._init({
             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();
+                Main.windowPicker.open();
             else
-                windowPicker.close();
+                Main.windowPicker.close();
         });
 
-        windowPicker.connect('open-state-changed', () => {
+        Main.windowPicker.connect('open-state-changed', () => {
-            this.checked = windowPicker.visible;
+            this.checked = Main.windowPicker.visible;
         });
     }
-}
+});

extensions/window-list/workspaceIndicator.js

@@ -1,50 +1,45 @@
-// SPDX-FileCopyrightText: 2019 Florian Müllner <fmuellner@gnome.org>
+/* exported WorkspaceIndicator */
-//
+const { Clutter, Gio, GObject, Meta, St } = imports.gi;
-// SPDX-License-Identifier: GPL-2.0-or-later
 
-import Clutter from 'gi://Clutter';
+const DND = imports.ui.dnd;
-import Gio from 'gi://Gio';
+const ExtensionUtils = imports.misc.extensionUtils;
-import GObject from 'gi://GObject';
+const Main = imports.ui.main;
-import Meta from 'gi://Meta';
+const PanelMenu = imports.ui.panelMenu;
-import St from 'gi://St';
+const PopupMenu = imports.ui.popupMenu;
 
-import {gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const _ = ExtensionUtils.gettext;
-
-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;
 
+let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
-    static {
+    _init(window) {
-        GObject.registerClass(this);
+        super._init({
-    }
-
-    constructor(window) {
-        super({
             style_class: 'window-list-window-preview',
         });
 
         this._delegate = this;
-        DND.makeDraggable(this, {restoreOnSuccess: true});
+        DND.makeDraggable(this, { restoreOnSuccess: true });
 
         this._window = window;
 
-        this._window.connectObject(
+        this.connect('destroy', this._onDestroy.bind(this));
-            'size-changed', () => this._checkRelayout(),
-            'position-changed', () => this._checkRelayout(),
-            'notify::minimized', this._updateVisible.bind(this),
-            'notify::window-type', this._updateVisible.bind(this),
-            this);
-        this._updateVisible();
 
-        global.display.connectObject('notify::focus-window',
+        this._sizeChangedId = this._window.connect('size-changed',
-            this._onFocusChanged.bind(this), this);
+            () => this.queue_relayout());
+        this._positionChangedId = this._window.connect('position-changed',
+            () => {
+                this._updateVisible();
+                this.queue_relayout();
+            });
+        this._minimizedChangedId = this._window.connect('notify::minimized',
+            this._updateVisible.bind(this));
+
+        this._focusChangedId = global.display.connect('notify::focus-window',
+            this._onFocusChanged.bind(this));
         this._onFocusChanged();
     }
 
@@ -53,6 +48,13 @@ class WindowPreview extends St.Button {
         return this._window;
     }
 
+    _onDestroy() {
+        this._window.disconnect(this._sizeChangedId);
+        this._window.disconnect(this._positionChangedId);
+        this._window.disconnect(this._minimizedChangedId);
+        global.display.disconnect(this._focusChangedId);
+    }
+
     _onFocusChanged() {
         if (global.display.focus_window === this._window)
             this.add_style_class_name('active');
@@ -60,24 +62,17 @@ class WindowPreview extends St.Button {
             this.remove_style_class_name('active');
     }
 
-    _checkRelayout() {
+    _updateVisible() {
         const monitor = Main.layoutManager.findIndexForActor(this);
         const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        if (this._window.get_frame_rect().overlap(workArea))
+        this.visible = this._window.get_frame_rect().overlap(workArea) &&
-            this.queue_relayout();
+            this._window.window_type !== Meta.WindowType.DESKTOP &&
-    }
-
-    _updateVisible() {
-        this.visible = this._window.window_type !== Meta.WindowType.DESKTOP &&
             this._window.showing_on_its_workspace();
     }
-}
+});
 
+let WorkspaceLayout = GObject.registerClass(
 class WorkspaceLayout extends Clutter.LayoutManager {
-    static {
-        GObject.registerClass(this);
-    }
-
     vfunc_get_preferred_width() {
         return [0, 0];
     }
@@ -104,15 +99,12 @@ class WorkspaceLayout extends Clutter.LayoutManager {
             child.allocate(childBox);
         }
     }
-}
+});
 
+let WorkspaceThumbnail = GObject.registerClass(
 class WorkspaceThumbnail extends St.Button {
-    static {
+    _init(index) {
-        GObject.registerClass(this);
+        super._init({
-    }
-
-    constructor(index) {
-        super({
             style_class: 'workspace',
             child: new Clutter.Actor({
                 layout_manager: new WorkspaceLayout(),
@@ -137,13 +129,16 @@ class WorkspaceThumbnail extends St.Button {
         let workspaceManager = global.workspace_manager;
         this._workspace = workspaceManager.get_workspace_by_index(index);
 
-        this._workspace.connectObject(
+        this._windowAddedId = this._workspace.connect('window-added',
-            'window-added', (ws, window) => this._addWindow(window),
+            (ws, window) => {
-            'window-removed', (ws, window) => this._removeWindow(window),
+                this._addWindow(window);
-            this);
+            });
-
+        this._windowRemovedId = this._workspace.connect('window-removed',
-        global.display.connectObject('restacked',
+            (ws, window) => {
-            this._onRestacked.bind(this), this);
+                this._removeWindow(window);
+            });
+        this._restackedId = global.display.connect('restacked',
+            this._onRestacked.bind(this));
 
         this._workspace.list_windows().forEach(w => this._addWindow(w));
         this._onRestacked();
@@ -241,16 +236,17 @@ class WorkspaceThumbnail extends St.Button {
 
     _onDestroy() {
         this._tooltip.destroy();
-    }
-}
 
-export class WorkspaceIndicator extends PanelMenu.Button {
+        this._workspace.disconnect(this._windowAddedId);
-    static {
+        this._workspace.disconnect(this._windowRemovedId);
-        GObject.registerClass(this);
+        global.display.disconnect(this._restackedId);
     }
+});
 
-    constructor() {
+var WorkspaceIndicator = GObject.registerClass(
-        super(0.5, _('Workspace Indicator'), true);
+class WorkspaceIndicator extends PanelMenu.Button {
+    _init() {
+        super._init(0.0, _('Workspace Indicator'), true);
         this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
         this.add_style_class_name('window-list-workspace-indicator');
         this.remove_style_class_name('panel-button');
@@ -266,7 +262,7 @@ export class WorkspaceIndicator extends PanelMenu.Button {
         let workspaceManager = global.workspace_manager;
 
         this._currentWorkspace = workspaceManager.get_active_workspace_index();
-        this._statusLabel = new St.Label({text: this._getStatusText()});
+        this._statusLabel = new St.Label({ text: this._getStatusText() });
 
         this._statusBin = new St.Bin({
             style_class: 'status-label-bin',
@@ -287,24 +283,39 @@ export class WorkspaceIndicator extends PanelMenu.Button {
 
         this._workspacesItems = [];
 
-        workspaceManager.connectObject(
+        this._workspaceManagerSignals = [
-            'notify::n-workspaces', this._nWorkspacesChanged.bind(this), GObject.ConnectFlags.AFTER,
+            workspaceManager.connect('notify::n-workspaces',
-            'workspace-switched', this._onWorkspaceSwitched.bind(this), GObject.ConnectFlags.AFTER,
+                this._nWorkspacesChanged.bind(this)),
-            'notify::layout-rows', this._updateThumbnailVisibility.bind(this),
+            workspaceManager.connect_after('workspace-switched',
-            this);
+                this._onWorkspaceSwitched.bind(this)),
+            workspaceManager.connect('notify::layout-rows',
+                this._updateThumbnailVisibility.bind(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 = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
-        this._settings.connectObject('changed::workspace-names',
+        this._settingsChangedId = this._settings.connect(
-            () => this._updateMenuLabels(), this);
+            'changed::workspace-names', this._updateMenuLabels.bind(this));
+    }
+
+    _onDestroy() {
+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
+            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+
+        if (this._settingsChangedId) {
+            this._settings.disconnect(this._settingsChangedId);
+            this._settingsChangedId = 0;
+        }
+
+        super._onDestroy();
     }
 
     _updateThumbnailVisibility() {
-        const {workspaceManager} = global;
+        const { workspaceManager } = global;
         const vertical = workspaceManager.layout_rows === -1;
         const useMenu =
             vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
@@ -424,4 +435,5 @@ export class WorkspaceIndicator extends PanelMenu.Button {
         let newIndex = this._currentWorkspace + diff;
         this._activate(newIndex);
     }
-}
+});
+

extensions/windowsNavigator/extension.js

@@ -1,298 +1,270 @@
-// SPDX-FileCopyrightText: 2011 Maxim Ermilov <zaspire@rambler.ru>
-// SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-// SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
-// SPDX-FileCopyrightText: 2019 Marco Trevisan (Treviño) <mail@3v1n0.net>
-// SPDX-FileCopyrightText: 2020 Thun Pin <thunpin@gmail.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-import Clutter from 'gi://Clutter';
+/* exported init */
-import Graphene from 'gi://Graphene';
+const { Clutter, Graphene, GObject, St } = imports.gi;
-import St from 'gi://St';
 
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const Main = imports.ui.main;
-import * as OverviewControls from 'resource:///org/gnome/shell/ui/overviewControls.js';
+const OverviewControls = imports.ui.overviewControls;
-import {InjectionManager} from 'resource:///org/gnome/shell/extensions/extension.js';
+const Workspace = imports.ui.workspace;
-import {WindowPreview} from 'resource:///org/gnome/shell/ui/windowPreview.js';
+const WorkspacesView = imports.ui.workspacesView;
-import {Workspace} from 'resource:///org/gnome/shell/ui/workspace.js';
-import {WorkspacesView} from 'resource:///org/gnome/shell/ui/workspacesView.js';
 
 const WINDOW_SLOT = 4;
 
-export default class Extension {
+var MyWorkspace = GObject.registerClass(
+class MyWorkspace extends Workspace.Workspace {
+    _init(...args) {
+        super._init(...args);
+
+        if (this.metaWorkspace && this.metaWorkspace.index() < 9) {
+            this._tip = new St.Label({
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false,
+            });
+            this.add_actor(this._tip);
+
+            this.connect('notify::scale-x', () => {
+                this._tip.set_scale(1 / this.scale_x, 1 / this.scale_x);
+            });
+        } else {
+            this._tip = null;
+        }
+    }
+
+    vfunc_allocate(box) {
+        super.vfunc_allocate(box);
+
+        if (this._tip)
+            this._tip.allocate_preferred_size(0, 0);
+    }
+
+    showTooltip() {
+        if (!this._tip)
+            return;
+        this._tip.text = (this.metaWorkspace.index() + 1).toString();
+        this._tip.show();
+        this.set_child_below_sibling(this._tip, null);
+    }
+
+    hideTooltip() {
+        if (this._tip)
+            this._tip.hide();
+    }
+
+    getWindowWithTooltip(id) {
+        const { layoutManager } = this._container;
+        const slot = layoutManager._windowSlots[id - 1];
+        return slot ? slot[WINDOW_SLOT].metaWindow : null;
+    }
+
+    showWindowsTooltips() {
+        const { layoutManager } = this._container;
+        for (let i = 0; i < layoutManager._windowSlots.length; i++) {
+            if (layoutManager._windowSlots[i])
+                layoutManager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
+        }
+    }
+
+    hideWindowsTooltips() {
+        const { layoutManager } = this._container;
+        for (let i in layoutManager._windowSlots) {
+            if (layoutManager._windowSlots[i])
+                layoutManager._windowSlots[i][WINDOW_SLOT].hideTooltip();
+        }
+    }
+
+    // overriding _addWindowClone to apply the tooltip patch on the cloned
+    // windowPreview
+    _addWindowClone(metaWindow) {
+        const clone = super._addWindowClone(metaWindow);
+
+        // appling the tooltip patch
+        (function patchPreview() {
+            this._text = new St.Label({
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false,
+            });
+
+            this._text.add_constraint(new Clutter.BindConstraint({
+                source: this.windowContainer,
+                coordinate: Clutter.BindCoordinate.POSITION,
+            }));
+            this._text.add_constraint(new Clutter.AlignConstraint({
+                source: this.windowContainer,
+                align_axis: Clutter.AlignAxis.X_AXIS,
+                pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
+                factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
+            }));
+            this._text.add_constraint(new Clutter.AlignConstraint({
+                source: this.windowContainer,
+                align_axis: Clutter.AlignAxis.Y_AXIS,
+                pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
+                factor: 0,
+            }));
+
+            this.add_child(this._text);
+        }).call(clone);
+
+        clone.showTooltip = function (text) {
+            this._text.set({ text });
+            this._text.show();
+        };
+
+        clone.hideTooltip = function () {
+            if (this._text && this._text.visible)
+                this._text.hide();
+        };
+
+        return clone;
+    }
+});
+
+var MyWorkspacesView = GObject.registerClass(
+class MyWorkspacesView extends WorkspacesView.WorkspacesView {
+    _init(...args) {
+        super._init(...args);
+
+        this._pickWorkspace = false;
+        this._pickWindow = false;
+        this._keyPressEventId =
+            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
+        this._keyReleaseEventId =
+            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
+    }
+
+    _onDestroy() {
+        super._onDestroy();
+
+        global.stage.disconnect(this._keyPressEventId);
+        global.stage.disconnect(this._keyReleaseEventId);
+    }
+
+    _hideTooltips() {
+        if (global.stage.get_key_focus() === global.stage)
+            global.stage.set_key_focus(this._prevFocusActor);
+        this._pickWindow = false;
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].hideWindowsTooltips();
+    }
+
+    _hideWorkspacesTooltips() {
+        global.stage.set_key_focus(this._prevFocusActor);
+        this._pickWorkspace = false;
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].hideTooltip();
+    }
+
+    _onKeyRelease(s, o) {
+        if (this._pickWindow &&
+            (o.get_key_symbol() === Clutter.KEY_Alt_L ||
+             o.get_key_symbol() === Clutter.KEY_Alt_R))
+            this._hideTooltips();
+        if (this._pickWorkspace &&
+            (o.get_key_symbol() === Clutter.KEY_Control_L ||
+             o.get_key_symbol() === Clutter.KEY_Control_R))
+            this._hideWorkspacesTooltips();
+    }
+
+    _onKeyPress(s, o) {
+        const { ControlsState } = OverviewControls;
+        if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
+            return false;
+
+        let workspaceManager = global.workspace_manager;
+
+        if ((o.get_key_symbol() === Clutter.KEY_Alt_L ||
+             o.get_key_symbol() === Clutter.KEY_Alt_R) &&
+            !this._pickWorkspace) {
+            this._prevFocusActor = global.stage.get_key_focus();
+            global.stage.set_key_focus(null);
+            this._active = workspaceManager.get_active_workspace_index();
+            this._pickWindow = true;
+            this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
+            return true;
+        }
+        if ((o.get_key_symbol() === Clutter.KEY_Control_L ||
+             o.get_key_symbol() === Clutter.KEY_Control_R) &&
+            !this._pickWindow) {
+            this._prevFocusActor = global.stage.get_key_focus();
+            global.stage.set_key_focus(null);
+            this._pickWorkspace = true;
+            for (let i = 0; i < this._workspaces.length; i++)
+                this._workspaces[i].showTooltip();
+            return true;
+        }
+
+        if (global.stage.get_key_focus() !== global.stage)
+            return false;
+
+        // ignore shift presses, they're required to get numerals in azerty keyboards
+        if ((this._pickWindow || this._pickWorkspace) &&
+            (o.get_key_symbol() === Clutter.KEY_Shift_L ||
+             o.get_key_symbol() === Clutter.KEY_Shift_R))
+            return true;
+
+        if (this._pickWindow) {
+            if (this._active !== workspaceManager.get_active_workspace_index()) {
+                this._hideTooltips();
+                return false;
+            }
+
+            let c = o.get_key_symbol() - Clutter.KEY_KP_0;
+            if (c > 9 || c <= 0) {
+                c = o.get_key_symbol() - Clutter.KEY_0;
+                if (c > 9 || c <= 0) {
+                    this._hideTooltips();
+                    global.log(c);
+                    return false;
+                }
+            }
+
+            let win = this._workspaces[this._active].getWindowWithTooltip(c);
+            this._hideTooltips();
+
+            if (win)
+                Main.activateWindow(win, global.get_current_time());
+
+            return true;
+        }
+        if (this._pickWorkspace) {
+            let c = o.get_key_symbol() - Clutter.KEY_KP_0;
+            if (c > 9 || c <= 0) {
+                c = o.get_key_symbol() - Clutter.KEY_0;
+                if (c > 9 || c <= 0) {
+                    this._hideWorkspacesTooltips();
+                    return false;
+                }
+            }
+
+            let workspace = this._workspaces[c - 1];
+            if (workspace !== undefined)
+                workspace.metaWorkspace.activate(global.get_current_time());
+
+            this._hideWorkspacesTooltips();
+            return true;
+        }
+        return false;
+    }
+});
+
+class Extension {
     constructor() {
-        this._injectionManager = new InjectionManager();
+        this._origWorkspace = Workspace.Workspace;
+        this._origWorkspacesView = WorkspacesView.WorkspacesView;
     }
 
     enable() {
-        const previewProto = WindowPreview.prototype;
+        Workspace.Workspace = MyWorkspace;
-
+        WorkspacesView.WorkspacesView = MyWorkspacesView;
-        this._injectionManager.overrideMethod(previewProto, '_init', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (...args) {
-                originalMethod.call(this, ...args);
-
-                this._text = new St.Label({
-                    style_class: 'extension-windowsNavigator-window-tooltip',
-                    visible: false,
-                });
-
-                this._text.add_constraint(new Clutter.BindConstraint({
-                    source: this.windowContainer,
-                    coordinate: Clutter.BindCoordinate.POSITION,
-                }));
-                this._text.add_constraint(new Clutter.AlignConstraint({
-                    source: this.windowContainer,
-                    align_axis: Clutter.AlignAxis.X_AXIS,
-                    pivot_point: new Graphene.Point({x: 0.5, y: -1}),
-                    factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
-                }));
-                this._text.add_constraint(new Clutter.AlignConstraint({
-                    source: this.windowContainer,
-                    align_axis: Clutter.AlignAxis.Y_AXIS,
-                    pivot_point: new Graphene.Point({x: -1, y: 0.5}),
-                    factor: 0,
-                }));
-
-                this.add_child(this._text);
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(previewProto, 'showTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function (text) {
-                this._text.set({text});
-                this._text.show();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(previewProto, 'hideTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                this._text?.hide();
-            };
-            /* eslint-enable */
-        });
-
-        const workspaceProto = Workspace.prototype;
-        this._injectionManager.overrideMethod(workspaceProto, '_init', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (...args) {
-                originalMethod.call(this, ...args);
-
-                if (this.metaWorkspace && this.metaWorkspace.index() < 9) {
-                    this._tip = new St.Label({
-                        style_class: 'extension-windowsNavigator-window-tooltip',
-                        visible: false,
-                    });
-                    this.add_actor(this._tip);
-
-                    this.connect('notify::scale-x', () => {
-                        this._tip.set_scale(1 / this.scale_x, 1 / this.scale_x);
-                    });
-                } else {
-                    this._tip = null;
-                }
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'vfunc_allocate', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (box) {
-                originalMethod.call(this, box);
-
-                this._tip?.allocate_preferred_size(0, 0);
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'showTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                if (!this._tip)
-                    return;
-                this._tip.text = (this.metaWorkspace.index() + 1).toString();
-                this._tip.show();
-                this.set_child_below_sibling(this._tip, null);
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'hideTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                this._tip?.hide();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'getWindowWithTooltip', () => {
-            /* eslint-disable no-invalid-this */
-            return function (id) {
-                const {layoutManager} = this._container;
-                const slot = layoutManager._windowSlots[id - 1];
-                return slot ? slot[WINDOW_SLOT].metaWindow : null;
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'showWindowsTooltips', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                const {layoutManager} = this._container;
-                for (let i = 0; i < layoutManager._windowSlots.length; i++) {
-                    if (layoutManager._windowSlots[i])
-                        layoutManager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
-                }
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(workspaceProto, 'hideWindowsTooltips', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                const {layoutManager} = this._container;
-                for (let i in layoutManager._windowSlots) {
-                    if (layoutManager._windowSlots[i])
-                        layoutManager._windowSlots[i][WINDOW_SLOT].hideTooltip();
-                }
-            };
-            /* eslint-enable */
-        });
-
-        const viewProto = WorkspacesView.prototype;
-        this._injectionManager.overrideMethod(viewProto, '_init', originalMethod => {
-            /* eslint-disable no-invalid-this */
-            return function (...args) {
-                originalMethod.call(this, ...args);
-
-                this._pickWorkspace = false;
-                this._pickWindow = false;
-                global.stage.connectObject(
-                    'key-press-event', this._onKeyPress.bind(this),
-                    'key-release-event', this._onKeyRelease.bind(this),
-                    this);
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(viewProto, '_hideTooltips', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                if (global.stage.get_key_focus() === global.stage)
-                    global.stage.set_key_focus(this._prevFocusActor);
-                this._pickWindow = false;
-                for (let i = 0; i < this._workspaces.length; i++)
-                    this._workspaces[i].hideWindowsTooltips();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(viewProto, '_hideWorkspacesTooltips', () => {
-            /* eslint-disable no-invalid-this */
-            return function () {
-                global.stage.set_key_focus(this._prevFocusActor);
-                this._pickWorkspace = false;
-                for (let i = 0; i < this._workspaces.length; i++)
-                    this._workspaces[i].hideTooltip();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(viewProto, '_onKeyRelease', () => {
-            /* eslint-disable no-invalid-this */
-            return function (actor, event) {
-                if (this._pickWindow &&
-                    (event.get_key_symbol() === Clutter.KEY_Alt_L ||
-                     event.get_key_symbol() === Clutter.KEY_Alt_R))
-                    this._hideTooltips();
-                if (this._pickWorkspace &&
-                    (event.get_key_symbol() === Clutter.KEY_Control_L ||
-                     event.get_key_symbol() === Clutter.KEY_Control_R))
-                    this._hideWorkspacesTooltips();
-            };
-            /* eslint-enable */
-        });
-        this._injectionManager.overrideMethod(viewProto, '_onKeyPress', () => {
-            /* eslint-disable no-invalid-this */
-            return function (actor, event) {
-                const {ControlsState} = OverviewControls;
-                if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
-                    return false;
-
-                let workspaceManager = global.workspace_manager;
-
-                if ((event.get_key_symbol() === Clutter.KEY_Alt_L ||
-                     event.get_key_symbol() === Clutter.KEY_Alt_R) &&
-                    !this._pickWorkspace) {
-                    this._prevFocusActor = global.stage.get_key_focus();
-                    global.stage.set_key_focus(null);
-                    this._active = workspaceManager.get_active_workspace_index();
-                    this._pickWindow = true;
-                    this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
-                    return true;
-                }
-                if ((event.get_key_symbol() === Clutter.KEY_Control_L ||
-                     event.get_key_symbol() === Clutter.KEY_Control_R) &&
-                    !this._pickWindow) {
-                    this._prevFocusActor = global.stage.get_key_focus();
-                    global.stage.set_key_focus(null);
-                    this._pickWorkspace = true;
-                    for (let i = 0; i < this._workspaces.length; i++)
-                        this._workspaces[i].showTooltip();
-                    return true;
-                }
-
-                if (global.stage.get_key_focus() !== global.stage)
-                    return false;
-
-                // ignore shift presses, they're required to get numerals in azerty keyboards
-                if ((this._pickWindow || this._pickWorkspace) &&
-                    (event.get_key_symbol() === Clutter.KEY_Shift_L ||
-                     event.get_key_symbol() === Clutter.KEY_Shift_R))
-                    return true;
-
-                if (this._pickWindow) {
-                    if (this._active !== workspaceManager.get_active_workspace_index()) {
-                        this._hideTooltips();
-                        return false;
-                    }
-
-                    let c = event.get_key_symbol() - Clutter.KEY_KP_0;
-                    if (c > 9 || c <= 0) {
-                        c = event.get_key_symbol() - Clutter.KEY_0;
-                        if (c > 9 || c <= 0) {
-                            this._hideTooltips();
-                            log(c);
-                            return false;
-                        }
-                    }
-
-                    let win = this._workspaces[this._active].getWindowWithTooltip(c);
-                    this._hideTooltips();
-
-                    if (win)
-                        Main.activateWindow(win, global.get_current_time());
-
-                    return true;
-                }
-                if (this._pickWorkspace) {
-                    let c = event.get_key_symbol() - Clutter.KEY_KP_0;
-                    if (c > 9 || c <= 0) {
-                        c = event.get_key_symbol() - Clutter.KEY_0;
-                        if (c > 9 || c <= 0) {
-                            this._hideWorkspacesTooltips();
-                            return false;
-                        }
-                    }
-
-                    let workspace = this._workspaces[c - 1];
-                    if (workspace !== undefined)
-                        workspace.metaWorkspace.activate(global.get_current_time());
-
-                    this._hideWorkspacesTooltips();
-                    return true;
-                }
-                return false;
-            };
-            /* eslint-enable */
-        });
     }
 
     disable() {
-        this._injectionManager.clear();
+        Workspace.Workspace = this._origWorkspace;
+        WorkspacesView.WorkspacesView = this._origWorkspacesView;
     }
 }
+
+/**
+ * @returns {Extension} - the extension's state object
+ */
+function init() {
+    return new Extension();
+}

extensions/windowsNavigator/meson.build

@@ -1,10 +1,5 @@
-# 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')

extensions/windowsNavigator/stylesheet.css

@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2011 Maxim Ermilov <zaspire@rambler.ru>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
 .extension-windowsNavigator-window-tooltip {
     color: #fefefe;
     background: rgba(0,0,0,0.8);

extensions/workspace-indicator/extension.js

@@ -1,22 +1,15 @@
-// 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
-
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-import Clutter from 'gi://Clutter';
+/* exported init enable disable */
-import Gio from 'gi://Gio';
-import GObject from 'gi://GObject';
-import Meta from 'gi://Meta';
-import St from 'gi://St';
 
-import {Extension, gettext as _} from 'resource:///org/gnome/shell/extensions/extension.js';
+const { Clutter, Gio, GObject, Meta, St } = imports.gi;
 
-import * as DND from 'resource:///org/gnome/shell/ui/dnd.js';
+const DND = imports.ui.dnd;
-import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+const ExtensionUtils = imports.misc.extensionUtils;
-import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
+const Main = imports.ui.main;
-import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const _ = ExtensionUtils.gettext;
 
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
@@ -26,31 +19,32 @@ const TOOLTIP_ANIMATION_TIME = 150;
 
 const MAX_THUMBNAILS = 6;
 
+let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
-    static {
+    _init(window) {
-        GObject.registerClass(this);
+        super._init({
-    }
-
-    constructor(window) {
-        super({
             style_class: 'workspace-indicator-window-preview',
         });
 
         this._delegate = this;
-        DND.makeDraggable(this, {restoreOnSuccess: true});
+        DND.makeDraggable(this, { restoreOnSuccess: true });
 
         this._window = window;
 
-        this._window.connectObject(
+        this.connect('destroy', this._onDestroy.bind(this));
-            'size-changed', () => this._checkRelayout(),
-            'position-changed', () => this._checkRelayout(),
-            'notify::minimized', this._updateVisible.bind(this),
-            'notify::window-type', this._updateVisible.bind(this),
-            this);
-        this._updateVisible();
 
-        global.display.connectObject('notify::focus-window',
+        this._sizeChangedId = this._window.connect('size-changed',
-            this._onFocusChanged.bind(this), this);
+            () => this.queue_relayout());
+        this._positionChangedId = this._window.connect('position-changed',
+            () => {
+                this._updateVisible();
+                this.queue_relayout();
+            });
+        this._minimizedChangedId = this._window.connect('notify::minimized',
+            this._updateVisible.bind(this));
+
+        this._focusChangedId = global.display.connect('notify::focus-window',
+            this._onFocusChanged.bind(this));
         this._onFocusChanged();
     }
 
@@ -59,6 +53,13 @@ class WindowPreview extends St.Button {
         return this._window;
     }
 
+    _onDestroy() {
+        this._window.disconnect(this._sizeChangedId);
+        this._window.disconnect(this._positionChangedId);
+        this._window.disconnect(this._minimizedChangedId);
+        global.display.disconnect(this._focusChangedId);
+    }
+
     _onFocusChanged() {
         if (global.display.focus_window === this._window)
             this.add_style_class_name('active');
@@ -66,24 +67,17 @@ class WindowPreview extends St.Button {
             this.remove_style_class_name('active');
     }
 
-    _checkRelayout() {
+    _updateVisible() {
         const monitor = Main.layoutManager.findIndexForActor(this);
         const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        if (this._window.get_frame_rect().overlap(workArea))
+        this.visible = this._window.get_frame_rect().overlap(workArea) &&
-            this.queue_relayout();
+            this._window.window_type !== Meta.WindowType.DESKTOP &&
-    }
-
-    _updateVisible() {
-        this.visible = this._window.window_type !== Meta.WindowType.DESKTOP &&
             this._window.showing_on_its_workspace();
     }
-}
+});
 
+let WorkspaceLayout = GObject.registerClass(
 class WorkspaceLayout extends Clutter.LayoutManager {
-    static {
-        GObject.registerClass(this);
-    }
-
     vfunc_get_preferred_width() {
         return [0, 0];
     }
@@ -110,15 +104,12 @@ class WorkspaceLayout extends Clutter.LayoutManager {
             child.allocate(childBox);
         }
     }
-}
+});
 
+let WorkspaceThumbnail = GObject.registerClass(
 class WorkspaceThumbnail extends St.Button {
-    static {
+    _init(index) {
-        GObject.registerClass(this);
+        super._init({
-    }
-
-    constructor(index) {
-        super({
             style_class: 'workspace',
             child: new Clutter.Actor({
                 layout_manager: new WorkspaceLayout(),
@@ -143,13 +134,16 @@ class WorkspaceThumbnail extends St.Button {
         let workspaceManager = global.workspace_manager;
         this._workspace = workspaceManager.get_workspace_by_index(index);
 
-        this._workspace.connectObject(
+        this._windowAddedId = this._workspace.connect('window-added',
-            'window-added', (ws, window) => this._addWindow(window),
+            (ws, window) => {
-            'window-removed', (ws, window) => this._removeWindow(window),
+                this._addWindow(window);
-            this);
+            });
-
+        this._windowRemovedId = this._workspace.connect('window-removed',
-        global.display.connectObject('restacked',
+            (ws, window) => {
-            this._onRestacked.bind(this), this);
+                this._removeWindow(window);
+            });
+        this._restackedId = global.display.connect('restacked',
+            this._onRestacked.bind(this));
 
         this._workspace.list_windows().forEach(w => this._addWindow(w));
         this._onRestacked();
@@ -247,16 +241,17 @@ class WorkspaceThumbnail extends St.Button {
 
     _onDestroy() {
         this._tooltip.destroy();
-    }
-}
 
+        this._workspace.disconnect(this._windowAddedId);
+        this._workspace.disconnect(this._windowRemovedId);
+        global.display.disconnect(this._restackedId);
+    }
+});
+
+let WorkspaceIndicator = GObject.registerClass(
 class WorkspaceIndicator extends PanelMenu.Button {
-    static {
+    _init() {
-        GObject.registerClass(this);
+        super._init(0.0, _('Workspace Indicator'));
-    }
-
-    constructor() {
-        super(0.5, _('Workspace Indicator'));
 
         let container = new St.Widget({
             layout_manager: new Clutter.BinLayout(),
@@ -288,11 +283,14 @@ class WorkspaceIndicator extends PanelMenu.Button {
         this._workspaceSection = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(this._workspaceSection);
 
-        workspaceManager.connectObject(
+        this._workspaceManagerSignals = [
-            'notify::n-workspaces', this._nWorkspacesChanged.bind(this), GObject.ConnectFlags.AFTER,
+            workspaceManager.connect_after('notify::n-workspaces',
-            'workspace-switched', this._onWorkspaceSwitched.bind(this), GObject.ConnectFlags.AFTER,
+                this._nWorkspacesChanged.bind(this)),
-            'notify::layout-rows', this._updateThumbnailVisibility.bind(this),
+            workspaceManager.connect_after('workspace-switched',
-            this);
+                this._onWorkspaceSwitched.bind(this)),
+            workspaceManager.connect('notify::layout-rows',
+                this._updateThumbnailVisibility.bind(this)),
+        ];
 
         this.connect('scroll-event', this._onScrollEvent.bind(this));
         this._thumbnailsBox.connect('scroll-event', this._onScrollEvent.bind(this));
@@ -300,19 +298,28 @@ class WorkspaceIndicator extends PanelMenu.Button {
         this._updateThumbnails();
         this._updateThumbnailVisibility();
 
-        this._settings = new Gio.Settings({schema_id: WORKSPACE_SCHEMA});
+        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        this._settings.connectObject(`changed::${WORKSPACE_KEY}`,
+        this._settingsChangedId = this._settings.connect(
-            this._updateMenuLabels.bind(this), this);
+            `changed::${WORKSPACE_KEY}`,
+            this._updateMenuLabels.bind(this));
     }
 
     _onDestroy() {
+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
+            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+
+        if (this._settingsChangedId) {
+            this._settings.disconnect(this._settingsChangedId);
+            this._settingsChangedId = 0;
+        }
+
         Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         super._onDestroy();
     }
 
     _updateThumbnailVisibility() {
-        const {workspaceManager} = global;
+        const { workspaceManager } = global;
         const vertical = workspaceManager.layout_rows === -1;
         const useMenu =
             vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
@@ -433,16 +440,22 @@ class WorkspaceIndicator extends PanelMenu.Button {
         let newIndex = global.workspace_manager.get_active_workspace_index() + diff;
         this._activate(newIndex);
     }
+});
+
+/** */
+function init() {
+    ExtensionUtils.initTranslations();
 }
 
-export default class WorkspaceIndicatorExtension extends Extension {
+let _indicator;
-    enable() {
-        this._indicator = new WorkspaceIndicator();
-        Main.panel.addToStatusArea('workspace-indicator', this._indicator);
-    }
 
-    disable() {
+/** */
-        this._indicator.destroy();
+function enable() {
-        delete this._indicator;
+    _indicator = new WorkspaceIndicator();
-    }
+    Main.panel.addToStatusArea('workspace-indicator', _indicator);
+}
+
+/** */
+function disable() {
+    _indicator.destroy();
 }

extensions/workspace-indicator/meson.build

@@ -1,12 +1,7 @@
-# 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_sources += files('prefs.js')

extensions/workspace-indicator/prefs.js

@@ -1,170 +1,131 @@
-// 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
-
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-import Adw from 'gi://Adw';
+/* exported init buildPrefsWidget */
-import Gio from 'gi://Gio';
-import GLib from 'gi://GLib';
-import GObject from 'gi://GObject';
-import Gtk from 'gi://Gtk';
-import Pango from 'gi://Pango';
 
-import {ExtensionPreferences, gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+const { Gio, GLib, GObject, Gtk, Pango } = imports.gi;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+
+const _ = ExtensionUtils.gettext;
 const N_ = e => e;
 
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
-class NewItem extends GObject.Object {}
+const WorkspaceSettingsWidget = GObject.registerClass(
-GObject.registerClass(NewItem);
+class WorkspaceSettingsWidget extends Gtk.ScrolledWindow {
-
+    _init() {
-class NewItemModel extends GObject.Object {
+        super._init({
-    static [GObject.interfaces] = [Gio.ListModel];
+            hscrollbar_policy: Gtk.PolicyType.NEVER,
-    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 box = new Gtk.Box({
+            orientation: Gtk.Orientation.VERTICAL,
+            halign: Gtk.Align.CENTER,
+            spacing: 12,
+            margin_top: 36,
+            margin_bottom: 36,
+            margin_start: 36,
+            margin_end: 36,
+        });
+        this.set_child(box);
 
-        const store = new Gio.ListStore({item_type: Gio.ListModel});
+        box.append(new Gtk.Label({
-        const listModel = new Gtk.FlattenListModel({model: store});
+            label: '<b>%s</b>'.format(_('Workspace Names')),
-        store.append(this._workspaces);
+            use_markup: true,
-        store.append(new NewItemModel());
+            halign: Gtk.Align.START,
+        }));
 
         this._list = new Gtk.ListBox({
             selection_mode: Gtk.SelectionMode.NONE,
-            css_classes: ['boxed-list'],
+            valign: Gtk.Align.START,
+            show_separators: true,
         });
         this._list.connect('row-activated', (l, row) => row.edit());
-        this.add(this._list);
+        box.append(this._list);
 
-        this._list.bind_model(listModel, item => {
+        const context = this._list.get_style_context();
-            return item instanceof NewItem
+        const cssProvider = new Gtk.CssProvider();
-                ? new NewWorkspaceRow()
+        cssProvider.load_from_data(
-                : new WorkspaceRow(item.string);
+            'list { min-width: 25em; }');
+
+        context.add_provider(cssProvider,
+            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        context.add_class('frame');
+
+        this._list.append(new NewWorkspaceRow());
+
+        this._actionGroup = new Gio.SimpleActionGroup();
+        this._list.insert_action_group('workspaces', this._actionGroup);
+
+        let action;
+        action = new Gio.SimpleAction({ name: 'add' });
+        action.connect('activate', () => {
+            const names = this._settings.get_strv(WORKSPACE_KEY);
+            this._settings.set_strv(WORKSPACE_KEY, [
+                ...names,
+                _('Workspace %d').format(names.length + 1),
+            ]);
+        });
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({
+            name: 'remove',
+            parameter_type: new GLib.VariantType('s'),
+        });
+        action.connect('activate', (a, param) => {
+            const removed = param.deepUnpack();
+            this._settings.set_strv(WORKSPACE_KEY,
+                this._settings.get_strv(WORKSPACE_KEY)
+                    .filter(name => name !== removed));
+        });
+        this._actionGroup.add_action(action);
+
+        action = new Gio.SimpleAction({ name: 'update' });
+        action.connect('activate', () => {
+            const names = this._getWorkspaceRows().map(row => row.name);
+            this._settings.set_strv(WORKSPACE_KEY, names);
+        });
+        this._actionGroup.add_action(action);
+
+        this._settings = new Gio.Settings({
+            schema_id: WORKSPACE_SCHEMA,
+        });
+        this._settings.connect(`changed::${WORKSPACE_KEY}`,
+            this._sync.bind(this));
+        this._sync();
+    }
+
+    _getWorkspaceRows() {
+        return [...this._list].filter(row => row.name);
+    }
+
+    _sync() {
+        const rows = this._getWorkspaceRows();
+
+        const oldNames = rows.map(row => row.name);
+        const newNames = this._settings.get_strv(WORKSPACE_KEY);
+
+        const removed = oldNames.filter(n => !newNames.includes(n));
+        const added = newNames.filter(n => !oldNames.includes(n));
+
+        removed.forEach(n => this._list.remove(rows.find(r => r.name === n)));
+        added.forEach(n => {
+            this._list.insert(new WorkspaceRow(n), newNames.indexOf(n));
         });
     }
-}
+});
 
-class WorkspaceRow extends Adw.PreferencesRow {
+const WorkspaceRow = GObject.registerClass(
-    static {
+class WorkspaceRow extends Gtk.ListBoxRow {
-        GObject.registerClass(this);
+    _init(name) {
-    }
+        super._init({ name });
 
-    constructor(name) {
+        const controller = new Gtk.ShortcutController();
-        super({name});
+        controller.add_shortcut(new Gtk.Shortcut({
+            trigger: Gtk.ShortcutTrigger.parse_string('Escape'),
+            action: Gtk.CallbackAction.new(this._stopEdit.bind(this)),
+        }));
+        this.add_controller(controller);
 
         const box = new Gtk.Box({
             spacing: 12,
@@ -186,39 +147,21 @@ class WorkspaceRow extends Adw.PreferencesRow {
 
         const button = new Gtk.Button({
             action_name: 'workspaces.remove',
+            action_target: new GLib.Variant('s', name),
             icon_name: 'edit-delete-symbolic',
-            has_frame: false,
         });
         box.append(button);
 
-        this.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();
         });
@@ -227,6 +170,11 @@ class WorkspaceRow extends Adw.PreferencesRow {
                 return;
             this._stopEdit();
         });
+
+        this.connect('notify::name', () => {
+            button.action_target = new GLib.Variant('s', this.name);
+            this.activate_action('workspaces.update', null);
+        });
     }
 
     edit() {
@@ -239,15 +187,12 @@ class WorkspaceRow extends Adw.PreferencesRow {
         this.grab_focus();
         this._stack.visible_child_name = 'display';
     }
-}
+});
 
-class NewWorkspaceRow extends Adw.PreferencesRow {
+const NewWorkspaceRow = GObject.registerClass(
-    static {
+class NewWorkspaceRow extends Gtk.ListBoxRow {
-        GObject.registerClass(this);
+    _init() {
-    }
+        super._init({
-
-    constructor() {
-        super({
             action_name: 'workspaces.add',
             child: new Gtk.Image({
                 icon_name: 'list-add-symbolic',
@@ -261,10 +206,16 @@ class NewWorkspaceRow extends Adw.PreferencesRow {
         this.update_property(
             [Gtk.AccessibleProperty.LABEL], [_('Add Workspace')]);
     }
+});
+
+/** */
+function init() {
+    ExtensionUtils.initTranslations();
 }
 
-export default class WorkspaceIndicatorPrefs extends ExtensionPreferences {
+/**
-    getPreferencesWidget() {
+ * @returns {Gtk.Widget} - the prefs widget
-        return new WorkspaceSettingsWidget();
+ */
-    }
+function buildPrefsWidget() {
+    return new WorkspaceSettingsWidget();
 }

extensions/workspace-indicator/stylesheet.css

@@ -1,10 +1,3 @@
-/*
- * 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;
 }

gnome-shell-extensions.doap

@@ -1,8 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-
-SPDX-License-Identifier: CC0-1.0
--->
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
          xmlns:foaf="http://xmlns.com/foaf/0.1/"
@@ -18,13 +13,20 @@ 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" />
-  <support-forum rdf:resource="https://discourse.gnome.org/tag/shell" />
+  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
-  <download-page rdf:resource="https://download.gnome.org/sources/gnome-shell-extensions/" />
+  <download-page rdf:resource="http://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" />
   <programming-language>JavaScript</programming-language>
 
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Giovanni Campagna</foaf:name>
+      <foaf:mbox rdf:resource="mailto:gcampagna@src.gnome.org" />
+      <gnome:userid>gcampagna</gnome:userid>
+    </foaf:Person>
+  </maintainer>
   <maintainer>
     <foaf:Person>
       <foaf:name>Florian Müllner</foaf:name>

lint/eslintrc-gjs.yml

@@ -2,7 +2,8 @@
 # SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
 # SPDX-FileCopyrightText: 2018 Claudio André <claudioandre.br@gmail.com>
 env:
-  es2021: true
+  es6: true
+  es2020: true
 extends: 'eslint:recommended'
 plugins:
   - jsdoc
@@ -68,10 +69,7 @@ rules:
   jsdoc/check-tag-names: error
   jsdoc/check-types: error
   jsdoc/implements-on-classes: error
-  jsdoc/tag-lines:
+  jsdoc/newline-after-description: error
-    - error
-    - any
-    - startLines: 1
   jsdoc/require-jsdoc: error
   jsdoc/require-param: error
   jsdoc/require-param-description: error
@@ -88,10 +86,7 @@ rules:
   linebreak-style:
     - error
     - unix
-  lines-between-class-members:
+  lines-between-class-members: error
-    - error
-    - always
-    - exceptAfterSingleLine: true
   max-nested-callbacks: error
   max-statements-per-line: error
   new-parens: error
@@ -264,10 +259,5 @@ globals:
   window: readonly
   TextEncoder: readonly
   TextDecoder: readonly
-  console: readonly
-  setTimeout: readonly
-  setInterval: readonly
-  clearTimeout: readonly
-  clearInterval: readonly
 parserOptions:
-  ecmaVersion: 2022
+  ecmaVersion: 2020

lint/eslintrc-shell.yml

@@ -1,24 +1,11 @@
-# SPDX-FileCopyrightText: 2019 Florian Müllner <fmuellner@gnome.org>
-#
-# SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
-
 rules:
   camelcase:
     - error
     - properties: never
       allow: [^vfunc_, ^on_]
-  consistent-return: error
+  object-curly-spacing:
-  eqeqeq:
     - error
-    - smart
+    - always
   prefer-arrow-callback: error
-  jsdoc/require-param-description: off
-  jsdoc/require-jsdoc:
-    - error
-    - exemptEmptyFunctions: true
-      publicOnly:
-        esm: true
 globals:
   global: readonly
-parserOptions:
-  sourceType: module

meson.build

@@ -1,10 +1,6 @@
-# SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 project('gnome-shell-extensions',
-  version: '45.2',
+  version: '41.2',
-  meson_version: '>= 0.58.0',
+  meson_version: '>= 0.53.0',
   license: 'GPL2+'
 )
 
@@ -19,11 +15,11 @@ datadir = get_option('datadir')
 shelldir = join_paths(datadir, 'gnome-shell')
 extensiondir = join_paths(shelldir, 'extensions')
 modedir = join_paths(shelldir, 'modes')
+themedir = join_paths(shelldir, 'theme')
 
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
 xsessiondir = join_paths(datadir, 'xsessions')
-wlsessiondir = join_paths(datadir, 'wayland-sessions')
 
 ver_arr = meson.project_version().split('.')
 shell_version = ver_arr[0]
@@ -40,7 +36,6 @@ classic_extensions = [
 default_extensions = classic_extensions
 default_extensions += [
   'drive-menu',
-  'light-style',
   'screenshot-window-sizer',
   'windowsNavigator',
   'workspace-indicator'
@@ -88,32 +83,12 @@ endforeach
 
 if classic_mode_enabled
   subdir('data')
-  meson.add_install_script(
-    'meson/session-post-install.py',
-    join_paths(get_option('prefix'), datadir)
-  )
 endif
 
 subdir('extensions')
 subdir('po')
 
-gnome.post_install(
+meson.add_dist_script('meson/generate-stylesheets.py')
-  glib_compile_schemas: true,
-)
-
 meson.add_dist_script('meson/check-version.py',
   meson.project_version(),
   'NEWS')
-
-summary_options = {
- 'extensions': enabled_extensions,
- 'classic_mode': get_option('classic_mode'),
-}
-
-summary_dirs = {
-  'prefix': get_option('prefix'),
-  'datadir': get_option('datadir'),
-}
-
-summary(summary_dirs, section: 'Directories')
-summary(summary_options, section: 'Build Options')

meson/check-version.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python3
 
-# SPDX-FileCopyrightText: 2021 Florian Müllner <fmuellner@gnome.org>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 import os, sys
 from pathlib import Path
 import argparse, subprocess

meson/generate-stylesheets.py

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

meson/session-post-install.py

@@ -1,24 +0,0 @@
-#!/usr/bin/env python3
-
-# SPDX-FileCopyrightText: 2021 Neal Gompa <ngompa@fedoraproject.org>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-import os
-import shutil
-import sys
-
-if os.environ.get('DESTDIR'):
-  install_root = os.environ.get('DESTDIR') + os.path.abspath(sys.argv[1])
-else:
-  install_root = sys.argv[1]
-
-# FIXME: Meson is unable to copy a generated target file:
-#        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
-dst_dir = os.path.join(install_root, 'wayland-sessions')
-if not os.path.exists(dst_dir):
-  os.makedirs(dst_dir)
-
-src = os.path.join(install_root, 'xsessions', 'gnome-classic.desktop')
-dst = os.path.join(dst_dir, 'gnome-classic.desktop')
-shutil.copyfile(src, dst)

meson_options.txt

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2017 Florian Müllner <fmuellner@gnome.org>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 option('extension_set',
   type: 'combo',
   choices: ['classic', 'default', 'all'],

po/LINGUAS

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

po/POTFILES.in

@@ -1,6 +1,4 @@
 data/gnome-classic.desktop.in
-data/gnome-classic-wayland.desktop.in
-data/gnome-classic-xorg.desktop.in
 extensions/apps-menu/extension.js
 extensions/auto-move-windows/extension.js
 extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml

po/ab.po

@@ -1,268 +0,0 @@
-# Abkhazian translation for gnome-shell-extensions.
-# Copyright (C) 2022 gnome-shell-extensions's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Нанба Наала <naala-nanba@rambler.ru>, 2022.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions main\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues\n"
-"POT-Creation-Date: 2022-07-10 12:54+0000\n"
-"PO-Revision-Date: 2022-02-12 02:08+0000\n"
-"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>, 2022\n"
-"Language-Team: Abkhazian <ab@li.org>\n"
-"Language: ab\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: data/gnome-classic.desktop.in:3
-msgid "GNOME Classic"
-msgstr "Аклассикатә GNOME"
-
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
-msgid "This session logs you into GNOME Classic"
-msgstr "Ари асеанс аклассикатә усуратә еишәа GNOME хархәагас иамоуп "
-
-#: data/gnome-classic-wayland.desktop.in:3
-msgid "GNOME Classic on Wayland"
-msgstr "Аклассикатә GNOME Wayland аҟны"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "Аклассикатә GNOME Xorg аҟны"
-
-#: extensions/apps-menu/extension.js:118
-msgid "Favorites"
-msgstr "Иалкаау"
-
-#: extensions/apps-menu/extension.js:379
-msgid "Applications"
-msgstr "Аԥшьқәа"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
-msgid "Application and workspace list"
-msgstr "Аԥшьи аусуратә ҵакырақәа рыхьӡынҵеи"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Ацәаҳәақәа рыхьӡынҵа аиԥшрагәаҭага аԥшьы (desktop-фаил ахьӡ )змоу, зашьҭахь "
-"ҩ-кәаԥки аусуратә ҭыԥ аномери гылоу "
-
-#: extensions/auto-move-windows/prefs.js:152
-msgid "Workspace Rules"
-msgstr "Аусуратә ҵакыра аԥҟаррақәа"
-
-#: extensions/auto-move-windows/prefs.js:306
-msgid "Add Rule"
-msgstr "Аԥҟара ацҵара"
-
-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:126
-#: extensions/places-menu/placeDisplay.js:210
-#, javascript-format
-msgid "Ejecting drive “%s” failed:"
-msgstr "Адиск «%s» аҭыгара залымшахеит:"
-
-#: extensions/drive-menu/extension.js:145
-msgid "Removable devices"
-msgstr "Иаҿыҵуа аиҿартәырақәа"
-
-#: extensions/drive-menu/extension.js:167
-msgid "Open Files"
-msgstr "Афаил аартра"
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-msgid "Use more screen for windows"
-msgstr "Изыцҵоу аекран аҵакыра аԥенџьырқәа рзы ахархәара"
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"Шәхы иашәырхәа изыцҵоу аекран аҵакыра аминиатиура атыԥаркразыаекран аганқәа "
-"реизышәара ԥсахуа аҭыԥыркра шәыржәпала, анаҩс адаԥа ҳәаақәызҵо ашәагаа "
-"архәыҷразыари ахышәара ахархәара аиуоит аминиатиура «natural» аҭыԥыркра "
-"алгоритм  ахархәараан"
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
-msgid "Place window captions on top"
-msgstr " Аԥенџьырқәа рыхқәа хыхь рҭыԥыркра"
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"Иалхзар, ахқәа аминиатиура хыхьтәи ахәҭаҟны аҭыԥ ааныркылалоит(ишыҟоу еиԥш "
-"ахқәа ҵаҟатәи аҭыԥ ааныркылоит).Ари ахышәара аԥсахраан,уи аус аура "
-"иалагарцазы, иаҭахуп Shell аиҭарура."
-
-#: extensions/places-menu/extension.js:94
-#: extensions/places-menu/extension.js:97
-msgid "Places"
-msgstr "Аҭыԥқәа"
-
-#: extensions/places-menu/placeDisplay.js:49
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr " «%s» аус арура залшом"
-
-#: extensions/places-menu/placeDisplay.js:64
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Иамоуӡит атом аибыҭара «%s» азы"
-
-#: extensions/places-menu/placeDisplay.js:125
-#: extensions/places-menu/placeDisplay.js:148
-msgid "Computer"
-msgstr "Акомпиутер"
-
-#: extensions/places-menu/placeDisplay.js:336
-msgid "Home"
-msgstr "Аҩнытәи аҭаӡ"
-
-#: extensions/places-menu/placeDisplay.js:381
-msgid "Browse Network"
-msgstr "Аҳа алаԥшхагара"
-
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
-msgid "Cycle Screenshot Sizes"
-msgstr "Аекран аҭыхымҭа ашәагаақәа рыԥсахра"
-
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Аекран аҭыхымҭа ашәагаақәа  шьҭахьҟатәи ахырхарҭала рыԥсахра"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
-msgid "Theme name"
-msgstr "Атема ахьӡ"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "~/.themes/name/gnome-shell аҟынтә иҭагалоу атема ахьӡ "
-
-#: extensions/window-list/extension.js:72
-msgid "Close"
-msgstr "Аркра"
-
-#: extensions/window-list/extension.js:92
-msgid "Unminimize"
-msgstr "Архынҳәра"
-
-#: extensions/window-list/extension.js:92
-msgid "Minimize"
-msgstr "Аиҟәырҳәра"
-
-#: extensions/window-list/extension.js:99
-msgid "Unmaximize"
-msgstr "Аиҭашьақәыргылара"
-
-#: extensions/window-list/extension.js:99
-msgid "Maximize"
-msgstr "Аиҵыхра"
-
-#: extensions/window-list/extension.js:483
-msgid "Minimize all"
-msgstr "Зегьы реиҟәырҳәра"
-
-#: extensions/window-list/extension.js:489
-msgid "Unminimize all"
-msgstr "Зегьы рырхынҳәра"
-
-#: extensions/window-list/extension.js:495
-msgid "Maximize all"
-msgstr "Зегьы реиҵыхра"
-
-#: extensions/window-list/extension.js:503
-msgid "Unmaximize all"
-msgstr "Зегьы реиҭашьақәыргылара"
-
-#: extensions/window-list/extension.js:511
-msgid "Close all"
-msgstr "Зегьы рыркра"
-
-#: extensions/window-list/extension.js:795
-msgid "Window List"
-msgstr "Аԥенџьырқәа рыхьӡынҵа"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
-msgid "When to group windows"
-msgstr "Аԥенџьырқәа аидыргәыԥлара анаҭаху"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
-msgstr ""
-"Иҳәаақәнаҵоит, ианаҭаху  ԥшьык иаҵанакуа аԥенџьырқәа реидыргәыԥлара, "
-"аԥенџьырқәа рыхьӡынҵаҟны Иҟалар зылшо аҵакқәа : «never» — ахаан; «auto» — "
-"автоматла; «always» — есқьынгьы"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:79
-msgid "Show windows from all workspaces"
-msgstr "Аҵакырақәа зегьы рҟынтә аԥенџьырқәа раарԥшра"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr ""
-"Аԥенџьырқәа рыхьӡынҵа аусуратә ҵакырақәа зегь рҟынтә акәу,мамзар уажәтәи "
-"аҟынтә акәу ишаарԥшлатәу"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
-msgid "Show the window list on all monitors"
-msgstr "Аԥенџьырқәа рыхьӡынҵа амониторқәа зегьы рҟны рырбара"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Аԥенџьырқәа рыхьӡынҵа иаҿаку амониторқәа зегьы рыҟноума иахьаарԥшлатәу , "
-"мамзар ихадоу аҟны акәу."
-
-#: extensions/window-list/prefs.js:35
-msgid "Window Grouping"
-msgstr "Аԥенџьырқәа  реидыргәыԥлара"
-
-#: extensions/window-list/prefs.js:40
-msgid "Never group windows"
-msgstr "Ахаангьы аԥенџьырқәа реидмыргәыԥлара"
-
-#: extensions/window-list/prefs.js:41
-msgid "Group windows when space is limited"
-msgstr "Аҭыԥ маҷхазар, аԥенџьырқәа еидшәыргәыԥла"
-
-#: extensions/window-list/prefs.js:42
-msgid "Always group windows"
-msgstr "Еснагь аԥенџьырқәа реидыргәыԥлара"
-
-#: extensions/window-list/prefs.js:66
-msgid "Show on all monitors"
-msgstr "Амониторқәа зегьы рҟны рырбара"
-
-#: extensions/window-list/workspaceIndicator.js:261
-#: extensions/workspace-indicator/extension.js:266
-msgid "Workspace Indicator"
-msgstr "Аусуратә ҵакыра аиндикатор"
-
-#: extensions/workspace-indicator/prefs.js:62
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Аусуратә ҵакыра %d"
-
-#: extensions/workspace-indicator/prefs.js:129
-msgid "Workspace Names"
-msgstr "Аусуратә ҵакырақәа рыхьӡқәа"
-
-#: extensions/workspace-indicator/prefs.js:255
-msgid "Add Workspace"
-msgstr "Аусуратә ҵакыра ацҵара"

po/be.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2022-07-10 12:54+0000\n"
+"POT-Creation-Date: 2021-01-20 23:03+0000\n"
-"PO-Revision-Date: 2022-10-19 15:20+0300\n"
+"PO-Revision-Date: 2021-01-24 15:33+0300\n"
 "Last-Translator: Launchpad translators\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
@@ -18,30 +18,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: data/gnome-classic.desktop.in:3
 msgid "GNOME Classic"
 msgstr "Класічны GNOME"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Гэты сеанс выкарыстоўвае класічны GNOME"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-msgid "GNOME Classic on Wayland"
-msgstr "Класічны GNOME на Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "Класічны GNOME на Xorg"
-
-#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Абраныя"
 
-#: extensions/apps-menu/extension.js:379
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Праграмы"
 
@@ -57,41 +48,43 @@ msgstr ""
 "Спіс радкоў, кожны з якіх змяшчае ідэнтыфікатар праграмы (імя файла *."
 "desktop), затым двукроп'е і нумар працоўнай прасторы"
 
-#: extensions/auto-move-windows/prefs.js:152
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "Правілы для працоўнай прасторы"
 
-#: extensions/auto-move-windows/prefs.js:306
+#: extensions/auto-move-windows/prefs.js:237
 msgid "Add Rule"
 msgstr "Дадаць правіла"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:126
+#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:210
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Не ўдалося выняць дыск «%s»:"
 
-#: extensions/drive-menu/extension.js:145
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Здымныя прылады"
 
-#: extensions/drive-menu/extension.js:167
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Адкрыць файлы"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#, fuzzy
 msgid "Use more screen for windows"
 msgstr "Выкарыстоўваць большую плошчу экрана для вокнаў"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#, fuzzy
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
 "Спрабаваць выкарыстаць большую плошчу экрана для размяшчэння мініяцюр праз "
-"змяненне суадносін бакоў экрана, ўшчыльняючы іх, каб зменшыць памеры "
+"змяненне суадносінаў бакоў экрана, ўшчыльняючы іх, каб зменшыць памеры "
 "абмежавальнай рамкі. Гэты параметр ужываецца толькі з натуральным "
 "размяшчэннем мініяцюр."
 
@@ -109,31 +102,31 @@ msgstr ""
 "перадвызначана). Каб змена налады ўступіла ў сілу, трэба перазапусціць "
 "абалонку."
 
-#: extensions/places-menu/extension.js:94
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:97
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Месцы"
 
-#: extensions/places-menu/placeDisplay.js:49
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Не ўдалося запусціць «%s»"
 
-#: extensions/places-menu/placeDisplay.js:64
+#: extensions/places-menu/placeDisplay.js:61
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Не ўдалося прымацаваць том для «%s»."
 
-#: extensions/places-menu/placeDisplay.js:125
 #: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Камп'ютар"
 
-#: extensions/places-menu/placeDisplay.js:336
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "Хатняя папка"
 
-#: extensions/places-menu/placeDisplay.js:381
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Агляд сеткі"
 
@@ -153,47 +146,47 @@ msgstr "Назва тэмы"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Назва тэмы, што загрузіцца з ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Закрыць"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Скасаваць згортванне"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Згарнуць"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Скасаваць разгортванне"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Разгарнуць"
 
-#: extensions/window-list/extension.js:483
+#: extensions/window-list/extension.js:432
 msgid "Minimize all"
 msgstr "Згарнуць усе"
 
-#: extensions/window-list/extension.js:489
+#: extensions/window-list/extension.js:438
 msgid "Unminimize all"
 msgstr "Скасаваць згортванне для ўсіх"
 
-#: extensions/window-list/extension.js:495
+#: extensions/window-list/extension.js:444
 msgid "Maximize all"
 msgstr "Разгарнуць усе"
 
-#: extensions/window-list/extension.js:503
+#: extensions/window-list/extension.js:452
 msgid "Unmaximize all"
 msgstr "Скасаваць разгортванне для ўсіх"
 
-#: extensions/window-list/extension.js:511
+#: extensions/window-list/extension.js:460
 msgid "Close all"
 msgstr "Закрыць усе"
 
-#: extensions/window-list/extension.js:795
+#: extensions/window-list/extension.js:737
 msgid "Window List"
 msgstr "Спіс вокнаў"
 
@@ -210,7 +203,7 @@ msgstr ""
 "значэнні: «never» (ніколі), «auto» (аўтаматычна), «always» (заўсёды)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:79
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Паказваць вокны з усіх працоўных прастор"
 
@@ -229,41 +222,41 @@ msgid ""
 msgstr ""
 "Паказваць спіс вокнаў на ўсіх падлучаных маніторах ці толькі на асноўным."
 
-#: extensions/window-list/prefs.js:35
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Групаванне вокнаў"
 
-#: extensions/window-list/prefs.js:40
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Ніколі не групаваць вокны"
 
-#: extensions/window-list/prefs.js:41
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Групаваць вокны калі не хапае месца"
 
-#: extensions/window-list/prefs.js:42
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Заўсёды групаваць вокны"
 
-#: extensions/window-list/prefs.js:66
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Паказваць на ўсіх маніторах"
 
-#: extensions/window-list/workspaceIndicator.js:261
+#: extensions/window-list/workspaceIndicator.js:247
-#: extensions/workspace-indicator/extension.js:266
+#: extensions/workspace-indicator/extension.js:253
 msgid "Workspace Indicator"
 msgstr "Індыкатар працоўнай прасторы"
 
-#: extensions/workspace-indicator/prefs.js:62
+#: extensions/workspace-indicator/prefs.js:34
+msgid "Workspace Names"
+msgstr "Назвы працоўных прастор"
+
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Працоўная прастора %d"
 
-#: extensions/workspace-indicator/prefs.js:129
+#: extensions/workspace-indicator/prefs.js:208
-msgid "Workspace Names"
-msgstr "Назвы працоўных прастор"
-
-#: extensions/workspace-indicator/prefs.js:255
 msgid "Add Workspace"
 msgstr "Дадаць працоўную прастору"
 

po/bg.po

@@ -1,17 +1,17 @@
 # Bulgarian translation for gnome-shell-extensions po-file.
 # Copyright (C) 2014, 2015, 2017 Free Software Foundation, Inc.
-# Copyright (C) 2021, 2022 Alexander Shopov <ash@kambanaria.org>.
+# Copyright (C) 2021 Alexander Shopov <ash@kambanaria.org>.
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Ivaylo Valkov <ivaylo@e-valkov.org>, 2014.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2021, 2022.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2021.
 # Lyubomir Vasilev <lyubomirv@abv.bg>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2022-02-12 20:25+0000\n"
+"POT-Creation-Date: 2021-07-05 17:13+0000\n"
-"PO-Revision-Date: 2022-02-13 11:40+0100\n"
+"PO-Revision-Date: 2021-07-11 10:19+0200\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -24,24 +24,15 @@ msgstr ""
 msgid "GNOME Classic"
 msgstr "Класически GNOME"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Работната среда изглежда като класическия GNOME (2.x)"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-msgid "GNOME Classic on Wayland"
-msgstr "Класически GNOME в Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "Класически GNOME в Xorg"
-
-#: extensions/apps-menu/extension.js:112
 msgid "Favorites"
 msgstr "Любими"
 
-#: extensions/apps-menu/extension.js:370
+#: extensions/apps-menu/extension.js:367
 msgid "Applications"
 msgstr "Програми"
 
@@ -57,26 +48,26 @@ msgstr ""
 "Списък от низове. Всеки съдържа идентификатор на програма (име на файл „."
 "desktop“), следван от знака „:“ и номер на работен плот"
 
-#: extensions/auto-move-windows/prefs.js:19
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "Правила за работните плотове"
 
-#: extensions/auto-move-windows/prefs.js:245
+#: extensions/auto-move-windows/prefs.js:237
 msgid "Add Rule"
 msgstr "Добавяне на правило"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:123
+#: extensions/drive-menu/extension.js:132
-#: extensions/places-menu/placeDisplay.js:210
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Неуспешно изваждане на устройство „%s“:"
 
-#: extensions/drive-menu/extension.js:139
+#: extensions/drive-menu/extension.js:148
 msgid "Removable devices"
 msgstr "Преносими медии"
 
-#: extensions/drive-menu/extension.js:161
+#: extensions/drive-menu/extension.js:172
 msgid "Open Files"
 msgstr "Отваряне на файлове"
 
@@ -109,31 +100,31 @@ msgstr ""
 "им, а не както е стандартно — отдолу. За прилагане на промяната на "
 "настройката трябва да рестартирате обвивката на GNOME."
 
-#: extensions/places-menu/extension.js:88
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:91
+#: extensions/places-menu/extension.js:92
 msgid "Places"
 msgstr "Места"
 
-#: extensions/places-menu/placeDisplay.js:49
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Неуспешно стартиране на „%s“"
 
-#: extensions/places-menu/placeDisplay.js:64
+#: extensions/places-menu/placeDisplay.js:61
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Неуспешно монтиране на тома „%s“"
 
-#: extensions/places-menu/placeDisplay.js:125
 #: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Компютър"
 
-#: extensions/places-menu/placeDisplay.js:336
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "Домашна папка"
 
-#: extensions/places-menu/placeDisplay.js:381
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Мрежа"
 
@@ -154,47 +145,47 @@ msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr ""
 "Името на темата, която да бъде заредена от „~/.themes/name/gnome-shell“"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Затваряне"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Деминимизиране"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Минимизиране"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Демаксимизиране"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Максимизиране"
 
-#: extensions/window-list/extension.js:434
+#: extensions/window-list/extension.js:432
 msgid "Minimize all"
 msgstr "Минимизиране на всички"
 
-#: extensions/window-list/extension.js:440
+#: extensions/window-list/extension.js:438
 msgid "Unminimize all"
 msgstr "Деминимизиране на всички"
 
-#: extensions/window-list/extension.js:446
+#: extensions/window-list/extension.js:444
 msgid "Maximize all"
 msgstr "Максимизиране на всички"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:452
 msgid "Unmaximize all"
 msgstr "Демаксимизиране на всички"
 
-#: extensions/window-list/extension.js:462
+#: extensions/window-list/extension.js:460
 msgid "Close all"
 msgstr "Затваряне на всички"
 
-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:737
 msgid "Window List"
 msgstr "Списък на прозорците"
 
@@ -212,7 +203,7 @@ msgstr ""
 "„always“ (винаги)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:76
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Да се показват прозорците от всички работни плотове"
 
@@ -233,40 +224,40 @@ msgstr ""
 "Дали списъкът с прозорци да се извежда на всички монитори или само на "
 "основния"
 
-#: extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Групиране на прозорци"
 
-#: extensions/window-list/prefs.js:37
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Никога да не се групират"
 
-#: extensions/window-list/prefs.js:38
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Групиране при ограничено място"
 
-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Винаги да се групират"
 
-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "На всички монитори"
 
 #: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:254
+#: extensions/workspace-indicator/extension.js:255
 msgid "Workspace Indicator"
 msgstr "Индикатор на работните плотове"
 
-#: extensions/workspace-indicator/prefs.js:18
+#: extensions/workspace-indicator/prefs.js:34
 msgid "Workspace Names"
 msgstr "Имена на работните плотове"
 
-#: extensions/workspace-indicator/prefs.js:39
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Работен плот %d"
 
-#: extensions/workspace-indicator/prefs.js:184
+#: extensions/workspace-indicator/prefs.js:208
 msgid "Add Workspace"
 msgstr "Добавяне на работен плот"

po/ca.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2021-11-06 14:08+0000\n"
+"POT-Creation-Date: 2020-05-28 00:55+0000\n"
 "PO-Revision-Date: 2017-07-08 13:29+0100\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -19,28 +19,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME clàssic"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Aquesta sessió us permet utilitzar el GNOME clàssic"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME clàssic amb Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME clàssic amb Xorg"
-
-#: extensions/apps-menu/extension.js:112
 msgid "Favorites"
 msgstr "Preferides"
 
-#: extensions/apps-menu/extension.js:366
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Aplicacions"
 
@@ -57,26 +48,26 @@ msgstr ""
 "d'aplicació (nom del fitxer de l'escriptori), seguit de dos punts i el "
 "número de l'espai de treball"
 
-#: extensions/auto-move-windows/prefs.js:34
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "Regles dels espais de treball"
 
-#: extensions/auto-move-windows/prefs.js:236
+#: extensions/auto-move-windows/prefs.js:243
 msgid "Add Rule"
 msgstr "Afegeix una regla"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:133
+#: extensions/drive-menu/extension.js:112
 #: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Ha fallat l'expulsió de la unitat «%s»:"
 
-#: extensions/drive-menu/extension.js:149
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Dispositius extraïbles"
 
-#: extensions/drive-menu/extension.js:171
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Obre els fitxers"
 
@@ -90,10 +81,10 @@ msgid ""
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
-"Intenta utilitzar més espai de la pantalla per a posicionar les miniatures "
+"Intenta utilitzar més espai de la pantalla per a posicionar les miniatures de "
-"de les finestres adaptant-les a la ràtio d'aspecte de la pantalla, "
+"les finestres adaptant-les a la ràtio d'aspecte de la pantalla, consolidant-"
-"consolidant-les més per a reduir la caixa que les envolta. Aquest paràmetre "
+"les més per a reduir la caixa que les envolta. Aquest paràmetre de "
-"de configuració només s'aplica a l'estratègia de posicionament de finestres "
+"configuració només s'aplica a l'estratègia de posicionament de finestres "
 "natural."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
@@ -111,8 +102,8 @@ msgstr ""
 "posicionar-lo a baix. Cal reiniciar el Shell per tal que aquest canvi tingui "
 "efecte."
 
-#: extensions/places-menu/extension.js:88
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:91
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Llocs"
 
@@ -155,47 +146,47 @@ msgstr "Nom del tema"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "El nom del tema que es carregarà des de ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Tanca"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Desminimitza"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Minimitza"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Desmaximitza"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: extensions/window-list/extension.js:434
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "Minimitza-ho tot"
 
-#: extensions/window-list/extension.js:440
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
 msgstr "Desminimitza-ho tot"
 
-#: extensions/window-list/extension.js:446
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "Maximitza-ho tot"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
 msgstr "Desmaximitza-ho tot"
 
-#: extensions/window-list/extension.js:462
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "Tanca-ho tot"
 
-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:734
 msgid "Window List"
 msgstr "Llista de finestres"
 
@@ -213,7 +204,7 @@ msgstr ""
 "«auto» (automàticament) i «always» (sempre)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:86
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Mostra les finestres de tots els espais de treball"
 
@@ -235,40 +226,41 @@ msgstr ""
 "Si es mostra la llista de finestres en tots els monitors connectats o només "
 "al primari."
 
-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Agrupació de finestres"
 
-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Mai agrupis les finestres"
 
-#: extensions/window-list/prefs.js:64
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Agrupa les finestres quan l'espai estigui limitat"
 
-#: extensions/window-list/prefs.js:65
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Agrupa les finestres sempre"
 
-#: extensions/window-list/prefs.js:81
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Mostra a tots els monitors"
 
-#: extensions/window-list/workspaceIndicator.js:249
+#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:254
+#: extensions/workspace-indicator/extension.js:213
 msgid "Workspace Indicator"
 msgstr "Indicador de l'espai de treball"
 
-#: extensions/workspace-indicator/prefs.js:33
+#: extensions/workspace-indicator/prefs.js:34
 msgid "Workspace Names"
 msgstr "Noms dels espais de treball"
 
-#: extensions/workspace-indicator/prefs.js:66
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"
 
-#: extensions/workspace-indicator/prefs.js:207
+#: extensions/workspace-indicator/prefs.js:218
 msgid "Add Workspace"
 msgstr "Afegeix un espai de treball"
+

po/cs.po

@@ -2,15 +2,15 @@
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Petr Kovar <pknbe@volny.cz>, 2013.
-# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015, 2017, 2019, 2020, 2022.
+# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015, 2017, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2021-11-06 14:08+0000\n"
+"POT-Creation-Date: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2022-02-16 09:58+0100\n"
+"PO-Revision-Date: 2020-08-28 22:18+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -20,28 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME klasik"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Toto sezení vás přihlásí do GNOME klasik"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME klasik na Waylandu"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME klasik na Xorg"
-
-#: extensions/apps-menu/extension.js:112
 msgid "Favorites"
 msgstr "Oblíbené"
 
-#: extensions/apps-menu/extension.js:366
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Aplikace"
 
@@ -57,26 +48,26 @@ msgstr ""
 "Seznam řetězců, z nichž každý obsahuje ID aplikace (název souboru pracovní "
 "plochy), následovaný dvojtečkou a číslem pracovní plochy"
 
-#: extensions/auto-move-windows/prefs.js:34
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "Pravidla pracovních ploch"
 
-#: extensions/auto-move-windows/prefs.js:236
+#: extensions/auto-move-windows/prefs.js:243
 msgid "Add Rule"
 msgstr "Přidat pravidlo"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:133
+#: extensions/drive-menu/extension.js:112
 #: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Vysunutí disku „%s“ selhalo:"
 
-#: extensions/drive-menu/extension.js:149
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Výměnná zařízení"
 
-#: extensions/drive-menu/extension.js:171
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Otevřít soubory"
 
@@ -108,8 +99,8 @@ msgstr ""
 "přepíše výchozí chování shellu, který jej umisťuje dolů. Změna tohoto "
 "nastavení vyžaduje restart shellu, aby se projevila."
 
-#: extensions/places-menu/extension.js:88
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:91
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Místa"
 
@@ -152,47 +143,47 @@ msgstr "Název motivu"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Název motivu, který se má načíst z ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Zavřít"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Zrušit minimalizaci"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Minimalizovat"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Zrušit maximalizaci"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Maximalizovat"
 
-#: extensions/window-list/extension.js:434
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "Minimalizovat všechna"
 
-#: extensions/window-list/extension.js:440
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
 msgstr "Zrušit minimalizaci všech"
 
-#: extensions/window-list/extension.js:446
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "Maximalizovat všechna"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
 msgstr "Zrušit maximalizaci všech"
 
-#: extensions/window-list/extension.js:462
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "Zavřít všechna"
 
-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:734
 msgid "Window List"
 msgstr "Seznam oken"
 
@@ -209,7 +200,7 @@ msgstr ""
 "hodnoty jsou „never“ (nikdy), „auto“ (automaticky) a „always“ (vždy)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:86
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Zobrazovat okna ze všech pracovních ploch"
 
@@ -229,40 +220,40 @@ msgstr ""
 "Zda zobrazovat seznam oken na všech připojených monitorech nebo jen na "
 "hlavním."
 
-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Seskupování oken"
 
-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Nikdy neseskupovat okna"
 
-#: extensions/window-list/prefs.js:64
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Seskupovat okna při nedostatku místa"
 
-#: extensions/window-list/prefs.js:65
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Vždy seskupovat okna"
 
-#: extensions/window-list/prefs.js:81
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Zobrazovat na všech monitorech"
 
-#: extensions/window-list/workspaceIndicator.js:249
+#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:254
+#: extensions/workspace-indicator/extension.js:213
 msgid "Workspace Indicator"
 msgstr "Ukazatel pracovní plochy"
 
-#: extensions/workspace-indicator/prefs.js:33
+#: extensions/workspace-indicator/prefs.js:34
 msgid "Workspace Names"
 msgstr "Názvy pracovních ploch"
 
-#: extensions/workspace-indicator/prefs.js:66
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Pracovní plocha %d"
 
-#: extensions/workspace-indicator/prefs.js:207
+#: extensions/workspace-indicator/prefs.js:218
 msgid "Add Workspace"
 msgstr "Přidat pracovní plochu"

po/da.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2021-11-06 14:08+0000\n"
+"POT-Creation-Date: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2022-02-27 13:21+0100\n"
+"PO-Revision-Date: 2020-09-07 18:36+0200\n"
 "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -22,28 +22,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3\n"
 
-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME Classic"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Denne session logger dig ind i GNOME Classic"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME Classic på Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME Classic på Xorg"
-
-#: extensions/apps-menu/extension.js:112
 msgid "Favorites"
 msgstr "Favoritter"
 
-#: extensions/apps-menu/extension.js:366
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Programmer"
 
@@ -59,26 +50,26 @@ msgstr ""
 "En liste over strenge, som hver indeholder et program-id "
 "(skrivebordsfilnavn), efterfulgt af et kolon og arbejdsområdets nummer"
 
-#: extensions/auto-move-windows/prefs.js:34
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "Regler for arbejdsområde"
 
-#: extensions/auto-move-windows/prefs.js:236
+#: extensions/auto-move-windows/prefs.js:243
 msgid "Add Rule"
 msgstr "Tilføj regel"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:133
+#: extensions/drive-menu/extension.js:112
 #: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Udskubning af drevet “%s” mislykkedes:"
 
-#: extensions/drive-menu/extension.js:149
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Flytbare enheder"
 
-#: extensions/drive-menu/extension.js:171
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Åbn filer"
 
@@ -112,8 +103,8 @@ msgstr ""
 "Ændring af denne indstilling kræver at shell'en genstartes for at træde i "
 "kraft."
 
-#: extensions/places-menu/extension.js:88
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:91
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Steder"
 
@@ -156,47 +147,47 @@ msgstr "Temanavn"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Navnet på temaet, som indlæses fra ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Luk"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Afminimér"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Minimér"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Afmaksimér"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Maksimér"
 
-#: extensions/window-list/extension.js:434
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "Minimér"
 
-#: extensions/window-list/extension.js:440
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
 msgstr "Afminimér alle"
 
-#: extensions/window-list/extension.js:446
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "Maksimér alle"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
 msgstr "Afmaksimér alle"
 
-#: extensions/window-list/extension.js:462
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "Luk alle"
 
-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:734
 msgid "Window List"
 msgstr "Vinduesliste"
 
@@ -213,7 +204,7 @@ msgstr ""
 "Mulige værdier er “never” (aldrig), “auto” (automatisk) og “always” (altid)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:86
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Vis vinduer fra alle arbejdsområder"
 
@@ -234,41 +225,41 @@ msgstr ""
 "Om vindueslisten skal vise på alle tilsluttede skærme, eller kun på den "
 "primære."
 
-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Vinduesgruppering"
 
-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Gruppér aldrig vinduer"
 
-#: extensions/window-list/prefs.js:64
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Gruppér vinduer når pladsen er begrænset"
 
-#: extensions/window-list/prefs.js:65
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Gruppér altid vinduer"
 
-#: extensions/window-list/prefs.js:81
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Vis på alle skærme"
 
-#: extensions/window-list/workspaceIndicator.js:249
+#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:254
+#: extensions/workspace-indicator/extension.js:213
 msgid "Workspace Indicator"
 msgstr "Arbejdsområdeindikator"
 
-#: extensions/workspace-indicator/prefs.js:33
+#: extensions/workspace-indicator/prefs.js:34
 msgid "Workspace Names"
 msgstr "Navne på arbejdsområder"
 
-#: extensions/workspace-indicator/prefs.js:66
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Arbejdsområde %d"
 
-#: extensions/workspace-indicator/prefs.js:207
+#: extensions/workspace-indicator/prefs.js:218
 msgid "Add Workspace"
 msgstr "Tilføj arbejdsområde"
 

po/de.po

@@ -2,51 +2,41 @@
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2011-2013, 2017.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2011, 2012, 2022.
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2011, 2012.
 # Benjamin Steinwender <b@stbe.at>, 2013.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2014.
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2017.
 # Tim Sabsch <tim@sabsch.com>, 2019-2020.
-# Philipp Kiemle <philipp.kiemle@gmail.com>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2022-03-07 15:35+0000\n"
+"POT-Creation-Date: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2022-03-10 22:26+0100\n"
+"PO-Revision-Date: 2020-09-08 20:20+0200\n"
-"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
+"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 2.4.1\n"
 
-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME Classic"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Diese Sitzung meldet Sie in GNOME Classic an"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME Classic unter Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME Classic unter Xorg"
-
-#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Favoriten"
 
-#: extensions/apps-menu/extension.js:379
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Anwendungen"
 
@@ -63,26 +53,26 @@ msgstr ""
 "Datei) enthält, gefolgt von einem Doppelpunkt und der Nummer der "
 "Arbeitsfläche"
 
-#: extensions/auto-move-windows/prefs.js:152
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "Arbeitsfläche-Regeln"
 
-#: extensions/auto-move-windows/prefs.js:306
+#: extensions/auto-move-windows/prefs.js:243
 msgid "Add Rule"
 msgstr "Regel hinzufügen"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:126
+#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:210
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Auswerfen von Laufwerk »%s« schlug fehl:"
 
-#: extensions/drive-menu/extension.js:145
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Wechseldatenträger"
 
-#: extensions/drive-menu/extension.js:167
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Dateien öffnen"
 
@@ -116,31 +106,31 @@ msgstr ""
 "Vorschaubild platziert und damit die Voreinstellung der Shell übergangen. "
 "Eine Änderungseinstellung tritt erst mit einem Neustart der Shell in Kraft."
 
-#: extensions/places-menu/extension.js:94
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:97
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Orte"
 
-#: extensions/places-menu/placeDisplay.js:49
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Starten von »%s« fehlgeschlagen"
 
-#: extensions/places-menu/placeDisplay.js:64
+#: extensions/places-menu/placeDisplay.js:61
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Datenträger für »%s« konnte nicht eingebunden werden"
 
-#: extensions/places-menu/placeDisplay.js:125
 #: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Rechner"
 
-#: extensions/places-menu/placeDisplay.js:336
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "Persönlicher Ordner"
 
-#: extensions/places-menu/placeDisplay.js:381
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Netzwerk durchsuchen"
 
@@ -162,47 +152,47 @@ msgstr ""
 "Der Name des Themas, welches aus ~/.themes/name/gnome-shell geladen werden "
 "soll"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Schließen"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Minimieren rückgängig"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Minimieren"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Maximieren rückgängig"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Maximieren"
 
-#: extensions/window-list/extension.js:441
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "Alle minimieren"
 
-#: extensions/window-list/extension.js:447
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
 msgstr "Alle minimieren rückgängig"
 
-#: extensions/window-list/extension.js:453
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "Alle maximieren"
 
-#: extensions/window-list/extension.js:461
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
 msgstr "Alle maximieren rückgängig"
 
-#: extensions/window-list/extension.js:469
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "Alle schließen"
 
-#: extensions/window-list/extension.js:753
+#: extensions/window-list/extension.js:734
 msgid "Window List"
 msgstr "Fensterliste"
 
@@ -220,7 +210,7 @@ msgstr ""
 "»always« (immer)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:79
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Fenster von allen Arbeitsflächen anzeigen"
 
@@ -242,41 +232,41 @@ msgstr ""
 "Legt fest, ob die Fensterliste auf allen angeschlossenen Bildschirmen "
 "angezeigt wird oder nur auf dem Primären."
 
-#: extensions/window-list/prefs.js:35
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Fenstergruppierung"
 
-#: extensions/window-list/prefs.js:40
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Fenster niemals gruppieren"
 
-#: extensions/window-list/prefs.js:41
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Fenster bei Platzmangel gruppieren"
 
-#: extensions/window-list/prefs.js:42
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Fenster immer gruppieren"
 
-#: extensions/window-list/prefs.js:66
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Auf allen Bildschirmen anzeigen"
 
-#: extensions/window-list/workspaceIndicator.js:261
+#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:266
+#: extensions/workspace-indicator/extension.js:213
 msgid "Workspace Indicator"
 msgstr "Arbeitsflächenindikator"
 
-#: extensions/workspace-indicator/prefs.js:62
+#: extensions/workspace-indicator/prefs.js:34
+msgid "Workspace Names"
+msgstr "Namen der Arbeitsflächen"
+
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
 
-#: extensions/workspace-indicator/prefs.js:129
+#: extensions/workspace-indicator/prefs.js:218
-msgid "Workspace Names"
-msgstr "Namen der Arbeitsflächen"
-
-#: extensions/workspace-indicator/prefs.js:255
 msgid "Add Workspace"
 msgstr "Arbeitsfläche hinzufügen"
 

po/el.po

@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2023-02-18 15:10+0000\n"
+"POT-Creation-Date: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2023-08-01 23:41+0300\n"
+"PO-Revision-Date: 2020-07-14 00:40+0300\n"
 "Last-Translator: Efstathios Iosifidis <eiosifidis@gnome.org>\n"
 "Language-Team: Greek, Modern (1453-) <gnome-el-list@gnome.org>\n"
 "Language: el\n"
@@ -21,31 +21,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 1.8.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME Classic"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Αυτή η συνεδρία σας συνδέει στο GNOME Classic"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME Classic σε Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME Classic σε Xorg"
-
-#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Αγαπημένα"
 
-#: extensions/apps-menu/extension.js:380
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Εφαρμογές"
 
@@ -62,26 +53,26 @@ msgstr ""
 "(όνομα αρχείου επιφάνειας εργασίας), ακολουθούμενη από άνω-κάτω τελεία και "
 "τον αριθμό του χώρου εργασίας"
 
-#: extensions/auto-move-windows/prefs.js:152
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "Κανόνες χώρων εργασίας"
 
-#: extensions/auto-move-windows/prefs.js:306
+#: extensions/auto-move-windows/prefs.js:243
 msgid "Add Rule"
 msgstr "Προσθήκη κανόνα"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:126
+#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:212
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Αποτυχία εξαγωγής του δίσκου «%s»:"
 
-#: extensions/drive-menu/extension.js:145
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Αφαιρούμενες συσκευές"
 
-#: extensions/drive-menu/extension.js:167
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Άνοιγμα αρχείων"
 
@@ -115,31 +106,31 @@ msgstr ""
 "στο κάτω μέρος. Η αλλαγή αυτής της ρύθμισης απαιτεί επανεκκίνηση του "
 "κελύφους για να υπάρξει κάποιο αποτέλεσμα."
 
-#: extensions/places-menu/extension.js:94
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:97
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Τοποθεσίες"
 
-#: extensions/places-menu/placeDisplay.js:52
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Αποτυχία εκκίνησης «%s»"
 
-#: extensions/places-menu/placeDisplay.js:67
+#: extensions/places-menu/placeDisplay.js:61
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Αποτυχία προσάρτησης τόμου για «%s»"
 
-#: extensions/places-menu/placeDisplay.js:127
+#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:150
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Υπολογιστής"
 
-#: extensions/places-menu/placeDisplay.js:340
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "Προσωπικός φάκελος"
 
-#: extensions/places-menu/placeDisplay.js:385
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Περιήγηση δικτύου"
 
@@ -160,47 +151,47 @@ msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr ""
 "Το όνομα του θέματος που θα φορτωθεί από το ~ /.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Αποελαχιστοποίηση"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Ελαχιστοποίηση"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Απομεγιστοποίηση"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Μεγιστοποίηση"
 
-#: extensions/window-list/extension.js:483
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "Ελαχιστοποίηση όλων"
 
-#: extensions/window-list/extension.js:489
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
 msgstr "Αποελαχιστοποίηση όλων"
 
-#: extensions/window-list/extension.js:495
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "Μεγιστοποίηση όλων"
 
-#: extensions/window-list/extension.js:503
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
 msgstr "Απομεγιστοποίηση όλων"
 
-#: extensions/window-list/extension.js:511
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "Κλείσιμο όλων"
 
-#: extensions/window-list/extension.js:795
+#: extensions/window-list/extension.js:734
 msgid "Window List"
 msgstr "Λίστα παραθύρου"
 
@@ -218,7 +209,7 @@ msgstr ""
 "«always» (πάντα)."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:79
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Εμφάνιση των παραθύρων από όλους τους χώρους εργασίας"
 
@@ -239,41 +230,41 @@ msgstr ""
 "Αν θα εμφανίζεται ο κατάλογος παραθύρων όλων των συνδεμένων οθονών ή μόνο "
 "της κύριας οθόνης."
 
-#: extensions/window-list/prefs.js:35
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Ομαδοποίηση παραθύρου"
 
-#: extensions/window-list/prefs.js:40
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Να μη γίνεται ποτέ ομαδοποίηση παραθύρων"
 
-#: extensions/window-list/prefs.js:41
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Ομαδοποίηση παραθύρων όταν ο χώρος είναι περιορισμένος"
 
-#: extensions/window-list/prefs.js:42
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Να γίνεται πάντα ομαδοποίηση παραθύρων"
 
-#: extensions/window-list/prefs.js:66
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Να εμφανίζεται σε όλες τις οθόνες"
 
-#: extensions/window-list/workspaceIndicator.js:261
+#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:266
+#: extensions/workspace-indicator/extension.js:213
 msgid "Workspace Indicator"
 msgstr "Δείκτης χώρου εργασίας"
 
-#: extensions/workspace-indicator/prefs.js:62
+#: extensions/workspace-indicator/prefs.js:34
+msgid "Workspace Names"
+msgstr "Ονόματα χώρων εργασίας:"
+
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Χώρος εργασίας %d"
 
-#: extensions/workspace-indicator/prefs.js:129
+#: extensions/workspace-indicator/prefs.js:218
-msgid "Workspace Names"
-msgstr "Ονόματα χώρων εργασίας"
-
-#: extensions/workspace-indicator/prefs.js:255
 msgid "Add Workspace"
 msgstr "Προσθήκη χώρου εργασίας"
 

po/en_GB.po

@@ -1,7 +1,7 @@
 # British English translation of gnome-shell-extensions.
 # Copyright (C) 2011 gnome-shell-extensions'S COPYRIGHT HOLDER.
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Bruce Cowan <bruce@bcowan.eu>, 2011-2023.
+# Bruce Cowan <bruce@bcowan.eu>, 2011, 2018.
 # Chris Leonard <cjlhomeaddress@gmail.com>, 2012.
 # Philip Withnall <philip@tecnocode.co.uk>, 2014.
 # Zander Brown <zbrown@gnome.org>, 2019-2020.
@@ -11,42 +11,31 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2023-08-05 15:59+0000\n"
+"POT-Creation-Date: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2023-09-06 12:13+0100\n"
+"PO-Revision-Date: 2020-08-24 23:05+0100\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Last-Translator: Zander Brown <zbrown@gnome.org>\n"
 "Language-Team: English - United Kingdom <en_GB@li.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.3.1\n"
+"X-Generator: Gtranslator 3.36.0\n"
 "X-Project-Style: gnome\n"
 
-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME Classic"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "This session logs you into GNOME Classic"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-#| msgid "GNOME Classic"
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME Classic on Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-#| msgid "GNOME Classic"
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME Classic on Xorg"
-
-#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Favourites"
 
-#: extensions/apps-menu/extension.js:380
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Applications"
 
@@ -62,26 +51,27 @@ msgstr ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 
-#: extensions/auto-move-windows/prefs.js:152
+#: extensions/auto-move-windows/prefs.js:35
+#| msgid "Workspace Names"
 msgid "Workspace Rules"
 msgstr "Workspace Rules"
 
-#: extensions/auto-move-windows/prefs.js:306
+#: extensions/auto-move-windows/prefs.js:243
 msgid "Add Rule"
 msgstr "Add Rule"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:126
+#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:212
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Ejecting drive “%s” failed:"
 
-#: extensions/drive-menu/extension.js:145
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Removable devices"
 
-#: extensions/drive-menu/extension.js:167
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Open Files"
 
@@ -113,31 +103,31 @@ msgstr ""
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 
-#: extensions/places-menu/extension.js:94
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:97
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Places"
 
-#: extensions/places-menu/placeDisplay.js:52
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Failed to launch “%s”"
 
-#: extensions/places-menu/placeDisplay.js:67
+#: extensions/places-menu/placeDisplay.js:61
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Failed to mount volume for “%s”"
 
-#: extensions/places-menu/placeDisplay.js:127
+#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:150
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Computer"
 
-#: extensions/places-menu/placeDisplay.js:340
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "Home"
 
-#: extensions/places-menu/placeDisplay.js:385
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Browse Network"
 
@@ -157,47 +147,47 @@ msgstr "Theme name"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Close"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Unminimise"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Minimise"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Unmaximise"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Maximise"
 
-#: extensions/window-list/extension.js:483
+#: extensions/window-list/extension.js:428
 msgid "Minimize all"
 msgstr "Minimise all"
 
-#: extensions/window-list/extension.js:489
+#: extensions/window-list/extension.js:434
 msgid "Unminimize all"
 msgstr "Unminimise all"
 
-#: extensions/window-list/extension.js:495
+#: extensions/window-list/extension.js:440
 msgid "Maximize all"
 msgstr "Maximise all"
 
-#: extensions/window-list/extension.js:503
+#: extensions/window-list/extension.js:448
 msgid "Unmaximize all"
 msgstr "Unmaximise all"
 
-#: extensions/window-list/extension.js:511
+#: extensions/window-list/extension.js:456
 msgid "Close all"
 msgstr "Close all"
 
-#: extensions/window-list/extension.js:795
+#: extensions/window-list/extension.js:734
 msgid "Window List"
 msgstr "Window List"
 
@@ -214,7 +204,7 @@ msgstr ""
 "Possible values are “never”, “auto” and “always”."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:79
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Show windows from all workspaces"
 
@@ -234,41 +224,42 @@ msgstr ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 
-#: extensions/window-list/prefs.js:35
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Window Grouping"
 
-#: extensions/window-list/prefs.js:40
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Never group windows"
 
-#: extensions/window-list/prefs.js:41
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Group windows when space is limited"
 
-#: extensions/window-list/prefs.js:42
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Always group windows"
 
-#: extensions/window-list/prefs.js:66
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Show on all monitors"
 
-#: extensions/window-list/workspaceIndicator.js:261
+#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:266
+#: extensions/workspace-indicator/extension.js:213
 msgid "Workspace Indicator"
 msgstr "Workspace Indicator"
 
-#: extensions/workspace-indicator/prefs.js:62
+#: extensions/workspace-indicator/prefs.js:34
+msgid "Workspace Names"
+msgstr "Workspace Names"
+
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Workspace %d"
 
-#: extensions/workspace-indicator/prefs.js:129
+#: extensions/workspace-indicator/prefs.js:218
-msgid "Workspace Names"
+#| msgid "Workspace"
-msgstr "Workspace Names"
-
-#: extensions/workspace-indicator/prefs.js:255
 msgid "Add Workspace"
 msgstr "Add Workspace"
 

po/eo.po

@@ -3,48 +3,39 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Ryan LORTIE <desrt@desrt.ca>, 2013.
 # Daniel PUENTES <blatberk@openmailbox.org>, 2015.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011-2019.
 # Carmen Bianca BAKKER <carmen@carmenbianca.eu>, 2021.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011-2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2023-08-05 15:58+0000\n"
+"POT-Creation-Date: 2021-03-27 20:14+0000\n"
-"PO-Revision-Date: 2023-09-27 22:47+0200\n"
+"PO-Revision-Date: 2021-03-29 17:24+0200\n"
-"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
+"Last-Translator: Carmen Bianca BAKKER <carmen@carmenbianca.eu>\n"
 "Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 42.0\n"
+"X-Generator: Gtranslator 3.38.0\n"
 "X-Project-Style: gnome\n"
 
 #: data/gnome-classic.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME-klasika"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Ĉi tiu seanco ensalutas vin GNOME-klasiken"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME-klasika je Vajlando"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME-klasika je Xorg"
-
-#: extensions/apps-menu/extension.js:121
 msgid "Favorites"
 msgstr "Plej ŝatataj"
 
-#: extensions/apps-menu/extension.js:378
+#: extensions/apps-menu/extension.js:367
 msgid "Applications"
 msgstr "Aplikaĵoj"
 
@@ -60,26 +51,26 @@ msgstr ""
 "Listo de ĉenoj, ĉiu enhavas aplikaĵan identigilon ('desktop' dosiernomo), "
 "sevkita per dupunkto kaj la laborspaca numero"
 
-#: extensions/auto-move-windows/prefs.js:155
+#: extensions/auto-move-windows/prefs.js:35
 msgid "Workspace Rules"
 msgstr "Laborspacaj reguloj"
 
-#: extensions/auto-move-windows/prefs.js:309
+#: extensions/auto-move-windows/prefs.js:237
 msgid "Add Rule"
 msgstr "Aldoni regulon"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:122
+#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:213
+#: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Elĵeto de volumo “%s” malsukcesis:"
 
-#: extensions/drive-menu/extension.js:141
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Demeteblaj aparatoj"
 
-#: extensions/drive-menu/extension.js:163
+#: extensions/drive-menu/extension.js:152
 msgid "Open Files"
 msgstr "Malfermi dosierojn"
 
@@ -111,31 +102,31 @@ msgstr ""
 "estas meti ĝin malsupre). Si vi ŝanĝas ĉi agordon tiam vi devas restartigi "
 "la ŝelon."
 
-#: extensions/places-menu/extension.js:85
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:88
+#: extensions/places-menu/extension.js:92
 msgid "Places"
 msgstr "Lokoj"
 
-#: extensions/places-menu/placeDisplay.js:53
+#: extensions/places-menu/placeDisplay.js:46
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Malsukcesis lanĉi “%s”"
 
-#: extensions/places-menu/placeDisplay.js:68
+#: extensions/places-menu/placeDisplay.js:61
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Ne eblis munti datumportilon por “%s”"
 
-#: extensions/places-menu/placeDisplay.js:128
+#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:151
+#: extensions/places-menu/placeDisplay.js:171
 msgid "Computer"
 msgstr "Komputilo"
 
-#: extensions/places-menu/placeDisplay.js:328
+#: extensions/places-menu/placeDisplay.js:359
 msgid "Home"
 msgstr "Domo"
 
-#: extensions/places-menu/placeDisplay.js:373
+#: extensions/places-menu/placeDisplay.js:404
 msgid "Browse Network"
 msgstr "Foliumi reton"
 
@@ -155,47 +146,47 @@ msgstr "Etosnomo"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "La nomo de la etoso, malfermigi de ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:71
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Fermi"
 
-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Malminimumigi"
 
-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Minimumigi"
 
-#: extensions/window-list/extension.js:105
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Malmaksimumigi"
 
-#: extensions/window-list/extension.js:105
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Maksimumigi"
 
-#: extensions/window-list/extension.js:468
+#: extensions/window-list/extension.js:432
 msgid "Minimize all"
 msgstr "Minimumigi ĉiujn"
 
-#: extensions/window-list/extension.js:474
+#: extensions/window-list/extension.js:438
 msgid "Unminimize all"
 msgstr "Malminimumigi ĉiujn"
 
-#: extensions/window-list/extension.js:480
+#: extensions/window-list/extension.js:444
 msgid "Maximize all"
 msgstr "Maksimumigi ĉiujn"
 
-#: extensions/window-list/extension.js:488
+#: extensions/window-list/extension.js:452
 msgid "Unmaximize all"
 msgstr "Malmaksimumigi ĉiujn"
 
-#: extensions/window-list/extension.js:496
+#: extensions/window-list/extension.js:460
 msgid "Close all"
 msgstr "Fermi ĉiujn"
 
-#: extensions/window-list/extension.js:776
+#: extensions/window-list/extension.js:737
 msgid "Window List"
 msgstr "Fenestra listo"
 
@@ -212,7 +203,7 @@ msgstr ""
 "Validaj valoroj estas “neniam”, “aŭtomate” kaj ĉiam”."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:76
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Montri la fenestrojn de ĉiuj laborspacoj"
 
@@ -231,41 +222,41 @@ msgid ""
 msgstr ""
 "Ĉu montri la fenestroliston en ĉiuj konektitaj ekranoj aŭ nur en la ĉefa."
 
-#: extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Fenestra grupigo"
 
-#: extensions/window-list/prefs.js:37
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Neniam grupigi fenestrojn"
 
-#: extensions/window-list/prefs.js:38
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Grupigi fenestrojn kiam spaco limitas"
 
-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Ĉiam grupigi fenestrojn"
 
-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Montri en ĉiuj ekranoj"
 
-#: extensions/window-list/workspaceIndicator.js:248
+#: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:252
+#: extensions/workspace-indicator/extension.js:255
 msgid "Workspace Indicator"
 msgstr "Laborspaco Indikilo"
 
-#: extensions/workspace-indicator/prefs.js:65
+#: extensions/workspace-indicator/prefs.js:34
+msgid "Workspace Names"
+msgstr "Laborspacaj nomoj"
+
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Laborspaco %d"
 
-#: extensions/workspace-indicator/prefs.js:132
+#: extensions/workspace-indicator/prefs.js:208
-msgid "Workspace Names"
-msgstr "Laborspacaj nomoj"
-
-#: extensions/workspace-indicator/prefs.js:258
 msgid "Add Workspace"
 msgstr "Aldoni laborspacon"
 

po/es.po

@@ -4,15 +4,15 @@
 # Jorge González <jorgegonz@svn.gnome.org>, 2011.
 # Nicolás Satragno <nsatragno@gmail.com>, 2011.
 # 
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2021.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2021-11-06 14:08+0000\n"
+"POT-Creation-Date: 2020-05-03 17:53+0000\n"
-"PO-Revision-Date: 2021-11-26 17:58+0100\n"
+"PO-Revision-Date: 2020-05-04 14:06+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
 "Language: es_ES\n"
@@ -20,32 +20,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 41.0\n"
+"X-Generator: Gtranslator 3.36.0\n"
 
-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME clásico"
 
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
+#: data/gnome-classic.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Esta sesión inicia GNOME clásico"
 
-#: data/gnome-classic-wayland.desktop.in:3
+#: extensions/apps-menu/extension.js:113
-#| msgid "GNOME Classic"
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME clásico en Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-#| msgid "GNOME Classic"
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME clásicoen Xorg"
-
-#: extensions/apps-menu/extension.js:112
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: extensions/apps-menu/extension.js:366
+#: extensions/apps-menu/extension.js:369
 msgid "Applications"
 msgstr "Aplicaciones"
 
@@ -61,26 +50,27 @@ msgstr ""
 "Una lista de cadenas, conteniendo cada una un ID de aplicación (nombre de "
 "archivo de escritorio), seguido de dos puntos y el número del área de trabajo"
 
-#: extensions/auto-move-windows/prefs.js:34
+#: extensions/auto-move-windows/prefs.js:35
+#| msgid "Workspace Names"
 msgid "Workspace Rules"
 msgstr "Reglas de las áreas de trabajo"
 
-#: extensions/auto-move-windows/prefs.js:236
+#: extensions/auto-move-windows/prefs.js:243
 msgid "Add Rule"
 msgstr "Añadir regla"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:133
+#: extensions/drive-menu/extension.js:112
 #: extensions/places-menu/placeDisplay.js:233
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Falló al expulsar el dispositivo «%s»:"
 
-#: extensions/drive-menu/extension.js:149
+#: extensions/drive-menu/extension.js:128
 msgid "Removable devices"
 msgstr "Dispositivos extraíbles"
 
-#: extensions/drive-menu/extension.js:171
+#: extensions/drive-menu/extension.js:155
 msgid "Open Files"
 msgstr "Abrir archivos"
 
@@ -113,8 +103,8 @@ msgstr ""
 "los sitúa por debajo. Cambiar esta configuración requiere reiniciar la shell "
 "para que tenga efecto."
 
-#: extensions/places-menu/extension.js:88
+#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:91
+#: extensions/places-menu/extension.js:93
 msgid "Places"
 msgstr "Lugares"
 
@@ -157,47 +147,47 @@ msgstr "Nombre del tema"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "El nombre del tema, que se carga desde ~/.themes/nombre/gnome-shell"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:98
 msgid "Close"
 msgstr "Cerrar"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Unminimize"
 msgstr "Desminimizar"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:118
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Unmaximize"
 msgstr "Desmaximizar"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:125
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: extensions/window-list/extension.js:434
+#: extensions/window-list/extension.js:429
 msgid "Minimize all"
 msgstr "Minimizar todo"
 
-#: extensions/window-list/extension.js:440
+#: extensions/window-list/extension.js:435
 msgid "Unminimize all"
 msgstr "Desminimizar todo"
 
-#: extensions/window-list/extension.js:446
+#: extensions/window-list/extension.js:441
 msgid "Maximize all"
 msgstr "Maximizar todo"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:449
 msgid "Unmaximize all"
 msgstr "Desmaximizar todo"
 
-#: extensions/window-list/extension.js:462
+#: extensions/window-list/extension.js:457
 msgid "Close all"
 msgstr "Cerrar todo"
 
-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:737
 msgid "Window List"
 msgstr "Lista de ventanas"
 
@@ -214,7 +204,7 @@ msgstr ""
 "ventanas. Los valores posibles son «never», «auto» y «always»."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:86
+#: extensions/window-list/prefs.js:100
 msgid "Show windows from all workspaces"
 msgstr "Mostrar ventanas de todas las áreas de trabajo"
 
@@ -236,41 +226,41 @@ msgstr ""
 "Indica si se debe mostrar la lista de ventanas en todas las pantallas "
 "conectadas o sólo en la primaria."
 
-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:29
 msgid "Window Grouping"
 msgstr "Agrupación de ventanas"
 
-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:58
 msgid "Never group windows"
 msgstr "Nunca agrupar las ventanas"
 
-#: extensions/window-list/prefs.js:64
+#: extensions/window-list/prefs.js:59
 msgid "Group windows when space is limited"
 msgstr "Agrupar las ventanas cuando el espacio esté limitado"
 
-#: extensions/window-list/prefs.js:65
+#: extensions/window-list/prefs.js:60
 msgid "Always group windows"
 msgstr "Siempre agrupar las ventanas"
 
-#: extensions/window-list/prefs.js:81
+#: extensions/window-list/prefs.js:94
 msgid "Show on all monitors"
 msgstr "Mostrar en todas las pantallas"
 
-#: extensions/window-list/workspaceIndicator.js:249
+#: extensions/window-list/workspaceIndicator.js:209
-#: extensions/workspace-indicator/extension.js:254
+#: extensions/workspace-indicator/extension.js:215
 msgid "Workspace Indicator"
 msgstr "Indicador de área de trabajo"
 
-#: extensions/workspace-indicator/prefs.js:33
+#: extensions/workspace-indicator/prefs.js:34
 msgid "Workspace Names"
 msgstr "Nombres de los áreas de trabajo"
 
-#: extensions/workspace-indicator/prefs.js:66
+#: extensions/workspace-indicator/prefs.js:67
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Área de trabajo %d"
 
-#: extensions/workspace-indicator/prefs.js:207
+#: extensions/workspace-indicator/prefs.js:218
 msgid "Add Workspace"
 msgstr "Añadir área de trabajo"