New upstream version 3.32.0

Update NEWS.

.gitignore

@@ -1,29 +0,0 @@
-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,40 +0,0 @@
-stages:
- - commit_check
- - source_check
- - build
-
-variables:
- LINT_LOG: "eslint-report.txt"
-
-.only_default: &only_default
-    only:
-        - branches
-        - tags
-        - merge_requests
-
-check_commit_log:
-    image: registry.gitlab.gnome.org/gnome/gjs:fedora.static-analysis
-    stage: commit_check
-    script:
-        - ./.gitlab-ci/check-commit-log.sh
-    only:
-        - merge_requests
-
-eslint:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-  stage: source_check
-  script:
-    - eslint -o $LINT_LOG --no-color || { cat $LINT_LOG; false; }
-  <<: *only_default
-  artifacts:
-    paths:
-      - ${LINT_LOG}
-    when: on_failure
-
-build-shell-extensions:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-  stage: build
-  script:
-    - meson _build .
-    - ninja -C _build test install
-  <<: *only_default

.gitlab-ci/check-commit-log.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-  echo Cannot review non-merge request
-  exit 1
-fi
-
-git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-
-branch_point=$(git merge-base HEAD FETCH_HEAD)
-
-commits=$(git log --format='format:%H' $branch_point..$CI_COMMIT_SHA)
-
-if [ -z "$commits" ]; then
-  echo Commit range empty
-  exit 1
-fi
-
-function commit_message_has_url() {
-  commit=$1
-  commit_message=$(git show -s --format='format:%b' $commit)
-  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
-  return $?
-}
-
-for commit in $commits; do
-  if ! commit_message_has_url $commit; then
-    echo "Missing merge request or issue URL on commit $(echo $commit | cut -c -8)"
-    exit 1
-  fi
-done

.gitmodules

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

NEWS

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

README.md

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

data/classic.json.in

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

data/gnome-classic.scss

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

data/gnome-shell-sass/COPYING

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

data/gnome-shell-sass/README.md

