panelMenu: Don't fade appMenuButton icon and put it on the side

Design request, don't fade the icon of the appMenuButton and put it on
the side instead of overlaping with the text.

.gitignore

@@ -32,7 +32,6 @@ data/org.gnome.shell.evolution.calendar.gschema.xml
 data/org.gnome.shell.evolution.calendar.gschema.valid
 data/org.gnome.Shell.PortalHelper.desktop
 data/org.gnome.Shell.PortalHelper.service
-data/theme/.sass-cache
 docs/reference/*/*.args
 docs/reference/*/*.bak
 docs/reference/*/*.hierarchy
@@ -87,7 +86,6 @@ src/gnome-shell-perf-helper
 src/gnome-shell-perf-tool
 src/gnome-shell-portal-helper
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
-src/org-gtk-application.[ch]
 src/run-js-test
 src/test-recorder
 src/test-recorder.ogg

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "src/gvc"]
 	path = src/gvc
 	url = git://git.gnome.org/libgnome-volume-control
-[submodule "data/theme/gnome-shell-sass"]
-	path = data/theme/gnome-shell-sass
-	url = git://git.gnome.org/gnome-shell-sass

NEWS

@@ -1,133 +1,3 @@
-3.15.91
-=======
-* Don't disable all shortcuts while non-panel menus are open [Florian; #745039]
-* Do not wake up the screen for disabled notifications [Florian; #744114]
-* Add unminimize animation [Florian; #702662]
-* Change default shortcut for viewing notifications [Florian; #687986]
-* Add shortcut to dismiss notifications from list [Florian; #745279]
-* Use Polari instead of Empathy for IRC conversations [Giovanni; #745431]
-* Add a hideable bottom tray for legacy status icons [Florian; #745162]
-* Improve accessibility of calendar/message list [Florian; #706903, #745393]
-* Fix window thumbnail scaling in overview [Sebastian; #744883]
-* Stop handling non-chat notifications for Empathy [Giovanni; #745503]
-* Fix mouse interaction with ibus candidate window [Rui; #745167, #745245]
-* Misc bug fixes and cleanups [Giovanni, Florian, Miguel, Cosimo, Jakub,
-  Michele, Raul, Matthias, Rui; #677412, #744880, #744900, #744894, #744907,
-  #745061, #741111, #744912, #745175, #745246, #744959, #744575, #745570,
-  #652742, #659187, #745412, #745521, #745521, #741665, #745574, #745627,
-  #745494, #745111, #745132, #745110]
-
-Contributors:
-  Michele, Giovanni Campagna, Cosimo Cecchi, Matthias Clasen,
-  Raul Gutierrez Segales, Sebastian Keller, David Liang, Rui Matos,
-  Florian Müllner, Yosef Or Boczko, Jakub Steiner, Jasper St. Pierre,
-  Rico Tzschichholz, Miguel Vaello Martínez
-
-Translations:
-  Dušan Kazik [sk], Chao-Hsiung Liao [zh_TW], Muhammet Kara [tr],
-  Balázs Úr [hu], Daniel Mustieles [es], Frédéric Péters [fr],
-  Rafael Ferreira [pt_BR], Aurimas Černius [lt], Milo Casagrande [it],
-  Yosef Or Boczko [he], Stas Solovey [ru], Baurzhan Muftakhidinov [kk],
-  Daniel Korostil [uk], Fran Dieguez [gl], Kjartan Maraas [nb],
-  Tom Tryfonidis [el], Cheng-Chia Tseng [zh_TW], Friedel Wolff [af],
-  Alexandre Franke [fr], Efstathios Iosifidis [el], Aron Xu [zh_CN],
-  Marek Černocký [cs], Enrico Nicoletto [pt_BR]
-
-3.15.90
-=======
-* gdm: Fix reactivity of first user in user list [Ray; #743370]
-* Prevent DND to dash when favorites are locked down [David; #741325]
-* Prevent DND in app picker when favorites are locked down [Murray; #741325]
-* Implement Display panel's OSD monitor labels in the shell [Rui; #743744]
-* Remove GSystem dependency [Colin; #744457]
-* Do not duplicate "New Window" action in dash [Florian; #744446]
-* Fix 'draw-cursor' option of screen recorder [Alexander; #744599]
-* Fix screencast timestamps [Sebastian; #744642]
-* Allow keybindings for switching to VT8-VT12 [Ray; #744800]
-* Implement notification redesign [Florian; #744498, #744815, #744817, #744850]
-* Fix struts computation of chrome on non-primary monitors [Sylvain; #744183]
-* Visual refresh based on GTK+ theme redesign [Jakub, Carlos; #737785, #744680]
-* Misc. bug fixes and cleanups [Ray, Bastien, Cosimo, Rui, Florian; #743371,
-  #736182, #744013, #743993, #744665]
-
-Contributors:
-  Cosimo Cecchi, Murray Cumming, Sebastian Dröge, David King,
-  Alexander Larsson, Rui Matos, Florian Müllner, Bastien Nocera,
-  Sylvain Pasche, Carlos Soriano, Jakub Steiner, Jasper St. Pierre, Ray Strode,
-  Colin Walters
-
-Translations:
-  Daniel Martinez [an], Sveinn í Felli [is], GNOME Translation Robot [de],
-  Yosef Or Boczko [he], Kristjan SCHMIDT [eo], Dušan Kazik [sk],
-  Andika Triwidada [id], Marek Černocký [cs], Muhammet Kara [tr],
-  Matej Urbančič [sl], Milo Casagrande [it], Anders Jonsson [sv]
-
-3.15.4
-======
-* Add mode parameter to AcceleratorActivated signal [Florian; #711682]
-* Fix PID based window/app association [Sebastian; #736527]
-* Fix current day highlight on day change [Sebastian; #742492]
-* Switch to vp9 for screencast recordings [Adel; #742744]
-* Disable IBus input sources on password entries [Takao; #730628]
-* Make slider scrolling smoother [Adel; #742648]
-* Allow move-up shortcut to move window above top workspace [Florian; #665764]
-* Misc. bug fixes [Adel, Rui; #742748, #742824, #741114]
-
-Contributors:
-  Cosimo Cecchi, Takao Fujiwara, Adel Gadllah, Sebastian Keller, Rui Matos,
-  Florian Müllner, Jasper St. Pierre
-
-Translations:
-  Andika Triwidada [id], Matej Urbančič [sl], Saibal Ray [bn_IN],
-  Inaki Larranaga Murgoitio [eu], Stas Solovey [ru], Kjartan Maraas [nb],
-  Balázs Úr [hu], Marek Černocký [cs], Rafael Ferreira [pt_BR],
-  Bernd Homuth [de], Daniel Mustieles [es], Fabio Tomat [fur]
-
-3.15.3
-======
-* Add support for high-contrast themes [Florian; #740447]
-* Fix banner message on login screen without user list [Ray; #703972]
-* Fix flicker when activating windows on another workspace [Florian; #741680]
-* Misc. bug fixes [Giovanni, Florian; #735308, #740237]
-
-Contributors:
-  Giovanni Campagna, Florian Müllner, Jasper St. Pierre, Ray Strode
-
-Translations:
-  Balázs Úr [hu], Josef Andersson [sv], Muhammet Kara [tr],
-  Baurzhan Muftakhidinov [kk], Inaki Larranaga Murgoitio [eu]
-
-3.15.2
-======
-* Fix visual glitch of window preview outline in overview [Chris; #699044]
-* Change user facing name of "Captive Portal" to "Network Login" [Elad; #737198]
-* Port to Python 3 [Slavek; #732478]
-* Hide Airplane mode indicator when g-s-d says so [Cosimo; #736292]
-* Allow translators to change non-work days [Lavi; #664645]
-* Delay invocation of caribou daemon until really needed [Daiki; #739712]
-* Don't lock screen after crash if locking is disabled [Adel; #704884]
-* Improve layout of extension installation dialog [William; #739888]
-* Fix workspace changes from app picker [Yuki; #737534]
-* Preload all ibus input sources in user configuration [Takao; #695428]
-* Properly remove network connections from list [Ryan; #740227]
-* Support CSS margin property [Carlos; #728437]
-* Improve handling of BUSY application state [Phillip; #736492]
-* Fix erroneous week numbers in calendar [Florian; #736722]
-* Misc. bugfixes and cleanups [Darcy, Yuki, Alexander, Eskild, Bastien, Cosimo, Colin,
-  Ray; #738725, #739497, #739241, #672500, #739822, #740074, #704163, #740141]
-
-Contributors:
-  Yuki, Lavi .A, Elad Alfassa, Cosimo Cecchi, Takao Fujiwara, Adel Gadllah,
-  Eskild Hustvedt, Chris Johns, William Jon McCann, Slavek Kabrda, Ryan Lortie,
-  Florian Müllner, Bastien Nocera, Christian Persch, Carlos Soriano,
-  Jasper St. Pierre, Ray Strode, Alexander Tsoy, Daiki Ueno, Colin Walters,
-  Phillip Wood
-
-Translations:
-  Jorge Perez Perez [an], Daniel Martinez [an], Daniel Mustieles [es],
-  Trần Ngọc Quân [vi], Changwoo Ryu [ko], Kjartan Maraas [nb],
-  Yosef Or Boczko [he], Marek Černocký [cs]
-
 3.15.1
 ======
 * Use GResources for theme loading [Cosimo; #736936]

autogen.sh

@@ -4,6 +4,8 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
+PKG_NAME="gnome-shell"
+
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -12,7 +14,7 @@ test -z "$srcdir" && srcdir=.
 }
 
 # Fetch submodules if needed
-if test ! -f src/gvc/Makefile.am || test ! -f data/theme/gnome-shell-sass/COPYING;
+if test ! -f src/gvc/Makefile.am;
 then
   echo "+ Setting up submodules"
   git submodule init
@@ -24,4 +26,4 @@ which gnome-autogen.sh || {
     echo "your OS vendor's package manager)."
     exit 1
 }
-. gnome-autogen.sh
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.15.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.15.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -73,14 +73,14 @@ AS_IF([test x$enable_systemd != xno], [
 
 AC_MSG_RESULT($enable_systemd)
 
-CLUTTER_MIN_VERSION=1.21.5
+CLUTTER_MIN_VERSION=1.15.90
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.15.91
+MUTTER_MIN_VERSION=3.15.1
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
-LIBEDATASERVER_MIN_VERSION=3.13.90
+LIBEDATASERVER_MIN_VERSION=3.5.3
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
@@ -97,6 +97,7 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
             gjs-internals-1.0 >= $GJS_MIN_VERSION
             $recorder_modules
             gdk-x11-3.0 libsoup-2.4
+            xtst
             clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
             clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
             libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
@@ -118,7 +119,8 @@ PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
 PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.13.1)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
+PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
 
 AC_ARG_ENABLE(browser-plugin,
               [AS_HELP_STRING([--enable-browser-plugin],
@@ -235,14 +237,6 @@ if test -z "${BROWSER_PLUGIN_DIR}"; then
 fi
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
 
-AC_ARG_VAR([GDBUS_CODEGEN],[the gdbus-codegen programme])
-AC_PATH_PROG([GDBUS_CODEGEN],[gdbus-codegen],[])
-if test -z "$GDBUS_CODEGEN"; then
-  AC_MSG_ERROR([gdbus-codegen not found])
-fi
-
-AC_PATH_PROG([SASS],[sass],[])
-
 AC_CONFIG_FILES([
   Makefile
   data/Makefile

data/50-gnome-shell-system.xml.in

@@ -6,7 +6,7 @@
                 package="gnome-shell">
 
 	<KeyListEntry name="toggle-message-tray"
-                      _description="Show the notification list"/>
+                      _description="Show the message tray"/>
 
 	<KeyListEntry name="focus-active-notification"
                       _description="Focus the active notification"/>

data/Makefile.am

@@ -1,5 +1,4 @@
 CLEANFILES =
-NULL =
 
 desktopdir=$(datadir)/applications
 desktop_DATA = gnome-shell.desktop gnome-shell-wayland.desktop  gnome-shell-extension-prefs.desktop
@@ -12,8 +11,7 @@ service_DATA = org.gnome.Shell.PortalHelper.service
 
 CLEANFILES += \
 	org.gnome.Shell.PortalHelper.service \
-	org.gnome.Shell.PortalHelper.desktop \
-	$(NULL)
+	org.gnome.Shell.PortalHelper.desktop
 
 endif
 
@@ -35,36 +33,7 @@ introspection_DATA =				\
 	org.gnome.Shell.Screencast.xml		\
 	org.gnome.Shell.Screenshot.xml		\
 	org.gnome.ShellSearchProvider.xml	\
-	org.gnome.ShellSearchProvider2.xml	\
-	$(NULL)
-
-theme_sources = 						\
-	theme/gnome-shell-high-contrast.scss			\
-	theme/gnome-shell.scss					\
-	theme/gnome-shell-sass/_colors.scss			\
-	theme/gnome-shell-sass/_common.scss			\
-	theme/gnome-shell-sass/_drawing.scss			\
-	theme/gnome-shell-sass/_high-contrast-colors.scss	\
-	$(NULL)
-
-dist_theme_files =						\
-	$(theme_sources)					\
-	theme/Gemfile						\
-	theme/HACKING						\
-	theme/README						\
-	theme/gnome-shell-sass/COPYING				\
-	theme/gnome-shell-sass/HACKING				\
-	theme/gnome-shell-sass/NEWS				\
-	theme/gnome-shell-sass/README				\
-	theme/gnome-shell-sass/gnome-shell-sass.doap		\
-	theme/parse-sass.sh					\
-	$(NULL)
-
-%.css: %.scss $(theme_sources)
-	@if test -n "$(SASS)"; then \
-		if $(AM_V_P); then PS4= set -x; else echo "  GEN      $@"; fi; \
-		$(SASS) --sourcemap=none -f -q --update $<; \
-	fi
+	org.gnome.ShellSearchProvider2.xml
 
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/theme --generate-dependencies $(srcdir)/gnome-shell-theme.gresource.xml)
 gnome-shell-theme.gresource: gnome-shell-theme.gresource.xml $(resource_files)
@@ -111,14 +80,12 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(convert_DATA)					\
 	$(keys_in_files)				\
-	$(dist_theme_files)				\
 	perf-background.xml.in				\
 	org.gnome.Shell.PortalHelper.desktop.in		\
 	org.gnome.Shell.PortalHelper.service.in		\
 	org.gnome.shell.gschema.xml.in.in		\
 	gnome-shell-theme.gresource.xml 		\
-	$(resource_files)				\
-	$(NULL)
+	$(resource_files)
 
 CLEANFILES +=						\
 	gnome-shell.desktop.in				\
@@ -131,5 +98,4 @@ CLEANFILES +=						\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
 	org.gnome.shell.gschema.xml.in			\
-	gnome-shell-theme.gresource			\
-	$(NULL)
+	gnome-shell-theme.gresource

data/gnome-shell-theme.gresource.xml

@@ -16,11 +16,8 @@
     <file>filter-selected-ltr.svg</file>
     <file>filter-selected-rtl.svg</file>
     <file>gnome-shell.css</file>
-    <file>gnome-shell-high-contrast.css</file>
     <file>logged-in-indicator.svg</file>
     <file>more-results.svg</file>
-    <file>no-events.svg</file>
-    <file>no-notifications.svg</file>
     <file>noise-texture.png</file>
     <file>page-indicator-active.svg</file>
     <file>page-indicator-inactive.svg</file>

data/org.gnome.shell.gschema.xml.in.in

@@ -112,10 +112,10 @@
       </_description>
     </key>
     <key name="toggle-message-tray" type="as">
-      <default>["&lt;Super&gt;v","&lt;Super&gt;m"]</default>
-      <_summary>Keybinding to toggle the visibility of the notification list</_summary>
+      <default>["&lt;Super&gt;m"]</default>
+      <_summary>Keybinding to toggle the visibility of the message tray</_summary>
       <_description>
-        Keybinding to toggle the visibility of the notification list.
+        Keybinding to toggle the visibility of the message tray.
       </_description>
     </key>
     <key name="focus-active-notification" type="as">

data/theme/Gemfile

@@ -1 +0,0 @@
-gem "sass", "~> 3.4.0"

data/theme/HACKING

@@ -1,3 +0,0 @@
-To generate the css files, from the project directory:
-
-sass --sourcemap=none --update .

data/theme/README

@@ -1,36 +0,0 @@
-Summary
--------
-
-* Do not edit the CSS directly, edit the source SCSS files and process them with SASS (running
-  `make` should do that when you have the required software installed, as described below;
-  run `/.parse-sass.sh` manually if it doesn't)
-* To be able to use the lates/adequate version of sass, install ruby, gem, sass & bundle. 
-  On Fedora F20, this is done with `sudo dnf install rubygems && gem install bundle && bundle install`
-  from the same directory this README resides in.
-
-How to tweak the theme
-----------------------
-
-Adwaita is a complex theme, so to keep it maintainable it's written and processed in SASS, the
-generated CSS is then transformed into a gresource file during gtk build and used at runtime in a 
-non-legible or editable form.
-
-It is very likely your change will happen in the _common.scss file. That's where all the widget 
-selectors are defined. Here's a rundown of the "supporting" stylesheets, that are unlikely to be the 
-right place for a drive by stylesheet fix:
-
-_colors.scss        - global color definitions. We keep the number of defined colors to a necessary minimum, 
-                      most colors are derived from a handful of basics. It is an exact copy of the gtk+ 
-                      counterpart. Light theme is used for the classic theme and dark is for GNOME3 shell 
-                      default.
-
-_drawing.scss       - drawing helper mixings/functions to allow easier definition of widget drawing under
-                      specific context. This is why Adwaita isn't 15000 LOC.
-
-_common.scss        - actual definitions of style for each widget. This is where you are likely to add/remove
-                      your changes.
-                      
-You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the
-_common.scss file, you can either run the ./parse-sass.sh script or keep SASS watching for changes as you
-edit. This is done by running `bundle exec sass --watch --sourcemap=none .` If sass is out of date, or is
-missing, you can install it with `bundle install`.

data/theme/_colors.scss

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

data/theme/_common.scss

@@ -0,0 +1,963 @@
+//This is the RIGHT PLACE to edit the stylesheet
+
+//let's start by telling people not to edit the generated CSS:
+$cakeisalie: "This stylesheet is generated, DO NOT EDIT";
+/* #{$cakeisalie} */
+
+/* Copyright 2009, Red Hat, Inc.
+ *
+ * Portions adapted from Mx's data/style/default.css
+ *   Copyright 2009 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+
+/* GLOBALS */
+$font-size: 11;
+$font-family: Cantarell, Sans-Serif;
+
+stage {
+  font-family: $font-family;
+  @include fontsize($font-size);
+  color: $fg_color;
+}
+
+/* WIDGETS */
+
+/* Buttons */
+// one would think we may want a generic button class:
+// bug #737785
+.candidate-page-button,
+.notification-button,
+.notification-icon-button,
+.hotplug-notification-item,
+.hotplug-resident-eject-button,
+.modal-dialog-button,
+.app-view-control {
+  border-radius: 3px;
+  border-width: 1px;
+  padding: 4px 32px;
+  @include button(normal);
+  &:hover { @include button(hover); }
+  &:focus { @include button(focus); }
+  &:insensitive { @include button(insensitive); }
+  &:active { @include button(active); }
+}
+
+/* Entries */
+StEntry {
+  border-radius: 3px;
+  padding: 4px;
+  border-width: 1px;
+  color: $fg_color;
+  @include entry(normal);
+  //&:hover { @include entry(hover);}
+  &:focus { @include entry(focus,$fc:transparentize($fg_color,0.5));}
+  &:insensitive { @include entry(insensitive);}
+  selection-background-color: $selected_bg_color;
+  selected-color: $selected_fg_color;
+}
+
+
+/* Scrollbars */
+
+StScrollBar {
+  padding: 0;
+  &.vfade { -st-vfade-offset: 68px; }
+  &.hfade { -st-hfade-offset: 68px; }
+
+  StScrollView & {
+    min-width: 14px;
+    min-height: 14px;
+  }
+  
+  StBin#trough {
+    border-radius: 0;
+    background-color: darken($bg_color,10%);
+  }
+  
+  StButton#vhandle, StButton#hhandle {
+    border-radius: 8px;
+    background-color: $bg_color;
+    border: 3px solid darken($bg_color,10%); //would be nice to margin or at least to transparent
+    &:hover { background-color: lighten($bg_color,10%); }
+    &:active { background-color: $selected_bg_color; }
+  }
+}
+
+/* Slider */
+
+.slider {
+    height: 1em;
+    -slider-height: 0.3em;
+    -slider-background-color: $insensitive_bg_color; //background of the trough
+    -slider-border-color: $borders_color; //trough border color
+    -slider-active-background-color: $selected_bg_color; //active trough fill
+    -slider-active-border-color: darken($selected_bg_color,10%); //active trough border
+    -slider-border-width: 1px;
+    -slider-handle-radius: 6px;
+}
+
+/* Check Boxes */
+
+.check-box {
+  StBoxLayout { spacing: .8em; }
+  StBin {
+    width: 24px;
+    height: 22px;
+    background-image: url("checkbox-off.svg");
+  }
+  &:focus Stbin { background-image: url("checkbox-off-focused.svg"); }
+  &:checked Stbin { background-image: url("checkbox.svg"); }
+  &:focus:checked Stbin { background-image: url("checkbox-focused.svg"); }
+}
+
+/* Switches */
+.toggle-switch {
+    width: 65px;
+    height: 22px;
+    background-size: contain;
+}
+
+  @each $v in us, intl {
+    .toggle-switch-#{$v} {
+      background-image: url("toggle-off-#{$v}.svg");    
+      &:checked { background-image: url("toggle-on-#{$v}.svg"); }
+    }
+  }
+
+/* links */
+.shell-link {
+  color: $link_color;
+  &:hover { color: lighten($link_color,10%); }
+}
+
+/* Modal Dialogs */
+
+.lightbox { background-color: black; } //FIXME where is this?
+.flashspot { background-color: white; } //FIXME where is this?
+
+.modal-dialog {
+  border-radius: 5px;
+  background-color: transparentize(darken($bg_color,10%),0.05);
+  border: 1px solid $borders_color;
+  padding: 24px;
+
+  .run-dialog-entry { width: 20em; }
+  .run-dialog-error-box {
+    padding-top: 16px;
+    spacing: 6px;
+  }
+  .run-dialog-button-box { padding-top: 1em; }
+  .run-dialog-label { 
+    font-size: fontsize($font-size + 1.1); 
+    font-weight: bold;
+    color: darken($fg_color,10%);
+    padding-bottom: .4em;
+  }
+  
+}
+  .button-dialog-button-box {
+    spacing: 18px;
+    padding-top: 48px;
+  }
+
+  .show-processes-dialog-subject,
+  .mount-question-dialog-subject,
+  .end-session-dialog-subject { //this should be a generic header class
+    font-size: fontsize($font-size * 1.3);
+  }
+
+/* Popvers/Menus */
+
+.popup-menu {
+  min-width: 200px;  
+  
+  .popup-menu-arrow { } //defined globally in the TOP BAR
+  .popup-sub-menu {
+    background-color: darken($bg_color,2%);
+    border-top: 1px solid lighten($borders_color,5%);
+    border-bottom: 1px solid lighten($borders_color,5%);
+  }
+  
+  .popup-menu-content { padding: 1em 0em; }
+  .popup-menu-item { 
+    spacing: 12px;
+    
+    &:ltr { padding: .4em 1.75em .4em 0em; }
+    &:rtl { padding: .4em 0em .4em 1.75em; }
+    &:active { background-color: lighten($bg_color,10%); }
+    &:insensitive { background-color: transparentize($bg_color,.5); }
+  }
+  .popup-inactive-menu-item { //all icons and other graphical elements
+    color: $fg_color;
+
+    &:insensitive { color: transparentize($fg_color,0.5); }
+  }
+  //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is  
+}
+
+  .popup-menu-ornament {
+      text-align: right;
+      width: 1em;
+  }
+  .popup-menu-boxpointer,
+  .candidate-popup-boxpointer {
+      -arrow-border-radius: 3px;
+      -arrow-background-color: $bg_color;
+      -arrow-border-width: 1px;
+      -arrow-border-color: $borders_color;
+      -arrow-base: 24px;
+      -arrow-rise: 11px;
+      -arrow-box-shadow: 0 1px 3px red; //dreaming. bug #689995
+  }
+  
+  .popup-separator-menu-item {
+    -margin-horizontal: 24px;
+    height: 1px; //not really the whole box
+    padding: 0; //not really centered
+    background-color: transparent;
+    border-color: lighten($borders_color,10%);
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+  }
+
+  
+/* fallback menu 
+- odd thing for styling App menu when apparently not running under shell. Light Adwaita styled
+  app menu inside the main app window itself rather than the top bar
+*/
+
+
+
+/* TOP BAR */
+
+#panel {
+  background-color: black;
+  font-weight: bold;
+  height: 1.86em;
+
+  &.unlock-screen,
+  &.login-screen,
+  &.lock-screen {
+    background-color: transparent;    
+  }
+
+  #panelLeft, #panelCenter { // spacing between activities<>app menu and such
+    spacing: 4px;
+  }
+  
+  .panel-corner {
+    -panel-corner-radius: 6px;
+    -panel-corner-background-color: black;
+    -panel-corner-border-width: 2px;
+    -panel-corner-border-color: transparent; 
+    
+    &:active, &:overview, &:focus { 
+      -panel-corner-border-color: lighten($selected_bg_color,5%); 
+    }
+
+    &.lock-screen, &.login-screen, &unlock-screen {
+      -panel-corner-radius: 0;
+      -panel-corner-background-color: transparent;
+      -panel-corner-border-color: transparent;
+    }
+  }
+
+  .panel-button {
+    padding: 0px 12px;
+    font-weight: bold;
+    color: #ccc;
+    transition-duration: 100ms;
+
+    #appMenuIcon { 
+      app-icon-bottom-clip: 1px;
+      
+      .panel-button:active &, 
+      .panel-button:overview &, 
+      .panel-button:focus &, 
+      .panel-button:checked & {
+        app-icon-bottom-clip: 2px;
+      }
+        
+    }
+    &:hover { 
+      color: lighten($fg_color, 10%);
+      text-shadow: black 0 2px 2px;
+    }
+    
+    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw
+      // a box-shadow
+      background-color: rgba(0, 0, 0, 0.01);
+      box-shadow: inset 0 -2px 0px lighten($selected_bg_color,5%);
+      color: lighten($fg_color,10%);
+      text-shadow: black 0px 2px 2px;
+      
+      & > .system-status-icon { icon-shadow: black 0 2px 2px; }
+    }
+    
+    .system-status-icon { icon-size: 1.09em; padding: 0 5px; }
+    .unlock-screen &,
+    .login-screen &,
+    .lock-screen & {
+      color: lighten($fg_color, 10%);
+      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
+    }
+  }
+  
+  .panel-status-button {
+  
+    &:active, &:overview, &:focus, &:checked {
+      border-color: lighten($selected_bg_color,5%);
+      border-bottom-width: 2px;
+    }
+  }
+  
+  .panel-menu { -boxpointer-gap: 4px; } //FIXME
+  .panel-status-indicators-box, //FIXME
+  .panel-status-menu-box {
+    spacing: 2px;
+  }
+  
+  .screencast-indicator { color: $warning_color; }
+}
+
+  // a little unstructured mess:
+
+  .system-switch-user-submenu-icon {
+    icon-size: 24px;
+    border: 1px solid transparentize($fg_color,0.6);
+  }
+  
+  #appMenu {
+    spinner-image: url("process-working.svg");
+    spacing: 4px;
+    
+    .label-shadow { color: transparentize(#000,0.5); }
+  }
+  
+  .aggregate-menu {
+    width: 360px;
+    .popup-menu-icon { padding: 0 4px; }
+  }
+  
+  .system-menu-action {
+    color: $fg_color;
+    border-radius: 32px; /* wish we could do 50% */
+    padding: 13px;
+    border: 1px solid lighten($borders_color,5%);
+    
+    &:hover, &:focus {
+      color: lighten($fg_color, 10%);
+      background-color: lighten($bg_color,10%);
+      border: none;
+      padding: 14px;
+    }
+    &:active { background-color: lighten($borders_color,5%); }
+    
+    & > StIcon { icon-size: 16px; }
+  }
+
+// not really top bar only
+.popup-menu-arrow { width: 16px; height: 16px; }
+.popup-menu-icon { icon-size: 1.09em; }
+
+//close buttons
+
+.window-close, .notification-close {
+  background-image: url("close-window.svg");
+  background-size: 32px;
+  height: 32px;
+  width: 32px;
+}
+  .window-close { 
+    -shell-close-overlap: 16px;
+    &:rtl { -st-background-image-shadow: 2px 2px 6px rgba(0,0,0,0.5); }
+  }
+  .notification-close {
+    -shell-close-overlap-x: 14px;
+    -shell-close-overlap-y: -12px;
+    
+    &:rtl { -shell-close-overlap-x: -14px; }
+  }
+
+/* OVERVIEW */
+
+#overview {
+  spacing: 24px; //
+
+}
+  .window-picker { //container around window thumbnails
+    -horizontal-spacing: 32px;
+    -vertical-spacing: 32px;
+    padding-left: 32px;
+    padding-right: 32px;
+    padding-bottom: 48px;
+    
+    &.external-monitor { padding: 32px; }
+  }
+
+  .window-clone-border {
+    border: 4px solid $selected_bg_color;
+    border-radius: 4px;
+  }
+  .window-caption {
+    spacing: 25px;
+    background-color: transparentize($bg_color,0.3);
+    border-radius: 8px;
+    padding: 4px 12px;
+    -shell-caption-spacing: 12px;
+    &:hover { background-color: $selected_bg_color; }
+  }
+  
+  .messages-indicator { color: transparentize($fg_color,.2); height: 32px; }
+  .messages-indicator-contents { spacing: 12px; padding-bottom: 12px; }
+
+  //search entry
+  .search-entry {
+    width: 320px;
+    padding: 7px 9px;
+    border-radius: 24px;
+    &:focus {
+      padding: 6px 8px;
+      border-width: 2px;
+    }
+    
+    .search-entry-icon { icon-size: 1em; padding: 0 4px; color: transparentize($fg_color,.3); }
+    
+    &:hover, &:focus {
+      .search-entry-icon { color: $fg_color; }
+    }
+  }
+  
+  //search results
+  
+  #searchResultsBin {
+    max-width: 1000px;
+  }
+
+  #searchResultsContent {
+      padding-left: 20px;
+      padding-right: 20px;
+      spacing: 16px;
+  }
+  
+  .search-section { spacing: 16px; } // This should be equal to #searchResultsContent spacing
+  .search-section-content { spacing: 32px; } // This is the space between the provider icon and the results container
+  .search-statustext { // "no results"
+    @extend %status_text;
+  }
+  .list-search-results { spacing: 3px; }
+  
+  .search-section-separator {
+    -gradient-height: 1px;
+    -gradient-start: rgba(255,255,255,0);
+    -gradient-end: rgba(255,255,255,0.1);
+    -margin-horizontal: 1.5em;
+    height: 1px;
+  }
+  
+  .list-search-result-content { spacing: 12px; padding: 12px; }
+  .list-search-result-title { font-size: 1.5em; color: darken($fg_color,5%); }
+  .list-search-result-description { color: darken($fg_color,15%); }
+  .search-provider-icon { padding: 15px; }
+  .search-provider-icon-more {
+    width: 16px;
+    height: 16px;
+    background-image: url("more-results.svg");
+  }
+  
+
+  /* DASHBOARD */
+  
+  #dash {
+    @extend %overview-panel;
+    padding: 4px;
+    border-left: 0px;
+    border-radius: 0px 9px 9px 0px;
+    
+    &:rtl {
+      border-left-width: 1px;
+      border-right-width: 0;
+      border-radius: 9px 0 0 9px;
+    }
+    
+    .placeholder {
+      background-image: url("dash-placeholder.svg");
+      background-size: contain;
+      height: 24px;
+    }
+    
+    .empty-dash-drop-target {
+      width: 24px;
+      height: 24px;
+    }
+    
+  }
+
+  .dash-item-container > StWidget {
+    padding: 4px 8px;
+  }
+
+  .dash-label { //osd tooltip
+    border-radius: 7px;
+    padding: 4px 12px;
+    background-color: transparentize($bg_color,0.3);
+    text-align: center;
+    -x-offset: 8px;
+  }
+  
+  /* App Vault/Grid */
+  .icon-grid {
+    spacing: 30px;
+    -shell-grid-horizontal-item-size: 136px;
+    -shell-grid-vertical-item-size: 136px;
+    
+    .overview-icon { icon-size: 96px; } //FIXME no effect
+  }
+  //.app-display { spacing: 20px; }
+
+  .app-view-controls { //favorties | all toggle container
+    padding-bottom: 32px;
+  }
+  .app-view-control { //favorties | all toggle button
+    padding: 4px 32px; 
+    &:checked { @include button(active); }
+    &:first-child { 
+      border-right-width: 0;
+      border-radius: 3px 0 0 3px;
+    }
+    &:last-child {
+     border-radius: 0 3px 3px 0;
+    }
+  }
+
+  //Icon tile
+  .search-provider-icon,
+  .list-search-result {
+    @extend %icon_tile;
+    &:active, &:checked { background-color: transparentize(darken($bg_color,10%),.1); }
+    &:focus, &:selected, &:hover { 
+      background-color: transparentize($fg_color,.9);
+      transition-duration: 200ms;
+    }
+  }
+  .app-well-app, 
+  .app-well-app.app-folder,
+  .show-apps,
+  .grid-search-result {
+    & > .overview-icon { 
+      @extend %icon_tile;
+    }
+    &.running > .overview-icon {
+      text-shadow: black 0px 2px 2px;
+    }
+    &:active > .overview-icon, 
+    &:checked > .overview-icon {
+      background-color: transparentize(darken($bg_color,10%),.1); //FIXME not working?
+      box-shadow: inset 0 1px 2px $borders_color;
+    }
+    &:hover > .overview-icon, 
+    &.running:hover > .overview-icon,
+    &:focus > .overview-icon, 
+    &:selected > .overview-icon { 
+      background-color: transparentize($fg_color,.9);
+      transition-duration: 0ms;
+      border-image: none;
+      background-image: none;
+    }
+    
+  }
+
+  .app-well-app-running-dot { //running apps indicator
+    width: 10px; height: 3px;
+    background-color: $selected_bg_color;
+    margin-bottom: 2px; //FIXME will happen :)
+  }
+  
+  %icon_tile {
+    border-radius: 4px;
+    padding: 6px;
+    border: 1px solid transparent;
+    transition-duration: 100ms;
+    text-align: center;
+  }
+  
+  .app-well-app.app-folder > .overview-icon {
+    background-color: transparentize($bg_color,.6);
+  }
+  
+  .show-apps:checked .show-apps-icon,
+  .show-apps:focus .show-apps-icon {
+    color: white;
+    transition-duration: 100ms;
+  }
+
+  
+  // Collections
+  .app-folder-popup { //expanded collection
+    -arrow-border-radius: 8px;
+    -arrow-background-color: transparentize($bg_color,0.7);
+    -arrow-base: 24px;
+    -arrow-rise: 11px;
+  }
+  .app-folder-popup-bin { padding: 5px; }
+  .app-folder-icon {
+    padding: 5px;
+    spacing-rows: 5px;
+    spacing-columns: 5px;
+  }
+  
+  .page-indicator { 
+    padding: 15px 20px;
+    
+    .page-indicator-icon {
+      width: 18px;
+      height: 18px;
+      background-image: url(page-indicator-inactive.svg);
+    }
+    
+    &:hover .page-indicator-icon { background-image: url(page-indicator-hover.svg); }
+    &:active .page-indicator-icon { background-image: url(page-indicator-active.svg); }
+    &:checked .page-indicator-icon,
+    &:checked:active { background-image: url(page-indicator-checked.svg); }
+  }
+  
+  .no-frequent-applications-label { @extend %status_text; }
+  
+  .app-well-app > .overview-icon.overview-icon-with-label,
+  .grid-search-result .overview-icon.overview-icon-with-label {
+    padding: 10px 8px 5px 8px;
+    spacing: 4px;
+  }
+  
+  // Workspace pager
+  .workspace-thumbnails { //container ala dash
+    @extend %overview-panel;
+    visible-width: 32px; //amount visible before hover
+    spacing: 11px;
+    padding: 8px;
+    border-radius: 9px 0 0 9px;
+    //border-width: 1px 0 1px 1px; //fixme: can't have non unoform borders :(
+    &:rtl { border-radius: 0 9px 9px 0;}
+  }
+  .workspace-thumbnail-indicator {
+    border: 4px solid $selected_bg_color;
+    padding: 1px;
+  }
+
+  //Some hacks I don't even
+  // FIXME
+  .search-display > StBoxLayout,
+  .all-apps,
+  .frequent-apps > StBoxLayout {
+    // horizontal padding to make sure scrollbars or dash don't overlap content
+    padding: 0px 88px 10px 88px;
+  }
+
+%overview-panel {
+  color: $fg_color;
+  background-color: $bg_color;
+  border: 1px solid transparentize($fg_color,0.8);
+}
+
+%status_text {
+  font-size: 2em;
+  font-weight: bold;
+  color: $fg_color;
+}
+
+/* NOTIFICATIONS & MESSAGE TRAY */
+
+#message-tray {
+  background: darken($bg_color,10%) url("noise-texture.png");
+  background-repeat: repeat;
+  height: 72px;
+  box-shadow: inset 0 2px 4px rgba(0,0,0,0.5);
+  padding: 4px;
+  .message-tray-summary { height: 72px; }
+  
+  .message-tray-menu-button {
+    StIcon {
+      padding: 0 20px;
+      color: $fg_color;
+      icon-size: 24px;
+      opacity: 1;
+    }
+    &:hover StIcon { color: lighten($fg_color, 15%); } 
+    &:active StIcon { color: lighten($selected_bg_color, 10%); }
+  } 
+  .no-messages-label { color: darken($fg_color,10%); }
+}
+  .url-highlighter { link-color: $selected_bg_color; }
+  
+  // Banners
+  .notification { 
+    font-size: 11pt;
+    width: 34em;
+    border-radius: 6px 6px 0 0;
+    background-color: transparentize(darken($bg_color,8%),.05);
+    border: 1px solid $borders_color;
+    border-bottom-width: 0;
+    //box-shadow: 0 1px 4px black;
+    spacing-rows: 4px;
+    padding: 8px 8px 4px 8px;
+    spacing-columns: 10px;
+    &.multi-line-notification { padding-bottom: 8px; }
+  }
+  .notification-unexpanded {
+    // We want to force the actor at a specific size, irrespective
+    // of its minimum and preferred size, so we override both
+    min-height: 36px;
+    height: 36px;
+  }
+  // We use row-span = 2 for the image cell, which prevents its height preferences to be
+  // taken into account during allocation, so its height ends up being limited by the height
+  // of the content in the other rows. To avoid showing a stretched image, we set the minimum
+  // height of the table to be ICON_SIZE + IMAGE_SIZE + spacing-rows = 24 + 125 + 10 = 159 
+  .notification-with-image {
+    min-height: 159px;
+  }
+  .notification-body { spacing: 5px; }
+  .notification-actions {
+    paddinf-top: 18px;
+    spacing: 6px;
+  }
+  //Message tray items
+  .summary-source {
+    border-radius: 0;
+    -st-natural-width: 60px; //FIXME left aligned rather than centered
+    padding: 9px;
+    transition-duration: 100ms;
+  }
+  .summary-source-button { 
+    &:hover .summary-source,
+    &:selected .summary-source,
+    &:focus .summary-source { background-color: lighten($bg_color,2%); }
+  }
+  .summary-source-counter {
+    font-size: 10pt;
+    font-weight: bold;
+    height: 1.6em; width: 1.6em;
+    -shell-counter-overlap-x: 3px;
+    -shell-counter-overlap-y: 3px;
+    background-color: $selected_bg_color;
+    border: 2px solid $fg_color;
+    box-shadow: 0 2px 2px rgba(0,0,0,0.5);
+    border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
+  }
+  
+  //Message tray popovers
+  .summary-boxpointer {
+    -arrow-border-radius: 15px;
+    -arrow-background-color: transparentize(darken($bg_color,8%),.05);
+    -arrow-base: 36px;
+    -arrow-rise: 18px;
+    color: $fg_color;
+    -boxpointer-gap: 4px;
+    .notification {
+      border-radius: 9px;
+      border-width: 0; //temporary workaround for border brokenness
+      background-color: transparentize(darken($bg_color,8%),.05) !important;
+      padding-bottom: 12px;
+    }
+    #summary-right-click-menu {
+      padding-top: 12px;
+      padding-bottom: 12px;
+    }
+  }
+  .summary-notification-stack-scrollview {
+    max-height: 24em;
+    padding-top: 8px;
+    padding-bottom: 8px;
+    &:ltr { padding-right: 8px; }
+    &:rtl { padding-left: 8px; }
+  }
+  .notification-scrollview {
+    max-height: 18em;
+    -st-vfade-offset: 24px;
+    &:ltr > StScrollBar { padding-left: 6px; }
+    &:rtl > StScrollBar { padding-right: 6px; }
+  }
+  .notification-button { -st-natural-width: 140px; }
+  .notification-icon-button { 
+    border-radius: 5px; 
+    padding: 5px;
+    &:focus { }//FIXME
+    & > StIcon { icons-size: 16px; padding: 8px; }
+  }
+  .secondary-icon { icon-size: 1.09em; } //FIXME
+
+  //chat bubbles
+  .chat-log-message { color: darken($fg_color,10%); }
+  .chat-empty-line { font-size: 4px; }
+  .chat-received { 
+    padding-left: 4px;
+    &:rtl { padding-left: 0px; padding-right: 4px; }
+  }
+  .chat-sent {
+    padding-left: 18pt;
+    color: darken($fg_color, 15%);
+    &:rtl { padding-left: 0; padding-right: 18pt; }
+  }
+  .chat-meta-message {
+    padding-left: 4px;
+    font-size: 9pt;
+    font-weight: bold;
+    color: darken($fg_color,20%);
+    &:rtl { padding-left: 0; padding-right: 4px; }
+  }
+  .chat-notification-scrollview { max-height: 22em; }
+  .subscription-message { font-style: italic; }
+  
+  //hotplug
+  .hotplug-transient-box {
+    spacing: 6px;
+    padding: 2px 72px 2px 12px;//FIXME wat?
+  }
+    .hotplug-notification-item {
+      padding: 2px 10px;
+      &:focus { padding: 1px 71px 1px 11px; } //FIXME wat?
+    }
+
+    .hotplug-notification-item-icon {
+      icon-size: 24px;
+      padding: 2px 5px;
+    }
+
+    .hotplug-resident-box { spacing: 8px; }
+
+    .hotplug-resident-mount { 
+      spacing: 8px;
+      border-radius: 4px;
+      color: green;
+      &:hover {
+        color: red;
+        background-color: blue;
+      }
+    }
+
+    .hotplug-resident-mount-label {
+      color: inherit;
+      padding-left: 6px;
+    }
+
+    .hotplug-resident-mount-icon {
+      icon-size: 24px;
+      padding-left: 6px;
+    }
+
+    .hotplug-resident-eject-icon {
+      icon-size: 16px;
+    }
+
+    .hotplug-resident-eject-button {
+      padding: 7px;
+      border-radius: 5px;
+      color: pink;
+    }
+
+/* Eeeky things */
+//Mess that is Looking Glass
+
+#LookingGlassDialog {
+  background-color: rgba(0,0,0,0.80);
+  spacing: 4px;
+  padding: 4px;
+  border: 2px solid grey;
+  border-radius: 4px;
+  & > #Toolbar {
+    border: 1px solid grey;
+    border-radius: 4px;
+  }
+  .labels { spacing: 4px; }
+  .notebook-tab {
+    -natural-hpadding: 12px;
+    -minimum-hpadding: 6px;
+    font-weight: bold;
+    color: #ccc;
+    transition-duration: 100ms;
+    padding-left: .3em;
+    padding-right: .3em;
+    &:hover {
+      color: white;
+      text-shadow: black 0px 2px 2px;
+    }
+    &:selected {
+      border-bottom-width: 2px;
+      border-color: lighten($selected_bg_color,5%);
+      color: white;
+      text-shadow: black 0px 2px 2px;
+    }
+  }
+  StBoxLayout#EvalBox { padding: 4px; spacing: 4px; }
+  StBoxLayout#ResultsArea { spacing: 4px; }
+}
+
+  .lg-dialog {
+    StEntry {
+      selection-background-color: #bbbbbb;
+      selected-color: #333333;
+    }
+    .shell-link { 
+      color: #999999;
+      &:hover { color: #dddddd; }
+     }
+  }
+
+  .lg-completions-text {
+      font-size: .9em;
+      font-style: italic;
+  }
+
+  .lg-obj-inspector-title {
+      spacing: 4px;
+  }
+
+  .lg-obj-inspector-button {
+      border: 1px solid gray;
+      padding: 4px;
+      border-radius: 4px;
+      &:hover { border: 1px solid #ffffff; }
+  }
+
+  #lookingGlassExtensions { padding: 4px; }
+
+  .lg-extensions-list {
+      padding: 4px;
+      spacing: 6px;
+  }
+
+  .lg-extension {
+      border: 1px solid #6f6f6f;
+      border-radius: 4px;
+      padding: 4px;
+  }
+
+  .lg-extension-name {
+      font-weight: bold;
+  }
+
+  .lg-extension-meta {
+      spacing: 6px;
+  }
+
+  #LookingGlassPropertyInspector {
+    background: rgba(0, 0, 0, 0.8);
+    border: 2px solid grey;
+    border-radius: 4px;
+    padding: 6px;
+  }

data/theme/_drawing.scss

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

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

@@ -1,8 +0,0 @@
-@import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
-@import "gnome-shell-sass/_drawing";
-@import "gnome-shell-sass/_common";
-
-//force symbolic icons
-stage {
-  -st-icon-style: symbolic;
-}

data/theme/gnome-shell.scss

@@ -1,5 +1,6 @@
 $variant: 'dark';
 
-@import "gnome-shell-sass/_colors"; //use gtk colors
-@import "gnome-shell-sass/_drawing";
-@import "gnome-shell-sass/_common";
+@import "_gnome-shell-old.scss"; //temporary. sadlu shell crashes when trying to build a theme from scratch
+@import "_colors"; //use gtk colors
+@import "_drawing";
+@import "_common";

data/theme/no-events.svg

@@ -1,119 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg3471"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="New document 5">
-  <defs
-     id="defs3473" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1461"
-     inkscape:window-height="772"
-     inkscape:window-x="37"
-     inkscape:window-y="64"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3476">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       transform="matrix(4,0,0,4,1.9999997,2.3636364)"
-       id="g19145"
-       style="fill:#bebebe;fill-opacity:1;display:inline">
-      <g
-         id="g19147"
-         inkscape:label="status"
-         style="fill:#bebebe;fill-opacity:1;display:inline"
-         transform="translate(-541.0002,-301)" />
-      <g
-         style="fill:#bebebe;fill-opacity:1"
-         id="g19149"
-         inkscape:label="devices"
-         transform="translate(-541.0002,-301)" />
-      <g
-         style="fill:#bebebe;fill-opacity:1"
-         id="g19151"
-         inkscape:label="apps"
-         transform="translate(-541.0002,-301)" />
-      <g
-         style="fill:#bebebe;fill-opacity:1"
-         id="g19153"
-         inkscape:label="places"
-         transform="translate(-541.0002,-301)" />
-      <g
-         style="fill:#bebebe;fill-opacity:1"
-         id="g19155"
-         inkscape:label="mimetypes"
-         transform="translate(-541.0002,-301)">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 543.0002,301 c -1.05237,0 -2,0.84508 -2,1.9375 l 0,11.125 c 0,1.09242 0.94763,1.9375 2,1.9375 l 11,0 c 1.05237,0 2,-0.84508 2,-1.9375 l 0,-11.125 c 0,-1.09242 -0.94763,-1.9375 -2,-1.9375 l -11,0 z m 0,5 3.03125,0 0,2 -3.03125,0 0,-2 z m 4.03125,0 2.96875,0 0,2 -2.96875,0 0,-2 z m 3.96875,0 3,0 0,2 -3,0 0,-2 z m -8,3 3.03125,0 0,2 -3.03125,0 0,-2 z m 4.03125,0 2.96875,0 0,2 -2.96875,0 0,-2 z m 3.96875,0 3,0 0,2 -3,0 0,-2 z m -8,3 3.03125,0 0,2 -3.03125,0 0,-2 z m 4.03125,0 2.96875,0 0,2 -2.96875,0 0,-2 z m 3.96875,0 3,0 0,2 -3,0 0,-2 z"
-           id="path19157"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans" />
-        <rect
-           height="1.9999993"
-           id="rect19159"
-           style="opacity:0.35;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           width="2.9999993"
-           x="551.00018"
-           y="309" />
-      </g>
-      <g
-         id="g19161"
-         inkscape:label="emblems"
-         style="fill:#bebebe;fill-opacity:1;display:inline"
-         transform="translate(-541.0002,-301)" />
-      <g
-         id="g19163"
-         inkscape:label="emotes"
-         style="fill:#bebebe;fill-opacity:1;display:inline"
-         transform="translate(-541.0002,-301)" />
-      <g
-         id="g19165"
-         inkscape:label="categories"
-         style="fill:#bebebe;fill-opacity:1;display:inline"
-         transform="translate(-541.0002,-301)" />
-      <g
-         id="g19167"
-         inkscape:label="actions"
-         style="fill:#bebebe;fill-opacity:1;display:inline"
-         transform="translate(-541.0002,-301)" />
-    </g>
-  </g>
-</svg>

data/theme/no-notifications.svg

@@ -1,114 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg3393"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="New document 2">
-  <defs
-     id="defs3395" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="697"
-     inkscape:window-height="613"
-     inkscape:window-x="100"
-     inkscape:window-y="77"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3398">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       transform="matrix(4,0,0,4,0.29733827,-0.35415646)"
-       id="g19245">
-      <g
-         id="g19247"
-         inkscape:label="status"
-         style="display:inline"
-         transform="translate(-323.02908,-649.02581)" />
-      <g
-         id="g19249"
-         inkscape:label="devices"
-         transform="translate(-323.02908,-649.02581)" />
-      <g
-         id="g19251"
-         inkscape:label="apps"
-         transform="translate(-323.02908,-649.02581)">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 331.9377,653 c 0.0187,0.16677 0.0625,0.32822 0.0625,0.5 0,2.48528 -2.01472,4.5 -4.5,4.5 -0.11769,0 -0.22834,-0.0224 -0.34375,-0.0312 l 0,2.21875 c 0,1.00412 0.80838,1.8125 1.8125,1.8125 l 1.54511,-5e-5 2,2.04688 2.0625,-2.04688 1.61114,0 c 1.00413,0 1.8125,-0.80838 1.8125,-1.8125 l 0,-5.375 c 0,-1.00412 -0.80837,-1.8125 -1.8125,-1.8125 z"
-           id="path19253"
-           sodipodi:nodetypes="csscsscccssssc"
-           style="opacity:0.5;color:#000000;fill:#c3c3c3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           d="m 327.5002,650 c -1.933,0 -3.5,1.567 -3.5,3.5 0,1.933 1.567,3.5 3.5,3.5 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m -0.53125,1 1.03125,0 -0.0625,1.375 a 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.125,0.125 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 l 1.15625,-0.75 0.5,0.90625 -1.21875,0.625 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0.0937 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0625 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0312 l 1.25,0.625 -0.53125,0.90625 -1.15625,-0.781 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,0 0.19951718,0.19951718 0 0 0 -0.125,0.0937 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0,0.0625 l 0.0625,1.3751 -1.03125,0 0.0937,-1.375 a 0.19951718,0.19951718 0 0 0 -0.0312,-0.0937 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0937,0.0312 l -1.1875,0.78125 -0.5,-0.90625 1.25,-0.625 a 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0312,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 l -1.25,-0.625 0.5,-0.90625 1.1875,0.75 a 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 L 326.96895,651 z"
-           id="path19255"
-           style="color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-      <g
-         id="g19257"
-         inkscape:label="places"
-         transform="translate(-323.02908,-649.02581)" />
-      <g
-         id="g19259"
-         inkscape:label="mimetypes"
-         transform="translate(-323.02908,-649.02581)" />
-      <g
-         id="g19261"
-         inkscape:label="emblems"
-         style="display:inline"
-         transform="translate(-323.02908,-649.02581)" />
-      <g
-         id="g19263"
-         inkscape:label="emotes"
-         style="display:inline"
-         transform="translate(-323.02908,-649.02581)" />
-      <g
-         id="g19265"
-         inkscape:label="categories"
-         style="display:inline"
-         transform="translate(-323.02908,-649.02581)" />
-      <g
-         id="g19267"
-         inkscape:label="actions"
-         style="display:inline"
-         transform="translate(-323.02908,-649.02581)" />
-    </g>
-  </g>
-</svg>

data/theme/parse-sass.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-
-bundle exec sass --update --sourcemap=none .

docs/reference/shell/shell-docs.sgml.in

@@ -17,6 +17,7 @@
   <chapter>
     <title>Actors</title>
     <xi:include href="xml/shell-generic-container.xml"/>
+    <xi:include href="xml/shell-slicer.xml"/>
     <xi:include href="xml/shell-stack.xml"/>
   </chapter>
   <chapter>
@@ -45,7 +46,7 @@
     <xi:include href="doc-gen-org.gnome.Shell.SearchProvider.xml"/>
     <xi:include href="doc-gen-org.gnome.Shell.SearchProvider2.xml"/>
     <xi:include href="xml/shell-global.xml"/>
-    <xi:include href="xml/shell-action-modes.xml"/>
+    <xi:include href="xml/shell-keybinding-modes.xml"/>
     <xi:include href="xml/shell-wm.xml"/>
     <xi:include href="xml/shell-util.xml"/>
     <xi:include href="xml/shell-mount-operation.xml"/>

js/gdm/authPrompt.js

@@ -140,7 +140,7 @@ const AuthPrompt = new Lang.Class({
     },
 
     _initButtons: function() {
-        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button button',
+        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button',
                                             button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                             reactive: true,
                                             can_focus: true,
@@ -162,7 +162,7 @@ const AuthPrompt = new Lang.Class({
                               y_fill: false,
                               x_align: St.Align.END,
                               y_align: St.Align.MIDDLE });
-        this.nextButton = new St.Button({ style_class: 'modal-dialog-button button',
+        this.nextButton = new St.Button({ style_class: 'modal-dialog-button',
                                           button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                           reactive: true,
                                           can_focus: true,
@@ -261,7 +261,6 @@ const AuthPrompt = new Lang.Class({
 
     _onVerificationComplete: function() {
         this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
-	this.cancelButton.reactive = false;
     },
 
     _onReset: function() {
@@ -433,7 +432,6 @@ const AuthPrompt = new Lang.Class({
     reset: function() {
         let oldStatus = this.verificationStatus;
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-        this.cancelButton.reactive = true;
 
         if (oldStatus == AuthPromptStatus.VERIFYING)
             this._userVerifier.cancel();
@@ -502,9 +500,6 @@ const AuthPrompt = new Lang.Class({
     },
 
     cancel: function() {
-        if (this.verificationStatus == AuthPromptStatus.NOT_VERIFYING || this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
-            return;
-        }
         this.reset();
         this.emit('cancelled');
     }

js/gdm/loginDialog.js

@@ -26,7 +26,6 @@ const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -365,17 +364,28 @@ const LoginDialog = new Lang.Class({
     Name: 'LoginDialog',
 
     _init: function(parentActor) {
-        this.actor = new Shell.GenericContainer({ style_class: 'login-dialog',
-                                                  visible: false });
-        this.actor.get_accessible().set_role(Atk.Role.WINDOW);
+        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
+                                     layout_manager: new Clutter.BinLayout(),
+                                     style_class: 'login-dialog',
+                                     visible: false });
 
         this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
-        this.actor.connect('allocate', Lang.bind(this, this._onAllocate));
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
         parentActor.add_child(this.actor);
 
         this._userManager = AccountsService.UserManager.get_default()
-        this._gdmClient = new Gdm.Client();
+        let gdmClient = new Gdm.Client();
+
+        if (GLib.getenv('GDM_GREETER_TEST') != '1') {
+            this._greeter = gdmClient.get_greeter_sync(null);
+
+            this._defaultSessionChangedId = this._greeter.connect('default-session-name-changed',
+                                                                  Lang.bind(this, this._onDefaultSessionChanged));
+            this._sessionOpenedId = this._greeter.connect('session-opened',
+                                                          Lang.bind(this, this._onSessionOpened));
+            this._timedLoginRequestedId = this._greeter.connect('timed-login-requested',
+                                                                Lang.bind(this, this._onTimedLoginRequested));
+        }
 
         this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
@@ -395,17 +405,24 @@ const LoginDialog = new Lang.Class({
         this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',
                                                     x_align: Clutter.ActorAlign.CENTER,
                                                     y_align: Clutter.ActorAlign.CENTER,
+                                                    x_expand: true,
+                                                    y_expand: true,
                                                     vertical: true,
                                                     visible: false });
         this.actor.add_child(this._userSelectionBox);
 
+        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
+                                           text: '' });
+        this._userSelectionBox.add(this._bannerLabel);
+        this._updateBanner();
+
         this._userList = new UserList();
         this._userSelectionBox.add(this._userList.actor,
                                    { expand: true,
                                      x_fill: true,
                                      y_fill: true });
 
-        this._authPrompt = new AuthPrompt.AuthPrompt(this._gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
+        this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
         this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted));
         this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
         this._authPrompt.hide();
@@ -433,25 +450,11 @@ const LoginDialog = new Lang.Class({
                                      x_align: St.Align.START,
                                      x_fill: true });
 
-        this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
-                                               opacity: 0,
-                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,
-                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
-        this.actor.add_child(this._bannerView);
-
-        let bannerBox = new St.BoxLayout({ vertical: true });
-
-        this._bannerView.add_actor(bannerBox);
-        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
-                                           text: '' });
-        this._bannerLabel.clutter_text.line_wrap = true;
-        this._bannerLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        bannerBox.add_child(this._bannerLabel);
-        this._updateBanner();
-
         this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',
                                         x_align: Clutter.ActorAlign.CENTER,
-                                        y_align: Clutter.ActorAlign.END });
+                                        y_align: Clutter.ActorAlign.END,
+                                        x_expand: true,
+                                        y_expand: true });
         this.actor.add_child(this._logoBin);
         this._updateLogo();
 
@@ -473,10 +476,6 @@ const LoginDialog = new Lang.Class({
         this._disableUserList = undefined;
         this._userListLoaded = false;
 
-        this._realmManager = new Realmd.Manager();
-        this._realmSignalId = this._realmManager.connect('login-format-changed',
-                                                         Lang.bind(this, this._showRealmLoginHint));
-
         LoginManager.getLoginManager().getCurrentSessionProxy(Lang.bind(this, this._gotGreeterSessionProxy));
 
         // If the user list is enabled, it should take key focus; make sure the
@@ -486,180 +485,6 @@ const LoginDialog = new Lang.Class({
                                                              Lang.bind(this, this._updateDisableUserList));
     },
 
-    _getBannerAllocation: function (dialogBox) {
-        let actorBox = new Clutter.ActorBox();
-
-        let [minWidth, minHeight, natWidth, natHeight] = this._bannerView.get_preferred_size();
-        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
-
-        actorBox.x1 = centerX - natWidth / 2;
-        actorBox.y1 = dialogBox.y1 + Main.layoutManager.panelBox.height;
-        actorBox.x2 = actorBox.x1 + natWidth;
-        actorBox.y2 = actorBox.y1 + natHeight;
-
-        return actorBox;
-    },
-
-    _getLogoBinAllocation: function (dialogBox) {
-        let actorBox = new Clutter.ActorBox();
-
-        let [minWidth, minHeight, natWidth, natHeight] = this._logoBin.get_preferred_size();
-        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
-
-        actorBox.x1 = centerX - natWidth / 2;
-        actorBox.y1 = dialogBox.y2 - natHeight;
-        actorBox.x2 = actorBox.x1 + natWidth;
-        actorBox.y2 = actorBox.y1 + natHeight;
-
-        return actorBox;
-    },
-
-    _getCenterActorAllocation: function (dialogBox, actor) {
-        let actorBox = new Clutter.ActorBox();
-
-        let [minWidth, minHeight, natWidth, natHeight] = actor.get_preferred_size();
-        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
-        let centerY = dialogBox.y1 + (dialogBox.y2 - dialogBox.y1) / 2;
-
-        actorBox.x1 = centerX - natWidth / 2;
-        actorBox.y1 = centerY - natHeight / 2;
-        actorBox.x2 = actorBox.x1 + natWidth;
-        actorBox.y2 = actorBox.y1 + natHeight;
-
-        return actorBox;
-    },
-
-    _onAllocate: function (actor, dialogBox, flags) {
-        let dialogWidth = dialogBox.x2 - dialogBox.x1;
-        let dialogHeight = dialogBox.y2 - dialogBox.y1;
-
-        // First find out what space the children require
-        let bannerAllocation = null;
-        let bannerHeight = 0;
-        let bannerWidth = 0;
-        if (this._bannerView.visible) {
-            bannerAllocation = this._getBannerAllocation(dialogBox, this._bannerView);
-            bannerHeight = bannerAllocation.y2 - bannerAllocation.y1;
-            bannerWidth = bannerAllocation.x2 - bannerAllocation.x1;
-        }
-
-        let authPromptAllocation = null;
-        let authPromptHeight = 0;
-        let authPromptWidth = 0;
-        if (this._authPrompt.actor.visible) {
-            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);
-            authPromptHeight = authPromptAllocation.y2 - authPromptAllocation.y1;
-            authPromptWidth = authPromptAllocation.x2 - authPromptAllocation.x1;
-        }
-
-        let userSelectionAllocation = null;
-        let userSelectionHeight = 0;
-        if (this._userSelectionBox.visible) {
-            userSelectionAllocation = this._getCenterActorAllocation(dialogBox, this._userSelectionBox);
-            userSelectionHeight = userSelectionAllocation.y2 - userSelectionAllocation.y1;
-        }
-
-        let logoAllocation = null;
-        let logoHeight = 0;
-        if (this._logoBin.visible) {
-            logoAllocation = this._getLogoBinAllocation(dialogBox);
-            logoHeight = logoAllocation.y2 - logoAllocation.y1;
-        }
-
-        // Then figure out if we're overly constrained and need to
-        // try a different layout, or if we have what extra space we
-        // can hand out
-        if (bannerAllocation) {
-            let leftOverYSpace = dialogHeight - bannerHeight - authPromptHeight - logoHeight;
-
-            if (leftOverYSpace > 0) {
-                 // First figure out how much left over space is up top
-                 let leftOverTopSpace = leftOverYSpace / 2;
-
-                 // Then, shift the banner into the middle of that extra space
-                 let yShift = leftOverTopSpace / 2;
-
-                 bannerAllocation.y1 += yShift;
-                 bannerAllocation.y2 += yShift;
-            } else {
-                 // Then figure out how much space there would be if we switched to a
-                 // wide layout with banner on one side and authprompt on the other.
-                 let leftOverXSpace = dialogWidth - authPromptWidth;
-
-                 // In a wide view, half of the available space goes to the banner,
-                 // and the other half goes to the margins.
-                 let wideBannerWidth = leftOverXSpace / 2;
-                 let wideSpacing  = leftOverXSpace - wideBannerWidth;
-
-                 // If we do go with a wide layout, we need there to be at least enough
-                 // space for the banner and the auth prompt to be the same width,
-                 // so it doesn't look unbalanced.
-                 if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {
-                     let centerX = dialogBox.x1 + dialogWidth / 2;
-                     let centerY = dialogBox.y1 + dialogHeight / 2;
-
-                     // A small portion of the spacing goes down the center of the
-                     // screen to help delimit the two columns of the wide view
-                     let centerGap = wideSpacing / 8;
-
-                     // place the banner along the left edge of the center margin
-                     bannerAllocation.x2 = centerX - centerGap / 2;
-                     bannerAllocation.x1 = bannerAllocation.x2 - wideBannerWidth;
-
-                     // figure out how tall it would like to be and try to accomodate
-                     // but don't let it get too close to the logo
-                     let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
-
-                     let maxWideHeight = dialogHeight - 3 * logoHeight;
-                     wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
-                     bannerAllocation.y1 = centerY - wideBannerHeight / 2;
-                     bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;
-
-                     // place the auth prompt along the right edge of the center margin
-                     authPromptAllocation.x1 = centerX + centerGap / 2;
-                     authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
-                 } else {
-                     // If we aren't going to do a wide view, then we need to limit
-                     // the height of the banner so it will present scrollbars
-
-                     // First figure out how much space there is without the banner
-                     leftOverYSpace += bannerHeight;
-
-                     // Then figure out how much of that space is up top
-                     let availableTopSpace = leftOverYSpace / 2;
-
-                     // Then give all of that space to the banner
-                     bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
-                 }
-            }
-        } else if (userSelectionAllocation) {
-            // Grow the user list to fill the space
-            let leftOverYSpace = dialogHeight - userSelectionHeight - logoHeight;
-
-            if (leftOverYSpace > 0) {
-                let topExpansion = leftOverYSpace / 2;
-                let bottomExpansion = topExpansion;
-
-                userSelectionAllocation.y1 -= topExpansion;
-                userSelectionAllocation.y2 += bottomExpansion;
-            }
-        }
-
-        // Finally hand out the allocations
-        if (bannerAllocation) {
-            this._bannerView.allocate(bannerAllocation, flags);
-        }
-
-        if (authPromptAllocation)
-            this._authPrompt.actor.allocate(authPromptAllocation, flags);
-
-        if (userSelectionAllocation)
-            this._userSelectionBox.allocate(userSelectionAllocation, flags);
-
-        if (logoAllocation)
-            this._logoBin.allocate(logoAllocation, flags);
-    },
-
     _ensureUserListLoaded: function() {
         if (!this._userManager.is_loaded) {
             this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',
@@ -712,20 +537,6 @@ const LoginDialog = new Lang.Class({
         }
     },
 
-    _fadeInBannerView: function() {
-        this._bannerView.show();
-        Tweener.addTween(this._bannerView,
-                         { opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad' });
-    },
-
-    _hideBannerView: function() {
-        Tweener.removeTweens(this._bannerView);
-        this._bannerView.opacity = 0;
-        this._bannerView.hide();
-    },
-
     _updateLogoTexture: function(cache, file) {
         if (this._logoFile && !this._logoFile.equal(file))
             return;
@@ -754,24 +565,7 @@ const LoginDialog = new Lang.Class({
         this._showPrompt();
     },
 
-    _resetGreeterProxy: function() {
-        if (GLib.getenv('GDM_GREETER_TEST') != '1') {
-            if (this._greeter) {
-                this._greeter.run_dispose();
-            }
-            this._greeter = this._gdmClient.get_greeter_sync(null);
-
-            this._defaultSessionChangedId = this._greeter.connect('default-session-name-changed',
-                                                                  Lang.bind(this, this._onDefaultSessionChanged));
-            this._sessionOpenedId = this._greeter.connect('session-opened',
-                                                          Lang.bind(this, this._onSessionOpened));
-            this._timedLoginRequestedId = this._greeter.connect('timed-login-requested',
-                                                                Lang.bind(this, this._onTimedLoginRequested));
-        }
-    },
-
     _onReset: function(authPrompt, beginRequest) {
-        this._resetGreeterProxy();
         this._sessionMenuButton.updateSensitivity(true);
 
         this._user = null;
@@ -810,7 +604,6 @@ const LoginDialog = new Lang.Class({
                          { opacity: 255,
                            time: _FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad' });
-        this._fadeInBannerView();
     },
 
     _showRealmLoginHint: function(realmManager, hint) {
@@ -830,25 +623,26 @@ const LoginDialog = new Lang.Class({
         this._authPrompt.setPasswordChar('');
         this._authPrompt.setQuestion(_("Username: "));
 
-        this._showRealmLoginHint(this._realmManager.loginFormat);
+        let realmManager = new Realmd.Manager();
+        let realmSignalId = realmManager.connect('login-format-changed',
+                                                 Lang.bind(this, this._showRealmLoginHint));
+        this._showRealmLoginHint(realmManager.loginFormat);
 
-        if (this._nextSignalId)
-            this._authPrompt.disconnect(this._nextSignalId);
-        this._nextSignalId = this._authPrompt.connect('next',
-                                                      Lang.bind(this, function() {
-                                                          this._authPrompt.disconnect(this._nextSignalId);
-                                                          this._nextSignalId = 0;
-                                                          this._authPrompt.updateSensitivity(false);
-                                                          let answer = this._authPrompt.getAnswer();
-                                                          this._user = this._userManager.get_user(answer);
-                                                          this._authPrompt.clear();
-                                                          this._authPrompt.startSpinning();
-                                                          this._authPrompt.begin({ userName: answer });
-                                                          this._updateCancelButton();
-                                                      }));
+        let nextSignalId = this._authPrompt.connect('next',
+                                                    Lang.bind(this, function() {
+                                                        this._authPrompt.disconnect(nextSignalId);
+                                                        this._authPrompt.updateSensitivity(false);
+                                                        let answer = this._authPrompt.getAnswer();
+                                                        this._user = this._userManager.get_user(answer);
+                                                        this._authPrompt.clear();
+                                                        this._authPrompt.startSpinning();
+                                                        this._authPrompt.begin({ userName: answer });
+                                                        this._updateCancelButton();
+
+                                                        realmManager.disconnect(realmSignalId)
+                                                        realmManager.release();
+                                                    }));
         this._updateCancelButton();
-
-        this._authPrompt.updateSensitivity(true);
         this._showPrompt();
     },
 
@@ -1064,7 +858,6 @@ const LoginDialog = new Lang.Class({
     _showUserList: function() {
         this._ensureUserListLoaded();
         this._authPrompt.hide();
-        this._hideBannerView();
         this._sessionMenuButton.close();
         this._setUserListExpanded(true);
         this._notListedButton.show();
@@ -1128,12 +921,6 @@ const LoginDialog = new Lang.Class({
             this._greeterSessionProxy.disconnect(this._greeterSessionProxyChangedId);
             this._greeterSessionProxy = null;
         }
-        if (this._realmManager) {
-            this._realmManager.disconnect(this._realmSignalId);
-            this._realmSignalId = 0;
-            this._realmManager.release();
-            this._realmManager = null;
-        }
     },
 
     _loadUserList: function() {
@@ -1170,7 +957,7 @@ const LoginDialog = new Lang.Class({
         this.actor.show();
         this.actor.opacity = 0;
 
-        Main.pushModal(this.actor, { actionMode: Shell.ActionMode.LOGIN_SCREEN });
+        Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOGIN_SCREEN });
 
         Tweener.addTween(this.actor,
                          { opacity: 255,

js/js-resources.gresource.xml

@@ -57,7 +57,6 @@
     <file>ui/layout.js</file>
     <file>ui/lightbox.js</file>
     <file>ui/lookingGlass.js</file>
-    <file>ui/legacyTray.js</file>
     <file>ui/magnifier.js</file>
     <file>ui/magnifierDBus.js</file>
     <file>ui/main.js</file>
@@ -65,7 +64,6 @@
     <file>ui/modalDialog.js</file>
     <file>ui/notificationDaemon.js</file>
     <file>ui/osdWindow.js</file>
-    <file>ui/osdMonitorLabeler.js</file>
     <file>ui/overview.js</file>
     <file>ui/overviewControls.js</file>
     <file>ui/panel.js</file>

js/misc/extensionUtils.js

@@ -43,7 +43,7 @@ function getCurrentExtension() {
     let path = match[1];
     let file = Gio.File.new_for_path(path);
 
-    // Walk up the directory tree, looking for an extension with
+    // Walk up the directory tree, looking for an extesion with
     // the same UUID as a directory name.
     while (file != null) {
         let extension = extensions[file.get_basename()];

js/misc/ibusManager.js

@@ -1,14 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
 try {
     var IBus = imports.gi.IBus;
-    _checkIBusVersion(1, 5, 2);
+    if (!('new_async' in IBus.Bus))
+        throw "IBus version is too old";
     const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
 } catch (e) {
     var IBus = null;
@@ -17,18 +16,6 @@ try {
 
 let _ibusManager = null;
 
-function _checkIBusVersion(requiredMajor, requiredMinor, requiredMicro) {
-    if ((IBus.MAJOR_VERSION > requiredMajor) ||
-        (IBus.MAJOR_VERSION == requiredMajor && IBus.MINOR_VERSION > requiredMinor) ||
-        (IBus.MAJOR_VERSION == requiredMajor && IBus.MINOR_VERSION == requiredMinor &&
-         IBus.MICRO_VERSION >= requiredMicro))
-        return;
-
-    throw "Found IBus version %d.%d.%d but required is %d.%d.%d".
-        format(IBus.MAJOR_VERSION, IBus.MINOR_VERSION, IBus.MINOR_VERSION,
-               requiredMajor, requiredMinor, requiredMicro);
-}
-
 function getIBusManager() {
     if (_ibusManager == null)
         _ibusManager = new IBusManager();
@@ -41,7 +28,6 @@ const IBusManager = new Lang.Class({
     // This is the longest we'll keep the keyboard frozen until an input
     // source is active.
     _MAX_INPUT_SOURCE_ACTIVATION_TIME: 4000, // ms
-    _PRELOAD_ENGINES_DELAY_TIME: 30, // sec
 
     _init: function() {
         if (!IBus)
@@ -56,7 +42,6 @@ const IBusManager = new Lang.Class({
         this._ready = false;
         this._registerPropertiesId = 0;
         this._currentEngineName = null;
-        this._preloadEnginesId = 0;
 
         this._ibus = IBus.Bus.new_async();
         this._ibus.connect('connected', Lang.bind(this, this._onConnected));
@@ -121,16 +106,6 @@ const IBusManager = new Lang.Class({
                                                          object_path: IBus.PATH_PANEL });
             this._candidatePopup.setPanelService(this._panelService);
             this._panelService.connect('update-property', Lang.bind(this, this._updateProperty));
-            try {
-                // IBus versions older than 1.5.10 have a bug which
-                // causes spurious set-content-type emissions when
-                // switching input focus that temporarily lose purpose
-                // and hints defeating its intended semantics and
-                // confusing users. We thus don't use it in that case.
-                _checkIBusVersion(1, 5, 10);
-                this._panelService.connect('set-content-type', Lang.bind(this, this._setContentType));
-            } catch (e) {
-            }
             // If an engine is already active we need to get its properties
             this._ibus.get_global_engine_async(-1, null, Lang.bind(this, function(i, result) {
                 let engine;
@@ -180,10 +155,6 @@ const IBusManager = new Lang.Class({
         this.emit('property-updated', this._currentEngineName, prop);
     },
 
-    _setContentType: function(panel, purpose, hints) {
-        this.emit('set-content-type', purpose, hints);
-    },
-
     activateProperty: function(key, state) {
         this._panelService.property_activate(key, state);
     },
@@ -196,10 +167,7 @@ const IBusManager = new Lang.Class({
     },
 
     setEngine: function(id, callback) {
-        // Send id even if id == this._currentEngineName
-        // because 'properties-registered' signal can be emitted
-        // while this._ibusSources == null on a lock screen.
-        if (!IBus || !this._ready) {
+        if (!IBus || !this._ready || id == this._currentEngineName) {
             if (callback)
                 callback();
             return;
@@ -208,27 +176,5 @@ const IBusManager = new Lang.Class({
         this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
                                            null, callback);
     },
-
-    preloadEngines: function(ids) {
-        if (!IBus || !this._ibus || ids.length == 0)
-            return;
-
-        if (this._preloadEnginesId != 0) {
-            Mainloop.source_remove(this._preloadEnginesId);
-            this._preloadEnginesId = 0;
-        }
-
-        this._preloadEnginesId =
-            Mainloop.timeout_add_seconds(this._PRELOAD_ENGINES_DELAY_TIME,
-                                         Lang.bind(this, function() {
-                                             this._ibus.preload_engines_async(
-                                                 ids,
-                                                 -1,
-                                                 null,
-                                                 null);
-                                             this._preloadEnginesId = 0;
-                                             return GLib.SOURCE_REMOVE;
-                                         }));
-    },
 });
 Signals.addSignalMethods(IBusManager.prototype);

js/misc/util.js

@@ -4,12 +4,10 @@ const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
-const Params = imports.misc.params;
 
 const SCROLL_TIME = 0.1;
 
@@ -40,8 +38,6 @@ const _urlRegexp = new RegExp(
         ')' +
     ')', 'gi');
 
-let _desktopSettings = null;
-
 // findUrls:
 // @str: string to find URLs in
 //
@@ -161,105 +157,6 @@ function _handleSpawnError(command, err) {
     Main.notifyError(title, err.message);
 }
 
-function formatTime(time, params) {
-    let date;
-    // HACK: The built-in Date type sucks at timezones, which we need for the
-    //       world clock; it's often more convenient though, so allow either
-    //       Date or GLib.DateTime as parameter
-    if (time instanceof Date)
-        date = GLib.DateTime.new_from_unix_local(time.getTime() / 1000);
-    else
-        date = time;
-
-    let now = GLib.DateTime.new_now_local();
-
-    let daysAgo = now.difference(date) / (24 * 60 * 60 * 1000 * 1000);
-
-    let format;
-
-    if (_desktopSettings == null)
-        _desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
-    let clockFormat = _desktopSettings.get_string('clock-format');
-    let hasAmPm = date.format('%p') != '';
-
-    params = Params.parse(params, { timeOnly: false });
-
-    if (clockFormat == '24h' || !hasAmPm) {
-        // Show only the time if date is on today
-        if (daysAgo < 1 || params.timeOnly)
-            /* Translators: Time in 24h format */
-            format = N_("%H\u2236%M");
-        // Show the word "Yesterday" and time if date is on yesterday
-        else if (daysAgo <2)
-            /* Translators: this is the word "Yesterday" followed by a
-             time string in 24h format. i.e. "Yesterday, 14:30" */
-            // xgettext:no-c-format
-            format = N_("Yesterday, %H\u2236%M");
-        // Show a week day and time if date is in the last week
-        else if (daysAgo < 7)
-            /* Translators: this is the week day name followed by a time
-             string in 24h format. i.e. "Monday, 14:30" */
-            // xgettext:no-c-format
-            format = N_("%A, %H\u2236%M");
-        else if (date.get_year() == now.get_year())
-            /* Translators: this is the month name and day number
-             followed by a time string in 24h format.
-             i.e. "May 25, 14:30" */
-            // xgettext:no-c-format
-            format = N_("%B %d, %H\u2236%M");
-        else
-            /* Translators: this is the month name, day number, year
-             number followed by a time string in 24h format.
-             i.e. "May 25 2012, 14:30" */
-            // xgettext:no-c-format
-            format = N_("%B %d %Y, %H\u2236%M");
-    } else {
-        // Show only the time if date is on today
-        if (daysAgo < 1 || params.timeOnly)
-            /* Translators: Time in 12h format */
-            format = N_("%l\u2236%M %p");
-        // Show the word "Yesterday" and time if date is on yesterday
-        else if (daysAgo <2)
-            /* Translators: this is the word "Yesterday" followed by a
-             time string in 12h format. i.e. "Yesterday, 2:30 pm" */
-            // xgettext:no-c-format
-            format = N_("Yesterday, %l\u2236%M %p");
-        // Show a week day and time if date is in the last week
-        else if (daysAgo < 7)
-            /* Translators: this is the week day name followed by a time
-             string in 12h format. i.e. "Monday, 2:30 pm" */
-            // xgettext:no-c-format
-            format = N_("%A, %l\u2236%M %p");
-        else if (date.get_year() == now.get_year())
-            /* Translators: this is the month name and day number
-             followed by a time string in 12h format.
-             i.e. "May 25, 2:30 pm" */
-            // xgettext:no-c-format
-            format = N_("%B %d, %l\u2236%M %p");
-        else
-            /* Translators: this is the month name, day number, year
-             number followed by a time string in 12h format.
-             i.e. "May 25 2012, 2:30 pm"*/
-            // xgettext:no-c-format
-            format = N_("%B %d %Y, %l\u2236%M %p");
-    }
-    return date.format(Shell.util_translate_time_string(format));
-}
-
-function createTimeLabel(date, params) {
-    if (_desktopSettings == null)
-        _desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
-
-    let label = new St.Label({ text: formatTime(date, params) });
-    let id = _desktopSettings.connect('changed::clock-format', function() {
-        label.text = formatTime(date, params);
-    });
-    label.connect('destroy', function() {
-        _desktopSettings.disconnect(id);
-    });
-    return label;
-}
-
 // lowerBound:
 // @array: an array or array-like object, already sorted
 //         according to @cmp

js/portalHelper/main.js

@@ -80,8 +80,8 @@ const PortalWindow = new Lang.Class({
         if (title) {
             this.title = title;
         } else {
-            /* TRANSLATORS: this is the title of the wifi captive portal login
-             * window, until we know the title of the actual login page */
+            // TRANSLATORS: this is the title of the wifi captive portal login
+            // window, until we know the title of the actual login page
             this.title = _("Web Authentication Redirect");
         }
     },

js/ui/altTab.js

@@ -81,6 +81,7 @@ const AppSwitcherPopup = new Lang.Class({
             let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
             let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
             let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
+            let vPadding = this.actor.get_theme_node().get_vertical_padding();
             let hPadding = leftPadding + rightPadding;
 
             let icon = this._items[this._selectedIndex].actor;

js/ui/appDisplay.js

@@ -366,8 +366,6 @@ const AllView = new Lang.Class({
     Extends: BaseAppView,
 
     _init: function() {
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this.parent({ usePagination: true }, null);
         this._scrollView = new St.ScrollView({ style_class: 'all-apps',
                                                x_expand: true,
@@ -519,19 +517,9 @@ const AllView = new Lang.Class({
             this.folderIcons.push(icon);
         }));
 
-        // Allow dragging of the icon only if the Dash would accept a drop to
-        // change favorite-apps. There are no other possible drop targets from
-        // the app picker, so there's no other need for a drag to start,
-        // at least on single-monitor setups.
-        // This also disables drag-to-launch on multi-monitor setups,
-        // but we hope that is not used much.
-        let favoritesWritable = this._settings.is_writable('favorite-apps');
-
         apps.forEach(Lang.bind(this, function(appId) {
             let app = appSys.lookup_app(appId);
-
-            let icon = new AppIcon(app,
-                                   { isDraggable: favoritesWritable });
+            let icon = new AppIcon(app);
             this.addItem(icon);
         }));
 
@@ -541,13 +529,6 @@ const AllView = new Lang.Class({
 
     // Overriden from BaseAppView
     animate: function (animationDirection, onComplete) {
-        this._scrollView.reactive = false;
-        let completionFunc = Lang.bind(this, function() {
-            this._scrollView.reactive = true;
-            if (onComplete)
-                onComplete();
-        });
-
         if (animationDirection == IconGrid.AnimationDirection.OUT &&
             this._displayingPopup && this._currentPopup) {
             this._currentPopup.popdown();
@@ -558,10 +539,10 @@ const AllView = new Lang.Class({
                     // signal handler, call again animate which will
                     // call the parent given that popup is already
                     // closed.
-                    this.animate(animationDirection, completionFunc);
+                    this.animate(animationDirection, onComplete);
                 }));
         } else {
-            this.parent(animationDirection, completionFunc);
+            this.parent(animationDirection, onComplete);
             if (animationDirection == IconGrid.AnimationDirection.OUT)
                 this._pageIndicators.animateIndicators(animationDirection);
         }
@@ -648,7 +629,7 @@ const AllView = new Lang.Class({
     },
 
     _onScroll: function(actor, event) {
-        if (this._displayingPopup || !this._scrollView.reactive)
+        if (this._displayingPopup)
             return Clutter.EVENT_STOP;
 
         let direction = event.get_scroll_direction();
@@ -782,9 +763,6 @@ const FrequentView = new Lang.Class({
 
     _init: function() {
         this.parent(null, { fillParent: true });
-
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this.actor = new St.Widget({ style_class: 'frequent-apps',
                                      layout_manager: new Clutter.BinLayout(),
                                      x_expand: true, y_expand: true });
@@ -821,19 +799,10 @@ const FrequentView = new Lang.Class({
         if(!hasUsefulData)
             return;
 
-        // Allow dragging of the icon only if the Dash would accept a drop to
-        // change favorite-apps. There are no other possible drop targets from
-        // the app picker, so there's no other need for a drag to start,
-        // at least on single-monitor setups.
-        // This also disables drag-to-launch on multi-monitor setups,
-        // but we hope that is not used much.
-        let favoritesWritable = this._settings.is_writable('favorite-apps');
-
         for (let i = 0; i < mostUsed.length; i++) {
             if (!mostUsed[i].get_app_info().should_show())
                 continue;
-            let appIcon = new AppIcon(mostUsed[i],
-                                      { isDraggable: favoritesWritable });
+            let appIcon = new AppIcon(mostUsed[i]);
             this._grid.addItem(appIcon, -1);
         }
     },
@@ -910,14 +879,14 @@ const AppDisplay = new Lang.Class({
         let view, button;
         view = new FrequentView();
         button = new St.Button({ label: _("Frequent"),
-                                 style_class: 'app-view-control button',
+                                 style_class: 'app-view-control',
                                  can_focus: true,
                                  x_expand: true });
         this._views[Views.FREQUENT] = { 'view': view, 'control': button };
 
         view = new AllView();
         button = new St.Button({ label: _("All"),
-                                 style_class: 'app-view-control button',
+                                 style_class: 'app-view-control',
                                  can_focus: true,
                                  x_expand: true });
         this._views[Views.ALL] = { 'view': view, 'control': button };
@@ -1548,12 +1517,12 @@ const AppIcon = new Lang.Class({
         this.id = app.get_id();
         this.name = app.get_name();
 
-        this.actor = new St.Button({ style_class: 'app-well-app',
+        // We need to make it track_hover so dash item can connect to
+        // the hover signal of the actor in _hookupLabel to call
+        // shouldShowTooltip when hovered.
+        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                      reactive: true,
-                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
-                                     can_focus: true,
-                                     x_fill: true,
-                                     y_fill: true });
+                                     track_hover: true });
 
         this._dot = new St.Widget({ style_class: 'app-well-app-running-dot',
                                     layout_manager: new Clutter.BinLayout(),
@@ -1561,54 +1530,54 @@ const AppIcon = new Lang.Class({
                                     x_align: Clutter.ActorAlign.CENTER,
                                     y_align: Clutter.ActorAlign.END });
 
-        this._iconContainer = new St.Widget({ layout_manager: new Clutter.BinLayout(),
-                                              x_expand: true, y_expand: true });
+        this._dot.hide();
 
-        this.actor.set_child(this._iconContainer);
-        this._iconContainer.add_child(this._dot);
+        this._button = new St.Button({ style_class: 'app-well-app',
+                                       reactive: true,
+                                       button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
+                                       can_focus: true,
+                                       x_fill: true,
+                                       y_fill: true });
+
+        this.actor.add_actor(this._button);
+        this.actor.add_actor(this._dot);
 
         this.actor._delegate = this;
+        this._button._delegate = this;
 
         if (!iconParams)
             iconParams = {};
 
-        // Get the isDraggable property without passing it on to the BaseIcon:
-        let appIconParams = Params.parse(iconParams, { isDraggable: true }, true);
-        let isDraggable = appIconParams['isDraggable'];
-        delete iconParams['isDraggable'];
-
         iconParams['createIcon'] = Lang.bind(this, this._createIcon);
         iconParams['setSizeManually'] = true;
         this.icon = new IconGrid.BaseIcon(app.get_name(), iconParams);
-        this._iconContainer.add_child(this.icon.actor);
+        this._button.set_child(this.icon.actor);
 
         this.actor.label_actor = this.icon.label;
 
-        this.actor.connect('leave-event', Lang.bind(this, this._onLeaveEvent));
-        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
-        this.actor.connect('touch-event', Lang.bind(this, this._onTouchEvent));
-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-        this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));
+        this._button.connect('leave-event', Lang.bind(this, this._onLeaveEvent));
+        this._button.connect('button-press-event', Lang.bind(this, this._onButtonPress));
+        this._button.connect('touch-event', Lang.bind(this, this._onTouchEvent));
+        this._button.connect('clicked', Lang.bind(this, this._onClicked));
+        this._button.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));
 
         this._menu = null;
         this._menuManager = new PopupMenu.PopupMenuManager(this);
 
-        if (isDraggable) {
-            this._draggable = DND.makeDraggable(this.actor);
-            this._draggable.connect('drag-begin', Lang.bind(this,
-                function () {
-                    this._removeMenuTimeout();
-                    Main.overview.beginItemDrag(this);
-                }));
-            this._draggable.connect('drag-cancelled', Lang.bind(this,
-                function () {
-                    Main.overview.cancelledItemDrag(this);
-                }));
-            this._draggable.connect('drag-end', Lang.bind(this,
-                function () {
-                   Main.overview.endItemDrag(this);
-                }));
-        }
+        this._draggable = DND.makeDraggable(this._button);
+        this._draggable.connect('drag-begin', Lang.bind(this,
+            function () {
+                this._removeMenuTimeout();
+                Main.overview.beginItemDrag(this);
+            }));
+        this._draggable.connect('drag-cancelled', Lang.bind(this,
+            function () {
+                Main.overview.cancelledItemDrag(this);
+            }));
+        this._draggable.connect('drag-end', Lang.bind(this,
+            function () {
+               Main.overview.endItemDrag(this);
+            }));
 
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
@@ -1620,6 +1589,18 @@ const AppIcon = new Lang.Class({
         this._updateRunningStyle();
     },
 
+    // Needed for containers that want to track focus of the widget
+    // for i.e. scroll the container when navigating through items
+    getFocusReceiver: function () {
+        return this._button;
+    },
+
+    // Needed for containers that want to change style of the widget
+    // for i.e. set as selected when searching in shell
+    getStyleReceiver: function () {
+        return this._button;
+    },
+
     _onDestroy: function() {
         if (this._stateChangedId > 0)
             this.app.disconnect(this._stateChangedId);
@@ -1639,10 +1620,13 @@ const AppIcon = new Lang.Class({
     },
 
     _updateRunningStyle: function() {
-        if (this.app.state != Shell.AppState.STOPPED)
+        if (this.app.state != Shell.AppState.STOPPED) {
+            this._button.add_style_class_name('running');
             this._dot.show();
-        else
+        } else {
+            this._button.remove_style_class_name('running');
             this._dot.hide();
+        }
     },
 
     _setPopupTimeout: function() {
@@ -1657,7 +1641,7 @@ const AppIcon = new Lang.Class({
     },
 
     _onLeaveEvent: function(actor, event) {
-        this.actor.fake_release();
+        this._button.fake_release();
         this._removeMenuTimeout();
     },
 
@@ -1695,10 +1679,8 @@ const AppIcon = new Lang.Class({
 
     popupMenu: function() {
         this._removeMenuTimeout();
-        this.actor.fake_release();
-
-        if (this._draggable)
-            this._draggable.fakeRelease();
+        this._button.fake_release();
+        this._draggable.fakeRelease();
 
         if (!this._menu) {
             this._menu = new AppIconMenu(this);
@@ -1709,17 +1691,14 @@ const AppIcon = new Lang.Class({
                 if (!isPoppedUp)
                     this._onMenuPoppedDown();
             }));
-            let id = Main.overview.connect('hiding', Lang.bind(this, function () { this._menu.close(); }));
-            this.actor.connect('destroy', function() {
-                Main.overview.disconnect(id);
-            });
+            Main.overview.connect('hiding', Lang.bind(this, function () { this._menu.close(); }));
 
             this._menuManager.addMenu(this._menu);
         }
 
         this.emit('menu-state-changed', true);
 
-        this.actor.set_hover(true);
+        this._button.set_hover(true);
         this._menu.popup();
         this._menuManager.ignoreRelease();
         this.emit('sync-tooltip');
@@ -1736,7 +1715,7 @@ const AppIcon = new Lang.Class({
     },
 
     _onMenuPoppedDown: function() {
-        this.actor.sync_hover();
+        this._button.sync_hover();
         this.emit('menu-state-changed', false);
     },
 
@@ -1804,8 +1783,6 @@ const AppIconMenu = new Lang.Class({
 
         this.actor.add_style_class_name('app-well-menu');
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         // Chain our visibility and lifecycle to that of the source
         source.actor.connect('notify::mapped', Lang.bind(this, function () {
             if (!source.actor.mapped)
@@ -1843,10 +1820,7 @@ const AppIconMenu = new Lang.Class({
         if (!this._source.app.is_window_backed()) {
             this._appendSeparator();
 
-            let appInfo = this._source.app.get_app_info();
-            let actions = appInfo.list_actions();
-            if (this._source.app.can_open_new_window() &&
-                actions.indexOf('new-window') == -1) {
+            if (this._source.app.can_open_new_window()) {
                 this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
                 this._newWindowMenuItem.connect('activate', Lang.bind(this, function() {
                     if (this._source.app.state == Shell.AppState.STOPPED)
@@ -1858,6 +1832,8 @@ const AppIconMenu = new Lang.Class({
                 this._appendSeparator();
             }
 
+            let appInfo = this._source.app.get_app_info();
+            let actions = appInfo.list_actions();
             for (let i = 0; i < actions.length; i++) {
                 let action = actions[i];
                 let item = this._appendMenuItem(appInfo.get_action_name(action));
@@ -1866,27 +1842,22 @@ const AppIconMenu = new Lang.Class({
                     this.emit('activate-window', null);
                 }));
             }
+            this._appendSeparator();
 
-            let canFavorite = this._settings.is_writable('favorite-apps');
+            let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());
 
-            if (canFavorite) {
-                this._appendSeparator();
-
-                let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());
-
-                if (isFavorite) {
-                    let item = this._appendMenuItem(_("Remove from Favorites"));
-                    item.connect('activate', Lang.bind(this, function() {
-                        let favs = AppFavorites.getAppFavorites();
-                        favs.removeFavorite(this._source.app.get_id());
-                    }));
-                } else {
-                    let item = this._appendMenuItem(_("Add to Favorites"));
-                    item.connect('activate', Lang.bind(this, function() {
-                        let favs = AppFavorites.getAppFavorites();
-                        favs.addFavorite(this._source.app.get_id());
-                    }));
-                }
+            if (isFavorite) {
+                let item = this._appendMenuItem(_("Remove from Favorites"));
+                item.connect('activate', Lang.bind(this, function() {
+                    let favs = AppFavorites.getAppFavorites();
+                    favs.removeFavorite(this._source.app.get_id());
+                }));
+            } else {
+                let item = this._appendMenuItem(_("Add to Favorites"));
+                item.connect('activate', Lang.bind(this, function() {
+                    let favs = AppFavorites.getAppFavorites();
+                    favs.addFavorite(this._source.app.get_id());
+                }));
             }
 
             if (Shell.AppSystem.get_default().lookup_app('org.gnome.Software.desktop')) {

js/ui/components/autorunManager.js

@@ -24,11 +24,11 @@ const AutorunSetting = {
 };
 
 // misc utils
-function shouldAutorunMount(mount) {
+function shouldAutorunMount(mount, forTransient) {
     let root = mount.get_root();
     let volume = mount.get_volume();
 
-    if (!volume || !volume.allowAutorun)
+    if (!volume || (!volume.allowAutorun && forTransient))
         return false;
 
     if (root.is_native() && isMountRootHidden(root))
@@ -167,38 +167,276 @@ const AutorunManager = new Lang.Class({
         this._session = new GnomeSession.SessionManager();
         this._volumeMonitor = Gio.VolumeMonitor.get();
 
-        this._dispatcher = new AutorunDispatcher(this);
+        this._transDispatcher = new AutorunTransientDispatcher(this);
+    },
+
+    _ensureResidentSource: function() {
+        if (this._residentSource)
+            return;
+
+        this._residentSource = new AutorunResidentSource(this);
+        let destroyId = this._residentSource.connect('destroy', Lang.bind(this, function() {
+            this._residentSource.disconnect(destroyId);
+            this._residentSource = null;
+        }));
     },
 
     enable: function() {
+        this._scanMounts();
+
         this._mountAddedId = this._volumeMonitor.connect('mount-added', Lang.bind(this, this._onMountAdded));
         this._mountRemovedId = this._volumeMonitor.connect('mount-removed', Lang.bind(this, this._onMountRemoved));
     },
 
     disable: function() {
+        if (this._residentSource)
+            this._residentSource.destroy();
         this._volumeMonitor.disconnect(this._mountAddedId);
         this._volumeMonitor.disconnect(this._mountRemovedId);
     },
 
+    _processMount: function(mount, hotplug) {
+        let discoverer = new ContentTypeDiscoverer(Lang.bind(this, function(mount, apps, contentTypes) {
+            this._ensureResidentSource();
+            this._residentSource.addMount(mount, apps);
+
+            if (hotplug)
+                this._transDispatcher.addMount(mount, apps, contentTypes);
+        }));
+        discoverer.guessContentTypes(mount);
+    },
+
+    _scanMounts: function() {
+        let mounts = this._volumeMonitor.get_mounts();
+        mounts.forEach(Lang.bind(this, function(mount) {
+            this._processMount(mount, false);
+        }));
+    },
+
     _onMountAdded: function(monitor, mount) {
         // don't do anything if our session is not the currently
         // active one
         if (!this._session.SessionIsActive)
             return;
 
-        let discoverer = new ContentTypeDiscoverer(Lang.bind(this, function(mount, apps, contentTypes) {
-            this._dispatcher.addMount(mount, apps, contentTypes);
-        }));
-        discoverer.guessContentTypes(mount);
+        this._processMount(mount, true);
     },
 
     _onMountRemoved: function(monitor, mount) {
-        this._dispatcher.removeMount(mount);
+        this._transDispatcher.removeMount(mount);
+        if (this._residentSource)
+            this._residentSource.removeMount(mount);
+    },
+
+    ejectMount: function(mount) {
+        let mountOp = new ShellMountOperation.ShellMountOperation(mount);
+
+        // first, see if we have a drive
+        let drive = mount.get_drive();
+        let volume = mount.get_volume();
+
+        if (drive &&
+            drive.get_start_stop_type() == Gio.DriveStartStopType.SHUTDOWN &&
+            drive.can_stop()) {
+            drive.stop(0, mountOp.mountOp, null,
+                       Lang.bind(this, this._onStop));
+        } else {
+            if (mount.can_eject()) {
+                mount.eject_with_operation(0, mountOp.mountOp, null,
+                                           Lang.bind(this, this._onEject));
+            } else if (volume && volume.can_eject()) {
+                volume.eject_with_operation(0, mountOp.mountOp, null,
+                                            Lang.bind(this, this._onEject));
+            } else if (drive && drive.can_eject()) {
+                drive.eject_with_operation(0, mountOp.mountOp, null,
+                                           Lang.bind(this, this._onEject));
+            } else if (mount.can_unmount()) {
+                mount.unmount_with_operation(0, mountOp.mountOp, null,
+                                             Lang.bind(this, this._onUnmount));
+            }
+        }
+    },
+
+    _onUnmount: function(mount, res) {
+        try {
+            mount.unmount_with_operation_finish(res);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to eject the mount ' + mount.get_name() 
+                    + ': ' + e.toString());
+        }
+    },
+
+    _onEject: function(source, res) {
+        try {
+            source.eject_with_operation_finish(res);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to eject the drive ' + source.get_name()
+                    + ': ' + e.toString());
+        }
+    },
+
+    _onStop: function(drive, res) {
+        try {
+            drive.stop_finish(res);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                log('Unable to stop the drive ' + drive.get_name() 
+                    + ': ' + e.toString());
+        }
+    },
+});
+
+const AutorunResidentSource = new Lang.Class({
+    Name: 'AutorunResidentSource',
+    Extends: MessageTray.Source,
+
+    _init: function(manager) {
+        this.parent(_("Removable Devices"), 'media-removable');
+        this.resident = true;
+
+        this._mounts = [];
+
+        this._manager = manager;
+        this._notification = new AutorunResidentNotification(this._manager, this);
+    },
+
+    _createPolicy: function() {
+        return new MessageTray.NotificationPolicy({ showInLockScreen: false });
+    },
+
+    buildRightClickMenu: function() {
+        return null;
+    },
+
+    addMount: function(mount, apps) {
+        if (!shouldAutorunMount(mount, false))
+            return;
+
+        let filtered = this._mounts.filter(function (element) {
+            return (element.mount == mount);
+        });
+
+        if (filtered.length != 0)
+            return;
+
+        let element = { mount: mount, apps: apps };
+        this._mounts.push(element);
+        this._redisplay();
+    },
+
+    removeMount: function(mount) {
+        this._mounts =
+            this._mounts.filter(function (element) {
+                return (element.mount != mount);
+            });
+
+        this._redisplay();
+    },
+
+    _redisplay: function() {
+        if (this._mounts.length == 0) {
+            this._notification.destroy();
+            this.destroy();
+
+            return;
+        }
+
+        this._notification.updateForMounts(this._mounts);
+
+        // add ourselves as a source, and push the notification
+        if (!Main.messageTray.contains(this)) {
+            Main.messageTray.add(this);
+            this.pushNotification(this._notification);
+        }
     }
 });
 
-const AutorunDispatcher = new Lang.Class({
-    Name: 'AutorunDispatcher',
+const AutorunResidentNotification = new Lang.Class({
+    Name: 'AutorunResidentNotification',
+    Extends: MessageTray.Notification,
+
+    _init: function(manager, source) {
+        this.parent(source, source.title, null, { customContent: true });
+
+        // set the notification as resident
+        this.setResident(true);
+
+        this._layout = new St.BoxLayout ({ style_class: 'hotplug-resident-box',
+                                           vertical: true });
+        this._manager = manager;
+
+        this.addActor(this._layout,
+                      { x_expand: true,
+                        x_fill: true });
+    },
+
+    updateForMounts: function(mounts) {
+        // remove all the layout content
+        this._layout.destroy_all_children();
+
+        for (let idx = 0; idx < mounts.length; idx++) {
+            let element = mounts[idx];
+
+            let actor = this._itemForMount(element.mount, element.apps);
+            this._layout.add(actor, { x_fill: true,
+                                      expand: true });
+        }
+    },
+
+    _itemForMount: function(mount, apps) {
+        let item = new St.BoxLayout();
+
+        // prepare the mount button content
+        let mountLayout = new St.BoxLayout();
+
+        let mountIcon = new St.Icon({ gicon: mount.get_icon(),
+                                      style_class: 'hotplug-resident-mount-icon' });
+        mountLayout.add_actor(mountIcon);
+
+        let labelBin = new St.Bin({ y_align: St.Align.MIDDLE });
+        let mountLabel =
+            new St.Label({ text: mount.get_name(),
+                           style_class: 'hotplug-resident-mount-label',
+                           track_hover: true,
+                           reactive: true });
+        labelBin.add_actor(mountLabel);
+        mountLayout.add_actor(labelBin);
+
+        let mountButton = new St.Button({ child: mountLayout,
+                                          x_align: St.Align.START,
+                                          x_fill: true,
+                                          style_class: 'hotplug-resident-mount',
+                                          button_mask: St.ButtonMask.ONE });
+        item.add(mountButton, { x_align: St.Align.START,
+                                expand: true });
+
+        let ejectIcon = 
+            new St.Icon({ icon_name: 'media-eject-symbolic',
+                          style_class: 'hotplug-resident-eject-icon' });
+
+        let ejectButton =
+            new St.Button({ style_class: 'hotplug-resident-eject-button',
+                            button_mask: St.ButtonMask.ONE,
+                            child: ejectIcon });
+        item.add(ejectButton, { x_align: St.Align.END });
+
+        // now connect signals
+        mountButton.connect('clicked', Lang.bind(this, function(actor, event) {
+            startAppForMount(apps[0], mount);
+        }));
+
+        ejectButton.connect('clicked', Lang.bind(this, function() {
+            this._manager.ejectMount(mount);
+        }));
+
+        return item;
+    },
+});
+
+const AutorunTransientDispatcher = new Lang.Class({
+    Name: 'AutorunTransientDispatcher',
 
     _init: function(manager) {
         this._manager = manager;
@@ -244,7 +482,7 @@ const AutorunDispatcher = new Lang.Class({
             return;
      
         // add a new source
-        this._sources.push(new AutorunSource(this._manager, mount, apps));
+        this._sources.push(new AutorunTransientSource(this._manager, mount, apps));
     },
 
     addMount: function(mount, apps, contentTypes) {
@@ -253,7 +491,7 @@ const AutorunDispatcher = new Lang.Class({
             return;
 
         // if the mount doesn't want to be autorun, return
-        if (!shouldAutorunMount(mount))
+        if (!shouldAutorunMount(mount, true))
             return;
 
         let setting = this._getAutorunSettingForType(contentTypes[0]);
@@ -293,8 +531,8 @@ const AutorunDispatcher = new Lang.Class({
     }
 });
 
-const AutorunSource = new Lang.Class({
-    Name: 'AutorunSource',
+const AutorunTransientSource = new Lang.Class({
+    Name: 'AutorunTransientSource',
     Extends: MessageTray.Source,
 
     _init: function(manager, mount, apps) {
@@ -304,7 +542,7 @@ const AutorunSource = new Lang.Class({
 
         this.parent(mount.get_name());
 
-        this._notification = new AutorunNotification(this._manager, this);
+        this._notification = new AutorunTransientNotification(this._manager, this);
 
         // add ourselves as a source, and popup the notification
         Main.messageTray.add(this);
@@ -316,31 +554,35 @@ const AutorunSource = new Lang.Class({
     }
 });
 
-const AutorunNotification = new Lang.Class({
-    Name: 'AutorunNotification',
+const AutorunTransientNotification = new Lang.Class({
+    Name: 'AutorunTransientNotification',
     Extends: MessageTray.Notification,
 
     _init: function(manager, source) {
-        this.parent(source, source.title);
+        this.parent(source, source.title, null, { customContent: true });
 
         this._manager = manager;
+        this._box = new St.BoxLayout({ style_class: 'hotplug-transient-box',
+                                       vertical: true });
+        this.addActor(this._box);
+
         this._mount = source.mount;
 
-        // set the notification to urgent, so that it expands out
-        this.setUrgency(MessageTray.Urgency.CRITICAL);
-    },
-
-    createBanner: function() {
-        let banner = new MessageTray.NotificationBanner(this);
-
-        this.source.apps.forEach(Lang.bind(this, function (app) {
+        source.apps.forEach(Lang.bind(this, function (app) {
             let actor = this._buttonForApp(app);
 
             if (actor)
-                banner.addButton(actor);
+                this._box.add(actor, { x_fill: true,
+                                       x_align: St.Align.START });
         }));
 
-        return banner;
+        this._box.add(this._buttonForEject(), { x_fill: true,
+                                                x_align: St.Align.START });
+
+        // set the notification to transient and urgent, so that it
+        // expands out
+        this.setTransient(true);
+        this.setUrgency(MessageTray.Urgency.CRITICAL);
     },
 
     _buttonForApp: function(app) {
@@ -358,9 +600,8 @@ const AutorunNotification = new Lang.Class({
         let button = new St.Button({ child: box,
                                      x_fill: true,
                                      x_align: St.Align.START,
-                                     x_expand: true,
                                      button_mask: St.ButtonMask.ONE,
-                                     style_class: 'hotplug-notification-item button' });
+                                     style_class: 'hotplug-notification-item' });
 
         button.connect('clicked', Lang.bind(this, function() {
             startAppForMount(app, this._mount);
@@ -370,11 +611,29 @@ const AutorunNotification = new Lang.Class({
         return button;
     },
 
-    activate: function() {
-        this.parent();
+    _buttonForEject: function() {
+        let box = new St.BoxLayout();
+        let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
+                                 style_class: 'hotplug-notification-item-icon' });
+        box.add(icon);
 
-        let app = Gio.app_info_get_default_for_type('inode/directory', false);
-        startAppForMount(app, this._mount);
+        let label = new St.Bin({ y_align: St.Align.MIDDLE,
+                                 child: new St.Label
+                                 ({ text: _("Eject") })
+                               });
+        box.add(label);
+
+        let button = new St.Button({ child: box,
+                                     x_fill: true,
+                                     x_align: St.Align.START,
+                                     button_mask: St.ButtonMask.ONE,
+                                     style_class: 'hotplug-notification-item' });
+
+        button.connect('clicked', Lang.bind(this, function() {
+            this._manager.ejectMount(this._mount);
+        }));
+
+        return button;
     }
 });
 

js/ui/components/keyring.js

@@ -41,7 +41,7 @@ const KeyringDialog = new Lang.Class({
         mainContentBox.add(this._messageBox,
                            { y_align: St.Align.START, expand: true, x_fill: true, y_fill: true });
 
-        let subject = new St.Label({ style_class: 'prompt-dialog-headline headline' });
+        let subject = new St.Label({ style_class: 'prompt-dialog-headline' });
         this.prompt.bind_property('message', subject, 'text', GObject.BindingFlags.SYNC_CREATE);
 
         this._messageBox.add(subject,

js/ui/components/networkAgent.js

@@ -54,7 +54,7 @@ const NetworkSecretDialog = new Lang.Class({
         mainContentBox.add(messageBox,
                            { y_align: St.Align.START });
 
-        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
+        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
                                             text: this._content.title });
         messageBox.add(subjectLabel,
                        { y_fill:  false,

js/ui/components/polkitAgent.js

@@ -50,7 +50,7 @@ const AuthenticationDialog = new Lang.Class({
         mainContentBox.add(messageBox,
                            { expand: true, y_align: St.Align.START });
 
-        this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
+        this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
                                             text: _("Authentication Required") });
 
         messageBox.add(this._subjectLabel,

js/ui/components/telepathyClient.js

@@ -11,13 +11,11 @@ const St = imports.gi.St;
 const Tpl = imports.gi.TelepathyLogger;
 const Tp = imports.gi.TelepathyGLib;
 
-const Calendar = imports.ui.calendar;
 const History = imports.misc.history;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;
-const Util = imports.misc.util;
 
 // See Notification.appendMessage
 const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes
@@ -31,6 +29,8 @@ const SCROLLBACK_HISTORY_LINES = 10;
 // See Notification._onEntryChanged
 const COMPOSING_STOP_TIMEOUT = 5;
 
+const CLOCK_FORMAT_KEY = 'clock-format';
+
 const NotificationDirection = {
     SENT: 'chat-sent',
     RECEIVED: 'chat-received'
@@ -104,6 +104,15 @@ const TelepathyClient = new Lang.Class({
         this._tpClient.set_handle_channels_func(
             Lang.bind(this, this._handleChannels));
 
+        // Watch subscription requests and connection errors
+        this._subscriptionSource = null;
+        this._accountSource = null;
+
+        // Workaround for gjs not supporting GPtrArray in signals.
+        // See BGO bug #653941 for context.
+        this._tpClient.set_contact_list_changed_func(
+            Lang.bind(this, this._contactListChanged));
+
         // Allow other clients (such as Empathy) to pre-empt our channels if
         // needed
         this._tpClient.set_delegated_channels_callback(
@@ -117,12 +126,17 @@ const TelepathyClient = new Lang.Class({
             throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
         }
 
+        this._accountManagerValidityChangedId = this._accountManager.connect('account-validity-changed',
+                                                                             Lang.bind(this, this._accountValidityChanged));
+
         if (!this._accountManager.is_prepared(Tp.AccountManager.get_feature_quark_core()))
-            this._accountManager.prepare_async(null, null);
+            this._accountManager.prepare_async(null, Lang.bind(this, this._accountManagerPrepared));
     },
 
     disable: function() {
         this._tpClient.unregister();
+        this._accountManager.disconnect(this._accountManagerValidityChangedId);
+        this._accountManagerValidityChangedId = 0;
     },
 
     _observeChannels: function(observer, account, conn, channels,
@@ -207,6 +221,33 @@ const TelepathyClient = new Lang.Class({
         }
     },
 
+    _displayRoomInvitation: function(conn, channel, dispatchOp, context) {
+        // We can only approve the rooms if we have been invited to it
+        let selfContact = channel.group_get_self_contact();
+        if (selfContact == null) {
+            context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
+                                        message: 'Not invited to the room' }));
+            return;
+        }
+
+        let [invited, inviter, reason, msg] = channel.group_get_local_pending_contact_info(selfContact);
+        if (!invited) {
+            context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
+                                        message: 'Not invited to the room' }));
+            return;
+        }
+
+        // FIXME: We don't have a 'chat room' icon (bgo #653737) use
+        // system-users for now as Empathy does.
+        let source = new ApproverSource(dispatchOp, _("Invitation"),
+                                        Gio.icon_new_for_string('system-users'));
+        Main.messageTray.add(source);
+
+        let notif = new RoomInviteNotification(source, dispatchOp, channel, inviter);
+        source.notify(notif);
+        context.accept();
+    },
+
     _approveChannels: function(approver, account, conn, channels,
                                dispatchOp, context) {
         let channel = channels[0];
@@ -220,6 +261,10 @@ const TelepathyClient = new Lang.Class({
 
         if (chanType == Tp.IFACE_CHANNEL_TYPE_TEXT)
             this._approveTextChannel(account, conn, channel, dispatchOp, context);
+        else if (chanType == Tp.IFACE_CHANNEL_TYPE_CALL)
+            this._approveCall(account, conn, channel, dispatchOp, context);
+        else if (chanType == Tp.IFACE_CHANNEL_TYPE_FILE_TRANSFER)
+            this._approveFileTransfer(account, conn, channel, dispatchOp, context);
         else
             context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
                                         message: 'Unsupported channel type' }));
@@ -228,22 +273,54 @@ const TelepathyClient = new Lang.Class({
     _approveTextChannel: function(account, conn, channel, dispatchOp, context) {
         let [targetHandle, targetHandleType] = channel.get_handle();
 
-        if (targetHandleType != Tp.HandleType.CONTACT) {
-            context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
-                                        message: 'Unsupported handle type' }));
-            return;
+        if (targetHandleType == Tp.HandleType.CONTACT) {
+            // Approve private text channels right away as we are going to handle it
+            dispatchOp.claim_with_async(this._tpClient,
+                                        Lang.bind(this, function(dispatchOp, result) {
+                try {
+                    dispatchOp.claim_with_finish(result);
+                    this._handlingChannels(account, conn, [channel], false);
+                } catch (err) {
+                    throw new Error('Failed to Claim channel: ' + err);
+                }}));
+
+            context.accept();
+        } else {
+            this._displayRoomInvitation(conn, channel, dispatchOp, context);
         }
+    },
 
-        // Approve private text channels right away as we are going to handle it
-        dispatchOp.claim_with_async(this._tpClient, Lang.bind(this, function(dispatchOp, result) {
-            try {
-                dispatchOp.claim_with_finish(result);
-                this._handlingChannels(account, conn, [channel], false);
-            } catch (err) {
-                log('Failed to Claim channel: ' + err);
-            }
-        }));
+    _approveCall: function(account, conn, channel, dispatchOp, context) {
+        let isVideo = false;
 
+        let props = channel.borrow_immutable_properties();
+
+        if (props[Tp.PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO])
+          isVideo = true;
+
+        // We got the TpContact
+        let source = new ApproverSource(dispatchOp, _("Call"), isVideo ?
+                                        Gio.icon_new_for_string('camera-web') :
+                                        Gio.icon_new_for_string('audio-input-microphone'));
+        Main.messageTray.add(source);
+
+        let notif = new AudioVideoNotification(source, dispatchOp, channel,
+            channel.get_target_contact(), isVideo);
+        source.notify(notif);
+        context.accept();
+    },
+
+    _approveFileTransfer: function(account, conn, channel, dispatchOp, context) {
+        // Use the icon of the file being transferred
+        let gicon = Gio.content_type_get_icon(channel.get_mime_type());
+
+        // We got the TpContact
+        let source = new ApproverSource(dispatchOp, _("File Transfer"), gicon);
+        Main.messageTray.add(source);
+
+        let notif = new FileTransferNotification(source, dispatchOp, channel,
+            channel.get_target_contact());
+        source.notify(notif);
         context.accept();
     },
 
@@ -251,6 +328,108 @@ const TelepathyClient = new Lang.Class({
         // Nothing to do as we don't make a distinction between observed and
         // handled channels.
     },
+
+    _accountManagerPrepared: function(am, result) {
+        am.prepare_finish(result);
+
+        let accounts = am.get_valid_accounts();
+        for (let i = 0; i < accounts.length; i++) {
+            this._accountValidityChanged(am, accounts[i], true);
+        }
+    },
+
+    _accountValidityChanged: function(am, account, valid) {
+        if (!valid)
+            return;
+
+        // It would be better to connect to "status-changed" but we cannot.
+        // See discussion in https://bugzilla.gnome.org/show_bug.cgi?id=654159
+        account.connect("notify::connection-status",
+                        Lang.bind(this, this._accountConnectionStatusNotifyCb));
+
+        account.connect('notify::connection',
+                        Lang.bind(this, this._connectionChanged));
+        this._connectionChanged(account);
+    },
+
+    _connectionChanged: function(account) {
+        let conn = account.get_connection();
+        if (conn == null)
+            return;
+
+        this._tpClient.grab_contact_list_changed(conn);
+        if (conn.get_contact_list_state() == Tp.ContactListState.SUCCESS) {
+            this._contactListChanged(conn, conn.dup_contact_list(), []);
+        }
+    },
+
+    _contactListChanged: function(conn, added, removed) {
+        for (let i = 0; i < added.length; i++) {
+            let contact = added[i];
+
+            contact.connect('subscription-states-changed',
+                            Lang.bind(this, this._subscriptionStateChanged));
+            this._subscriptionStateChanged(contact);
+        }
+    },
+
+    _subscriptionStateChanged: function(contact) {
+        if (contact.get_publish_state() != Tp.SubscriptionState.ASK)
+            return;
+
+        /* Implicitly accept publish requests if contact is already subscribed */
+        if (contact.get_subscribe_state() == Tp.SubscriptionState.YES ||
+            contact.get_subscribe_state() == Tp.SubscriptionState.ASK) {
+
+            contact.authorize_publication_async(function(src, result) {
+                src.authorize_publication_finish(result)});
+
+            return;
+        }
+
+        /* Display notification to ask user to accept/reject request */
+        let source = this._ensureAppSource();
+
+        let notif = new SubscriptionRequestNotification(source, contact);
+        source.notify(notif);
+    },
+
+    _accountConnectionStatusNotifyCb: function(account) {
+        let connectionError = account.connection_error;
+
+        if (account.connection_status != Tp.ConnectionStatus.DISCONNECTED ||
+            connectionError == Tp.error_get_dbus_name(Tp.Error.CANCELLED)) {
+            return;
+        }
+
+        let notif = this._accountNotifications[account.get_object_path()];
+        if (notif)
+            return;
+
+        /* Display notification that account failed to connect */
+        let source = this._ensureAppSource();
+
+        notif = new AccountNotification(source, account, connectionError);
+        this._accountNotifications[account.get_object_path()] = notif;
+        notif.connect('destroy', Lang.bind(this, function() {
+            delete this._accountNotifications[account.get_object_path()];
+        }));
+        source.notify(notif);
+    },
+
+    _ensureAppSource: function() {
+        if (this._appSource == null) {
+            this._appSource = new MessageTray.Source(_("Chat"), 'empathy');
+            this._appSource.policy = new MessageTray.NotificationApplicationPolicy('empathy');
+
+            Main.messageTray.add(this._appSource);
+            this._appSource.connect('destroy', Lang.bind(this, function () {
+                this._appSource = null;
+            }));
+        }
+
+        return this._appSource;
+    }
 });
 
 const ChatSource = new Lang.Class({
@@ -272,7 +451,7 @@ const ChatSource = new Lang.Class({
         this._closedId = this._channel.connect('invalidated', Lang.bind(this, this._channelClosed));
 
         this._notification = new ChatNotification(this);
-        this._notification.connect('activated', Lang.bind(this, this.open));
+        this._notification.connect('clicked', Lang.bind(this, this.open));
         this._notification.setUrgency(MessageTray.Urgency.HIGH);
         this._notifyTimeoutId = 0;
 
@@ -297,6 +476,22 @@ const ChatSource = new Lang.Class({
         this._getLogMessages();
     },
 
+    buildRightClickMenu: function() {
+        let item;
+
+        let rightClickMenu = this.parent();
+        item = new PopupMenu.PopupMenuItem('');
+        item.actor.connect('notify::mapped', Lang.bind(this, function() {
+            item.label.set_text(this.isMuted ? _("Unmute") : _("Mute"));
+        }));
+        item.connect('activate', Lang.bind(this, function() {
+            this.setMuted(!this.isMuted);
+            this.emit('done-displaying-content', false);
+        }));
+        rightClickMenu.add(item.actor);
+        return rightClickMenu;
+    },
+
     _createPolicy: function() {
         return new MessageTray.NotificationApplicationPolicy('empathy');
     },
@@ -357,17 +552,10 @@ const ChatSource = new Lang.Class({
 
     open: function() {
         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
-            // fallback to something else if activation fails
-
-            let target;
-            if (this._channel.connection.protocol_name == 'irc')
-                target = 'org.freedesktop.Telepathy.Client.Polari';
-            else
-                target = 'org.freedesktop.Telepathy.Client.Empathy.Chat';
-            this._client.delegate_channels_async([this._channel], global.get_current_time(), target, null);
+            // We are handling the channel, try to pass it to Empathy
+            this._client.delegate_channels_async([this._channel],
+                                                 global.get_current_time(),
+                                                 'org.freedesktop.Telepathy.Client.Empathy.Chat', null);
         } else {
             // We are not the handler, just ask to present the channel
             let dbus = Tp.DBusDaemon.dup();
@@ -467,6 +655,10 @@ const ChatSource = new Lang.Class({
         return this._pendingMessages.length;
     },
 
+    get indicatorCount() {
+        return this.count;
+    },
+
     get unseenCount() {
         return this.count;
     },
@@ -745,16 +937,99 @@ const ChatNotification = new Lang.Class({
         this._filterMessages();
     },
 
+    _formatTimestamp: function(date) {
+        let now = new Date();
+
+        var daysAgo = (now.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
+
+        let format;
+
+        let desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
+        let clockFormat = desktopSettings.get_string(CLOCK_FORMAT_KEY);
+        let hasAmPm = date.toLocaleFormat('%p') != '';
+
+        if (clockFormat == '24h' || !hasAmPm) {
+            // Show only the time if date is on today
+            if(daysAgo < 1){
+                /* Translators: Time in 24h format */
+                format = N_("%H\u2236%M");
+            }
+            // Show the word "Yesterday" and time if date is on yesterday
+            else if(daysAgo <2){
+                /* Translators: this is the word "Yesterday" followed by a
+                 time string in 24h format. i.e. "Yesterday, 14:30" */
+                // xgettext:no-c-format
+                format = N_("Yesterday, %H\u2236%M");
+            }
+            // Show a week day and time if date is in the last week
+            else if (daysAgo < 7) {
+                /* Translators: this is the week day name followed by a time
+                 string in 24h format. i.e. "Monday, 14:30" */
+                // xgettext:no-c-format
+                format = N_("%A, %H\u2236%M");
+
+            } else if (date.getYear() == now.getYear()) {
+                /* Translators: this is the month name and day number
+                 followed by a time string in 24h format.
+                 i.e. "May 25, 14:30" */
+                // xgettext:no-c-format
+                format = N_("%B %d, %H\u2236%M");
+            } else {
+                /* Translators: this is the month name, day number, year
+                 number followed by a time string in 24h format.
+                 i.e. "May 25 2012, 14:30" */
+                // xgettext:no-c-format
+                format = N_("%B %d %Y, %H\u2236%M");
+            }
+        } else {
+            // Show only the time if date is on today
+            if(daysAgo < 1){
+                /* Translators: Time in 24h format */
+                format = N_("%l\u2236%M %p");
+            }
+            // Show the word "Yesterday" and time if date is on yesterday
+            else if(daysAgo <2){
+                /* Translators: this is the word "Yesterday" followed by a
+                 time string in 12h format. i.e. "Yesterday, 2:30 pm" */
+                // xgettext:no-c-format
+                format = N_("Yesterday, %l\u2236%M %p");
+            }
+            // Show a week day and time if date is in the last week
+            else if (daysAgo < 7) {
+                /* Translators: this is the week day name followed by a time
+                 string in 12h format. i.e. "Monday, 2:30 pm" */
+                // xgettext:no-c-format
+                format = N_("%A, %l\u2236%M %p");
+
+            } else if (date.getYear() == now.getYear()) {
+                /* Translators: this is the month name and day number
+                 followed by a time string in 12h format.
+                 i.e. "May 25, 2:30 pm" */
+                // xgettext:no-c-format
+                format = N_("%B %d, %l\u2236%M %p");
+            } else {
+                /* Translators: this is the month name, day number, year
+                 number followed by a time string in 12h format.
+                 i.e. "May 25 2012, 2:30 pm"*/
+                // xgettext:no-c-format
+                format = N_("%B %d %Y, %l\u2236%M %p");
+            }
+        }
+        return date.toLocaleFormat(Shell.util_translate_time_string(format));
+    },
+
     appendTimestamp: function() {
         this._timestampTimeoutId = 0;
 
         let lastMessageTime = this._history[0].time;
         let lastMessageDate = new Date(lastMessageTime * 1000);
 
-        let timeLabel = Util.createTimeLabel(lastMessageDate);
-        timeLabel.style_class = 'chat-meta-message';
-        timeLabel.x_expand = timeLabel.y_expand = true;
-        timeLabel.x_align = timeLabel.y_align = Clutter.ActorAlign.END;
+        let timeLabel = new St.Label({ text: this._formatTimestamp(lastMessageDate),
+                                       style_class: 'chat-meta-message',
+                                       x_expand: true,
+                                       y_expand: true,
+                                       x_align: Clutter.ActorAlign.END,
+                                       y_align: Clutter.ActorAlign.END });
 
         this._lastMessageBox.add_actor(timeLabel);
 
@@ -828,4 +1103,358 @@ const ChatNotification = new Lang.Class({
     }
 });
 
+const ApproverSource = new Lang.Class({
+    Name: 'ApproverSource',
+    Extends: MessageTray.Source,
+
+    _init: function(dispatchOp, text, gicon) {
+        this._gicon = gicon;
+
+        this.parent(text);
+
+        this._dispatchOp = dispatchOp;
+
+        // Destroy the source if the channel dispatch operation is invalidated
+        // as we can't approve any more.
+        this._invalidId = dispatchOp.connect('invalidated',
+                                             Lang.bind(this, function(domain, code, msg) {
+            this.destroy();
+        }));
+    },
+
+    _createPolicy: function() {
+        return new MessageTray.NotificationApplicationPolicy('empathy');
+    },
+
+    destroy: function() {
+        if (this._invalidId != 0) {
+            this._dispatchOp.disconnect(this._invalidId);
+            this._invalidId = 0;
+        }
+
+        this.parent();
+    },
+
+    getIcon: function() {
+        return this._gicon;
+    }
+});
+
+const RoomInviteNotification = new Lang.Class({
+    Name: 'RoomInviteNotification',
+    Extends: MessageTray.Notification,
+
+    _init: function(source, dispatchOp, channel, inviter) {
+        this.parent(source,
+                    /* translators: argument is a room name like
+                     * room@jabber.org for example. */
+                    _("Invitation to %s").format(channel.get_identifier()),
+                    null,
+                    { customContent: true });
+        this.setResident(true);
+
+        /* translators: first argument is the name of a contact and the second
+         * one the name of a room. "Alice is inviting you to join room@jabber.org
+         * for example. */
+        this.addBody(_("%s is inviting you to join %s").format(inviter.get_alias(), channel.get_identifier()));
+
+        this.addAction(_("Decline"), Lang.bind(this, function() {
+            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
+                src.leave_channels_finish(result);
+            });
+            this.destroy();
+        }));
+        this.addAction(_("Accept"), Lang.bind(this, function() {
+            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
+                src.handle_with_time_finish(result);
+            });
+            this.destroy();
+        }));
+    }
+});
+
+// Audio Video
+const AudioVideoNotification = new Lang.Class({
+    Name: 'AudioVideoNotification',
+    Extends: MessageTray.Notification,
+
+    _init: function(source, dispatchOp, channel, contact, isVideo) {
+        let title = '';
+
+        if (isVideo)
+             /* translators: argument is a contact name like Alice for example. */
+            title = _("Video call from %s").format(contact.get_alias());
+        else
+             /* translators: argument is a contact name like Alice for example. */
+            title = _("Call from %s").format(contact.get_alias());
+
+        this.parent(source, title, null, { customContent: true });
+        this.setResident(true);
+
+        this.setUrgency(MessageTray.Urgency.CRITICAL);
+
+        this.addAction(_("Decline"), Lang.bind(this, function() {
+            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
+                src.leave_channels_finish(result);
+            });
+            this.destroy();
+        }));
+        /* translators: this is a button label (verb), not a noun */
+        this.addAction(_("Answer"), Lang.bind(this, function() {
+            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
+                src.handle_with_time_finish(result);
+            });
+            this.destroy();
+        }));
+    }
+});
+
+// File Transfer
+const FileTransferNotification = new Lang.Class({
+    Name: 'FileTransferNotification',
+    Extends: MessageTray.Notification,
+
+    _init: function(source, dispatchOp, channel, contact) {
+        this.parent(source,
+                    /* To translators: The first parameter is
+                     * the contact's alias and the second one is the
+                     * file name. The string will be something
+                     * like: "Alice is sending you test.ogg"
+                     */
+                    _("%s is sending you %s").format(contact.get_alias(),
+                                                     channel.get_filename()),
+                    null,
+                    { customContent: true });
+        this.setResident(true);
+
+        this.addAction(_("Decline"), Lang.bind(this, function() {
+            dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
+                src.leave_channels_finish(result);
+            });
+            this.destroy();
+        }));
+        this.addAction(_("Accept"), Lang.bind(this, function() {
+            dispatchOp.handle_with_time_async('', global.get_current_time(), function(src, result) {
+                src.handle_with_time_finish(result);
+            });
+            this.destroy();
+        }));
+    }
+});
+
+// Subscription request
+const SubscriptionRequestNotification = new Lang.Class({
+    Name: 'SubscriptionRequestNotification',
+    Extends: MessageTray.Notification,
+
+    _init: function(source, contact) {
+        this.parent(source,
+                    /* To translators: The parameter is the contact's alias */
+                    _("%s would like permission to see when you are online").format(contact.get_alias()),
+                    null, { customContent: true });
+
+        this._contact = contact;
+        this._connection = contact.get_connection();
+
+        let layout = new St.BoxLayout({ vertical: false });
+
+        // Display avatar
+        let iconBox = new St.Bin({ style_class: 'avatar-box' });
+        iconBox._size = 48;
+
+        let textureCache = St.TextureCache.get_default();
+        let file = contact.get_avatar_file();
+
+        if (file) {
+            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+            iconBox.child = textureCache.load_file_async(file, iconBox._size, iconBox._size, scaleFactor);
+        }
+        else {
+            iconBox.child = new St.Icon({ icon_name: 'avatar-default',
+                                          icon_size: iconBox._size });
+        }
+
+        layout.add(iconBox);
+
+        // subscription request message
+        let label = new St.Label({ style_class: 'subscription-message',
+                                   text: contact.get_publish_request() });
+
+        layout.add(label);
+
+        this.addActor(layout);
+
+        this.addAction(_("Decline"), Lang.bind(this, function() {
+            contact.remove_async(function(src, result) {
+                src.remove_finish(result);
+            });
+        }));
+        this.addAction(_("Accept"), Lang.bind(this, function() {
+            // Authorize the contact and request to see his status as well
+            contact.authorize_publication_async(function(src, result) {
+                src.authorize_publication_finish(result);
+            });
+
+            contact.request_subscription_async('', function(src, result) {
+                src.request_subscription_finish(result);
+            });
+        }));
+
+        this._changedId = contact.connect('subscription-states-changed',
+            Lang.bind(this, this._subscriptionStatesChangedCb));
+        this._invalidatedId = this._connection.connect('invalidated',
+            Lang.bind(this, this.destroy));
+    },
+
+    destroy: function() {
+        if (this._changedId != 0) {
+            this._contact.disconnect(this._changedId);
+            this._changedId = 0;
+        }
+
+        if (this._invalidatedId != 0) {
+            this._connection.disconnect(this._invalidatedId);
+            this._invalidatedId = 0;
+        }
+
+        this.parent();
+    },
+
+    _subscriptionStatesChangedCb: function(contact, subscribe, publish, msg) {
+        // Destroy the notification if the subscription request has been
+        // answered
+        if (publish != Tp.SubscriptionState.ASK)
+            this.destroy();
+    }
+});
+
+// Messages from empathy/libempathy/empathy-utils.c
+// create_errors_to_message_hash()
+
+/* Translator note: these should be the same messages that are
+ * used in Empathy, so just copy and paste from there. */
+let _connectionErrorMessages = {};
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.NETWORK_ERROR)]
+  = _("Network error");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.AUTHENTICATION_FAILED)]
+  = _("Authentication failed");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ENCRYPTION_ERROR)]
+  = _("Encryption error");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_NOT_PROVIDED)]
+  = _("Certificate not provided");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_UNTRUSTED)]
+  = _("Certificate untrusted");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_EXPIRED)]
+  = _("Certificate expired");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_NOT_ACTIVATED)]
+  = _("Certificate not activated");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_HOSTNAME_MISMATCH)]
+  = _("Certificate hostname mismatch");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_FINGERPRINT_MISMATCH)]
+  = _("Certificate fingerprint mismatch");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_SELF_SIGNED)]
+  = _("Certificate self-signed");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CANCELLED)]
+  = _("Status is set to offline");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ENCRYPTION_NOT_AVAILABLE)]
+  = _("Encryption is not available");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INVALID)]
+  = _("Certificate is invalid");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REFUSED)]
+  = _("Connection has been refused");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_FAILED)]
+  = _("Connection can't be established");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_LOST)]
+  = _("Connection has been lost");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ALREADY_CONNECTED)]
+  = _("This account is already connected to the server");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REPLACED)]
+  = _("Connection has been replaced by a new connection using the same resource");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.REGISTRATION_EXISTS)]
+  = _("The account already exists on the server");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)]
+  = _("Server is currently too busy to handle the connection");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_REVOKED)]
+  = _("Certificate has been revoked");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)]
+  = _("Certificate uses an insecure cipher algorithm or is cryptographically weak");
+_connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXCEEDED)]
+  = _("The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library");
+_connectionErrorMessages['org.freedesktop.DBus.Error.NoReply']
+  = _("Internal error");
+
+const AccountNotification = new Lang.Class({
+    Name: 'AccountNotification',
+    Extends: MessageTray.Notification,
+
+    _init: function(source, account, connectionError) {
+        this.parent(source,
+                    /* translators: argument is the account name, like
+                     * name@jabber.org for example. */
+                    _("Unable to connect to %s").format(account.get_display_name()),
+                    this._getMessage(connectionError));
+
+        this._account = account;
+
+        this.addAction(_("View account"), Lang.bind(this, function() {
+            let cmd = 'empathy-accounts --select-account=' +
+                account.get_path_suffix();
+            let app_info = Gio.app_info_create_from_commandline(cmd, null, 0);
+            app_info.launch([], global.create_app_launch_context(0, -1));
+        }));
+
+        this._enabledId = account.connect('notify::enabled',
+                                          Lang.bind(this, function() {
+                                              if (!account.is_enabled())
+                                                  this.destroy();
+                                          }));
+
+        this._invalidatedId = account.connect('invalidated',
+                                              Lang.bind(this, this.destroy));
+
+        this._connectionStatusId = account.connect('notify::connection-status',
+            Lang.bind(this, function() {
+                let status = account.connection_status;
+                if (status == Tp.ConnectionStatus.CONNECTED) {
+                    this.destroy();
+                } else if (status == Tp.ConnectionStatus.DISCONNECTED) {
+                    let connectionError = account.connection_error;
+
+                    if (connectionError == Tp.error_get_dbus_name(Tp.Error.CANCELLED))
+                        this.destroy();
+                    else
+                        this.update(this.title, this._getMessage(connectionError));
+                }
+            }));
+    },
+
+    _getMessage: function(connectionError) {
+        let message;
+        if (connectionError in _connectionErrorMessages) {
+            message = _connectionErrorMessages[connectionError];
+        } else {
+            message = _("Unknown reason");
+        }
+        return message;
+    },
+
+    destroy: function() {
+        if (this._enabledId != 0) {
+            this._account.disconnect(this._enabledId);
+            this._enabledId = 0;
+        }
+
+        if (this._invalidatedId != 0) {
+            this._account.disconnect(this._invalidatedId);
+            this._invalidatedId = 0;
+        }
+
+        if (this._connectionStatusId != 0) {
+            this._account.disconnect(this._connectionStatusId);
+            this._connectionStatusId = 0;
+        }
+
+        this.parent();
+    }
+});
 const Component = TelepathyClient;

js/ui/ctrlAltTab.js

@@ -100,7 +100,7 @@ const CtrlAltTabManager = new Lang.Class({
                     if (app)
                         icon = app.create_icon_texture(POPUP_APPICON_SIZE);
                     else
-                        icon = textureCache.bind_cairo_surface_property(windows[i], 'icon');
+                        icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
                 }
 
                 items.push({ name: windows[i].title,

js/ui/dash.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Signals = imports.signals;
 const Lang = imports.lang;
@@ -270,9 +269,6 @@ const ShowAppsIcon = new Lang.Class({
         if (app == null)
             return false;
 
-        if (!this._settings.is_writable('favorite-apps'))
-            return false;
-
         let id = app.get_id();
         let isFavorite = AppFavorites.getAppFavorites().isFavorite(id);
         return isFavorite;
@@ -428,8 +424,6 @@ const Dash = new Lang.Class({
 
         this._workId = Main.initializeDeferredWork(this._box, Lang.bind(this, this._redisplay));
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this._appSystem = Shell.AppSystem.get_default();
 
         this._appSystem.connect('installed-changed', Lang.bind(this, function() {
@@ -519,13 +513,10 @@ const Dash = new Lang.Class({
             this._syncLabel(item, appIcon);
         }));
 
-        let id = Main.overview.connect('hiding', Lang.bind(this, function() {
+        Main.overview.connect('hiding', Lang.bind(this, function() {
             this._labelShowing = false;
             item.hideLabel();
         }));
-        item.child.connect('destroy', function() {
-            Main.overview.disconnect(id);
-        });
 
         if (appIcon) {
             appIcon.connect('sync-tooltip', Lang.bind(this, function() {
@@ -538,17 +529,14 @@ const Dash = new Lang.Class({
         let appIcon = new AppDisplay.AppIcon(app,
                                              { setSizeManually: true,
                                                showLabel: false });
-        if (appIcon._draggable) {
-            appIcon._draggable.connect('drag-begin',
-                                       Lang.bind(this, function() {
-                                           appIcon.actor.opacity = 50;
-                                       }));
-            appIcon._draggable.connect('drag-end',
-                                       Lang.bind(this, function() {
-                                           appIcon.actor.opacity = 255;
-                                       }));
-        }
-
+        appIcon._draggable.connect('drag-begin',
+                                   Lang.bind(this, function() {
+                                       appIcon.actor.opacity = 50;
+                                   }));
+        appIcon._draggable.connect('drag-end',
+                                   Lang.bind(this, function() {
+                                       appIcon.actor.opacity = 255;
+                                   }));
         appIcon.connect('menu-state-changed',
                         Lang.bind(this, function(appIcon, opened) {
                             this._itemMenuStateChanged(item, opened);
@@ -862,9 +850,6 @@ const Dash = new Lang.Class({
         if (app == null || app.is_window_backed())
             return DND.DragMotionResult.NO_DROP;
 
-        if (!this._settings.is_writable('favorite-apps'))
-            return DND.DragMotionResult.NO_DROP;
-
         let favorites = AppFavorites.getAppFavorites().getFavorites();
         let numFavorites = favorites.length;
 
@@ -941,9 +926,6 @@ const Dash = new Lang.Class({
             return false;
         }
 
-        if (!this._settings.is_writable('favorite-apps'))
-            return false;
-
         let id = app.get_id();
 
         let favorites = AppFavorites.getAppFavorites().getFavoriteMap();

js/ui/dateMenu.js

@@ -4,8 +4,6 @@ const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const GnomeDesktop = imports.gi.GnomeDesktop;
 const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
-const GWeather = imports.gi.GWeather;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Cairo = imports.cairo;
@@ -21,293 +19,24 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Calendar = imports.ui.calendar;
 
-function _isToday(date) {
-    let now = new Date();
-    return now.getYear() == date.getYear() &&
-           now.getMonth() == date.getMonth() &&
-           now.getDate() == date.getDate();
+const N_ = function(s) { return s; };
+
+function _onVertSepRepaint(area) {
+    let cr = area.get_context();
+    let themeNode = area.get_theme_node();
+    let [width, height] = area.get_surface_size();
+    let stippleColor = themeNode.get_color('-stipple-color');
+    let stippleWidth = themeNode.get_length('-stipple-width');
+    let x = Math.floor(width/2) + 0.5;
+    cr.moveTo(x, 0);
+    cr.lineTo(x, height);
+    Clutter.cairo_set_source_color(cr, stippleColor);
+    cr.setDash([1, 3], 1); // Hard-code for now
+    cr.setLineWidth(stippleWidth);
+    cr.stroke();
+    cr.$dispose();
 }
 
-const TodayButton = new Lang.Class({
-    Name: 'TodayButton',
-
-    _init: function(calendar) {
-        // Having the ability to go to the current date if the user is already
-        // on the current date can be confusing. So don't make the button reactive
-        // until the selected date changes.
-        this.actor = new St.Button({ style_class: 'datemenu-today-button',
-                                     x_align: St.Align.START,
-                                     can_focus: true,
-                                     reactive: false
-                                   });
-        this.actor.connect('clicked', Lang.bind(this,
-            function() {
-                this._calendar.setDate(new Date(), false);
-            }));
-
-        let hbox = new St.BoxLayout({ vertical: true });
-        this.actor.add_actor(hbox);
-
-        this._dayLabel = new St.Label({ style_class: 'day-label',
-                                        x_align: Clutter.ActorAlign.START });
-        hbox.add_actor(this._dayLabel);
-
-        this._dateLabel = new St.Label({ style_class: 'date-label' });
-        hbox.add_actor(this._dateLabel);
-
-        this._calendar = calendar;
-        this._calendar.connect('selected-date-changed', Lang.bind(this,
-            function(calendar, date) {
-                // Make the button reactive only if the selected date is not the
-                // current date.
-                this.actor.reactive = !_isToday(date)
-            }));
-    },
-
-    setDate: function(date) {
-        this._dayLabel.set_text(date.toLocaleFormat('%A'));
-
-        /* Translators: This is the date format to use when the calendar popup is
-         * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-         */
-        let dateFormat = Shell.util_translate_time_string (N_("%B %e %Y"));
-        this._dateLabel.set_text(date.toLocaleFormat(dateFormat));
-
-        /* Translators: This is the accessible name of the date button shown
-         * below the time in the shell; it should combine the weekday and the
-         * date, e.g. "Tuesday February 17 2015".
-         */
-        let dateFormat = Shell.util_translate_time_string (N_("%A %B %e %Y"));
-        this.actor.accessible_name = date.toLocaleFormat(dateFormat);
-    }
-});
-
-const WorldClocksSection = new Lang.Class({
-    Name: 'WorldClocksSection',
-
-    _init: function() {
-        this._clock = new GnomeDesktop.WallClock();
-        this._settings = null;
-        this._clockNotifyId = 0;
-        this._changedId = 0;
-
-        this._locations = [];
-
-        this.actor = new St.Button({ style_class: 'world-clocks-button',
-                                     x_fill: true,
-                                     can_focus: true });
-        this.actor.connect('clicked', Lang.bind(this,
-            function() {
-                let app = this._getClockApp();
-                app.activate();
-
-                Main.overview.hide();
-                Main.panel.closeCalendar();
-            }));
-
-        let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
-        this._grid = new St.Widget({ style_class: 'world-clocks-grid',
-                                     layout_manager: layout });
-        layout.hookup_style(this._grid);
-
-        this.actor.child = this._grid;
-
-        Shell.AppSystem.get_default().connect('installed-changed',
-                                              Lang.bind(this, this._sync));
-        this._sync();
-    },
-
-    _getClockApp: function() {
-        return Shell.AppSystem.get_default().lookup_app('org.gnome.clocks.desktop');
-    },
-
-    _sync: function() {
-        this.actor.visible = (this._getClockApp() != null);
-
-        if (this.actor.visible) {
-            if (!this._settings) {
-                this._settings = new Gio.Settings({ schema_id: 'org.gnome.clocks' });
-                this._changedId =
-                    this._settings.connect('changed::world-clocks',
-                                           Lang.bind(this, this._clocksChanged));
-                this._clocksChanged();
-            }
-        } else {
-            if (this._settings)
-                this._settings.disconnect(this._changedId);
-            this._settings = null;
-            this._changedId = 0;
-        }
-    },
-
-    _clocksChanged: function() {
-        this._grid.destroy_all_children();
-        this._locations = [];
-
-        let world = GWeather.Location.get_world();
-        let clocks = this._settings.get_value('world-clocks').deep_unpack();
-        for (let i = 0; i < clocks.length; i++) {
-            let l = world.deserialize(clocks[i].location);
-            this._locations.push({ location: l });
-        }
-
-        this._locations.sort(function(a, b) {
-            return a.location.get_timezone().get_offset() -
-                   b.location.get_timezone().get_offset();
-        });
-
-        let layout = this._grid.layout_manager;
-        let title = (this._locations.length == 0) ? _("Add world clocks…")
-                                                  : _("World Clocks");
-        let header = new St.Label({ style_class: 'world-clocks-header',
-                                    x_align: Clutter.ActorAlign.START,
-                                    text: title });
-        layout.attach(header, 0, 0, 2, 1);
-        this.actor.label_actor = header;
-
-        for (let i = 0; i < this._locations.length; i++) {
-            let l = this._locations[i].location;
-
-            let label = new St.Label({ style_class: 'world-clocks-city',
-                                       text: l.get_city_name(),
-                                       x_align: Clutter.ActorAlign.START,
-                                       x_expand: true });
-
-            let time = new St.Label({ style_class: 'world-clocks-time',
-                                      x_align: Clutter.ActorAlign.END,
-                                      x_expand: true });
-
-            if (this._grid.text_direction == Clutter.TextDirection.RTL) {
-                layout.attach(time, 0, i + 1, 1, 1);
-                layout.attach(label, 1, i + 1, 1, 1);
-            } else {
-                layout.attach(label, 0, i + 1, 1, 1);
-                layout.attach(time, 1, i + 1, 1, 1);
-            }
-
-            this._locations[i].actor = time;
-        }
-
-        if (this._grid.get_n_children() > 1) {
-            if (!this._clockNotifyId)
-                this._clockNotifyId =
-                    this._clock.connect('notify::clock', Lang.bind(this, this._updateLabels));
-            this._updateLabels();
-        } else {
-            if (this._clockNotifyId)
-                this._clock.disconnect(this._clockNotifyId);
-            this._clockNotifyId = 0;
-        }
-    },
-
-    _updateLabels: function() {
-        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 = GLib.DateTime.new_now(tz);
-            l.actor.text = Util.formatTime(now, { timeOnly: true });
-        }
-    }
-});
-
-const MessagesIndicator = new Lang.Class({
-    Name: 'MessagesIndicator',
-
-    _init: function() {
-        this.actor = new St.Label({ text: '⚫', visible: false, y_expand: true,
-                                    y_align: Clutter.ActorAlign.CENTER });
-
-        this._sources = [];
-
-        Main.messageTray.connect('source-added', Lang.bind(this, this._onSourceAdded));
-        Main.messageTray.connect('source-removed', Lang.bind(this, this._onSourceRemoved));
-        Main.messageTray.connect('queue-changed', Lang.bind(this, this._updateCount));
-
-        let sources = Main.messageTray.getSources();
-        sources.forEach(Lang.bind(this, function(source) { this._onSourceAdded(null, source); }));
-    },
-
-    _onSourceAdded: function(tray, source) {
-        source.connect('count-updated', Lang.bind(this, this._updateCount));
-        this._sources.push(source);
-        this._updateCount();
-    },
-
-    _onSourceRemoved: function(tray, source) {
-        this._sources.splice(this._sources.indexOf(source), 1);
-        this._updateCount();
-    },
-
-    _updateCount: function() {
-        let count = 0;
-        this._sources.forEach(Lang.bind(this,
-            function(source) {
-                count += source.unseenCount;
-            }));
-        count -= Main.messageTray.queueCount;
-
-        this.actor.visible = (count > 0);
-    }
-});
-
-const IndicatorPad = new Lang.Class({
-    Name: 'IndicatorPad',
-    Extends: St.Widget,
-
-    _init: function(actor) {
-        this._source = actor;
-        this._source.connect('notify::visible',
-                             Lang.bind(this, this.queue_relayout));
-        this.parent();
-    },
-
-    vfunc_get_preferred_width: function(container, forHeight) {
-        if (this._source.visible)
-            return this._source.get_preferred_width(forHeight);
-        return [0, 0];
-    },
-
-    vfunc_get_preferred_height: function(container, forWidth) {
-        if (this._source.visible)
-            return this._source.get_preferred_height(forWidth);
-        return [0, 0];
-    }
-});
-
-const FreezableBinLayout = new Lang.Class({
-    Name: 'FreezableBinLayout',
-    Extends: Clutter.BinLayout,
-
-    _init: function() {
-        this.parent();
-
-        this._frozen = false;
-        this._savedWidth = [NaN, NaN];
-        this._savedHeight = [NaN, NaN];
-    },
-
-    set frozen(v) {
-        if (this._frozen == v)
-            return;
-
-        this._frozen = v;
-        if (!this._frozen)
-            this.layout_changed();
-    },
-
-    vfunc_get_preferred_width: function(container, forHeight) {
-        if (!this._frozen || this._savedWidth.some(isNaN))
-            this._savedWidth = this.parent(container, forHeight);
-        return this._savedWidth;
-    },
-
-    vfunc_get_preferred_height: function(container, forWidth) {
-        if (!this._frozen || this._savedHeight.some(isNaN))
-            this._savedHeight = this.parent(container, forWidth);
-        return this._savedHeight;
-    }
-});
-
 const DateMenuButton = new Lang.Class({
     Name: 'DateMenuButton',
     Extends: PanelMenu.Button,
@@ -317,78 +46,96 @@ const DateMenuButton = new Lang.Class({
         let hbox;
         let vbox;
 
-        let menuAlignment = 0.5;
+        let menuAlignment = 0.25;
         if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
             menuAlignment = 1.0 - menuAlignment;
         this.parent(menuAlignment);
 
         this._clockDisplay = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
-        this._indicator = new MessagesIndicator();
-
-        let box = new St.BoxLayout();
-        box.add_actor(new IndicatorPad(this._indicator.actor));
-        box.add_actor(this._clockDisplay);
-        box.add_actor(this._indicator.actor);
-
         this.actor.label_actor = this._clockDisplay;
-        this.actor.add_actor(box);
+        this.actor.add_actor(this._clockDisplay);
         this.actor.add_style_class_name ('clock-display');
 
-
-        let layout = new FreezableBinLayout();
-        let bin = new St.Widget({ layout_manager: layout });
-        this.menu.box.add_child(bin);
-
         hbox = new St.BoxLayout({ name: 'calendarArea' });
-        bin.add_actor(hbox);
+        this.menu.box.add_child(hbox);
 
+        // Fill up the first column
+
+        vbox = new St.BoxLayout({vertical: true});
+        hbox.add(vbox);
+
+        // Date
+        // Having the ability to go to the current date if the user is already
+        // on the current date can be confusing. So don't make the button reactive
+        // until the selected date changes.
+        this._date = new St.Button({ style_class: 'datemenu-date-label',
+                                     reactive: false
+                                   });
+        this._date.connect('clicked',
+                           Lang.bind(this, function() {
+                               this._calendar.setDate(new Date(), false);
+                           }));
+        vbox.add(this._date, { x_fill: false  });
+
+        this._eventList = new Calendar.EventsList();
         this._calendar = new Calendar.Calendar();
+
         this._calendar.connect('selected-date-changed',
                                Lang.bind(this, function(calendar, date) {
-                                   layout.frozen = !_isToday(date);
-                                   this._messageList.setDate(date);
-                               }));
+                                  // we know this._eventList is defined here, because selected-data-changed
+                                  // only gets emitted when the user clicks a date in the calendar,
+                                  // and the calender makes those dates unclickable when instantiated with
+                                  // a null event source
+                                   this._eventList.setDate(date);
 
+                                   // Make the button reactive only if the selected date is not the current date.
+                                   this._date.can_focus = this._date.reactive = !this._isToday(date)
+                               }));
+        vbox.add(this._calendar.actor);
+
+        let separator = new PopupMenu.PopupSeparatorMenuItem();
+        vbox.add(separator.actor, { y_align: St.Align.END, expand: true, y_fill: false });
+
+        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
+        this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
+        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+
+        this._openClocksItem = new PopupMenu.PopupMenuItem(_("Open Clocks"));
+        this._openClocksItem.connect('activate', Lang.bind(this, this._onOpenClocksActivate));
+        vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+
+        Shell.AppSystem.get_default().connect('installed-changed',
+                                              Lang.bind(this, this._appInstalledChanged));
+
+        item = this.menu.addSettingsAction(_("Date & Time Settings"), 'gnome-datetime-panel.desktop');
+        if (item) {
+            item.actor.show_on_set_parent = false;
+            item.actor.reparent(vbox);
+            this._dateAndTimeSeparator = separator;
+        }
+
+        this._separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
+                                               pseudo_class: 'highlighted' });
+        this._separator.connect('repaint', Lang.bind(this, _onVertSepRepaint));
+        hbox.add(this._separator);
+
+        // Fill up the second column
+        hbox.add(this._eventList.actor, { expand: true, y_fill: false, y_align: St.Align.START });
+
+        // Whenever the menu is opened, select today
         this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
-            // Whenever the menu is opened, select today
             if (isOpen) {
                 let now = new Date();
                 this._calendar.setDate(now);
-                this._date.setDate(now);
-                this._messageList.setDate(now);
+
+                /* Translators: This is the date format to use when the calendar popup is
+                 * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
+                 */
+                let dateFormat = Shell.util_translate_time_string (N_("%A %B %e, %Y"));
+                this._date.set_label(now.toLocaleFormat(dateFormat));
             }
-            // Block notification banners while the menu is open
-            Main.messageTray.bannerBlocked = isOpen;
         }));
 
-        // Fill up the first column
-        this._messageList = new Calendar.MessageList();
-        hbox.add(this._messageList.actor, { expand: true, y_fill: false, y_align: St.Align.START });
-
-        // Fill up the second column
-        vbox = new St.BoxLayout({ style_class: 'datemenu-calendar-column',
-                                  vertical: true });
-        hbox.add(vbox);
-
-        this._date = new TodayButton(this._calendar);
-        vbox.add_actor(this._date.actor);
-
-        vbox.add(this._calendar.actor);
-
-        this._displaysSection = new St.ScrollView({ style_class: 'datemenu-displays-section vfade',
-                                                    x_expand: true, x_fill: true,
-                                                    overlay_scrollbars: true });
-        this._displaysSection.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        vbox.add_actor(this._displaysSection);
-
-        let displaysBox = new St.BoxLayout({ vertical: true,
-                                             style_class: 'datemenu-displays-box' });
-        this._displaysSection.add_actor(displaysBox);
-
-        this._clocksItem = new WorldClocksSection();
-        displaysBox.add(this._clocksItem.actor, { x_fill: true });
-
-
         // Done with hbox for calendar and event list
 
         this._clock = new GnomeDesktop.WallClock();
@@ -398,6 +145,36 @@ const DateMenuButton = new Lang.Class({
         this._sessionUpdated();
     },
 
+    _isToday: function(date) {
+        let now = new Date();
+        return now.getYear() == date.getYear() &&
+               now.getMonth() == date.getMonth() &&
+               now.getDate() == date.getDate();
+    },
+
+    _appInstalledChanged: function() {
+        this._calendarApp = undefined;
+        this._updateEventsVisibility();
+    },
+
+    _updateEventsVisibility: function() {
+        let visible = this._eventSource.hasCalendars;
+        this._openCalendarItem.actor.visible = visible &&
+            (this._getCalendarApp() != null);
+        this._openClocksItem.actor.visible = visible &&
+            (this._getClockApp() != null);
+        this._separator.visible = visible;
+        this._eventList.actor.visible = visible;
+        if (visible) {
+            let alignment = 0.25;
+            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+                alignment = 1.0 - alignment;
+            this.menu._arrowAlignment = alignment;
+        } else {
+            this.menu._arrowAlignment = 0.5;
+        }
+    },
+
     _getEventSource: function() {
         return new Calendar.DBusEventSource();
     },
@@ -407,9 +184,12 @@ const DateMenuButton = new Lang.Class({
             this._eventSource.destroy();
 
         this._calendar.setEventSource(eventSource);
-        this._messageList.setEventSource(eventSource);
+        this._eventList.setEventSource(eventSource);
 
         this._eventSource = eventSource;
+        this._eventSource.connect('notify::has-calendars', Lang.bind(this, function() {
+            this._updateEventsVisibility();
+        }));
     },
 
     _sessionUpdated: function() {
@@ -421,10 +201,44 @@ const DateMenuButton = new Lang.Class({
             eventSource = new Calendar.EmptyEventSource();
         }
         this._setEventSource(eventSource);
+        this._updateEventsVisibility();
 
-        // Displays are not actually expected to launch Settings when activated
-        // but the corresponding app (clocks, weather); however we can consider
-        // that display-specific settings, so re-use "allowSettings" here ...
-        this._displaysSection.visible = Main.sessionMode.allowSettings;
+        // This needs to be handled manually, as the code to
+        // autohide separators doesn't work across the vbox
+        this._dateAndTimeSeparator.actor.visible = Main.sessionMode.allowSettings;
+    },
+
+    _getCalendarApp: function() {
+        if (this._calendarApp !== undefined)
+            return this._calendarApp;
+
+        let apps = Gio.AppInfo.get_recommended_for_type('text/calendar');
+        if (apps && (apps.length > 0)) {
+            let app = Gio.AppInfo.get_default_for_type('text/calendar', false);
+            let defaultInRecommended = apps.some(function(a) { return a.equal(app); });
+            this._calendarApp = defaultInRecommended ? app : apps[0];
+        } else {
+            this._calendarApp = null;
+        }
+        return this._calendarApp;
+    },
+
+    _getClockApp: function() {
+        return Shell.AppSystem.get_default().lookup_app('org.gnome.clocks.desktop');
+    },
+
+    _onOpenCalendarActivate: function() {
+        this.menu.close();
+
+        let app = this._getCalendarApp();
+        if (app.get_id() == 'evolution.desktop')
+            app = Gio.DesktopAppInfo.new('evolution-calendar.desktop');
+        app.launch([], global.create_app_launch_context(0, -1));
+    },
+
+    _onOpenClocksActivate: function() {
+        this.menu.close();
+        let app = this._getClockApp();
+        app.activate();
     }
 });

js/ui/edgeDragAction.js

@@ -6,8 +6,6 @@ const Meta = imports.gi.Meta;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 
-const Main = imports.ui.main;
-
 const EDGE_THRESHOLD = 20;
 const DRAG_DISTANCE = 80;
 
@@ -15,10 +13,9 @@ const EdgeDragAction = new Lang.Class({
     Name: 'EdgeDragAction',
     Extends: Clutter.GestureAction,
 
-    _init : function(side, allowedModes) {
+    _init : function(side) {
         this.parent();
         this._side = side;
-        this._allowedModes = allowedModes;
         this.set_n_touch_points(1);
 
         global.display.connect('grab-op-begin', Lang.bind(this, function() {
@@ -37,9 +34,6 @@ const EdgeDragAction = new Lang.Class({
         if (this.get_n_current_points() == 0)
             return false;
 
-        if (!(this._allowedModes & Main.actionMode))
-            return false;
-
         let [x, y] = this.get_press_coords(0);
         let monitorRect = this._getMonitorRect(x, y);
 

js/ui/environment.js

@@ -77,7 +77,6 @@ function init() {
     window._ = Gettext.gettext;
     window.C_ = Gettext.pgettext;
     window.ngettext = Gettext.ngettext;
-    window.N_ = function(s) { return s; };
 
     // Miscellaneous monkeypatching
     _patchContainerClass(St.BoxLayout);

js/ui/extensionDownloader.js

@@ -203,16 +203,14 @@ const InstallExtensionDialog = new Lang.Class({
 
         let message = _("Download and install “%s” from extensions.gnome.org?").format(info.name);
 
-        let box = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
-                                     vertical: false });
+        let box = new St.BoxLayout();
         this.contentLayout.add(box);
 
         let gicon = new Gio.FileIcon({ file: Gio.File.new_for_uri(REPOSITORY_URL_BASE + info.icon) })
         let icon = new St.Icon({ gicon: gicon });
         box.add(icon);
 
-        let label = new St.Label({ style_class: 'prompt-dialog-headline',
-                                   text: message });
+        let label = new St.Label({ text: message });
         box.add(label);
     },
 

js/ui/ibusCandidatePopup.js

@@ -41,11 +41,11 @@ const CandidateArea = new Lang.Class({
 
         this._buttonBox = new St.BoxLayout({ style_class: 'candidate-page-button-box' });
 
-        this._previousButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-previous button' });
+        this._previousButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-previous' });
         this._previousButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
         this._buttonBox.add(this._previousButton, { expand: true });
 
-        this._nextButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-next button' });
+        this._nextButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-next' });
         this._nextButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
         this._buttonBox.add(this._nextButton, { expand: true });
 

js/ui/iconGrid.js

@@ -278,20 +278,6 @@ const IconGrid = new Lang.Class({
         this._grid.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this._grid.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this._grid.connect('allocate', Lang.bind(this, this._allocate));
-        this._grid.connect('actor-added', Lang.bind(this, this._childAdded));
-        this._grid.connect('actor-removed', Lang.bind(this, this._childRemoved));
-    },
-
-    _keyFocusIn: function(actor) {
-        this.emit('key-focus-in', actor);
-    },
-
-    _childAdded: function(grid, child) {
-        child._iconGridKeyFocusInId = child.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
-    },
-
-    _childRemoved: function(grid, child) {
-        child.disconnect(child._iconGridKeyFocusInId);
     },
 
     _getPreferredWidth: function (grid, forHeight, alloc) {
@@ -682,6 +668,10 @@ const IconGrid = new Lang.Class({
         this._grid.destroy_all_children();
     },
 
+    _keyFocusIn: function(actor) {
+        this.emit('key-focus-in', actor._associatedItem);
+    },
+
     addItem: function(item, index) {
         if (!item.icon instanceof BaseIcon)
             throw new Error('Only items with a BaseIcon icon property can be added to IconGrid');
@@ -691,9 +681,26 @@ const IconGrid = new Lang.Class({
             this._grid.insert_child_at_index(item.actor, index);
         else
             this._grid.add_actor(item.actor);
+
+        // Maybe the item actor acts as a container, so ask the item if
+        // it has a specific actor to track focus
+        let focusReceiver = item.actor;
+        if (item.getFocusReceiver)
+            focusReceiver = item.getFocusReceiver();
+
+        focusReceiver._associatedItem = item.actor;
+        focusReceiver._iconGridKeyFocusInId = focusReceiver.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
     },
 
     removeItem: function(item) {
+        let focusReceiver = item.actor;
+        if (item.getFocusReceiver)
+            focusReceiver = item.getFocusReceiver();
+
+
+        focusReceiver._associatedItem = null;
+        focusReceiver.disconnect(focusReceiver._iconGridKeyFocusInId);
+
         this._grid.remove_child(item.actor);
     },
 

js/ui/layout.js

@@ -21,6 +21,11 @@ const STARTUP_ANIMATION_TIME = 0.5;
 const KEYBOARD_ANIMATION_TIME = 0.15;
 const BACKGROUND_FADE_ANIMATION_TIME = 1.0;
 
+// The message tray takes this much pressure
+// in the pressure barrier at once to release it.
+const MESSAGE_TRAY_PRESSURE_THRESHOLD = 250; // pixels
+const MESSAGE_TRAY_PRESSURE_TIMEOUT = 1000; // ms
+
 const HOT_CORNER_PRESSURE_THRESHOLD = 100; // pixels
 const HOT_CORNER_PRESSURE_TIMEOUT = 1000; // ms
 
@@ -45,16 +50,11 @@ const MonitorConstraint = new Lang.Class({
                  'index': GObject.ParamSpec.int('index',
                                                 'Monitor index', 'Track specific monitor',
                                                 GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
-                                                -1, 64, -1),
-                 'work-area': GObject.ParamSpec.boolean('work-area',
-                                                        'Work-area', 'Track monitor\'s work-area',
-                                                        GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
-                                                        false)},
+                                                -1, 64, -1)},
 
     _init: function(props) {
         this._primary = false;
         this._index = -1;
-        this._workArea = false;
 
         this.parent(props);
     },
@@ -84,19 +84,6 @@ const MonitorConstraint = new Lang.Class({
         this.notify('index');
     },
 
-    get work_area() {
-        return this._workArea;
-    },
-
-    set work_area(v) {
-        if (v == this._workArea)
-            return;
-        this._workArea = v;
-        if (this.actor)
-            this.actor.queue_relayout();
-        this.notify('work-area');
-    },
-
     vfunc_set_actor: function(actor) {
         if (actor) {
             if (!this._monitorsChangedId) {
@@ -104,21 +91,10 @@ const MonitorConstraint = new Lang.Class({
                     this.actor.queue_relayout();
                 }));
             }
-
-            if (!this._workareasChangedId) {
-                this._workareasChangedId = global.screen.connect('workareas-changed', Lang.bind(this, function() {
-                    if (this._workArea)
-                        this.actor.queue_relayout();
-                }));
-            }
         } else {
             if (this._monitorsChangedId)
                 Main.layoutManager.disconnect(this._monitorsChangedId);
             this._monitorsChangedId = 0;
-
-            if (this._workareasChangedId)
-                global.screen.disconnect(this._workareasChangedId);
-            this._workareasChangedId = 0;
         }
 
         this.parent(actor);
@@ -128,21 +104,15 @@ const MonitorConstraint = new Lang.Class({
         if (!this._primary && this._index < 0)
             return;
 
-        let index;
-        if (this._primary)
-            index = Main.layoutManager.primaryIndex;
-        else
-            index = Math.min(this._index, Main.layoutManager.monitors.length - 1);
-
-        let rect;
-        if (this._workArea) {
-            let ws = global.screen.get_workspace_by_index(0);
-            rect = ws.get_work_area_for_monitor(index);
+        let monitor;
+        if (this._primary) {
+            monitor = Main.layoutManager.primaryMonitor;
         } else {
-            rect = Main.layoutManager.monitors[index];
+            let index = Math.min(this._index, Main.layoutManager.monitors.length - 1);
+            monitor = Main.layoutManager.monitors[index];
         }
 
-        actorBox.init_rect(rect.x, rect.y, rect.width, rect.height);
+        actorBox.init_rect(monitor.x, monitor.y, monitor.width, monitor.height);
     }
 });
 
@@ -165,7 +135,6 @@ const Monitor = new Lang.Class({
 const defaultParams = {
     trackFullscreen: false,
     affectsStruts: false,
-    affectsInputRegion: true
 };
 
 const LayoutManager = new Lang.Class({
@@ -180,6 +149,7 @@ const LayoutManager = new Lang.Class({
 
         this._keyboardIndex = -1;
         this._rightPanelBarrier = null;
+        this._trayBarrier = null;
 
         this._inOverview = false;
         this._updateRegionIdle = 0;
@@ -236,6 +206,11 @@ const LayoutManager = new Lang.Class({
         this.panelBox.connect('allocation-changed',
                               Lang.bind(this, this._panelBoxChanged));
 
+        this.trayBox = new St.Widget({ name: 'trayBox',
+                                       layout_manager: new Clutter.BinLayout() }); 
+        this.addChrome(this.trayBox);
+        this._setupTrayPressure();
+
         this.modalDialogGroup = new St.Widget({ name: 'modalDialogGroup',
                                                 layout_manager: new Clutter.BinLayout() });
         this.uiGroup.add_actor(this.modalDialogGroup);
@@ -448,6 +423,10 @@ const LayoutManager = new Lang.Class({
         this.panelBox.set_size(this.primaryMonitor.width, -1);
 
         this.keyboardIndex = this.primaryIndex;
+
+        this.trayBox.set_position(this.bottomMonitor.x,
+                                  this.bottomMonitor.y + this.bottomMonitor.height);
+        this.trayBox.set_size(this.bottomMonitor.width, -1);
     },
 
     _panelBoxChanged: function() {
@@ -476,9 +455,50 @@ const LayoutManager = new Lang.Class({
         }
     },
 
+    _setupTrayPressure: function() {
+        this._trayPressure = new PressureBarrier(MESSAGE_TRAY_PRESSURE_THRESHOLD,
+                                                 MESSAGE_TRAY_PRESSURE_TIMEOUT,
+                                                 Shell.KeyBindingMode.NORMAL |
+                                                 Shell.KeyBindingMode.OVERVIEW);
+        this._trayPressure.setEventFilter(this._trayBarrierEventFilter);
+        this._trayPressure.connect('trigger', function(barrier) {
+            if (Main.layoutManager.bottomMonitor.inFullscreen)
+                return;
+
+            Main.messageTray.openTray();
+        });
+    },
+
+    _updateTrayBarrier: function() {
+        let monitor = this.bottomMonitor;
+
+        if (this._trayBarrier) {
+            this._trayPressure.removeBarrier(this._trayBarrier);
+            this._trayBarrier.destroy();
+            this._trayBarrier = null;
+        }
+
+        this._trayBarrier = new Meta.Barrier({ display: global.display,
+                                               x1: monitor.x, x2: monitor.x + monitor.width,
+                                               y1: monitor.y + monitor.height, y2: monitor.y + monitor.height,
+                                               directions: Meta.BarrierDirection.NEGATIVE_Y });
+        this._trayPressure.addBarrier(this._trayBarrier);
+    },
+
+    _trayBarrierEventFilter: function(event) {
+        // Throw out all events where the pointer was grabbed by another
+        // client, as the client that grabbed the pointer expects to have
+        // complete control over it
+        if (event.grabbed && Main.modalCount == 0)
+            return true;
+
+        return false;
+    },
+
     _monitorsChanged: function() {
         this._updateMonitors();
         this._updateBoxes();
+        this._updateTrayBarrier();
         this._updateHotCorners();
         this._updateBackgrounds();
         this._updateFullscreen();
@@ -588,6 +608,7 @@ const LayoutManager = new Lang.Class({
             // the UI group to get the correct allocation for the struts.
             this._updateRegions();
 
+            this.trayBox.hide();
             this.keyboardBox.hide();
 
             let monitor = this.primaryMonitor;
@@ -654,6 +675,7 @@ const LayoutManager = new Lang.Class({
 
         this._startingUp = false;
 
+        this.trayBox.show();
         this.keyboardBox.show();
 
         if (!Main.sessionMode.isGreeter) {
@@ -726,11 +748,10 @@ const LayoutManager = new Lang.Class({
     // @actor: an actor to add to the chrome
     // @params: (optional) additional params
     //
-    // Adds @actor to the chrome, and (unless %affectsInputRegion in
-    // @params is %false) extends the input region to include it.
-    // Changes in @actor's size, position, and visibility will
-    // automatically result in appropriate changes to the input
-    // region.
+    // Adds @actor to the chrome, and extends the input region
+    // to include it. Changes in @actor's size, position, and
+    // visibility will automatically result in appropriate changes
+    // to the input region.
     //
     // If %affectsStruts in @params is %true (and @actor is along a
     // screen edge), then @actor's size and position will also affect
@@ -932,7 +953,7 @@ const LayoutManager = new Lang.Class({
 
         for (i = 0; i < this._trackedActors.length; i++) {
             let actorData = this._trackedActors[i];
-            if (!(actorData.affectsInputRegion && wantsInputRegion) && !actorData.affectsStruts)
+            if (!wantsInputRegion && !actorData.affectsStruts)
                 continue;
 
             let [x, y] = actorData.actor.get_transformed_position();
@@ -942,7 +963,7 @@ const LayoutManager = new Lang.Class({
             w = Math.round(w);
             h = Math.round(h);
 
-            if (actorData.affectsInputRegion && wantsInputRegion && actorData.actor.get_paint_visibility())
+            if (wantsInputRegion && actorData.actor.get_paint_visibility())
                 rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h }));
 
             if (actorData.affectsStruts) {
@@ -952,39 +973,46 @@ const LayoutManager = new Lang.Class({
                 let y1 = Math.max(y, 0);
                 let y2 = Math.min(y + h, global.screen_height);
 
-                // Metacity wants to know what side of the monitor the
-                // strut is considered to be attached to. First, we find
-                // the monitor that contains the strut. If the actor is
+                // NetWM struts are not really powerful enought to handle
+                // a multi-monitor scenario, they only describe what happens
+                // around the outer sides of the full display region. However
+                // it can describe a partial region along each side, so
+                // we can support having the struts only affect the
+                // primary monitor. This should be enough as we only have
+                // chrome affecting the struts on the primary monitor so
+                // far.
+                //
+                // Metacity wants to know what side of the screen the
+                // strut is considered to be attached to. If the actor is
                 // only touching one edge, or is touching the entire
-                // border of that monitor, then it's obvious which side
-                // to call it. If it's in a corner, we pick a side
-                // arbitrarily. If it doesn't touch any edges, or it
-                // spans the width/height across the middle of the
-                // screen, then we don't create a strut for it at all.
-
-                let monitor = this.findMonitorForActor(actorData.actor);
+                // border of the primary monitor, then it's obvious which
+                // side to call it. If it's in a corner, we pick a side
+                // arbitrarily. If it doesn't touch any edges, or it spans
+                // the width/height across the middle of the screen, then
+                // we don't create a strut for it at all.
                 let side;
-                if (x1 <= monitor.x && x2 >= monitor.x + monitor.width) {
-                    if (y1 <= monitor.y)
+                let primary = this.primaryMonitor;
+                if (x1 <= primary.x && x2 >= primary.x + primary.width) {
+                    if (y1 <= primary.y)
                         side = Meta.Side.TOP;
-                    else if (y2 >= monitor.y + monitor.height)
+                    else if (y2 >= primary.y + primary.height)
                         side = Meta.Side.BOTTOM;
                     else
                         continue;
-                } else if (y1 <= monitor.y && y2 >= monitor.y + monitor.height) {
-                    if (x1 <= monitor.x)
+                } else if (y1 <= primary.y && y2 >= primary.y + primary.height) {
+                    if (x1 <= 0)
                         side = Meta.Side.LEFT;
-                    else if (x2 >= monitor.x + monitor.width)
+                    else if (x2 >= primary.x + primary.width)
                         side = Meta.Side.RIGHT;
                     else
                         continue;
-                } else if (x1 <= monitor.x)
+                } else if (x1 <= 0)
                     side = Meta.Side.LEFT;
-                else if (y1 <= monitor.y)
+                else if (y1 <= 0)
                     side = Meta.Side.TOP;
-                else if (x2 >= monitor.x + monitor.width)
+                else if (x2 >= global.screen_width)
                     side = Meta.Side.RIGHT;
-                else if (y2 >= monitor.y + monitor.height)
+                else if (y2 >= global.screen_height)
                     side = Meta.Side.BOTTOM;
                 else
                     continue;
@@ -1039,8 +1067,8 @@ const HotCorner = new Lang.Class({
 
         this._pressureBarrier = new PressureBarrier(HOT_CORNER_PRESSURE_THRESHOLD,
                                                     HOT_CORNER_PRESSURE_TIMEOUT,
-                                                    Shell.ActionMode.NORMAL |
-                                                    Shell.ActionMode.OVERVIEW);
+                                                    Shell.KeyBindingMode.NORMAL |
+                                                    Shell.KeyBindingMode.OVERVIEW);
         this._pressureBarrier.connect('trigger', Lang.bind(this, this._toggleOverview));
 
         // Cache the three ripples instead of dynamically creating and destroying them.
@@ -1217,10 +1245,10 @@ const HotCorner = new Lang.Class({
 const PressureBarrier = new Lang.Class({
     Name: 'PressureBarrier',
 
-    _init: function(threshold, timeout, actionMode) {
+    _init: function(threshold, timeout, keybindingMode) {
         this._threshold = threshold;
         this._timeout = timeout;
-        this._actionMode = actionMode;
+        this._keybindingMode = keybindingMode;
         this._barriers = [];
         this._eventFilter = null;
 
@@ -1323,7 +1351,7 @@ const PressureBarrier = new Lang.Class({
             return;
 
         // Throw out all events not in the proper keybinding mode
-        if (!(this._actionMode & Main.actionMode))
+        if (!(this._keybindingMode & Main.keybindingMode))
             return;
 
         let slide = this._getDistanceAlongBarrier(barrier, event);

js/ui/legacyTray.js

@@ -1,178 +0,0 @@
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const Lang = imports.lang;
-const Layout = imports.ui.layout;
-const Main = imports.ui.main;
-const Overview = imports.ui.overview;
-const OverviewControls = imports.ui.overviewControls;
-const Tweener = imports.ui.tweener;
-
-const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
-    'bluetooth-applet': 'bluetooth',
-    'gnome-volume-control-applet': 'volume', // renamed to gnome-sound-applet
-                                             // when moved to control center
-    'gnome-sound-applet': 'volume',
-    'nm-applet': 'network',
-    'gnome-power-manager': 'battery',
-    'keyboard': 'keyboard',
-    'a11y-keyboard': 'a11y',
-    'kbd-scrolllock': 'keyboard',
-    'kbd-numlock': 'keyboard',
-    'kbd-capslock': 'keyboard',
-    'ibus-ui-gtk': 'keyboard'
-};
-
-// Offset of the original position from the bottom-right corner
-const CONCEALED_VISIBLE_FRACTION = 0.2;
-const REVEAL_ANIMATION_TIME = 0.2;
-
-const LegacyTray = new Lang.Class({
-    Name: 'LegacyTray',
-
-    _init: function() {
-        this.actor = new St.Widget({ clip_to_allocation: true,
-                                     layout_manager: new Clutter.BinLayout() });
-        let constraint = new Layout.MonitorConstraint({ primary: true,
-                                                        work_area: true });
-        this.actor.add_constraint(constraint);
-
-        this._slideLayout = new OverviewControls.SlideLayout();
-        this._slideLayout.translationX = 0;
-        this._slideLayout.slideDirection = OverviewControls.SlideDirection.LEFT;
-
-        this._slider = new St.Widget({ style_class: 'legacy-tray',
-                                       x_expand: true, y_expand: true,
-                                       x_align: Clutter.ActorAlign.START,
-                                       y_align: Clutter.ActorAlign.END,
-                                       layout_manager: this._slideLayout });
-        this.actor.add_actor(this._slider);
-
-        this._box = new St.BoxLayout();
-        this._slider.add_actor(this._box);
-
-        this._concealHandle = new St.Button({ style_class: 'legacy-tray-handle' });
-        this._concealHandle.child = new St.Icon({ icon_name: 'go-previous-symbolic' });
-        this._box.add_child(this._concealHandle);
-
-        this._iconBox = new St.BoxLayout({ style_class: 'legacy-tray-icon-box' });
-        this._box.add_actor(this._iconBox);
-
-        this._revealHandle = new St.Button({ style_class: 'legacy-tray-handle' });
-        this._revealHandle.child = new St.Icon({ icon_name: 'go-next-symbolic' });
-        this._box.add_child(this._revealHandle);
-
-        this._revealHandle.bind_property('visible',
-                                         this._concealHandle, 'visible',
-                                         GObject.BindingFlags.BIDIRECTIONAL |
-                                         GObject.BindingFlags.INVERT_BOOLEAN);
-        this._revealHandle.connect('notify::visible',
-                                   Lang.bind(this, this._sync));
-        this._revealHandle.connect('notify::hover',
-                                   Lang.bind(this ,this._sync));
-        this._revealHandle.connect('clicked', Lang.bind(this,
-            function() {
-                this._concealHandle.show();
-            }));
-        this._concealHandle.connect('clicked', Lang.bind(this,
-            function() {
-                this._revealHandle.show();
-            }));
-
-        Main.layoutManager.addChrome(this.actor, { affectsInputRegion: false });
-        Main.layoutManager.trackChrome(this._slider, { affectsInputRegion: true });
-
-        this._trayManager = new Shell.TrayManager();
-        this._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
-        this._trayManager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
-        this._trayManager.manage_screen(global.screen, this.actor);
-
-        Main.overview.connect('showing', Lang.bind(this,
-            function() {
-                Tweener.removeTweens(this._slider);
-                Tweener.addTween(this._slider, { opacity: 0,
-                                                 time: Overview.ANIMATION_TIME,
-                                                 transition: 'easeOutQuad' });
-            }));
-        Main.overview.connect('shown', Lang.bind(this, this._sync));
-        Main.overview.connect('hiding', Lang.bind(this,
-            function() {
-                this._sync();
-                Tweener.removeTweens(this._slider);
-                Tweener.addTween(this._slider, { opacity: 255,
-                                                 time: Overview.ANIMATION_TIME,
-                                                 transition: 'easeOutQuad' });
-            }));
-
-        Main.layoutManager.connect('monitors-changed',
-                                   Lang.bind(this, this._sync));
-        global.screen.connect('in-fullscreen-changed',
-                              Lang.bind(this, this._sync));
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sync));
-
-        this._sync();
-    },
-
-    _onTrayIconAdded: function(tm, icon) {
-        let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
-        if (STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass] !== undefined)
-            return;
-
-        let button = new St.Button({ child: icon,
-                                     button_mask: St.ButtonMask.ONE |
-                                                  St.ButtonMask.TWO |
-                                                  St.ButtonMask.THREE,
-                                     x_fill: true, y_fill: true });
-        button.connect('clicked',
-            function() {
-                icon.click(Clutter.get_current_event());
-            });
-
-        this._iconBox.add_actor(button);
-        this._sync();
-    },
-
-    _onTrayIconRemoved: function(tm, icon) {
-        if (!this.actor.contains(icon))
-            return;
-
-        icon.get_parent().destroy();
-        this._sync();
-    },
-
-    _sync: function() {
-        // FIXME: we no longer treat tray icons as notifications
-        let allowed = Main.sessionMode.hasNotifications;
-        let hasIcons = this._iconBox.get_n_children() > 0;
-        let inOverview = Main.overview.visible && !Main.overview.animationInProgress;
-        let inFullscreen = Main.layoutManager.primaryMonitor.inFullscreen;
-        this.actor.visible = allowed && hasIcons && !inOverview && !inFullscreen;
-
-        if (!hasIcons)
-            this._concealHandle.hide();
-
-        let targetSlide;
-        if (this._concealHandle.visible) {
-            targetSlide = 1.0;
-        } else if (!hasIcons) {
-            targetSlide = 0.0;
-        } else {
-            let [, boxWidth] = this._box.get_preferred_width(-1);
-            let [, handleWidth] = this._revealHandle.get_preferred_width(-1);
-
-            targetSlide = handleWidth / boxWidth;
-            if (!this._revealHandle.hover)
-                targetSlide *= CONCEALED_VISIBLE_FRACTION;
-        }
-
-        if (this.actor.visible)
-            Tweener.addTween(this._slideLayout,
-                             { slideX: targetSlide,
-                               time: REVEAL_ANIMATION_TIME,
-                               transition: 'easeOutQuad' });
-        else
-            this._slideLayout.slideX = targetSlide;
-    }
-});

js/ui/lookingGlass.js

@@ -1040,7 +1040,7 @@ const LookingGlass = new Lang.Class({
         let availableHeight = primary.height - Main.layoutManager.keyboardBox.height;
         let myHeight = Math.min(primary.height * 0.7, availableHeight * 0.9);
         this.actor.x = primary.x + (primary.width - myWidth) / 2;
-        this._hiddenY = primary.y + Main.layoutManager.panelBox.height - myHeight;
+        this._hiddenY = primary.y + Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners
         this._targetY = this._hiddenY + myHeight;
         this.actor.y = this._hiddenY;
         this.actor.width = myWidth;
@@ -1086,7 +1086,7 @@ const LookingGlass = new Lang.Class({
         if (this._open)
             return;
 
-        if (!Main.pushModal(this._entry, { actionMode: Shell.ActionMode.LOOKING_GLASS }))
+        if (!Main.pushModal(this._entry, { keybindingMode: Shell.KeyBindingMode.LOOKING_GLASS }))
             return;
 
         this._notebook.selectIndex(0);

js/ui/main.js

@@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@@ -18,11 +17,9 @@ const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
 const Keyboard = imports.ui.keyboard;
-const LegacyTray = imports.ui.legacyTray;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
 const OsdWindow = imports.ui.osdWindow;
-const OsdMonitorLabeler = imports.ui.osdMonitorLabeler;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
 const Params = imports.misc.params;
@@ -53,21 +50,19 @@ let overview = null;
 let runDialog = null;
 let lookingGlass = null;
 let wm = null;
-let legacyTray = null;
 let messageTray = null;
 let screenShield = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
 let ctrlAltTabManager = null;
 let osdWindowManager = null;
-let osdMonitorLabeler = null;
 let sessionMode = null;
 let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
 let screencastService = null;
 let modalCount = 0;
-let actionMode = Shell.ActionMode.NONE;
+let keybindingMode = Shell.KeyBindingMode.NONE;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@@ -80,19 +75,18 @@ let _cssStylesheet = null;
 let _a11ySettings = null;
 
 function _sessionUpdated() {
-    if (sessionMode.isPrimary)
-        _loadDefaultStylesheet();
+    _loadDefaultStylesheet();
 
     wm.setCustomKeybindingHandler('panel-main-menu',
-                                  Shell.ActionMode.NORMAL |
-                                  Shell.ActionMode.OVERVIEW,
+                                  Shell.KeyBindingMode.NORMAL |
+                                  Shell.KeyBindingMode.OVERVIEW,
                                   sessionMode.hasOverview ? Lang.bind(overview, overview.toggle) : null);
-    wm.allowKeybinding('overlay-key', Shell.ActionMode.NORMAL |
-                                      Shell.ActionMode.OVERVIEW);
+    wm.allowKeybinding('overlay-key', Shell.KeyBindingMode.NORMAL |
+                                      Shell.KeyBindingMode.OVERVIEW);
 
     wm.setCustomKeybindingHandler('panel-run-dialog',
-                                  Shell.ActionMode.NORMAL |
-                                  Shell.ActionMode.OVERVIEW,
+                                  Shell.KeyBindingMode.NORMAL |
+                                  Shell.KeyBindingMode.OVERVIEW,
                                   sessionMode.hasRunDialog ? openRunDialog : null);
 
     if (!sessionMode.hasRunDialog) {
@@ -115,8 +109,6 @@ function start() {
 
     sessionMode = new SessionMode.SessionMode();
     sessionMode.connect('updated', _sessionUpdated);
-    Gtk.Settings.get_default().connect('notify::gtk-theme-name',
-                                       _loadDefaultStylesheet);
     _initializeUI();
 
     shellDBusService = new ShellDBus.GnomeShell();
@@ -154,16 +146,14 @@ function _initializeUI() {
     xdndHandler = new XdndHandler.XdndHandler();
     ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
     osdWindowManager = new OsdWindow.OsdWindowManager();
-    osdMonitorLabeler = new OsdMonitorLabeler.OsdMonitorLabeler();
     overview = new Overview.Overview();
     wm = new WindowManager.WindowManager();
     magnifier = new Magnifier.Magnifier();
     if (LoginManager.canLock())
         screenShield = new ScreenShield.ScreenShield();
 
-    legacyTray = new LegacyTray.LegacyTray();
-    messageTray = new MessageTray.MessageTray();
     panel = new Panel.Panel();
+    messageTray = new MessageTray.MessageTray();
     keyboard = new Keyboard.Keyboard();
     notificationDaemon = new NotificationDaemon.NotificationDaemon();
     windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
@@ -215,50 +205,44 @@ function _initializeUI() {
     }
 
     layoutManager.connect('startup-complete', function() {
-        if (actionMode == Shell.ActionMode.NONE) {
-            actionMode = Shell.ActionMode.NORMAL;
+        if (keybindingMode == Shell.KeyBindingMode.NONE) {
+            keybindingMode = Shell.KeyBindingMode.NORMAL;
         }
         if (screenShield) {
             screenShield.lockIfWasLocked();
         }
-        if (sessionMode.currentMode != 'gdm' &&
+        if (LoginManager.haveSystemd() &&
+            sessionMode.currentMode != 'gdm' &&
             sessionMode.currentMode != 'initial-setup') {
-            Shell.Global.log_structured('GNOME Shell started at ' + _startDate,
-                                        ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
+            // Do not import globally to not depend
+            // on systemd on non-systemd systems.
+            let GSystem = imports.gi.GSystem;
+            GSystem.log_structured_print('GNOME Shell started at ' + _startDate,
+                                         ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
+        } else {
+            log('GNOME Shell started at ' + _startDate);
         }
     });
 }
 
-function _getStylesheet(name) {
+function _getDefaultStylesheet() {
     let stylesheet;
 
-    stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + name);
+    stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + sessionMode.stylesheetName);
     if (stylesheet.query_exists(null))
         return stylesheet;
 
-    stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
+    stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + sessionMode.stylesheetName);
     if (stylesheet.query_exists(null))
         return stylesheet;
 
     return null;
 }
 
-function _getDefaultStylesheet() {
-    let stylesheet = null;
-    let name = sessionMode.stylesheetName;
-
-    // Look for a high-contrast variant first when using GTK+'s HighContrast
-    // theme
-    if (Gtk.Settings.get_default().gtk_theme_name == 'HighContrast')
-        stylesheet = _getStylesheet(name.replace('.css', '-high-contrast.css'));
-
-    if (stylesheet == null)
-        stylesheet = _getStylesheet(sessionMode.stylesheetName);
-
-    return stylesheet;
-}
-
 function _loadDefaultStylesheet() {
+    if (!sessionMode.isPrimary)
+        return;
+
     let stylesheet = _getDefaultStylesheet();
     if (_defaultCssStylesheet && _defaultCssStylesheet.equal(stylesheet))
         return;
@@ -272,7 +256,7 @@ function _loadDefaultStylesheet() {
  *
  * Get the theme CSS file that the shell will load
  *
- * Returns: A #GFile that contains the theme CSS,
+ * Returns: A file path that contains the theme CSS,
  *          null if using the default
  */
 function getThemeStylesheet() {
@@ -287,7 +271,7 @@ function getThemeStylesheet() {
  * Set the theme CSS file that the shell will load
  */
 function setThemeStylesheet(cssStylesheet) {
-    _cssStylesheet = cssStylesheet ? Gio.File.new_for_path(cssStylesheet) : null;
+    _cssStylesheet = Gio.File.new_for_path(cssStylesheet);
 }
 
 /**
@@ -372,7 +356,7 @@ function _findModal(actor) {
  *  - options: Meta.ModalOptions flags to indicate that the pointer is
  *             already grabbed
  *
- *  - actionMode: used to set the current Shell.ActionMode to filter
+ *  - keybindingMode: used to set the current Shell.KeyBindingMode to filter
  *                    global keybindings; the default of NONE will filter
  *                    out all keybindings
  *
@@ -381,7 +365,7 @@ function _findModal(actor) {
 function pushModal(actor, params) {
     params = Params.parse(params, { timestamp: global.get_current_time(),
                                     options: 0,
-                                    actionMode: Shell.ActionMode.NONE });
+                                    keybindingMode: Shell.KeyBindingMode.NONE });
 
     if (modalCount == 0) {
         if (!global.begin_modal(params.timestamp, params.options)) {
@@ -411,9 +395,9 @@ function pushModal(actor, params) {
                                 destroyId: actorDestroyId,
                                 prevFocus: prevFocus,
                                 prevFocusDestroyId: prevFocusDestroyId,
-                                actionMode: actionMode });
+                                keybindingMode: keybindingMode });
 
-    actionMode = params.actionMode;
+    keybindingMode = params.keybindingMode;
     global.stage.set_key_focus(actor);
     return true;
 }
@@ -439,7 +423,7 @@ function popModal(actor, timestamp) {
     if (focusIndex < 0) {
         global.stage.set_key_focus(null);
         global.end_modal(timestamp);
-        actionMode = Shell.ActionMode.NORMAL;
+        keybindingMode = Shell.KeyBindingMode.NORMAL;
 
         throw new Error('incorrect pop');
     }
@@ -452,7 +436,7 @@ function popModal(actor, timestamp) {
     if (focusIndex == modalActorFocusStack.length - 1) {
         if (record.prevFocus)
             record.prevFocus.disconnect(record.prevFocusDestroyId);
-        actionMode = record.actionMode;
+        keybindingMode = record.keybindingMode;
         global.stage.set_key_focus(record.prevFocus);
     } else {
         // If we have:
@@ -477,7 +461,7 @@ function popModal(actor, timestamp) {
         for (let i = modalActorFocusStack.length - 1; i > focusIndex; i--) {
             modalActorFocusStack[i].prevFocus = modalActorFocusStack[i - 1].prevFocus;
             modalActorFocusStack[i].prevFocusDestroyId = modalActorFocusStack[i - 1].prevFocusDestroyId;
-            modalActorFocusStack[i].actionMode = modalActorFocusStack[i - 1].actionMode;
+            modalActorFocusStack[i].keybindingMode = modalActorFocusStack[i - 1].keybindingMode;
         }
     }
     modalActorFocusStack.splice(focusIndex, 1);
@@ -488,7 +472,7 @@ function popModal(actor, timestamp) {
     layoutManager.modalEnded();
     global.end_modal(timestamp);
     Meta.enable_unredirect_for_screen(global.screen);
-    actionMode = Shell.ActionMode.NORMAL;
+    keybindingMode = Shell.KeyBindingMode.NORMAL;
 }
 
 function createLookingGlass() {
@@ -656,7 +640,7 @@ const RestartMessage = new Lang.Class({
 
     _init : function(message) {
         this.parent({ shellReactive: true,
-                      styleClass: 'restart-message headline',
+                      styleClass: 'restart-message',
                       shouldFadeIn: false,
                       destroyOnClose: true });
 

js/ui/modalDialog.js

@@ -41,14 +41,14 @@ const ModalDialog = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
-                                        actionMode: Shell.ActionMode.SYSTEM_MODAL,
+                                        keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
                                         shouldFadeIn: true,
                                         shouldFadeOut: true,
                                         destroyOnClose: true });
 
         this.state = State.CLOSED;
         this._hasModal = false;
-        this._actionMode = params.actionMode;
+        this._keybindingMode = params.keybindingMode;
         this._shellReactive = params.shellReactive;
         this._shouldFadeIn = params.shouldFadeIn;
         this._shouldFadeOut = params.shouldFadeOut;
@@ -170,7 +170,7 @@ const ModalDialog = new Lang.Class({
         else
             keys = [];
 
-        let button = new St.Button({ style_class: 'modal-dialog-button button',
+        let button = new St.Button({ style_class: 'modal-dialog-button',
                                      button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                      reactive:    true,
                                      can_focus:   true,
@@ -362,7 +362,7 @@ const ModalDialog = new Lang.Class({
         if (this._hasModal)
             return true;
         if (!Main.pushModal(this._group, { timestamp: timestamp,
-                                           actionMode: this._actionMode }))
+                                           keybindingMode: this._keybindingMode }))
             return false;
 
         this._hasModal = true;

js/ui/notificationDaemon.js

@@ -91,6 +91,21 @@ const rewriteRules = {
     ]
 };
 
+const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
+    'bluetooth-applet': 'bluetooth',
+    'gnome-volume-control-applet': 'volume', // renamed to gnome-sound-applet
+                                             // when moved to control center
+    'gnome-sound-applet': 'volume',
+    'nm-applet': 'network',
+    'gnome-power-manager': 'battery',
+    'keyboard': 'keyboard',
+    'a11y-keyboard': 'a11y',
+    'kbd-scrolllock': 'keyboard',
+    'kbd-numlock': 'keyboard',
+    'kbd-capslock': 'keyboard',
+    'ibus-ui-gtk': 'keyboard'
+};
+
 const FdoNotificationDaemon = new Lang.Class({
     Name: 'FdoNotificationDaemon',
 
@@ -105,10 +120,13 @@ const FdoNotificationDaemon = new Lang.Class({
 
         this._nextNotificationId = 1;
 
-        Shell.WindowTracker.get_default().connect('notify::focus-app',
-            Lang.bind(this, this._onFocusAppChanged));
-        Main.overview.connect('hidden',
-            Lang.bind(this, this._onFocusAppChanged));
+        Shell.WindowTracker.get_default().connect('notify::focus-app', Lang.bind(this, this._onFocusAppChanged));
+        Main.overview.connect('hidden', Lang.bind(this, this._onFocusAppChanged));
+
+        this._trayManager = new Shell.TrayManager();
+        this._trayIconAddedId = this._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
+        this._trayIconRemovedId = this._trayManager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
+        this._trayManager.manage_screen(global.screen, Main.messageTray.actor);
     },
 
     _imageForNotificationData: function(hints) {
@@ -149,10 +167,11 @@ const FdoNotificationDaemon = new Lang.Class({
         return null;
     },
 
-    _lookupSource: function(title, pid) {
+    _lookupSource: function(title, pid, trayIcon) {
         for (let i = 0; i < this._sources.length; i++) {
             let source = this._sources[i];
-            if (source.pid == pid && source.initialTitle == title)
+            if (source.pid == pid &&
+                (source.initialTitle == title || source.trayIcon || trayIcon))
                 return source;
         }
         return null;
@@ -169,7 +188,7 @@ const FdoNotificationDaemon = new Lang.Class({
     //
     // Either a pid or ndata.notification is needed to retrieve or
     // create a source.
-    _getSource: function(title, pid, ndata, sender) {
+    _getSource: function(title, pid, ndata, sender, trayIcon) {
         if (!pid && !(ndata && ndata.notification))
             return null;
 
@@ -180,13 +199,13 @@ const FdoNotificationDaemon = new Lang.Class({
         if (ndata && ndata.notification)
             return ndata.notification.source;
 
-        let source = this._lookupSource(title, pid);
+        let source = this._lookupSource(title, pid, trayIcon);
         if (source) {
             source.setTitle(title);
             return source;
         }
 
-        let source = new FdoNotificationDaemonSource(title, pid, sender, ndata ? ndata.hints['desktop-entry'] : null);
+        let source = new FdoNotificationDaemonSource(title, pid, sender, trayIcon, ndata ? ndata.hints['desktop-entry'] : null);
 
         this._sources.push(source);
         source.connect('destroy', Lang.bind(this, function() {
@@ -212,10 +231,13 @@ const FdoNotificationDaemon = new Lang.Class({
 
         // Filter out chat, presence, calls and invitation notifications from
         // Empathy, since we handle that information from telepathyClient.js
-        //
-        // Note that empathy uses im.received for one to one chats and
-        // x-empathy.im.mentioned for multi-user, so we're good here
-        if (appName == 'Empathy' && hints['category'] == 'im.received') {
+        if (appName == 'Empathy' && (hints['category'] == 'im.received' ||
+              hints['category'] == 'x-empathy.im.room-invitation' ||
+              hints['category'] == 'x-empathy.call.incoming' ||
+              hints['category'] == 'x-empathy.transfer.incoming' ||
+              hints['category'] == 'x-empathy.im.subscription-request' ||
+              hints['category'] == 'presence.online' ||
+              hints['category'] == 'presence.offline')) {
             // Ignore replacesId since we already sent back a
             // NotificationClosed for that id.
             id = this._nextNotificationId++;
@@ -308,6 +330,19 @@ const FdoNotificationDaemon = new Lang.Class({
         return invocation.return_value(GLib.Variant.new('(u)', [id]));
     },
 
+    _makeButton: function(id, label, useActionIcons) {
+        let button = new St.Button({ can_focus: true });
+        let iconName = id.endsWith('-symbolic') ? id : id + '-symbolic';
+        if (useActionIcons && Gtk.IconTheme.get_default().has_icon(iconName)) {
+            button.add_style_class_name('notification-icon-button');
+            button.child = new St.Icon({ icon_name: iconName });
+        } else {
+            button.add_style_class_name('notification-button');
+            button.label = label;
+        }
+        return button;
+    },
+
     _notifyForSource: function(source, ndata) {
         let [id, icon, summary, body, actions, hints, notification] =
             [ndata.id, ndata.icon, ndata.summary, ndata.body,
@@ -335,17 +370,26 @@ const FdoNotificationDaemon = new Lang.Class({
                 }));
         }
 
+        // Mark music notifications so they can be shown in the screen shield
+        notification.isMusic = (ndata.hints['category'] == 'x-gnome.music');
+
         let gicon = this._iconForNotificationData(icon, hints);
         let gimage = this._imageForNotificationData(hints);
 
+        let image = null;
+
         // If an icon is not specified, we use 'image-data' or 'image-path' hint for an icon
         // and don't show a large image. There are currently many applications that use
         // notify_notification_set_icon_from_pixbuf() from libnotify, which in turn sets
         // the 'image-data' hint. These applications don't typically pass in 'app_icon'
         // argument to Notify() and actually expect the pixbuf to be shown as an icon.
         // So the logic here does the right thing for this case. If both an icon and either
-        // one of 'image-data' or 'image-path' are specified, the icon and takes precedence.
-        if (!gicon && gimage)
+        // one of 'image-data' or 'image-path' are specified, we show both an icon and
+        // a large image.
+        if (gicon && gimage)
+            image = new St.Icon({ gicon: gimage,
+                                  icon_size: notification.IMAGE_SIZE });
+        else if (!gicon && gimage)
             gicon = gimage;
         else if (!gicon)
             gicon = this._fallbackIconForNotificationData(hints);
@@ -355,27 +399,31 @@ const FdoNotificationDaemon = new Lang.Class({
                                              clear: true,
                                              soundFile: hints['sound-file'],
                                              soundName: hints['sound-name'] });
+        notification.setImage(image);
 
         let hasDefaultAction = false;
 
         if (actions.length) {
+            let useActionIcons = (hints['action-icons'] == true);
+
             for (let i = 0; i < actions.length - 1; i += 2) {
                 let [actionId, label] = [actions[i], actions[i+1]];
-                if (actionId == 'default')
+                if (actionId == 'default') {
                     hasDefaultAction = true;
-                else
-                    notification.addAction(label, Lang.bind(this, function() {
+                } else {
+                    notification.addButton(this._makeButton(actionId, label, useActionIcons), Lang.bind(this, function() {
                         this._emitActionInvoked(ndata.id, actionId);
                     }));
+                }
             }
         }
 
         if (hasDefaultAction) {
-            notification.connect('activated', Lang.bind(this, function() {
+            notification.connect('clicked', Lang.bind(this, function() {
                 this._emitActionInvoked(ndata.id, 'default');
             }));
         } else {
-            notification.connect('activated', Lang.bind(this, function() {
+            notification.connect('clicked', Lang.bind(this, function() {
                 source.open();
             }));
         }
@@ -412,7 +460,7 @@ const FdoNotificationDaemon = new Lang.Class({
     GetCapabilities: function() {
         return [
             'actions',
-            // 'action-icons',
+            'action-icons',
             'body',
             // 'body-hyperlinks',
             // 'body-images',
@@ -455,6 +503,20 @@ const FdoNotificationDaemon = new Lang.Class({
     _emitActionInvoked: function(id, action) {
         this._dbusImpl.emit_signal('ActionInvoked',
                                    GLib.Variant.new('(us)', [id, action]));
+    },
+
+    _onTrayIconAdded: function(o, icon) {
+        let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
+        if (STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass] !== undefined)
+            return;
+
+        let source = this._getSource(icon.title || icon.wm_class || C_("program", "Unknown"), icon.pid, null, null, icon);
+    },
+
+    _onTrayIconRemoved: function(o, icon) {
+        let source = this._lookupSource(null, icon.pid, true);
+        if (source)
+            source.destroy();
     }
 });
 
@@ -462,9 +524,10 @@ const FdoNotificationDaemonSource = new Lang.Class({
     Name: 'FdoNotificationDaemonSource',
     Extends: MessageTray.Source,
 
-    _init: function(title, pid, sender, appId) {
+    _init: function(title, pid, sender, trayIcon, appId) {
         // Need to set the app before chaining up, so
         // methods called from the parent constructor can find it
+        this.trayIcon = trayIcon;
         this.pid = pid;
         this.app = this._getApp(appId);
 
@@ -484,6 +547,12 @@ const FdoNotificationDaemonSource = new Lang.Class({
                                                               Lang.bind(this, this._onNameVanished));
         else
             this._nameWatcherId = 0;
+
+        if (this.trayIcon) {
+            // Try again finding the app, using the WM_CLASS from the tray icon
+            this._setSummaryIcon(this.trayIcon);
+            this.useNotificationIcon = false;
+        }
     },
 
     _createPolicy: function() {
@@ -501,14 +570,15 @@ const FdoNotificationDaemonSource = new Lang.Class({
         // of which аre removed from DBus immediately.
         // Sender being removed from DBus would normally result in a tray icon being removed,
         // so allow the code path that handles the tray icon being removed to handle that case.
-        if (this.app)
+        if (!this.trayIcon && this.app)
             this.destroy();
     },
 
     processNotification: function(notification, gicon) {
         if (gicon)
             this._gicon = gicon;
-        this.iconUpdated();
+        if (!this.trayIcon)
+            this.iconUpdated();
 
         let tracker = Shell.WindowTracker.get_default();
         if (notification.resident && this.app && tracker.focus_app == this.app)
@@ -517,6 +587,29 @@ const FdoNotificationDaemonSource = new Lang.Class({
             this.notify(notification);
     },
 
+    handleSummaryClick: function(button) {
+        if (!this.trayIcon)
+            return false;
+
+        let event = Clutter.get_current_event();
+
+        // Left clicks are passed through only where there aren't unacknowledged
+        // notifications, so it possible to open them in summary mode; right
+        // clicks are always forwarded, as the right click menu is not useful for
+        // tray icons
+        if (button == 1 &&
+            this.notifications.length > 0)
+            return false;
+
+        let id = global.stage.connect('deactivate', Lang.bind(this, function () {
+            global.stage.disconnect(id);
+            this.trayIcon.click(event);
+        }));
+
+        Main.overview.hide();
+        return true;
+    },
+
     _getApp: function(appId) {
         let app;
 
@@ -524,6 +617,16 @@ const FdoNotificationDaemonSource = new Lang.Class({
         if (app != null)
             return app;
 
+        if (this.trayIcon) {
+            app = Shell.AppSystem.get_default().lookup_startup_wmclass(this.trayIcon.wm_class);
+            if (app != null)
+                return app;
+
+            app = Shell.AppSystem.get_default().lookup_desktop_wmclass(this.trayIcon.wm_class);
+            if (app != null)
+                return app;
+        }
+
         if (appId) {
             app = Shell.AppSystem.get_default().lookup_app(appId + '.desktop');
             if (app != null)
@@ -548,13 +651,17 @@ const FdoNotificationDaemonSource = new Lang.Class({
         this.destroyNonResidentNotifications();
     },
 
+    _lastNotificationRemoved: function() {
+        if (!this.trayIcon)
+            this.destroy();
+    },
+
     openApp: function() {
         if (this.app == null)
             return;
 
         this.app.activate();
         Main.overview.hide();
-        Main.panel.closeCalendar();
     },
 
     destroy: function() {
@@ -567,7 +674,11 @@ const FdoNotificationDaemonSource = new Lang.Class({
     },
 
     createIcon: function(size) {
-        if (this.app) {
+        if (this.trayIcon) {
+            return new Clutter.Clone({ width: size,
+                                       height: size,
+                                       source: this.trayIcon });
+        } else if (this.app) {
             return this.app.create_icon_texture(size);
         } else if (this._gicon) {
             return new St.Icon({ gicon: this._gicon,
@@ -642,7 +753,7 @@ const GtkNotificationDaemonNotification = new Lang.Class({
         this._activateAction(action.unpack(), actionTarget);
     },
 
-    activate: function() {
+    _onClicked: function() {
         this._activateAction(this._defaultAction, this._defaultActionTarget);
         this.parent();
     },
@@ -709,17 +820,11 @@ const GtkNotificationDaemonAppSource = new Lang.Class({
     activateAction: function(actionId, target) {
         let app = this._createApp();
         app.ActivateActionRemote(actionId, target ? [target] : [], getPlatformData());
-
-        Main.overview.hide();
-        Main.panel.closeCalendar();
     },
 
     open: function() {
         let app = this._createApp();
         app.ActivateRemote(getPlatformData());
-
-        Main.overview.hide();
-        Main.panel.closeCalendar();
     },
 
     addNotification: function(notificationId, notificationParams, showBanner) {

js/ui/osdMonitorLabeler.js

@@ -1,141 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
-
-const Lang = imports.lang;
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-const Meta = imports.gi.Meta;
-
-const FADE_TIME = 0.1;
-
-const OsdMonitorLabel = new Lang.Class({
-    Name: 'OsdMonitorLabel',
-
-    _init: function(monitor, label) {
-        this._actor = new St.Widget({ opacity: 0,
-                                      x_expand: true,
-                                      y_expand: true });
-
-        this._monitor = monitor;
-
-        this._box = new St.BoxLayout({ style_class: 'osd-window',
-                                       vertical: true });
-        this._actor.add_actor(this._box);
-
-        this._label = new St.Label({ style_class: 'osd-monitor-label',
-                                     text: label });
-        this._box.add(this._label);
-
-        Main.uiGroup.add_child(this._actor);
-        Main.uiGroup.set_child_above_sibling(this._actor, null);
-        this._position();
-
-        Meta.disable_unredirect_for_screen(global.screen);
-        Tweener.addTween(this._actor,
-                         { opacity: 255,
-                           time: FADE_TIME,
-                           transition: 'easeOutQuad' });
-    },
-
-    _position: function() {
-        let workArea = Main.layoutManager.getWorkAreaForMonitor(this._monitor);
-
-        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-            this._box.x = workArea.x + (workArea.width - this._box.width);
-        else
-            this._box.x = workArea.x;
-
-        this._box.y = workArea.y;
-    },
-
-    destroy: function() {
-        Tweener.addTween(this._actor,
-                         { opacity: 0,
-                           time: FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this._actor.destroy();
-                               Meta.enable_unredirect_for_screen(global.screen);
-                           })
-                         });
-    }
-});
-
-const OsdMonitorLabeler = new Lang.Class({
-    Name: 'OsdMonitorLabeler',
-
-    _init: function() {
-        this._monitorManager = Meta.MonitorManager.get();
-        this._client = null;
-        this._clientWatchId = 0;
-        this._osdLabels = [];
-        this._monitorLabels = null;
-        Main.layoutManager.connect('monitors-changed',
-                                    Lang.bind(this, this._reset));
-        this._reset();
-    },
-
-    _reset: function() {
-        for (let i in this._osdLabels)
-            this._osdLabels[i].destroy();
-        this._osdLabels = [];
-        this._monitorLabels = new Map();
-        let monitors = Main.layoutManager.monitors;
-        for (let i in monitors)
-            this._monitorLabels.set(monitors[i].index, []);
-    },
-
-    _trackClient: function(client) {
-        if (this._client)
-            return (this._client == client);
-
-        this._client = client;
-        this._clientWatchId = Gio.bus_watch_name(Gio.BusType.SESSION, client, 0, null,
-                                                 Lang.bind(this, function(c, name) {
-                                                     this.hide(name);
-                                                 }));
-        return true;
-    },
-
-    _untrackClient: function(client) {
-        if (!this._client || this._client != client)
-            return false;
-
-        Gio.bus_unwatch_name(this._clientWatchId);
-        this._clientWatchId = 0;
-        this._client = null;
-        return true;
-    },
-
-    show: function(client, params) {
-        if (!this._trackClient(client))
-            return;
-
-        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(' ')));
-        }
-    },
-
-    hide: function(client) {
-        if (!this._untrackClient(client))
-            return;
-
-        this._reset();
-    }
-});

js/ui/overview.js

@@ -259,6 +259,8 @@ const Overview = new Lang.Class({
         this._overview.add(this._controls.actor, { y_fill: true, expand: true });
         this._controls.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
 
+        this._stack.add_actor(this._controls.indicatorActor);
+
         // TODO - recalculate everything when desktop size changes
         this.dashIconSize = this._dash.iconSize;
         this._dash.connect('icon-size-changed',
@@ -507,7 +509,7 @@ const Overview = new Lang.Class({
             if (shouldBeModal) {
                 if (!this._modal) {
                     if (Main.pushModal(this._overview,
-                                       { actionMode: Shell.ActionMode.OVERVIEW })) {
+                                       { keybindingMode: Shell.KeyBindingMode.OVERVIEW })) {
                         this._modal = true;
                     } else {
                         this.hide();
@@ -603,9 +605,9 @@ const Overview = new Lang.Class({
                 return;
         }
 
-        this._shown = false;
-
         this._animateNotVisible();
+
+        this._shown = false;
         this._syncGrab();
     },
 

js/ui/overviewControls.js

@@ -391,6 +391,111 @@ const DashSpacer = new Lang.Class({
     }
 });
 
+const MessagesIndicator = new Lang.Class({
+    Name: 'MessagesIndicator',
+
+    _init: function(viewSelector) {
+        this._count = 0;
+        this._sources = [];
+        this._viewSelector = viewSelector;
+
+        this._container = new St.BoxLayout({ style_class: 'messages-indicator-contents',
+                                             reactive: true,
+                                             track_hover: true,
+                                             x_expand: true,
+                                             y_expand: true,
+                                             x_align: Clutter.ActorAlign.CENTER });
+
+        this._icon = new St.Icon({ icon_name: 'user-idle-symbolic',
+                                   icon_size: 16 });
+        this._container.add_actor(this._icon);
+
+        this._label = new St.Label();
+        this._container.add_actor(this._label);
+
+        this._highlight = new St.Widget({ style_class: 'messages-indicator-highlight',
+                                          x_expand: true,
+                                          y_expand: true,
+                                          y_align: Clutter.ActorAlign.END,
+                                          visible: false });
+
+        this._container.connect('notify::hover', Lang.bind(this,
+            function() {
+                this._highlight.visible = this._container.hover;
+            }));
+
+        let clickAction = new Clutter.ClickAction();
+        this._container.add_action(clickAction);
+        clickAction.connect('clicked', Lang.bind(this,
+            function() {
+                Main.messageTray.openTray();
+            }));
+
+        Main.messageTray.connect('showing', Lang.bind(this,
+            function() {
+                this._highlight.visible = false;
+                this._container.hover = false;
+            }));
+
+        let layout = new Clutter.BinLayout();
+        this.actor = new St.Widget({ layout_manager: layout,
+                                     style_class: 'messages-indicator',
+                                     y_expand: true,
+                                     y_align: Clutter.ActorAlign.END,
+                                     visible: false });
+        this.actor.add_actor(this._container);
+        this.actor.add_actor(this._highlight);
+
+        Main.messageTray.connect('source-added', Lang.bind(this, this._onSourceAdded));
+        Main.messageTray.connect('source-removed', Lang.bind(this, this._onSourceRemoved));
+
+        let sources = Main.messageTray.getSources();
+        sources.forEach(Lang.bind(this, function(source) { this._onSourceAdded(null, source); }));
+
+        this._viewSelector.connect('page-changed', Lang.bind(this, this._updateVisibility));
+        Main.overview.connect('showing', Lang.bind(this, this._updateVisibility));
+    },
+
+    _onSourceAdded: function(tray, source) {
+        if (source.trayIcon)
+            return;
+
+        source.connect('count-updated', Lang.bind(this, this._updateCount));
+        this._sources.push(source);
+        this._updateCount();
+    },
+
+    _onSourceRemoved: function(tray, source) {
+        this._sources.splice(this._sources.indexOf(source), 1);
+        this._updateCount();
+    },
+
+    _updateCount: function() {
+        let count = 0;
+        let hasChats = false;
+        this._sources.forEach(Lang.bind(this,
+            function(source) {
+                count += source.indicatorCount;
+                hasChats |= source.isChat;
+            }));
+
+        this._count = count;
+        this._label.text = ngettext("%d new message",
+                                    "%d new messages",
+                                   count).format(count);
+
+        this._icon.visible = hasChats;
+        this._updateVisibility();
+    },
+
+    _updateVisibility: function() {
+        let activePage = this._viewSelector.getActivePage();
+        let visible = ((this._count > 0) && (activePage == ViewSelector.ViewPage.WINDOWS));
+
+        this.actor.visible = visible;
+    }
+});
+
 const ControlsLayout = new Lang.Class({
     Name: 'ControlsLayout',
     Extends: Clutter.BinLayout,
@@ -419,6 +524,9 @@ const ControlsManager = new Lang.Class({
         this.viewSelector.connect('page-changed', Lang.bind(this, this._setVisibility));
         this.viewSelector.connect('page-empty', Lang.bind(this, this._onPageEmpty));
 
+        this._indicator = new MessagesIndicator(this.viewSelector);
+        this.indicatorActor = this._indicator.actor;
+
         let layout = new ControlsLayout();
         this.actor = new St.Widget({ layout_manager: layout,
                                      reactive: true,

js/ui/panel.js

@@ -26,7 +26,6 @@ const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
 const PANEL_ICON_SIZE = 24;
-const APP_MENU_ICON_MARGIN = 2;
 
 const BUTTON_DND_ACTIVATION_TIMEOUT = 250;
 
@@ -75,6 +74,90 @@ function _unpremultiply(color) {
                                blue: blue, alpha: color.alpha });
 };
 
+const TextShadower = new Lang.Class({
+    Name: 'TextShadower',
+
+    _init: function() {
+        this.actor = new Shell.GenericContainer();
+        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+
+        this._label = new St.Label();
+        this.actor.add_actor(this._label);
+        for (let i = 0; i < 4; i++) {
+            let actor = new St.Label({ style_class: 'label-shadow' });
+            actor.clutter_text.ellipsize = Pango.EllipsizeMode.END;
+            this.actor.add_actor(actor);
+        }
+        this._label.raise_top();
+    },
+
+    setText: function(text) {
+        let children = this.actor.get_children();
+        for (let i = 0; i < children.length; i++)
+            children[i].set_text(text);
+    },
+
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        let [minWidth, natWidth] = this._label.get_preferred_width(forHeight);
+        alloc.min_size = minWidth + 2;
+        alloc.natural_size = natWidth + 2;
+    },
+
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        let [minHeight, natHeight] = this._label.get_preferred_height(forWidth);
+        alloc.min_size = minHeight + 2;
+        alloc.natural_size = natHeight + 2;
+    },
+
+    _allocate: function(actor, box, flags) {
+        let children = this.actor.get_children();
+
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        let [minChildWidth, minChildHeight, natChildWidth, natChildHeight] =
+            this._label.get_preferred_size();
+
+        let childWidth = Math.min(natChildWidth, availWidth - 2);
+        let childHeight = Math.min(natChildHeight, availHeight - 2);
+
+        for (let i = 0; i < children.length; i++) {
+            let child = children[i];
+            let childBox = new Clutter.ActorBox();
+            // The order of the labels here is arbitrary, except
+            // we know the "real" label is at the end because Clutter.Actor
+            // sorts by Z order
+            switch (i) {
+                case 0: // top
+                    childBox.x1 = 1;
+                    childBox.y1 = 0;
+                    break;
+                case 1: // right
+                    childBox.x1 = 2;
+                    childBox.y1 = 1;
+                    break;
+                case 2: // bottom
+                    childBox.x1 = 1;
+                    childBox.y1 = 2;
+                    break;
+                case 3: // left
+                    childBox.x1 = 0;
+                    childBox.y1 = 1;
+                    break;
+                case 4: // center
+                    childBox.x1 = 1;
+                    childBox.y1 = 1;
+                    break;
+            }
+            childBox.x2 = childBox.x1 + childWidth;
+            childBox.y2 = childBox.y1 + childHeight;
+            child.allocate(childBox, flags);
+        }
+    }
+});
+
 /**
  * AppMenuButton:
  *
@@ -98,7 +181,6 @@ const AppMenuButton = new Lang.Class({
         this._targetApp = null;
         this._appMenuNotifyId = 0;
         this._actionGroupNotifyId = 0;
-        this._busyNotifyId = 0;
 
         let bin = new St.Bin({ name: 'appMenu' });
         bin.connect('style-changed', Lang.bind(this, this._onStyleChanged));
@@ -107,22 +189,28 @@ const AppMenuButton = new Lang.Class({
         this.actor.bind_property("reactive", this.actor, "can-focus", 0);
         this.actor.reactive = false;
 
-        this._container = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
+        this._container = St.BoxLayout({ style_class: 'panel-status-menu-box' });
         bin.set_child(this._container);
 
         let textureCache = St.TextureCache.get_default();
         textureCache.connect('icon-theme-changed',
                              Lang.bind(this, this._onIconThemeChanged));
 
-        this._iconBox = new St.Bin({ style_class: 'app-menu-icon' });
+        this._iconBox = new Shell.Slicer({ name: 'appMenuIcon' });
+        this._iconBox.connect('style-changed',
+                              Lang.bind(this, this._onIconBoxStyleChanged));
+        this._iconBox.connect('notify::allocation',
+                              Lang.bind(this, this._updateIconBoxClip));
         this._container.add_actor(this._iconBox);
 
-        this._label = new St.Label({ y_expand: true,
-                                     y_align: Clutter.ActorAlign.CENTER });
-        this._container.add_actor(this._label);
+        this._label = new TextShadower();
+        this._label.actor.y_align = Clutter.ActorAlign.CENTER;
+        this._container.add_actor(this._label.actor);
         this._arrow = PopupMenu.arrowIcon(St.Side.BOTTOM);
         this._container.add_actor(this._arrow);
 
+        this._iconBottomClip = 0;
+
         this._visible = !Main.overview.visible;
         if (!this._visible)
             this.actor.hide();
@@ -187,11 +275,17 @@ const AppMenuButton = new Lang.Class({
         this._spinner.actor.hide();
     },
 
+    _onIconBoxStyleChanged: function() {
+        let node = this._iconBox.get_theme_node();
+        this._iconBottomClip = node.get_length('app-icon-bottom-clip');
+        this._updateIconBoxClip();
+    },
+
     _syncIcon: function() {
         if (!this._targetApp)
             return;
 
-        let icon = this._targetApp.create_icon_texture(PANEL_ICON_SIZE - APP_MENU_ICON_MARGIN);
+        let icon = this._targetApp.create_icon_texture(2 * PANEL_ICON_SIZE);
         this._iconBox.set_child(icon);
     },
 
@@ -202,6 +296,16 @@ const AppMenuButton = new Lang.Class({
         this._syncIcon();
     },
 
+    _updateIconBoxClip: function() {
+        let allocation = this._iconBox.allocation;
+        if (this._iconBottomClip > 0)
+            this._iconBox.set_clip(0, 0,
+                                   allocation.x2 - allocation.x1,
+                                   allocation.y2 - allocation.y1 - this._iconBottomClip);
+        else
+            this._iconBox.remove_clip();
+    },
+
     stopAnimation: function() {
         if (this._stop)
             return;
@@ -289,18 +393,13 @@ const AppMenuButton = new Lang.Class({
                 this._targetApp.disconnect(this._actionGroupNotifyId);
                 this._actionGroupNotifyId = 0;
             }
-            if (this._busyNotifyId) {
-                this._targetApp.disconnect(this._busyNotifyId);
-                this._busyNotifyId = 0;
-            }
 
             this._targetApp = targetApp;
 
             if (this._targetApp) {
                 this._appMenuNotifyId = this._targetApp.connect('notify::menu', Lang.bind(this, this._sync));
                 this._actionGroupNotifyId = this._targetApp.connect('notify::action-group', Lang.bind(this, this._sync));
-                this._busyNotifyId = this._targetApp.connect('notify::busy', Lang.bind(this, this._sync));
-                this._label.set_text(this._targetApp.get_name());
+                this._label.setText(this._targetApp.get_name());
                 this.actor.set_accessible_name(this._targetApp.get_name());
             }
         }
@@ -313,7 +412,7 @@ const AppMenuButton = new Lang.Class({
 
         let isBusy = (this._targetApp != null &&
                       (this._targetApp.get_state() == Shell.AppState.STARTING ||
-                       this._targetApp.get_busy()));
+                       this._targetApp.get_state() == Shell.AppState.BUSY));
         if (isBusy)
             this.startAnimation();
         else
@@ -651,7 +750,7 @@ const AggregateMenu = new Lang.Class({
         this.menu.actor.add_style_class_name('aggregate-menu');
 
         this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
-        this.actor.add_child(this._indicators);
+        this.actor.add_actor(this._indicators);
 
         if (Config.HAVE_NETWORKMANAGER) {
             this._network = new imports.ui.status.network.NMApplet();
@@ -724,7 +823,7 @@ const Panel = new Lang.Class({
 
         this.statusArea = {};
 
-        this.menuManager = new PopupMenu.PopupMenuManager(this);
+        this.menuManager = new PopupMenu.PopupMenuManager(this, { keybindingMode: Shell.KeyBindingMode.TOPBAR_POPUP });
 
         this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
         this.actor.add_actor(this._leftBox);
@@ -878,8 +977,9 @@ const Panel = new Lang.Class({
         return Clutter.EVENT_STOP;
     },
 
-    _toggleMenu: function(indicator) {
-        if (!indicator) // menu not supported by current session mode
+    toggleAppMenu: function() {
+        let indicator = this.statusArea.appMenu;
+        if (!indicator) // appMenu not supported by current session mode
             return;
 
         let menu = indicator.menu;
@@ -891,26 +991,6 @@ const Panel = new Lang.Class({
             menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },
 
-    toggleAppMenu: function() {
-        this._toggleMenu(this.statusArea.appMenu);
-    },
-
-    toggleCalendar: function() {
-        this._toggleMenu(this.statusArea.dateMenu);
-    },
-
-    closeCalendar: function() {
-        let indicator = this.statusArea.dateMenu;
-        if (!indicator) // calendar not supported by current session mode
-            return;
-
-        let menu = indicator.menu;
-        if (!indicator.actor.reactive)
-            return;
-
-        menu.close();
-    },
-
     set boxOpacity(value) {
         let isReactive = value > 0;
 
@@ -956,7 +1036,7 @@ const Panel = new Lang.Class({
                 continue;
             if (indicator.menu)
                 indicator.menu.close();
-            indicator.container.hide();
+            indicator.actor.hide();
         }
     },
 
@@ -988,21 +1068,14 @@ const Panel = new Lang.Class({
     },
 
     _addToPanelBox: function(role, indicator, position, box) {
-        let container = indicator.container;
-        container.show();
-
-        let parent = container.get_parent();
-        if (parent)
-            parent.remove_actor(container);
-
-        box.insert_child_at_index(container, position);
+        indicator.actor.show();
+        box.insert_child_at_index(indicator.actor, position);
         if (indicator.menu)
             this.menuManager.addMenu(indicator.menu);
         this.statusArea[role] = indicator;
         let destroyId = indicator.connect('destroy', Lang.bind(this, function(emitter) {
             delete this.statusArea[role];
             emitter.disconnect(destroyId);
-            container.destroy();
         }));
     },
 

js/ui/panelMenu.js

@@ -13,92 +13,16 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;
 
-const ButtonBox = new Lang.Class({
-    Name: 'ButtonBox',
-
-    _init: function(params) {
-        params = Params.parse(params, { style_class: 'panel-button' }, true);
-        this.actor = new Shell.GenericContainer(params);
-        this.actor._delegate = this;
-
-        this.container = new St.Bin({ y_fill: true,
-                                      x_fill: true,
-                                      child: this.actor });
-
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-
-        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
-        this._minHPadding = this._natHPadding = 0.0;
-    },
-
-    _onStyleChanged: function(actor) {
-        let themeNode = actor.get_theme_node();
-
-        this._minHPadding = themeNode.get_length('-minimum-hpadding');
-        this._natHPadding = themeNode.get_length('-natural-hpadding');
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let child = actor.get_first_child();
-
-        if (child) {
-            [alloc.min_size, alloc.natural_size] = child.get_preferred_width(-1);
-        } else {
-            alloc.min_size = alloc.natural_size = 0;
-        }
-
-        alloc.min_size += 2 * this._minHPadding;
-        alloc.natural_size += 2 * this._natHPadding;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let child = actor.get_first_child();
-
-        if (child) {
-            [alloc.min_size, alloc.natural_size] = child.get_preferred_height(-1);
-        } else {
-            alloc.min_size = alloc.natural_size = 0;
-        }
-    },
-
-    _allocate: function(actor, box, flags) {
-        let child = actor.get_first_child();
-        if (!child)
-            return;
-
-        let [minWidth, natWidth] = child.get_preferred_width(-1);
-
-        let availWidth = box.x2 - box.x1;
-        let availHeight = box.y2 - box.y1;
-
-        let childBox = new Clutter.ActorBox();
-        if (natWidth + 2 * this._natHPadding <= availWidth) {
-            childBox.x1 = this._natHPadding;
-            childBox.x2 = availWidth - this._natHPadding;
-        } else {
-            childBox.x1 = this._minHPadding;
-            childBox.x2 = availWidth - this._minHPadding;
-        }
-
-        childBox.y1 = 0;
-        childBox.y2 = availHeight;
-
-        child.allocate(childBox, flags);
-    },
-});
-
 const Button = new Lang.Class({
     Name: 'PanelMenuButton',
-    Extends: ButtonBox,
 
     _init: function(menuAlignment, nameText, dontCreateMenu) {
-        this.parent({ reactive: true,
-                      can_focus: true,
-                      track_hover: true,
-                      accessible_name: nameText ? nameText : "",
-                      accessible_role: Atk.Role.MENU });
+        this.actor = new St.Bin({ style_class: 'panel-button',
+                                  reactive: true,
+                                  can_focus: true,
+                                  track_hover: true,
+                                  accessible_name: nameText ? nameText : "",
+                                  accessible_role: Atk.Role.MENU });
 
         this.actor.connect('event', Lang.bind(this, this._onEvent));
         this.actor.connect('notify::visible', Lang.bind(this, this._onVisibilityChanged));
@@ -173,13 +97,10 @@ const Button = new Lang.Class({
         // menu is higher then the screen; it's useful if part of the menu is
         // scrollable so the minimum height is smaller than the natural height
         let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
-        let verticalMargins = this.menu.actor.margin_top + this.menu.actor.margin_bottom;
-        this.menu.actor.style = ('max-height: ' + Math.round(workArea.height - verticalMargins) + 'px;');
+        this.menu.actor.style = ('max-height: ' + Math.round(workArea.height) + 'px;');
     },
 
     destroy: function() {
-        this.actor._delegate = null;
-
         if (this.menu)
             this.menu.destroy();
         this.actor.destroy();

js/ui/popupMenu.js

@@ -91,7 +91,6 @@ const PopupBaseMenuItem = new Lang.Class({
             this.actor.add_style_class_name(params.style_class);
 
         if (this._activatable) {
-            this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPressEvent));
             this.actor.connect('button-release-event', Lang.bind(this, this._onButtonReleaseEvent));
             this.actor.connect('touch-event', Lang.bind(this, this._onTouchEvent));
             this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
@@ -115,26 +114,15 @@ const PopupBaseMenuItem = new Lang.Class({
         this._parent = parent;
     },
 
-    _onButtonPressEvent: function (actor, event) {
-        // This is the CSS active state
-        this.actor.add_style_pseudo_class ('active');
-        return Clutter.EVENT_PROPAGATE;
-    },
-
     _onButtonReleaseEvent: function (actor, event) {
-        this.actor.remove_style_pseudo_class ('active');
         this.activate(event);
         return Clutter.EVENT_STOP;
     },
 
     _onTouchEvent: function (actor, event) {
         if (event.type() == Clutter.EventType.TOUCH_END) {
-            this.actor.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');
         }
         return Clutter.EVENT_PROPAGATE;
     },
@@ -170,17 +158,10 @@ const PopupBaseMenuItem = new Lang.Class({
         if (activeChanged) {
             this.active = active;
             if (active) {
-                this.actor.add_style_class_name('active');
+                this.actor.add_style_pseudo_class('active');
                 this.actor.grab_key_focus();
             } else {
-                this.actor.remove_style_class_name('active');
-                // 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.actor.remove_style_pseudo_class('active');
             }
             this.emit('active-changed', active);
         }
@@ -264,8 +245,8 @@ const PopupSeparatorMenuItem = new Lang.Class({
                            Lang.bind(this, this._syncVisibility));
         this._syncVisibility();
 
-        this._separator = new St.Widget({ style_class: 'popup-separator-menu-item' });
-        this.actor.add(this._separator, { expand: true });
+        this._separator = new Separator.HorizontalSeparator({ style_class: 'popup-separator-menu-item' });
+        this.actor.add(this._separator.actor, { expand: true });
     },
 
     _syncVisibility: function() {
@@ -1094,12 +1075,10 @@ const PopupSubMenuMenuItem = new Lang.Class({
             this.actor.add_style_pseudo_class('open');
             this._getTopMenu()._setOpenedSubMenu(this.menu);
             this.actor.add_accessible_state (Atk.StateType.EXPANDED);
-            this.actor.add_style_pseudo_class('checked');
         } else {
             this.actor.remove_style_pseudo_class('open');
             this._getTopMenu()._setOpenedSubMenu(null);
             this.actor.remove_accessible_state (Atk.StateType.EXPANDED);
-            this.actor.remove_style_pseudo_class('checked');
         }
     },
 
@@ -1144,9 +1123,6 @@ const PopupSubMenuMenuItem = new Lang.Class({
     },
 
     _onButtonReleaseEvent: function(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._setOpenState(!this._getOpenState());
         return Clutter.EVENT_PROPAGATE;
     }
@@ -1159,8 +1135,6 @@ const PopupMenuManager = new Lang.Class({
     Name: 'PopupMenuManager',
 
     _init: function(owner, grabParams) {
-        grabParams = Params.parse(grabParams,
-                                  { actionMode: Shell.ActionMode.POPUP });
         this._owner = owner;
         this._grabHelper = new GrabHelper.GrabHelper(owner.actor, grabParams);
         this._menus = [];

js/ui/runDialog.js

@@ -272,10 +272,6 @@ const RunDialog = new Lang.Class({
     },
 
     _restart: function() {
-        if (Meta.is_wayland_compositor()) {
-            this._showError('Restart is not available on Wayland');
-            return;
-        }
         this._shouldFadeOut = false;
         this.close();
         Meta.restart(_("Restarting…"));

js/ui/screenShield.js

@@ -60,6 +60,9 @@ const CURTAIN_SLIDE_TIME = 0.3;
 const Clock = new Lang.Class({
     Name: 'ScreenShieldClock',
 
+    CLOCK_FORMAT_KEY: 'clock-format',
+    CLOCK_SHOW_SECONDS_KEY: 'clock-show-seconds',
+
     _init: function() {
         this.actor = new St.BoxLayout({ style_class: 'screen-shield-clock',
                                         vertical: true });
@@ -98,14 +101,18 @@ const NotificationsBox = new Lang.Class({
     _init: function() {
         this.actor = new St.BoxLayout({ vertical: true,
                                         name: 'screenShieldNotifications',
-                                        style_class: 'screen-shield-notifications-container' });
+                                        style_class: 'screen-shield-notifications-box' });
+
+        this._musicBin = new St.Bin({ style_class: 'screen-shield-notifications-box',
+                                      visible: false });
 
         this._scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.START,
                                                hscrollbar_policy: Gtk.PolicyType.NEVER });
         this._notificationBox = new St.BoxLayout({ vertical: true,
-                                                   style_class: 'screen-shield-notifications-container' });
+                                                   style_class: 'screen-shield-notifications-box' });
         this._scrollView.add_actor(this._notificationBox);
 
+        this.actor.add(this._musicBin);
         this.actor.add(this._scrollView, { x_fill: true, x_align: St.Align.START });
 
         this._sources = new Map();
@@ -132,11 +139,12 @@ const NotificationsBox = new Lang.Class({
     },
 
     _updateVisibility: function() {
+        this._musicBin.visible = this._musicBin.child != null && this._musicBin.child.visible;
         this._notificationBox.visible = this._notificationBox.get_children().some(function(a) {
             return a.visible;
         });
 
-        this.actor.visible = this._notificationBox.visible;
+        this.actor.visible = this._musicBin.visible || this._notificationBox.visible;
     },
 
     _makeNotificationCountText: function(count, isChat) {
@@ -184,7 +192,7 @@ const NotificationsBox = new Lang.Class({
         for (let i = 0; i < source.notifications.length; i++) {
             let n = source.notifications[i];
 
-            if (n.acknowledged)
+            if (n.acknowledged || n.isMusic)
                 continue;
 
             let body = '';
@@ -205,13 +213,29 @@ const NotificationsBox = new Lang.Class({
     },
 
     _showSource: function(source, obj, box) {
+        let musicNotification = source.getMusicNotification();
+
+        if (musicNotification != null &&
+            this._musicBin.child == null) {
+            musicNotification.acknowledged = true;
+            if (musicNotification.actor.get_parent() != null)
+                musicNotification.actor.get_parent().remove_actor(musicNotification.actor);
+            this._musicBin.child = musicNotification.actor;
+            this._musicBin.child.visible = obj.visible;
+
+            musicNotification.expand(false /* animate */);
+
+            obj.musicNotification = musicNotification;
+        }
+
         if (obj.detailed) {
             [obj.titleLabel, obj.countLabel] = this._makeNotificationDetailedSource(source, box);
         } else {
             [obj.titleLabel, obj.countLabel] = this._makeNotificationSource(source, box);
         }
 
-        box.visible = obj.visible && (source.unseenCount > 0);
+        box.visible = obj.visible &&
+            (source.unseenCount > (musicNotification ? 1 : 0));
     },
 
     _sourceAdded: function(tray, source, initial) {
@@ -222,16 +246,23 @@ const NotificationsBox = new Lang.Class({
             sourceCountChangedId: 0,
             sourceTitleChangedId: 0,
             sourceUpdatedId: 0,
+            sourceNotifyId: 0,
+            musicNotification: null,
             sourceBox: null,
             titleLabel: null,
             countLabel: null,
         };
 
-        obj.sourceBox = new St.BoxLayout({ style_class: 'screen-shield-notification-source',
-                                           x_expand: true });
+        obj.sourceBox = new St.BoxLayout({ style_class: 'screen-shield-notification-source' });
         this._showSource(source, obj, obj.sourceBox);
         this._notificationBox.add(obj.sourceBox, { x_fill: false, x_align: St.Align.START });
 
+        if (obj.musicNotification) {
+            obj.sourceNotifyId = source.connect('notify', Lang.bind(this, function(source, notification) {
+                notification.acknowledged = true;
+            }));
+        }
+
         obj.sourceCountChangedId = source.connect('count-updated', Lang.bind(this, function(source) {
             this._countChanged(source, obj);
         }));
@@ -271,8 +302,7 @@ const NotificationsBox = new Lang.Class({
                              });
 
             this._updateVisibility();
-            if (obj.sourceBox.visible)
-                this.emit('wake-up-screen');
+            this.emit('wake-up-screen');
         }
     },
 
@@ -293,7 +323,8 @@ const NotificationsBox = new Lang.Class({
             obj.countLabel.text = this._makeNotificationCountText(count, source.isChat);
         }
 
-        obj.sourceBox.visible = obj.visible && (source.unseenCount > 0);
+        obj.sourceBox.visible = obj.visible &&
+            (source.unseenCount > (obj.musicNotification ? 1 : 0));
 
         this._updateVisibility();
         if (obj.sourceBox.visible)
@@ -305,7 +336,10 @@ const NotificationsBox = new Lang.Class({
             return;
 
         obj.visible = source.policy.showInLockScreen;
-        obj.sourceBox.visible = obj.visible && source.unseenCount > 0;
+        if (obj.musicNotification)
+            obj.musicNotification.actor.visible = obj.visible;
+        obj.sourceBox.visible = obj.visible &&
+            source.unseenCount > (obj.musicNotification ? 1 : 0);
 
         this._updateVisibility();
         if (obj.sourceBox.visible)
@@ -332,6 +366,13 @@ const NotificationsBox = new Lang.Class({
         obj.sourceBox.destroy();
         obj.sourceBox = obj.titleLabel = obj.countLabel = null;
 
+        if (obj.musicNotification) {
+            this._musicBin.child = null;
+            obj.musicNotification = null;
+
+            source.disconnect(obj.sourceNotifyId);
+        }
+
         source.disconnect(obj.sourceDestroyId);
         source.disconnect(obj.sourceCountChangedId);
         source.disconnect(obj.sourceTitleChangedId);
@@ -606,14 +647,14 @@ const ScreenShield = new Lang.Class({
         if (this._isModal)
             return true;
 
-        this._isModal = Main.pushModal(this.actor, { actionMode: Shell.ActionMode.LOCK_SCREEN });
+        this._isModal = Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
         if (this._isModal)
             return true;
 
         // We failed to get a pointer grab, it means that
         // something else has it. Try with a keyboard grab only
         this._isModal = Main.pushModal(this.actor, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED,
-                                                     actionMode: Shell.ActionMode.LOCK_SCREEN });
+                                                     keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
         return this._isModal;
     },
 

js/ui/screencast.js

@@ -99,7 +99,7 @@ const ScreencastService = new Lang.Class({
             recorder.set_pipeline(options['pipeline']);
         if (options['framerate'])
             recorder.set_framerate(options['framerate']);
-        if ('draw-cursor' in options)
+        if (options['draw-cursor'])
             recorder.set_draw_cursor(options['draw-cursor']);
     },
 

js/ui/search.js

@@ -199,9 +199,12 @@ const SearchResultsBase = new Lang.Class({
             this._cancellable.reset();
 
             this.provider.getResultMetas(metasNeeded, Lang.bind(this, function(metas) {
+                if (metas.length == 0) {
+                    callback(false);
+                    return;
+                }
                 if (metas.length != metasNeeded.length) {
-                    log('Wrong number of result metas returned by search provider ' + this.provider.id +
-                        ': expected ' + metasNeeded.length + ' but got ' + metas.length);
+                    log('Wrong number of result metas returned by search provider');
                     callback(false);
                     return;
                 }
@@ -233,7 +236,6 @@ const SearchResultsBase = new Lang.Class({
             this._ensureResultActors(results, Lang.bind(this, function(successful) {
                 if (!successful) {
                     this._clearResultDisplay();
-                    callback();
                     return;
                 }
 
@@ -657,11 +659,15 @@ const SearchResults = new Lang.Class({
         if (!result)
             return;
 
+        let styleReceiver = result.actor;
+        if (result.getStyleReceiver)
+            styleReceiver = result.getStyleReceiver();
+
         if (selected) {
-            result.actor.add_style_pseudo_class('selected');
+            styleReceiver.add_style_pseudo_class('selected');
             Util.ensureActorVisibleInScrollView(this._scrollView, result.actor);
         } else {
-            result.actor.remove_style_pseudo_class('selected');
+            styleReceiver.remove_style_pseudo_class('selected');
         }
     }
 });

js/ui/shellDBus.js

@@ -25,10 +25,6 @@ const GnomeShellIface = '<node> \
 <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="HideMonitorLabels" /> \
 <method name="FocusApp"> \
     <arg type="s" direction="in" name="id"/> \
 </method> \
@@ -48,7 +44,8 @@ const GnomeShellIface = '<node> \
 </method> \
 <signal name="AcceleratorActivated"> \
     <arg name="action" type="u" /> \
-    <arg name="parameters" type="a{sv}" /> \
+    <arg name="deviceid" type="u" /> \
+    <arg name="timestamp" type="u" /> \
 </signal> \
 <property name="Mode" type="s" access="read" /> \
 <property name="OverviewActive" type="b" access="readwrite" /> \
@@ -93,12 +90,6 @@ const GnomeShell = new Lang.Class({
             function(display, action, deviceid, timestamp) {
                 this._emitAcceleratorActivated(action, deviceid, timestamp);
             }));
-
-        this._cachedOverviewVisible = false;
-        Main.overview.connect('showing',
-                              Lang.bind(this, this._checkOverviewVisibleChanged));
-        Main.overview.connect('hidden',
-                              Lang.bind(this, this._checkOverviewVisibleChanged));
     },
 
     /**
@@ -143,7 +134,7 @@ const GnomeShell = new Lang.Class({
             params[param] = params[param].deep_unpack();
 
         let monitorIndex = -1;
-        if (params['monitor'] >= 0)
+        if (params['monitor'])
             monitorIndex = params['monitor'];
 
         let icon = null;
@@ -199,14 +190,11 @@ const GnomeShell = new Lang.Class({
 
         let connection = this._dbusImpl.get_connection();
         let info = this._dbusImpl.get_info();
-        let params = { 'device-id': GLib.Variant.new('u', deviceid),
-                       'timestamp': GLib.Variant.new('u', timestamp),
-                       'action-mode': GLib.Variant.new('u', Main.actionMode) };
         connection.emit_signal(destination,
                                this._dbusImpl.get_object_path(),
                                info ? info.name : null,
                                'AcceleratorActivated',
-                               GLib.Variant.new('(ua{sv})', [action, params]));
+                               GLib.Variant.new('(uuu)', [action, deviceid, timestamp]));
     },
 
     _grabAcceleratorForSender: function(accelerator, flags, sender) {
@@ -244,29 +232,11 @@ const GnomeShell = new Lang.Class({
         this._grabbers.delete(name);
     },
 
-    ShowMonitorLabelsAsync: function(params, invocation) {
-        let sender = invocation.get_sender();
-        let [dict] = params;
-        Main.osdMonitorLabeler.show(sender, dict);
-    },
-
-    HideMonitorLabelsAsync: function(params, invocation) {
-        let sender = invocation.get_sender();
-        Main.osdMonitorLabeler.hide(sender);
-    },
-
 
     Mode: global.session_mode,
 
-    _checkOverviewVisibleChanged: function() {
-        if (Main.overview.visible !== this._cachedOverviewVisible) {
-            this._cachedOverviewVisible = Main.overview.visible;
-            this._dbusImpl.emit_property_changed('OverviewActive', new GLib.Variant('b', this._cachedOverviewVisible));
-        }
-    },
-
     get OverviewActive() {
-        return this._cachedOverviewVisible;
+        return Main.overview.visible;
     },
 
     set OverviewActive(visible) {

js/ui/slider.js

@@ -7,7 +7,7 @@ const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;
 
-const SLIDER_SCROLL_STEP = 0.02; /* Slider scrolling step in % */
+const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */
 
 const Slider = new Lang.Class({
     Name: "Slider",
@@ -197,7 +197,7 @@ const Slider = new Lang.Class({
             let [dx, dy] = event.get_scroll_delta();
             // Even though the slider is horizontal, use dy to match
             // the UP/DOWN above.
-            delta = -dy * SLIDER_SCROLL_STEP;
+            delta = -dy / 10;
         }
 
         this._value = Math.min(Math.max(0, this._value + delta), 1);

js/ui/status/keyboard.js

@@ -155,7 +155,6 @@ const InputSourceManager = new Lang.Class({
         this._ibusSources = {};
 
         this._currentSource = null;
-        this._backupSource = null;
 
         // All valid input sources currently in the gsettings
         // KEY_INPUT_SOURCES list ordered by most recently used
@@ -164,13 +163,13 @@ const InputSourceManager = new Lang.Class({
             Main.wm.addKeybinding('switch-input-source',
                                   new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
                                   Meta.KeyBindingFlags.NONE,
-                                  Shell.ActionMode.ALL,
+                                  Shell.KeyBindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
         this._keybindingActionBackward =
             Main.wm.addKeybinding('switch-input-source-backward',
                                   new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
                                   Meta.KeyBindingFlags.IS_REVERSED,
-                                  Shell.ActionMode.ALL,
+                                  Shell.KeyBindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
         this._settings = new Gio.Settings({ schema_id: DESKTOP_INPUT_SOURCES_SCHEMA });
         this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));
@@ -184,7 +183,6 @@ const InputSourceManager = new Lang.Class({
         this._ibusManager.connect('ready', Lang.bind(this, this._ibusReadyCallback));
         this._ibusManager.connect('properties-registered', Lang.bind(this, this._ibusPropertiesRegistered));
         this._ibusManager.connect('property-updated', Lang.bind(this, this._ibusPropertyUpdated));
-        this._ibusManager.connect('set-content-type', Lang.bind(this, this._ibusSetContentType));
 
         global.display.connect('modifiers-accelerator-activated', Lang.bind(this, this._modifiersSwitcher));
 
@@ -194,7 +192,6 @@ const InputSourceManager = new Lang.Class({
         this._overviewHiddenId = 0;
         this._settings.connect('changed::per-window', Lang.bind(this, this._sourcesPerWindowChanged));
         this._sourcesPerWindowChanged();
-        this._disableIBus = false;
     },
 
     reload: function() {
@@ -242,7 +239,8 @@ const InputSourceManager = new Lang.Class({
         // effect without considerable work to consolidate the usage
         // of pushModal/popModal and grabHelper. See
         // https://bugzilla.gnome.org/show_bug.cgi?id=695143 .
-        if (Main.actionMode == Shell.ActionMode.POPUP) {
+        if (Main.keybindingMode == Shell.KeyBindingMode.MESSAGE_TRAY ||
+            Main.keybindingMode == Shell.KeyBindingMode.TOPBAR_POPUP) {
             this._modifiersSwitcher();
             return;
         }
@@ -311,8 +309,6 @@ const InputSourceManager = new Lang.Class({
                 [exists, displayName, shortName, , ] =
                     this._xkbInfo.get_layout_info(id);
             } else if (type == INPUT_SOURCE_TYPE_IBUS) {
-                if (this._disableIBus)
-                    continue;
                 let engineDesc = this._ibusManager.getEngineDesc(id);
                 if (engineDesc) {
                     let language = IBus.get_language_name(engineDesc.get_language());
@@ -383,24 +379,8 @@ const InputSourceManager = new Lang.Class({
         }
         this._mruSources = mruSources.concat(sourcesList);
 
-        if (this._mruSources.length > 0) {
-            if (!this._disableIBus && this._backupSource) {
-                for (let i = 0; i < this._mruSources.length; i++) {
-                    if (this._mruSources[i].type == this._backupSource.type &&
-                        this._mruSources[i].id == this._backupSource.id) {
-                        let currentSource = this._mruSources.splice(i, 1);
-                        this._mruSources = currentSource.concat(this._mruSources);
-                        break;
-                    }
-                }
-                this._backupSource = null;
-            }
+        if (this._mruSources.length > 0)
             this._mruSources[0].activate();
-        }
-
-        // All ibus engines are preloaded here to reduce the launching time
-        // when users switch the input sources.
-        this._ibusManager.preloadEngines(Object.keys(this._ibusSources));
     },
 
     _makeEngineShortName: function(engineDesc) {
@@ -453,27 +433,6 @@ const InputSourceManager = new Lang.Class({
         return false;
     },
 
-    _ibusSetContentType: function(im, purpose, hints) {
-        if (purpose == IBus.InputPurpose.PASSWORD) {
-            if (Object.keys(this._inputSources).length == Object.keys(this._ibusSources).length)
-                return;
-
-            if (this._disableIBus)
-                return;
-            this._disableIBus = true;
-            this._backupSource = this._currentSource;
-        } else {
-            if (!this._disableIBus)
-                return;
-            this._disableIBus = false;
-        }
-        // If this._mruSources is not cleared before this.reload() is called,
-        // the order is different from the original one as IM sources will
-        // be appended to XKB sources.
-        this._mruSources = [];
-        this.reload();
-    },
-
     _getNewInputSource: function(current) {
         for (let i in this._inputSources) {
             let is = this._inputSources[i];
@@ -588,6 +547,7 @@ const InputSourceIndicator = new Lang.Class({
         this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
         this.actor.add_child(this._hbox);
+        this.actor.add_style_class_name('panel-status-button');
 
         this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(this._propSeparator);

js/ui/status/network.js

@@ -888,11 +888,11 @@ const NMWirelessDialog = new Lang.Class({
                                                x_align: Clutter.ActorAlign.CENTER,
                                                y_align: Clutter.ActorAlign.CENTER });
         this._airplaneIcon = new St.Icon({ icon_size: 48 });
-        this._airplaneHeadline = new St.Label({ style_class: 'nm-dialog-airplane-headline headline' });
+        this._airplaneHeadline = new St.Label({ style_class: 'nm-dialog-airplane-headline' });
         this._airplaneText = new St.Label({ style_class: 'nm-dialog-airplane-text' });
 
         let airplaneSubStack = new St.Widget({ layout_manager: new Clutter.BinLayout });
-        this._airplaneButton = new St.Button({ style_class: 'modal-dialog-button button' });
+        this._airplaneButton = new St.Button({ style_class: 'modal-dialog-button' });
         this._airplaneButton.connect('clicked', Lang.bind(this, function() {
             if (this._rfkill.airplaneMode)
                 this._rfkill.airplaneMode = false;
@@ -1867,7 +1867,7 @@ const NMApplet = new Lang.Class({
     _connectionRemoved: function(connection) {
         let pos = this._connections.indexOf(connection);
         if (pos != -1)
-            this._connections.splice(pos, 1);
+            this._connections.splice(connection, 1);
 
         let section = connection._section;
 

js/ui/status/system.js

@@ -285,7 +285,7 @@ const Indicator = new Lang.Class({
         let disabled = Main.sessionMode.isLocked ||
                        (Main.sessionMode.isGreeter &&
                         this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
-        this._suspendAction.visible = this._haveSuspend && !disabled;
+        this._suspendAction.visible = this._haveShutdown && !disabled;
         this._updateActionsVisibility();
     },
 

js/ui/switcherPopup.js

@@ -87,6 +87,8 @@ const SwitcherPopup = new Lang.Class({
 
         let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
         let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
+        let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
+        let vPadding = this.actor.get_theme_node().get_vertical_padding();
         let hPadding = leftPadding + rightPadding;
 
         // Allocate the switcherList

js/ui/unlockDialog.js

@@ -154,7 +154,7 @@ const UnlockDialog = new Lang.Class({
             return true;
 
         if (!Main.pushModal(this.actor, { timestamp: timestamp,
-                                          actionMode: Shell.ActionMode.UNLOCK_SCREEN }))
+                                          keybindingMode: Shell.KeyBindingMode.UNLOCK_SCREEN }))
             return false;
 
         this._isModal = true;

js/ui/viewSelector.js

@@ -65,8 +65,7 @@ const ShowOverviewAction = new Lang.Class({
     },
 
     vfunc_gesture_prepare : function(action, actor) {
-        return Main.actionMode == Shell.ActionMode.NORMAL &&
-               this.get_n_current_points() == this.get_n_touch_points();
+        return this.get_n_current_points() == this.get_n_touch_points();
     },
 
     _getBoundingRect : function(motion) {
@@ -194,30 +193,27 @@ const ViewSelector = new Lang.Class({
                 // the windows to animate, but now we no longer want to
                 // show it given that we are now on the apps page or
                 // search page.
-                if (this._activePage != this._workspacesPage) {
+                if (this._activePage != this._workspacesPage)
                     this._workspacesPage.opacity = 0;
-                    this._workspacesPage.hide();
-                }
             }));
 
         Main.wm.addKeybinding('toggle-application-view',
                               new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
-                              Shell.ActionMode.NORMAL |
-                              Shell.ActionMode.OVERVIEW,
+                              Shell.KeyBindingMode.NORMAL |
+                              Shell.KeyBindingMode.OVERVIEW,
                               Lang.bind(this, this._toggleAppsPage));
 
         Main.wm.addKeybinding('toggle-overview',
                               new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
-                              Shell.ActionMode.NORMAL |
-                              Shell.ActionMode.OVERVIEW,
+                              Shell.KeyBindingMode.NORMAL |
+                              Shell.KeyBindingMode.OVERVIEW,
                               Lang.bind(Main.overview, Main.overview.toggle));
 
         let gesture;
 
-        gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT,
-                                                    Shell.ActionMode.NORMAL);
+        gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT);
         gesture.connect('activated', Lang.bind(this, function() {
             if (Main.overview.visible)
                 Main.overview.hide();
@@ -552,9 +548,7 @@ const ViewSelector = new Lang.Class({
     _onCapturedEvent: function(actor, event) {
         if (event.type() == Clutter.EventType.BUTTON_PRESS) {
             let source = event.get_source();
-            if (source != this._text &&
-                this._text.text == '' &&
-                !this._text.has_preedit () &&
+            if (source != this._text && this._text.text == '' &&
                 !Main.layoutManager.keyboardBox.contains(source)) {
                 // the user clicked outside after activating the entry, but
                 // with no search term entered and no keyboard button pressed

js/ui/windowAttentionHandler.js

@@ -39,7 +39,7 @@ const WindowAttentionHandler = new Lang.Class({
         let [title, banner] = this._getTitleAndBanner(app, window);
 
         let notification = new MessageTray.Notification(source, title, banner);
-        notification.connect('activated', function() {
+        notification.connect('clicked', function() {
             source.open();
         });
         notification.setForFeedback(true);

js/ui/windowManager.js

@@ -478,9 +478,7 @@ const WorkspaceSwitchAction = new Lang.Class({
     },
 
     vfunc_gesture_prepare : function(action, actor) {
-        let allowedModes = Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW;
-        return this.get_n_current_points() == this.get_n_touch_points() &&
-               (allowedModes & Main.actionMode);
+        return this.get_n_current_points() == this.get_n_touch_points();
     },
 
     vfunc_gesture_end : function(action, actor) {
@@ -528,7 +526,7 @@ const AppSwitchAction = new Lang.Class({
     },
 
     vfunc_gesture_prepare : function(action, actor) {
-        if (Main.actionMode != Shell.ActionMode.NORMAL) {
+        if (Main.overview.visible) {
             this.cancel();
             return false;
         }
@@ -580,35 +578,6 @@ const AppSwitchAction = new Lang.Class({
 });
 Signals.addSignalMethods(AppSwitchAction.prototype);
 
-const ResizePopup = new Lang.Class({
-    Name: 'ResizePopup',
-
-    _init: function() {
-        this._widget = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-        this._label = new St.Label({ style_class: 'resize-popup',
-                                     x_align: Clutter.ActorAlign.CENTER,
-                                     y_align: Clutter.ActorAlign.CENTER,
-                                     x_expand: true, y_expand: true });
-        this._widget.add_child(this._label);
-        Main.uiGroup.add_actor(this._widget);
-    },
-
-    set: function(rect, displayW, displayH) {
-        /* Translators: This represents the size of a window. The first number is
-         * the width of the window and the second is the height. */
-        let text = _("%d x %d").format(displayW, displayH);
-        this._label.set_text(text);
-
-        this._widget.set_position(rect.x, rect.y);
-        this._widget.set_size(rect.width, rect.height);
-    },
-
-    destroy: function() {
-        this._widget.destroy();
-        this._widget = null;
-    },
-});
-
 const WindowManager = new Lang.Class({
     Name: 'WindowManager',
 
@@ -616,7 +585,6 @@ const WindowManager = new Lang.Class({
         this._shellwm =  global.window_manager;
 
         this._minimizing = [];
-        this._unminimizing = [];
         this._maximizing = [];
         this._unmaximizing = [];
         this._mapping = [];
@@ -642,209 +610,185 @@ const WindowManager = new Lang.Class({
         this._shellwm.connect('hide-tile-preview', Lang.bind(this, this._hideTilePreview));
         this._shellwm.connect('show-window-menu', Lang.bind(this, this._showWindowMenu));
         this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
-        this._shellwm.connect('unminimize', Lang.bind(this, this._unminimizeWindow));
         this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
         this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
         this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
         this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
         this._shellwm.connect('filter-keybinding', Lang.bind(this, this._filterKeybinding));
         this._shellwm.connect('confirm-display-change', Lang.bind(this, this._confirmDisplayChange));
-        global.screen.connect('restacked', Lang.bind(this, this._syncStacking));
 
         this._workspaceSwitcherPopup = null;
         this._tilePreview = null;
 
-        this.allowKeybinding('switch-to-session-1', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-2', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-3', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-4', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-5', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-6', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-7', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-8', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-9', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-10', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-11', Shell.ActionMode.ALL);
-        this.allowKeybinding('switch-to-session-12', Shell.ActionMode.ALL);
-
         this.setCustomKeybindingHandler('switch-to-workspace-left',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-right',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-up',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-down',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-last',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-left',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-right',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-up',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-down',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-1',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-2',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-3',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-4',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-5',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-6',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-7',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-8',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-9',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-10',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-11',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-12',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-1',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-2',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-3',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-4',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-5',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-6',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-7',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-8',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-9',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-10',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-11',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-12',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-last',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-applications',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-group',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-applications-backward',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-group-backward',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-windows',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startWindowSwitcher));
         this.setCustomKeybindingHandler('switch-windows-backward',
-                                        Shell.ActionMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startWindowSwitcher));
         this.setCustomKeybindingHandler('switch-panels',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW |
-                                        Shell.ActionMode.LOCK_SCREEN |
-                                        Shell.ActionMode.UNLOCK_SCREEN |
-                                        Shell.ActionMode.LOGIN_SCREEN,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW |
+                                        Shell.KeyBindingMode.LOCK_SCREEN |
+                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
+                                        Shell.KeyBindingMode.LOGIN_SCREEN,
                                         Lang.bind(this, this._startA11ySwitcher));
         this.setCustomKeybindingHandler('switch-panels-backward',
-                                        Shell.ActionMode.NORMAL |
-                                        Shell.ActionMode.OVERVIEW |
-                                        Shell.ActionMode.LOCK_SCREEN |
-                                        Shell.ActionMode.UNLOCK_SCREEN |
-                                        Shell.ActionMode.LOGIN_SCREEN,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW |
+                                        Shell.KeyBindingMode.LOCK_SCREEN |
+                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
+                                        Shell.KeyBindingMode.LOGIN_SCREEN,
                                         Lang.bind(this, this._startA11ySwitcher));
 
         this.addKeybinding('pause-resume-tweens',
                            new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
-                           Shell.ActionMode.ALL,
+                           Shell.KeyBindingMode.ALL,
                            Lang.bind(this, this._toggleTweens));
 
         this.addKeybinding('open-application-menu',
                            new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
-                           Shell.ActionMode.NORMAL |
-                           Shell.ActionMode.POPUP,
+                           Shell.KeyBindingMode.NORMAL |
+                           Shell.KeyBindingMode.TOPBAR_POPUP,
                            Lang.bind(this, this._toggleAppMenu));
 
-        this.addKeybinding('toggle-message-tray',
-                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
-                           Meta.KeyBindingFlags.NONE,
-                           Shell.ActionMode.NORMAL |
-                           Shell.ActionMode.POPUP,
-                           Lang.bind(this, this._toggleCalendar));
-
-        global.display.connect('show-resize-popup', Lang.bind(this, this._showResizePopup));
-
         Main.overview.connect('showing', Lang.bind(this, function() {
             for (let i = 0; i < this._dimmedWindows.length; i++)
                 this._undimWindow(this._dimmedWindows[i]);
@@ -910,44 +854,6 @@ const WindowManager = new Lang.Class({
         Main.activateWindow(nextWindow);
     },
 
-    insertWorkspace: function(pos) {
-        if (!Meta.prefs_get_dynamic_workspaces())
-            return;
-
-        let windows = global.get_window_actors().map(function(winActor) {
-            return winActor.meta_window;
-        });
-
-        // To create a new workspace, we slide all the windows on workspaces
-        // below us to the next workspace, leaving a blank workspace for us
-        // to recycle.
-        windows.forEach(function(window) {
-            // If the window is attached to an ancestor, we don't need/want
-            // to move it
-            if (window.get_transient_for() != null)
-                return;
-            // Same for OR windows
-            if (window.is_override_redirect())
-                return;
-            // Windows on workspaces below pos don't need moving
-            let index = window.get_workspace().index();
-            if (index < pos)
-                return;
-            window.change_workspace_by_index(index + 1, true);
-        });
-
-        // If the new workspace was inserted before the active workspace,
-        // activate the workspace to which its windows went
-        let activeIndex = global.screen.get_active_workspace_index();
-        if (activeIndex >= pos) {
-            let newWs = global.screen.get_workspace_by_index(activeIndex + 1);
-            this._blockAnimations = true;
-            newWs.activate(global.get_current_time());
-            this._blockAnimations = false;
-        }
-    },
-
-
     keepWorkspaceAlive: function(workspace, duration) {
         if (!this._workspaceTracker)
             return;
@@ -969,7 +875,7 @@ const WindowManager = new Lang.Class({
 
     removeKeybinding: function(name) {
         if (global.display.remove_keybinding(name))
-            this.allowKeybinding(name, Shell.ActionMode.NONE);
+            this.allowKeybinding(name, Shell.KeyBindingMode.NONE);
     },
 
     allowKeybinding: function(name, modes) {
@@ -977,7 +883,7 @@ const WindowManager = new Lang.Class({
     },
 
     _shouldAnimate: function() {
-        return !(Main.overview.visible || this._blockAnimations);
+        return !Main.overview.visible;
     },
 
     _shouldAnimateActor: function(actor, types) {
@@ -1074,84 +980,6 @@ const WindowManager = new Lang.Class({
         }
     },
 
-    _unminimizeWindow : function(shellwm, actor) {
-        let types = [Meta.WindowType.NORMAL,
-                     Meta.WindowType.MODAL_DIALOG,
-                     Meta.WindowType.DIALOG];
-        if (!this._shouldAnimateActor(actor, types)) {
-            shellwm.completed_unminimize(actor);
-            return;
-        }
-
-        this._unminimizing.push(actor);
-
-        if (actor.meta_window.is_monitor_sized()) {
-            actor.opacity = 0;
-            actor.set_scale(1.0, 1.0);
-            Tweener.addTween(actor,
-                         { opacity: 255,
-                           time: MINIMIZE_WINDOW_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: this._unminimizeWindowDone,
-                           onCompleteScope: this,
-                           onCompleteParams: [shellwm, actor],
-                           onOverwrite: this._unminimizeWindowOverwritten,
-                           onOverwriteScope: this,
-                           onOverwriteParams: [shellwm, actor]
-                         });
-        } else {
-            let [success, geom] = actor.meta_window.get_icon_geometry();
-            if (success) {
-                actor.set_position(geom.x, geom.y);
-                actor.set_scale(geom.width / actor.width,
-                                geom.height / actor.height);
-            } else {
-                let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
-                actor.set_position(monitor.x, monitor.y);
-                if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-                    actor.x += monitor.width;
-                actor.set_scale(0, 0);
-            }
-
-            let rect = actor.meta_window.get_frame_rect();
-            let [xDest, yDest] = [rect.x, rect.y];
-
-            actor.show();
-            Tweener.addTween(actor,
-                             { scale_x: 1.0,
-                               scale_y: 1.0,
-                               x: xDest,
-                               y: yDest,
-                               time: MINIMIZE_WINDOW_ANIMATION_TIME,
-                               transition: 'easeInExpo',
-                               onComplete: this._unminimizeWindowDone,
-                               onCompleteScope: this,
-                               onCompleteParams: [shellwm, actor],
-                               onOverwrite: this._unminimizeWindowOverwritten,
-                               onOverwriteScope: this,
-                               onOverwriteParams: [shellwm, actor]
-                             });
-        }
-    },
-
-    _unminimizeWindowDone : function(shellwm, actor) {
-        if (this._removeEffect(this._unminimizing, actor)) {
-            Tweener.removeTweens(actor);
-            actor.set_scale(1.0, 1.0);
-            actor.set_opacity(255);
-            actor.set_pivot_point(0, 0);
-
-            shellwm.completed_unminimize(actor);
-        }
-    },
-
-    _unminimizeWindowOverwritten : function(shellwm, actor) {
-        if (this._removeEffect(this._unminimizing, actor)) {
-            shellwm.completed_unminimize(actor);
-        }
-    },
-
-
     _maximizeWindow : function(shellwm, actor, targetX, targetY, targetWidth, targetHeight) {
         shellwm.completed_maximize(actor);
     },
@@ -1246,8 +1074,10 @@ const WindowManager = new Lang.Class({
             return;
         }
 
-        if (actor.meta_window.is_attached_dialog())
+        if (actor.meta_window.is_attached_dialog()) {
+            /* Scale the window from the center of the parent */
             this._checkDimming(actor.get_meta_window().get_transient_for());
+        }
 
         switch (actor._windowType) {
         case Meta.WindowType.NORMAL:
@@ -1402,36 +1232,18 @@ const WindowManager = new Lang.Class({
     },
 
     _filterKeybinding: function(shellwm, binding) {
-        if (Main.actionMode == Shell.ActionMode.NONE)
+        if (Main.keybindingMode == Shell.KeyBindingMode.NONE)
             return true;
 
         // There's little sense in implementing a keybinding in mutter and
         // not having it work in NORMAL mode; handle this case generically
         // so we don't have to explicitly allow all builtin keybindings in
         // NORMAL mode.
-        if (Main.actionMode == Shell.ActionMode.NORMAL &&
+        if (Main.keybindingMode == Shell.KeyBindingMode.NORMAL &&
             binding.is_builtin())
             return false;
 
-        return !(this._allowedKeybindings[binding.get_name()] & Main.actionMode);
-    },
-
-    _syncStacking: function() {
-        if (this._switchData == null)
-            return;
-
-        // Update stacking of windows in inGroup (aka the workspace we are
-        // switching to). Windows in outGroup are about to be hidden anyway,
-        // so we just ignore them here.
-        let windows = global.get_window_actors();
-        let sibling = null;
-        for (let i = 0; i < windows.length; i++) {
-            if (windows[i].get_parent() != this._switchData.inGroup)
-                continue;
-
-            this._switchData.inGroup.set_child_above_sibling(windows[i], sibling);
-            sibling = windows[i];
-        }
+        return !(this._allowedKeybindings[binding.get_name()] & Main.keybindingMode);
     },
 
     _switchWorkspace : function(shellwm, from, to, direction) {
@@ -1601,10 +1413,6 @@ const WindowManager = new Lang.Class({
         Main.panel.toggleAppMenu();
     },
 
-    _toggleCalendar: function(display, screen, window, event, binding) {
-        Main.panel.toggleCalendar();
-    },
-
     _toggleTweens: function() {
         this._tweensPaused = !this._tweensPaused;
         const OrigTweener = imports.tweener.tweener;
@@ -1629,11 +1437,6 @@ const WindowManager = new Lang.Class({
             direction = Meta.MotionDirection.DOWN;
             newWs = screen.get_workspace_by_index(screen.n_workspaces - 1);
         } else if (isNaN(target)) {
-            // Prepend a new workspace dynamically
-            if (screen.get_active_workspace_index() == 0 &&
-                action == 'move' && target == 'up')
-                this.insertWorkspace(0);
-
             direction = Meta.MotionDirection[target.toUpperCase()];
             newWs = screen.get_active_workspace().get_neighbor(direction);
         } else if (target > 0) {
@@ -1698,18 +1501,4 @@ const WindowManager = new Lang.Class({
         let dialog = new DisplayChangeDialog(this._shellwm);
         dialog.open();
     },
-
-    _showResizePopup: function(display, show, rect, displayW, displayH) {
-        if (show) {
-            if (!this._resizePopup)
-                this._resizePopup = new ResizePopup();
-
-            this._resizePopup.set(rect, displayW, displayH);
-        } else {
-            if (this._resizePopup) {
-                this._resizePopup.destroy();
-                this._resizePopup = null;
-            }
-        }
-    },
 });

js/ui/workspace.js

@@ -156,6 +156,7 @@ const WindowClone = new Lang.Class({
         this.actor.add_action(clickAction);
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
         this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPress));
+        this.actor.connect('enter-event', Lang.bind(this, this._onEnter));
 
         this._draggable = DND.makeDraggable(this.actor,
                                             { restoreOnSuccess: true,
@@ -352,6 +353,10 @@ const WindowClone = new Lang.Class({
         return false;
     },
 
+    _onEnter: function() {
+        this.actor.grab_key_focus();
+    },
+
     _onClicked: function(action, actor) {
         this._activate();
     },
@@ -912,18 +917,14 @@ const LayoutStrategy = new Lang.Class({
         let slots = [];
 
         // Do this in three parts.
-        let heightWithoutSpacing = 0;
+        let height = 0;
         for (let i = 0; i < rows.length; i++) {
             let row = rows[i];
-            heightWithoutSpacing += row.height;
+            height += row.height + this._rowSpacing;
         }
 
-        let verticalSpacing = (rows.length - 1) * this._rowSpacing;
-        let additionalVerticalScale = Math.min(1, (area.height - verticalSpacing) / heightWithoutSpacing);
+        height -= this._rowSpacing;
 
-        // keep track how much smaller the grid becomes due to scaling
-        // so it can be centered again
-        let compensation = 0
         let y = 0;
 
         for (let i = 0; i < rows.length; i++) {
@@ -931,27 +932,13 @@ const LayoutStrategy = new Lang.Class({
 
             // If this window layout row doesn't fit in the actual
             // geometry, then apply an additional scale to it.
-            let horizontalSpacing = (row.windows.length - 1) * this._columnSpacing;
-            let widthWithoutSpacing = row.width - horizontalSpacing;
-            let additionalHorizontalScale = Math.min(1, (area.width - horizontalSpacing) / widthWithoutSpacing);
+            row.additionalScale = Math.min(1, area.width / row.width, area.height / height);
 
-            if (additionalHorizontalScale < additionalVerticalScale) {
-                row.additionalScale = additionalHorizontalScale;
-                // Only consider the scaling in addition to the vertical scaling for centering.
-                compensation += (additionalVerticalScale - additionalHorizontalScale) * row.height;
-            } else {
-                row.additionalScale = additionalVerticalScale;
-                // No compensation when scaling vertically since centering based on a too large
-                // height would undo what vertical scaling is trying to achieve.
-            }
-
-            row.x = area.x + (Math.max(area.width - (widthWithoutSpacing * row.additionalScale + horizontalSpacing), 0) / 2)
-            row.y = area.y + (Math.max(area.height - (heightWithoutSpacing + verticalSpacing), 0) / 2) + y;
-            y += row.height * row.additionalScale + this._rowSpacing;
+            row.x = area.x + (Math.max(area.width - row.width, 0) / 2) * row.additionalScale;
+            row.y = area.y + (y + Math.max(area.height - height, 0) / 2) * row.additionalScale;
+            y += row.height + this._rowSpacing;
         }
 
-        compensation = compensation / 2;
-
         for (let i = 0; i < rows.length; i++) {
             let row = rows[i];
             let x = row.x;
@@ -966,7 +953,7 @@ const LayoutStrategy = new Lang.Class({
                 let cloneWidth = window.width * s;
 
                 let cloneX = x + (cellWidth - cloneWidth) / 2;
-                let cloneY = row.y + row.height * row.additionalScale - cellHeight + compensation;
+                let cloneY = row.y + row.height - cellHeight;
 
                 slots.push([cloneX, cloneY, s, window]);
                 x += cellWidth + this._columnSpacing;

js/ui/workspaceThumbnail.js

@@ -795,13 +795,35 @@ const ThumbnailsBox = new Lang.Class({
 
             let isWindow = !!source.realWindow;
 
+            // To create a new workspace, we first slide all the windows on workspaces
+            // below us to the next workspace, leaving a blank workspace for us to recycle.
             let newWorkspaceIndex;
             [newWorkspaceIndex, this._dropPlaceholderPos] = [this._dropPlaceholderPos, -1];
+
+            // Nab all the windows below us.
+            let windows = global.get_window_actors().filter(function(winActor) {
+                // If the window is attached to an ancestor, we don't need/want to move it
+                let window = winActor.meta_window;
+
+                if (window.get_transient_for() != null)
+                    return false;
+
+                if (isWindow)
+                    return window.get_workspace().index() >= newWorkspaceIndex && winActor != source;
+                else
+                    return window.get_workspace().index() >= newWorkspaceIndex;
+            });
+
             this._spliceIndex = newWorkspaceIndex;
 
-            Main.wm.insertWorkspace(newWorkspaceIndex);
+            // ... move them down one.
+            windows.forEach(function(winActor) {
+                let window = winActor.meta_window;
+                window.change_workspace_by_index(window.get_workspace().index() + 1, true);
+            });
 
             if (isWindow) {
+                // ... and bam, a workspace, good as new.
                 // Move the window to our monitor first if necessary.
                 let thumbMonitor = this._thumbnails[newWorkspaceIndex].monitorIndex;
                 if (source.metaWindow.get_monitor() != thumbMonitor)

js/ui/workspacesView.js

@@ -18,6 +18,8 @@ const Workspace = imports.ui.workspace;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
 
 const WORKSPACE_SWITCH_TIME = 0.25;
+// Note that mutter has a compile-time limit of 36
+const MAX_WORKSPACES = 16;
 
 const AnimationType = {
     ZOOM: 0,
@@ -536,7 +538,6 @@ const WorkspacesDisplay = new Lang.Class({
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].destroy();
 
-        this._primaryIndex = Main.layoutManager.primaryIndex;
         this._workspacesViews = [];
         let monitors = Main.layoutManager.monitors;
         for (let i = 0; i < monitors.length; i++) {

po/LINGUAS

@@ -30,7 +30,6 @@ hi
 hu
 ia
 id
-is
 it
 ja
 kk

po/POTFILES.skip

@@ -1,4 +1,2 @@
 data/org.gnome.shell.evolution.calendar.gschema.xml.in
 src/calendar-server/evolution-calendar.desktop.in
-# Meh, autofools :-(
-sub/src/calendar-server/evolution-calendar.desktop.in

po/an.po

@@ -2,15 +2,15 @@
 # Copyright (C) 2011 gnome-shell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
 # FULL NAME <EMAIL@ADDRESS>, 2011.
-# Daniel Martinez <entaltoaragon@gmail.com>, 2011, 2014, 2015.
+# Daniel Martinez <entaltoaragon@gmail.com>, 2011, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-01-22 08:34+0000\n"
-"PO-Revision-Date: 2015-01-22 19:23+0100\n"
+"POT-Creation-Date: 2014-11-08 08:31+0000\n"
+"PO-Revision-Date: 2014-11-08 19:15+0100\n"
 "Last-Translator: Daniel Martinez <entaltoaragon@gmail.com>\n"
 "Language-Team: Aragonés <softaragones@googlegroups.com>\n"
 "Language: an\n"
@@ -302,6 +302,7 @@ msgstr ""
 "Retardo en cambiar o foco d'o churi dica que o puntero deixa de mover-se"
 
 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
+#| msgid "Network error"
 msgid "Network Login"
 msgstr "Encetar sesión en o rete"
 
@@ -335,25 +336,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Encetar sesión"
 
-#: ../js/gdm/loginDialog.js:276
+#: ../js/gdm/loginDialog.js:275
 msgid "Choose Session"
 msgstr "Esleyir a sesión"
 
-#: ../js/gdm/loginDialog.js:428
+#: ../js/gdm/loginDialog.js:434
 msgid "Not listed?"
 msgstr "No ye en a lista?"
 
-#: ../js/gdm/loginDialog.js:814
+#: ../js/gdm/loginDialog.js:619
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(eix., usuario u %s)"
 
-#: ../js/gdm/loginDialog.js:819 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:624 ../js/ui/components/networkAgent.js:269
 #: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "Nombre d'usuario:"
 
-#: ../js/gdm/loginDialog.js:1151
+#: ../js/gdm/loginDialog.js:953
 msgid "Login Window"
 msgstr "Finestra d'inicio de sesión"
 
@@ -420,7 +421,7 @@ msgstr "S'ha anyadiu %s a os suyos favoritos."
 msgid "%s has been removed from your favorites."
 msgstr "S'ha sacau %s d'os suyos favoritos"
 
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:819
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:813
 #: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Configuración"
@@ -463,43 +464,43 @@ msgstr "%l∶%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:98
+#: ../js/ui/calendar.js:115
 msgctxt "grid sunday"
 msgid "S"
 msgstr "D"
 
 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:100
+#: ../js/ui/calendar.js:117
 msgctxt "grid monday"
 msgid "M"
 msgstr "L"
 
 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:102
+#: ../js/ui/calendar.js:119
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "M"
 
 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:104
+#: ../js/ui/calendar.js:121
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "X"
 
 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:106
+#: ../js/ui/calendar.js:123
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Ch"
 
 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:108
+#: ../js/ui/calendar.js:125
 msgctxt "grid friday"
 msgid "F"
 msgstr "V"
 
 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:110
+#: ../js/ui/calendar.js:127
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
@@ -510,52 +511,52 @@ msgstr "S"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #. */
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:140
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Dom"
 
 #. Translators: Event list abbreviation for Monday */
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:142
 msgctxt "list monday"
 msgid "M"
 msgstr "L"
 
 #. Translators: Event list abbreviation for Tuesday */
-#: ../js/ui/calendar.js:127
+#: ../js/ui/calendar.js:144
 msgctxt "list tuesday"
 msgid "T"
 msgstr "M"
 
 #. Translators: Event list abbreviation for Wednesday */
-#: ../js/ui/calendar.js:129
+#: ../js/ui/calendar.js:146
 msgctxt "list wednesday"
 msgid "W"
 msgstr "X"
 
 #. Translators: Event list abbreviation for Thursday */
-#: ../js/ui/calendar.js:131
+#: ../js/ui/calendar.js:148
 msgctxt "list thursday"
 msgid "Th"
 msgstr "Ch"
 
 #. Translators: Event list abbreviation for Friday */
-#: ../js/ui/calendar.js:133
+#: ../js/ui/calendar.js:150
 msgctxt "list friday"
 msgid "F"
 msgstr "V"
 
 #. Translators: Event list abbreviation for Saturday */
-#: ../js/ui/calendar.js:135
+#: ../js/ui/calendar.js:152
 msgctxt "list saturday"
 msgid "S"
 msgstr "D"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:461
 msgid "Previous month"
 msgstr "Mes anterior"
 
-#: ../js/ui/calendar.js:470
+#: ../js/ui/calendar.js:471
 msgid "Next month"
 msgstr "Mes siguient"
 
@@ -691,7 +692,7 @@ msgstr "Clau d'o ret de banda ampla mobil"
 #: ../js/ui/components/networkAgent.js:346
 #, javascript-format
 msgid "A password is required to connect to “%s”."
-msgstr "Se requier una clau ta connectar-se a \"%s\"."
+msgstr "Se requier una clau ta connectar-se a \"%s\"»."
 
 #: ../js/ui/components/polkitAgent.js:54
 msgid "Authentication Required"
@@ -988,7 +989,7 @@ msgstr "Veyer cuenta"
 msgid "Unknown reason"
 msgstr "Razón desconoixida"
 
-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:155
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:154
 msgid "Windows"
 msgstr "Finestras"
 
@@ -1012,13 +1013,6 @@ msgstr "Ubrir reloches"
 msgid "Date & Time Settings"
 msgstr "Achustes de calendata y hora"
 
-#. Translators: This is the date format to use when the calendar popup is
-#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#. */
-#: ../js/ui/dateMenu.js:132
-msgid "%A %B %e, %Y"
-msgstr "%A, %e de %B de %Y"
-
 #: ../js/ui/endSessionDialog.js:64
 #, javascript-format
 msgctxt "title"
@@ -1159,7 +1153,7 @@ msgstr "Instalar"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Descargar y instalar \"%s\" dende extensions.gnome.org?"
 
-#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:577
+#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:535
 msgid "Keyboard"
 msgstr "Teclau"
 
@@ -1243,11 +1237,11 @@ msgstr "Servilla d'o menú"
 msgid "No Messages"
 msgstr "No i hai mensaches"
 
-#: ../js/ui/messageTray.js:1986
+#: ../js/ui/messageTray.js:1984
 msgid "Message Tray"
 msgstr "Servilla de mensaches"
 
-#: ../js/ui/messageTray.js:2443 ../js/ui/overviewControls.js:483
+#: ../js/ui/messageTray.js:2441 ../js/ui/overviewControls.js:483
 #: ../js/ui/screenShield.js:152
 #, javascript-format
 msgid "%d new message"
@@ -1255,11 +1249,11 @@ msgid_plural "%d new messages"
 msgstr[0] "%d mensache nuevo"
 msgstr[1] "%d mensaches nuevos"
 
-#: ../js/ui/messageTray.js:3013
+#: ../js/ui/messageTray.js:3011
 msgid "System Information"
 msgstr "Informacion d'o sistema"
 
-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:439
+#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconoxiu"
@@ -1278,19 +1272,19 @@ msgstr "Vista cheneral"
 #. characters. */
 #: ../js/ui/overview.js:246
 msgid "Type to search…"
-msgstr "Tecleyar ta mirar…"
+msgstr "Tecleyar ta mirar..."
 
-#: ../js/ui/panel.js:521
+#: ../js/ui/panel.js:515
 msgid "Quit"
 msgstr "Salir"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview". */
-#: ../js/ui/panel.js:573
+#: ../js/ui/panel.js:567
 msgid "Activities"
 msgstr "Actividatz"
 
-#: ../js/ui/panel.js:924
+#: ../js/ui/panel.js:918
 msgid "Top Bar"
 msgstr "Barra superior"
 
@@ -1310,12 +1304,6 @@ msgstr "Trancar"
 msgid "Restarting…"
 msgstr "Reenchegando…"
 
-#. Translators: This is a time format for a date in
-#. long format */
-#: ../js/ui/screenShield.js:88
-msgid "%A, %B %d"
-msgstr "%A, %d de %B"
-
 #: ../js/ui/screenShield.js:154
 #, javascript-format
 msgid "%d new notification"
@@ -1339,11 +1327,11 @@ msgstr "No se podió blocar"
 msgid "Lock was blocked by an application"
 msgstr "Una aplicación impidió o bloqueyo"
 
-#: ../js/ui/search.js:609
-msgid "Searching…"
-msgstr "Mirando…"
-
 #: ../js/ui/search.js:611
+msgid "Searching…"
+msgstr "Mirando..."
+
+#: ../js/ui/search.js:613
 msgid "No results."
 msgstr "No se troboron resultaus."
 
@@ -1445,7 +1433,7 @@ msgstr "No connectau"
 msgid "Brightness"
 msgstr "Brilo"
 
-#: ../js/ui/status/keyboard.js:601
+#: ../js/ui/status/keyboard.js:559
 msgid "Show Keyboard Layout"
 msgstr "Amostrar a distribución d'o teclau"
 
@@ -1476,7 +1464,7 @@ msgstr "<desconoxiu>"
 #: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
 #: ../js/ui/status/network.js:1512
 msgid "Off"
-msgstr "Desenchegau"
+msgstr "DESENCHEGAU"
 
 #: ../js/ui/status/network.js:459
 msgid "Connected"
@@ -1499,13 +1487,13 @@ msgstr "Connectando"
 #. Translators: this is for network connections that require some kind of key or password */
 #: ../js/ui/status/network.js:474
 msgid "Authentication required"
-msgstr "S'amenista autenticación"
+msgstr "s'amenista autenticación"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
 #: ../js/ui/status/network.js:482
 msgid "Firmware missing"
-msgstr "Manca o \"firmware\""
+msgstr "falta o \"firmware\""
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage */
@@ -1539,7 +1527,7 @@ msgstr "O modo avión ye enchegau"
 
 #: ../js/ui/status/network.js:814
 msgid "Wi-Fi is disabled when airplane mode is on."
-msgstr "O Wi-Fi ye desactivau quan o modo avión  ye enchegau."
+msgstr "O wi-Fi ye desactivau quan o modo avión  ye enchegau."
 
 #: ../js/ui/status/network.js:815
 msgid "Turn Off Airplane Mode"
@@ -1547,15 +1535,15 @@ msgstr "Desenchegar o modo avión"
 
 #: ../js/ui/status/network.js:824
 msgid "Wi-Fi is Off"
-msgstr "O Wi-Fi ye desenchegau"
+msgstr "O wi-fi ye desenchegau"
 
 #: ../js/ui/status/network.js:825
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
-msgstr "O Wi-Fi ameniste estar enchegau ta connectar-se a un ret."
+msgstr "O wi-Fi ameniste estar enchegau ta connectar-se a un ret."
 
 #: ../js/ui/status/network.js:826
 msgid "Turn On Wi-Fi"
-msgstr "Enchegar o Wi-Fi"
+msgstr "Enchegar o wi-fi"
 
 #: ../js/ui/status/network.js:851
 msgid "Wi-Fi Networks"
@@ -1579,7 +1567,7 @@ msgstr "Selecciona o ret"
 
 #: ../js/ui/status/network.js:1180
 msgid "Wi-Fi Settings"
-msgstr "Opcions d'o Wi-Fi"
+msgstr "Opcions inalambricas"
 
 #: ../js/ui/status/network.js:1282
 msgid "Turn On"
@@ -1700,18 +1688,18 @@ msgstr "Encetar sesión como unatro usuario"
 msgid "Unlock Window"
 msgstr "Desbloquiar finestra"
 
-#: ../js/ui/viewSelector.js:159
+#: ../js/ui/viewSelector.js:158
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: ../js/ui/viewSelector.js:163
+#: ../js/ui/viewSelector.js:162
 msgid "Search"
 msgstr "Mirar"
 
 #: ../js/ui/windowAttentionHandler.js:19
 #, javascript-format
 msgid "“%s” is ready"
-msgstr "\"%s\" ye parau"
+msgstr "'%s' ye parau"
 
 #: ../js/ui/windowManager.js:65
 msgid "Do you want to keep these display settings?"
@@ -1735,13 +1723,6 @@ msgid_plural "Settings changes will revert in %d seconds"
 msgstr[0] "Os cambeos d'as opcions serán revertius en %d segundo"
 msgstr[1] "Os cambeos d'as opcions serán revertius en %d segundos"
 
-#. Translators: This represents the size of a window. The first number is
-#. * the width of the window and the second is the height. */
-#: ../js/ui/windowManager.js:599
-#, javascript-format
-msgid "%d x %d"
-msgstr "%d x %d"
-
 #: ../js/ui/windowMenu.js:34
 msgid "Minimize"
 msgstr "Minimizar"
@@ -1826,7 +1807,7 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Listar os modos posibles"
 
-#: ../src/shell-app.c:680
+#: ../src/shell-app.c:666
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Ha fallau en aventar \"%s\""
@@ -1891,6 +1872,12 @@ msgstr "L'usuario refusó o dialogo d'autenticación"
 #~ msgid "calendar:MY"
 #~ msgstr "calendar:MY"
 
+#~ msgid "%A %B %e, %Y"
+#~ msgstr "%A, %e de %B de %Y"
+
+#~ msgid "%A, %B %d"
+#~ msgstr "%A, %d de %B"
+
 #~ msgid "<b>%A</b>, <b>%H:%M</b>"
 #~ msgstr "<b>%A</b>, <b>%H:%M</b>"
 

po/ko.po

@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2014-09-13 07:37+0000\n"
-"PO-Revision-Date: 2014-11-16 03:54+0900\n"
+"PO-Revision-Date: 2014-09-18 01:41+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: Korean\n"
@@ -1444,7 +1444,7 @@ msgstr "<알 수 없음>"
 #: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
 #: ../js/ui/status/network.js:1511
 msgid "Off"
-msgstr "끔"
+msgstr "끄기"
 
 #: ../js/ui/status/network.js:459
 msgid "Connected"
@@ -1626,7 +1626,7 @@ msgstr "비행기 모드"
 
 #: ../js/ui/status/rfkill.js:85
 msgid "On"
-msgstr "켬"
+msgstr "켜기"
 
 #: ../js/ui/status/system.js:317
 msgid "Switch User"