theme: Standardise text styles

Initial attempt to use standard text styles, in line with what's
being done for GTK (https://gitlab.gnome.org/GNOME/gtk/issues/1808).

This is just changing the sizes and weights for now. Spacing
adjustments will be required further down the line.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/594

.gitignore

@@ -80,3 +80,4 @@ tests/run-test.sh
 *~
 *.patch
 *.sw?
+.vscode

.gitlab-ci.yml

@@ -15,10 +15,10 @@ variables:
         - merge_requests
 
 check_commit_log:
-    image: registry.fedoraproject.org/fedora:latest
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: review
-    before_script:
+    variables:
-        - dnf install -y git
+        GIT_DEPTH: "100"
     script:
         - ./.gitlab-ci/check-commit-log.sh
     only:
@@ -40,7 +40,7 @@ js_check:
         when: on_failure
 
 build:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: build
     before_script:
         - .gitlab-ci/checkout-mutter.sh
@@ -58,7 +58,7 @@ build:
             - build
 
 test:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: test
     before_script:
         - ninja -C mutter/build install
@@ -72,7 +72,7 @@ test:
         when: on_failure
 
 test-pot:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
     stage: test
     before_script:
         - ninja -C mutter/build install

.gitlab-ci/Dockerfile

@@ -1,19 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/mutter/master:v1
-
-RUN dnf -y update && dnf -y upgrade && \
-    dnf install -y 'dnf-command(copr)' && \
-    dnf copr enable -y fmuellner/gnome-shell-ci && \
-    dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \
-
-    # bt only exports HAVE_BLUETOOTH to js, rest are outdated build-requires
-    dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel \
-                  upower-devel python3-devel && \
-
-    # We'll build mutter ourselves
-    dnf remove -y --noautoremove mutter mutter-devel && \
-
-    # Needed for tests
-    dnf install -y '*/xvfb-run' gdm-lib accountsservice-libs && \
-
-    dnf clean all && \
-    rm -rf /var/cache/dnf

.gitlab-ci/checkout-mutter.sh

@@ -17,15 +17,19 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
   merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
 
   echo Looking for $merge_request_branch on remote ...
-  if git fetch $merge_request_remote $merge_request_branch >/dev/null 2>&1; then
+  if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
     mutter_target=FETCH_HEAD
+  else
+    mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+    echo Using $mutter_target instead
   fi
 fi
 
 if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l $shell_branch)