@@ -0,0 +1,16 @@
+# GNOME Shell Sass
+GNOME Shell Sass is a project intended to allow the sharing of the
+theme sources in sass between gnome-shell and other projects like
+gnome-shell-extensions.
+
+Any changes should be done in the [GNOME Shell subtree][shell-subtree]
+and not the stand-alone [gnome-shell-sass repository][sass-repo]. They
+will then be synchronized periodically before releases.
+
+## License
+GNOME Shell Sass is distributed under the terms of the GNU General Public
+License, version 2 or later. See the [COPYING][license] file for details.
+
+[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
+[sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
+[license]: COPYING

data/gnome-shell-sass/_colors.scss

@@ -0,0 +1,41 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
+$bg_color: if($variant == 'light', #f6f5f4, desaturate(#3d3846, 10%));
+$fg_color: if($variant == 'light', #2e3436, #eeeeec);
+
+$selected_fg_color: #ffffff;
+$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
+$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
+$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
+$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #cc0000;
+$success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
+$destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
+
+$osd_fg_color: #eeeeec;
+$osd_bg_color: #2e3436;
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.9);
+
+$tooltip_borders_color: $osd_outer_borders_color;
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);

data/gnome-shell-sass/_drawing.scss

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

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

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

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

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

extensions/apps-menu/extension.js

@@ -4,17 +4,17 @@
 const {
     Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
 } = imports.gi;
-const Signals = imports.signals;
-
 const DND = imports.ui.dnd;
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
+const Signals = imports.signals;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+
 const appSys = Shell.AppSystem.get_default();
 
 const APPLICATION_ICON_SIZE = 32;
@@ -25,34 +25,47 @@ 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 ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
+    constructor(button) {
+        super();
+        this._button = button;
+        this.actor.add_child(new St.Label({ text: _('Activities Overview') }));
+    }
+
+    activate(event) {
+        this._button.menu.toggle();
+        Main.overview.toggle();
+        super.activate(event);
+    }
+}
+
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, app) {
-        super._init();
+    constructor(button, app) {
+        super();
         this._app = app;
         this._button = button;
 
         this._iconBin = new St.Bin();
-        this.add_child(this._iconBin);
+        this.actor.add_child(this._iconBin);
 
         let appLabel = new St.Label({
             text: app.get_name(),
             y_expand: true,
             y_align: Clutter.ActorAlign.CENTER
         });
-        this.add_child(appLabel);
-        this.label_actor = appLabel;
+        this.actor.add_child(appLabel);
+        this.actor.label_actor = appLabel;
 
         let textureCache = St.TextureCache.get_default();
         let iconThemeChangedId = textureCache.connect('icon-theme-changed',
-            this._updateIcon.bind(this));
-        this.connect('destroy', () => {
+                                                      this._updateIcon.bind(this));
+        this.actor.connect('destroy', () => {
             textureCache.disconnect(iconThemeChangedId);
         });
         this._updateIcon();
 
-        this._delegate = this;
-        let draggable = DND.makeDraggable(this);
+        this.actor._delegate = this;
+        let draggable = DND.makeDraggable(this.actor);
 
         let maybeStartDrag = draggable._maybeStartDrag;
         draggable._maybeStartDrag = (event) => {
@@ -67,8 +80,6 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._button.selectCategory(null);
         this._button.menu.toggle();
         super.activate(event);
-
-        Main.overview.hide();
     }
 
     setActive(active, params) {
@@ -90,16 +101,13 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _updateIcon() {
-        let icon = this.getDragActor();
-        icon.style_class = 'icon-dropshadow';
-        this._iconBin.set_child(icon);
+        this._iconBin.set_child(this.getDragActor());
     }
-});
+}
 
-var CategoryMenuItem = GObject.registerClass(
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, category) {
-        super._init();
+    constructor(button, category) {
+        super();
         this._category = category;
         this._button = button;
 
@@ -112,9 +120,8 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         else
             name = _('Favorites');
 
-        this.add_child(new St.Label({ text: name }));
-        this.connect('motion-event', this._onMotionEvent.bind(this));
-        this.connect('notify::active', this._onActiveChanged.bind(this));
+        this.actor.add_child(new St.Label({ text: name }));
+        this.actor.connect('motion-event', this._onMotionEvent.bind(this));
     }
 
     activate(event) {
@@ -124,7 +131,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _isNavigatingSubmenu([x, y]) {
-        let [posX, posY] = this.get_transformed_position();
+        let [posX, posY] = this.actor.get_transformed_position();
 
         if (this._oldX == -1) {
             this._oldX = x;
@@ -139,11 +146,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._oldY = y;
 
         // If it lies outside the x-coordinates then it is definitely outside.
-        if (posX > x || posX + this.width < x)
+        if (posX > x || posX + this.actor.width < x)
             return false;
 
         // If it lies inside the menu item then it is definitely inside.
-        if (posY <= y && posY + this.height >= y)
+        if (posY <= y && posY + this.actor.height >= y)
             return true;
 
         // We want the keep-up triangle only if the movement is more
@@ -164,17 +171,17 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         // only check for triangle ABC.
         if (posY > y) {
             let offset = posY - y;
-            y = posY + this.height + offset;
+            y = posY + this.actor.height + offset;
         }
 
         // Ensure that A is (0, 0).
         x -= posX;
-        y -= posY + this.height;
+        y -= posY + this.actor.height;
 
         // Check which side of line AB the point P lies on by taking the
         // cross-product of AB and AP. See:
         // http://stackoverflow.com/questions/3461453/determine-which-side-of-a-line-a-point-lies
-        if (((this.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
+        if (((this.actor.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
             return true;
 
         return false;
@@ -184,16 +191,16 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         if (!Clutter.get_pointer_grab()) {
             this._oldX = -1;
             this._oldY = -1;
-            Clutter.grab_pointer(this);
+            Clutter.grab_pointer(this.actor);
         }
-        this.hover = true;
+        this.actor.hover = true;
 
         if (this._isNavigatingSubmenu(event.get_coords()))
             return true;
 
         this._oldX = -1;
         this._oldY = -1;
-        this.hover = false;
+        this.actor.hover = false;
         Clutter.ungrab_pointer();
 
         let source = event.get_source();
@@ -203,14 +210,14 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         return false;
     }
 
-    _onActiveChanged() {
-        if (!this.active)
-            return;
-
-        this._button.selectCategory(this._category);
-        this._button.scrollToCatButton(this);
+    setActive(active, params) {
+        if (active) {
+            this._button.selectCategory(this._category);
+            this._button.scrollToCatButton(this);
+        }
+        super.setActive(active, params);
     }
-});
+}
 
 class ApplicationsMenu extends PopupMenu.PopupMenu {
     constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -222,9 +229,28 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
         return false;
     }
 
+    open(animate) {
+        this._button.hotCorner.setBarrierSize(0);
+        if (this._button.hotCorner.actor) // fallback corner
+            this._button.hotCorner.actor.hide();
+        super.open(animate);
+    }
+
+    close(animate) {
+        let size = Main.layoutManager.panelBox.height;
+        this._button.hotCorner.setBarrierSize(size);
+        if (this._button.hotCorner.actor) // fallback corner
+            this._button.hotCorner.actor.show();
+        super.close(animate);
+    }
+
     toggle() {
-        if (this.isOpen)
+        if (this.isOpen) {
             this._button.selectCategory(null);
+        } else {
+            if (Main.overview.visible)
+                Main.overview.hide();
+        }
         super.toggle();
     }
 }
@@ -236,7 +262,7 @@ class DesktopTarget {
 
         this._windowAddedId =
             global.window_group.connect('actor-added',
-                this._onWindowAdded.bind(this));
+                                        this._onWindowAdded.bind(this));
 
         global.get_window_actors().forEach(a => {
             this._onWindowAdded(a.get_parent(), a);
@@ -296,8 +322,8 @@ class DesktopTarget {
 
             // Hack: force nautilus to reload file info
             info = new Gio.FileInfo();
-            info.set_attribute_uint64(
-                Gio.FILE_ATTRIBUTE_TIME_ACCESS, GLib.get_real_time());
+            info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
+                                      GLib.get_real_time());
             try {
                 await file.set_attributes_async(info, queryFlags, ioPriority, null);
             } catch (e) {
@@ -376,6 +402,8 @@ class ApplicationsButton extends PanelMenu.Button {
         this.name = 'panelApplications';
         this.label_actor = this._label;
 
+        this.connect('captured-event', this._onCapturedEvent.bind(this));
+
         this._showingId = Main.overview.connect('showing', () => {
             this.add_accessible_state (Atk.StateType.CHECKED);
         });
@@ -383,7 +411,7 @@ class ApplicationsButton extends PanelMenu.Button {
             this.remove_accessible_state (Atk.StateType.CHECKED);
         });
         Main.layoutManager.connect('startup-complete',
-            this._setKeybinding.bind(this));
+                                   this._setKeybinding.bind(this));
         this._setKeybinding();
 
         this._desktopTarget = new DesktopTarget();
@@ -398,14 +426,14 @@ class ApplicationsButton extends PanelMenu.Button {
 
         this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
         this._treeChangedId = this._tree.connect('changed',
-            this._onTreeChanged.bind(this));
+                                                 this._onTreeChanged.bind(this));
 
         this._applicationsButtons = new Map();
         this.reloadFlag = false;
         this._createLayout();
         this._display();
         this._installedChangedId = appSys.connect('installed-changed',
-            this._onTreeChanged.bind(this));
+                                                  this._onTreeChanged.bind(this));
     }
 
     _onTreeChanged() {
@@ -417,6 +445,10 @@ class ApplicationsButton extends PanelMenu.Button {
         }
     }
 
+    get hotCorner() {
+        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
+    }
+
     _createVertSeparator() {
         let separator = new St.DrawingArea({
             style_class: 'calendar-vertical-separator',
@@ -427,23 +459,30 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _onDestroy() {
-        super._onDestroy();
-
         Main.overview.disconnect(this._showingId);
         Main.overview.disconnect(this._hidingId);
         appSys.disconnect(this._installedChangedId);
         this._tree.disconnect(this._treeChangedId);
         this._tree = null;
 
+        let handler = Main.sessionMode.hasOverview ?
+            Main.overview.toggle.bind(Main.overview) : null;
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
-            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
-            Main.sessionMode.hasOverview
-                ? Main.overview.toggle.bind(Main.overview)
-                : null);
+                                           Shell.ActionMode.NORMAL |
+                                           Shell.ActionMode.OVERVIEW,
+                                           handler);
 
         this._desktopTarget.destroy();
     }
 
+    _onCapturedEvent(actor, event) {
+        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
+            if (!Main.overview.shouldToggleByCornerOrButton())
+                return true;
+        }
+        return false;
+    }
+
     _onMenuKeyPress(actor, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
@@ -483,8 +522,9 @@ class ApplicationsButton extends PanelMenu.Button {
 
     _setKeybinding() {
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
-            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
-            () => this.menu.toggle());
+                                           Shell.ActionMode.NORMAL |
+                                           Shell.ActionMode.OVERVIEW,
+                                           () => this.menu.toggle());
     }
 
     _redisplay() {
@@ -525,7 +565,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
         let currentScrollValue = appsScrollBoxAdj.get_value();
         let boxHeight = appsScrollBoxAlloc.y2 - appsScrollBoxAlloc.y1;
-        let buttonAlloc = button.get_allocation_box();
+        let buttonAlloc = button.actor.get_allocation_box();
         let newScrollValue = currentScrollValue;
         if (currentScrollValue > buttonAlloc.y1 - 10)
             newScrollValue = buttonAlloc.y1 - 10;
@@ -540,7 +580,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
         let currentScrollValue = catsScrollBoxAdj.get_value();
         let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
-        let buttonAlloc = button.get_allocation_box();
+        let buttonAlloc = button.actor.get_allocation_box();
         let newScrollValue = currentScrollValue;
         if (currentScrollValue > buttonAlloc.y1 - 10)
             newScrollValue = buttonAlloc.y1 - 10;
@@ -586,6 +626,14 @@ class ApplicationsButton extends PanelMenu.Button {
             y_align: St.Align.START
         });
 
+        let activities = new ActivitiesMenuItem(this);
+        this.leftBox.add(activities.actor, {
+            expand: false,
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START
+        });
+
         this.applicationsBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox.add_actor(this.applicationsBox);
         this.categoriesBox = new St.BoxLayout({ vertical: true });
@@ -615,7 +663,7 @@ class ApplicationsButton extends PanelMenu.Button {
         this._tree.load_sync();
         let root = this._tree.get_root_directory();
         let categoryMenuItem = new CategoryMenuItem(this, null);
-        this.categoriesBox.add_actor(categoryMenuItem);
+        this.categoriesBox.add_actor(categoryMenuItem.actor);
         let iter = root.iter();
         let nextType;
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
@@ -631,7 +679,7 @@ class ApplicationsButton extends PanelMenu.Button {
             this._loadCategory(categoryId, dir);
             if (this.applicationsByCategory[categoryId].length > 0) {
                 let categoryMenuItem = new CategoryMenuItem(this, dir);
-                this.categoriesBox.add_actor(categoryMenuItem);
+                this.categoriesBox.add_actor(categoryMenuItem.actor);
             }
         }
 
@@ -672,8 +720,8 @@ class ApplicationsButton extends PanelMenu.Button {
                 item.setDragEnabled(this._desktopTarget.hasDesktop);
                 this._applicationsButtons.set(app, item);
             }
-            if (!item.get_parent())
-                this.applicationsBox.add_actor(item);
+            if (!item.actor.get_parent())
+                this.applicationsBox.add_actor(item.actor);
         }
     }
 
@@ -697,16 +745,19 @@ class ApplicationsButton extends PanelMenu.Button {
 });
 
 let appsMenuButton;
+let activitiesButton;
 
 function enable() {
+    activitiesButton = Main.panel.statusArea['activities'];
+    activitiesButton.container.hide();
     appsMenuButton = new ApplicationsButton();
-    let index = Main.sessionMode.panel.left.indexOf('activities') + 1;
-    Main.panel.addToStatusArea('apps-menu', appsMenuButton, index, 'left');
+    Main.panel.addToStatusArea('apps-menu', appsMenuButton, 1, 'left');
 }
 
 function disable() {
     Main.panel.menuManager.removeMenu(appsMenuButton.menu);
     appsMenuButton.destroy();
+    activitiesButton.container.show();
 }
 
 function init() {

extensions/auto-move-windows/extension.js

@@ -4,9 +4,10 @@
 
 const Shell = imports.gi.Shell;
 
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+
 class WindowMover {
     constructor() {
         this._settings = ExtensionUtils.getSettings();
@@ -16,7 +17,7 @@ class WindowMover {
 
         this._appsChangedId =
             this._appSystem.connect('installed-changed',
-                this._updateAppData.bind(this));
+                                    this._updateAppData.bind(this));
 
         this._settings.connect('changed', this._updateAppConfigs.bind(this));
         this._updateAppConfigs();
@@ -49,7 +50,7 @@ class WindowMover {
         addedApps.forEach(app => {
             let data = {
                 windowsChangedId: app.connect('windows-changed',
-                    this._appWindowsChanged.bind(this)),
+                                              this._appWindowsChanged.bind(this)),
                 moveWindowsId: 0,
                 windows: app.get_windows()
             };

extensions/auto-move-windows/prefs.js

@@ -233,8 +233,8 @@ const Widget = GObject.registerClass({
         });
         let { APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT } = Columns;
         this._store.set(iter,
-            [APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT],
-            [appInfo, icon, displayName, workspace, adj]);
+                        [APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT],
+                        [appInfo, icon, displayName, workspace, adj]);
     }
 
     _checkId(id) {

extensions/drive-menu/extension.js

@@ -5,38 +5,36 @@ const { Gio, GObject, Shell, St } = imports.gi;
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
-var MountMenuItem = GObject.registerClass(
+const ExtensionUtils = imports.misc.extensionUtils;
+
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(mount) {
-        super._init();
+    constructor(mount) {
+        super();
 
         this.label = new St.Label({ text: mount.get_name() });
-        this.add(this.label, { expand: true });
-        this.label_actor = this.label;
+        this.actor.add(this.label, { expand: true });
+        this.actor.label_actor = this.label;
 
         this.mount = mount;
 
-        this.connect('destroy', this._onDestroy.bind(this));
-
         let ejectIcon = new St.Icon({
             icon_name: 'media-eject-symbolic',
             style_class: 'popup-menu-icon'
         });
         let ejectButton = new St.Button({ child: ejectIcon });
         ejectButton.connect('clicked', this._eject.bind(this));
-        this.add(ejectButton);
+        this.actor.add(ejectButton);
 
         this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
         this._syncVisibility();
     }
 
-    _onDestroy() {
+    destroy() {
         if (this._changedId) {
             this.mount.disconnect(this._changedId);
             this._changedId = 0;
@@ -63,7 +61,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _syncVisibility() {
-        this.visible = this._isInteresting();
+        this.actor.visible = this._isInteresting();
     }
 
     _eject() {
@@ -75,10 +73,10 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         if (this.mount.can_eject())
             this.mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
+                                            this._ejectFinish.bind(this));
         else
             this.mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
+                                              this._unmountFinish.bind(this));
     }
 
     _unmountFinish(mount, result) {
@@ -104,13 +102,13 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     activate(event) {
-        let uri = this.mount.get_root().get_uri();
         let context = global.create_app_launch_context(event.get_time(), -1);
-        Gio.AppInfo.launch_default_for_uri(uri, context);
+        Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
+                                           context);
 
         super.activate(event);
     }
-});
+}
 
 let DriveMenu = GObject.registerClass(
 class DriveMenu extends PanelMenu.Button {
@@ -152,7 +150,7 @@ class DriveMenu extends PanelMenu.Button {
     }
 
     _updateMenuVisibility() {
-        if (this._mounts.filter(i => i.visible).length > 0)
+        if (this._mounts.filter(i => i.actor.visible).length > 0)
             this.show();
         else
             this.hide();

extensions/horizontal-workspaces/extension.js

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

extensions/horizontal-workspaces/meson.build

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

extensions/horizontal-workspaces/metadata.json.in

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

extensions/horizontal-workspaces/stylesheet.css

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

extensions/native-window-placement/extension.js

@@ -1,8 +1,9 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported enable disable */
-const ExtensionUtils = imports.misc.extensionUtils;
 const Workspace = imports.ui.workspace;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+
 // testing settings for natural window placement strategy:
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
 const WINDOW_PLACEMENT_NATURAL_GAPS = 5;                            // half of the minimum gap between windows
@@ -202,10 +203,9 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
 
         // Work out scaling by getting the most top-left and most bottom-right window coords.
         let scale;
-        scale = Math.min(
-            areaRect.width / bounds.width,
-            areaRect.height / bounds.height,
-            1.0);
+        scale = Math.min(areaRect.width / bounds.width,
+                         areaRect.height / bounds.height,
+                         1.0);
 
         // Make bounding rect fill the screen size for later steps
         bounds.x = bounds.x - (areaRect.width - bounds.width * scale) / 2;

extensions/places-menu/extension.js

@@ -3,7 +3,6 @@
 
 const { Clutter, GObject, St } = imports.gi;
 
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -12,25 +11,25 @@ const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = x => x;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const PlaceDisplay = Me.imports.placeDisplay;
 
 const PLACE_ICON_SIZE = 16;
 
-var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(info) {
-        super._init();
+    constructor(info) {
+        super();
         this._info = info;
 
         this._icon = new St.Icon({
             gicon: info.icon,
             icon_size: PLACE_ICON_SIZE
         });
-        this.add_child(this._icon);
+        this.actor.add_child(this._icon);
 
         this._label = new St.Label({ text: info.name, x_expand: true });
-        this.add_child(this._label);
+        this.actor.add_child(this._label);
 
         if (info.isRemovable()) {
             this._ejectIcon = new St.Icon({
@@ -39,11 +38,11 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
             });
             this._ejectButton = new St.Button({ child: this._ejectIcon });
             this._ejectButton.connect('clicked', info.eject.bind(info));
-            this.add_child(this._ejectButton);
+            this.actor.add_child(this._ejectButton);
         }
 
         this._changedId = info.connect('changed',
-            this._propertiesChanged.bind(this));
+                                       this._propertiesChanged.bind(this));
     }
 
     destroy() {
@@ -65,7 +64,7 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._icon.gicon = info.icon;
         this._label.text = info.name;
     }
-});
+}
 
 const SECTIONS = [
     'special',
@@ -136,9 +135,9 @@ let _indicator;
 function enable() {
     _indicator = new PlacesMenu;
 
-    let pos = Main.sessionMode.panel.left.indexOf('appMenu');
+    let pos = 1;
     if ('apps-menu' in Main.panel.statusArea)
-        pos++;
+        pos = 2;
     Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }
 

extensions/places-menu/placeDisplay.js

@@ -71,21 +71,18 @@ class PlaceInfo {
     }
 
     getIcon() {
-        this.file.query_info_async('standard::symbolic-icon',
-            Gio.FileQueryInfoFlags.NONE,
-            0,
-            null,
-            (file, result) => {
-                try {
-                    let info = file.query_info_finish(result);
-                    this.icon = info.get_symbolic_icon();
-                    this.emit('changed');
-                } catch (e) {
-                    if (e instanceof Gio.IOErrorEnum)
-                        return;
-                    throw e;
-                }
-            });
+        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
+                                   (file, result) => {
+                                       try {
+                                           let info = file.query_info_finish(result);
+                                           this.icon = info.get_symbolic_icon();
+                                           this.emit('changed');
+                                       } catch (e) {
+                                           if (e instanceof Gio.IOErrorEnum)
+                                               return;
+                                           throw e;
+                                       }
+                                   });
 
         // return a generic icon for this kind for now, until we have the
         // icon from the query info above
@@ -155,7 +152,7 @@ class RootInfo extends PlaceInfo {
 
             this._proxy = obj;
             this._proxy.connect('g-properties-changed',
-                this._propertiesChanged.bind(this));
+                                this._propertiesChanged.bind(this));
             this._propertiesChanged(obj);
         });
     }
@@ -206,10 +203,10 @@ class PlaceDeviceInfo extends PlaceInfo {
 
         if (this._mount.can_eject())
             this._mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
+                                             this._ejectFinish.bind(this));
         else
             this._mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
+                                               this._unmountFinish.bind(this));
     }
 
     _ejectFinish(mount, result) {
@@ -278,8 +275,9 @@ var PlacesManager = class {
         };
 
         this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
-        this._showDesktopIconsChangedId = this._settings.connect(
-            'changed::show-desktop-icons', this._updateSpecials.bind(this));
+        this._showDesktopIconsChangedId =
+            this._settings.connect('changed::show-desktop-icons',
+                                   this._updateSpecials.bind(this));
         this._updateSpecials();
 
         /*
@@ -352,10 +350,9 @@ var PlacesManager = class {
 
         let homePath = GLib.get_home_dir();
 
-        this._places.special.push(new PlaceInfo(
-            'special',
-            Gio.File.new_for_path(homePath),
-            _('Home')));
+        this._places.special.push(new PlaceInfo('special',
+                                                Gio.File.new_for_path(homePath),
+                                                _('Home')));
 
         let specials = [];
         let dirs = DEFAULT_DIRECTORIES.slice();
@@ -397,11 +394,10 @@ var PlacesManager = class {
 
         /* Add standard places */
         this._places.devices.push(new RootInfo());
-        this._places.network.push(new PlaceInfo(
-            'network',
-            Gio.File.new_for_uri('network:///'),
-            _('Browse Network'),
-            'network-workgroup-symbolic'));
+        this._places.network.push(new PlaceInfo('network',
+                                                Gio.File.new_for_uri('network:///'),
+                                                _('Browse Network'),
+                                                'network-workgroup-symbolic'));
 
         /* first go through all connected drives */
         let drives = this._volumeMonitor.get_connected_drives();

extensions/screenshot-window-sizer/extension.js

@@ -21,10 +21,11 @@
 
 const { Meta, Shell, St } = imports.gi;
 
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
+const ExtensionUtils = imports.misc.extensionUtils;
+
 const MESSAGE_FADE_TIME = 2;
 
 let text;
@@ -46,9 +47,8 @@ function flashMessage(message) {
     text.opacity = 255;
 
     let monitor = Main.layoutManager.primaryMonitor;
-    text.set_position(
-        monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
-        monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
+    text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
+                      monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
 
     Tweener.addTween(text, {
         opacity: 0,
@@ -63,9 +63,7 @@ let SIZES = [
     [800, 450],
     [1024, 576],
     [1200, 675],
-    [1600, 900],
-    [360, 654], // Phone portrait maximized
-    [720, 360] // Phone landscape fullscreen
+    [1600, 900]
 ];
 
 function cycleScreenshotSizes(display, window, binding) {
@@ -137,18 +135,17 @@ function cycleScreenshotSizes(display, window, binding) {
 }
 
 function enable() {
-    Main.wm.addKeybinding(
-        'cycle-screenshot-sizes',
-        ExtensionUtils.getSettings(),
-        Meta.KeyBindingFlags.PER_WINDOW,
-        Shell.ActionMode.NORMAL,
-        cycleScreenshotSizes);
-    Main.wm.addKeybinding(
-        'cycle-screenshot-sizes-backward',
-        ExtensionUtils.getSettings(),
-        Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.IS_REVERSED,
-        Shell.ActionMode.NORMAL,
-        cycleScreenshotSizes);
+    Main.wm.addKeybinding('cycle-screenshot-sizes',
+                          ExtensionUtils.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
+    Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
+                          ExtensionUtils.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW |
+                          Meta.KeyBindingFlags.IS_REVERSED,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
 }
 
 function disable() {

extensions/user-theme/extension.js

@@ -3,12 +3,12 @@
 /* exported init */
 
 const { Gio, GLib } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 
 const SETTINGS_KEY = 'name';
 
+const ExtensionUtils = imports.misc.extensionUtils;
+
 class ThemeManager {
     constructor() {
         this._settings = ExtensionUtils.getSettings();

extensions/window-list/classic.css

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

extensions/window-list/extension.js

@@ -2,15 +2,12 @@
 const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
 
 const DND = imports.ui.dnd;
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
-const Overview = imports.ui.overview;
+const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Tweener = imports.ui.tweener;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
-const { WindowPicker, WindowPickerToggle } = Me.imports.windowPicker;
-const { WorkspaceIndicator } = Me.imports.workspaceIndicator;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -75,8 +72,9 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
         });
         this.addMenuItem(this._minimizeItem);
 
-        this._notifyMinimizedId = this._metaWindow.connect(
-            'notify::minimized', this._updateMinimizeItem.bind(this));
+        this._notifyMinimizedId =
+            this._metaWindow.connect('notify::minimized',
+                                     this._updateMinimizeItem.bind(this));
         this._updateMinimizeItem();
 
         this._maximizeItem = new PopupMenu.PopupMenuItem('');
@@ -88,12 +86,12 @@ 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._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'));
@@ -133,38 +131,40 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
     }
 }
 
-const WindowTitle = GObject.registerClass({
-    GTypeName: 'WindowListWindowTitle'
-}, class WindowTitle extends St.BoxLayout {
-    _init(metaWindow) {
+class WindowTitle {
+    constructor(metaWindow) {
         this._metaWindow = metaWindow;
-
-        super._init({
+        this.actor = new St.BoxLayout({
             style_class: 'window-button-box',
             x_expand: true,
             y_expand: true
         });
 
         this._icon = new St.Bin({ style_class: 'window-button-icon' });
-        this.add(this._icon);
+        this.actor.add(this._icon);
         this.label_actor = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
-        this.add(this.label_actor);
+        this.actor.add(this.label_actor);
 
         this._textureCache = St.TextureCache.get_default();
-        this._iconThemeChangedId = this._textureCache.connect(
-            'icon-theme-changed', this._updateIcon.bind(this));
-        this._notifyWmClass = this._metaWindow.connect_after(
-            'notify::wm-class', this._updateIcon.bind(this));
-        this._notifyAppId = this._metaWindow.connect_after(
-            'notify::gtk-application-id', this._updateIcon.bind(this));
+        this._iconThemeChangedId =
+            this._textureCache.connect('icon-theme-changed',
+                                       this._updateIcon.bind(this));
+        this._notifyWmClass =
+            this._metaWindow.connect_after('notify::wm-class',
+                                           this._updateIcon.bind(this));
+        this._notifyAppId =
+            this._metaWindow.connect_after('notify::gtk-application-id',
+                                           this._updateIcon.bind(this));
         this._updateIcon();
 
-        this.connect('destroy', this._onDestroy.bind(this));
+        this.actor.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._notifyTitleId =
+            this._metaWindow.connect('notify::title',
+                                     this._updateTitle.bind(this));
+        this._notifyMinimizedId =
+            this._metaWindow.connect('notify::minimized',
+                                     this._minimizedChanged.bind(this));
         this._minimizedChanged();
     }
 
@@ -201,60 +201,61 @@ const WindowTitle = GObject.registerClass({
         this._metaWindow.disconnect(this._notifyWmClass);
         this._metaWindow.disconnect(this._notifyAppId);
     }
-});
+}
 
 
-const BaseButton = GObject.registerClass({
-    GTypeName: 'WindowListBaseButton',
-    GTypeFlags: GObject.TypeFlags.ABSTRACT
-}, class BaseButton extends St.Button {
-    _init(perMonitor, monitorIndex) {
+class BaseButton {
+    constructor(perMonitor, monitorIndex) {
+        if (this.constructor === BaseButton)
+            throw new TypeError('Cannot instantiate abstract class BaseButton');
+
         this._perMonitor = perMonitor;
         this._monitorIndex = monitorIndex;
 
-        super._init({
+        this.actor = new St.Button({
             style_class: 'window-button',
             x_fill: true,
             y_fill: true,
             can_focus: true,
             button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE
         });
+        this.actor._delegate = this;
 
-        this.connect('allocation-changed',
-            this._updateIconGeometry.bind(this));
-        this.connect('clicked', this._onClicked.bind(this));
-        this.connect('destroy', this._onDestroy.bind(this));
-        this.connect('popup-menu', this._onPopupMenu.bind(this));
+        this.actor.connect('allocation-changed',
+                           this._updateIconGeometry.bind(this));
+        this.actor.connect('clicked', this._onClicked.bind(this));
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+        this.actor.connect('popup-menu', this._onPopupMenu.bind(this));
 
         this._contextMenuManager = new PopupMenu.PopupMenuManager(this);
 
-        this._switchWorkspaceId = global.window_manager.connect(
-            'switch-workspace', this._updateVisibility.bind(this));
+        this._switchWorkspaceId =
+            global.window_manager.connect('switch-workspace',
+                                          this._updateVisibility.bind(this));
 
         if (this._perMonitor) {
-            this._windowEnteredMonitorId = global.display.connect(
-                'window-entered-monitor',
-                this._windowEnteredOrLeftMonitor.bind(this));
-            this._windowLeftMonitorId = global.display.connect(
-                'window-left-monitor',
-                this._windowEnteredOrLeftMonitor.bind(this));
+            this._windowEnteredMonitorId =
+                global.display.connect('window-entered-monitor',
+                                       this._windowEnteredOrLeftMonitor.bind(this));
+            this._windowLeftMonitorId =
+                global.display.connect('window-left-monitor',
+                                       this._windowEnteredOrLeftMonitor.bind(this));
         }
     }
 
     get active() {
-        return this.has_style_class_name('focused');
+        return this.actor.has_style_class_name('focused');
     }
 
     activate() {
         if (this.active)
             return;
 
-        this._onClicked(this, 1);
+        this._onClicked(this.actor, 1);
     }
 
     _onClicked(_actor, _button) {
-        throw new GObject.NotImplementedError(
-            `_onClicked in ${this.constructor.name}`);
+        throw new Error('Not implemented');
     }
 
     _canOpenPopupMenu() {
@@ -268,20 +269,18 @@ const BaseButton = GObject.registerClass({
     }
 
     _isFocused() {
-        throw new GObject.NotImplementedError(
-            `_isFocused in ${this.constructor.name}`);
+        throw new Error('Not implemented');
     }
 
     _updateStyle() {
         if (this._isFocused())
-            this.add_style_class_name('focused');
+            this.actor.add_style_class_name('focused');
         else
-            this.remove_style_class_name('focused');
+            this.actor.remove_style_class_name('focused');
     }
 
     _windowEnteredOrLeftMonitor(_metaDisplay, _monitorIndex, _metaWindow) {
-        throw new GObject.NotImplementedError(
-            `_windowEnteredOrLeftMonitor in ${this.constructor.name}`);
+        throw new Error('Not implemented');
     }
 
     _isWindowVisible(window) {
@@ -293,22 +292,20 @@ const BaseButton = GObject.registerClass({
     }
 
     _updateVisibility() {
-        throw new GObject.NotImplementedError(
-            `_updateVisibility in ${this.constructor.name}`);
+        throw new Error('Not implemented');
     }
 
     _getIconGeometry() {
         let rect = new Meta.Rectangle();
 
-        [rect.x, rect.y] = this.get_transformed_position();
-        [rect.width, rect.height] = this.get_transformed_size();
+        [rect.x, rect.y] = this.actor.get_transformed_position();
+        [rect.width, rect.height] = this.actor.get_transformed_size();
 
         return rect;
     }
 
     _updateIconGeometry() {
-        throw new GObject.NotImplementedError(
-            `_updateIconGeometry in ${this.constructor.name}`);
+        throw new Error('Not implemented');
     }
 
     _onDestroy() {
@@ -322,33 +319,33 @@ const BaseButton = GObject.registerClass({
             global.display.disconnect(this._windowLeftMonitorId);
         this._windowLeftMonitorId = 0;
     }
-});
+}
 
 
-const WindowButton = GObject.registerClass({
-    GTypeName: 'WindowListWindowButton'
-}, class WindowButton extends BaseButton {
-    _init(metaWindow, perMonitor, monitorIndex) {
-        super._init(perMonitor, monitorIndex);
+class WindowButton extends BaseButton {
+    constructor(metaWindow, perMonitor, monitorIndex) {
+        super(perMonitor, monitorIndex);
 
         this.metaWindow = metaWindow;
         this._updateVisibility();
 
         this._windowTitle = new WindowTitle(this.metaWindow);
-        this.set_child(this._windowTitle);
-        this.label_actor = this._windowTitle.label_actor;
+        this.actor.set_child(this._windowTitle.actor);
+        this.actor.label_actor = this._windowTitle.label_actor;
 
-        this._contextMenu = new WindowContextMenu(this, this.metaWindow);
+        this._contextMenu = new WindowContextMenu(this.actor, this.metaWindow);
         this._contextMenu.connect('open-state-changed', _onMenuStateChanged);
         this._contextMenu.actor.hide();
         this._contextMenuManager.addMenu(this._contextMenu);
         Main.uiGroup.add_actor(this._contextMenu.actor);
 
-        this._workspaceChangedId = this.metaWindow.connect(
-            'workspace-changed', this._updateVisibility.bind(this));
+        this._workspaceChangedId =
+            this.metaWindow.connect('workspace-changed',
+                                    this._updateVisibility.bind(this));
 
-        this._notifyFocusId = global.display.connect(
-            'notify::focus-window', this._updateStyle.bind(this));
+        this._notifyFocusId =
+            global.display.connect('notify::focus-window',
+                                   this._updateStyle.bind(this));
         this._updateStyle();
     }
 
@@ -372,9 +369,9 @@ const WindowButton = GObject.registerClass({
         super._updateStyle();
 
         if (this.metaWindow.minimized)
-            this.add_style_class_name('minimized');
+            this.actor.add_style_class_name('minimized');
         else
-            this.remove_style_class_name('minimized');
+            this.actor.remove_style_class_name('minimized');
     }
 
     _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
@@ -383,7 +380,7 @@ const WindowButton = GObject.registerClass({
     }
 
     _updateVisibility() {
-        this.visible = this._isWindowVisible(this.metaWindow);
+        this.actor.visible = this._isWindowVisible(this.metaWindow);
     }
 
     _updateIconGeometry() {
@@ -396,14 +393,14 @@ const WindowButton = GObject.registerClass({
         global.display.disconnect(this._notifyFocusId);
         this._contextMenu.destroy();
     }
-});
+}
 
 
 class AppContextMenu extends PopupMenu.PopupMenu {
-    constructor(source) {
+    constructor(source, appButton) {
         super(source, 0.5, St.Side.BOTTOM);
 
-        this._appButton = source;
+        this._appButton = appButton;
 
         this._minimizeItem = new PopupMenu.PopupMenuItem(_('Minimize all'));
         this._minimizeItem.connect('activate', () => {
@@ -444,12 +441,12 @@ class AppContextMenu extends PopupMenu.PopupMenu {
 
     open(animate) {
         let windows = this._appButton.getWindowList();
-        this._minimizeItem.visible = windows.some(w => !w.minimized);
-        this._unminimizeItem.visible = windows.some(w => w.minimized);
-        this._maximizeItem.visible = windows.some(w => {
+        this._minimizeItem.actor.visible = windows.some(w => !w.minimized);
+        this._unminimizeItem.actor.visible = windows.some(w => w.minimized);
+        this._maximizeItem.actor.visible = windows.some(w => {
             return w.get_maximized() != Meta.MaximizeFlags.BOTH;
         });
-        this._unmaximizeItem.visible = windows.some(w => {
+        this._unmaximizeItem.actor.visible = windows.some(w => {
             return w.get_maximized() == Meta.MaximizeFlags.BOTH;
         });
 
@@ -457,17 +454,15 @@ class AppContextMenu extends PopupMenu.PopupMenu {
     }
 }
 
-const AppButton = GObject.registerClass({
-    GTypeName: 'WindowListAppButton',
-}, class AppButton extends BaseButton {
-    _init(app, perMonitor, monitorIndex) {
-        super._init(perMonitor, monitorIndex);
+class AppButton extends BaseButton {
+    constructor(app, perMonitor, monitorIndex) {
+        super(perMonitor, monitorIndex);
 
         this.app = app;
         this._updateVisibility();
 
         let stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-        this.set_child(stack);
+        this.actor.set_child(stack);
 
         this._singleWindowTitle = new St.Bin({
             x_expand: true,
@@ -496,14 +491,14 @@ const AppButton = GObject.registerClass({
         this._multiWindowTitle.label_actor = label;
 
         this._menuManager = new PopupMenu.PopupMenuManager(this);
-        this._menu = new PopupMenu.PopupMenu(this, 0.5, St.Side.BOTTOM);
+        this._menu = new PopupMenu.PopupMenu(this.actor, 0.5, St.Side.BOTTOM);
         this._menu.connect('open-state-changed', _onMenuStateChanged);
         this._menu.actor.hide();
         this._menu.connect('activate', this._onMenuActivate.bind(this));
         this._menuManager.addMenu(this._menu);
         Main.uiGroup.add_actor(this._menu.actor);
 
-        this._appContextMenu = new AppContextMenu(this);
+        this._appContextMenu = new AppContextMenu(this.actor, this);
         this._appContextMenu.connect('open-state-changed', _onMenuStateChanged);
         this._appContextMenu.actor.hide();
         Main.uiGroup.add_actor(this._appContextMenu.actor);
@@ -514,13 +509,15 @@ const AppButton = GObject.registerClass({
                 this._icon.child = app.create_icon_texture(ICON_TEXTURE_SIZE);
             });
 
-        this._windowsChangedId = this.app.connect(
-            'windows-changed', this._windowsChanged.bind(this));
+        this._windowsChangedId =
+            this.app.connect('windows-changed',
+                             this._windowsChanged.bind(this));
         this._windowsChanged();
 
         this._windowTracker = Shell.WindowTracker.get_default();
-        this._notifyFocusId = this._windowTracker.connect(
-            'notify::focus-app', this._updateStyle.bind(this));
+        this._notifyFocusId =
+            this._windowTracker.connect('notify::focus-app',
+                                        this._updateStyle.bind(this));
         this._updateStyle();
     }
 
@@ -536,9 +533,9 @@ const AppButton = GObject.registerClass({
         if (!this._perMonitor) {
             // fast path: use ShellApp API to avoid iterating over all windows.
             let workspace = global.workspace_manager.get_active_workspace();
-            this.visible = this.app.is_on_workspace(workspace);
+            this.actor.visible = this.app.is_on_workspace(workspace);
         } else {
-            this.visible = this.getWindowList().length >= 1;
+            this.actor.visible = this.getWindowList().length >= 1;
         }
     }
 
@@ -566,17 +563,17 @@ const AppButton = GObject.registerClass({
             if (!this._windowTitle) {
                 this.metaWindow = windows[0];
                 this._windowTitle = new WindowTitle(this.metaWindow);
-                this._singleWindowTitle.child = this._windowTitle;
-                this._windowContextMenu = new WindowContextMenu(this, this.metaWindow);
-                this._windowContextMenu.connect(
-                    'open-state-changed', _onMenuStateChanged);
+                this._singleWindowTitle.child = this._windowTitle.actor;
+                this._windowContextMenu = new WindowContextMenu(this.actor, this.metaWindow);
+                this._windowContextMenu.connect('open-state-changed',
+                                                _onMenuStateChanged);
                 Main.uiGroup.add_actor(this._windowContextMenu.actor);
                 this._windowContextMenu.actor.hide();
                 this._contextMenuManager.addMenu(this._windowContextMenu);
             }
             this._contextMenuManager.removeMenu(this._appContextMenu);
             this._contextMenu = this._windowContextMenu;
-            this.label_actor = this._windowTitle.label_actor;
+            this.actor.label_actor = this._windowTitle.label_actor;
         } else {
             if (this._windowTitle) {
                 this.metaWindow = null;
@@ -587,7 +584,7 @@ const AppButton = GObject.registerClass({
             }
             this._contextMenu = this._appContextMenu;
             this._contextMenuManager.addMenu(this._appContextMenu);
-            this.label_actor = this._multiWindowTitle.label_actor;
+            this.actor.label_actor = this._multiWindowTitle.label_actor;
         }
 
     }
@@ -616,7 +613,7 @@ const AppButton = GObject.registerClass({
                 for (let i = 0; i < windows.length; i++) {
                     let windowTitle = new WindowTitle(windows[i]);
                     let item = new PopupMenu.PopupBaseMenuItem();
-                    item.add_actor(windowTitle);
+                    item.actor.add_actor(windowTitle.actor);
                     item._window = windows[i];
                     this._menu.addMenuItem(item);
                 }
@@ -644,33 +641,151 @@ const AppButton = GObject.registerClass({
         this.app.disconnect(this._windowsChangedId);
         this._menu.destroy();
     }
+}
+
+
+let WorkspaceIndicator = GObject.registerClass(
+class WorkspaceIndicator extends PanelMenu.Button {
+    _init() {
+        super._init(0.0, _('Workspace Indicator'), true);
+        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
+        this.add_style_class_name('window-list-workspace-indicator');
+        this.menu.actor.remove_style_class_name('panel-menu');
+
+        let container = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            x_expand: true,
+            y_expand: true
+        });
+        this.add_actor(container);
+
+        let workspaceManager = global.workspace_manager;
+
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this.statusLabel = new St.Label({
+            text: this._getStatusText(),
+            x_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
+        });
+        container.add_actor(this.statusLabel);
+
+        this.workspacesItems = [];
+
+        this._workspaceManagerSignals = [];
+        this._workspaceManagerSignals.push(workspaceManager.connect('notify::n-workspaces',
+                                                                    this._updateMenu.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
+                                                                          this._updateIndicator.bind(this)));
+
+        this.connect('scroll-event', this._onScrollEvent.bind(this));
+        this._updateMenu();
+
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
+        this._settingsChangedId =
+            this._settings.connect('changed::workspace-names',
+                                   this._updateMenu.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();
+    }
+
+    _updateIndicator() {
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+
+        this.statusLabel.set_text(this._getStatusText());
+    }
+
+    _getStatusText() {
+        let workspaceManager = global.workspace_manager;
+        let current = workspaceManager.get_active_workspace().index();
+        let total = workspaceManager.n_workspaces;
+
+        return '%d / %d'.format(current + 1, total);
+    }
+
+    _updateMenu() {
+        let workspaceManager = global.workspace_manager;
+
+        this.menu.removeAll();
+        this.workspacesItems = [];
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
+            let name = Meta.prefs_get_workspace_name(i);
+            let item = new PopupMenu.PopupMenuItem(name);
+            item.workspaceId = i;
+
+            item.connect('activate', (item, _event) => {
+                this._activate(item.workspaceId);
+            });
+
+            if (i == this._currentWorkspace)
+                item.setOrnament(PopupMenu.Ornament.DOT);
+
+            this.menu.addMenuItem(item);
+            this.workspacesItems[i] = item;
+        }
+
+        this.statusLabel.set_text(this._getStatusText());
+    }
+
+    _activate(index) {
+        let workspaceManager = global.workspace_manager;
+
+        if (index >= 0 && index < workspaceManager.n_workspaces) {
+            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
+            metaWorkspace.activate(global.get_current_time());
+        }
+    }
+
+    _onScrollEvent(actor, event) {
+        let direction = event.get_scroll_direction();
+        let diff = 0;
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            diff = 1;
+        } else if (direction == Clutter.ScrollDirection.UP) {
+            diff = -1;
+        } else {
+            return;
+        }
+
+        let newIndex = this._currentWorkspace + diff;
+        this._activate(newIndex);
+    }
+
+    _allocate(actor, box, flags) {
+        if (actor.get_n_children() > 0)
+            actor.get_first_child().allocate(box, flags);
+    }
 });
 
-
-const WindowList = GObject.registerClass({
-    GTypeName: 'WindowListWindowList',
-}, class WindowList extends St.Widget {
-    _init(perMonitor, monitor) {
+class WindowList {
+    constructor(perMonitor, monitor) {
         this._perMonitor = perMonitor;
         this._monitor = monitor;
 
-        super._init({
+        this.actor = new St.Widget({
             name: 'panel',
             style_class: 'bottom-panel solid',
             reactive: true,
             track_hover: true,
             layout_manager: new Clutter.BinLayout()
         });
-        this.connect('destroy', this._onDestroy.bind(this));
+        this.actor.connect('destroy', this._onDestroy.bind(this));
 
         let box = new St.BoxLayout({ x_expand: true, y_expand: true });
-        this.add_actor(box);
-
-        let toggle = new WindowPickerToggle();
-        box.add_actor(toggle);
-
-        toggle.connect('notify::checked',
-            this._updateWindowListVisibility.bind(this));
+        this.actor.add_actor(box);
 
         let layout = new Clutter.BoxLayout({ homogeneous: true });
         this._windowList = new St.Widget({
@@ -697,77 +812,82 @@ const WindowList = GObject.registerClass({
         indicatorsBox.add(this._workspaceIndicator.container, { expand: false, y_fill: true });
 
         this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
-        this._workspacesOnlyOnPrimaryChangedId = this._mutterSettings.connect(
-            'changed::workspaces-only-on-primary',
-            this._updateWorkspaceIndicatorVisibility.bind(this));
-        this._dynamicWorkspacesChangedId = this._mutterSettings.connect(
-            'changed::dynamic-workspaces',
-            this._updateWorkspaceIndicatorVisibility.bind(this));
+        this._workspacesOnlyOnPrimaryChangedId =
+            this._mutterSettings.connect('changed::workspaces-only-on-primary',
+                                         this._updateWorkspaceIndicatorVisibility.bind(this));
+        this._dynamicWorkspacesChangedId =
+            this._mutterSettings.connect('changed::dynamic-workspaces',
+                                         this._updateWorkspaceIndicatorVisibility.bind(this));
         this._updateWorkspaceIndicatorVisibility();
 
         this._menuManager = new PopupMenu.PopupMenuManager(this);
         this._menuManager.addMenu(this._workspaceIndicator.menu);
 
-        Main.layoutManager.addChrome(this, {
+        Main.layoutManager.addChrome(this.actor, {
             affectsStruts: true,
             trackFullscreen: true
         });
-        Main.uiGroup.set_child_above_sibling(this, Main.layoutManager.panelBox);
-        Main.ctrlAltTabManager.addGroup(this, _('Window List'), 'start-here-symbolic');
+        Main.uiGroup.set_child_above_sibling(this.actor, Main.layoutManager.panelBox);
+        Main.ctrlAltTabManager.addGroup(this.actor, _('Window List'), 'start-here-symbolic');
 
-        this.width = this._monitor.width;
-        this.connect('notify::height', this._updatePosition.bind(this));
+        this.actor.width = this._monitor.width;
+        this.actor.connect('notify::height', this._updatePosition.bind(this));
         this._updatePosition();
 
         this._appSystem = Shell.AppSystem.get_default();
-        this._appStateChangedId = this._appSystem.connect(
-            'app-state-changed', this._onAppStateChanged.bind(this));
+        this._appStateChangedId =
+            this._appSystem.connect('app-state-changed',
+                                    this._onAppStateChanged.bind(this));
 
-        this._keyboardVisiblechangedId = Main.layoutManager.connect(
-            'keyboard-visible-changed',
-            (o, state) => {
-                Main.layoutManager.keyboardBox.visible = state;
-                let keyboardBox = Main.layoutManager.keyboardBox;
-                keyboardBox.visible = state;
-                if (state) {
-                    Main.uiGroup.set_child_above_sibling(
-                        this, keyboardBox);
-                } else {
-                    Main.uiGroup.set_child_above_sibling(
-                        this, Main.layoutManager.panelBox);
-                }
-                this._updateKeyboardAnchor();
-            });
+        this._keyboardVisiblechangedId =
+            Main.layoutManager.connect('keyboard-visible-changed',
+                (o, state) => {
+                    Main.layoutManager.keyboardBox.visible = state;
+                    let keyboardBox = Main.layoutManager.keyboardBox;
+                    keyboardBox.visible = state;
+                    if (state)
+                        Main.uiGroup.set_child_above_sibling(this.actor, keyboardBox);
+                    else
+                        Main.uiGroup.set_child_above_sibling(this.actor,
+                                                             Main.layoutManager.panelBox);
+                    this._updateKeyboardAnchor();
+                });
 
         let workspaceManager = global.workspace_manager;
 
         this._workspaceSignals = new Map();
-        this._nWorkspacesChangedId = workspaceManager.connect(
-            'notify::n-workspaces', this._onWorkspacesChanged.bind(this));
+        this._nWorkspacesChangedId =
+            workspaceManager.connect('notify::n-workspaces',
+                                     this._onWorkspacesChanged.bind(this));
         this._onWorkspacesChanged();
 
-        this._switchWorkspaceId = global.window_manager.connect(
-            'switch-workspace', this._checkGrouping.bind(this));
+        this._switchWorkspaceId =
+            global.window_manager.connect('switch-workspace',
+                                          this._checkGrouping.bind(this));
 
-        this._overviewShowingId = Main.overview.connect('showing', () => {
-            this.hide();
-            this._updateKeyboardAnchor();
-        });
+        this._overviewShowingId =
+            Main.overview.connect('showing', () => {
+                this.actor.hide();
+                this._updateKeyboardAnchor();
+            });
 
-        this._overviewHidingId = Main.overview.connect('hiding', () => {
-            this.visible = !Main.layoutManager.primaryMonitor.inFullscreen;
-            this._updateKeyboardAnchor();
-        });
+        this._overviewHidingId =
+            Main.overview.connect('hiding', () => {
+                this.actor.visible = !Main.layoutManager.primaryMonitor.inFullscreen;
+                this._updateKeyboardAnchor();
+            });
 
         this._fullscreenChangedId =
             global.display.connect('in-fullscreen-changed', () => {
                 this._updateKeyboardAnchor();
             });
 
-        this._dragBeginId = Main.xdndHandler.connect('drag-begin',
-            this._onDragBegin.bind(this));
-        this._dragEndId = Main.xdndHandler.connect('drag-end',
-            this._onDragEnd.bind(this));
+        this._dragBeginId =
+            Main.xdndHandler.connect('drag-begin',
+                                     this._onDragBegin.bind(this));
+        this._dragEndId =
+            Main.xdndHandler.connect('drag-end',
+                                     this._onDragEnd.bind(this));
         this._dragMonitor = {
             dragMotion: this._onDragMotion.bind(this)
         };
@@ -776,8 +896,9 @@ const WindowList = GObject.registerClass({
         this._dndWindow = null;
 
         this._settings = ExtensionUtils.getSettings();
-        this._groupingModeChangedId = this._settings.connect(
-            'changed::grouping-mode', this._groupingModeChanged.bind(this));
+        this._groupingModeChangedId =
+            this._settings.connect('changed::grouping-mode',
+                                   this._groupingModeChanged.bind(this));
         this._grouped = undefined;
         this._groupingModeChanged();
     }
@@ -793,16 +914,16 @@ const WindowList = GObject.registerClass({
             return;
 
         let children = this._windowList.get_children()
-            .filter(c => c.visible);
+            .filter(c => c.visible)
+            .map(a => a._delegate);
         let active = children.findIndex(c => c.active);
         let newActive = Math.max(0, Math.min(active + diff, children.length - 1));
         children[newActive].activate();
     }
 
     _updatePosition() {
-        this.set_position(
-            this._monitor.x,
-            this._monitor.y + this._monitor.height - this.height);
+        this.actor.set_position(this._monitor.x,
+                                this._monitor.y + this._monitor.height - this.actor.height);
     }
 
     _updateWorkspaceIndicatorVisibility() {
@@ -812,20 +933,7 @@ const WindowList = GObject.registerClass({
         let workspacesOnMonitor = this._monitor == Main.layoutManager.primaryMonitor ||
                                   !this._mutterSettings.get_boolean('workspaces-only-on-primary');
 
-        this._workspaceIndicator.visible = hasWorkspaces && workspacesOnMonitor;
-    }
-
-    _updateWindowListVisibility() {
-        let visible = !Main.windowPicker.visible;
-
-        Tweener.addTween(this._windowList, {
-            opacity: visible ? 255 : 0,
-            transition: 'ease-out-quad',
-            time: Overview.ANIMATION_TIME
-        });
-
-        this._windowList.reactive = visible;
-        this._windowList.get_children().forEach(c => c.reactive = visible);
+        this._workspaceIndicator.actor.visible = hasWorkspaces && workspacesOnMonitor;
     }
 
     _getPreferredUngroupedWindowListWidth() {
@@ -848,8 +956,8 @@ const WindowList = GObject.registerClass({
     }
 
     _getMaxWindowListWidth() {
-        let indicatorsBox = this._workspaceIndicator.get_parent();
-        return this.width - indicatorsBox.get_preferred_width(-1)[1];
+        let indicatorsBox = this._workspaceIndicator.actor.get_parent();
+        return this.actor.width - indicatorsBox.get_preferred_width(-1)[1];
     }
 
     _groupingModeChanged() {
@@ -901,8 +1009,8 @@ const WindowList = GObject.registerClass({
         if (!Main.keyboard.actor)
             return;
 
-        let translationY = Main.overview.visible ? 0 : this.height;
-        Main.keyboard.actor.translation_y = -translationY;
+        let anchorY = Main.overview.visible ? 0 : this.actor.height;
+        Main.keyboard.actor.anchor_y = anchorY;
     }
 
     _onAppStateChanged(appSys, app) {
@@ -917,15 +1025,15 @@ const WindowList = GObject.registerClass({
 
     _addApp(app) {
         let button = new AppButton(app, this._perMonitor, this._monitor.index);
-        this._windowList.layout_manager.pack(button,
-            true, true, true,
-            Clutter.BoxAlignment.START,
-            Clutter.BoxAlignment.START);
+        this._windowList.layout_manager.pack(button.actor,
+                                             true, true, true,
+                                             Clutter.BoxAlignment.START,
+                                             Clutter.BoxAlignment.START);
     }
 
     _removeApp(app) {
         let children = this._windowList.get_children();
-        let child = children.find(c => c.app == app);
+        let child = children.find(c => c._delegate.app == app);
         if (child)
             child.destroy();
     }
@@ -941,14 +1049,14 @@ const WindowList = GObject.registerClass({
             return;
 
         let children = this._windowList.get_children();
-        if (children.find(c => c.metaWindow == win))
+        if (children.find(c => c._delegate.metaWindow == win))
             return;
 
         let button = new WindowButton(win, this._perMonitor, this._monitor.index);
-        this._windowList.layout_manager.pack(button,
-            true, true, true,
-            Clutter.BoxAlignment.START,
-            Clutter.BoxAlignment.START);
+        this._windowList.layout_manager.pack(button.actor,
+                                             true, true, true,
+                                             Clutter.BoxAlignment.START,
+                                             Clutter.BoxAlignment.START);
     }
 
     _onWindowRemoved(ws, win) {
@@ -962,7 +1070,7 @@ const WindowList = GObject.registerClass({
             return; // not actually removed, just moved to another workspace
 
         let children = this._windowList.get_children();
-        let child = children.find(c => c.metaWindow == win);
+        let child = children.find(c => c._delegate.metaWindow == win);
         if (child)
             child.destroy();
     }
@@ -977,10 +1085,12 @@ const WindowList = GObject.registerClass({
                 continue;
 
             let signals = { windowAddedId: 0, windowRemovedId: 0 };
-            signals._windowAddedId = workspace.connect_after(
-                'window-added', this._onWindowAdded.bind(this));
-            signals._windowRemovedId = workspace.connect(
-                'window-removed', this._onWindowRemoved.bind(this));
+            signals._windowAddedId =
+                workspace.connect_after('window-added',
+                                        this._onWindowAdded.bind(this));
+            signals._windowRemovedId =
+                workspace.connect('window-removed',
+                                  this._onWindowRemoved.bind(this));
             this._workspaceSignals.set(workspace, signals);
         }
 
@@ -1011,12 +1121,15 @@ const WindowList = GObject.registerClass({
 
     _onDragMotion(dragEvent) {
         if (Main.overview.visible ||
-            !this.contains(dragEvent.targetActor)) {
+            !this.actor.contains(dragEvent.targetActor)) {
             this._removeActivateTimeout();
             return DND.DragMotionResult.CONTINUE;
         }
 
-        let hoveredWindow = dragEvent.targetActor.metaWindow;
+        let hoveredWindow = null;
+        if (dragEvent.targetActor._delegate)
+            hoveredWindow = dragEvent.targetActor._delegate.metaWindow;
+
         if (!hoveredWindow ||
             this._dndWindow == hoveredWindow)
             return DND.DragMotionResult.CONTINUE;
@@ -1025,7 +1138,8 @@ const WindowList = GObject.registerClass({
 
         this._dndWindow = hoveredWindow;
         this._dndTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-            DND_ACTIVATE_TIMEOUT, this._activateWindow.bind(this));
+                                              DND_ACTIVATE_TIMEOUT,
+                                              this._activateWindow.bind(this));
 
         return DND.DragMotionResult.CONTINUE;
     }
@@ -1041,7 +1155,7 @@ const WindowList = GObject.registerClass({
         let [x, y] = global.get_pointer();
         let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
 
-        if (this._dndWindow && this.contains(pickedActor))
+        if (this._dndWindow && this.actor.contains(pickedActor))
             this._dndWindow.activate(global.get_current_time());
         this._dndWindow = null;
         this._dndTimeoutId = 0;
@@ -1055,7 +1169,7 @@ const WindowList = GObject.registerClass({
 
         this._workspaceIndicator.destroy();
 
-        Main.ctrlAltTabManager.removeGroup(this);
+        Main.ctrlAltTabManager.removeGroup(this.actor);
 
         this._appSystem.disconnect(this._appStateChangedId);
         this._appStateChangedId = 0;
@@ -1087,36 +1201,31 @@ const WindowList = GObject.registerClass({
         for (let i = 0; i < windows.length; i++)
             windows[i].metaWindow.set_icon_geometry(null);
     }
-});
+}
 
 class Extension {
     constructor() {
         this._windowLists = null;
-        this._hideOverviewOrig = Main.overview.hide;
+        this._injections = {};
     }
 
     enable() {
         this._windowLists = [];
 
         this._settings = ExtensionUtils.getSettings();
-        this._showOnAllMonitorsChangedId = this._settings.connect(
-            'changed::show-on-all-monitors', this._buildWindowLists.bind(this));
+        this._showOnAllMonitorsChangedId =
+            this._settings.connect('changed::show-on-all-monitors',
+                                   this._buildWindowLists.bind(this));
 
-        this._monitorsChangedId = Main.layoutManager.connect(
-            'monitors-changed', this._buildWindowLists.bind(this));
-
-        Main.windowPicker = new WindowPicker();
-
-        Main.overview.hide = () => {
-            Main.windowPicker.close();
-            this._hideOverviewOrig.call(Main.overview);
-        };
+        this._monitorsChangedId =
+            Main.layoutManager.connect('monitors-changed',
+                                       this._buildWindowLists.bind(this));
 
         this._buildWindowLists();
     }
 
     _buildWindowLists() {
-        this._windowLists.forEach(list => list.destroy());
+        this._windowLists.forEach(list => list.actor.destroy());
         this._windowLists = [];
 
         let showOnAllMonitors = this._settings.get_boolean('show-on-all-monitors');
@@ -1138,19 +1247,14 @@ class Extension {
         this._monitorsChangedId = 0;
 
         this._windowLists.forEach(windowList => {
-            windowList.hide();
-            windowList.destroy();
+            windowList.actor.hide();
+            windowList.actor.destroy();
         });
         this._windowLists = null;
-
-        Main.windowPicker.destroy();
-        delete Main.windowPicker;
-
-        Main.overview.hide = this._hideOverviewOrig;
     }
 
     someWindowListContains(actor) {
-        return this._windowLists.some(list => list.contains(actor));
+        return this._windowLists.some(list => list.actor.contains(actor));
     }
 }
 

extensions/window-list/meson.build

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

extensions/window-list/stylesheet.css

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

extensions/window-list/windowPicker.js

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

extensions/window-list/workspaceIndicator.js

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

extensions/windowsNavigator/extension.js

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

extensions/workspace-indicator/extension.js

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

extensions/workspace-indicator/stylesheet.css

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

lint/eslintrc-legacy.json

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

lint/eslintrc-shell.json

@@ -4,7 +4,7 @@
             "error",
             {
                 "properties": "never",
-                "allow": ["^vfunc_", "^on_"]
+                "allow": ["^vfunc_"]
             }
         ],
         "no-unused-vars": [
@@ -21,6 +21,10 @@
         "prefer-arrow-callback": "error"
     },
     "globals": {
-        "global": false
+        "global": false,
+        "_": false,
+        "C_": false,
+        "N_": false,
+        "ngettext": false
     }
 }

lint/generate-report.sh

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

meson.build

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

po/LINGUAS

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

po/POTFILES.in

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

po/mjw.po

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