+  mutter_target=$(git branch -r -l origin/$shell_branch)
+  mutter_target=${mutter_target:-$(git branch -r -l ${shell_branch#remotes/})}
   mutter_target=${mutter_target:-origin/master}
   echo Using $mutter_target instead
 fi
 
-git checkout $mutter_target
+git checkout -q $mutter_target

NEWS

@@ -1,3 +1,107 @@
+3.33.3
+======
+* Prepare for optional X11 [Carlos; !378]
+* Fix opening window menu [Marco; !557]
+* Reload search providers when installed applications change [Cosimo; !562]
+* Implement locate-pointer accessibility feature [Olivier; #981]
+* Allow to disable window menus via session mode [Cosimo; !569]
+* Implement mouse accessibility [Olivier; !474]
+* Call GDM's RegisterSession() after startup [Iain; !570]
+* Fix extended keys popups being hidden by on-screen keyboard [Marco; !583]
+* Fix top bar being hidden by lock screen [Jonas; !571]
+* Update theme to better match GTK's Adwaita [Frederik; #841]
+* Set up GJS profiler when GJS_TRACE_FD is set [Christian; !573]
+* Misc. bug fixes and cleanups [Jonas, Cosimo, Robert, Florian, Marco, Simon,
+  Laurent, Niels, Will; !551, !555, !464, #1333, !565, !572, !568, !558, #1205,
+  #1336, !579, !576, #1392, !582, !586, #1406, #1351]
+
+Contributors:
+  Laurent Bigonville, Cosimo Cecchi, Piotr Drąg, Jonas Dreßler,
+  Frederik Feichtmeier, Olivier Fourdan, Carlos Garnacho, Niels De Graef,
+  Christian Hergert, Iain Lane, Robert Mader, Florian Müllner, Simon Schampijer,
+  Jakub Steiner, Will Thompson, Marco Trevisan (Treviño)
+
+Translators:
+  Kukuh Syafaat [id], Balázs Meskó [hu], Daniel Mustieles [es],
+  Fabio Tomat [fur], Nathan Follens [nl], Goran Vidović [hr], Jordi Mas [ca]
+
+3.33.2
+======
+* Fix keeping actors visible in scrollviews [Marco; #1061]
+* Move some chrome above popup windows [Jonas D.; !358]
+* Include 'sandboxed-app-id' in winodw introspection info [Florian; #1289]
+* Port to libecal-2.0 [Milan; !501]
+* Support TCRYPT in mount password dialog [segfault; !126]
+* Misc. bug fixes and cleanups [Florian, Marco, Veerasamy; !517, #745, !499,
+  !510, !515, !546, !549]
+
+Contributors:
+  Cosimo Cecchi, Milan Crha, Jonas Dreßler, Florian Müllner, segfault,
+  Veerasamy Sevagen, Marco Trevisan (Treviño)
+
+Translators:
+  Daniel Mustieles [es]
+
+3.33.1
+======
+* Refine the app menu [Florian; #968]
+* Refine window preview style [Feichtmeier; !461]
+* Only emit ::style-changed on actual changes [Carlos; #1153]
+* Disable emoji on-screen keyboard support on X11 [Florian; #1172]
+* Fix tablet button mapping overlay [Carlos; #1220]
+* Don't crash for world clock locations with no timezone [Florian; #1062]
+* Don't leak old on-screen keyboard layout groups [Carlos; mutter#556]
+* Fix ellipsization in dialog subtitles/bodies [Marco; !531]
+* Fix glitch of fullscreen window in workspace switch animation [Jonas D.; !322]
+* Fix distortion of some image contents [Florian; !525]
+* Allow dragging unfocused tiled/maximized windows from top bar [Dylan; #679290]
+* Handle network interface name changes [Fabrice; !534]
+* Avoid unnecessary style changes when computing :first/:last-child
+  [Florian; !529]
+* Misc. bug fixes and cleanups [Florian, Marco, Robert, Georges, Carlos, Simon,
+  Jonas D.; !487, !441, !502, !503, !504, !506, #822, !551, !512, !509, !511,
+  #1054, !524, #1065, !331, !540]
+
+Contributors:
+  Fabrice Bellet, Jonas Dreßler, Feichtmeier, Carlos Garnacho, Robert Mader,
+  Dylan McCall, Simon McVittie, Florian Müllner, Georges Basile Stavracas Neto,
+  Marco Trevisan (Treviño)
+
+Translators:
+  Daniel Mustieles [es], Kukuh Syafaat [id], Fabio Tomat [fur],
+  Carmen Bianca BAKKER [eo], Dingzhong Chen [zh_CN], Tim Sabsch [de]
+
+3.32.1
+======
+* Fix avatar scaling on login screen [Florian; #1024]
+* Fix distortion of desktop zoom [Florian; #646]
+* Fix mouse cursor visibility when using desktop zoom [Florian, Marco; #1020]
+* Fix screen dimming after wake-up on lock screen [Xiaoguang; #900]
+* Fix Alt+Esc switcher [Florian; #1064]
+* Respect struts for popover placement [Andrea; #1102]
+* Fix app icons updates after theme changes [Florian; #1117]
+* Fix desktop zoom after resolution changes [Marco; #1120]
+* Implement stick-to-finger workspace switch overview gestures [Florian; #516]
+* Make World Clocks offsets relative to local time [Florian; #1157]
+* Fix top app icon disappearing from dash [Florian; #1053]
+* Update switch style to match new Adwaita [Jakub; !496]
+* Ensure CSS units are pixel-aligned when scaling is used [Carlos; #91]
+* Misc. bug fixes and cleanups [Florian, Jakub, Robert, Alex, Carlos, Phil,
+  Marco, Benjamin, AsciiWolf, Ray, verdre; !444, #1016, #1018, !449, #1036,
+  !455, #1094, !440, #1023, #624, #1017, !476, !473, !480, #1130, !485, !481,
+  !490, !489, #1151, !435, #1160, !482, #1150, #1166, !384]
+
+Contributors:
+  AsciiWolf, Andrea Azzarone, Benjamin Berg, Carlos Garnacho, Victor Ibragimov,
+  Robert Mader, Alex Monday, Florian Müllner, Jakub Steiner, Ray Strode,
+  Marco Trevisan (Treviño), verdre, Xiaoguang Wang, Phil Wyett
+
+Translators:
+  Victor Ibragimov [tg, af, et, ja], Bruce Cowan [en_GB], Piotr Drąg [tg],
+  Charles Monzat [fr], Khaled Hosny [ar], Goran Vidović [hr],
+  Cheng-Chia Tseng [zh_TW], Carmen Bianca BAKKER [eo], Daniel Mustieles [es],
+  Dušan Kazik [sk]
+
 3.32.0
 ======
 * Fix sizing issues in on-screen-keyboard emoji panel [Carlos; !439]

data/dbus-interfaces/org.gnome.Shell.xml

@@ -9,9 +9,6 @@
     <method name="ShowOSD">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
-    <method name="ShowMonitorLabels">
-      <arg type="a{uv}" direction="in" name="params"/>
-    </method>
     <method name="ShowMonitorLabels2">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>

data/gnome-shell-theme.gresource.xml

@@ -20,12 +20,16 @@
     <file>no-notifications.svg</file>
     <file>noise-texture.png</file>
     <file>pad-osd.css</file>
+    <file alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
+    <file alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
+    <file alias="icons/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
+    <file alias="icons/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
     <file>process-working.svg</file>
-    <file>toggle-off-us.svg</file>
+    <file>toggle-off.svg</file>
-    <file>toggle-off-intl.svg</file>
+    <file>toggle-off-dark.svg</file>
     <file>toggle-off-hc.svg</file>
-    <file>toggle-on-us.svg</file>
+    <file>toggle-on.svg</file>
-    <file>toggle-on-intl.svg</file>
+    <file>toggle-on-dark.svg</file>
     <file>toggle-on-hc.svg</file>
   </gresource>
 </gresources>

data/theme/gnome-shell-high-contrast.scss

@@ -1,3 +1,5 @@
+$variant: 'light';
+
 @import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
 @import "gnome-shell-sass/_drawing";
 @import "gnome-shell-sass/_common";

data/theme/gnome-shell-sass/_colors.scss

@@ -3,11 +3,11 @@
 
 
 $base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
-$bg_color: if($variant == 'light', #f6f5f4, desaturate(#3d3846, 10%));
+$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
 $fg_color: if($variant == 'light', #2e3436, #eeeeec);
 
 $selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));
+$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
 $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));
@@ -16,16 +16,20 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), li
 $top_hilight: $borders_edge;
 
 $warning_color: #f57900;
-$error_color: #cc0000;
+$error_color: #ff8080;
 $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_text_color: white;
+$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.9);
+$osd_outer_borders_color: transparentize(white, 0.84);
 
 $tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

data/theme/gnome-shell-sass/_drawing.scss

@@ -37,16 +37,13 @@
 // 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%));
@@ -111,7 +108,7 @@
   }
 }
 
-@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
@@ -130,19 +127,17 @@
   $_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)));
-
+  $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
 
   @if $t==normal {
   //
   // normal button
   //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
-                            $osd_bg_color);
 
-    color: $osd_fg_color;
+    color: $tc;
-    background-color: $_bg;
+    background-color: $c;
-    border-color: $osd_borders_color;
+    border-color: $borders_color;
-    box-shadow: inset 0 1px lighten($osd_bg_color,10%);
+    box-shadow: $_button_shadow;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
   }
@@ -150,26 +145,21 @@
   //
   // focused button
   //  
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+    color: $tc;
-                          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;
+    box-shadow: inset 0px 0px 0px 2px $selected_bg_color;
+    //border-color: $selected_bg_color;
   }
 
   @else if $t==hover {
   //
   // active osd button
   //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+    color: $tc;
-                            lighten($osd_bg_color,3%));
+    border-color: $borders_color;
-
+    background-color: $c;
-    color: white;
+    box-shadow: $_button_shadow;
-    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;
 
@@ -178,27 +168,18 @@
   //
   // active osd button
   //
-    $_bg: if($c!=$bg_color, $c, $osd_borders_color);
+    color: $tc;
-
+    border-color: $borders_color;
-    color: white;
+    background-color: $c;
-    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;
+    box-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;
+    border-color: $insensitive_borders_color;
-    background-color: $_bg;
+    background-color: $insensitive_bg_color;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;

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

@@ -26,6 +26,7 @@ $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.9);
 
 $tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

data/theme/pointer-double-click-symbolic.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="layer1"
+     style="display:inline">
+    <g
+       id="id1"
+       transform="translate(-19,-0.75)">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 19.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.38151 2.829427,-2.763021 4.24414,-4.144531 0.5882,1.18866 1.158389,2.386561 1.758464,3.569127 1.108631,1.640259 4.157538,0.465128 3.89799,-1.495859 0.01057,-0.470226 -0.405577,-0.908445 -0.434651,-1.313638 0.259401,-0.25321 0.518802,-0.50642 0.778203,-0.75963 0.5882,1.18866 1.158389,2.386561 1.758464,3.569127 1.108631,1.640259 4.157538,0.465128 3.89799,-1.495859 -0.192325,-0.904303 -0.717854,-1.698026 -1.068629,-2.548967 -0.238908,-0.512658 -0.477817,-1.025315 -0.716725,-1.537973 1.755859,0 3.511719,0 5.267578,0 C 34.777352,9.738932 30.31641,5.0970051 25.855469,0.45507812 c 0,2.08138018 0,4.16276048 0,6.24414068 -2,-2.0813802 -4,-4.1627605 -6,-6.24414068 z m 1.5,3.72656248 c 2,2.0813801 4,4.1627603 6,6.2441404 0,-2.0813801 0,-4.1627603 0,-6.2441404 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.366537,0 -2.733073,0 -4.09961,0 0.883468,1.903435 1.781983,3.800273 2.656081,5.707817 0.0065,0.622781 -1.227555,0.980575 -1.325116,0.207118 -0.80433,-1.640251 -1.608661,-3.280501 -2.412991,-4.920752 -1.020182,0.995443 -2.040365,1.990885 -3.060547,2.986328 0.263642,0.608048 0.596803,1.192457 0.814693,1.816134 -0.182662,0.601037 -1.26833,0.8373 -1.365856,0.06795 -0.796094,-1.623456 -1.592189,-3.246912 -2.388284,-4.870368 -1.059245,1.033854 -2.118489,2.067708 -3.177734,3.101562 -4e-6,-4.265002 -7e-6,-8.5300036 -1.1e-5,-12.7950054 z"
+         id="path5565" />
+    </g>
+    <g
+       id="id2"
+       transform="translate(-25,-0.75)" />
+  </g>
+</svg>

data/theme/pointer-drag-symbolic.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="g835">
+    <path
+       style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="M 10.705078 1.671875 C 9.8685536 1.7465699 8.886927 1.5353073 8.2578125 2.2480469 C 8.0785627 2.7511513 7.8667422 2.9777446 7.3125 2.8652344 C 6.5186841 2.8141575 5.6105879 2.9190179 5.125 3.6386719 C 4.5700923 4.4696324 4.8113194 5.4949043 4.7578125 6.4316406 L 4.7578125 7.9335938 C 4.2480917 7.6156216 3.6258927 7.8015358 3.0585938 7.7519531 C 2.6157606 7.7312277 2.1774807 7.7771069 1.7402344 7.84375 C 1.7971654 10.529678 1.813967 13.217089 1.8613281 15.902344 C 1.9550191 17.204635 3.0933719 18.307155 4.40625 18.326172 C 5.0391993 18.341272 5.8885801 18.332951 6.6308594 18.337891 C 9.8526764 18.325821 13.076973 18.38774 16.296875 18.28125 C 17.459088 18.161027 18.510143 17.092798 18.367188 15.884766 L 18.367188 6.4042969 C 17.660379 5.4636119 16.551912 4.623434 15.308594 4.8339844 C 15.009045 4.3804158 14.822476 3.3608651 14.082031 3.0351562 C 13.727176 2.744118 13.242443 2.9253873 12.822266 2.8730469 C 12.524824 2.8003648 11.966366 3.0655864 11.953125 2.6210938 C 11.795774 2.0995736 11.23789 1.7125276 10.705078 1.671875 z M 10.599609 3.1757812 C 10.764131 3.4472414 10.782382 3.9294982 10.818359 4.3007812 C 10.824915 4.3076775 10.838155 4.3066925 10.845703 4.3125 C 10.836598 4.3123268 10.827465 4.3126732 10.818359 4.3125 L 11.3125 10.212891 L 11.976562 4.3710938 L 13.322266 4.375 C 13.858345 4.7645492 13.735252 5.5154752 13.876953 6.0976562 C 13.865826 6.1651282 13.88335 6.1937019 13.892578 6.234375 C 13.891928 6.2343667 13.891276 6.2343833 13.890625 6.234375 L 13.902344 6.3203125 L 14.384766 10.185547 L 15.048828 6.265625 C 15.622863 6.228498 16.206517 6.3041365 16.607422 6.7675781 C 17.017062 6.9844433 16.823063 7.4565491 16.867188 7.8261719 L 16.867188 16.167969 C 16.530129 17.131654 15.267211 16.71624 14.492188 16.828125 C 11.121671 16.841205 7.7500508 16.861953 4.3808594 16.814453 C 3.4051926 16.786173 3.2389196 15.744474 3.3398438 14.972656 C 3.3282027 13.065594 3.2950998 11.158732 3.2617188 9.2519531 C 3.5880829 9.2584131 3.9376766 9.2391948 4.25 9.2617188 C 4.7438842 10.17694 4.7346154 11.262903 4.7578125 12.277344 C 5.2504494 12.270544 5.8011939 12.317174 6.2578125 12.277344 C 6.2669593 9.7577406 6.2393741 7.2373172 6.2714844 4.71875 C 6.3763823 4.198849 7.0022289 4.409587 7.3828125 4.3652344 L 8.0585938 4.3652344 L 8.546875 10.212891 L 9.2167969 4.3359375 L 9.2128906 4.3359375 C 9.2438386 3.9531035 9.0622615 3.4401006 9.4609375 3.2167969 L 10.599609 3.1757812 z "
+       id="path5630" />
+  </g>
+</svg>

data/theme/pointer-primary-click-symbolic.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2"
+   version="1.1">
+  <g
+     id="layer1"
+     style="display:inline">
+    <g
+       id="id1"
+       transform="translate(-22.25,-0.75)">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 25.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.380859 2.829427,-2.761719 4.24414,-4.142578 0.612408,1.215372 1.173049,2.460221 1.819709,3.656095 1.141947,1.476279 3.975266,0.389006 3.846009,-1.473608 -0.09413,-0.822519 -0.594755,-1.521423 -0.899969,-2.277599 -0.298869,-0.640171 -0.597739,-1.280342 -0.896608,-1.920513 1.75651,0 3.513021,0 5.269531,0 C 34.777344,9.738932 30.316406,5.0970051 25.855469,0.45507812 Z m 1.5,3.72656248 c 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.367188,0 -2.734375,0 -4.101563,0 0.885072,1.903196 1.781799,3.80152 2.659622,5.707744 0.0349,0.566084 -1.149057,0.988823 -1.282093,0.297971 -0.818567,-1.671162 -1.637133,-3.342323 -2.455699,-5.013485 -1.059896,1.034505 -2.119791,2.06901 -3.179687,3.103515 1.5e-5,-4.264988 3e-5,-8.5299756 4.5e-5,-12.7949634 z"
+         id="path5565" />
+    </g>
+  </g>
+</svg>

data/theme/pointer-secondary-click-symbolic.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="layer1"
+     style="display:inline;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
+    <g
+       transform="matrix(-1,0,0,1,42,-0.75)"
+       id="g5847"
+       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 25.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.380859 2.829427,-2.761719 4.24414,-4.142578 0.612408,1.215372 1.173049,2.460221 1.819709,3.656095 1.141947,1.476279 3.975266,0.389006 3.846009,-1.473608 -0.09413,-0.822519 -0.594755,-1.521423 -0.899969,-2.277599 -0.298869,-0.640171 -0.597739,-1.280342 -0.896608,-1.920513 1.75651,0 3.513021,0 5.269531,0 C 34.777344,9.738932 30.316406,5.0970051 25.855469,0.45507812 Z m 1.5,3.72656248 c 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.367188,0 -2.734375,0 -4.101563,0 0.885072,1.903196 1.781799,3.80152 2.659622,5.707744 0.0349,0.566084 -1.149057,0.988823 -1.282093,0.297971 -0.818567,-1.671162 -1.637133,-3.342323 -2.455699,-5.013485 -1.059896,1.034505 -2.119791,2.06901 -3.179687,3.103515 1.5e-5,-4.264988 3e-5,-8.5299756 4.5e-5,-12.7949634 z"
+         id="path5851" />
+    </g>
+  </g>
+</svg>

data/theme/toggle-off-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-42.76)"/></defs><g transform="translate(0 -291.18)" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#323233" stroke="#272728"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none" fill="url(#b)" stroke="#151515"/></g></svg>

data/theme/toggle-off-intl.svg

@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="toggle-off-us.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802-8"
-       id="linearGradient12311-3-1-0-5-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802-8"
-       inkscape:collect="always">
-      <stop
-         id="stop37804-1"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806-8"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="492.52756"
-       x2="610.13782"
-       y1="501.43866"
-       x1="610.13782"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13602"
-       xlink:href="#linearGradient37802-8"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-5.0602834"
-     inkscape:cy="16.473273"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1375"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
-      </g>
-      <g
-         transform="translate(-49.946213,-1.890275)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.15627193;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="path13479"
-         sodipodi:cx="16.4375"
-         sodipodi:cy="10.8125"
-         sodipodi:rx="4.3125"
-         sodipodi:ry="4.3125"
-         d="m 20.75,10.8125 a 4.3125,4.3125 0 1 1 -8.625,0 4.3125,4.3125 0 1 1 8.625,0 z"
-         transform="matrix(1.4212691,0,0,1.1514287,577.38488,1761.1138)" />
-    </g>
-  </g>
-</svg>

data/theme/toggle-off-us.svg

@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="toggle-on-intl.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802"
-       id="linearGradient12311-3-1-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802"
-       inkscape:collect="always">
-      <stop
-         id="stop37804"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4-3"
-       id="linearGradient77680"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0322581,717.71949,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4-3">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5-7" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0-9" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802-8"
-       id="linearGradient12311-3-1-0-5-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802-8"
-       inkscape:collect="always">
-      <stop
-         id="stop37804-1"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806-8"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="492.52756"
-       x2="610.13782"
-       y1="501.43866"
-       x1="610.13782"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13602"
-       xlink:href="#linearGradient37802-8"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="16.760995"
-     inkscape:cy="21.955673"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1375"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
-      </g>
-      <g
-         transform="translate(-49.946213,-1.890275)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <text
-         xml:space="preserve"
-         style="font-size:13.79166794px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         x="520.29974"
-         y="1997.0011"
-         id="text75614"
-         sodipodi:linespacing="125%"
-         transform="scale(1.1236771,0.88993537)"><tspan
-           sodipodi:role="line"
-           id="tspan75616"
-           x="520.29974"
-           y="1997.0011">OFF</tspan></text>
-    </g>
-  </g>
-</svg>

data/theme/toggle-off.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#e1dedb" stroke="#cdc7c2" stroke-linecap="round" stroke-linejoin="round"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke="#aa9f98" stroke-linecap="round" stroke-linejoin="round"/><g transform="matrix(.97148 0 0 1 1658.914 -2552.91)" stroke-width="1.015" stroke-linecap="round" stroke-linejoin="round"><rect ry="13.17" rx="13.556" y="1234.681" x="-1242.732" height="26" width="49.409" style="marker:none" fill="#e1dedb" stroke="#cdc7c2"/><rect style="marker:none" width="26.763" height="26" x="-1242.732" y="1234.769" rx="13.511" ry="13.126" fill="#f8f7f7" stroke="#aa9f98"/></g><g transform="matrix(.97148 0 0 1 1658.914 -2512.91)" stroke-width="1.015" stroke="#2b73cc"><rect style="marker:none" width="49.409" height="26" x="-1242.732" y="1234.681" rx="13.556" ry="13.17" fill="#3081e3"/><rect ry="13.126" rx="13.511" y="1234.769" x="-1220.086" height="26" width="26.763" style="marker:none" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></g></svg>

data/theme/toggle-on-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-19)"/></defs><g transform="translate(0 -291.18)" stroke="#030e1b" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#15539e"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none" fill="url(#b)"/></g></svg>

data/theme/toggle-on-intl.svg

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-on-intl.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461"
-       id="linearGradient77551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       id="linearGradient77461"
-       inkscape:collect="always">
-      <stop
-         id="stop77463"
-         offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
-      <stop
-         id="stop77465"
-         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="37.410841"
-     inkscape:cy="16.009314"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient77551);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-      <g
-         transform="translate(2.0625,-2)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <rect
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="rect13678"
-         width="3.0646207"
-         height="12.414008"
-         x="554.77728"
-         y="1767.3566" />
-    </g>
-  </g>
-</svg>

data/theme/toggle-on-us.svg

@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-on-us.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient77461-1"
-       inkscape:collect="always">
-      <stop
-         id="stop77463-1"
-         offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
-      <stop
-         id="stop77465-4"
-         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient77551-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8527367,0,0,0.80554422,-969.41608,-778.00299)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient11198"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-1066.3709,794.25325)"
-       x1="1322.5831"
-       y1="-312.51855"
-       x2="1322.5831"
-       y2="-306.53461" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-26.798898"
-     inkscape:cy="5.3753009"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient11198);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
-      </g>
-      <g
-         transform="translate(2.0625,-2)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <text
-         transform="scale(1.1000946,0.90901274)"
-         sodipodi:linespacing="125%"
-         id="text38018"
-         y="1955.5205"
-         x="495.94223"
-         style="font-size:13.29953671px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         xml:space="preserve"><tspan
-           y="1955.5205"
-           x="495.94223"
-           id="tspan38020"
-           sodipodi:role="line">ON</tspan></text>
-    </g>
-  </g>
-</svg>

data/theme/toggle-on.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)" stroke="#2b73cc"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#3081e3"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></svg>

js/extensionPrefs/main.js

@@ -551,9 +551,9 @@ class ExtensionRow extends Gtk.ListBoxRow {
 
         let button = new Gtk.Button({ valign: Gtk.Align.CENTER,
                                       no_show_all: true });
-        button.add(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
+        button.set_image(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
-                                   icon_size: Gtk.IconSize.BUTTON,
+                                         icon_size: Gtk.IconSize.BUTTON,
-                                   visible: true }));
+                                         visible: true }));
         button.get_style_context().add_class('circular');
         hbox.add(button);
 

js/gdm/batch.js

@@ -124,7 +124,7 @@ var Batch = class extends Task {
     }
 
     process() {
-        throw new Error('Not implemented');
+        throw new GObject.NotImplementedError(`process in ${this.constructor.name}`);
     }
 
     runTask() {

js/gdm/loginDialog.js

@@ -325,7 +325,7 @@ var SessionMenuButton = class {
                  this._button.remove_style_pseudo_class('active');
         });
 
-        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button },
+        this._manager = new PopupMenu.PopupMenuManager(this._button,
                                                        { actionMode: Shell.ActionMode.NONE });
         this._manager.addMenu(this._menu);
 
@@ -652,7 +652,7 @@ var LoginDialog = GObject.registerClass({
                      bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
                      bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);
 
-                     // figure out how tall it would like to be and try to accomodate
+                     // figure out how tall it would like to be and try to accommodate
                      // but don't let it get too close to the logo
                      let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
 

js/js-resources.gresource.xml

@@ -64,6 +64,7 @@
     <file>ui/keyboard.js</file>
     <file>ui/layout.js</file>
     <file>ui/lightbox.js</file>
+    <file>ui/locatePointer.js</file>
     <file>ui/lookingGlass.js</file>
     <file>ui/magnifier.js</file>
     <file>ui/magnifierDBus.js</file>
@@ -81,9 +82,11 @@
     <file>ui/pageIndicators.js</file>
     <file>ui/panel.js</file>
     <file>ui/panelMenu.js</file>
+    <file>ui/pointerA11yTimeout.js</file>
     <file>ui/pointerWatcher.js</file>
     <file>ui/popupMenu.js</file>
     <file>ui/remoteSearch.js</file>
+    <file>ui/ripples.js</file>
     <file>ui/runDialog.js</file>
     <file>ui/screenShield.js</file>
     <file>ui/screencast.js</file>
@@ -120,6 +123,7 @@
 
     <file>ui/status/accessibility.js</file>
     <file>ui/status/brightness.js</file>
+    <file>ui/status/dwellClick.js</file>
     <file>ui/status/location.js</file>
     <file>ui/status/keyboard.js</file>
     <file>ui/status/nightLight.js</file>

js/misc/introspect.js

@@ -42,8 +42,6 @@ var IntrospectService = class {
     }
 
     _isStandaloneApp(app) {
-        let windows = app.get_windows();
-
         return app.get_windows().some(w => w.transient_for == null);
     }
 
@@ -55,6 +53,11 @@ var IntrospectService = class {
        return APP_WHITELIST.includes(sender);
     }
 
+    _getSandboxedAppId(app) {
+        let ids = app.get_windows().map(w => w.get_sandboxed_app_id());
+        return ids.find(id => id != null);
+    }
+
     _syncRunningApplications() {
         let tracker = Shell.WindowTracker.get_default();
         let apps = this._appSystem.get_running();
@@ -76,6 +79,10 @@ var IntrospectService = class {
                 newActiveApplication = app.get_id();
             }
 
+            let sandboxedAppId = this._getSandboxedAppId(app);
+            if (sandboxedAppId)
+                appInfo['sandboxed-app-id'] = new GLib.Variant('s', sandboxedAppId);
+
             newRunningApplications[app.get_id()] = appInfo;
         }
 
@@ -137,6 +144,7 @@ var IntrospectService = class {
                 let frameRect = window.get_frame_rect();
                 let title = window.get_title();
                 let wmClass = window.get_wm_class();
+                let sandboxedAppId = window.get_sandboxed_app_id();
 
                 windowsList[windowId] = {
                     'app-id': GLib.Variant.new('s', app.get_id()),
@@ -153,6 +161,10 @@ var IntrospectService = class {
 
                 if (wmClass != null)
                     windowsList[windowId]['wm-class'] = GLib.Variant.new('s', wmClass);
+
+                if (sandboxedAppId != null)
+                    windowsList[windowId]['sandboxed-app-id'] =
+                        GLib.Variant.new('s', sandboxedAppId);
             }
         }
         invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));

js/misc/loginManager.js

@@ -48,6 +48,28 @@ function canLock() {
     }
 }
 
+
+function registerSessionWithGDM() {
+    log("Registering session with GDM");
+    Gio.DBus.system.call('org.gnome.DisplayManager',
+                         '/org/gnome/DisplayManager/Manager',
+                         'org.gnome.DisplayManager.Manager',
+                         'RegisterSession',
+                         GLib.Variant.new('(a{sv})', [{}]), null,
+                         Gio.DBusCallFlags.NONE, -1, null,
+        (source, result) => {
+            try {
+                source.call_finish(result);
+            } catch (e) {
+                if (!e.matches(Gio.DBusError, Gio.DBusError.UNKNOWN_METHOD))
+                    log(`Error registering session with GDM: ${e.message}`);
+                else
+                    log("Not calling RegisterSession(): method not exported, GDM too old?");
+            }
+        }
+    );
+}
+
 let _loginManager = null;
 
 /**

js/misc/modemManager.js

@@ -71,7 +71,7 @@ function _findProviderForMccMnc(operator_name, operator_code) {
 // Tries to find the operator name corresponding to the given SID
 //
 function _findProviderForSid(sid) {
-    if (sid == 0)
+    if (!sid)
         return null;
 
     let mpd = _getMobileProvidersDatabase();

js/misc/systemActions.js

@@ -88,42 +88,42 @@ const SystemActions = GObject.registerClass({
                             name: C_("search-result", "Power Off"),
                             iconName: 'system-shutdown-symbolic',
                             // Translators: A list of keywords that match the power-off action, separated by semicolons
-                            keywords: _("power off;shutdown;reboot;restart").split(';'),
+                            keywords: _("power off;shutdown;reboot;restart").split(/[; ]/),
                             available: false });
         this._actions.set(LOCK_SCREEN_ACTION_ID,
                           { // Translators: The name of the lock screen action in search
                             name: C_("search-result", "Lock Screen"),
                             iconName: 'system-lock-screen-symbolic',
                             // Translators: A list of keywords that match the lock screen action, separated by semicolons
-                            keywords: _("lock screen").split(';'),
+                            keywords: _("lock screen").split(/[; ]/),
                             available: false });
         this._actions.set(LOGOUT_ACTION_ID,
                           { // Translators: The name of the logout action in search
                             name: C_("search-result", "Log Out"),
                             iconName: 'application-exit-symbolic',
                             // Translators: A list of keywords that match the logout action, separated by semicolons
-                            keywords: _("logout;sign off").split(';'),
+                            keywords: _("logout;log out;sign off").split(/[; ]/),
                             available: false });
         this._actions.set(SUSPEND_ACTION_ID,
                           { // Translators: The name of the suspend action in search
                             name: C_("search-result", "Suspend"),
                             iconName: 'media-playback-pause-symbolic',
                             // Translators: A list of keywords that match the suspend action, separated by semicolons
-                            keywords: _("suspend;sleep").split(';'),
+                            keywords: _("suspend;sleep").split(/[; ]/),
                             available: false });
         this._actions.set(SWITCH_USER_ACTION_ID,
                           { // Translators: The name of the switch user action in search
                             name: C_("search-result", "Switch User"),
                             iconName: 'system-switch-user-symbolic',
                             // Translators: A list of keywords that match the switch user action, separated by semicolons
-                            keywords: _("switch user").split(';'),
+                            keywords: _("switch user").split(/[; ]/),
                             available: false });
         this._actions.set(LOCK_ORIENTATION_ACTION_ID,
                           { // Translators: The name of the lock orientation action in search
                             name: C_("search-result", "Lock Orientation"),
                             iconName: '',
                             // Translators: A list of keywords that match the lock orientation action, separated by semicolons
-                            keywords: _("lock orientation;screen;rotation").split(';'),
+                            keywords: _("lock orientation;screen;rotation").split(/[; ]/),
                             available: false });
 
         this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
@@ -262,7 +262,7 @@ const SystemActions = GObject.registerClass({
         let results = [];
 
         for (let [key, {available, keywords}] of this._actions)
-            if (available && terms.every(t => keywords.some(k => (k.indexOf(t) >= 0))))
+            if (available && terms.every(t => keywords.some(k => k.startsWith(t))))
                 results.push(key);
 
         return results;

js/misc/util.js

@@ -366,7 +366,7 @@ class CloseButton extends St.Button {
     }
 
     _computeBoxPointerOffset() {
-        if (!this._boxPointer || !this._boxPointer.actor.get_stage())
+        if (!this._boxPointer || !this._boxPointer.get_stage())
             return 0;
 
         let side = this._boxPointer.arrowSide;

js/misc/weather.js

@@ -30,6 +30,14 @@ var WeatherClient = class {
                 return;
             }
 
+            if (this._permStore.g_name_owner == null) {
+                // Failed to auto-start, likely because xdg-desktop-portal
+                // isn't installed; don't restrict access to location service
+                this._weatherAuthorized = true;
+                this._updateAutoLocation();
+                return;
+            }
+
             this._permStore.LookupRemote('gnome', 'geolocation', (res, error) => {
                 if (error)
                     log('Error looking up permission: ' + error.message);

js/perf/core.js

@@ -10,7 +10,7 @@ const Scripting = imports.ui.scripting;
 // someone should be able to get an idea of how well the shell is performing
 // on a particular system.
 
-let METRICS = {
+var METRICS = {
     overviewLatencyFirst:
     { description: "Time to first frame after triggering overview, first time",
       units: "us" },

js/perf/hwtest.js

@@ -1,8 +1,8 @@
-const { Clutter, Gio, Gtk, Shell } = imports.gi;
+const { Clutter, Gio, Shell } = imports.gi;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
 
-let METRICS = {
+var METRICS = {
     timeToDesktop:
     { description: "Time from starting graphical.target to desktop showing",
       units: "us" },
@@ -104,7 +104,10 @@ function *run() {
     yield Scripting.waitLeisure();
     Scripting.scriptEvent('desktopShown');
 
-    Gtk.Settings.get_default().gtk_enable_animations = false;
+    let interfaceSettings = new Gio.Settings({
+        schema_id: 'org.gnome.desktop.interface'
+    });
+    interfaceSettings.set_boolean('enable-animations', false);
 
     Scripting.scriptEvent('overviewShowStart');
     Main.overview.show();
@@ -200,7 +203,7 @@ function *run() {
 
     yield Scripting.sleep(1000);
 
-    Gtk.Settings.get_default().gtk_enable_animations = true;
+    interfaceSettings.set_boolean('enable-animations', true);
 }
 
 let overviewShowStart;

js/ui/accessDialog.js

@@ -1,4 +1,4 @@
-const { Clutter, Gio, GLib, Shell } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Shell } = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
@@ -15,9 +15,10 @@ var DialogResponse = {
     CLOSED: 2
 };
 
-var AccessDialog = class extends ModalDialog.ModalDialog {
+var AccessDialog = GObject.registerClass(
-    constructor(invocation, handle, title, subtitle, body, options) {
+class AccessDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'access-dialog' });
+    _init(invocation, handle, title, subtitle, body, options) {
+        super._init({ styleClass: 'access-dialog' });
 
         this._invocation = invocation;
         this._handle = handle;
@@ -109,7 +110,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
         });
         this.close();
     }
-};
+});
 
 var AccessDialogDBus = class {
     constructor() {

js/ui/altTab.js

@@ -474,12 +474,10 @@ var CyclerList = GObject.registerClass({
     }
 });
 
-var CyclerPopup = GObject.registerClass(
+var CyclerPopup = GObject.registerClass({
-class CyclerPopup extends SwitcherPopup.SwitcherPopup {
+    GTypeFlags: GObject.TypeFlags.ABSTRACT
+}, class CyclerPopup extends SwitcherPopup.SwitcherPopup {
     _init() {
-        if (new.target === CyclerPopup)
-            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
-
         super._init();
 
         this._items = this._getWindows();
@@ -619,9 +617,8 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
 var WindowCyclerPopup = GObject.registerClass(
 class WindowCyclerPopup extends CyclerPopup {
     _init() {
-        super._init();
-
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
+        super._init();
     }
 
     _getWindows() {

js/ui/appDisplay.js

@@ -98,8 +98,8 @@ function clamp(value, min, max) {
 
 class BaseAppView {
     constructor(params, gridParams) {
-        if (new.target === BaseAppView)
+        if (this.constructor === BaseAppView)
-            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
+            throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
 
         gridParams = Params.parse(gridParams, { xAlign: St.Align.MIDDLE,
                                                 columnLimit: MAX_COLUMNS,
@@ -414,7 +414,7 @@ var AllView = class AllView extends BaseAppView {
         this._refilterApps();
     }
 
-    // Overriden from BaseAppView
+    // Overridden from BaseAppView
     animate(animationDirection, onComplete) {
         this._scrollView.reactive = false;
         let completionFunc = () => {
@@ -632,9 +632,9 @@ var AllView = class AllView extends BaseAppView {
             this._scrollView.get_effect('fade').fade_edges = true;
 
         if (this._availWidth != availWidth || this._availHeight != availHeight || oldNPages != this._grid.nPages()) {
-            this._adjustment.value = 0;
-            this._grid.currentPage = 0;
             Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                this._adjustment.value = 0;
+                this._grid.currentPage = 0;
                 this._pageIndicators.setNPages(this._grid.nPages());
                 this._pageIndicators.setCurrentPage(0);
             });
@@ -1017,7 +1017,7 @@ var FolderView = class FolderView extends BaseAppView {
         Util.ensureActorVisibleInScrollView(this.actor, actor);
     }
 
-    // Overriden from BaseAppView
+    // Overridden from BaseAppView
     animate(animationDirection) {
         this._grid.animatePulse(animationDirection);
     }
@@ -1081,7 +1081,7 @@ var FolderView = class FolderView extends BaseAppView {
 
         let contentBox = this.actor.get_theme_node().get_content_box(pageBox);
         // We only can show icons inside the collection view boxPointer
-        // so we have to substract the required padding etc of the boxpointer
+        // so we have to subtract the required padding etc of the boxpointer
         return [(contentBox.x2 - contentBox.x1) - 2 * this._offsetForEachSide, (contentBox.y2 - contentBox.y1) - 2 * this._offsetForEachSide];
     }
 
@@ -1301,16 +1301,16 @@ var AppFolderPopup = class AppFolderPopup {
                                                        x_expand: true,
                                                        x_align: St.Align.START });
 
-        this._boxPointer.actor.style_class = 'app-folder-popup';
+        this._boxPointer.style_class = 'app-folder-popup';
-        this.actor.add_actor(this._boxPointer.actor);
+        this.actor.add_actor(this._boxPointer);
         this._boxPointer.bin.set_child(this._view.actor);
 
         this.closeButton = Util.makeCloseButton(this._boxPointer);
         this.closeButton.connect('clicked', this.popdown.bind(this));
         this.actor.add_actor(this.closeButton);
 
-        this._boxPointer.actor.bind_property('opacity', this.closeButton, 'opacity',
+        this._boxPointer.bind_property('opacity', this.closeButton, 'opacity',
-                                             GObject.BindingFlags.SYNC_CREATE);
+                                       GObject.BindingFlags.SYNC_CREATE);
 
         global.focus_manager.add_group(this.actor);
 
@@ -1479,7 +1479,7 @@ var AppIcon = class AppIcon {
         this.actor.connect('popup-menu', this._onKeyboardPopupMenu.bind(this));
 
         this._menu = null;
-        this._menuManager = new PopupMenu.PopupMenuManager(this);
+        this._menuManager = new PopupMenu.PopupMenuManager(this.actor);
 
         if (isDraggable) {
             this._draggable = DND.makeDraggable(this.actor);
@@ -1707,25 +1707,20 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
             w => !w.skip_taskbar
         );
 
-        // Display the app windows menu items and the separator between windows
+        if (windows.length > 0)
-        // of the current desktop and other windows.
+            this.addMenuItem(
-        let workspaceManager = global.workspace_manager;
+                /* Translators: This is the heading of a list of open windows */
-        let activeWorkspace = workspaceManager.get_active_workspace();
+                new PopupMenu.PopupSeparatorMenuItem(_("Open Windows"))
-        let separatorShown = windows.length > 0 && windows[0].get_workspace() != activeWorkspace;
+            );
 
-        for (let i = 0; i < windows.length; i++) {
+        windows.forEach(window => {
-            let window = windows[i];
-            if (!separatorShown && window.get_workspace() != activeWorkspace) {
-                this._appendSeparator();
-                separatorShown = true;
-            }
             let title = window.title ? window.title
                                      : this._source.app.get_name();
             let item = this._appendMenuItem(title);
             item.connect('activate', () => {
                 this.emit('activate-window', window);
             });
-        }
+        });
 
         if (!this._source.app.is_window_backed()) {
             this._appendSeparator();

js/ui/appFavorites.js

@@ -14,39 +14,47 @@ const RENAMED_DESKTOP_IDS = {
     'epiphany.desktop': 'org.gnome.Epiphany.desktop',
     'evolution.desktop': 'org.gnome.Evolution.desktop',
     'file-roller.desktop': 'org.gnome.FileRoller.desktop',
+    'five-or-more.desktop': 'org.gnome.five-or-more.desktop',
+    'four-in-a-row.desktop': 'org.gnome.Four-in-a-row.desktop',
     'gcalctool.desktop': 'org.gnome.Calculator.desktop',
     'geary.desktop': 'org.gnome.Geary.desktop',
     'gedit.desktop': 'org.gnome.gedit.desktop',
-    'glchess.desktop': 'gnome-chess.desktop',
+    'glchess.desktop': 'org.gnome.Chess.desktop',
-    'glines.desktop': 'five-or-more.desktop',
+    'glines.desktop': 'org.gnome.five-or-more.desktop',
-    'gnect.desktop': 'four-in-a-row.desktop',
+    'gnect.desktop': 'org.gnome.Four-in-a-row.desktop',
     'gnibbles.desktop': 'org.gnome.Nibbles.desktop',
-    'gnobots2.desktop': 'gnome-robots.desktop',
+    'gnobots2.desktop': 'org.gnome.Robots.desktop',
     'gnome-boxes.desktop': 'org.gnome.Boxes.desktop',
     'gnome-calculator.desktop': 'org.gnome.Calculator.desktop',
+    'gnome-chess.desktop': 'org.gnome.Chess.desktop',
     'gnome-clocks.desktop': 'org.gnome.clocks.desktop',
     'gnome-contacts.desktop': 'org.gnome.Contacts.desktop',
     'gnome-documents.desktop': 'org.gnome.Documents.desktop',
     'gnome-font-viewer.desktop': 'org.gnome.font-viewer.desktop',
+    'gnome-klotski.desktop': 'org.gnome.Klotski.desktop',
     'gnome-nibbles.desktop': 'org.gnome.Nibbles.desktop',
     'gnome-mahjongg.desktop': 'org.gnome.Mahjongg.desktop',
+    'gnome-mines.desktop': 'org.gnome.Mines.desktop',
     'gnome-music.desktop': 'org.gnome.Music.desktop',
     'gnome-photos.desktop': 'org.gnome.Photos.desktop',
+    'gnome-robots.desktop': 'org.gnome.Robots.desktop',
     'gnome-screenshot.desktop': 'org.gnome.Screenshot.desktop',
     'gnome-software.desktop': 'org.gnome.Software.desktop',
     'gnome-terminal.desktop': 'org.gnome.Terminal.desktop',
+    'gnome-tetravex.desktop': 'org.gnome.Tetravex.desktop',
     'gnome-tweaks.desktop': 'org.gnome.tweaks.desktop',
     'gnome-weather.desktop': 'org.gnome.Weather.desktop',
-    'gnomine.desktop': 'gnome-mines.desktop',
+    'gnomine.desktop': 'org.gnome.Mines.desktop',
-    'gnotravex.desktop': 'gnome-tetravex.desktop',
+    'gnotravex.desktop': 'org.gnome.Tetravex.desktop',
-    'gnotski.desktop': 'gnome-klotski.desktop',
+    'gnotski.desktop': 'org.gnome.Klotski.desktop',
-    'gtali.desktop': 'tali.desktop',
+    'gtali.desktop': 'org.gnome.Tali.desktop',
     'iagno.desktop': 'org.gnome.Reversi.desktop',
     'nautilus.desktop': 'org.gnome.Nautilus.desktop',
     'org.gnome.gnome-2048.desktop': 'org.gnome.TwentyFortyEight.desktop',
     'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop',
     'org.gnome.Weather.Application.desktop': 'org.gnome.Weather.desktop',
     'polari.desktop': 'org.gnome.Polari.desktop',
+    'tali.desktop': 'org.gnome.Tali.desktop',
     'totem.desktop': 'org.gnome.Totem.desktop',
     'evince.desktop': 'org.gnome.Evince.desktop',
 };

js/ui/audioDeviceSelection.js

@@ -1,4 +1,4 @@
-const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
@@ -13,10 +13,11 @@ var AudioDevice = {
 
 const AudioDeviceSelectionIface = loadInterfaceXML('org.gnome.Shell.AudioDeviceSelection');
 
-var AudioDeviceSelectionDialog =
+var AudioDeviceSelectionDialog = GObject.registerClass({
-class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
+    Signals: { 'device-selected': { param_types: [GObject.TYPE_UINT] } }
-    constructor(devices) {
+}, class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'audio-device-selection-dialog' });
+    _init(devices) {
+        super._init({ styleClass: 'audio-device-selection-dialog' });
 
         this._deviceItems = {};
 
@@ -33,10 +34,6 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
             throw new Error('Too few devices for a selection');
     }
 
-    destroy() {
-        super.destroy();
-    }
-
     _buildLayout(devices) {
         let title = new St.Label({ style_class: 'audio-selection-title',
                                    text: _("Select Audio Device"),
@@ -125,7 +122,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
         Main.overview.hide();
         app.activate();
     }
-};
+});
 
 var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
     constructor() {

js/ui/background.js

@@ -257,14 +257,15 @@ var Background = class Background {
                 this._refreshAnimation();
             });
 
-        this._settingsChangedSignalId = this._settings.connect('changed', () => {
+        this._settingsChangedSignalId =
-            this.emit('changed');
+            this._settings.connect('changed', this._emitChangedSignal.bind(this));
-        });
 
         this._load();
     }
 
     destroy() {
+        this.background = null;
+
         this._cancellable.cancel();
         this._removeAnimationTimeout();
 
@@ -288,6 +289,22 @@ var Background = class Background {
         if (this._settingsChangedSignalId != 0)
             this._settings.disconnect(this._settingsChangedSignalId);
         this._settingsChangedSignalId = 0;
+
+        if (this._changedIdleId) {
+            GLib.source_remove(this._changedIdleId);
+            this._changedIdleId = 0;
+        }
+    }
+
+    _emitChangedSignal() {
+        if (this._changedIdleId)
+            return;
+
+        this._changedIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+            this._changedIdleId = 0;
+            this.emit('changed');
+            return GLib.SOURCE_REMOVE;
+        });
     }
 
     updateResolution() {
@@ -343,7 +360,7 @@ var Background = class Background {
                                                if (changedFile.equal(file)) {
                                                    let imageCache = Meta.BackgroundImageCache.get_default();
                                                    imageCache.purge(changedFile);
-                                                   this.emit('changed');
+                                                   this._emitChangedSignal();
                                                }
                                            });
         this._fileWatches[key] = signalId;
@@ -699,7 +716,6 @@ var BackgroundManager = class BackgroundManager {
                            time: FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete() {
-                               oldBackgroundActor.background.run_dispose();
                                oldBackgroundActor.destroy();
                            }
                          });

js/ui/backgroundMenu.js

@@ -25,7 +25,7 @@ var BackgroundMenu = class BackgroundMenu extends PopupMenu.PopupMenu {
 function addBackgroundMenu(actor, layoutManager) {
     actor.reactive = true;
     actor._backgroundMenu = new BackgroundMenu(layoutManager);
-    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
+    actor._backgroundManager = new PopupMenu.PopupMenuManager(actor);
     actor._backgroundManager.addMenu(actor._backgroundMenu);
 
     function openMenu(x, y) {

js/ui/barLevel.js

@@ -121,7 +121,8 @@ var BarLevel = class {
         cr.lineTo(x, (height - barLevelHeight) / 2);
         cr.lineTo(x, (height + barLevelHeight) / 2);
         cr.lineTo(barLevelBorderRadius + barLevelBorderWidth, (height + barLevelHeight) / 2);
-        Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+        if (this._value > 0)
+          Clutter.cairo_set_source_color(cr, barLevelActiveColor);
         cr.fillPreserve();
         Clutter.cairo_set_source_color(cr, barLevelActiveBorderColor);
         cr.setLineWidth(barLevelBorderWidth);
@@ -143,17 +144,19 @@ var BarLevel = class {
         }
 
         /* end progress bar arc */
-        if (this._value <= this._overdriveStart)
+        if (this._value > 0) {
-            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+          if (this._value <= this._overdriveStart)
-        else
+              Clutter.cairo_set_source_color(cr, barLevelActiveColor);
-            Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
+          else
-        cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
+              Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
-        cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
+          cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
-        cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
+          cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
-        cr.lineTo(endX, (height - barLevelHeight) / 2);
+          cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
-        cr.fillPreserve();
+          cr.lineTo(endX, (height - barLevelHeight) / 2);
-        cr.setLineWidth(barLevelBorderWidth);
+          cr.fillPreserve();
-        cr.stroke();
+          cr.setLineWidth(barLevelBorderWidth);
+          cr.stroke();
+        }
 
         /* draw overdrive separator */
         if (overdriveActive) {

js/ui/boxpointer.js

@@ -24,7 +24,7 @@ var POPUP_ANIMATION_TIME = 0.15;
  * placed.  The arrow position may be controlled via
  * setArrowOrigin(). The arrow side might be temporarily flipped
  * depending on the box size and source position to keep the box
- * totally inside the monitor if possible.
+ * totally inside the monitor workarea if possible.
  *
  */
 var BoxPointer = GObject.registerClass({
@@ -33,8 +33,6 @@ var BoxPointer = GObject.registerClass({
     _init(arrowSide, binProperties) {
         super._init();
 
-        this.actor = this;
-
         this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._arrowSide = arrowSide;
@@ -47,13 +45,18 @@ var BoxPointer = GObject.registerClass({
         this._border.connect('repaint', this._drawBorder.bind(this));
         this.add_actor(this._border);
         this.bin.raise(this._border);
-        this._xOffset = 0;
-        this._yOffset = 0;
-        this._xPosition = 0;
-        this._yPosition = 0;
         this._sourceAlignment = 0.5;
         this._capturedEventId = 0;
         this._muteInput();
+
+        this.connect('destroy', this._onDestroy.bind(this));
+    }
+
+    _onDestroy() {
+        if (this._sourceActorDestroyId) {
+            this._sourceActor.disconnect(this._sourceActorDestroyId);
+            delete this._sourceActorDestroyId;
+        }
     }
 
     get arrowSide() {
@@ -73,36 +76,6 @@ var BoxPointer = GObject.registerClass({
         }
     }
 
-    // BoxPointer.show() and BoxPointer.hide() are here for only compatibility
-    // purposes, and will be removed in 3.32.
-    show(animate, onComplete) {
-        if (animate !== undefined) {
-            try {
-                throw new Error('BoxPointer.show() has been moved to BoxPointer.open(), this code will break in the future.');
-            } catch(e) {
-                logError(e);
-                this.open(animate, onComplete);
-                return;
-            }
-        }
-
-        this.visible = true;
-    }
-
-    hide(animate, onComplete) {
-        if (animate !== undefined) {
-            try {
-                throw new Error('BoxPointer.hide() has been moved to BoxPointer.close(), this code will break in the future.');
-            } catch(e) {
-                logError(e);
-                this.close(animate, onComplete);
-                return;
-            }
-        }
-
-        this.visible = false;
-    }
-
     open(animate, onComplete) {
         let themeNode = this.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
@@ -118,23 +91,23 @@ var BoxPointer = GObject.registerClass({
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
                 case St.Side.TOP:
-                    this.yOffset = -rise;
+                    this.translation_y = -rise;
                     break;
                 case St.Side.BOTTOM:
-                    this.yOffset = rise;
+                    this.translation_y = rise;
                     break;
                 case St.Side.LEFT:
-                    this.xOffset = -rise;
+                    this.translation_x = -rise;
                     break;
                 case St.Side.RIGHT:
-                    this.xOffset = rise;
+                    this.translation_x = rise;
                     break;
             }
         }
 
         Tweener.addTween(this, { opacity: 255,
-                                 xOffset: 0,
+                                 translation_x: 0,
-                                 yOffset: 0,
+                                 translation_y: 0,
                                  transition: 'linear',
                                  onComplete: () => {
                                      this._unmuteInput();
@@ -148,8 +121,8 @@ var BoxPointer = GObject.registerClass({
         if (!this.visible)
             return;
 
-        let xOffset = 0;
+        let translationX = 0;
-        let yOffset = 0;
+        let translationY = 0;
         let themeNode = this.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
         let fade = (animate & PopupAnimation.FADE);
@@ -158,16 +131,16 @@ var BoxPointer = GObject.registerClass({
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
                 case St.Side.TOP:
-                    yOffset = rise;
+                    translationY = rise;
                     break;
                 case St.Side.BOTTOM:
-                    yOffset = -rise;
+                    translationY = -rise;
                     break;
                 case St.Side.LEFT:
-                    xOffset = rise;
+                    translationX = rise;
                     break;
                 case St.Side.RIGHT:
-                    xOffset = -rise;
+                    translationX = -rise;
                     break;
             }
         }
@@ -176,15 +149,15 @@ var BoxPointer = GObject.registerClass({
 
         Tweener.removeTweens(this);
         Tweener.addTween(this, { opacity: fade ? 0 : 255,
-                                 xOffset: xOffset,
+                                 translation_x: translationX,
-                                 yOffset: yOffset,
+                                 translation_y: translationY,
                                  transition: 'linear',
                                  time: animationTime,
                                  onComplete: () => {
                                      this.hide();
                                      this.opacity = 0;
-                                     this.xOffset = 0;
+                                     this.translation_x = 0;
-                                     this.yOffset = 0;
+                                     this.translation_y = 0;
                                      if (onComplete)
                                          onComplete();
                                  }
@@ -231,13 +204,10 @@ var BoxPointer = GObject.registerClass({
         this.set_allocation(box, flags);
 
         let themeNode = this.get_theme_node();
-        box = themeNode.get_content_box(box);
-
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let rise = themeNode.get_length('-arrow-rise');
         let childBox = new Clutter.ActorBox();
-        let availWidth = box.x2 - box.x1;
+        let [availWidth, availHeight] = themeNode.get_content_box(box).get_size();
-        let availHeight = box.y2 - box.y1;
 
         childBox.x1 = 0;
         childBox.y1 = 0;
@@ -266,8 +236,9 @@ var BoxPointer = GObject.registerClass({
         this.bin.allocate(childBox, flags);
 
         if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition();
+            this._reposition(box);
-            this._updateFlip();
+            this._updateFlip(box);
+            this.set_allocation(box, flags);
         }
     }
 
@@ -454,15 +425,25 @@ var BoxPointer = GObject.registerClass({
     }
 
     setPosition(sourceActor, alignment) {
-        // We need to show it now to force an allocation,
+        if (!this._sourceActor || sourceActor != this._sourceActor) {
-        // so that we can query the correct size.
+            if (this._sourceActorDestroyId) {
-        this.show();
+                this._sourceActor.disconnect(this._sourceActorDestroyId);
+                delete this._sourceActorDestroyId;
+            }
+
+            this._sourceActor = sourceActor;
+
+            if (this._sourceActor) {
+                this._sourceActorDestroyId = this._sourceActor.connect('destroy', () => {
+                    this._sourceActor = null;
+                    delete this._sourceActorDestroyId;
+                })
+            }
+        }
 
-        this._sourceActor = sourceActor;
         this._arrowAlignment = alignment;
 
-        this._reposition();
+        this.queue_relayout();
-        this._updateFlip();
     }
 
     setSourceAlignment(alignment) {
@@ -474,14 +455,18 @@ var BoxPointer = GObject.registerClass({
         this.setPosition(this._sourceActor, this._arrowAlignment);
     }
 
-    _reposition() {
+    _reposition(allocationBox) {
         let sourceActor = this._sourceActor;
         let alignment = this._arrowAlignment;
+        let monitorIndex = Main.layoutManager.findIndexForActor(sourceActor);
+
+        this._sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
+        this._workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
 
         // Position correctly relative to the sourceActor
         let sourceNode = sourceActor.get_theme_node();
         let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
-        let sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
+        let sourceAllocation = this._sourceAllocation;
         let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
         let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
         let [minWidth, minHeight, natWidth, natHeight] = this.get_preferred_size();
@@ -489,7 +474,7 @@ var BoxPointer = GObject.registerClass({
         // We also want to keep it onscreen, and separated from the
         // edge by the same distance as the main part of the box is
         // separated from its sourceActor
-        let monitor = Main.layoutManager.findMonitorForActor(sourceActor);
+        let workarea = this._workArea;
         let themeNode = this.get_theme_node();
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let arrowBase = themeNode.get_length('-arrow-base');
@@ -539,8 +524,8 @@ var BoxPointer = GObject.registerClass({
         case St.Side.BOTTOM:
             resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
 
-            resX = Math.max(resX, monitor.x + padding);
+            resX = Math.max(resX, workarea.x + padding);
-            resX = Math.min(resX, monitor.x + monitor.width - (padding + natWidth));
+            resX = Math.min(resX, workarea.x + workarea.width - (padding + natWidth));
 
             arrowOrigin = sourceCenterX - resX;
             if (arrowOrigin <= (x1 + (borderRadius + halfBase))) {
@@ -558,8 +543,8 @@ var BoxPointer = GObject.registerClass({
         case St.Side.RIGHT:
             resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
 
-            resY = Math.max(resY, monitor.y + padding);
+            resY = Math.max(resY, workarea.y + padding);
-            resY = Math.min(resY, monitor.y + monitor.height - (padding + natHeight));
+            resY = Math.min(resY, workarea.y + workarea.height - (padding + natHeight));
 
             arrowOrigin = sourceCenterY - resY;
             if (arrowOrigin <= (y1 + (borderRadius + halfBase))) {
@@ -583,9 +568,8 @@ var BoxPointer = GObject.registerClass({
             parent = parent.get_parent();
         }
 
-        this._xPosition = Math.floor(x);
+        // Actually set the position
-        this._yPosition = Math.floor(y);
+        allocationBox.set_origin(Math.floor(x), Math.floor(y));
-        this._shiftActor();
     }
 
     // @origin: Coordinate specifying middle of the arrow, along
@@ -608,44 +592,30 @@ var BoxPointer = GObject.registerClass({
         }
     }
 
-    _shiftActor() {
-        // Since the position of the BoxPointer depends on the allocated size
-        // of the BoxPointer and the position of the source actor, trying
-        // to position the BoxPointer via the x/y properties will result in
-        // allocation loops and warnings. Instead we do the positioning via
-        // the anchor point, which is independent of allocation, and leave
-        // x == y == 0.
-        this.set_anchor_point(-(this._xPosition + this._xOffset),
-                              -(this._yPosition + this._yOffset));
-    }
-
     _calculateArrowSide(arrowSide) {
-        let sourceAllocation = Shell.util_get_transformed_allocation(this._sourceActor);
+        let sourceAllocation = this._sourceAllocation;
         let [minWidth, minHeight, boxWidth, boxHeight] = this.get_preferred_size();
-        let monitorActor = this.sourceActor;
+        let workarea = this._workArea;
-        if (!monitorActor)
-            monitorActor = this;
-        let monitor = Main.layoutManager.findMonitorForActor(monitorActor);
 
         switch (arrowSide) {
         case St.Side.TOP:
-            if (sourceAllocation.y2 + boxHeight > monitor.y + monitor.height &&
+            if (sourceAllocation.y2 + boxHeight > workarea.y + workarea.height &&
-                boxHeight < sourceAllocation.y1 - monitor.y)
+                boxHeight < sourceAllocation.y1 - workarea.y)
                 return St.Side.BOTTOM;
             break;
         case St.Side.BOTTOM:
-            if (sourceAllocation.y1 - boxHeight < monitor.y &&
+            if (sourceAllocation.y1 - boxHeight < workarea.y &&
-                boxHeight < monitor.y + monitor.height - sourceAllocation.y2)
+                boxHeight < workarea.y + workarea.height - sourceAllocation.y2)
                 return St.Side.TOP;
             break;
         case St.Side.LEFT:
-            if (sourceAllocation.x2 + boxWidth > monitor.x + monitor.width &&
+            if (sourceAllocation.x2 + boxWidth > workarea.x + workarea.width &&
-                boxWidth < sourceAllocation.x1 - monitor.x)
+                boxWidth < sourceAllocation.x1 - workarea.x)
                 return St.Side.RIGHT;
             break;
         case St.Side.RIGHT:
-            if (sourceAllocation.x1 - boxWidth < monitor.x &&
+            if (sourceAllocation.x1 - boxWidth < workarea.x &&
-                boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
+                boxWidth < workarea.x + workarea.width - sourceAllocation.x2)
                 return St.Side.LEFT;
             break;
         }
@@ -653,38 +623,16 @@ var BoxPointer = GObject.registerClass({
         return arrowSide;
     }
 
-    _updateFlip() {
+    _updateFlip(allocationBox) {
         let arrowSide = this._calculateArrowSide(this._userArrowSide);
         if (this._arrowSide != arrowSide) {
             this._arrowSide = arrowSide;
-            this._reposition();
+            this._reposition(allocationBox);
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
-                this.queue_relayout();
-                return false;
-            });
 
             this.emit('arrow-side-changed');
         }
     }
 
-    set xOffset(offset) {
-        this._xOffset = offset;
-        this._shiftActor();
-    }
-
-    get xOffset() {
-        return this._xOffset;
-    }
-
-    set yOffset(offset) {
-        this._yOffset = offset;
-        this._shiftActor();
-    }
-
-    get yOffset() {
-        return this._yOffset;
-    }
-
     updateArrowSide(side) {
         this._arrowSide = side;
         this._border.queue_repaint();

js/ui/components/automountManager.js

@@ -5,6 +5,7 @@ const Mainloop = imports.mainloop;
 const Params = imports.misc.params;
 
 const GnomeSession = imports.misc.gnomeSession;
+const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
 var GNOME_SESSION_AUTOMOUNT_INHIBIT = 16;
@@ -199,12 +200,20 @@ var AutomountManager = class {
             // error strings are not unique for the cases in the comments below.
             if (e.message.includes('No key available with this passphrase') || // cryptsetup
                 e.message.includes('No key available to unlock device') ||     // udisks (no password)
-                e.message.includes('Error unlocking')) {                       // udisks (wrong password)
+                // libblockdev wrong password opening LUKS device
+                e.message.includes('Failed to activate device: Incorrect passphrase') ||
+                // cryptsetup returns EINVAL in many cases, including wrong TCRYPT password/parameters
+                e.message.includes('Failed to load device\'s parameters: Invalid argument')) {
+
                 this._reaskPassword(volume);
             } else {
+                if (e.message.includes('Compiled against a version of libcryptsetup that does not support the VeraCrypt PIM setting')) {
+                    Main.notifyError(_("Unable to unlock volume"),
+                        _("The installed udisks version does not support the PIM setting"));
+                }
+
                 if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
                     log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
-
                 this._closeOperation(volume);
             }
         }

js/ui/components/keyring.js

@@ -10,9 +10,10 @@ const CheckBox = imports.ui.checkBox;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
-var KeyringDialog = class extends ModalDialog.ModalDialog {
+var KeyringDialog = GObject.registerClass(
-    constructor() {
+class KeyringDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'prompt-dialog' });
+    _init() {
+        super._init({ styleClass: 'prompt-dialog' });
 
         this.prompt = new Shell.KeyringPrompt();
         this.prompt.connect('show-password', this._onShowPassword.bind(this));
@@ -23,20 +24,8 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
         this._content = new Dialog.MessageDialogContent({ icon });
         this.contentLayout.add(this._content);
 
-        // FIXME: Why does this break now?
-        /*
         this.prompt.bind_property('message', this._content, 'title', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('description', this._content, 'body', GObject.BindingFlags.SYNC_CREATE);
-        */
-        this.prompt.connect('notify::message', () => {
-            this._content.title = this.prompt.message;
-        });
-        this._content.title = this.prompt.message;
-
-        this.prompt.connect('notify::description', () => {
-            this._content.body = this.prompt.description;
-        });
-        this._content.body = this.prompt.description;
 
         this._workSpinner = null;
         this._controlTable = null;
@@ -224,7 +213,7 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
     _onCancelButton() {
         this.prompt.cancel();
     }
-};
+});
 
 var KeyringDummyDialog = class {
     constructor() {

js/ui/components/networkAgent.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, NM, Pango, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Config = imports.misc.config;
@@ -12,9 +12,10 @@ const ShellEntry = imports.ui.shellEntry;
 
 const VPN_UI_GROUP = 'VPN Plugin UI';
 
-var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
+var NetworkSecretDialog = GObject.registerClass(
-    constructor(agent, requestId, connection, settingName, hints, flags, contentOverride) {
+class NetworkSecretDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'prompt-dialog' });
+    _init(agent, requestId, connection, settingName, hints, flags, contentOverride) {
+        super._init({ styleClass: 'prompt-dialog' });
 
         this._agent = agent;
         this._requestId = requestId;
@@ -347,7 +348,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
 
         return content;
     }
-};
+});
 
 var VPNRequestHandler = class {
     constructor(agent, requestId, authHelper, serviceType, connection, hints, flags) {

js/ui/components/polkitAgent.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const { AccountsService, Clutter, Gio, GLib,
-        Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
+        GObject, Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Animation = imports.ui.animation;
@@ -15,9 +15,11 @@ var DIALOG_ICON_SIZE = 48;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
-var AuthenticationDialog = class extends ModalDialog.ModalDialog {
+var AuthenticationDialog = GObject.registerClass({
-    constructor(actionId, body, cookie, userNames) {
+    Signals: { 'done': { param_types: [GObject.TYPE_BOOLEAN] } }
-        super({ styleClass: 'prompt-dialog' });
+}, class AuthenticationDialog extends ModalDialog.ModalDialog {
+    _init(actionId, body, cookie, userNames) {
+        super._init({ styleClass: 'prompt-dialog' });
 
         this.actionId = actionId;
         this.message = body;
@@ -25,7 +27,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         this._wasDismissed = false;
 
         this._sessionUpdatedId = Main.sessionMode.connect('updated', () => {
-            this._group.visible = !Main.sessionMode.isLocked;
+            this.visible = !Main.sessionMode.isLocked;
         });
 
         this.connect('closed', this._onDialogClosed.bind(this));
@@ -326,8 +328,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
 
         this._destroySession();
     }
-};
+});
-Signals.addSignalMethods(AuthenticationDialog.prototype);
 
 var AuthenticationAgent = class {
     constructor() {

js/ui/components/telepathyClient.js

@@ -401,7 +401,7 @@ var ChatSource = class extends MessageTray.Source {
         if (this._client.is_handling_channel(this._channel)) {
             // We are handling the channel, try to pass it to Empathy or Polari
             // (depending on the channel type)
-            // We don't check if either app is availble - mission control will
+            // We don't check if either app is available - mission control will
             // fallback to something else if activation fails
 
             let target;

js/ui/dash.js

@@ -584,22 +584,18 @@ var Dash = class Dash {
         let firstButton = iconChildren[0].child;
         let firstIcon = firstButton._delegate.icon;
 
-        let minHeight, natHeight;
+        // Enforce valid spacings during the size request
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-
-        // Enforce the current icon size during the size request
         firstIcon.icon.ensure_style();
-        let [, currentHeight] = firstIcon.icon.get_size();
+        let [, iconHeight] = firstIcon.icon.get_preferred_height(-1);
-        firstIcon.icon.set_height(this.iconSize * scaleFactor);
+        let [, buttonHeight] = firstButton.get_preferred_height(-1);
-        [minHeight, natHeight] = firstButton.get_preferred_height(-1);
-        firstIcon.icon.set_height(currentHeight);
 
         // Subtract icon padding and box spacing from the available height
-        availHeight -= iconChildren.length * (natHeight - this.iconSize * scaleFactor) +
+        availHeight -= iconChildren.length * (buttonHeight - iconHeight) +
                        (iconChildren.length - 1) * spacing;
 
         let availSize = availHeight / iconChildren.length;
 
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         let iconSizes = baseIconSizes.map(s => s * scaleFactor);
 
         let newIconSize = baseIconSizes[0];
@@ -903,7 +899,7 @@ var Dash = class Dash {
                 favPos++;
         }
 
-        // No drag placeholder means we don't wan't to favorite the app
+        // No drag placeholder means we don't want to favorite the app
         // and we are dragging it to its original position
         if (!this._dragPlaceholder)
             return true;

js/ui/dateMenu.js

@@ -118,7 +118,7 @@ var WorldClocksSection = class WorldClocksSection {
             if (!clocks[i].location)
                 continue;
             let l = world.deserialize(clocks[i].location);
-            if (l)
+            if (l && l.get_timezone() != null)
                 this._locations.push({ location: l });
         }
 
@@ -136,11 +136,12 @@ var WorldClocksSection = class WorldClocksSection {
         layout.attach(header, 0, 0, 2, 1);
         this.actor.label_actor = header;
 
+        let localOffset = GLib.DateTime.new_now_local().get_utc_offset();
+
         for (let i = 0; i < this._locations.length; i++) {
             let l = this._locations[i].location;
 
-            let name = l.get_level() == GWeather.LocationLevel.NAMED_TIMEZONE ? l.get_name()
+            let name = l.get_city_name() || l.get_name();
-                                                                              : l.get_city_name();
             let label = new St.Label({ style_class: 'world-clocks-city',
                                        text: name,
                                        x_align: Clutter.ActorAlign.START,
@@ -149,7 +150,8 @@ var WorldClocksSection = class WorldClocksSection {
 
             let time = new St.Label({ style_class: 'world-clocks-time' });
 
-            let offset = l.get_timezone().get_offset() / 60.;
+            let otherOffset = this._getTimeAtLocation(l).get_utc_offset();
+            let offset = (otherOffset - localOffset) / GLib.TIME_SPAN_HOUR;
             let fmt = (Math.trunc(offset) == offset) ? '%s%.0f' : '%s%.1f';
             let prefix = (offset >= 0) ? '+' : '-';
             let tz = new St.Label({ style_class: 'world-clocks-timezone',
@@ -182,11 +184,15 @@ var WorldClocksSection = class WorldClocksSection {
         }
     }
 
+    _getTimeAtLocation(location) {
+        let tz = GLib.TimeZone.new(location.get_timezone().get_tzid());
+        return GLib.DateTime.new_now(tz);
+    }
+
     _updateLabels() {
         for (let i = 0; i < this._locations.length; i++) {
             let l = this._locations[i];
-            let tz = GLib.TimeZone.new(l.location.get_timezone().get_tzid());
+            let now = this._getTimeAtLocation(l.location);
-            let now = GLib.DateTime.new_now(tz);
             l.actor.text = Util.formatTime(now, { timeOnly: true });
         }
     }
@@ -470,10 +476,9 @@ class DateMenuButton extends PanelMenu.Button {
         box.add_actor(this._clockDisplay);
         box.add_actor(this._indicator.actor);
 
-        this.actor.label_actor = this._clockDisplay;
+        this.label_actor = this._clockDisplay;
-        this.actor.add_actor(box);
+        this.add_actor(box);
-        this.actor.add_style_class_name ('clock-display');
+        this.add_style_class_name ('clock-display');
-
 
         let layout = new FreezableBinLayout();
         let bin = new St.Widget({ layout_manager: layout });

js/ui/dialog.js

@@ -175,10 +175,10 @@ var MessageDialogContent = GObject.registerClass({
             this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
         });
 
-        let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
+        let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
                           line_wrap: true };
-        Object.assign(this._subtitle.clutter_text, textProps);
+        this._subtitle.clutter_text.set(textProps);
-        Object.assign(this._body.clutter_text, textProps);
+        this._body.clutter_text.set(textProps);
 
         if (!params.hasOwnProperty('style_class'))
             params.style_class = 'message-dialog-main-layout';

js/ui/dnd.js

@@ -306,6 +306,9 @@ var _Draggable = class _Draggable {
      * for the draggable.
      */
     startDrag(stageX, stageY, time, sequence, device) {
+        if (currentDraggable)
+            return;
+
         if (device == undefined) {
             let event = Clutter.get_current_event();
 
@@ -447,7 +450,8 @@ var _Draggable = class _Draggable {
         let [stageX, stageY] = event.get_coords();
 
         // See if the user has moved the mouse enough to trigger a drag
-        let threshold = St.Settings.get().drag_threshold;
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        let threshold = St.Settings.get().drag_threshold * scaleFactor;
         if (!currentDraggable &&
             (Math.abs(stageX - this._dragStartX) > threshold ||
              Math.abs(stageY - this._dragStartY) > threshold)) {

js/ui/endSessionDialog.js

@@ -19,7 +19,7 @@
 const Mainloop = imports.mainloop;
 
 const { AccountsService, Clutter, Gio,
-        GLib, Pango, Polkit, Shell, St }  = imports.gi;
+        GLib, GObject, Pango, Polkit, Shell, St }  = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;
@@ -226,10 +226,11 @@ function init() {
     _endSessionDialog = new EndSessionDialog();
 }
 
-var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
+var EndSessionDialog = GObject.registerClass(
-    constructor() {
+class EndSessionDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'end-session-dialog',
+    _init() {
-                destroyOnClose: false });
+        super._init({ styleClass: 'end-session-dialog',
+                      destroyOnClose: false });
 
         this._loginManager = LoginManager.getLoginManager();
         this._userManager = AccountsService.UserManager.get_default();
@@ -747,4 +748,4 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog {
     Close(parameters, invocation) {
         this.close();
     }
-};
+});

js/ui/environment.js

@@ -96,6 +96,15 @@ function init() {
     Clutter.Actor.prototype.toString = function() {
         return St.describe_actor(this);
     };
+    // Deprecation warning for former JS classes turned into an actor subclass
+    Object.defineProperty(Clutter.Actor.prototype, 'actor', {
+        get() {
+            let klass = this.constructor.name;
+            let { stack } = new Error();
+            log(`Usage of object.actor is deprecated for ${klass}\n${stack}`);
+            return this;
+        }
+    });
 
     let origToString = Object.prototype.toString;
     Object.prototype.toString = function() {

js/ui/extensionDownloader.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, Soup, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Soup, St } = imports.gi;
 
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
@@ -176,10 +176,10 @@ function checkForUpdates() {
     });
 }
 
-var InstallExtensionDialog =
+var InstallExtensionDialog = GObject.registerClass(
 class InstallExtensionDialog extends ModalDialog.ModalDialog {
-    constructor(uuid, info, invocation) {
+    _init(uuid, info, invocation) {
-        super({ styleClass: 'extension-dialog' });
+        super._init({ styleClass: 'extension-dialog' });
 
         this._uuid = uuid;
         this._info = info;
@@ -255,7 +255,7 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
 
         this.close();
     }
-};
+});
 
 function init() {
     _httpSession = new Soup.SessionAsync({ ssl_use_system_ca_file: true });

js/ui/grabHelper.js

@@ -43,6 +43,9 @@ function _popGrabHelper(grabHelper) {
 // call grab().
 var GrabHelper = class GrabHelper {
     constructor(owner, params) {
+        if (!(owner instanceof Clutter.Actor))
+            throw new Error('GrabHelper owner must be a Clutter.Actor');
+
         this._owner = owner;
         this._modalParams = params;
 

js/ui/ibusCandidatePopup.js

@@ -272,7 +272,7 @@ var CandidatePopup = class CandidatePopup {
 
     _setDummyCursorGeometry(x, y, w, h) {
         Main.layoutManager.setDummyCursorGeometry(x, y, w, h);
-        if (this._boxPointer.actor.visible)
+        if (this._boxPointer.visible)
             this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
     }
 
@@ -285,7 +285,7 @@ var CandidatePopup = class CandidatePopup {
         if (isVisible) {
             this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
             this._boxPointer.open(BoxPointer.PopupAnimation.NONE);
-            this._boxPointer.actor.raise_top();
+            this._boxPointer.raise_top();
         } else {
             this._boxPointer.close(BoxPointer.PopupAnimation.NONE);
         }

js/ui/iconGrid.js

@@ -43,8 +43,6 @@ class BaseIcon extends St.Bin {
                       x_fill: true,
                       y_fill: true });
 
-        this.actor = this;
-
         this.connect('destroy', this._onDestroy.bind(this));
 
         this._box = new St.BoxLayout({ vertical: true });
@@ -81,7 +79,7 @@ class BaseIcon extends St.Bin {
     // This can be overridden by a subclass, or by the createIcon
     // parameter to _init()
     createIcon(size) {
-        throw new Error('no implementation of createIcon in ' + this);
+        throw new GObject.NotImplementedError(`createIcon in ${this.constructor.name}`);
     }
 
     setIconSize(size) {
@@ -104,6 +102,7 @@ class BaseIcon extends St.Bin {
     }
 
     vfunc_style_changed() {
+        super.vfunc_style_changed();
         let node = this.get_theme_node();
 
         let size;
@@ -187,8 +186,6 @@ var IconGrid = GObject.registerClass({
         super._init({ style_class: 'icon-grid',
                       y_align: Clutter.ActorAlign.START });
 
-        this.actor = this;
-
         params = Params.parse(params, { rowLimit: null,
                                         columnLimit: null,
                                         minRows: 1,
@@ -325,6 +322,7 @@ var IconGrid = GObject.registerClass({
                 leftEmptySpace = availWidth - usedWidth;
         }
 
+        let animating = this._clonesAnimating.length > 0;
         let x = box.x1 + leftEmptySpace + this.leftPadding;
         let y = box.y1 + this.topPadding;
         let columnIndex = 0;
@@ -334,10 +332,11 @@ var IconGrid = GObject.registerClass({
 
             if (this._rowLimit && rowIndex >= this._rowLimit ||
                 this._fillParent && childBox.y2 > availHeight - this.bottomPadding) {
-                children[i].hide();
+                children[i].opacity = 0;
             } else {
+                if (!animating)
+                    children[i].opacity = 255;
                 children[i].allocate(childBox, flags);
-                children[i].show();
             }
 
             columnIndex++;
@@ -381,7 +380,7 @@ var IconGrid = GObject.registerClass({
              child != null;
              child = child.get_next_sibling()) {
 
-            if (!child.visible)
+            if (!child.visible || !child.opacity)
                 continue;
 
             let childVolume = child.get_transformed_paint_volume(this);
@@ -419,7 +418,8 @@ var IconGrid = GObject.registerClass({
 
     animatePulse(animationDirection) {
         if (animationDirection != AnimationDirection.IN)
-            throw new Error("Pulse animation only implements 'in' animation direction");
+            throw new GObject.NotImplementedError("Pulse animation only implements " +
+                                                  "'in' animation direction");
 
         this._cancelAnimation();
 
@@ -843,7 +843,7 @@ var PaginatedIconGrid = GObject.registerClass({
         }
     }
 
-    // Overriden from IconGrid
+    // Overridden from IconGrid
     _getChildrenToAnimate() {
         let children = this._getVisibleChildren();
         let firstIndex = this._childrenPerPage * this.currentPage;

js/ui/keyboard.js

@@ -282,11 +282,11 @@ var Key = class Key {
                                                        y_fill: true,
                                                        x_align: St.Align.START });
         this._boxPointer.hide();
-        Main.layoutManager.addChrome(this._boxPointer.actor);
+        Main.layoutManager.addTopChrome(this._boxPointer);
         this._boxPointer.setPosition(this.keyButton, 0.5);
 
         // Adds style to existing keyboard style to avoid repetition
-        this._boxPointer.actor.add_style_class_name('keyboard-subkeys');
+        this._boxPointer.add_style_class_name('keyboard-subkeys');
         this._getExtendedKeys();
         this.keyButton._extended_keys = this._extended_keyboard;
     }
@@ -1049,7 +1049,7 @@ var Keyboard = class Keyboard {
         this._a11yApplicationsSettings.connect('changed', this._syncEnabled.bind(this));
         this._lastDeviceId = null;
         this._suggestions = null;
-        this._emojiKeyVisible = true;
+        this._emojiKeyVisible = Meta.is_wayland_compositor();
 
         this._focusTracker = new FocusTracker();
         this._focusTracker.connect('position-changed', this._onFocusPositionChanged.bind(this));
@@ -1144,6 +1144,7 @@ var Keyboard = class Keyboard {
             this._keyboardController.disconnect(this._keypadVisibleId);
         if (this._focusNotifyId)
             global.stage.disconnect(this._focusNotifyId);
+        this._clearShowIdle();
         this._keyboard = null;
         this.actor.destroy();
         this.actor = null;
@@ -1162,7 +1163,7 @@ var Keyboard = class Keyboard {
         this._keyboardController = new KeyboardController();
 
         this._groups = {};
-        this._current_page = null;
+        this._currentPage = null;
 
         this._suggestions = new Suggestions();
         this.actor.add(this._suggestions.actor,
@@ -1202,10 +1203,12 @@ var Keyboard = class Keyboard {
         this._keyboardNotifyId = this._keyboardController.connect('active-group', this._onGroupChanged.bind(this));
         this._keyboardGroupsChangedId = this._keyboardController.connect('groups-changed', this._onKeyboardGroupsChanged.bind(this));
         this._keyboardStateId = this._keyboardController.connect('panel-state', this._onKeyboardStateChanged.bind(this));
-        this._emojiKeyVisibleId = this._keyboardController.connect('emoji-visible', this._onEmojiKeyVisible.bind(this));
         this._keypadVisibleId = this._keyboardController.connect('keypad-visible', this._onKeypadVisible.bind(this));
         this._focusNotifyId = global.stage.connect('notify::key-focus', this._onKeyFocusChanged.bind(this));
 
+        if (Meta.is_wayland_compositor())
+            this._emojiKeyVisibleId = this._keyboardController.connect('emoji-visible', this._onEmojiKeyVisible.bind(this));
+
         this._relayout();
     }
 
@@ -1227,6 +1230,7 @@ var Keyboard = class Keyboard {
         if (!this._showIdleId) {
           this._showIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
               this.show(Main.layoutManager.focusIndex);
+              this._showIdleId = 0;
               return GLib.SOURCE_REMOVE;
           });
           GLib.Source.set_name_by_id(this._showIdleId, '[gnome-shell] this.show');
@@ -1302,7 +1306,7 @@ var Keyboard = class Keyboard {
             this._languagePopup.destroy();
 
         this._languagePopup = new LanguageSelectionPopup(keyActor);
-        Main.layoutManager.addChrome(this._languagePopup.actor);
+        Main.layoutManager.addTopChrome(this._languagePopup.actor);
         this._languagePopup.open(true);
     }
 
@@ -1353,7 +1357,7 @@ var Keyboard = class Keyboard {
             } else if (switchToLevel == 1) {
                 extraButton.connect('long-press', () => {
                     this._latched = true;
-                    this._setCurrentLevelLatched(this._current_page, this._latched);
+                    this._setCurrentLevelLatched(this._currentPage, this._latched);
                 });
             }
 
@@ -1380,8 +1384,8 @@ var Keyboard = class Keyboard {
     }
 
     _updateCurrentPageVisible() {
-        if (this._current_page)
+        if (this._currentPage)
-            this._current_page.visible = !this._emojiActive && !this._keypadVisible;
+            this._currentPage.visible = !this._emojiActive && !this._keypadVisible;
     }
 
     _setEmojiActive(active) {
@@ -1440,7 +1444,7 @@ var Keyboard = class Keyboard {
 
     _getGridSlots() {
         let numOfHorizSlots = 0, numOfVertSlots;
-        let rows = this._current_page.get_children();
+        let rows = this._currentPage.get_children();
         numOfVertSlots = rows.length;
 
         for (let i = 0; i < rows.length; ++i) {
@@ -1470,7 +1474,12 @@ var Keyboard = class Keyboard {
     }
 
     _onKeyboardGroupsChanged(keyboard) {
-        this._groups = [];
+        let nonGroupActors = [this._emojiSelection.actor, this._keypad.actor];
+        this._aspectContainer.get_children().filter(c => !nonGroupActors.includes(c)).forEach(c => {
+            c.destroy();
+        });
+
+        this._groups = {};
         this._onGroupChanged();
     }
 
@@ -1512,13 +1521,24 @@ var Keyboard = class Keyboard {
     _setActiveLayer(activeLevel) {
         let activeGroupName = this._keyboardController.getCurrentGroup();
         let layers = this._groups[activeGroupName];
+        let currentPage = layers[activeLevel];
 
-        if (this._current_page != null) {
+        if (this._currentPage == currentPage) {
-            this._setCurrentLevelLatched(this._current_page, false);
+            this._updateCurrentPageVisible();
-            this._current_page.hide();
+            return;
         }
 
-        this._current_page = layers[activeLevel];
+        if (this._currentPage != null) {
+            this._setCurrentLevelLatched(this._currentPage, false);
+            this._currentPage.disconnect(this._currentPage._destroyID);
+            this._currentPage.hide();
+            delete this._currentPage._destroyID;
+        }
+
+        this._currentPage = currentPage;
+        this._currentPage._destroyID = this._currentPage.connect('destroy', () => {
+            this._currentPage = null;
+        });
         this._updateCurrentPageVisible();
     }
 
@@ -1606,18 +1626,6 @@ var Keyboard = class Keyboard {
         this.setCursorLocation(null);
     }
 
-    _hideSubkeys() {
-        if (this._subkeysBoxPointer) {
-            this._subkeysBoxPointer.hide(BoxPointer.PopupAnimation.FULL);
-            this._subkeysBoxPointer = null;
-        }
-        if (this._capturedEventId) {
-            this.actor.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-        this._capturedPress = false;
-    }
-
     resetSuggestions() {
         if (this._suggestions)
             this._suggestions.clear();

js/ui/layout.js

@@ -11,6 +11,7 @@ const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
+const Ripples = imports.ui.ripples;
 
 var STARTUP_ANIMATION_TIME = 0.5;
 var KEYBOARD_ANIMATION_TIME = 0.15;
@@ -160,6 +161,19 @@ var Monitor = class Monitor {
     }
 };
 
+const UiActor = GObject.registerClass(
+class UiActor extends St.Widget {
+    vfunc_get_preferred_width (forHeight) {
+        let width = global.stage.width;
+        return [width, width];
+    }
+
+    vfunc_get_preferred_height (forWidth) {
+        let height = global.stage.height;
+        return [height, height];
+    }
+});
+
 const defaultParams = {
     trackFullscreen: false,
     affectsStruts: false,
@@ -200,17 +214,20 @@ var LayoutManager = GObject.registerClass({
         global.stage.no_clear_hint = true;
 
         // Set up stage hierarchy to group all UI actors under one container.
-        this.uiGroup = new St.Widget({ name: 'uiGroup' });
+        this.uiGroup = new UiActor({ name: 'uiGroup' });
         this.uiGroup.set_flags(Clutter.ActorFlags.NO_LAYOUT);
-        this.uiGroup.add_constraint(new Clutter.BindConstraint({
+
-            source: global.stage,
+        global.stage.add_child(this.uiGroup);
-            coordinate: Clutter.BindCoordinate.ALL,
-        }));
 
         global.stage.remove_actor(global.window_group);
         this.uiGroup.add_actor(global.window_group);
 
-        global.stage.add_child(this.uiGroup);
+        // Using addChrome() to add actors to uiGroup will position actors
+        // underneath the top_window_group.
+        // To insert actors at the top of uiGroup, we use addTopChrome() or
+        // add the actor directly using uiGroup.add_actor().
+        global.stage.remove_actor(global.top_window_group);
+        this.uiGroup.add_actor(global.top_window_group);
 
         this.overviewGroup = new St.Widget({ name: 'overviewGroup',
                                              visible: false,
@@ -238,17 +255,14 @@ var LayoutManager = GObject.registerClass({
         this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                               reactive: true,
                                               track_hover: true });
-        this.addChrome(this.keyboardBox);
+        this.addTopChrome(this.keyboardBox);
         this._keyboardHeightNotifyId = 0;
 
         // A dummy actor that tracks the mouse or text cursor, based on the
         // position and size set in setDummyCursorGeometry.
-        this.dummyCursor = new St.Widget({ width: 0, height: 0, visible: false });
+        this.dummyCursor = new St.Widget({ width: 0, height: 0, opacity: 0 });
         this.uiGroup.add_actor(this.dummyCursor);
 
-        global.stage.remove_actor(global.top_window_group);
-        this.uiGroup.add_actor(global.top_window_group);
-
         let feedbackGroup = Meta.get_feedback_group_for_display(global.display);
         global.stage.remove_actor(feedbackGroup);
         this.uiGroup.add_actor(feedbackGroup);
@@ -793,6 +807,16 @@ var LayoutManager = GObject.registerClass({
         this._trackActor(actor, params);
     }
 
+    // addTopChrome:
+    // @actor: an actor to add to the chrome
+    // @params: (optional) additional params
+    //
+    // Like addChrome(), but adds @actor above all windows, including popups.
+    addTopChrome(actor, params) {
+        this.uiGroup.add_actor(actor);
+        this._trackActor(actor, params);
+    }
+
     // trackChrome:
     // @actor: a descendant of the chrome to begin tracking
     // @params: parameters describing how to track @actor
@@ -1049,8 +1073,7 @@ var LayoutManager = GObject.registerClass({
             }
         }
 
-        if (!Meta.is_wayland_compositor())
+        global.set_stage_input_region(rects);
-            global.set_stage_input_region(rects);
         this._isPopupWindowVisible = isPopupMenuVisible;
 
         let workspaceManager = global.workspace_manager;
@@ -1095,14 +1118,15 @@ var HotCorner = class HotCorner {
                                                     Shell.ActionMode.OVERVIEW);
         this._pressureBarrier.connect('trigger', this._toggleOverview.bind(this));
 
-        // Cache the three ripples instead of dynamically creating and destroying them.
+        let px = 0.0;
-        this._ripple1 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
+        let py = 0.0;
-        this._ripple2 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
-        this._ripple3 = new St.BoxLayout({ style_class: 'ripple-box', opacity: 0, visible: false });
+            px = 1.0;
+            py = 0.0;
+        }
 
-        layoutManager.uiGroup.add_actor(this._ripple1);
+        this._ripples = new Ripples.Ripples(px, py, 'ripple-box');
-        layoutManager.uiGroup.add_actor(this._ripple2);
+        this._ripples.addTo(layoutManager.uiGroup);
-        layoutManager.uiGroup.add_actor(this._ripple3);
     }
 
     setBarrierSize(size) {
@@ -1184,53 +1208,12 @@ var HotCorner = class HotCorner {
             this.actor.destroy();
     }
 
-    _animRipple(ripple, delay, time, startScale, startOpacity, finalScale) {
-        // We draw a ripple by using a source image and animating it scaling
-        // outwards and fading away. We want the ripples to move linearly
-        // or it looks unrealistic, but if the opacity of the ripple goes
-        // linearly to zero it fades away too quickly, so we use Tweener's
-        // 'onUpdate' to give a non-linear curve to the fade-away and make
-        // it more visible in the middle section.
-
-        ripple._opacity = startOpacity;
-
-        if (ripple.get_text_direction() == Clutter.TextDirection.RTL)
-            ripple.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
-
-        ripple.visible = true;
-        ripple.opacity = 255 * Math.sqrt(startOpacity);
-        ripple.scale_x = ripple.scale_y = startScale;
-
-        ripple.x = this._x;
-        ripple.y = this._y;
-
-        Tweener.addTween(ripple, { _opacity: 0,
-                                   scale_x: finalScale,
-                                   scale_y: finalScale,
-                                   delay: delay,
-                                   time: time,
-                                   transition: 'linear',
-                                   onUpdate() { ripple.opacity = 255 * Math.sqrt(ripple._opacity); },
-                                   onComplete() { ripple.visible = false; } });
-    }
-
-    _rippleAnimation() {
-        // Show three concentric ripples expanding outwards; the exact
-        // parameters were found by trial and error, so don't look
-        // for them to make perfect sense mathematically
-
-        //                              delay  time  scale opacity => scale
-        this._animRipple(this._ripple1, 0.0,   0.83,  0.25,  1.0,     1.5);
-        this._animRipple(this._ripple2, 0.05,  1.0,   0.0,   0.7,     1.25);
-        this._animRipple(this._ripple3, 0.35,  1.0,   0.0,   0.3,     1);
-    }
-
     _toggleOverview() {
         if (this._monitor.inFullscreen && !Main.overview.visible)
             return;
 
         if (Main.overview.shouldToggleByCornerOrButton()) {
-            this._rippleAnimation();
+            this._ripples.playAnimation(this._x, this._y);
             Main.overview.toggle();
         }
     }

js/ui/lightbox.js

@@ -7,7 +7,7 @@ const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
 var DEFAULT_FADE_FACTOR = 0.4;
-var VIGNETTE_BRIGHTNESS = 0.8;
+var VIGNETTE_BRIGHTNESS = 0.2;
 var VIGNETTE_SHARPNESS = 0.7;
 
 const VIGNETTE_DECLARATIONS = '\

js/ui/locatePointer.js

@@ -0,0 +1,24 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const { Clutter, Gio, GLib, St } = imports.gi;
+const Ripples = imports.ui.ripples;
+const Main = imports.ui.main;
+
+const LOCATE_POINTER_KEY = "locate-pointer";
+const LOCATE_POINTER_SCHEMA = "org.gnome.desktop.interface"
+
+var locatePointer = class {
+    constructor() {
+        this._settings = new Gio.Settings({schema_id: LOCATE_POINTER_SCHEMA});
+        this._ripples = new Ripples.Ripples(0.5, 0.5, 'ripple-pointer-location');
+        this._ripples.addTo(Main.uiGroup);
+    }
+
+    show() {
+        if (!this._settings.get_boolean("locate-pointer"))
+            return;
+
+        let [x, y, mods] = global.get_pointer();
+        this._ripples.playAnimation(x, y);
+    }
+};

js/ui/magnifier.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Atspi, Clutter, Cogl, GDesktopEnums,
+const { Atspi, Clutter, GDesktopEnums,
         Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
@@ -18,9 +18,6 @@ var NO_CHANGE = 0.0;
 var POINTER_REST_TIME = 1000; // milliseconds
 
 // Settings
-const APPLICATIONS_SCHEMA       = 'org.gnome.desktop.a11y.applications';
-const SHOW_KEY                  = 'screen-magnifier-enabled';
-
 const MAGNIFIER_SCHEMA          = 'org.gnome.desktop.a11y.magnifier';
 const SCREEN_POSITION_KEY       = 'screen-position';
 const MAG_FACTOR_KEY            = 'mag-factor';
@@ -56,22 +53,19 @@ var MouseSpriteContent = GObject.registerClass({
 
     vfunc_get_preferred_size() {
         if (!this._texture)
-            return [0, 0];
+            return [false, 0, 0];
 
-        return [this._texture.get_width(), this._texture.get_height()];
+        return [true, this._texture.get_width(), this._texture.get_height()];
     }
 
     vfunc_paint_content(actor, node) {
         if (!this._texture)
             return;
 
-        let color = new Cogl.Color();
+        let color = Clutter.Color.get_static(Clutter.StaticColor.WHITE);
-        color.init_from_4ub(0, 0, 0, 0);
+        let [minFilter, magFilter] = actor.get_content_scaling_filters();
-
         let textureNode = new Clutter.TextureNode(this._texture,
-                                                  color,
+                                                  color, minFilter, magFilter);
-                                                  Clutter.ScalingFilter.NEAREST,
-                                                  Clutter.ScalingFilter.NEAREST);
         textureNode.set_name('MouseSpriteContent');
         node.add_child(textureNode);
 
@@ -86,8 +80,14 @@ var MouseSpriteContent = GObject.registerClass({
         if (this._texture == coglTexture)
             return;
 
+        let oldTexture = this._texture;
         this._texture = coglTexture;
         this.invalidate();
+
+        if (!oldTexture || !coglTexture ||
+            oldTexture.get_width() != coglTexture.get_width() ||
+            oldTexture.get_height() != coglTexture.get_height())
+            this.invalidate_size();
     }
 });
 
@@ -102,7 +102,6 @@ var Magnifier = class Magnifier {
 
         this._mouseSprite = new Clutter.Actor({ request_mode: Clutter.RequestMode.CONTENT_SIZE });
         this._mouseSprite.content = new MouseSpriteContent();
-        this._updateSpriteTexture();
 
         this._cursorRoot = new Clutter.Actor();
         this._cursorRoot.add_actor(this._mouseSprite);
@@ -115,14 +114,16 @@ var Magnifier = class Magnifier {
 
         let aZoomRegion = new ZoomRegion(this, this._cursorRoot);
         this._zoomRegions.push(aZoomRegion);
-        let showAtLaunch = this._settingsInit(aZoomRegion);
+        this._settingsInit(aZoomRegion);
         aZoomRegion.scrollContentsTo(this.xMouse, this.yMouse);
 
-        cursorTracker.connect('cursor-changed', this._updateMouseSprite.bind(this));
+        St.Settings.get().connect('notify::magnifier-active', () => {
+            this.setActive(St.Settings.get().magnifier_active);
+        });
 
         // Export to dbus.
         magDBusService = new MagnifierDBus.ShellMagnifier();
-        this.setActive(showAtLaunch);
+        this.setActive(St.Settings.get().magnifier_active);
     }
 
     /**
@@ -155,9 +156,15 @@ var Magnifier = class Magnifier {
 
         if (isActive != activate) {
             if (activate) {
+                this._updateMouseSprite();
+                this._cursorSpriteChangedId =
+                    this._cursorTracker.connect('cursor-changed',
+                                                this._updateMouseSprite.bind(this));
                 Meta.disable_unredirect_for_display(global.display);
                 this.startTrackingMouse();
             } else {
+                this._cursorTracker.disconnect(this._cursorSpriteChangedId);
+                this._mouseSprite.content.texture = null;
                 Meta.enable_unredirect_for_display(global.display);
                 this.stopTrackingMouse();
             }
@@ -495,13 +502,8 @@ var Magnifier = class Magnifier {
     }
 
     _settingsInit(zoomRegion) {
-        this._appSettings = new Gio.Settings({ schema_id: APPLICATIONS_SCHEMA });
         this._settings = new Gio.Settings({ schema_id: MAGNIFIER_SCHEMA });
 
-        this._appSettings.connect('changed::' + SHOW_KEY, () => {
-            this.setActive(this._appSettings.get_boolean(SHOW_KEY));
-        });
-
         this._settings.connect('changed::' + SCREEN_POSITION_KEY,
                                this._updateScreenPosition.bind(this));
         this._settings.connect('changed::' + MAG_FACTOR_KEY,
@@ -608,8 +610,6 @@ var Magnifier = class Magnifier {
         let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
         this.addCrosshairs();
         this.setCrosshairsVisible(showCrosshairs);
-
-        return this._appSettings.get_boolean(SHOW_KEY);
    }
 
     _updateScreenPosition() {
@@ -756,13 +756,41 @@ var ZoomRegion = class ZoomRegion {
 
         this._pointerIdleMonitor = Meta.IdleMonitor.get_for_device(Meta.VIRTUAL_CORE_POINTER_ID);
         this._scrollContentsTimerId = 0;
+    }
 
-        Main.layoutManager.connect('monitors-changed',
+    _connectSignals() {
-                                   this._monitorsChanged.bind(this));
+        if (this._signalConnections)
-        this._focusCaretTracker.connect('caret-moved',
+            return;
-                                    this._updateCaret.bind(this));
+
-        this._focusCaretTracker.connect('focus-changed',
+        this._signalConnections = [];
-                                    this._updateFocus.bind(this));
+        let id = Main.layoutManager.connect('monitors-changed',
+                                            this._monitorsChanged.bind(this));
+        this._signalConnections.push([Main.layoutManager, id]);
+
+        id = this._focusCaretTracker.connect('caret-moved', this._updateCaret.bind(this));
+        this._signalConnections.push([this._focusCaretTracker, id]);
+
+        id = this._focusCaretTracker.connect('focus-changed', this._updateFocus.bind(this));
+        this._signalConnections.push([this._focusCaretTracker, id]);
+    }
+
+    _disconnectSignals() {
+        for (let [obj, id] of this._signalConnections)
+            obj.disconnect(id);
+
+        delete this._signalConnections;
+    }
+
+    _updateScreenPosition() {
+        if (this._screenPosition == GDesktopEnums.MagnifierScreenPosition.NONE)
+            this._setViewPort({
+                x: this._viewPortX,
+                y: this._viewPortY,
+                width: this._viewPortWidth,
+                height: this._viewPortHeight
+            });
+        else
+            this.setScreenPosition(this._screenPosition);
     }
 
     _updateFocus(caller, event) {
@@ -810,10 +838,13 @@ var ZoomRegion = class ZoomRegion {
             this._createActors();
             if (this._isMouseOverRegion())
                 this._magnifier.hideSystemCursor();
+            this._updateScreenPosition();
             this._updateMagViewGeometry();
             this._updateCloneGeometry();
             this._updateMousePosition();
+            this._connectSignals();
         } else {
+            this._disconnectSignals();
             this._destroyActors();
         }
 
@@ -1241,7 +1272,7 @@ var ZoomRegion = class ZoomRegion {
 
     /**
      * getContrast:
-     * Retreive the contrast of the magnified view.
+     * Retrieve the contrast of the magnified view.
      * @return  Object containing the contrast for the red, green,
      *          and blue channels.
      */
@@ -1563,18 +1594,8 @@ var ZoomRegion = class ZoomRegion {
     }
 
     _monitorsChanged() {
-        if (!this.isActive())
-            return;
-
         this._background.set_size(global.screen_width, global.screen_height);
-
+        this._updateScreenPosition();
-        if (this._screenPosition == GDesktopEnums.MagnifierScreenPosition.NONE)
-            this._setViewPort({ x: this._viewPortX,
-                                y: this._viewPortY,
-                                width: this._viewPortWidth,
-                                height: this._viewPortHeight });
-        else
-            this.setScreenPosition(this._screenPosition);
     }
 };
 

js/ui/main.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
 
 const AccessDialog = imports.ui.accessDialog;
@@ -37,9 +37,12 @@ const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
 const KbdA11yDialog = imports.ui.kbdA11yDialog;
+const LocatePointer = imports.ui.locatePointer;
+const PointerA11yTimeout = imports.ui.pointerA11yTimeout;
 
 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
 const STICKY_KEYS_ENABLE = 'stickykeys-enable';
+const LOG_DOMAIN = 'GNOME Shell';
 const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a';
 
 var componentManager = null;
@@ -74,12 +77,14 @@ var layoutManager = null;
 var kbdA11yDialog = null;
 var inputMethod = null;
 var introspectService = null;
+var locatePointer = null;
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
 let _a11ySettings = null;
 let _themeResource = null;
 let _oskResource = null;
+let pointerA11yTimeout = null;
 
 function _sessionUpdated() {
     if (sessionMode.isPrimary)
@@ -92,6 +97,8 @@ function _sessionUpdated() {
     wm.allowKeybinding('overlay-key', Shell.ActionMode.NORMAL |
                                       Shell.ActionMode.OVERVIEW);
 
+    wm.allowKeybinding('locate-pointer-key', Shell.ActionMode.ALL);
+
     wm.setCustomKeybindingHandler('panel-run-dialog',
                                   Shell.ActionMode.NORMAL |
                                   Shell.ActionMode.OVERVIEW,
@@ -165,6 +172,8 @@ function _initializeUI() {
     kbdA11yDialog = new KbdA11yDialog.KbdA11yDialog();
     wm = new WindowManager.WindowManager();
     magnifier = new Magnifier.Magnifier();
+    locatePointer = new LocatePointer.locatePointer();
+
     if (LoginManager.canLock())
         screenShield = new ScreenShield.ScreenShield();
 
@@ -183,6 +192,8 @@ function _initializeUI() {
     layoutManager.init();
     overview.init();
 
+    pointerA11yTimeout = new PointerA11yTimeout.PointerA11yTimeout();
+
     _a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
 
     global.display.connect('overlay-key', () => {
@@ -190,6 +201,10 @@ function _initializeUI() {
             overview.toggle();
     });
 
+    global.connect('locate-pointer', () => {
+        locatePointer.show();
+    });
+
     global.display.connect('show-restart-message', (display, message) => {
         showRestartMessage(message);
         return true;
@@ -211,13 +226,6 @@ function _initializeUI() {
 
     _startDate = new Date();
 
-    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
-    if (perfModuleName) {
-        let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
-        let module = eval('imports.perf.' + perfModuleName + ';');
-        Scripting.runPerfScript(module, perfOutput);
-    }
-
     ExtensionDownloader.init();
     ExtensionSystem.init();
 
@@ -236,8 +244,19 @@ function _initializeUI() {
         }
         if (sessionMode.currentMode != 'gdm' &&
             sessionMode.currentMode != 'initial-setup') {
-            Shell.Global.log_structured('GNOME Shell started at ' + _startDate,
+            GLib.log_structured(LOG_DOMAIN, GLib.LogLevelFlags.LEVEL_MESSAGE, {
-                                        ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
+                'MESSAGE': `GNOME Shell started at ${_startDate}`,
+                'MESSAGE_ID': GNOMESHELL_STARTED_MESSAGE_ID
+            });
+        }
+
+        LoginManager.registerSessionWithGDM();
+
+        let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
+        if (perfModuleName) {
+            let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
+            let module = eval('imports.perf.' + perfModuleName + ';');
+            Scripting.runPerfScript(module, perfOutput);
         }
     });
 }
@@ -636,7 +655,7 @@ function _queueBeforeRedraw(workId) {
  * initialization as well, under the assumption that new actors
  * will need it.
  *
- * Returns: A string work identifer
+ * Returns: A string work identifier
  */
 function initializeDeferredWork(actor, callback, props) {
     // Turn into a string so we can use as an object property
@@ -689,12 +708,13 @@ function queueDeferredWork(workId) {
     }
 }
 
-var RestartMessage = class extends ModalDialog.ModalDialog {
+var RestartMessage = GObject.registerClass(
-    constructor(message) {
+class RestartMessage extends ModalDialog.ModalDialog {
-        super({ shellReactive: true,
+    _init(message) {
-                styleClass: 'restart-message headline',
+        super._init({ shellReactive: true,
-                shouldFadeIn: false,
+                      styleClass: 'restart-message headline',
-                destroyOnClose: true });
+                      shouldFadeIn: false,
+                      destroyOnClose: true });
 
         let label = new St.Label({ text: message });
 
@@ -704,7 +724,7 @@ var RestartMessage = class extends ModalDialog.ModalDialog {
                                         y_align: St.Align.MIDDLE });
         this.buttonLayout.hide();
     }
-};
+});
 
 function showRestartMessage(message) {
     let restartMessage = new RestartMessage(message);

js/ui/messageTray.js

@@ -584,7 +584,6 @@ class SourceActor extends St.Widget {
         this._source = source;
         this._size = size;
 
-        this.actor = this;
         this.connect('destroy', () => {
             this._source.disconnect(this._iconUpdatedId);
             this._actorDestroyed = true;

js/ui/modalDialog.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Atk, Clutter, Shell, St } = imports.gi;
+const { Atk, Clutter, GObject, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Dialog = imports.ui.dialog;
@@ -21,8 +21,20 @@ var State = {
     FADED_OUT: 4
 };
 
-var ModalDialog = class {
+var ModalDialog = GObject.registerClass({
-    constructor(params) {
+    Properties: { 'state': GObject.ParamSpec.int('state', 'Dialog state', 'state',
+                                                 GObject.ParamFlags.READABLE,
+                                                 Math.min(...Object.values(State)),
+                                                 Math.max(...Object.values(State)),
+                                                 State.CLOSED) },
+    Signals: { 'opened': {}, 'closed': {} }
+}, class ModalDialog extends St.Widget {
+    _init(params) {
+        super._init({ visible: false,
+                      x: 0,
+                      y: 0,
+                      accessible_role: Atk.Role.DIALOG });
+
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
                                         actionMode: Shell.ActionMode.SYSTEM_MODAL,
@@ -30,7 +42,7 @@ var ModalDialog = class {
                                         shouldFadeOut: true,
                                         destroyOnClose: true });
 
-        this.state = State.CLOSED;
+        this._state = State.CLOSED;
         this._hasModal = false;
         this._actionMode = params.actionMode;
         this._shellReactive = params.shellReactive;
@@ -38,31 +50,25 @@ var ModalDialog = class {
         this._shouldFadeOut = params.shouldFadeOut;
         this._destroyOnClose = params.destroyOnClose;
 
-        this._group = new St.Widget({ visible: false,
+        Main.layoutManager.modalDialogGroup.add_actor(this);
-                                      x: 0,
-                                      y: 0,
-                                      accessible_role: Atk.Role.DIALOG });
-        Main.layoutManager.modalDialogGroup.add_actor(this._group);
 
         let constraint = new Clutter.BindConstraint({ source: global.stage,
                                                       coordinate: Clutter.BindCoordinate.ALL });
-        this._group.add_constraint(constraint);
+        this.add_constraint(constraint);
-
-        this._group.connect('destroy', this._onGroupDestroy.bind(this));
 
         this.backgroundStack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
         this._backgroundBin = new St.Bin({ child: this.backgroundStack,
                                            x_fill: true, y_fill: true });
         this._monitorConstraint = new Layout.MonitorConstraint();
         this._backgroundBin.add_constraint(this._monitorConstraint);
-        this._group.add_actor(this._backgroundBin);
+        this.add_actor(this._backgroundBin);
 
         this.dialogLayout = new Dialog.Dialog(this.backgroundStack, params.styleClass);
         this.contentLayout = this.dialogLayout.contentLayout;
         this.buttonLayout = this.dialogLayout.buttonLayout;
 
         if (!this._shellReactive) {
-            this._lightbox = new Lightbox.Lightbox(this._group,
+            this._lightbox = new Lightbox.Lightbox(this,
                                                    { inhibitEvents: true,
                                                      radialEffect: true });
             this._lightbox.highlight(this._backgroundBin);
@@ -77,8 +83,16 @@ var ModalDialog = class {
         this._savedKeyFocus = null;
     }
 
-    destroy() {
+    get state() {
-        this._group.destroy();
+        return this._state;
+    }
+
+    _setState(state) {
+        if (this._state == state)
+            return;
+
+        this._state = state;
+        this.notify('state');
     }
 
     clearButtons() {
@@ -96,29 +110,25 @@ var ModalDialog = class {
         return this.dialogLayout.addButton(buttonInfo);
     }
 
-    _onGroupDestroy() {
-        this.emit('destroy');
-    }
-
     _fadeOpen(onPrimary) {
         if (onPrimary)
             this._monitorConstraint.primary = true;
         else
             this._monitorConstraint.index = global.display.get_current_monitor();
 
-        this.state = State.OPENING;
+        this._setState(State.OPENING);
 
         this.dialogLayout.opacity = 255;
         if (this._lightbox)
             this._lightbox.show();
-        this._group.opacity = 0;
+        this.opacity = 0;
-        this._group.show();
+        this.show();
-        Tweener.addTween(this._group,
+        Tweener.addTween(this,
                          { opacity: 255,
                            time: this._shouldFadeIn ? OPEN_AND_CLOSE_TIME : 0,
                            transition: 'easeOutQuad',
                            onComplete: () => {
-                               this.state = State.OPENED;
+                               this._setState(State.OPENED);
                                this.emit('opened');
                            }
                          });
@@ -148,8 +158,8 @@ var ModalDialog = class {
     }
 
     _closeComplete() {
-        this.state = State.CLOSED;
+        this._setState(State.CLOSED);
-        this._group.hide();
+        this.hide();
         this.emit('closed');
 
         if (this._destroyOnClose)
@@ -160,12 +170,12 @@ var ModalDialog = class {
         if (this.state == State.CLOSED || this.state == State.CLOSING)
             return;
 
-        this.state = State.CLOSING;
+        this._setState(State.CLOSING);
         this.popModal(timestamp);
         this._savedKeyFocus = null;
 
         if (this._shouldFadeOut)
-            Tweener.addTween(this._group,
+            Tweener.addTween(this,
                              { opacity: 0,
                                time: OPEN_AND_CLOSE_TIME,
                                transition: 'easeOutQuad',
@@ -183,11 +193,11 @@ var ModalDialog = class {
             return;
 
         let focus = global.stage.key_focus;
-        if (focus && this._group.contains(focus))
+        if (focus && this.contains(focus))
             this._savedKeyFocus = focus;
         else
             this._savedKeyFocus = null;
-        Main.popModal(this._group, timestamp);
+        Main.popModal(this, timestamp);
         this._hasModal = false;
 
         if (!this._shellReactive)
@@ -201,7 +211,7 @@ var ModalDialog = class {
         let params = { actionMode: this._actionMode };
         if (timestamp)
             params['timestamp'] = timestamp;
-        if (!Main.pushModal(this._group, params))
+        if (!Main.pushModal(this, params))
             return false;
 
         this._hasModal = true;
@@ -224,10 +234,10 @@ var ModalDialog = class {
     // can be dismissed by a close call.
     //
     // The main point of this method is to give some indication to the user
-    // that the dialog reponse has been acknowledged but will take a few
+    // that the dialog response has been acknowledged but will take a few
     // moments before being processed.
     // e.g., if a user clicked "Log Out" then the dialog should go away
-    // imediately, but the lightbox should remain until the logout is
+    // immediately, but the lightbox should remain until the logout is
     // complete.
     _fadeOutDialog(timestamp) {
         if (this.state == State.CLOSED || this.state == State.CLOSING)
@@ -242,9 +252,8 @@ var ModalDialog = class {
                            time:    FADE_OUT_DIALOG_TIME,
                            transition: 'easeOutQuad',
                            onComplete: () => {
-                               this.state = State.FADED_OUT;
+                               this._setState(State.FADED_OUT);
                            }
                          });
     }
-};
+});
-Signals.addSignalMethods(ModalDialog.prototype);

js/ui/osdMonitorLabeler.js

@@ -95,28 +95,6 @@ var OsdMonitorLabeler = class {
 
         this._reset();
 
-        for (let id in params) {
-            let monitor = this._monitorManager.get_monitor_for_output(id);
-            if (monitor == -1)
-                continue;
-            this._monitorLabels.get(monitor).push(params[id].deep_unpack());
-        }
-
-        // In mirrored display setups, more than one physical outputs
-        // might be showing the same logical monitor. In that case, we
-        // join each output's labels on the same OSD widget.
-        for (let [monitor, labels] of this._monitorLabels.entries()) {
-            labels.sort();
-            this._osdLabels.push(new OsdMonitorLabel(monitor, labels.join(' ')));
-        }
-    }
-
-    show2(client, params) {
-        if (!this._trackClient(client))
-            return;
-
-        this._reset();
-
         for (let connector in params) {
             let monitor = this._monitorManager.get_monitor_for_connector(connector);
             if (monitor == -1)

js/ui/overviewControls.js

@@ -122,7 +122,7 @@ var SlidingControl = class {
     }
 
     _getSlide() {
-        throw new Error('getSlide() must be overridden');
+        throw new GObject.NotImplementedError(`_getSlide in ${this.constructor.name}`);
     }
 
     _updateSlide() {
@@ -369,17 +369,15 @@ class DashSpacer extends St.Widget {
     }
 
     vfunc_get_preferred_width(forHeight) {
-        let box = this.get_allocation_box();
+        if (this._bindConstraint)
-        let minWidth = super.vfunc_get_preferred_width(forHeight)[0];
+            return this._bindConstraint.source.get_preferred_width(forHeight);
-        let natWidth = box.x2 - box.x1;
+        return super.vfunc_get_preferred_width(forHeight);
-        return [minWidth, natWidth];
     }
 
     vfunc_get_preferred_height(forWidth) {
-        let box = this.get_allocation_box();
+        if (this._bindConstraint)
-        let minHeight = super.vfunc_get_preferred_height(forWidth)[0];
+            return this._bindConstraint.source.get_preferred_height(forWidth);
-        let natHeight = box.y2 - box.y1;
+        return super.vfunc_get_preferred_height(forWidth);
-        return [minHeight, natHeight];
     }
 });
 

js/ui/padOsd.js

@@ -374,12 +374,12 @@ var PadDiagram = GObject.registerClass({
         svgData += this._cssString();
         svgData += this._wrappingSvgFooter();
 
-        let handle = new Rsvg.Handle();
+        let istream = new Gio.MemoryInputStream();
-        handle.set_base_uri(GLib.path_get_dirname(this._imagePath));
+        istream.add_bytes(new GLib.Bytes(svgData));
-        handle.write(svgData);
-        handle.close();
 
-        return handle;
+        return Rsvg.Handle.new_from_stream_sync(istream,
+                                                Gio.File.new_for_path(this._imagePath),
+                                                0, null);
     }
 
     _updateDiagramScale() {

js/ui/panel.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Atk, Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
+const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Cairo = imports.cairo;
 const Mainloop = imports.mainloop;
 
@@ -66,7 +66,7 @@ function _unpremultiply(color) {
 
 class AppMenu extends PopupMenu.PopupMenu {
     constructor(sourceActor) {
-        super(sourceActor, 0.0, St.Side.TOP);
+        super(sourceActor, 0.5, St.Side.TOP);
 
         this.actor.add_style_class_name('app-menu');
 
@@ -75,6 +75,9 @@ class AppMenu extends PopupMenu.PopupMenu {
 
         this._windowsChangedId = 0;
 
+        /* Translators: This is the heading of a list of open windows */
+        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem(_("Open Windows")));
+
         this._windowSection = new PopupMenu.PopupMenuSection();
         this.addMenuItem(this._windowSection);
 
@@ -105,6 +108,8 @@ class AppMenu extends PopupMenu.PopupMenu {
             });
         });
 
+        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
         this.addAction(_("Quit"), () => {
             this._app.request_quit();
         });
@@ -117,7 +122,7 @@ class AppMenu extends PopupMenu.PopupMenu {
 
     _updateDetailsVisibility() {
         let sw = this._appSystem.lookup_app('org.gnome.Software.desktop');
-        this._detailsItem.actor.visible = (sw != null);
+        this._detailsItem.visible = (sw != null);
     }
 
     isEmpty() {
@@ -155,7 +160,7 @@ class AppMenu extends PopupMenu.PopupMenu {
             });
         });
 
-        this._newWindowItem.actor.visible =
+        this._newWindowItem.visible =
             app && app.can_open_new_window() && !actions.includes('new-window');
     }
 
@@ -172,13 +177,6 @@ class AppMenu extends PopupMenu.PopupMenu {
                 Main.activateWindow(window, event.get_time());
             });
         });
-
-        // Add separator between windows of the current desktop and other windows.
-        let workspaceManager = global.workspace_manager;
-        let activeWorkspace = workspaceManager.get_active_workspace();
-        let pos = windows.findIndex(w => w.get_workspace() != activeWorkspace);
-        if (pos >= 0)
-            this._windowSection.addMenuItem(new PopupMenu.PopupSeparatorMenuItem(), pos);
     }
 }
 
@@ -196,21 +194,20 @@ var AppMenuButton = GObject.registerClass({
     _init(panel) {
         super._init(0.0, null, true);
 
-        this.actor.accessible_role = Atk.Role.MENU;
+        this.accessible_role = Atk.Role.MENU;
 
         this._startingApps = [];
 
         this._menuManager = panel.menuManager;
-        this._gtkSettings = Gtk.Settings.get_default();
         this._targetApp = null;
         this._busyNotifyId = 0;
 
         let bin = new St.Bin({ name: 'appMenu' });
         bin.connect('style-changed', this._onStyleChanged.bind(this));
-        this.actor.add_actor(bin);
+        this.add_actor(bin);
 
-        this.actor.bind_property("reactive", this.actor, "can-focus", 0);
+        this.bind_property("reactive", this, "can-focus", 0);
-        this.actor.reactive = false;
+        this.reactive = false;
 
         this._container = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         bin.set_child(this._container);
@@ -266,10 +263,10 @@ var AppMenuButton = GObject.registerClass({
             return;
 
         this._visible = true;
-        this.actor.reactive = true;
+        this.reactive = true;
         this.show();
-        Tweener.removeTweens(this.actor);
+        Tweener.removeTweens(this);
-        Tweener.addTween(this.actor,
+        Tweener.addTween(this,
                          { opacity: 255,
                            time: Overview.ANIMATION_TIME,
                            transition: 'easeOutQuad' });
@@ -280,9 +277,9 @@ var AppMenuButton = GObject.registerClass({
             return;
 
         this._visible = false;
-        this.actor.reactive = false;
+        this.reactive = false;
-        Tweener.removeTweens(this.actor);
+        Tweener.removeTweens(this);
-        Tweener.addTween(this.actor,
+        Tweener.addTween(this,
                          { opacity: 0,
                            time: Overview.ANIMATION_TIME,
                            transition: 'easeOutQuad',
@@ -405,7 +402,7 @@ var AppMenuButton = GObject.registerClass({
             if (this._targetApp) {
                 this._busyNotifyId = this._targetApp.connect('notify::busy', this._sync.bind(this));
                 this._label.set_text(this._targetApp.get_name());
-                this.actor.set_accessible_name(this._targetApp.get_name());
+                this.set_accessible_name(this._targetApp.get_name());
             }
         }
 
@@ -423,7 +420,7 @@ var AppMenuButton = GObject.registerClass({
         else
             this.stopAnimation();
 
-        this.actor.reactive = (visible && !isBusy);
+        this.reactive = (visible && !isBusy);
 
         this._syncIcon();
         this.menu.setApp(this._targetApp);
@@ -462,28 +459,28 @@ var ActivitiesButton = GObject.registerClass(
 class ActivitiesButton extends PanelMenu.Button {
     _init() {
         super._init(0.0, null, true);
-        this.actor.accessible_role = Atk.Role.TOGGLE_BUTTON;
+        this.accessible_role = Atk.Role.TOGGLE_BUTTON;
 
-        this.actor.name = 'panelActivities';
+        this.name = 'panelActivities';
 
         /* Translators: If there is no suitable word for "Activities"
            in your language, you can use the word for "Overview". */
         this._label = new St.Label({ text: _("Activities"),
                                      y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add_actor(this._label);
+        this.add_actor(this._label);
 
-        this.actor.label_actor = this._label;
+        this.label_actor = this._label;
 
-        this.actor.connect('captured-event', this._onCapturedEvent.bind(this));
+        this.connect('captured-event', this._onCapturedEvent.bind(this));
-        this.actor.connect_after('key-release-event', this._onKeyRelease.bind(this));
+        this.connect_after('key-release-event', this._onKeyRelease.bind(this));
 
         Main.overview.connect('showing', () => {
-            this.actor.add_style_pseudo_class('overview');
+            this.add_style_pseudo_class('overview');
-            this.actor.add_accessible_state (Atk.StateType.CHECKED);
+            this.add_accessible_state (Atk.StateType.CHECKED);
         });
         Main.overview.connect('hiding', () => {
-            this.actor.remove_style_pseudo_class('overview');
+            this.remove_style_pseudo_class('overview');
-            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
+            this.remove_accessible_state (Atk.StateType.CHECKED);
         });
 
         this._xdndTimeOut = 0;
@@ -536,7 +533,7 @@ class ActivitiesButton extends PanelMenu.Button {
         let [x, y, mask] = global.get_pointer();
         let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
 
-        if (pickedActor == this.actor && Main.overview.shouldToggleByCornerOrButton())
+        if (pickedActor == this && Main.overview.shouldToggleByCornerOrButton())
             Main.overview.toggle();
 
         Mainloop.source_remove(this._xdndTimeOut);
@@ -750,7 +747,7 @@ class AggregateMenu extends PanelMenu.Button {
         this.menu.box.set_layout_manager(menuLayout);
 
         this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
-        this.actor.add_child(this._indicators);
+        this.add_child(this._indicators);
 
         if (Config.HAVE_NETWORKMANAGER) {
             this._network = new imports.ui.status.network.NMApplet();
@@ -809,6 +806,7 @@ class AggregateMenu extends PanelMenu.Button {
         menuLayout.addSizeChild(this._location.menu.actor);
         menuLayout.addSizeChild(this._rfkill.menu.actor);
         menuLayout.addSizeChild(this._power.menu.actor);
+        menuLayout.addSizeChild(this._system.buttonGroup);
     }
 });
 
@@ -819,6 +817,7 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
     'dateMenu': imports.ui.dateMenu.DateMenuButton,
     'a11y': imports.ui.status.accessibility.ATIndicator,
     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
+    'dwellClick': imports.ui.status.dwellClick.DwellClickIndicator,
 };
 
 var Panel = GObject.registerClass(
@@ -827,9 +826,6 @@ class Panel extends St.Widget {
         super._init({ name: 'panel',
                       reactive: true });
 
-        // For compatibility with extensions that still use the
-        // this.actor field
-        this.actor = this;
         this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._sessionStyle = null;
@@ -882,7 +878,7 @@ class Panel extends St.Widget {
     }
 
     vfunc_allocate(box, flags) {
-        super.vfunc_allocate(box, flags);
+        this.set_allocation(box, flags);
 
         let allocWidth = box.x2 - box.x1;
         let allocHeight = box.y2 - box.y1;
@@ -976,22 +972,11 @@ class Panel extends St.Widget {
         if (isPress && button != 1)
             return Clutter.EVENT_PROPAGATE;
 
-        let focusWindow = global.display.focus_window;
-        if (!focusWindow)
-            return Clutter.EVENT_PROPAGATE;
-
-        let dragWindow = focusWindow.is_attached_dialog() ? focusWindow.get_transient_for()
-                                                          : focusWindow;
-        if (!dragWindow)
-            return Clutter.EVENT_PROPAGATE;
-
-        let rect = dragWindow.get_frame_rect();
         let [stageX, stageY] = event.get_coords();
 
-        let allowDrag = dragWindow.maximized_vertically &&
+        let dragWindow = this._getDraggableWindowForPosition(stageX);
-                        stageX > rect.x && stageX < rect.x + rect.width;
 
-        if (!allowDrag)
+        if (!dragWindow)
             return Clutter.EVENT_PROPAGATE;
 
         global.display.begin_grab_op(dragWindow,
@@ -1021,7 +1006,7 @@ class Panel extends St.Widget {
             return; // menu not supported by current session mode
 
         let menu = indicator.menu;
-        if (!indicator.actor.reactive)
+        if (!indicator.reactive)
             return;
 
         menu.toggle();
@@ -1043,7 +1028,7 @@ class Panel extends St.Widget {
             return;
 
         let menu = indicator.menu;
-        if (!indicator.actor.reactive)
+        if (!indicator.reactive)
             return;
 
         menu.close();
@@ -1201,4 +1186,21 @@ class Panel extends St.Widget {
                     Main.messageTray.bannerBlocked = isOpen;
             });
     }
+
+    _getDraggableWindowForPosition(stageX) {
+        let workspaceManager = global.workspace_manager;
+        let workspace = workspaceManager.get_active_workspace()
+        let allWindowsByStacking = global.display.sort_windows_by_stacking(
+            workspace.list_windows()
+        ).reverse();
+
+        return allWindowsByStacking.find(metaWindow => {
+            let rect = metaWindow.get_frame_rect();
+            return metaWindow.is_on_primary_monitor() &&
+                   metaWindow.showing_on_its_workspace() &&
+                   metaWindow.get_window_type() != Meta.WindowType.DESKTOP &&
+                   metaWindow.maximized_vertically &&
+                   stageX > rect.x && stageX < rect.x + rect.width
+        });
+    }
 });

js/ui/panelMenu.js

@@ -14,12 +14,11 @@ class ButtonBox extends St.Widget {
 
         super._init(params);
 
-        this.actor = this;
         this._delegate = this;
 
         this.container = new St.Bin({ y_fill: true,
                                       x_fill: true,
-                                      child: this.actor });
+                                      child: this });
 
         this.connect('style-changed', this._onStyleChanged.bind(this));
         this.connect('destroy', this._onDestroy.bind(this));
@@ -105,9 +104,9 @@ var Button = GObject.registerClass({
         this.connect('notify::visible', this._onVisibilityChanged.bind(this));
 
         if (dontCreateMenu)
-            this.menu = new PopupMenu.PopupDummyMenu(this.actor);
+            this.menu = new PopupMenu.PopupDummyMenu(this);
         else
-            this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));
+            this.setMenu(new PopupMenu.PopupMenu(this, menuAlignment, St.Side.TOP, 0));
     }
 
     setSensitive(sensitive) {
@@ -145,7 +144,7 @@ var Button = GObject.registerClass({
         if (!this.menu)
             return;
 
-        if (!this.actor.visible)
+        if (!this.visible)
             this.menu.close();
     }
 
@@ -155,10 +154,10 @@ var Button = GObject.registerClass({
 
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
-            let group = global.focus_manager.get_group(this.actor);
+            let group = global.focus_manager.get_group(this);
             if (group) {
                 let direction = (symbol == Clutter.KEY_Left) ? St.DirectionType.LEFT : St.DirectionType.RIGHT;
-                group.navigate_focus(this.actor, direction, false);
+                group.navigate_focus(this, direction, false);
                 return Clutter.EVENT_STOP;
             }
         }
@@ -167,9 +166,9 @@ var Button = GObject.registerClass({
 
     _onOpenStateChanged(menu, open) {
         if (open)
-            this.actor.add_style_pseudo_class('active');
+            this.add_style_pseudo_class('active');
         else
-            this.actor.remove_style_pseudo_class('active');
+            this.remove_style_pseudo_class('active');
 
         // Setting the max-height won't do any good if the minimum height of the
         // menu is higher then the screen; it's useful if part of the menu is

js/ui/pointerA11yTimeout.js

@@ -0,0 +1,104 @@
+const { Clutter, GLib, GObject, Meta, St } = imports.gi;
+const Tweener = imports.ui.tweener;
+const Main = imports.ui.main;
+const Cairo = imports.cairo;
+
+const ANIMATION_STEPS = 36.;
+
+var PieTimer = GObject.registerClass(
+class PieTimer extends St.DrawingArea {
+    _init() {
+        this._x = 0;
+        this._y = 0;
+        this._startTime = 0;
+        this._duration = 0;
+        super._init( { style_class: 'pie-timer',
+                       visible: false,
+                       can_focus: false,
+                       reactive: false });
+    }
+
+    vfunc_repaint() {
+        let node = this.get_theme_node();
+        let backgroundColor = node.get_color('-pie-background-color');
+        let borderColor = node.get_color('-pie-border-color');
+        let borderWidth = node.get_length('-pie-border-width');
+        let [width, height] = this.get_surface_size();
+        let radius = Math.min(width / 2, height / 2);
+
+        let currentTime = GLib.get_monotonic_time() / 1000.0;
+        let ellapsed = currentTime - this._startTime;
+        let angle = (ellapsed / this._duration) * 2 * Math.PI;
+        let startAngle = 3 * Math.PI / 2;
+        let endAngle = startAngle + angle;
+
+        let cr = this.get_context();
+        cr.setLineCap(Cairo.LineCap.ROUND);
+        cr.setLineJoin(Cairo.LineJoin.ROUND);
+        cr.translate(width / 2, height / 2);
+
+        cr.moveTo(0, 0);
+        cr.arc(0, 0, radius - borderWidth, startAngle, endAngle);
+        cr.lineTo(0, 0);
+        cr.closePath();
+
+        cr.setLineWidth(0);
+        Clutter.cairo_set_source_color(cr, backgroundColor);
+        cr.fillPreserve();
+
+        cr.setLineWidth(borderWidth);
+        Clutter.cairo_set_source_color(cr, borderColor);
+        cr.stroke();
+
+        cr.$dispose();
+    }
+
+    start(x, y, duration) {
+        Tweener.removeTweens(this);
+
+        this.x = x - this.width / 2;
+        this.y = y - this.height / 2;
+        this.show();
+        Main.uiGroup.set_child_above_sibling(this, null);
+
+        this._startTime = GLib.get_monotonic_time() / 1000.0;
+        this._duration = duration;
+
+        Tweener.addTween(this,
+                         { opacity: 255,
+                           time: duration / 1000,
+                           transition: 'easeOutQuad',
+                           onUpdateScope: this,
+                           onUpdate() { this.queue_repaint() },
+                           onCompleteScope: this,
+                           onComplete() { this.stop(); }
+                          });
+    }
+
+    stop() {
+        Tweener.removeTweens(this);
+        this.hide();
+    }
+});
+
+var PointerA11yTimeout = class PointerA11yTimeout {
+    constructor() {
+        let manager = Clutter.DeviceManager.get_default();
+        let pieTimer = new PieTimer();
+
+        Main.uiGroup.add_actor(pieTimer);
+
+        manager.connect('ptr-a11y-timeout-started', (manager, device, type, timeout) => {
+            let [x, y, mods] = global.get_pointer();
+            pieTimer.start(x, y, timeout);
+            if (type == Clutter.PointerA11yTimeoutType.GESTURE)
+              global.display.set_cursor(Meta.Cursor.CROSSHAIR);
+        });
+
+        manager.connect('ptr-a11y-timeout-stopped', (manager, device, type) => {
+            pieTimer.stop();
+            if (type == Clutter.PointerA11yTimeoutType.GESTURE)
+              global.display.set_cursor(Meta.Cursor.DEFAULT);
+        });
+    }
+};

js/ui/popupMenu.js

@@ -51,49 +51,64 @@ function arrowIcon(side) {
     return arrow;
 }
 
-var PopupBaseMenuItem = class {
+var PopupBaseMenuItem = GObject.registerClass({
-    constructor(params) {
+    Properties: {
+        'active': GObject.ParamSpec.boolean('active', 'active', 'active',
+                                            GObject.ParamFlags.READWRITE,
+                                            GObject.TYPE_BOOLEAN,
+                                            false),
+        'sensitive': GObject.ParamSpec.boolean('sensitive', 'sensitive', 'sensitive',
+                                               GObject.ParamFlags.READWRITE,
+                                               GObject.TYPE_BOOLEAN,
+                                               true),
+    },
+    Signals: {
+        'activate': { param_types: [Clutter.Event.$gtype] },
+    }
+}, class PopupBaseMenuItem extends St.BoxLayout {
+    _init(params) {
         params = Params.parse (params, { reactive: true,
                                          activate: true,
                                          hover: true,
                                          style_class: null,
                                          can_focus: true
                                        });
-
+        super._init({ style_class: 'popup-menu-item',
-        this.actor = new St.BoxLayout({ style_class: 'popup-menu-item',
+                      reactive: params.reactive,
-                                        reactive: params.reactive,
+                      track_hover: params.reactive,
-                                        track_hover: params.reactive,
+                      can_focus: params.can_focus,
-                                        can_focus: params.can_focus,
+                      accessible_role: Atk.Role.MENU_ITEM });
-                                        accessible_role: Atk.Role.MENU_ITEM });
+        this._delegate = this;
-        this.actor._delegate = this;
 
         this._ornament = Ornament.NONE;
         this._ornamentLabel = new St.Label({ style_class: 'popup-menu-ornament' });
-        this.actor.add(this._ornamentLabel);
+        this.add(this._ornamentLabel);
 
         this._parent = null;
-        this.active = false;
+        this._active = false;
         this._activatable = params.reactive && params.activate;
         this._sensitive = true;
 
         if (!this._activatable)
-            this.actor.add_style_class_name('popup-inactive-menu-item');
+            this.add_style_class_name('popup-inactive-menu-item');
 
         if (params.style_class)
-            this.actor.add_style_class_name(params.style_class);
+            this.add_style_class_name(params.style_class);
 
         if (this._activatable) {
-            this.actor.connect('button-press-event', this._onButtonPressEvent.bind(this));
+            this.connect('button-press-event', this._onButtonPressEvent.bind(this));
-            this.actor.connect('button-release-event', this._onButtonReleaseEvent.bind(this));
+            this.connect('button-release-event', this._onButtonReleaseEvent.bind(this));
-            this.actor.connect('touch-event', this._onTouchEvent.bind(this));
+            this.connect('touch-event', this._onTouchEvent.bind(this));
-            this.actor.connect('key-press-event', this._onKeyPressEvent.bind(this));
+            this.connect('key-press-event', this._onKeyPressEvent.bind(this));
         }
         if (params.reactive && params.hover)
-            this.actor.connect('notify::hover', this._onHoverChanged.bind(this));
+            this.bind_property('hover', this, 'active', GObject.BindingFlags.SYNC_CREATE);
+    }
 
-        this.actor.connect('key-focus-in', this._onKeyFocusIn.bind(this));
+    get actor() {
-        this.actor.connect('key-focus-out', this._onKeyFocusOut.bind(this));
+        /* This is kept for compatibility with current implementation, and we
-        this.actor.connect('destroy', this._onDestroy.bind(this));
+           don't want to warn here yet since PopupMenu depends on this */
+        return this;
     }
 
     _getTopMenu() {
@@ -109,24 +124,24 @@ var PopupBaseMenuItem = class {
 
     _onButtonPressEvent(actor, event) {
         // This is the CSS active state
-        this.actor.add_style_pseudo_class ('active');
+        this.add_style_pseudo_class('active');
         return Clutter.EVENT_PROPAGATE;
     }
 
     _onButtonReleaseEvent(actor, event) {
-        this.actor.remove_style_pseudo_class ('active');
+        this.remove_style_pseudo_class('active');
         this.activate(event);
         return Clutter.EVENT_STOP;
     }
 
     _onTouchEvent(actor, event) {
         if (event.type() == Clutter.EventType.TOUCH_END) {
-            this.actor.remove_style_pseudo_class ('active');
+            this.remove_style_pseudo_class('active');
             this.activate(event);
             return Clutter.EVENT_STOP;
         } else if (event.type() == Clutter.EventType.TOUCH_BEGIN) {
             // This is the CSS active state
-            this.actor.add_style_pseudo_class ('active');
+            this.add_style_pseudo_class('active');
         }
         return Clutter.EVENT_PROPAGATE;
     }
@@ -151,54 +166,56 @@ var PopupBaseMenuItem = class {
         return Clutter.EVENT_PROPAGATE;
     }
 
-    _onKeyFocusIn(actor) {
+    vfunc_key_focus_in() {
-        this.setActive(true);
+        super.vfunc_key_focus_in();
+        this.active = true;
     }
 
-    _onKeyFocusOut(actor) {
+    vfunc_key_focus_out() {
-        this.setActive(false);
+        super.vfunc_key_focus_out();
-    }
+        this.active = false;
-
-    _onHoverChanged(actor) {
-        this.setActive(actor.hover);
     }
 
     activate(event) {
         this.emit('activate', event);
     }
 
-    setActive(active) {
+    get active() {
+        return this._active;
+    }
+
+    set active(active) {
         let activeChanged = active != this.active;
         if (activeChanged) {
-            this.active = active;
+            this._active = active;
             if (active) {
-                this.actor.add_style_class_name('selected');
+                this.add_style_class_name('selected');
-                if (this.actor.can_focus)
+                if (this.can_focus)
-                    this.actor.grab_key_focus();
+                    this.grab_key_focus();
             } else {
-                this.actor.remove_style_class_name('selected');
+                this.remove_style_class_name('selected');
                 // Remove the CSS active state if the user press the button and
                 // while holding moves to another menu item, so we don't paint all items.
                 // The correct behaviour would be to set the new item with the CSS
                 // active state as well, but button-press-event is not trigered,
                 // so we should track it in our own, which would involve some work
                 // in the container
-                this.actor.remove_style_pseudo_class ('active');
+                this.remove_style_pseudo_class('active');
             }
-            this.emit('active-changed', active);
+            this.notify('active');
         }
     }
 
     syncSensitive() {
-        let sensitive = this.getSensitive();
+        let sensitive = this.sensitive;
-        this.actor.reactive = sensitive;
+        this.reactive = sensitive;
-        this.actor.can_focus = sensitive;
+        this.can_focus = sensitive;
-        this.emit('sensitive-changed');
+        this.notify('sensitive');
         return sensitive;
     }
 
     getSensitive() {
-        let parentSensitive = this._parent ? this._parent.getSensitive() : true;
+        let parentSensitive = this._parent ? this._parent.sensitive : true;
         return this._activatable && this._sensitive && parentSensitive;
     }
 
@@ -210,12 +227,12 @@ var PopupBaseMenuItem = class {
         this.syncSensitive();
     }
 
-    destroy() {
+    get sensitive() {
-        this.actor.destroy();
+        return this.getSensitive();
     }
 
-    _onDestroy() {
+    set sensitive(sensitive) {
-        this.emit('destroy');
+        this.setSensitive(sensitive);
     }
 
     setOrnament(ornament) {
@@ -226,36 +243,38 @@ var PopupBaseMenuItem = class {
 
         if (ornament == Ornament.DOT) {
             this._ornamentLabel.text = '\u2022';
-            this.actor.add_accessible_state(Atk.StateType.CHECKED);
+            this.add_accessible_state(Atk.StateType.CHECKED);
         } else if (ornament == Ornament.CHECK) {
             this._ornamentLabel.text = '\u2713';
-            this.actor.add_accessible_state(Atk.StateType.CHECKED);
+            this.add_accessible_state(Atk.StateType.CHECKED);
         } else if (ornament == Ornament.NONE) {
             this._ornamentLabel.text = '';
-            this.actor.remove_accessible_state(Atk.StateType.CHECKED);
+            this.remove_accessible_state(Atk.StateType.CHECKED);
         }
     }
-};
+});
-Signals.addSignalMethods(PopupBaseMenuItem.prototype);
 
-var PopupMenuItem = class extends PopupBaseMenuItem {
+var PopupMenuItem = GObject.registerClass(
-    constructor(text, params) {
+class PopupMenuItem extends PopupBaseMenuItem {
-        super(params);
+    _init(text, params) {
+        super._init(params);
 
         this.label = new St.Label({ text: text });
-        this.actor.add_child(this.label);
+        this.add_child(this.label);
-        this.actor.label_actor = this.label
+        this.label_actor = this.label
     }
-};
+});
 
-var PopupSeparatorMenuItem = class extends PopupBaseMenuItem {
+
-    constructor(text) {
+var PopupSeparatorMenuItem = GObject.registerClass(
-        super({ reactive: false,
+class PopupSeparatorMenuItem extends PopupBaseMenuItem {
-                can_focus: false});
+    _init(text) {
+        super._init({ reactive: false,
+                      can_focus: false });
 
         this.label = new St.Label({ text: text || '' });
-        this.actor.add(this.label);
+        this.add(this.label);
-        this.actor.label_actor = this.label;
+        this.label_actor = this.label;
 
         this.label.connect('notify::text',
                            this._syncVisibility.bind(this));
@@ -264,81 +283,78 @@ var PopupSeparatorMenuItem = class extends PopupBaseMenuItem {
         this._separator = new St.Widget({ style_class: 'popup-separator-menu-item',
                                           y_expand: true,
                                           y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add(this._separator, { expand: true });
+        this.add(this._separator, { expand: true });
     }
 
     _syncVisibility() {
         this.label.visible = this.label.text != '';
     }
-};
+});
 
-var Switch = class {
+var Switch = GObject.registerClass(
-    constructor(state) {
+class Switch extends St.Bin {
-        this.actor = new St.Bin({ style_class: 'toggle-switch',
+    _init(state) {
-                                  accessible_role: Atk.Role.CHECK_BOX,
+        super._init({ style_class: 'toggle-switch',
-                                  can_focus: true });
+                      accessible_role: Atk.Role.CHECK_BOX,
-        // Translators: this MUST be either "toggle-switch-us"
+                      can_focus: true });
-        // (for toggle switches containing the English words
-        // "ON" and "OFF") or "toggle-switch-intl" (for toggle
-        // switches containing "◯" and "|"). Other values will
-        // simply result in invisible toggle switches.
-        this.actor.add_style_class_name(_("toggle-switch-us"));
         this.setToggleState(state);
     }
 
     setToggleState(state) {
         if (state)
-            this.actor.add_style_pseudo_class('checked');
+            this.add_style_pseudo_class('checked');
         else
-            this.actor.remove_style_pseudo_class('checked');
+            this.remove_style_pseudo_class('checked');
         this.state = state;
     }
 
     toggle() {
         this.setToggleState(!this.state);
     }
-};
+});
 
-var PopupSwitchMenuItem = class extends PopupBaseMenuItem {
+var PopupSwitchMenuItem = GObject.registerClass({
-    constructor(text, active, params) {
+    Signals: { 'toggled': { param_types: [GObject.TYPE_BOOLEAN] }, },
-        super(params);
+},
+class PopupSwitchMenuItem extends PopupBaseMenuItem {
+    _init(text, active, params) {
+        super._init(params);
 
         this.label = new St.Label({ text: text });
         this._switch = new Switch(active);
 
-        this.actor.accessible_role = Atk.Role.CHECK_MENU_ITEM;
+        this.accessible_role = Atk.Role.CHECK_MENU_ITEM;
         this.checkAccessibleState();
-        this.actor.label_actor = this.label;
+        this.label_actor = this.label;
 
-        this.actor.add_child(this.label);
+        this.add_child(this.label);
 
         this._statusBin = new St.Bin({ x_align: St.Align.END });
-        this.actor.add(this._statusBin, { expand: true, x_align: St.Align.END });
+        this.add(this._statusBin, { expand: true, x_align: St.Align.END });
 
         this._statusLabel = new St.Label({ text: '',
                                            style_class: 'popup-status-menu-item'
                                          });
-        this._statusBin.child = this._switch.actor;
+        this._statusBin.child = this._switch;
     }
 
     setStatus(text) {
         if (text != null) {
             this._statusLabel.text = text;
             this._statusBin.child = this._statusLabel;
-            this.actor.reactive = false;
+            this.reactive = false;
-            this.actor.accessible_role = Atk.Role.MENU_ITEM;
+            this.accessible_role = Atk.Role.MENU_ITEM;
         } else {
-            this._statusBin.child = this._switch.actor;
+            this._statusBin.child = this._switch;
-            this.actor.reactive = true;
+            this.reactive = true;
-            this.actor.accessible_role = Atk.Role.CHECK_MENU_ITEM;
+            this.accessible_role = Atk.Role.CHECK_MENU_ITEM;
         }
         this.checkAccessibleState();
     }
 
     activate(event) {
-        if (this._switch.actor.mapped) {
+        if (this._switch.mapped)
             this.toggle();
-        }
 
         // we allow pressing space to toggle the switch
         // without closing the menu
@@ -365,29 +381,30 @@ var PopupSwitchMenuItem = class extends PopupBaseMenuItem {
     }
 
     checkAccessibleState() {
-        switch (this.actor.accessible_role) {
+        switch (this.accessible_role) {
         case Atk.Role.CHECK_MENU_ITEM:
             if (this._switch.state)
-                this.actor.add_accessible_state (Atk.StateType.CHECKED);
+                this.add_accessible_state(Atk.StateType.CHECKED);
             else
-                this.actor.remove_accessible_state (Atk.StateType.CHECKED);
+                this.remove_accessible_state(Atk.StateType.CHECKED);
             break;
         default:
-            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
+            this.remove_accessible_state(Atk.StateType.CHECKED);
         }
     }
-};
+});
 
-var PopupImageMenuItem = class extends PopupBaseMenuItem {
+var PopupImageMenuItem = GObject.registerClass(
-    constructor(text, icon, params) {
+class PopupImageMenuItem extends PopupBaseMenuItem {
-        super(params);
+    _init(text, icon, params) {
+        super._init(params);
 
         this._icon = new St.Icon({ style_class: 'popup-menu-icon',
                                    x_align: Clutter.ActorAlign.END });
-        this.actor.add_child(this._icon);
+        this.add_child(this._icon);
         this.label = new St.Label({ text: text });
-        this.actor.add_child(this.label);
+        this.add_child(this.label);
-        this.actor.label_actor = this.label;
+        this.label_actor = this.label;
 
         this.setIcon(icon);
     }
@@ -399,12 +416,12 @@ var PopupImageMenuItem = class extends PopupBaseMenuItem {
         else
             this._icon.icon_name = icon;
     }
-};
+});
 
 var PopupMenuBase = class {
     constructor(sourceActor, styleClass) {
-        if (new.target === PopupMenuBase)
+        if (this.constructor === PopupMenuBase)
-            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
+            throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
 
         this.sourceActor = sourceActor;
         this._parent = null;
@@ -443,13 +460,21 @@ var PopupMenuBase = class {
     }
 
     getSensitive() {
-        let parentSensitive = this._parent ? this._parent.getSensitive() : true;
+        let parentSensitive = this._parent ? this._parent.sensitive : true;
         return this._sensitive && parentSensitive;
     }
 
     setSensitive(sensitive) {
         this._sensitive = sensitive;
-        this.emit('sensitive-changed');
+        this.emit('notify::sensitive');
+    }
+
+    get sensitive() {
+        return this.getSensitive();
+    }
+
+    set sensitive(sensitive) {
+        this.setSensitive(sensitive);
     }
 
     _sessionUpdated() {
@@ -485,7 +510,7 @@ var PopupMenuBase = class {
             app.activate();
         });
 
-        menuItem.actor.visible = Main.sessionMode.allowSettings;
+        menuItem.visible = Main.sessionMode.allowSettings;
         this._settingsActions[desktopFile] = menuItem;
 
         return menuItem;
@@ -494,7 +519,7 @@ var PopupMenuBase = class {
     _setSettingsVisibility(visible) {
         for (let id in this._settingsActions) {
             let item = this._settingsActions[id];
-            item.actor.visible = visible;
+            item.visible = visible;
         }
     }
 
@@ -517,16 +542,17 @@ var PopupMenuBase = class {
 
     _subMenuActiveChanged(submenu, submenuItem) {
         if (this._activeMenuItem && this._activeMenuItem != submenuItem)
-            this._activeMenuItem.setActive(false);
+            this._activeMenuItem.active = false;
         this._activeMenuItem = submenuItem;
         this.emit('active-changed', submenuItem);
     }
 
     _connectItemSignals(menuItem) {
-        menuItem._activeChangeId = menuItem.connect('active-changed', (menuItem, active) => {
+        menuItem._activeChangeId = menuItem.connect('notify::active', (menuItem) => {
+            let active = menuItem.active;
             if (active && this._activeMenuItem != menuItem) {
                 if (this._activeMenuItem)
-                    this._activeMenuItem.setActive(false);
+                    this._activeMenuItem.active = false;
                 this._activeMenuItem = menuItem;
                 this.emit('active-changed', menuItem);
             } else if (!active && this._activeMenuItem == menuItem) {
@@ -534,8 +560,8 @@ var PopupMenuBase = class {
                 this.emit('active-changed', null);
             }
         });
-        menuItem._sensitiveChangeId = menuItem.connect('sensitive-changed', () => {
+        menuItem._sensitiveChangeId = menuItem.connect('notify::sensitive', () => {
-            let sensitive = menuItem.getSensitive();
+            let sensitive = menuItem.sensitive;
             if (!sensitive && this._activeMenuItem == menuItem) {
                 if (!this.actor.navigate_focus(menuItem.actor,
                                                St.DirectionType.TAB_FORWARD,
@@ -546,12 +572,12 @@ var PopupMenuBase = class {
                     menuItem.actor.grab_key_focus();
             }
         });
-        menuItem._activateId = menuItem.connect('activate', (menuItem, event) => {
+        menuItem._activateId = menuItem.connect_after('activate', (menuItem, event) => {
             this.emit('activate', menuItem);
             this.itemActivated(BoxPointer.PopupAnimation.FULL);
         });
 
-        menuItem._parentSensitiveChangeId = this.connect('sensitive-changed', () => {
+        menuItem._parentSensitiveChangeId = this.connect('notify::sensitive', () => {
             menuItem.syncSensitive();
         });
 
@@ -603,7 +629,7 @@ var PopupMenuBase = class {
             return;
         }
 
-        menuItem.actor.show();
+        menuItem.show();
     }
 
     moveMenuItem(menuItem, position) {
@@ -650,8 +676,8 @@ var PopupMenuBase = class {
             let parentClosingId = this.connect('menu-closed', () => {
                 menuItem.emit('menu-closed');
             });
-            let subMenuSensitiveChangedId = this.connect('sensitive-changed', () => {
+            let subMenuSensitiveChangedId = this.connect('notify::sensitive', () => {
-                menuItem.emit('sensitive-changed');
+                menuItem.emit('notify::sensitive');
             });
 
             menuItem.connect('destroy', () => {
@@ -857,9 +883,9 @@ var PopupMenu = class extends PopupMenuBase {
 
     close(animate) {
         if (this._activeMenuItem)
-            this._activeMenuItem.setActive(false);
+            this._activeMenuItem.active = false;
 
-        if (this._boxPointer.actor.visible) {
+        if (this._boxPointer.visible) {
             this._boxPointer.close(animate, () => {
                 this.emit('menu-closed');
             });
@@ -890,6 +916,10 @@ var PopupDummyMenu = class {
         return true;
     }
 
+    get sensitive() {
+        return this.getSensitive();
+    }
+
     open() { this.emit('open-state-changed', true); }
     close() { this.emit('open-state-changed', false); }
     toggle() {}
@@ -929,7 +959,11 @@ var PopupSubMenu = class extends PopupMenuBase {
     }
 
     getSensitive() {
-        return this._sensitive && this.sourceActor._delegate.getSensitive();
+        return this._sensitive && this.sourceActor.sensitive;
+    }
+
+    get sensitive() {
+        return this.getSensitive();
     }
 
     open(animate) {
@@ -996,7 +1030,7 @@ var PopupSubMenu = class extends PopupMenuBase {
         this.emit('open-state-changed', false);
 
         if (this._activeMenuItem)
-            this._activeMenuItem.setActive(false);
+            this._activeMenuItem.active = false;
 
         if (animate && this._needsScrollbar())
             animate = false;
@@ -1028,7 +1062,7 @@ var PopupSubMenu = class extends PopupMenuBase {
 
         if (this.isOpen && event.get_key_symbol() == Clutter.KEY_Left) {
             this.close(BoxPointer.PopupAnimation.FULL);
-            this.sourceActor._delegate.setActive(true);
+            this.sourceActor._delegate.active = true;
             return Clutter.EVENT_STOP;
         }
 
@@ -1059,25 +1093,26 @@ var PopupMenuSection = class extends PopupMenuBase {
     close() { this.emit('open-state-changed', false); }
 };
 
-var PopupSubMenuMenuItem = class extends PopupBaseMenuItem {
+var PopupSubMenuMenuItem = GObject.registerClass(
-    constructor(text, wantIcon) {
+class PopupSubMenuMenuItem extends PopupBaseMenuItem {
-        super();
+    _init(text, wantIcon) {
+        super._init();
 
-        this.actor.add_style_class_name('popup-submenu-menu-item');
+        this.add_style_class_name('popup-submenu-menu-item');
 
         if (wantIcon) {
             this.icon = new St.Icon({ style_class: 'popup-menu-icon' });
-            this.actor.add_child(this.icon);
+            this.add_child(this.icon);
         }
 
         this.label = new St.Label({ text: text,
                                     y_expand: true,
                                     y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add_child(this.label);
+        this.add_child(this.label);
-        this.actor.label_actor = this.label;
+        this.label_actor = this.label;
 
         let expander = new St.Bin({ style_class: 'popup-menu-item-expander' });
-        this.actor.add(expander, { expand: true });
+        this.add(expander, { expand: true });
 
         this._triangle = arrowIcon(St.Side.RIGHT);
         this._triangle.pivot_point = new Clutter.Point({ x: 0.5, y: 0.6 });
@@ -1086,11 +1121,12 @@ var PopupSubMenuMenuItem = class extends PopupBaseMenuItem {
                                             y_align: Clutter.ActorAlign.CENTER });
         this._triangleBin.add_child(this._triangle);
 
-        this.actor.add_child(this._triangleBin);
+        this.add_child(this._triangleBin);
-        this.actor.add_accessible_state (Atk.StateType.EXPANDABLE);
+        this.add_accessible_state(Atk.StateType.EXPANDABLE);
 
-        this.menu = new PopupSubMenu(this.actor, this._triangle);
+        this.menu = new PopupSubMenu(this, this._triangle);
         this.menu.connect('open-state-changed', this._subMenuOpenStateChanged.bind(this));
+        this.connect('destroy', () => { this.menu.destroy(); });
     }
 
     _setParent(parent) {
@@ -1107,24 +1143,18 @@ var PopupSubMenuMenuItem = class extends PopupBaseMenuItem {
 
     _subMenuOpenStateChanged(menu, open) {
         if (open) {
-            this.actor.add_style_pseudo_class('open');
+            this.add_style_pseudo_class('open');
             this._getTopMenu()._setOpenedSubMenu(this.menu);
-            this.actor.add_accessible_state (Atk.StateType.EXPANDED);
+            this.add_accessible_state(Atk.StateType.EXPANDED);
-            this.actor.add_style_pseudo_class('checked');
+            this.add_style_pseudo_class('checked');
         } else {
-            this.actor.remove_style_pseudo_class('open');
+            this.remove_style_pseudo_class('open');
             this._getTopMenu()._setOpenedSubMenu(null);
-            this.actor.remove_accessible_state (Atk.StateType.EXPANDED);
+            this.remove_accessible_state (Atk.StateType.EXPANDED);
-            this.actor.remove_style_pseudo_class('checked');
+            this.remove_style_pseudo_class('checked');
         }
     }
 
-    destroy() {
-        this.menu.destroy();
-
-        super.destroy();
-    }
-
     setSubmenuShown(open) {
         if (open)
             this.menu.open(BoxPointer.PopupAnimation.FULL);
@@ -1162,7 +1192,7 @@ var PopupSubMenuMenuItem = class extends PopupBaseMenuItem {
     _onButtonReleaseEvent(actor) {
         // Since we override the parent, we need to manage what the parent does
         // with the active style class
-        this.actor.remove_style_pseudo_class ('active');
+        this.remove_style_pseudo_class('active');
         this._setOpenState(!this._getOpenState());
         return Clutter.EVENT_PROPAGATE;
     }
@@ -1171,12 +1201,12 @@ var PopupSubMenuMenuItem = class extends PopupBaseMenuItem {
         if (event.type() == Clutter.EventType.TOUCH_END) {
             // Since we override the parent, we need to manage what the parent does
             // with the active style class
-            this.actor.remove_style_pseudo_class ('active');
+            this.remove_style_pseudo_class('active');
             this._setOpenState(!this._getOpenState());
         }
         return Clutter.EVENT_PROPAGATE;
     }
-};
+});
 
 /* Basic implementation of a menu manager.
  * Call addMenu to add menus
@@ -1185,8 +1215,7 @@ var PopupMenuManager = class {
     constructor(owner, grabParams) {
         grabParams = Params.parse(grabParams,
                                   { actionMode: Shell.ActionMode.POPUP });
-        this._owner = owner;
+        this._grabHelper = new GrabHelper.GrabHelper(owner, grabParams);
-        this._grabHelper = new GrabHelper.GrabHelper(owner.actor, grabParams);
         this._menus = [];
     }
 

js/ui/remoteSearch.js

@@ -89,6 +89,8 @@ function loadRemoteSearchProviders(searchSettings, callback) {
             try {
                 let desktopId = keyfile.get_string(group, 'DesktopId');
                 appInfo = Gio.DesktopAppInfo.new(desktopId);
+                if (!appInfo.should_show())
+                    return;
             } catch (e) {
                 log('Ignoring search provider ' + path + ': missing DesktopId');
                 return;

js/ui/ripples.js

@@ -0,0 +1,97 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const { Clutter, St } = imports.gi;
+const Tweener = imports.ui.tweener;
+
+// Shamelessly copied from the layout "hotcorner" ripples implementation
+var Ripples = class Ripples {
+    constructor(px, py, styleClass) {
+        this._x = 0;
+        this._y = 0;
+
+        this._px = px;
+        this._py = py;
+
+        this._ripple1 = new St.BoxLayout({ style_class: styleClass,
+                                           opacity: 0,
+                                           can_focus: false,
+                                           reactive: false,
+                                           visible: false });
+        this._ripple1.set_pivot_point(px, py);
+
+        this._ripple2 = new St.BoxLayout({ style_class: styleClass,
+                                           opacity: 0,
+                                           can_focus: false,
+                                           reactive: false,
+                                           visible: false });
+        this._ripple2.set_pivot_point(px, py);
+
+        this._ripple3 = new St.BoxLayout({ style_class: styleClass,
+                                           opacity: 0,
+                                           can_focus: false,
+                                           reactive: false,
+                                           visible: false });
+        this._ripple3.set_pivot_point(px, py);
+    }
+
+    _animRipple(ripple, delay, time, startScale, startOpacity, finalScale) {
+        // We draw a ripple by using a source image and animating it scaling
+        // outwards and fading away. We want the ripples to move linearly
+        // or it looks unrealistic, but if the opacity of the ripple goes
+        // linearly to zero it fades away too quickly, so we use Tweener's
+        // 'onUpdate' to give a non-linear curve to the fade-away and make
+        // it more visible in the middle section.
+
+        ripple.x = this._x;
+        ripple.y = this._y;
+        ripple._opacity = startOpacity;
+        ripple.visible = true;
+        ripple.opacity = 255 * Math.sqrt(startOpacity);
+        ripple.scale_x = ripple.scale_y = startScale;
+        ripple.set_translation( - this._px * ripple.width, - this._py * ripple.height, 0.0);
+
+        Tweener.addTween(ripple, { _opacity: 0,
+                                   scale_x: finalScale,
+                                   scale_y: finalScale,
+                                   delay: delay,
+                                   time: time,
+                                   transition: 'linear',
+                                   onUpdate() { ripple.opacity = 255 * Math.sqrt(ripple._opacity); },
+                                   onComplete() { ripple.visible = false; } });
+    }
+
+    addTo(stage) {
+        if (this._stage !== undefined) {
+            throw new Error('Ripples already added');
+            return;
+        }
+
+        this._stage = stage;
+        this._stage.add_actor(this._ripple1);
+        this._stage.add_actor(this._ripple2);
+        this._stage.add_actor(this._ripple3);
+    }
+
+    playAnimation(x, y) {
+        if (this._stage === undefined) {
+            throw new Error('Ripples not added');
+            return;
+        }
+
+        this._x = x;
+        this._y = y;
+
+        this._stage.set_child_above_sibling(this._ripple1, null);
+        this._stage.set_child_above_sibling(this._ripple2, this._ripple1);
+        this._stage.set_child_above_sibling(this._ripple3, this._ripple2);
+
+        // Show three concentric ripples expanding outwards; the exact
+        // parameters were found by trial and error, so don't look
+        // for them to make perfect sense mathematically
+
+        //                              delay  time  scale opacity => scale
+        this._animRipple(this._ripple1, 0.0,   0.83,  0.25,  1.0,     1.5);
+        this._animRipple(this._ripple2, 0.05,  1.0,   0.0,   0.7,     1.25);
+        this._animRipple(this._ripple3, 0.35,  1.0,   0.0,   0.3,     1);
+    }
+};

js/ui/runDialog.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;
@@ -23,10 +23,11 @@ const EXEC_ARG_KEY = 'exec-arg';
 
 var DIALOG_GROW_TIME = 0.1;
 
-var RunDialog = class extends ModalDialog.ModalDialog {
+var RunDialog = GObject.registerClass(
-    constructor() {
+class RunDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'run-dialog',
+    _init() {
-                destroyOnClose: false });
+        super._init({ styleClass: 'run-dialog',
+                      destroyOnClose: false });
 
         this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
         this._terminalSettings = new Gio.Settings({ schema_id: TERMINAL_SCHEMA });
@@ -282,5 +283,4 @@ var RunDialog = class extends ModalDialog.ModalDialog {
 
         super.open();
     }
-};
+});
-Signals.addSignalMethods(RunDialog.prototype);

js/ui/screenShield.js

@@ -810,16 +810,8 @@ var ScreenShield = class {
 
         this._maybeCancelDialog();
 
-        if (this._longLightbox.actor.visible ||
+        if (this._longLightbox.actor.visible) {
-            this._isActive) {
+            // We're in the process of showing.
-            // We're either shown and active, or in the process of
-            // showing.
-            // The latter is a very unlikely condition (it requires
-            // idle-delay < 20), but in any case we have nothing
-            // to do at this point: either isActive is true, or
-            // it will soon be.
-            // isActive can also be true if the lightbox is hidden,
-            // in case the shield is down and the user hasn't unlocked yet
             return;
         }
 

js/ui/screenshot.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, Gtk, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 const GrabHelper = imports.ui.grabHelper;
@@ -227,8 +227,6 @@ var SelectArea = class {
         this._lastY = 0;
         this._result = null;
 
-        this._initRubberbandColors();
-
         this._group = new St.Widget({ visible: false,
                                       reactive: true,
                                       x: 0,
@@ -248,10 +246,10 @@ var SelectArea = class {
                                                       coordinate: Clutter.BindCoordinate.ALL });
         this._group.add_constraint(constraint);
 
-        this._rubberband = new Clutter.Rectangle({ color: this._background,
+        this._rubberband = new St.Widget({
-                                                   has_border: true,
+            style_class: 'select-area-rubberband',
-                                                   border_width: 1,
+            visible: false
-                                                   border_color: this._border });
+        });
         this._group.add_actor(this._rubberband);
     }
 
@@ -265,25 +263,6 @@ var SelectArea = class {
         this._group.visible = true;
     }
 
-    _initRubberbandColors() {
-        function colorFromRGBA(rgba) {
-            return new Clutter.Color({ red: rgba.red * 255,
-                                       green: rgba.green * 255,
-                                       blue: rgba.blue * 255,
-                                       alpha: rgba.alpha * 255 });
-        }
-
-        let path = new Gtk.WidgetPath();
-        path.append_type(Gtk.IconView);
-
-        let context = new Gtk.StyleContext();
-        context.set_path(path);
-        context.add_class('rubberband');
-
-        this._background = colorFromRGBA(context.get_background_color(Gtk.StateFlags.NORMAL));
-        this._border = colorFromRGBA(context.get_border_color(Gtk.StateFlags.NORMAL));
-    }
-
     _getGeometry() {
         return { x: Math.min(this._startX, this._lastX),
                  y: Math.min(this._startY, this._lastY),
@@ -302,6 +281,7 @@ var SelectArea = class {
 
         this._rubberband.set_position(geometry.x, geometry.y);
         this._rubberband.set_size(geometry.width, geometry.height);
+        this._rubberband.show();
 
         return Clutter.EVENT_PROPAGATE;
     }

js/ui/scripting.js

@@ -37,16 +37,13 @@ const { loadInterfaceXML } = imports.misc.fileUtils;
  * 'yield Scripting.sleep(500);'
  */
 function sleep(milliseconds) {
-    let cb;
+    return new Promise(resolve => {
-
+        let id = Mainloop.timeout_add(milliseconds, () => {
-    let id = Mainloop.timeout_add(milliseconds, () => {
+            resolve();
-        if (cb)
+            return GLib.SOURCE_REMOVE;
-            cb();
+        });
-        return GLib.SOURCE_REMOVE;
+        GLib.Source.set_name_by_id(id, '[gnome-shell] sleep');
     });
-    GLib.Source.set_name_by_id(id, '[gnome-shell] sleep');
-
-    return callback => { cb = callback; };
 }
 
 /**
@@ -57,14 +54,9 @@ function sleep(milliseconds) {
  * 'yield Scripting.waitLeisure();'
  */
 function waitLeisure() {
-    let cb;
+    return new Promise(resolve => {
-
+        global.run_at_leisure(resolve);
-    global.run_at_leisure(() => {
-       if (cb)
-           cb();
     });
-
-    return callback => { cb = callback; };
 }
 
 const PerfHelperIface = loadInterfaceXML('org.gnome.Shell.PerfHelper');
@@ -82,25 +74,16 @@ function _getPerfHelper() {
 }
 
 function _callRemote(obj, method, ...args) {
-    let cb;
+    return new Promise((resolve, reject) => {
-    let errcb;
+        args.push((result, excp) => {
+            if (excp)
+                reject(excp);
+            else
+                resolve();
+        });
 
-    args.push((result, excp) => {
+        method.apply(obj, args);
-         if (excp) {
-             if (errcb)
-                 errcb(excp);
-         } else {
-             if (cb)
-                 cb();
-         }
     });
-
-    method.apply(obj, args);
-
-    return (callback, error_callback) => {
-        cb = callback;
-        errcb = error_callback;
-    };
 }
 
 /**
@@ -192,27 +175,6 @@ function collectStatistics() {
     Shell.PerfLog.get_default().collect_statistics();
 }
 
-function _step(g, finish, onError) {
-    try {
-        let waitFunction = g.next();
-        waitFunction(() => {
-                         _step(g, finish, onError);
-                     },
-                     err => {
-                         if (onError)
-                             onError(err);
-                     });
-    } catch (err) {
-        if (err instanceof StopIteration) {
-            if (finish)
-                finish();
-        } else {
-            if (onError)
-                onError(err);
-        }
-    }
-}
-
 function _collect(scriptModule, outputFile) {
     let eventHandlers = {};
 
@@ -348,23 +310,23 @@ function _collect(scriptModule, outputFile) {
  * After running the script and collecting statistics from the
  * event log, GNOME Shell will exit.
  **/
-function runPerfScript(scriptModule, outputFile) {
+async function runPerfScript(scriptModule, outputFile) {
     Shell.PerfLog.get_default().set_enabled(true);
 
-    let g = scriptModule.run();
+    for (let step of scriptModule.run()) {
+        try {
+            await step;
+        } catch (err) {
+            log(`Script failed: ${err}\n${err.stack}`);
+            Meta.exit(Meta.ExitCode.ERROR);
+        }
+    }
 
-    _step(g,
+    try {
-          () => {
+        _collect(scriptModule, outputFile);
-              try {
+    } catch (err) {
-                  _collect(scriptModule, outputFile);
+        log(`Script failed: ${err}\n${err.stack}`);
-              } catch (err) {
+        Meta.exit(Meta.ExitCode.ERROR);
-                  log("Script failed: " + err + "\n" + err.stack);
+    }
-                  Meta.exit(Meta.ExitCode.ERROR);
+    Meta.exit(Meta.ExitCode.SUCCESS);
-              }
-              Meta.exit(Meta.ExitCode.SUCCESS);
-          },
-         err => {
-             log("Script failed: " + err + "\n" + err.stack);
-             Meta.exit(Meta.ExitCode.ERROR);
-         });
 }

js/ui/search.js

@@ -431,6 +431,9 @@ var SearchResults = class {
         this._cancellable = new Gio.Cancellable();
 
         this._registerProvider(new AppDisplay.AppSearchProvider());
+
+        let appSystem = Shell.AppSystem.get_default();
+        appSystem.connect('installed-changed', this._reloadRemoteProviders.bind(this));
         this._reloadRemoteProviders();
     }
 

js/ui/sessionMode.js

@@ -25,6 +25,7 @@ const _modes = {
         hasWorkspaces: false,
         hasWindows: false,
         hasNotifications: false,
+        hasWmMenus: false,
         isLocked: false,
         isGreeter: false,
         isPrimary: false,
@@ -47,7 +48,7 @@ const _modes = {
         panel: {
             left: [],
             center: ['dateMenu'],
-            right: ['a11y', 'keyboard', 'aggregateMenu']
+            right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
         },
         panelStyle: 'login-screen'
     },
@@ -72,7 +73,7 @@ const _modes = {
         panel: {
             left: [],
             center: [],
-            right: ['a11y', 'keyboard', 'aggregateMenu']
+            right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
         },
         panelStyle: 'unlock-screen'
     },
@@ -86,6 +87,7 @@ const _modes = {
         hasRunDialog: true,
         hasWorkspaces: true,
         hasWindows: true,
+        hasWmMenus: true,
         hasNotifications: true,
         isLocked: false,
         isPrimary: true,
@@ -99,7 +101,7 @@ const _modes = {
         panel: {
             left: ['activities', 'appMenu'],
             center: ['dateMenu'],
-            right: ['a11y', 'keyboard', 'aggregateMenu']
+            right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu']
         }
     }
 };

js/ui/shellDBus.js

@@ -79,14 +79,17 @@ var GnomeShell = class {
         for (let param in params)
             params[param] = params[param].deep_unpack();
 
-        let { monitor: monitorIndex,
+        let { connector,
               label,
               level,
               max_level: maxLevel,
               icon: serializedIcon } = params;
 
-        if (monitorIndex === undefined)
+        let monitorIndex = -1;
-            monitorIndex = -1;
+        if (connector) {
+            let monitorManager = Meta.MonitorManager.get();
+            monitorIndex = monitorManager.get_monitor_for_connector(connector);
+        }
 
         let icon = null;
         if (serializedIcon)
@@ -203,16 +206,10 @@ var GnomeShell = class {
         this._grabbers.delete(name);
     }
 
-    ShowMonitorLabelsAsync(params, invocation) {
-        let sender = invocation.get_sender();
-        let [dict] = params;
-        Main.osdMonitorLabeler.show(sender, dict);
-    }
-
     ShowMonitorLabels2Async(params, invocation) {
         let sender = invocation.get_sender();
         let [dict] = params;
-        Main.osdMonitorLabeler.show2(sender, dict);
+        Main.osdMonitorLabeler.show(sender, dict);
     }
 
     HideMonitorLabelsAsync(params, invocation) {

js/ui/shellEntry.js

@@ -148,7 +148,7 @@ function addContextMenu(entry, params) {
 
     entry.menu = new EntryMenu(entry);
     entry.menu.isPassword = params.isPassword;
-    entry._menuManager = new PopupMenu.PopupMenuManager({ actor: entry },
+    entry._menuManager = new PopupMenu.PopupMenuManager(entry,
                                                         { actionMode: params.actionMode });
     entry._menuManager.addMenu(entry.menu);
 

js/ui/shellMountOperation.js

@@ -1,8 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, Pango, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
+const Animation = imports.ui.animation;
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
@@ -14,6 +15,7 @@ const ShellEntry = imports.ui.shellEntry;
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
 var LIST_ITEM_ICON_SIZE = 48;
+var WORK_SPINNER_ICON_SIZE = 16;
 
 const REMEMBER_MOUNT_PASSWORD_KEY = 'remember-mount-password';
 
@@ -148,7 +150,7 @@ var ShellMountOperation = class {
         }
 
         this._dialogId = this._dialog.connect('response',
-            (object, choice, password, remember) => {
+            (object, choice, password, remember, hiddenVolume, systemVolume, pim) => {
                 if (choice == -1) {
                     this.mountOp.reply(Gio.MountOperationResult.ABORTED);
                 } else {
@@ -158,6 +160,9 @@ var ShellMountOperation = class {
                         this.mountOp.set_password_save(Gio.PasswordSave.NEVER);
 
                     this.mountOp.set_password(password);
+                    this.mountOp.set_is_tcrypt_hidden_volume(hiddenVolume);
+                    this.mountOp.set_is_tcrypt_system_volume(systemVolume);
+                    this.mountOp.set_pim(pim);
                     this.mountOp.reply(Gio.MountOperationResult.HANDLED);
                 }
             });
@@ -264,9 +269,11 @@ var ShellUnmountNotifier = class extends MessageTray.Source {
     }
 };
 
-var ShellMountQuestionDialog = class extends ModalDialog.ModalDialog {
+var ShellMountQuestionDialog = GObject.registerClass({
-    constructor(icon) {
+    Signals: { 'response': { param_types: [GObject.TYPE_INT] } }
-        super({ styleClass: 'mount-dialog' });
+}, class ShellMountQuestionDialog extends ModalDialog.ModalDialog {
+    _init(icon) {
+        super._init({ styleClass: 'mount-dialog' });
 
         this._content = new Dialog.MessageDialogContent({ icon });
         this.contentLayout.add(this._content, { x_fill: true, y_fill: false });
@@ -276,34 +283,107 @@ var ShellMountQuestionDialog = class extends ModalDialog.ModalDialog {
         _setLabelsForMessage(this._content, message);
         _setButtonsForChoices(this, choices);
     }
-};
+});
-Signals.addSignalMethods(ShellMountQuestionDialog.prototype);
 
-var ShellMountPasswordDialog = class extends ModalDialog.ModalDialog {
+var ShellMountPasswordDialog = GObject.registerClass({
-    constructor(message, icon, flags) {
+    Signals: { 'response': { param_types: [GObject.TYPE_INT,
+                                           GObject.TYPE_STRING,
+                                           GObject.TYPE_BOOLEAN,
+                                           GObject.TYPE_BOOLEAN,
+                                           GObject.TYPE_BOOLEAN,
+                                           GObject.TYPE_UINT] } }
+}, class ShellMountPasswordDialog extends ModalDialog.ModalDialog {
+    _init(message, icon, flags) {
         let strings = message.split('\n');
         let title = strings.shift() || null;
         let body = strings.shift() || null;
-        super({ styleClass: 'prompt-dialog' });
+        super._init({ styleClass: 'prompt-dialog' });
+
+        let disksApp = Shell.AppSystem.get_default().lookup_app('org.gnome.DiskUtility.desktop');
 
         let content = new Dialog.MessageDialogContent({ icon, title, body });
         this.contentLayout.add_actor(content);
+        content._body.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
-        this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' });
+        let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
-        content.messageBox.add(this._passwordBox);
+        let grid = new St.Widget({ style_class: 'prompt-dialog-grid',
+                                   layout_manager: layout });
+        layout.hookup_style(grid);
+        let rtl = grid.get_text_direction() === Clutter.TextDirection.RTL;
 
-        this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label',
+        if (flags & Gio.AskPasswordFlags.TCRYPT) {
-                                              text: _("Password") }));
+            this._keyfilesLabel = new St.Label(({ style_class: 'prompt-dialog-keyfiles-label',
-        this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
+                                                  visible: false }));
 
+            this._hiddenVolume = new CheckBox.CheckBox(_("Hidden Volume"));
+            content.messageBox.add(this._hiddenVolume.actor);
+
+            this._systemVolume = new CheckBox.CheckBox(_("Windows System Volume"));
+            content.messageBox.add(this._systemVolume.actor);
+
+            this._keyfilesCheckbox = new CheckBox.CheckBox(_("Uses Keyfiles"));
+            this._keyfilesCheckbox.actor.connect("clicked", this._onKeyfilesCheckboxClicked.bind(this));
+            content.messageBox.add(this._keyfilesCheckbox.actor);
+
+            this._keyfilesLabel.clutter_text.set_markup(
+                /* Translators: %s is the Disks application */
+                _("To unlock a volume that uses keyfiles, use the <i>%s</i> utility instead.").format(disksApp.get_name())
+            );
+            this._keyfilesLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+            this._keyfilesLabel.clutter_text.line_wrap = true;
+            content.messageBox.add(this._keyfilesLabel, { y_fill: false, y_align: St.Align.MIDDLE, expand: true });
+
+            this._pimLabel = new St.Label({ style_class: 'prompt-dialog-password-label',
+                                            text: _("PIM Number"),
+                                            y_align: Clutter.ActorAlign.CENTER });
+            this._pimEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
+                                            can_focus: true,
+                                            x_expand: true });
+            this._pimEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
+            this._pimEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
+            ShellEntry.addContextMenu(this._pimEntry, { isPassword: true });
+
+            if (rtl) {
+                layout.attach(this._pimEntry, 0, 0, 1, 1);
+                layout.attach(this._pimLabel, 1, 0, 1, 1);
+            } else {
+                layout.attach(this._pimLabel, 0, 0, 1, 1);
+                layout.attach(this._pimEntry, 1, 0, 1, 1);
+            }
+
+            this._pimErrorMessageLabel = new St.Label({ style_class: 'prompt-dialog-password-entry',
+                                                        text: _("The PIM must be a number or empty."),
+                                                        visible: false });
+            layout.attach(this._pimErrorMessageLabel, 0, 2, 2, 1);
+        } else {
+            this._hiddenVolume = null;
+            this._systemVolume = null;
+            this._pimEntry = null;
+            this._pimErrorMessageLabel = null;
+        }
+
+        this._passwordLabel = new St.Label({ style_class: 'prompt-dialog-password-label',
+                                             text: _("Password"),
+                                             y_align: Clutter.ActorAlign.CENTER });
         this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
-                                             text: "",
+                                             can_focus: true,
-                                             can_focus: true});
+                                             x_expand: true });
-        ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
         this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
         this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-        this._passwordBox.add(this._passwordEntry, {expand: true });
+        ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
         this.setInitialKeyFocus(this._passwordEntry);
+        this._workSpinner = new Animation.Spinner(WORK_SPINNER_ICON_SIZE, true);
+        this._passwordEntry.secondary_icon = this._workSpinner.actor;
+
+        if (rtl) {
+            layout.attach(this._passwordEntry, 0, 1, 1, 1);
+            layout.attach(this._passwordLabel, 1, 1, 1, 1);
+        } else {
+            layout.attach(this._passwordLabel, 0, 1, 1, 1);
+            layout.attach(this._passwordEntry, 1, 1, 1, 1);
+        }
+
+        content.messageBox.add(grid);
 
         this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label',
                                                  text: _("Sorry, that didn’t work. Please try again.") });
@@ -313,8 +393,7 @@ var ShellMountPasswordDialog = class extends ModalDialog.ModalDialog {
         content.messageBox.add(this._errorMessageLabel);
 
         if (flags & Gio.AskPasswordFlags.SAVING_SUPPORTED) {
-            this._rememberChoice = new CheckBox.CheckBox();
+            this._rememberChoice = new CheckBox.CheckBox(_("Remember Password"));
-            this._rememberChoice.getLabelActor().text = _("Remember Password");
             this._rememberChoice.actor.checked =
                 global.settings.get_boolean(REMEMBER_MOUNT_PASSWORD_KEY);
             content.messageBox.add(this._rememberChoice.actor);
@@ -322,25 +401,36 @@ var ShellMountPasswordDialog = class extends ModalDialog.ModalDialog {
             this._rememberChoice = null;
         }
 
-        let buttons = [{ label: _("Cancel"),
+        this._defaultButtons = [{ label: _("Cancel"),
-                         action: this._onCancelButton.bind(this),
+                                  action: this._onCancelButton.bind(this),
-                         key:    Clutter.Escape
+                                  key:    Clutter.Escape
-                       },
+                                },
-                       { label: _("Unlock"),
+                                { label: _("Unlock"),
-                         action: this._onUnlockButton.bind(this),
+                                  action: this._onUnlockButton.bind(this),
-                         default: true
+                                  default: true
-                       }];
+                                }];
 
-        this.setButtons(buttons);
+        this._usesKeyfilesButtons = [{ label: _("Cancel"),
+                                       action: this._onCancelButton.bind(this),
+                                       key:    Clutter.Escape
+                                     },
+                                     { /* Translators: %s is the Disks application */
+                                       label: _("Open %s").format(disksApp.get_name()),
+                                       action: this._onOpenDisksButton.bind(this),
+                                       default: true
+                                     }];
+
+        this.setButtons(this._defaultButtons);
     }
 
     reaskPassword() {
         this._passwordEntry.set_text('');
         this._errorMessageLabel.show();
+        this._workSpinner.stop();
     }
 
     _onCancelButton() {
-        this.emit('response', -1, '', false);
+        this.emit('response', -1, '', false, false, false, 0);
     }
 
     _onUnlockButton() {
@@ -348,18 +438,68 @@ var ShellMountPasswordDialog = class extends ModalDialog.ModalDialog {
     }
 
     _onEntryActivate() {
+        let pim = 0;
+        if (this._pimEntry !== null)
+            pim = this._pimEntry.get_text();
+        if (isNaN(pim)) {
+            this._pimEntry.set_text('');
+            this._pimErrorMessageLabel.show();
+            return;
+        } else if (this._pimErrorMessageLabel !== null) {
+            this._pimErrorMessageLabel.hide();
+        }
+
         global.settings.set_boolean(REMEMBER_MOUNT_PASSWORD_KEY,
             this._rememberChoice && this._rememberChoice.actor.checked);
+
+        this._workSpinner.play();
         this.emit('response', 1,
             this._passwordEntry.get_text(),
             this._rememberChoice &&
-            this._rememberChoice.actor.checked);
+            this._rememberChoice.actor.checked,
+            this._hiddenVolume &&
+            this._hiddenVolume.actor.checked,
+            this._systemVolume &&
+            this._systemVolume.actor.checked,
+            parseInt(pim));
     }
-};
 
-var ShellProcessesDialog = class extends ModalDialog.ModalDialog {
+    _onKeyfilesCheckboxClicked() {
-    constructor(icon) {
+        let useKeyfiles = this._keyfilesCheckbox.actor.checked;
-        super({ styleClass: 'mount-dialog' });
+        this._passwordEntry.reactive = !useKeyfiles;
+        this._passwordEntry.can_focus = !useKeyfiles;
+        this._passwordEntry.clutter_text.editable = !useKeyfiles;
+        this._passwordEntry.clutter_text.selectable = !useKeyfiles;
+        this._pimEntry.reactive = !useKeyfiles;
+        this._pimEntry.can_focus = !useKeyfiles;
+        this._pimEntry.clutter_text.editable = !useKeyfiles;
+        this._pimEntry.clutter_text.selectable = !useKeyfiles;
+        this._rememberChoice.actor.reactive = !useKeyfiles;
+        this._rememberChoice.actor.can_focus = !useKeyfiles;
+        this._keyfilesLabel.visible = useKeyfiles;
+        this.setButtons(useKeyfiles ? this._usesKeyfilesButtons : this._defaultButtons);
+    }
+
+    _onOpenDisksButton() {
+        let app = Shell.AppSystem.get_default().lookup_app('org.gnome.DiskUtility.desktop');
+        if (app)
+            app.activate();
+        else
+            Main.notifyError(
+                /* Translators: %s is the Disks application */
+                _("Unable to start %s").format(app.get_name()),
+                /* Translators: %s is the Disks application */
+                _("Couldn’t find the %s application").format(app.get_name())
+            );
+        this._onCancelButton();
+    }
+});
+
+var ShellProcessesDialog = GObject.registerClass({
+    Signals: { 'response': { param_types: [GObject.TYPE_INT] } }
+}, class ShellProcessesDialog extends ModalDialog.ModalDialog {
+    _init(icon) {
+        super._init({ styleClass: 'mount-dialog' });
 
         this._content = new Dialog.MessageDialogContent({ icon });
         this.contentLayout.add(this._content, { x_fill: true, y_fill: false });
@@ -412,8 +552,7 @@ var ShellProcessesDialog = class extends ModalDialog.ModalDialog {
         _setLabelsForMessage(this._content, message);
         _setButtonsForChoices(this, choices);
     }
-};
+});
-Signals.addSignalMethods(ShellProcessesDialog.prototype);
 
 const GnomeShellMountOpIface = loadInterfaceXML('org.Gtk.MountOperationHandler');
 
@@ -515,7 +654,7 @@ var GnomeShellMountOpHandler = class {
 
         this._dialog = new ShellMountPasswordDialog(message, this._createGIcon(iconName), flags);
         this._dialog.connect('response',
-            (object, choice, password, remember) => {
+            (object, choice, password, remember, hiddenVolume, systemVolume, pim) => {
                 let details = {};
                 let response;
 
@@ -527,6 +666,9 @@ var GnomeShellMountOpHandler = class {
                     let passSave = remember ? Gio.PasswordSave.PERMANENTLY : Gio.PasswordSave.NEVER;
                     details['password_save'] = GLib.Variant.new('u', passSave);
                     details['password'] = GLib.Variant.new('s', password);
+                    details['hidden_volume'] = GLib.Variant.new('b', hiddenVolume);
+                    details['system_volume'] = GLib.Variant.new('b', systemVolume);
+                    details['pim'] = GLib.Variant.new('u', pim);
                 }
 
                 this._clearCurrentRequest(response, details);

js/ui/status/accessibility.js

@@ -32,14 +32,14 @@ const HIGH_CONTRAST_THEME           = 'HighContrast';
 var ATIndicator = GObject.registerClass(
 class ATIndicator extends PanelMenu.Button {
     _init() {
-        super._init(0.0, _("Accessibility"));
+        super._init(0.5, _("Accessibility"));
 
         this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         this._hbox.add_child(new St.Icon({ style_class: 'system-status-icon',
                                            icon_name: 'preferences-desktop-accessibility-symbolic' }));
         this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
-        this.actor.add_child(this._hbox);
+        this.add_child(this._hbox);
 
         this._a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
         this._a11ySettings.connect('changed::' + KEY_ALWAYS_SHOW, this._queueSyncMenuVisibility.bind(this));
@@ -86,7 +86,7 @@ class ATIndicator extends PanelMenu.Button {
         let alwaysShow = this._a11ySettings.get_boolean(KEY_ALWAYS_SHOW);
         let items = this.menu._getMenuItems();
 
-        this.actor.visible = alwaysShow || items.some(f => !!f.state);
+        this.visible = alwaysShow || items.some(f => !!f.state);
 
         return GLib.SOURCE_REMOVE;
     }
@@ -112,38 +112,22 @@ class ATIndicator extends PanelMenu.Button {
 
     _buildItem(string, schema, key) {
         let settings = new Gio.Settings({ schema_id: schema });
-        settings.connect('changed::'+key, () => {
+        let widget = this._buildItemExtended(string,
+            settings.get_boolean(key),
+            settings.is_writable(key),
+            enabled => settings.set_boolean(key, enabled));
+
+        settings.connect('changed::' + key, () => {
             widget.setToggleState(settings.get_boolean(key));
 
             this._queueSyncMenuVisibility();
         });
 
-        let widget = this._buildItemExtended(string,
-            settings.get_boolean(key),
-            settings.is_writable(key),
-            enabled => settings.set_boolean(key, enabled));
         return widget;
     }
 
     _buildHCItem() {
         let interfaceSettings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
-        interfaceSettings.connect('changed::' + KEY_GTK_THEME, () => {
-            let value = interfaceSettings.get_string(KEY_GTK_THEME);
-            if (value == HIGH_CONTRAST_THEME) {
-                highContrast.setToggleState(true);
-            } else {
-                highContrast.setToggleState(false);
-                gtkTheme = value;
-            }
-
-            this._queueSyncMenuVisibility();
-        });
-        interfaceSettings.connect('changed::' + KEY_ICON_THEME, () => {
-            let value = interfaceSettings.get_string(KEY_ICON_THEME);
-            if (value != HIGH_CONTRAST_THEME)
-                iconTheme = value;
-        });
-
         let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
         let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
         let hasHC = (gtkTheme == HIGH_CONTRAST_THEME);
@@ -164,19 +148,30 @@ class ATIndicator extends PanelMenu.Button {
                     interfaceSettings.reset(KEY_ICON_THEME);
                 }
             });
+
+        interfaceSettings.connect('changed::' + KEY_GTK_THEME, () => {
+            let value = interfaceSettings.get_string(KEY_GTK_THEME);
+            if (value == HIGH_CONTRAST_THEME) {
+                highContrast.setToggleState(true);
+            } else {
+                highContrast.setToggleState(false);
+                gtkTheme = value;
+            }
+
+            this._queueSyncMenuVisibility();
+        });
+
+        interfaceSettings.connect('changed::' + KEY_ICON_THEME, () => {
+            let value = interfaceSettings.get_string(KEY_ICON_THEME);
+            if (value != HIGH_CONTRAST_THEME)
+                iconTheme = value;
+        });
+
         return highContrast;
     }
 
     _buildFontItem() {
         let settings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
-        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, () => {
-            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
-            let active = (factor > 1.0);
-            widget.setToggleState(active);
-
-            this._queueSyncMenuVisibility();
-        });
-
         let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
         let initial_setting = (factor > 1.0);
         let widget = this._buildItemExtended(_("Large Text"),
@@ -189,6 +184,15 @@ class ATIndicator extends PanelMenu.Button {
                 else
                     settings.reset(KEY_TEXT_SCALING_FACTOR);
             });
+
+        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, () => {
+            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
+            let active = (factor > 1.0);
+            widget.setToggleState(active);
+
+            this._queueSyncMenuVisibility();
+        });
+
         return widget;
     }
 });

js/ui/status/bluetooth.js

@@ -118,9 +118,9 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         // Remember if there were setup devices and show the menu
         // if we've seen setup devices and we're not hard blocked
         if (nDevices > 0)
-            this._item.actor.visible = !this._proxy.BluetoothHardwareAirplaneMode;
+            this._item.visible = !this._proxy.BluetoothHardwareAirplaneMode;
         else
-            this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
+            this._item.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
 
         if (nConnectedDevices > 0)
             /* Translators: this is the number of connected bluetooth devices */

js/ui/status/brightness.js

@@ -37,12 +37,12 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
         let icon = new St.Icon({ icon_name: 'display-brightness-symbolic',
                                  style_class: 'popup-menu-icon' });
-        this._item.actor.add(icon);
+        this._item.add(icon);
-        this._item.actor.add(this._slider.actor, { expand: true });
+        this._item.add(this._slider.actor, { expand: true });
-        this._item.actor.connect('button-press-event', (actor, event) => {
+        this._item.connect('button-press-event', (actor, event) => {
             return this._slider.startDragging(event);
         });
-        this._item.actor.connect('key-press-event', (actor, event) => {
+        this._item.connect('key-press-event', (actor, event) => {
             return this._slider.onKeyPressEvent(actor, event);
         });
 
@@ -55,7 +55,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
     _sync() {
         let visible = this._proxy.Brightness >= 0;
-        this._item.actor.visible = visible;
+        this._item.visible = visible;
         if (visible)
             this._slider.setValue(this._proxy.Brightness / 100.0);
     }

js/ui/status/dwellClick.js

@@ -0,0 +1,86 @@
+const { Clutter, Gio, GLib, GObject, St } = imports.gi;
+const Mainloop = imports.mainloop;
+
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const MOUSE_A11Y_SCHEMA       = 'org.gnome.desktop.a11y.mouse';
+const KEY_DWELL_CLICK_ENABLED = 'dwell-click-enabled';
+const KEY_DWELL_MODE          = 'dwell-mode';
+const DWELL_MODE_WINDOW       = 'window';
+const DWELL_CLICK_MODES = {
+    primary:   {
+                 name: _("Single Click"),
+                 icon: 'pointer-primary-click-symbolic',
+                 type: Clutter.PointerA11yDwellClickType.PRIMARY
+               },
+    double:    {
+                 name: _("Double Click"),
+                 icon: 'pointer-double-click-symbolic',
+                 type: Clutter.PointerA11yDwellClickType.DOUBLE
+               },
+    drag:      {
+                 name: _("Drag"),
+                 icon: 'pointer-drag-symbolic',
+                 type: Clutter.PointerA11yDwellClickType.DRAG
+               },
+    secondary: {
+                 name: _("Secondary Click"),
+                 icon: 'pointer-secondary-click-symbolic',
+                 type: Clutter.PointerA11yDwellClickType.SECONDARY
+               },
+};
+
+var DwellClickIndicator = GObject.registerClass(
+class DwellClickIndicator extends PanelMenu.Button {
+    _init() {
+        super._init(0.5, _("Dwell Click"));
+
+        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
+        this._icon = new St.Icon({ style_class: 'system-status-icon',
+                                   icon_name: 'pointer-primary-click-symbolic' });
+        this._hbox.add_child(this._icon);
+        this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+
+        this.add_child(this._hbox);
+
+        this._a11ySettings = new Gio.Settings({ schema_id: MOUSE_A11Y_SCHEMA });
+        this._a11ySettings.connect('changed::' + KEY_DWELL_CLICK_ENABLED, this._syncMenuVisibility.bind(this));
+        this._a11ySettings.connect('changed::' + KEY_DWELL_MODE, this._syncMenuVisibility.bind(this));
+
+        this._deviceManager = Clutter.DeviceManager.get_default();
+        this._deviceManager.connect('ptr-a11y-dwell-click-type-changed', this._updateClickType.bind(this));
+
+        this._addDwellAction(DWELL_CLICK_MODES.primary);
+        this._addDwellAction(DWELL_CLICK_MODES.double);
+        this._addDwellAction(DWELL_CLICK_MODES.drag);
+        this._addDwellAction(DWELL_CLICK_MODES.secondary);
+
+        this._setClickType(DWELL_CLICK_MODES.primary);
+        this._syncMenuVisibility();
+    }
+
+    _syncMenuVisibility() {
+        this.visible =
+          (this._a11ySettings.get_boolean(KEY_DWELL_CLICK_ENABLED) &&
+           this._a11ySettings.get_string(KEY_DWELL_MODE) == DWELL_MODE_WINDOW);
+
+        return GLib.SOURCE_REMOVE;
+    }
+
+    _addDwellAction(mode) {
+        this.menu.addAction(mode.name, this._setClickType.bind(this, mode), mode.icon);
+    }
+
+    _updateClickType(manager, click_type) {
+        for (let mode in DWELL_CLICK_MODES) {
+            if (DWELL_CLICK_MODES[mode].type == click_type)
+                this._icon.icon_name = DWELL_CLICK_MODES[mode].icon;
+        }
+    }
+
+    _setClickType(mode) {
+        this._deviceManager.set_pointer_a11y_dwell_click_type(mode.type);
+        this._icon.icon_name = mode.icon;
+    }
+});

js/ui/status/keyboard.js

@@ -15,17 +15,18 @@ const Util = imports.misc.util;
 const INPUT_SOURCE_TYPE_XKB = 'xkb';
 const INPUT_SOURCE_TYPE_IBUS = 'ibus';
 
-var LayoutMenuItem = class extends PopupMenu.PopupBaseMenuItem {
+var LayoutMenuItem = GObject.registerClass(
-    constructor(displayName, shortName) {
+class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
-        super();
+    _init(displayName, shortName) {
+        super._init();
 
         this.label = new St.Label({ text: displayName });
         this.indicator = new St.Label({ text: shortName });
-        this.actor.add(this.label, { expand: true });
+        this.add(this.label, { expand: true });
-        this.actor.add(this.indicator);
+        this.add(this.indicator);
-        this.actor.label_actor = this.label;
+        this.label_actor = this.label;
     }
-};
+});
 
 var InputSource = class {
     constructor(type, id, displayName, shortName, index) {
@@ -125,8 +126,8 @@ class InputSourceSwitcher extends SwitcherPopup.SwitcherList {
 
 var InputSourceSettings = class {
     constructor() {
-        if (new.target === InputSourceSettings)
+        if (this.constructor === InputSourceSettings)
-            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
+            throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
     }
 
     _emitInputSourcesChanged() {
@@ -809,7 +810,7 @@ class InputSourceIndicatorContainer extends St.Widget {
 var InputSourceIndicator = GObject.registerClass(
 class InputSourceIndicator extends PanelMenu.Button {
     _init() {
-        super._init(0.0, _("Keyboard"));
+        super._init(0.5, _("Keyboard"));
 
         this.connect('destroy', this._onDestroy.bind(this));
 
@@ -822,7 +823,7 @@ class InputSourceIndicator extends PanelMenu.Button {
         this._hbox.add_child(this._container);
         this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
-        this.actor.add_child(this._hbox);
+        this.add_child(this._hbox);
 
         this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(this._propSeparator);
@@ -857,7 +858,7 @@ class InputSourceIndicator extends PanelMenu.Button {
         // but at least for now it is used as "allow popping up windows
         // from shell menus"; we can always add a separate sessionMode
         // option if need arises.
-        this._showLayoutItem.actor.visible = Main.sessionMode.allowSettings;
+        this._showLayoutItem.visible = Main.sessionMode.allowSettings;
     }
 
     _sourcesChanged() {
@@ -908,11 +909,11 @@ class InputSourceIndicator extends PanelMenu.Button {
             // We also hide if we have only one visible source unless
             // it's an IBus source with properties.
             this.menu.close();
-            this.actor.hide();
+            this.hide();
             return;
         }
 
-        this.actor.show();
+        this.show();
 
         this._buildPropSection(newSource.properties);
 

js/ui/status/location.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, Gio, GLib, Shell } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Shell } = imports.gi;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
@@ -101,12 +101,12 @@ var Indicator = class extends PanelMenu.SystemIndicator {
     _syncIndicator() {
         if (this._managerProxy == null) {
             this._indicator.visible = false;
-            this._item.actor.visible = false;
+            this._item.visible = false;
             return;
         }
 
         this._indicator.visible = this._managerProxy.InUse;
-        this._item.actor.visible = this._indicator.visible;
+        this._item.visible = this._indicator.visible;
         this._updateMenuLabels();
     }
 
@@ -342,9 +342,11 @@ var AppAuthorizer = class {
     }
 };
 
-var GeolocationDialog = class extends ModalDialog.ModalDialog {
+var GeolocationDialog = GObject.registerClass({
-    constructor(name, subtitle, reqAccuracyLevel) {
+    Signals: { 'response': { param_types: [GObject.TYPE_UINT] } }
-        super({ styleClass: 'geolocation-dialog' });
+}, class GeolocationDialog extends ModalDialog.ModalDialog {
+    _init(name, subtitle, reqAccuracyLevel) {
+        super._init({ styleClass: 'geolocation-dialog' });
         this.reqAccuracyLevel = reqAccuracyLevel;
 
         let icon = new Gio.ThemedIcon({ name: 'find-location-symbolic' });
@@ -375,5 +377,4 @@ var GeolocationDialog = class extends ModalDialog.ModalDialog {
         this.emit('response', GeoclueAccuracyLevel.NONE);
         this.close();
     }
-};
+});
-Signals.addSignalMethods(GeolocationDialog.prototype);

js/ui/status/network.js

@@ -69,9 +69,12 @@ function ssidToLabel(ssid) {
 
 function ensureActiveConnectionProps(active, client) {
     if (!active._primaryDevice) {
-        // This list is guaranteed to have only one device in it.
+        let devices = active.get_devices();
-        let device = active.get_devices()[0]._delegate;
+        if (devices.length > 0) {
-        active._primaryDevice = device;
+            // This list is guaranteed to have at most one device in it.
+            let device = devices[0]._delegate;
+            active._primaryDevice = device;
+        }
     }
 }
 
@@ -167,10 +170,10 @@ var NMConnectionItem = class {
 };
 Signals.addSignalMethods(NMConnectionItem.prototype);
 
-var NMConnectionSection = class {
+var NMConnectionSection = class NMConnectionSection {
     constructor(client) {
-        if (new.target === NMConnectionSection)
+        if (this.constructor === NMConnectionSection)
-            throw new TypeError('Cannot instantiate abstract type ' + new.target.name);
+            throw new TypeError(`Cannot instantiate abstract type ${this.constructor.name}`);
 
         this._client = client;
 
@@ -235,14 +238,14 @@ var NMConnectionSection = class {
         if (!this._connectionValid(connection))
             return;
 
-        // This function is called everytime connection is added or updated
+        // This function is called every time the connection is added or updated.
         // In the usual case, we already added this connection and UUID
         // didn't change. So we need to check if we already have an item,
         // and update it for properties in the connection that changed
         // (the only one we care about is the name)
         // But it's also possible we didn't know about this connection
         // (eg, during coldplug, or because it was updated and suddenly
-        // it's valid for this device), in which case we add a new item
+        // it's valid for this device), in which case we add a new item.
 
         let item = this._connectionItems.get(connection.get_uuid());
         if (item)
@@ -297,12 +300,13 @@ var NMConnectionSection = class {
 };
 Signals.addSignalMethods(NMConnectionSection.prototype);
 
-var NMConnectionDevice = class extends NMConnectionSection {
+var NMConnectionDevice = class NMConnectionDevice extends NMConnectionSection {
     constructor(client, device) {
-        if (new.target === NMConnectionDevice)
-            throw new TypeError('Cannot instantiate abstract type ' + new.target.name);
-
         super(client);
+
+        if (this.constructor === NMConnectionDevice)
+            throw new TypeError(`Cannot instantiate abstract type ${this.constructor.name}`);
+
         this._device = device;
         this._description = '';
 
@@ -388,8 +392,8 @@ var NMConnectionDevice = class extends NMConnectionSection {
 
     _sync() {
         let nItems = this._connectionItems.size;
-        this._autoConnectItem.actor.visible = (nItems == 0);
+        this._autoConnectItem.visible = (nItems == 0);
-        this._deactivateItem.actor.visible = this._device.state > NM.DeviceState.DISCONNECTED;
+        this._deactivateItem.visible = this._device.state > NM.DeviceState.DISCONNECTED;
 
         if (this._activeConnection == null) {
             let activeConnection = this._device.active_connection;
@@ -476,7 +480,7 @@ var NMDeviceWired = class extends NMConnectionDevice {
     }
 
     _sync() {
-        this.item.actor.visible = this._hasCarrier();
+        this.item.visible = this._hasCarrier();
         super._sync();
     }
 
@@ -612,31 +616,36 @@ var NMDeviceBluetooth = class extends NMConnectionDevice {
     }
 };
 
-var NMWirelessDialogItem = class {
+var NMWirelessDialogItem = GObject.registerClass({
-    constructor(network) {
+    Signals: {
+        'selected': {},
+    }
+}, class NMWirelessDialogItem extends St.BoxLayout {
+    _init(network) {
         this._network = network;
         this._ap = network.accessPoints[0];
 
-        this.actor = new St.BoxLayout({ style_class: 'nm-dialog-item',
+        super._init({ style_class: 'nm-dialog-item',
-                                        can_focus: true,
+                      can_focus: true,
-                                        reactive: true });
+                      reactive: true });
-        this.actor.connect('key-focus-in', () => { this.emit('selected'); });
+
+        this.connect('key-focus-in', () => { this.emit('selected'); });
         let action = new Clutter.ClickAction();
-        action.connect('clicked', () => { this.actor.grab_key_focus(); });
+        action.connect('clicked', () => { this.grab_key_focus(); });
-        this.actor.add_action(action);
+        this.add_action(action);
 
         let title = ssidToLabel(this._ap.get_ssid());
         this._label = new St.Label({ text: title });
 
-        this.actor.label_actor = this._label;
+        this.label_actor = this._label;
-        this.actor.add(this._label, { x_align: St.Align.START });
+        this.add(this._label, { x_align: St.Align.START });
 
         this._selectedIcon = new St.Icon({ style_class: 'nm-dialog-icon',
                                            icon_name: 'object-select-symbolic' });
-        this.actor.add(this._selectedIcon);
+        this.add(this._selectedIcon);
 
         this._icons = new St.BoxLayout({ style_class: 'nm-dialog-icons' });
-        this.actor.add(this._icons, { expand: true, x_fill: false, x_align: St.Align.END });
+        this.add(this._icons, { expand: true, x_fill: false, x_align: St.Align.END });
 
         this._secureIcon = new St.Icon({ style_class: 'nm-dialog-icon' });
         if (this._ap._secType != NMAccessPointSecurity.NONE)
@@ -668,12 +677,12 @@ var NMWirelessDialogItem = class {
         else
             return 'network-wireless-signal-' + signalToIcon(this._ap.strength) + '-symbolic';
     }
-};
+});
-Signals.addSignalMethods(NMWirelessDialogItem.prototype);
 
-var NMWirelessDialog = class extends ModalDialog.ModalDialog {
+var NMWirelessDialog = GObject.registerClass(
-    constructor(client, device) {
+class NMWirelessDialog extends ModalDialog.ModalDialog {
-        super({ styleClass: 'nm-dialog' });
+    _init(client, device) {
+        super._init({ styleClass: 'nm-dialog' });
 
         this._client = client;
         this._device = device;
@@ -719,9 +728,11 @@ var NMWirelessDialog = class extends ModalDialog.ModalDialog {
             Main.sessionMode.disconnect(id);
             this.close();
         });
+
+        this.connect('destroy', this._onDestroy.bind(this));
     }
 
-    destroy() {
+    _onDestroy() {
         if (this._apAddedId) {
             GObject.Object.prototype.disconnect.call(this._device, this._apAddedId);
             this._apAddedId = 0;
@@ -747,8 +758,6 @@ var NMWirelessDialog = class extends ModalDialog.ModalDialog {
             Mainloop.source_remove(this._scanTimeoutId);
             this._scanTimeoutId = 0;
         }
-
-        super.destroy();
     }
 
     _onScanTimeout() {
@@ -1075,7 +1084,7 @@ var NMWirelessDialog = class extends ModalDialog.ModalDialog {
 
             let newPos = Util.insertSorted(this._networks, network, this._networkSortFunction);
             this._createNetworkItem(network);
-            this._itemBox.insert_child_at_index(network.item.actor, newPos);
+            this._itemBox.insert_child_at_index(network.item, newPos);
         }
 
         this._syncView();
@@ -1093,7 +1102,7 @@ var NMWirelessDialog = class extends ModalDialog.ModalDialog {
         network.accessPoints.splice(res.ap, 1);
 
         if (network.accessPoints.length == 0) {
-            network.item.actor.destroy();
+            network.item.destroy();
             this._networks.splice(res.network, 1);
         } else {
             network.item.updateBestAP(network.accessPoints[0]);
@@ -1109,7 +1118,7 @@ var NMWirelessDialog = class extends ModalDialog.ModalDialog {
 
         this._itemBox.remove_all_children();
         this._networks.forEach(network => {
-            this._itemBox.add_child(network.item.actor);
+            this._itemBox.add_child(network.item);
         });
 
         adjustment.value = scrollValue;
@@ -1117,29 +1126,29 @@ var NMWirelessDialog = class extends ModalDialog.ModalDialog {
 
     _selectNetwork(network) {
         if (this._selectedNetwork)
-            this._selectedNetwork.item.actor.remove_style_pseudo_class('selected');
+            this._selectedNetwork.item.remove_style_pseudo_class('selected');
 
         this._selectedNetwork = network;
         this._updateSensitivity();
 
         if (this._selectedNetwork)
-            this._selectedNetwork.item.actor.add_style_pseudo_class('selected');
+            this._selectedNetwork.item.add_style_pseudo_class('selected');
     }
 
     _createNetworkItem(network) {
         network.item = new NMWirelessDialogItem(network);
         network.item.setActive(network == this._selectedNetwork);
         network.item.connect('selected', () => {
-            Util.ensureActorVisibleInScrollView(this._scrollView, network.item.actor);
+            Util.ensureActorVisibleInScrollView(this._scrollView, network.item);
             this._selectNetwork(network);
         });
-        network.item.actor.connect('destroy', () => {
+        network.item.connect('destroy', () => {
             let keyFocus = global.stage.key_focus;
-            if (keyFocus && keyFocus.contains(network.item.actor))
+            if (keyFocus && keyFocus.contains(network.item))
                 this._itemBox.grab_key_focus();
         });
     }
-};
+});
 
 var NMDeviceWireless = class {
     constructor(client, device) {
@@ -1261,7 +1270,7 @@ var NMDeviceWireless = class {
 
     _sync() {
         this._toggleItem.label.text = this._client.wireless_enabled ? _("Turn Off") : _("Turn On");
-        this._toggleItem.actor.visible = this._client.wireless_hardware_enabled;
+        this._toggleItem.visible = this._client.wireless_hardware_enabled;
 
         this.item.icon.icon_name = this._getMenuIcon();
         this.item.label.text = this._getStatus();
@@ -1451,7 +1460,7 @@ var NMVpnSection = class extends NMConnectionSection {
 
     _sync() {
         let nItems = this._connectionItems.size;
-        this.item.actor.visible = (nItems > 0);
+        this.item.visible = (nItems > 0);
 
         super._sync();
     }
@@ -1534,7 +1543,7 @@ var DeviceCategory = class extends PopupMenu.PopupMenuSection {
 
         this._summaryItem.menu.addSettingsAction(_('Network Settings'),
                                                  'gnome-network-panel.desktop');
-        this._summaryItem.actor.hide();
+        this._summaryItem.hide();
 
     }
 
@@ -1543,7 +1552,7 @@ var DeviceCategory = class extends PopupMenu.PopupMenuSection {
             (prev, child) => prev + (child.visible ? 1 : 0), 0);
         this._summaryItem.label.text = this._getSummaryLabel(nDevices);
         let shouldSummarize = nDevices > MAX_DEVICE_ITEMS;
-        this._summaryItem.actor.visible = shouldSummarize;
+        this._summaryItem.visible = shouldSummarize;
         this.section.actor.visible = !shouldSummarize;
     }
 
@@ -1673,7 +1682,11 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
     _readDevices() {
         let devices = this._client.get_devices() || [ ];
         for (let i = 0; i < devices.length; ++i) {
-            this._deviceAdded(this._client, devices[i], true);
+            try {
+                this._deviceAdded(this._client, devices[i], true);
+            } catch (e) {
+                log(`Failed to add device ${devices[i]}: ${e}`);
+            }
         }
         this._syncDeviceNames();
     }
@@ -1726,14 +1739,24 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
             this._addDeviceWrapper(wrapper);
 
             this._nmDevices.push(device);
-            if (!skipSyncDeviceNames)
+            this._deviceChanged(device, skipSyncDeviceNames);
-                this._syncDeviceNames();
 
-            if (wrapper instanceof NMConnectionSection) {
+            device.connect('notify::interface', () => {
-                this._connections.forEach(connection => {
+                this._deviceChanged(device, false);
-                    wrapper.checkConnection(connection);
+            });
-                });
+        }
-            }
+    }
+
+    _deviceChanged(device, skipSyncDeviceNames) {
+        let wrapper = device._delegate;
+
+        if (!skipSyncDeviceNames)
+            this._syncDeviceNames();
+
+        if (wrapper instanceof NMConnectionSection) {
+            this._connections.forEach(connection => {
+                wrapper.checkConnection(connection);
+            });
         }
     }
 

js/ui/status/nightLight.js

@@ -61,6 +61,6 @@ var Indicator = class extends PanelMenu.SystemIndicator {
                                          : _("Night Light On");
         this._disableItem.label.text = disabled ? _("Resume")
                                                 : _("Disable Until Tomorrow");
-        this._item.actor.visible = this._indicator.visible = visible;
+        this._item.visible = this._indicator.visible = visible;
     }
 };

js/ui/status/power.js

@@ -96,11 +96,11 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         // Do we have batteries or a UPS?
         let visible = this._proxy.IsPresent;
         if (visible) {
-            this._item.actor.show();
+            this._item.show();
             this._percentageLabel.visible = this._desktopSettings.get_boolean(SHOW_BATTERY_PERCENTAGE);
         } else {
             // If there's no battery, then we use the power icon.
-            this._item.actor.hide();
+            this._item.hide();
             this._indicator.icon_name = 'system-shutdown-symbolic';
             this._percentageLabel.hide();
             return;

js/ui/status/remoteAccess.js

@@ -53,10 +53,10 @@ var RemoteAccessApplet = class extends PanelMenu.SystemIndicator {
     _sync() {
         if (this._handles.size == 0) {
             this._indicator.visible = false;
-            this._item.actor.visible = false;
+            this._item.visible = false;
         } else {
             this._indicator.visible = true;
-            this._item.actor.visible = true;
+            this._item.visible = true;
         }
     }
 

js/ui/status/rfkill.js

@@ -97,7 +97,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         let showAirplaneMode = this._manager.shouldShowAirplaneMode;
 
         this._indicator.visible = (airplaneMode && showAirplaneMode);
-        this._item.actor.visible = (airplaneMode && showAirplaneMode);
+        this._item.visible = (airplaneMode && showAirplaneMode);
         this._offItem.setSensitive(!hwAirplaneMode);
 
         if (hwAirplaneMode)

js/ui/status/system.js

@@ -116,10 +116,10 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
         this._createSubMenu();
 
-        this._loginScreenItem.actor.connect('notify::visible',
+        this._loginScreenItem.connect('notify::visible',
-                                            () => { this._updateMultiUser(); });
+                                      () => { this._updateMultiUser(); });
-        this._logoutItem.actor.connect('notify::visible',
+        this._logoutItem.connect('notify::visible',
-                                       () => { this._updateMultiUser(); });
+                                 () => { this._updateMultiUser(); });
         // Whether shutdown is available or not depends on both lockdown
         // settings (disable-log-out) and Polkit policy - the latter doesn't
         // notify, so we update the menu item each time the menu opens or
@@ -142,7 +142,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
                        this._lockScreenAction.visible ||
                        this._altSwitcher.actor.visible);
 
-        this._actionsItem.actor.visible = visible;
+        this.buttonGroup.visible = visible;
     }
 
     _sessionUpdated() {
@@ -150,10 +150,10 @@ var Indicator = class extends PanelMenu.SystemIndicator {
     }
 
     _updateMultiUser() {
-        let hasSwitchUser = this._loginScreenItem.actor.visible;
+        let hasSwitchUser = this._loginScreenItem.visible;
-        let hasLogout = this._logoutItem.actor.visible;
+        let hasLogout = this._logoutItem.visible;
 
-        this._switchUserSubMenu.actor.visible = hasSwitchUser || hasLogout;
+        this._switchUserSubMenu.visible = hasSwitchUser || hasLogout;
     }
 
     _updateSwitchUserSubMenu() {
@@ -208,7 +208,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         this._switchUserSubMenu.menu.addMenuItem(item);
         this._loginScreenItem = item;
         this._systemActions.bind_property('can-switch-user',
-                                          this._loginScreenItem.actor,
+                                          this._loginScreenItem,
                                           'visible',
                                           bindFlags);
 
@@ -220,7 +220,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         this._switchUserSubMenu.menu.addMenuItem(item);
         this._logoutItem = item;
         this._systemActions.bind_property('can-logout',
-                                          this._logoutItem.actor,
+                                          this._logoutItem,
                                           'visible',
                                           bindFlags);
 
@@ -236,6 +236,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
         item = new PopupMenu.PopupBaseMenuItem({ reactive: false,
                                                  can_focus: false });
+        this.buttonGroup = item;
 
         let app = this._settingsApp = Shell.AppSystem.get_default().lookup_app(
             'gnome-control-center.desktop'
@@ -250,14 +251,14 @@ var Indicator = class extends PanelMenu.SystemIndicator {
             log('Missing required core component Settings, expect trouble…');
             this._settingsAction = new St.Widget();
         }
-        item.actor.add(this._settingsAction, { expand: true, x_fill: false });
+        item.add(this._settingsAction, { expand: true, x_fill: false });
 
         this._orientationLockAction = this._createActionButton('', _("Orientation Lock"));
         this._orientationLockAction.connect('clicked', () => {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE),
             this._systemActions.activateLockOrientation();
         });
-        item.actor.add(this._orientationLockAction, { expand: true, x_fill: false });
+        item.add(this._orientationLockAction, { expand: true, x_fill: false });
         this._systemActions.bind_property('can-lock-orientation',
                                           this._orientationLockAction,
                                           'visible',
@@ -272,7 +273,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
             this._systemActions.activateLockScreen();
         });
-        item.actor.add(this._lockScreenAction, { expand: true, x_fill: false });
+        item.add(this._lockScreenAction, { expand: true, x_fill: false });
         this._systemActions.bind_property('can-lock-screen',
                                           this._lockScreenAction,
                                           'visible',
@@ -299,9 +300,8 @@ var Indicator = class extends PanelMenu.SystemIndicator {
                                           bindFlags);
 
         this._altSwitcher = new AltSwitcher(this._powerOffAction, this._suspendAction);
-        item.actor.add(this._altSwitcher.actor, { expand: true, x_fill: false });
+        item.add(this._altSwitcher.actor, { expand: true, x_fill: false });
 
-        this._actionsItem = item;
         this.menu.addMenuItem(item);
 
 

js/ui/status/volume.js

@@ -41,12 +41,12 @@ var StreamSlider = class {
         this._slider.connect('drag-end', this._notifyVolumeChange.bind(this));
 
         this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
-        this.item.actor.add(this._icon);
+        this.item.add(this._icon);
-        this.item.actor.add(this._slider.actor, { expand: true });
+        this.item.add(this._slider.actor, { expand: true });
-        this.item.actor.connect('button-press-event', (actor, event) => {
+        this.item.connect('button-press-event', (actor, event) => {
             return this._slider.startDragging(event);
         });
-        this.item.actor.connect('key-press-event', (actor, event) => {
+        this.item.connect('key-press-event', (actor, event) => {
             return this._slider.onKeyPressEvent(actor, event);
         });
 
@@ -93,7 +93,7 @@ var StreamSlider = class {
 
     _updateVisibility() {
         let visible = this._shouldBeVisible();
-        this.item.actor.visible = visible;
+        this.item.visible = visible;
     }
 
     scroll(event) {

js/ui/switcherPopup.js

@@ -30,12 +30,10 @@ function primaryModifier(mask) {
     return primary;
 }
 
-var SwitcherPopup = GObject.registerClass(
+var SwitcherPopup = GObject.registerClass({
-class SwitcherPopup extends St.Widget {
+    GTypeFlags: GObject.TypeFlags.ABSTRACT
+}, class SwitcherPopup extends St.Widget {
     _init(items) {
-        if (new.target === SwitcherPopup)
-            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
-
         super._init({ style_class: 'switcher-popup',
                       reactive: true,
                       visible: false });
@@ -164,7 +162,7 @@ class SwitcherPopup extends St.Widget {
     }
 
     _keyPressHandler(keysym, action) {
-        throw new Error('Not implemented');
+        throw new GObject.NotImplementedError(`_keyPressHandler in ${this.constructor.name}`);
     }
 
     _keyPressEvent(actor, event) {