update theme

We don't use the gradient part of a Separator, so we can
just use a StWidget instead and shut up some warnings

.gitignore

@@ -23,6 +23,7 @@ data/gnome-shell-wayland.desktop
 data/gnome-shell-wayland.desktop.in
 data/gnome-shell-extension-prefs.desktop
 data/gnome-shell-extension-prefs.desktop.in
+data/gnome-shell-theme.gresource
 data/gschemas.compiled
 data/perf-background.xml
 data/org.gnome.shell.gschema.xml
@@ -85,6 +86,7 @@ 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,3 +1,6 @@
 [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 = https://git.gnome.org/browse/gnome-shell-sass

NEWS

@@ -1,3 +1,133 @@
+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]
+* Reset the OSK to primary on monitor changes [Rui; #738536]
+* Use LC_TIME locale for format string translations [Florian; #738640]
+* Summarize queued up notifications [Devyani; #702460]
+* Improve handling of multi-day events [Andreas; #727302]
+* Support EXTERNAL scroll policy type [Florian; #739379]
+* Misc. bugfixes [Owen, Rui; #738652, #739252]
+
+Contributors:
+  Andreas Brauchli, Cosimo Cecchi, Devyani Kota, Rui Matos, Florian Müllner,
+  Jasper St. Pierre, Owen W. Taylor
+
+Translations:
+  Bahodir Mansurov [uz@cyrillic]
+
+3.14.1
+======
+* Fix pulse animation for scrolled app folders [Florian; #736885]
+* Fix updating background on file changes [Owen; #710756]
+* Obtain keyboard variant from IBus [Jinkyu; #735066]
+* Implement Ctrl-u / Ctrl-k keybindings in entries [Florian; #737346]
+* Pass VPN hints to auth dialog [Dan; #737592]
+* Only allow one screenshot request at a time [Adel; #737456]
+* Respect disable-save-to-disc lockdown setting [Florian; #737846]
+* Respect scaling-factor for profile pictures [Darcy; #735419]
+* Focus login screen after lifting the lock screen shield [Ray; #708105]
+* Speed up pulse animation for few items [Carlos S.; #737017]
+* Fix gap between workspace switcher and screen edge [Florian; #728899]
+* Disable unredirection during recordings [Adel; #738226]
+* Ensure there's always at least one input source [Rui; #738303]
+* Restrict width of dash icons' context menus [Adel; #738054]
+* Misc. bug fixes [Jasper, Florian, Carlos G., Owen; #736999, #737382, #737001,
+  #738314, #738256, #738147]
+
+Contributors:
+  Darcy Beurle, Cosimo Cecchi, Adel Gadllah, Carlos Garnacho, Rui Matos,
+  Florian Müllner, Carlos Soriano, Jasper St. Pierre, Ray Strode, Patrick Ward,
+  Dan Williams, Owen W. Taylor, Jinkyu Yi
+
+Translations:
+  Мирослав Николић po/sr, sr@latin.po, Fran Diéguez [gl], Marek Černocký [cs],
+  Saibal Ray [bn_IN], Rajesh Ranjan [hi], Friedel Wolff [af],
+  Zhou Fang [zh_CN], Krishnababu Krothapalli [te], Kjartan Maraas [nb],
+  Rūdolfs Mazurs [lv], Sweta Kothari [gu], Christian Kirbach [de],
+  Cheng-Chia Tseng [zh_TW], Pedro Albuquerque [pt], Daniel Mustieles [es],
+  Luca Ferretti [it], Baurzhan Muftakhidinov [kk], Arash Mousavi [fa],
+  Milo Casagrande [it]
+
+3.14.0
+======
+* Fix exposure of the accessible tree [Alejandro; #736821]
+* Hide empty app folders in app picker [Florian; #736910]
+
+Contributors:
+  Florian Müllner, Alejandro Piñeiro
+
+Translations:
+  Yuri Myasoedov [ru], Pawan Chitrakar [ne], Manoj Kumar Giri [or],
+  Daniel Mustieles [es], GNOME Translation Robot [de], Rajesh Ranjan [hi],
+  Shankar Prasad [kn], Kenneth Nielsen [da], Daniel Korostil [uk],
+  Changwoo Ryu [ko], A S Alam [pa], Tom Tryfonidis [el], Petr Kovar [cs]
+
 3.13.92
 =======
 * Fix submenu arrow animations [Hashem; #728927]

autogen.sh

@@ -14,7 +14,7 @@ PKG_NAME="gnome-shell"
 }
 
 # Fetch submodules if needed
-if test ! -f src/gvc/Makefile.am;
+if test ! -f src/gvc/Makefile.am || test ! -f data/theme/gnome-shell-sass/COPYING;
 then
   echo "+ Setting up submodules"
   git submodule init

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.13.92],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.15.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -37,7 +37,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 GLIB_GSETTINGS
 
 # Get a value to substitute into gnome-shell.in
-AM_PATH_PYTHON([2.5])
+AM_PATH_PYTHON([3])
 AC_SUBST(PYTHON)
 
 # We need at least this, since gst_plugin_register_static() was added
@@ -76,11 +76,11 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.15.90
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.13.92
+MUTTER_MIN_VERSION=3.15.4
-GTK_MIN_VERSION=3.13.2
+GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
-LIBEDATASERVER_MIN_VERSION=3.5.3
+LIBEDATASERVER_MIN_VERSION=3.13.90
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
@@ -97,7 +97,6 @@ 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
@@ -119,7 +118,7 @@ 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.7.4)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.13.1)
 PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
 
 AC_ARG_ENABLE(browser-plugin,
@@ -232,9 +231,17 @@ esac
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
-BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
+if test -z "${BROWSER_PLUGIN_DIR}"; then
+  BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
+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_CONFIG_FILES([
   Makefile
   data/Makefile

data/Makefile.am

@@ -35,44 +35,11 @@ introspection_DATA =				\
 	org.gnome.ShellSearchProvider.xml	\
 	org.gnome.ShellSearchProvider2.xml
 
-themedir = $(pkgdatadir)/theme
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/theme --generate-dependencies $(srcdir)/gnome-shell-theme.gresource.xml)
-dist_theme_DATA =				\
+gnome-shell-theme.gresource: gnome-shell-theme.gresource.xml $(resource_files)
-	theme/calendar-arrow-left.svg		\
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/theme $<
-	theme/calendar-arrow-right.svg		\
+resourcedir = $(pkgdatadir)
-	theme/calendar-today.svg		\
+resource_DATA = gnome-shell-theme.gresource
-	theme/checkbox-focused.svg		\
-	theme/checkbox-off-focused.svg		\
-	theme/checkbox-off.svg			\
-	theme/checkbox.svg			\
-	theme/close-window.svg			\
-	theme/close.svg				\
-	theme/corner-ripple-ltr.png		\
-	theme/corner-ripple-rtl.png		\
-	theme/dash-placeholder.svg		\
-	theme/filter-selected-ltr.svg		\
-	theme/filter-selected-rtl.svg		\
-	theme/gnome-shell.css			\
-	theme/logged-in-indicator.svg		\
-	theme/message-tray-background.png	\
-	theme/more-results.svg			\
-	theme/noise-texture.png			\
-	theme/page-indicator-active.svg		\
-	theme/page-indicator-inactive.svg	\
-	theme/page-indicator-checked.svg	\
-	theme/page-indicator-hover.svg		\
-	theme/panel-button-border.svg		\
-	theme/panel-button-highlight-narrow.svg	\
-	theme/panel-button-highlight-wide.svg	\
-	theme/process-working.svg		\
-	theme/running-indicator.svg		\
-	theme/source-button-border.svg		\
-	theme/summary-counter.svg		\
-	theme/toggle-off-us.svg			\
-	theme/toggle-off-intl.svg		\
-	theme/toggle-on-us.svg			\
-	theme/toggle-on-intl.svg		\
-	theme/ws-switch-arrow-up.png		\
-	theme/ws-switch-arrow-down.png
 
 backgrounddir = $(pkgdatadir)
 background_DATA = perf-background.xml
@@ -116,7 +83,9 @@ EXTRA_DIST =						\
 	perf-background.xml.in				\
 	org.gnome.Shell.PortalHelper.desktop.in		\
 	org.gnome.Shell.PortalHelper.service.in		\
-	org.gnome.shell.gschema.xml.in.in
+	org.gnome.shell.gschema.xml.in.in		\
+	gnome-shell-theme.gresource.xml 		\
+	$(resource_files)
 
 CLEANFILES +=						\
 	gnome-shell.desktop.in				\
@@ -128,4 +97,5 @@ CLEANFILES +=						\
 	perf-background.xml				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
-	org.gnome.shell.gschema.xml.in
+	org.gnome.shell.gschema.xml.in			\
+	gnome-shell-theme.gresource

data/gnome-shell-theme.gresource.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell/theme">
+    <file>calendar-arrow-left.svg</file>
+    <file>calendar-arrow-right.svg</file>
+    <file>calendar-today.svg</file>
+    <file>checkbox-focused.svg</file>
+    <file>checkbox-off-focused.svg</file>
+    <file>checkbox-off.svg</file>
+    <file>checkbox.svg</file>
+    <file>close-window.svg</file>
+    <file>close.svg</file>
+    <file>corner-ripple-ltr.png</file>
+    <file>corner-ripple-rtl.png</file>
+    <file>dash-placeholder.svg</file>
+    <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>noise-texture.png</file>
+    <file>page-indicator-active.svg</file>
+    <file>page-indicator-inactive.svg</file>
+    <file>page-indicator-checked.svg</file>
+    <file>page-indicator-hover.svg</file>
+    <file>process-working.svg</file>
+    <file>running-indicator.svg</file>
+    <file>source-button-border.svg</file>
+    <file>summary-counter.svg</file>
+    <file>toggle-off-us.svg</file>
+    <file>toggle-off-intl.svg</file>
+    <file>toggle-on-us.svg</file>
+    <file>toggle-on-intl.svg</file>
+    <file>ws-switch-arrow-up.png</file>
+    <file>ws-switch-arrow-down.png</file>
+  </gresource>
+</gresources>

data/org.gnome.Shell.PortalHelper.desktop.in

@@ -1,9 +1,9 @@
 [Desktop Entry]
-_Name=Captive Portal
+_Name=Network Login
 Type=Application
 Exec=gapplication launch org.gnome.Shell.PortalHelper
 DBusActivatable=true
 NoDisplay=true
 Icon=network-workgroup
 StartupNotify=true
-OnlyShowIn=GNOME;
+OnlyShowIn=GNOME;

data/theme/HACKING

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

data/theme/checkbox-focused.svg

@@ -14,7 +14,7 @@
    height="22"
    id="svg3199"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="checkbox.svg">
   <defs
      id="defs3201">
@@ -132,51 +132,54 @@
        xlink:href="#linearGradient10597-5"
        inkscape:collect="always" />
     <linearGradient
-       y2="-388.72955"
+       inkscape:collect="always"
-       x2="-93.031357"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8"
-       y1="-396.34738"
+       id="linearGradient11811"
-       x1="-93.031357"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient14219-6"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
-       xlink:href="#linearGradient15404-9"
+       x1="63.568954"
-       inkscape:collect="always" />
+       y1="127.16142"
+       x2="63.568954"
+       y2="152.6618" />
     <linearGradient
-       id="linearGradient15404-9"
+       id="linearGradient5581-5-2-4-6-8-7-35-8">
-       inkscape:collect="always">
       <stop
-         id="stop15406-6"
+         id="stop5583-0-92-8-0-7-6-5-1"
          offset="0"
-         style="stop-color:#515151;stop-opacity:1" />
+         style="stop-color:#454c4c;stop-opacity:1;" />
       <stop
-         id="stop15408-7"
+         style="stop-color:#393f3f;stop-opacity:1;"
+         offset="0.40000001"
+         id="stop5585-4-7-2-7-9-9-92-0" />
+      <stop
+         id="stop5587-6-7-2-0-3-1-21-5"
          offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
+         style="stop-color:#2d3232;stop-opacity:1;" />
     </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#000000"
+     pagecolor="#a2a2a2"
      bordercolor="#2d2d2d"
      borderopacity="1"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
+     inkscape:zoom="22.627417"
-     inkscape:cx="71.516955"
+     inkscape:cx="9.6447897"
-     inkscape:cy="5.8710559"
+     inkscape:cy="12.591409"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1412"
      inkscape:window-height="1067"
-     inkscape:window-x="2635"
+     inkscape:window-x="184"
-     inkscape:window-y="226"
+     inkscape:window-y="233"
      inkscape:window-maximized="0"
      borderlayer="true"
      inkscape:showpageshadow="false"
      inkscape:snap-nodes="false"
      inkscape:snap-bbox="true"
-     showborder="false">
+     showborder="true">
     <inkscape:grid
        type="xygrid"
        id="grid14843"
@@ -203,87 +206,56 @@
      id="layer1"
      transform="translate(-342.5,-521.36218)">
     <g
-       transform="matrix(0.80230061,0,0,0.80230061,-87.624044,-453.10297)"
+       style="display:inline"
-       id="g14586-0"
+       id="use5671"
-       style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none">
+       transform="matrix(1.3594109,0,0,1.3564242,319.2059,481.99447)">
-      <g
+      <rect
-         inkscape:export-ydpi="90"
+         transform="matrix(0.47304779,0,0,0.4807373,-6.3607039,-29.396216)"
-         inkscape:export-xdpi="90"
+         rx="4.4136767"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         y="125.3458"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         x="50.440369"
-         id="g15291-9-6"
+         height="29.154205"
-         style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new">
+         width="29.559635"
-        <g
+         id="rect11803"
-           transform="translate(877.50354,-102.83507)"
+         style="color:#000000;fill:url(#linearGradient11811);fill-opacity:1;stroke:#3465a4;stroke-width:1.54426003000000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="g16853-4-9"
+         ry="4.4233952" />
-           style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;enable-background:new">
+      <path
-          <rect
+         inkscape:connector-curvature="0"
-             transform="scale(1,-1)"
+         id="path11809"
-             style="color:#000000;fill:url(#linearGradient14219-6);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.24833274;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         d="m 17.87105,33.844107 0,-0.773112 c 0,-1.031264 0.807171,-1.836142 1.811982,-1.836142 l 9.612456,0 c 1.004811,0 1.787822,0.804878 1.787822,1.836142 l 0,0.773112 c 0,-1.031264 -0.783011,-1.836142 -1.787822,-1.836142 l -9.612456,0 c -1.004811,0 -1.811982,0.804878 -1.811982,1.836142 z"
-             id="rect6506-6"
+         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;opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             width="11.281681"
+         sodipodi:nodetypes="csssscssc" />
-             height="11.26221"
+      <path
-             x="-409.59354"
+         sodipodi:nodetypes="csssscssc"
-             y="-284.40115"
+         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;opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             rx="1.0052766"
+         d="m 17.87105,41.158551 0,0.773112 c 0,1.031264 0.807171,1.836142 1.811982,1.836142 l 9.612456,0 c 1.004811,0 1.787822,-0.804878 1.787822,-1.836142 l 0,-0.773112 c 0,1.031264 -0.783011,1.836142 -1.787822,1.836142 l -9.612456,0 c -1.004811,0 -1.811982,-0.804878 -1.811982,-1.836142 z"
-             ry="1.0052764" />
+         id="path11867"
-        </g>
+         inkscape:connector-curvature="0" />
-      </g>
+      <path
-      <g
+         inkscape:connector-curvature="0"
-         inkscape:export-ydpi="90"
+         id="path11869"
-         inkscape:export-xdpi="90"
+         d="m 17.87105,41.895784 0,0.773112 c 0,1.031264 0.644622,1.836142 1.649433,1.836142 l 10.067593,0 c 1.004811,0 1.495234,-0.804878 1.495234,-1.836142 l 0,-0.773112 c 0,1.031264 -0.783011,1.836142 -1.787822,1.836142 l -9.612456,0 c -1.004811,0 -1.811982,-0.804878 -1.811982,-1.836142 z"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         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;opacity:0.15;color:#000000;fill:#000000;fill-opacity:0.85253451;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         transform="translate(343.99999,987.99997)"
+         sodipodi:nodetypes="csssscssc" />
-         id="g5886-5"
-         style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new" />
-    </g>
-    <g
-       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
-       id="g14586">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
-         id="g15291-9"
-         style="display:inline;enable-background:new">
-        <g
-           transform="translate(877.50354,-102.83507)"
-           id="g16853-4"
-           style="enable-background:new" />
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="translate(343.99999,987.99997)"
-         id="g5886"
-         style="display:inline;enable-background:new">
-        <path
-           style="fill:none;stroke:url(#linearGradient5891-0-4);stroke-width:7.11431503;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
-           id="path5835"
-           inkscape:path-effect="#path-effect5837-4-6"
-           inkscape:original-d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
-           inkscape:path-effect="#path-effect5837-4-6"
-           id="path5880"
-           d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
-           style="fill:none;stroke:#4787c8;stroke-width:3.55715752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:nodetypes="ccc" />
-        <path
-           style="fill:none;stroke:#7ea7d3;stroke-width:1.18571913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 197.45937,240.47455 c -0.17828,-0.29362 -0.20087,-0.67548 -0.0603,-0.98892 0.14055,-0.31344 0.43739,-0.54812 0.77144,-0.62817 0.33405,-0.08 0.69314,-0.01 0.99635,0.15175 0.30321,0.16144 0.55146,0.40727 0.79165,0.65284 l 3.66429,3.74643 12.87946,-12.98973 c 0.20796,-0.20974 0.42306,-0.41969 0.68548,-0.55522 0.26242,-0.13553 0.57293,-0.19052 0.85827,-0.11426 0.14267,0.0381 0.27708,0.10787 0.38874,0.20452 0.11167,0.0966 0.20021,0.22004 0.25479,0.35726 0.0546,0.13722 0.075,0.28793 0.0585,0.43468 -0.0165,0.14674 -0.07,0.28919 -0.15422,0.41052"
-           id="path5882"
-           inkscape:path-effect="#path-effect5884-4-7"
-           inkscape:original-d="m 197.45937,240.47455 c 0.65604,-0.56057 2.02485,-1.34847 2.49911,-0.8125 l 3.66429,3.74643 12.87946,-12.98973 c 0.6875,-0.6875 2.09152,0.7375 2.09152,0.7375"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csccc" />
-      </g>
     </g>
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect17347"
+       width="21.943846"
+       height="21.943846"
+       x="342.29913"
+       y="521.58435" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.8;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 359.97505,524.8252 -7.88606,7.71465 -2.57155,-2.57155 -2.91442,-0.0427 0,2.35727 4.02875,3.98587 c 0.80342,0.80309 2.111,0.80309 2.91442,0 l 8.18609,-8.22894 0,-0.38573 c 0,-1.24128 0.19944,-1.76801 -0.82915,-2.29836 z"
+       id="rect5147-9-1-5-7-6-5-8-7"
+       sodipodi:nodetypes="ccccccccscc" />
+    <path
+       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:#eeeeec;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 361.65223,524.52745 -9.5602,9.36735 -2.56345,-2.56344 -2.92846,-0.0214 0.0153,2.32639 4.02203,4.02206 c 0.80341,0.80309 2.10565,0.80309 2.90906,0 l 10.95049,-11.05765 0.003,-2.1502 z"
+       id="path12830-4-17-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
   </g>
 </svg>

data/theme/checkbox-off-focused.svg

@@ -14,22 +14,10 @@
    height="22"
    id="svg3199"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="checkbox-off.svg">
   <defs
      id="defs3201">
-    <linearGradient
-       id="linearGradient15404"
-       inkscape:collect="always">
-      <stop
-         id="stop15406"
-         offset="0"
-         style="stop-color:#515151;stop-opacity:1" />
-      <stop
-         id="stop15408"
-         offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
-    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
@@ -56,16 +44,6 @@
        effect="spiro"
        id="path-effect5884-4-7"
        is_visible="true" />
-    <linearGradient
-       y2="-388.72955"
-       x2="-93.031357"
-       y1="-396.34738"
-       x1="-93.031357"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14219"
-       xlink:href="#linearGradient15404"
-       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient10013-4-63-6">
@@ -110,30 +88,55 @@
        id="linearGradient15376"
        xlink:href="#linearGradient10597-5"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8"
+       id="linearGradient11811"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="63.568954"
+       y1="127.16142"
+       x2="63.568954"
+       y2="152.6618" />
+    <linearGradient
+       id="linearGradient5581-5-2-4-6-8-7-35-8">
+      <stop
+         id="stop5583-0-92-8-0-7-6-5-1"
+         offset="0"
+         style="stop-color:#454c4c;stop-opacity:1;" />
+      <stop
+         style="stop-color:#393f3f;stop-opacity:1;"
+         offset="0.40000001"
+         id="stop5585-4-7-2-7-9-9-92-0" />
+      <stop
+         id="stop5587-6-7-2-0-3-1-21-5"
+         offset="1"
+         style="stop-color:#2d3232;stop-opacity:1;" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#000000"
+     pagecolor="#a2a2a2"
      bordercolor="#2d2d2d"
      borderopacity="1"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
+     inkscape:zoom="5.6568542"
-     inkscape:cx="6.1225392"
+     inkscape:cx="19.79113"
-     inkscape:cy="3.6003241"
+     inkscape:cy="11.232334"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1412"
      inkscape:window-height="1067"
-     inkscape:window-x="2116"
+     inkscape:window-x="184"
-     inkscape:window-y="261"
+     inkscape:window-y="233"
      inkscape:window-maximized="0"
      borderlayer="true"
      inkscape:showpageshadow="false"
      inkscape:snap-nodes="false"
      inkscape:snap-bbox="true"
-     showborder="false">
+     showborder="true">
     <inkscape:grid
        type="xygrid"
        id="grid14843"
@@ -160,39 +163,44 @@
      id="layer1"
      transform="translate(-342.5,-521.36218)">
     <g
-       transform="matrix(0.80230061,0,0,0.80230061,-87.624044,-453.10297)"
+       style="display:inline"
-       id="g14586"
+       id="use5671"
-       style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none">
+       transform="matrix(1.3594109,0,0,1.3564242,319.2059,481.99447)">
-      <g
+      <rect
-         inkscape:export-ydpi="90"
+         transform="matrix(0.47304779,0,0,0.4807373,-6.3607039,-29.396216)"
-         inkscape:export-xdpi="90"
+         rx="4.4136767"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         y="125.3458"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         x="50.440369"
-         id="g15291-9"
+         height="29.154205"
-         style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new">
+         width="29.559635"
-        <g
+         id="rect11803"
-           transform="translate(877.50354,-102.83507)"
+         style="color:#000000;fill:url(#linearGradient11811);fill-opacity:1;stroke:#3465a4;stroke-width:1.54426003000000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="g16853-4"
+         ry="4.4233952" />
-           style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;enable-background:new">
+      <path
-          <rect
+         inkscape:connector-curvature="0"
-             transform="scale(1,-1)"
+         id="path11809"
-             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.24833274;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         d="m 17.87105,33.844107 0,-0.773112 c 0,-1.031264 0.807171,-1.836142 1.811982,-1.836142 l 9.612456,0 c 1.004811,0 1.787822,0.804878 1.787822,1.836142 l 0,0.773112 c 0,-1.031264 -0.783011,-1.836142 -1.787822,-1.836142 l -9.612456,0 c -1.004811,0 -1.811982,0.804878 -1.811982,1.836142 z"
-             id="rect6506-6"
+         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;opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             width="11.281681"
+         sodipodi:nodetypes="csssscssc" />
-             height="11.26221"
+      <path
-             x="-409.59354"
+         sodipodi:nodetypes="csssscssc"
-             y="-284.40115"
+         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;opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             rx="1.0052766"
+         d="m 17.87105,41.158551 0,0.773112 c 0,1.031264 0.807171,1.836142 1.811982,1.836142 l 9.612456,0 c 1.004811,0 1.787822,-0.804878 1.787822,-1.836142 l 0,-0.773112 c 0,1.031264 -0.783011,1.836142 -1.787822,1.836142 l -9.612456,0 c -1.004811,0 -1.811982,-0.804878 -1.811982,-1.836142 z"
-             ry="1.0052764" />
+         id="path11867"
-        </g>
+         inkscape:connector-curvature="0" />
-      </g>
+      <path
-      <g
+         inkscape:connector-curvature="0"
-         inkscape:export-ydpi="90"
+         id="path11869"
-         inkscape:export-xdpi="90"
+         d="m 17.87105,41.895784 0,0.773112 c 0,1.031264 0.644622,1.836142 1.649433,1.836142 l 10.067593,0 c 1.004811,0 1.495234,-0.804878 1.495234,-1.836142 l 0,-0.773112 c 0,1.031264 -0.783011,1.836142 -1.787822,1.836142 l -9.612456,0 c -1.004811,0 -1.811982,-0.804878 -1.811982,-1.836142 z"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         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;opacity:0.15;color:#000000;fill:#000000;fill-opacity:0.85253451;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         transform="translate(343.99999,987.99997)"
+         sodipodi:nodetypes="csssscssc" />
-         id="g5886"
-         style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new" />
     </g>
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect17347"
+       width="21.943846"
+       height="21.943846"
+       x="342.29913"
+       y="521.58435" />
   </g>
 </svg>

data/theme/checkbox-off.svg

@@ -14,22 +14,10 @@
    height="22"
    id="svg3199"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="checkbox.svg">
+   sodipodi:docname="checkbox-focused.svg">
   <defs
      id="defs3201">
-    <linearGradient
-       id="linearGradient15404"
-       inkscape:collect="always">
-      <stop
-         id="stop15406"
-         offset="0"
-         style="stop-color:#515151;stop-opacity:1" />
-      <stop
-         id="stop15408"
-         offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
-    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
@@ -44,27 +32,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872-5-1"
-       id="linearGradient5891-0-4"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872-5-1">
-      <stop
-         style="stop-color:#0b2e52;stop-opacity:1"
-         offset="0"
-         id="stop5874-4-4" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876-0-5" />
-    </linearGradient>
     <inkscape:path-effect
        effect="spiro"
        id="path-effect5837-4-6"
@@ -77,16 +44,6 @@
        effect="spiro"
        id="path-effect5884-4-7"
        is_visible="true" />
-    <linearGradient
-       y2="-388.72955"
-       x2="-93.031357"
-       y1="-396.34738"
-       x1="-93.031357"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14219"
-       xlink:href="#linearGradient15404"
-       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient10013-4-63-6">
@@ -131,30 +88,55 @@
        id="linearGradient15376"
        xlink:href="#linearGradient10597-5"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8"
+       id="linearGradient11811"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="63.568954"
+       y1="127.16142"
+       x2="63.568954"
+       y2="152.6618" />
+    <linearGradient
+       id="linearGradient5581-5-2-4-6-8-7-35-8">
+      <stop
+         id="stop5583-0-92-8-0-7-6-5-1"
+         offset="0"
+         style="stop-color:#454c4c;stop-opacity:1;" />
+      <stop
+         style="stop-color:#393f3f;stop-opacity:1;"
+         offset="0.40000001"
+         id="stop5585-4-7-2-7-9-9-92-0" />
+      <stop
+         id="stop5587-6-7-2-0-3-1-21-5"
+         offset="1"
+         style="stop-color:#2d3232;stop-opacity:1;" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#000000"
+     pagecolor="#a2a2a2"
      bordercolor="#2d2d2d"
      borderopacity="1"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
+     inkscape:zoom="1"
-     inkscape:cx="71.247925"
+     inkscape:cx="9.6447897"
-     inkscape:cy="33.339093"
+     inkscape:cy="12.591409"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1412"
      inkscape:window-height="1067"
-     inkscape:window-x="2116"
+     inkscape:window-x="184"
-     inkscape:window-y="261"
+     inkscape:window-y="233"
      inkscape:window-maximized="0"
      borderlayer="true"
      inkscape:showpageshadow="false"
      inkscape:snap-nodes="false"
      inkscape:snap-bbox="true"
-     showborder="false">
+     showborder="true">
     <inkscape:grid
        type="xygrid"
        id="grid14843"
@@ -181,38 +163,44 @@
      id="layer1"
      transform="translate(-342.5,-521.36218)">
     <g
-       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
+       style="display:inline"
-       id="g14586">
+       id="use5671"
-      <g
+       transform="matrix(1.3594109,0,0,1.3564242,319.2059,481.99447)">
-         inkscape:export-ydpi="90"
+      <rect
-         inkscape:export-xdpi="90"
+         transform="matrix(0.47304779,0,0,0.4807373,-6.3607039,-29.396216)"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         rx="4.4136767"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         y="125.3458"
-         id="g15291-9"
+         x="50.440369"
-         style="display:inline;enable-background:new">
+         height="29.154205"
-        <g
+         width="29.559635"
-           transform="translate(877.50354,-102.83507)"
+         id="rect11803"
-           id="g16853-4"
+         style="color:#000000;fill:url(#linearGradient11811);fill-opacity:1;stroke:#1c1f1f;stroke-width:1.54426003;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           style="enable-background:new">
+         ry="4.4233952" />
-          <rect
+      <path
-             transform="scale(1,-1)"
+         inkscape:connector-curvature="0"
-             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#868686;stroke-width:0.59377144999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         id="path11809"
-             id="rect6506-6"
+         d="m 17.87105,33.844107 0,-0.773112 c 0,-1.031264 0.807171,-1.836142 1.811982,-1.836142 l 9.612456,0 c 1.004811,0 1.787822,0.804878 1.787822,1.836142 l 0,0.773112 c 0,-1.031264 -0.783011,-1.836142 -1.787822,-1.836142 l -9.612456,0 c -1.004811,0 -1.811982,0.804878 -1.811982,1.836142 z"
-             width="11.281681"
+         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;opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             height="11.26221"
+         sodipodi:nodetypes="csssscssc" />
-             x="-409.59354"
+      <path
-             y="-284.40115"
+         sodipodi:nodetypes="csssscssc"
-             rx="0.95632279"
+         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;opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             ry="0.95632273" />
+         d="m 17.87105,41.158551 0,0.773112 c 0,1.031264 0.807171,1.836142 1.811982,1.836142 l 9.612456,0 c 1.004811,0 1.787822,-0.804878 1.787822,-1.836142 l 0,-0.773112 c 0,1.031264 -0.783011,1.836142 -1.787822,1.836142 l -9.612456,0 c -1.004811,0 -1.811982,-0.804878 -1.811982,-1.836142 z"
-        </g>
+         id="path11867"
-      </g>
+         inkscape:connector-curvature="0" />
-      <g
+      <path
-         inkscape:export-ydpi="90"
+         inkscape:connector-curvature="0"
-         inkscape:export-xdpi="90"
+         id="path11869"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         d="m 17.87105,41.895784 0,0.773112 c 0,1.031264 0.644622,1.836142 1.649433,1.836142 l 10.067593,0 c 1.004811,0 1.495234,-0.804878 1.495234,-1.836142 l 0,-0.773112 c 0,1.031264 -0.783011,1.836142 -1.787822,1.836142 l -9.612456,0 c -1.004811,0 -1.811982,-0.804878 -1.811982,-1.836142 z"
-         transform="translate(343.99999,987.99997)"
+         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;opacity:0.15;color:#000000;fill:#000000;fill-opacity:0.85253451;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         id="g5886"
+         sodipodi:nodetypes="csssscssc" />
-         style="display:inline;enable-background:new" />
     </g>
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect17347"
+       width="21.943846"
+       height="21.943846"
+       x="342.29913"
+       y="521.58435" />
   </g>
 </svg>

data/theme/checkbox.svg

@@ -14,8 +14,8 @@
    height="22"
    id="svg3199"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="checkbox-focused.svg">
+   sodipodi:docname="checkbox.svg">
   <defs
      id="defs3201">
     <linearGradient
@@ -131,30 +131,55 @@
        id="linearGradient15376"
        xlink:href="#linearGradient10597-5"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5581-5-2-4-6-8-7-35-8"
+       id="linearGradient11811"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0317573,0,0,1.0053174,-102.66338,-0.82153381)"
+       x1="63.568954"
+       y1="127.16142"
+       x2="63.568954"
+       y2="152.6618" />
+    <linearGradient
+       id="linearGradient5581-5-2-4-6-8-7-35-8">
+      <stop
+         id="stop5583-0-92-8-0-7-6-5-1"
+         offset="0"
+         style="stop-color:#454c4c;stop-opacity:1;" />
+      <stop
+         style="stop-color:#393f3f;stop-opacity:1;"
+         offset="0.40000001"
+         id="stop5585-4-7-2-7-9-9-92-0" />
+      <stop
+         id="stop5587-6-7-2-0-3-1-21-5"
+         offset="1"
+         style="stop-color:#2d3232;stop-opacity:1;" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#000000"
+     pagecolor="#a2a2a2"
      bordercolor="#2d2d2d"
      borderopacity="1"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="64.516955"
+     inkscape:cx="-0.17876005"
-     inkscape:cy="13.871056"
+     inkscape:cy="11.944326"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1412"
+     inkscape:window-width="2560"
-     inkscape:window-height="1067"
+     inkscape:window-height="1375"
-     inkscape:window-x="2635"
+     inkscape:window-x="0"
-     inkscape:window-y="226"
+     inkscape:window-y="27"
-     inkscape:window-maximized="0"
+     inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
      inkscape:snap-nodes="false"
      inkscape:snap-bbox="true"
-     showborder="false">
+     showborder="true">
     <inkscape:grid
        type="xygrid"
        id="grid14843"
@@ -171,7 +196,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -181,63 +206,56 @@
      id="layer1"
      transform="translate(-342.5,-521.36218)">
     <g
-       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
+       style="display:inline"
-       id="g14586">
+       id="use5671"
-      <g
+       transform="matrix(1.3594109,0,0,1.3564242,319.2059,481.99447)">
-         inkscape:export-ydpi="90"
+      <rect
-         inkscape:export-xdpi="90"
+         transform="matrix(0.47304779,0,0,0.4807373,-6.3607039,-29.396216)"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         rx="4.4136767"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
+         y="125.3458"
-         id="g15291-9"
+         x="50.440369"
-         style="display:inline;enable-background:new">
+         height="29.154205"
-        <g
+         width="29.559635"
-           transform="translate(877.50354,-102.83507)"
+         id="rect11803"
-           id="g16853-4"
+         style="color:#000000;fill:url(#linearGradient11811);fill-opacity:1;stroke:#1c1f1f;stroke-width:1.54426003;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           style="enable-background:new">
+         ry="4.4233952" />
-          <rect
+      <path
-             transform="scale(1,-1)"
+         inkscape:connector-curvature="0"
-             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#868686;stroke-width:0.59377144999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         id="path11809"
-             id="rect6506-6"
+         d="m 17.87105,33.844107 0,-0.773112 c 0,-1.031264 0.807171,-1.836142 1.811982,-1.836142 l 9.612456,0 c 1.004811,0 1.787822,0.804878 1.787822,1.836142 l 0,0.773112 c 0,-1.031264 -0.783011,-1.836142 -1.787822,-1.836142 l -9.612456,0 c -1.004811,0 -1.811982,0.804878 -1.811982,1.836142 z"
-             width="11.281681"
+         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;opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             height="11.26221"
+         sodipodi:nodetypes="csssscssc" />
-             x="-409.59354"
+      <path
-             y="-284.40115"
+         sodipodi:nodetypes="csssscssc"
-             rx="0.95632279"
+         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;opacity:0.15;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             ry="0.95632273" />
+         d="m 17.87105,41.158551 0,0.773112 c 0,1.031264 0.807171,1.836142 1.811982,1.836142 l 9.612456,0 c 1.004811,0 1.787822,-0.804878 1.787822,-1.836142 l 0,-0.773112 c 0,1.031264 -0.783011,1.836142 -1.787822,1.836142 l -9.612456,0 c -1.004811,0 -1.811982,-0.804878 -1.811982,-1.836142 z"
-        </g>
+         id="path11867"
-      </g>
+         inkscape:connector-curvature="0" />
-      <g
+      <path
-         inkscape:export-ydpi="90"
+         inkscape:connector-curvature="0"
-         inkscape:export-xdpi="90"
+         id="path11869"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
+         d="m 17.87105,41.895784 0,0.773112 c 0,1.031264 0.644622,1.836142 1.649433,1.836142 l 10.067593,0 c 1.004811,0 1.495234,-0.804878 1.495234,-1.836142 l 0,-0.773112 c 0,1.031264 -0.783011,1.836142 -1.787822,1.836142 l -9.612456,0 c -1.004811,0 -1.811982,-0.804878 -1.811982,-1.836142 z"
-         transform="translate(343.99999,987.99997)"
+         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;opacity:0.15;color:#000000;fill:#000000;fill-opacity:0.85253451;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         id="g5886"
+         sodipodi:nodetypes="csssscssc" />
-         style="display:inline;enable-background:new">
-        <path
-           style="fill:none;stroke:url(#linearGradient5891-0-4);stroke-width:7.11431503;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
-           id="path5835"
-           inkscape:path-effect="#path-effect5837-4-6"
-           inkscape:original-d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
-           inkscape:path-effect="#path-effect5837-4-6"
-           id="path5880"
-           d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
-           style="fill:none;stroke:#4787c8;stroke-width:3.55715752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:nodetypes="ccc" />
-        <path
-           style="fill:none;stroke:#7ea7d3;stroke-width:1.18571913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 197.45937,240.47455 c -0.17828,-0.29362 -0.20087,-0.67548 -0.0603,-0.98892 0.14055,-0.31344 0.43739,-0.54812 0.77144,-0.62817 0.33405,-0.08 0.69314,-0.01 0.99635,0.15175 0.30321,0.16144 0.55146,0.40727 0.79165,0.65284 l 3.66429,3.74643 12.87946,-12.98973 c 0.20796,-0.20974 0.42306,-0.41969 0.68548,-0.55522 0.26242,-0.13553 0.57293,-0.19052 0.85827,-0.11426 0.14267,0.0381 0.27708,0.10787 0.38874,0.20452 0.11167,0.0966 0.20021,0.22004 0.25479,0.35726 0.0546,0.13722 0.075,0.28793 0.0585,0.43468 -0.0165,0.14674 -0.07,0.28919 -0.15422,0.41052"
-           id="path5882"
-           inkscape:path-effect="#path-effect5884-4-7"
-           inkscape:original-d="m 197.45937,240.47455 c 0.65604,-0.56057 2.02485,-1.34847 2.49911,-0.8125 l 3.66429,3.74643 12.87946,-12.98973 c 0.6875,-0.6875 2.09152,0.7375 2.09152,0.7375"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csccc" />
-      </g>
     </g>
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect17347"
+       width="21.943846"
+       height="21.943846"
+       x="342.29913"
+       y="521.58435" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.8;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 359.97505,524.8252 -7.88606,7.71465 -2.57155,-2.57155 -2.91442,-0.0427 0,2.35727 4.02875,3.98587 c 0.80342,0.80309 2.111,0.80309 2.91442,0 l 8.18609,-8.22894 0,-0.38573 c 0,-1.24128 0.19944,-1.76801 -0.82915,-2.29836 z"
+       id="rect5147-9-1-5-7-6-5-8-7"
+       sodipodi:nodetypes="ccccccccscc" />
+    <path
+       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:#eeeeec;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif;-inkscape-font-specification:sans-serif"
+       d="m 361.65223,524.52745 -9.5602,9.36735 -2.56345,-2.56344 -2.92846,-0.0214 0.0153,2.32639 4.02203,4.02206 c 0.80341,0.80309 2.10565,0.80309 2.90906,0 l 10.95049,-11.05765 0.003,-2.1502 z"
+       id="path12830-4-17-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
   </g>
 </svg>

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

@@ -0,0 +1,8 @@
+@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

@@ -0,0 +1,5 @@
+$variant: 'dark';
+
+@import "gnome-shell-sass/_colors"; //use gtk colors
+@import "gnome-shell-sass/_drawing";
+@import "gnome-shell-sass/_common";

data/theme/panel-button-border.svg

@@ -1,74 +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="17"
-   height="10"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="panel-button-border.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="8.6594891"
-     inkscape:cy="5.7029946"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     guidetolerance="10000"
-     objecttolerance="10000">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3792"
-       empspacing="10"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3796"
-       width="7"
-       height="2"
-       x="5"
-       y="8" />
-  </g>
-</svg>

data/theme/panel-button-highlight-narrow.svg

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="25"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="panel-button-highlight-narrow.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-171.36384"
-     inkscape:cy="-53.255157"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10626">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-468.08632,-537.03477)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4625;color:#000000;fill:url(#radialGradient10592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path34506-3"
-       sodipodi:cx="51"
-       sodipodi:cy="30"
-       sodipodi:rx="42"
-       sodipodi:ry="16"
-       d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
-       sodipodi:start="3.1415927"
-       sodipodi:end="6.2831853"
-       transform="matrix(0.35714286,0,0,1.5625,464.87203,515.15977)"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>

data/theme/panel-button-highlight-wide.svg

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="84"
-   height="25"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="panel-button-highlight-wide.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-118.50071"
-     inkscape:cy="27.304508"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10626">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-441.08632,-537.03477)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4625;color:#000000;fill:url(#radialGradient10592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path34506-3"
-       sodipodi:cx="51"
-       sodipodi:cy="30"
-       sodipodi:rx="42"
-       sodipodi:ry="16"
-       d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
-       sodipodi:start="3.1415927"
-       sodipodi:end="6.2831853"
-       transform="matrix(1,0,0,1.5625,432.08632,515.15977)"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>

data/theme/process-working.svg

@@ -12,7 +12,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg5369"
    version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
+   inkscape:version="0.48.5 r10040"
    width="96"
    height="48"
    sodipodi:docname="process-working.svg"
@@ -25,12 +25,597 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs5373" />
+     id="defs5373">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient35326"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient8231-1-4-4-1">
+      <stop
+         id="stop8233-28-5-27-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop8235-7-3-94-3" />
+      <stop
+         id="stop8237-7-8-20-2"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop8239-2-9-1-9"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient35230"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient5767-6">
+      <stop
+         id="stop5769-0"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop5771-1" />
+      <stop
+         id="stop5773-7"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop5775-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10257">
+      <stop
+         id="stop10259"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop10261" />
+      <stop
+         id="stop10263"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop10265"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10269">
+      <stop
+         id="stop10271"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop10273" />
+      <stop
+         id="stop10275"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop10277"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10279"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10281">
+      <stop
+         id="stop10283"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop10285" />
+      <stop
+         id="stop10287"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop10289"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10293">
+      <stop
+         id="stop10295"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop10297" />
+      <stop
+         id="stop10299"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop10301"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10303"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10305">
+      <stop
+         id="stop10307"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop10309" />
+      <stop
+         id="stop10311"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop10313"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10315"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10317">
+      <stop
+         id="stop10319"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop10321" />
+      <stop
+         id="stop10323"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop10325"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10329">
+      <stop
+         id="stop10331"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop10333" />
+      <stop
+         id="stop10335"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop10337"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10341">
+      <stop
+         id="stop10343"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop10345" />
+      <stop
+         id="stop10347"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop10349"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10351"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10353">
+      <stop
+         id="stop10355"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop10357" />
+      <stop
+         id="stop10359"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop10361"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10363"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10365">
+      <stop
+         id="stop10367"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop10369" />
+      <stop
+         id="stop10371"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop10373"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10377">
+      <stop
+         id="stop10379"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop10381" />
+      <stop
+         id="stop10383"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop10385"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10387"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10389">
+      <stop
+         id="stop10391"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop10393" />
+      <stop
+         id="stop10395"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop10397"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10399"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10401">
+      <stop
+         id="stop10403"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop10405" />
+      <stop
+         id="stop10407"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop10409"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10411"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10413">
+      <stop
+         id="stop10415"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop10417" />
+      <stop
+         id="stop10419"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop10421"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10423"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10425">
+      <stop
+         id="stop10427"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15428571"
+         offset="0.31861392"
+         id="stop10429" />
+      <stop
+         id="stop10431"
+         offset="0.54270232"
+         style="stop-color:#ffffff;stop-opacity:0.33714285" />
+      <stop
+         id="stop10433"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10435"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <linearGradient
+       id="linearGradient10437">
+      <stop
+         id="stop10439"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.31861392"
+         id="stop10441" />
+      <stop
+         id="stop10443"
+         offset="0.75051737"
+         style="stop-color:#ffffff;stop-opacity:0.42857143" />
+      <stop
+         id="stop10445"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10709"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10711"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8231-1-4-4-1"
+       id="radialGradient10713"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.229454,-1.2865389,1.2087442,2.0939897,-228.90301,-208.08725)"
+       cx="-0.067823187"
+       cy="188.51917"
+       fx="-0.067823187"
+       fy="188.51917"
+       r="27.330345" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5767-6"
+       id="radialGradient10715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1252013,-0.60470548,0.56813832,1.0568583,-107.67128,-11.948108)"
+       cx="0.053942412"
+       cy="189.15244"
+       fx="0.053942412"
+       fy="189.15244"
+       r="27.330345" />
+  </defs>
   <sodipodi:namedview
      pagecolor="#808080"
      bordercolor="#666666"
@@ -46,13 +631,15 @@
      showgrid="true"
      borderlayer="true"
      inkscape:showpageshadow="false"
-     inkscape:zoom="16"
+     inkscape:zoom="5.6568542"
-     inkscape:cx="53.997662"
+     inkscape:cx="40.82607"
-     inkscape:cy="22.367695"
+     inkscape:cy="30.594699"
-     inkscape:window-x="1600"
+     inkscape:window-x="2560"
      inkscape:window-y="33"
      inkscape:window-maximized="0"
-     inkscape:current-layer="layer2">
+     inkscape:current-layer="layer2"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid11933"
@@ -128,134 +715,97 @@
      id="layer2"
      inkscape:label="spinner">
     <g
-       transform="matrix(0.28240106,0,0,0.28240106,146.92015,-382.52444)"
+       transform="matrix(0.43142675,0,0,0.43298814,218.13188,-592.92581)"
-       id="g10450-5"
+       id="g10450-5-3"
        style="display:inline">
       <path
-         inkscape:connector-curvature="0"
+         inkscape:export-ydpi="90"
-         style="opacity:0.6;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:export-xdpi="90"
-         d="m -477.76072,1373.3569 0,9.4717"
+         inkscape:export-filename="/home/hbons/Moblin/git/carrick-ng/data/icons/network-connecting.png"
-         id="path18768"
+         sodipodi:open="true"
-         sodipodi:nodetypes="cc"
+         sodipodi:end="4.712389"
-         inkscape:transform-center-y="-4.6808838" />
+         sodipodi:start="0.23191105"
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#radialGradient10713);stroke-width:12.18051815;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+         id="path10452-5"
+         sodipodi:cx="-25.809397"
+         sodipodi:cy="179.43886"
+         sodipodi:rx="22.98097"
+         sodipodi:ry="22.98097"
+         d="m -3.4436513,184.72075 c -2.9171108,12.35226 -15.2953817,20.00096 -27.6476417,17.08385 -12.35226,-2.91711 -20.00096,-15.29538 -17.083849,-27.64764 2.449452,-10.372 11.708437,-17.69907 22.365746,-17.69907"
+         transform="matrix(-0.16397381,0.61157081,-0.61162275,-0.16377992,-372.32298,1442.5061)" />
       <path
-         inkscape:connector-curvature="0"
+         transform="matrix(-0.63300818,0.01438356,-0.01458424,-0.63300359,-491.4014,1510.996)"
-         inkscape:transform-center-y="-3.3099227"
+         d="m -3.4436513,184.72075 c -2.9171108,12.35226 -15.2953817,20.00096 -27.6476417,17.08385 -12.35226,-2.91711 -20.00096,-15.29538 -17.083849,-27.64764 2.449452,-10.372 11.708437,-17.69907 22.365746,-17.69907"
-         sodipodi:nodetypes="cc"
+         sodipodi:ry="22.98097"
-         id="path18770"
+         sodipodi:rx="22.98097"
-         d="m -461.0171,1380.2922 -7.23427,7.3824"
+         sodipodi:cy="179.43886"
-         style="opacity:0.7;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:cx="-25.809397"
-         inkscape:transform-center-x="-3.3098966" />
+         id="path10454-7"
-      <path
+         style="fill:none;stroke:url(#radialGradient10715);stroke-width:12.18051815;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-         inkscape:connector-curvature="0"
+         sodipodi:type="arc"
-         inkscape:transform-center-x="-4.6808962"
+         sodipodi:start="0.23191105"
-         style="opacity:0.8;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:end="4.712389"
-         d="m -454.08163,1397.0359 -9.47165,0"
+         sodipodi:open="true"
-         id="path18772"
+         inkscape:export-filename="/home/hbons/Moblin/git/carrick-ng/data/icons/network-connecting.png"
-         sodipodi:nodetypes="cc"
+         inkscape:export-xdpi="90"
-         inkscape:transform-center-y="-2.6596956e-05" />
+         inkscape:export-ydpi="90" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc"
-         id="path18774"
-         d="m -461.01709,1413.7796 -6.93831,-7.0864"
-         style="opacity:0.9;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:transform-center-x="-3.3098966"
-         inkscape:transform-center-y="3.3098652" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:transform-center-y="4.6808757"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -477.76074,1420.715 9e-5,-9.4716"
-         id="path18776"
-         sodipodi:nodetypes="cc" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc"
-         id="path18778"
-         d="m -494.50442,1413.7796 6.79048,-6.9384"
-         style="opacity:0.3;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:transform-center-y="3.3098769"
-         inkscape:transform-center-x="3.3098883" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:transform-center-x="4.6808941"
-         style="opacity:0.4;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -501.43987,1397.0359 9.47174,0"
-         id="path18780"
-         sodipodi:nodetypes="cc"
-         inkscape:transform-center-y="-2.6596956e-05" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc"
-         id="path18782"
-         d="m -494.5044,1380.2922 6.64243,6.9384"
-         style="opacity:0.5;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:transform-center-x="3.3098902"
-         inkscape:transform-center-y="-3.3099302" />
     </g>
     <use
-       style="display:inline"
        x="0"
        y="0"
-       xlink:href="#g10450-5"
+       xlink:href="#g10450-5-3"
-       id="use4981"
+       id="use13294"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,36,-4.9705636)"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,35.986458,-4.9737924)"
-       width="400"
+       width="96"
-       height="400" />
+       height="48" />
     <use
-       style="display:inline"
        x="0"
        y="0"
-       xlink:href="#use4981"
+       xlink:href="#use13294"
-       id="use4983"
+       id="use13314"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,43.032478,-21.909695)"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,43.036943,-21.933639)"
-       width="400"
+       width="96"
-       height="400" />
+       height="48" />
     <use
-       style="display:inline"
        x="0"
        y="0"
-       xlink:href="#use4983"
+       xlink:href="#use13314"
-       id="use4985"
+       id="use13334"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,50.081986,-38.904617)"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,50.085328,-38.904987)"
-       width="400"
+       width="96"
-       height="400" />
+       height="48" />
     <use
-       style="display:inline"
        x="0"
        y="0"
-       xlink:href="#use4985"
+       xlink:href="#use13334"
-       id="use4987"
+       id="use13354"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,-38.919996,-31.872139)"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-38.894841,-31.888724)"
-       width="400"
+       width="96"
-       height="400" />
+       height="48" />
     <use
-       style="display:inline"
        x="0"
        y="0"
-       xlink:href="#use4987"
+       xlink:href="#use13354"
-       id="use4989"
+       id="use13374"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,52.986628,2.0890543)"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,52.971072,2.0670843)"
-       width="400"
+       width="96"
-       height="400" />
+       height="48" />
     <use
-       style="display:inline"
        x="0"
        y="0"
-       xlink:href="#use4989"
+       xlink:href="#use13374"
-       id="use4991"
+       id="use13394"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,60.013026,-14.912936)"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,60.017834,-14.929741)"
-       width="400"
+       width="96"
-       height="400" />
+       height="48" />
     <use
-       style="display:inline"
        x="0"
        y="0"
-       xlink:href="#use4991"
+       xlink:href="#use13394"
-       id="use4993"
+       id="use13414"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,67.022396,-31.859127)"
+       transform="matrix(0.86602541,0.50000001,-0.50000001,0.86602541,50.044124,-25.16226)"
-       width="400"
+       width="96"
-       height="400" />
+       height="48" />
   </g>
 </svg>

data/theme/toggle-off-intl.svg

@@ -7,51 +7,127 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="65"
    height="22"
-   id="svg3273"
+   id="svg2857"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="New document 14">
+   sodipodi:docname="toggle-off-us.svg">
   <defs
-     id="defs3275">
+     id="defs2859">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_z="744.09448 : 526.18109 : 1"
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3281" />
+       id="perspective2865" />
     <inkscape:perspective
-       id="perspective3261"
+       id="perspective2843"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
        inkscape:vp_z="1 : 0.5 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient38024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4-0"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient37802-8"
+       id="linearGradient12311-3-1-0-5-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
+       x1="610.13782"
+       y1="501.43866"
+       x2="610.13782"
+       y2="492.52756" />
+    <linearGradient
+       id="linearGradient37802-8"
+       inkscape:collect="always">
+      <stop
+         id="stop37804-1"
+         offset="0"
+         style="stop-color:#2c2c2c;stop-opacity:1" />
+      <stop
+         id="stop37806-8"
+         offset="1"
+         style="stop-color:#16191a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="492.52756"
+       x2="610.13782"
+       y1="501.43866"
+       x1="610.13782"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13602"
+       xlink:href="#linearGradient37802-8"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#000000"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
+     inkscape:zoom="1"
-     inkscape:cx="32.000004"
+     inkscape:cx="-5.0602834"
-     inkscape:cy="10.999997"
+     inkscape:cy="16.473273"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g37994"
      showgrid="false"
-     inkscape:window-width="609"
+     inkscape:window-width="2560"
-     inkscape:window-height="501"
+     inkscape:window-height="1375"
      inkscape:window-x="0"
-     inkscape:window-y="26"
+     inkscape:window-y="27"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid12954"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata3278">
+     id="metadata2862">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -66,61 +142,68 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-343,-521.36218)">
+     transform="translate(-444.64286,-781.36218)">
     <g
-       id="g17454"
+       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       transform="translate(-453,448.36218)"
+       id="g37994">
-       style="display:inline">
-      <rect
-         transform="scale(-1,1)"
-         ry="4"
-         rx="4"
-         y="74.5"
-         x="-859.5"
-         height="19"
-         width="63.000004"
-         id="rect17456"
-         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="scale(-1,1)"
-         ry="4"
-         rx="4"
-         y="74"
-         x="-828"
-         height="20"
-         width="31"
-         id="rect17458"
-         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
       <g
-         transform="matrix(-1,0,0,1,1619.1239,-33.986291)"
+         id="g37996"
-         id="g17460"
+         transform="translate(-115,1277)">
-         style="display:inline">
+        <rect
-        <path
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect13475"
-           d="m 803.6322,115.48629 0,4.29495"
+           width="98"
-           id="path17462"
+           height="25"
-           inkscape:connector-curvature="0" />
+           x="644.5"
-        <path
+           y="484.61118"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           rx="4.7429576"
-           d="m 806.62805,115.48629 0,4.29495"
+           ry="3.8424656" />
-           id="path17464"
+        <rect
-           inkscape:connector-curvature="0" />
+           ry="3.8424656"
-        <path
+           rx="4.7429576"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           y="483.5"
-           d="m 809.6239,115.48629 0,4.29495"
+           x="644.5"
-           id="path17466"
+           height="25"
-           inkscape:connector-curvature="0" />
+           width="98"
+           id="rect38000"
+           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+      </g>
+      <g
+         transform="translate(-49.946213,-1.890275)"
+         id="g38002">
+        <g
+           transform="translate(-115,1247)"
+           style="display:inline"
+           id="g38004">
+          <rect
+             ry="3.7972314"
+             rx="4.6871223"
+             y="515.5"
+             x="694.53046"
+             height="25"
+             width="45.969578"
+             id="rect38006"
+             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 699.09675,516.7365 36.86904,0"
+             id="path38016"
+             inkscape:path-effect="#path-effect77541-4"
+             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
+             inkscape:connector-curvature="0" />
+        </g>
       </g>
       <path
          sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.96875012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.15627193;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="path18722"
+         id="path13479"
-         sodipodi:cx="47.6875"
+         sodipodi:cx="16.4375"
-         sodipodi:cy="11.5625"
+         sodipodi:cy="10.8125"
-         sodipodi:rx="3.9375"
+         sodipodi:rx="4.3125"
-         sodipodi:ry="3.9375"
+         sodipodi:ry="4.3125"
-         d="m 51.625,11.5625 c 0,2.174621 -1.762879,3.9375 -3.9375,3.9375 -2.174621,0 -3.9375,-1.762879 -3.9375,-3.9375 0,-2.1746212 1.762879,-3.9375 3.9375,-3.9375 2.174621,0 3.9375,1.7628788 3.9375,3.9375 z"
+         d="m 20.75,10.8125 a 4.3125,4.3125 0 1 1 -8.625,0 4.3125,4.3125 0 1 1 8.625,0 z"
-         transform="matrix(1.0158729,0,0,1.0158729,795.55556,72.25399)" />
+         transform="matrix(1.4212691,0,0,1.1514287,577.38488,1761.1138)" />
     </g>
   </g>
 </svg>

data/theme/toggle-off-us.svg

@@ -7,51 +7,171 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="65"
    height="22"
-   id="svg3012"
+   id="svg2857"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="New document 6">
+   sodipodi:docname="toggle-on-intl.svg">
   <defs
-     id="defs3014">
+     id="defs2859">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_z="744.09448 : 526.18109 : 1"
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3020" />
+       id="perspective2865" />
     <inkscape:perspective
-       id="perspective2997"
+       id="perspective2843"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
        inkscape:vp_z="1 : 0.5 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient38024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient37802"
+       id="linearGradient12311-3-1-0-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
+       x1="610.13782"
+       y1="501.43866"
+       x2="610.13782"
+       y2="492.52756" />
+    <linearGradient
+       id="linearGradient37802"
+       inkscape:collect="always">
+      <stop
+         id="stop37804"
+         offset="0"
+         style="stop-color:#2c2c2c;stop-opacity:1" />
+      <stop
+         id="stop37806"
+         offset="1"
+         style="stop-color:#16191a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4-3"
+       id="linearGradient77680"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0322581,717.71949,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4-3">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5-7" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0-9" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4-0"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient37802-8"
+       id="linearGradient12311-3-1-0-5-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
+       x1="610.13782"
+       y1="501.43866"
+       x2="610.13782"
+       y2="492.52756" />
+    <linearGradient
+       id="linearGradient37802-8"
+       inkscape:collect="always">
+      <stop
+         id="stop37804-1"
+         offset="0"
+         style="stop-color:#2c2c2c;stop-opacity:1" />
+      <stop
+         id="stop37806-8"
+         offset="1"
+         style="stop-color:#16191a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="492.52756"
+       x2="610.13782"
+       y1="501.43866"
+       x1="610.13782"
+       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13602"
+       xlink:href="#linearGradient37802-8"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#000000"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
+     inkscape:zoom="1"
-     inkscape:cx="32.000004"
+     inkscape:cx="16.760995"
-     inkscape:cy="10.999997"
+     inkscape:cy="21.955673"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g37994"
      showgrid="false"
-     inkscape:window-width="609"
+     inkscape:window-width="2560"
-     inkscape:window-height="501"
+     inkscape:window-height="1375"
      inkscape:window-x="0"
-     inkscape:window-y="26"
+     inkscape:window-y="27"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid12954"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata3017">
+     id="metadata2862">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -66,73 +186,70 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-343,-521.36218)">
+     transform="translate(-444.64286,-781.36218)">
     <g
-       id="g17454"
+       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       transform="translate(-453,448.36218)"
+       id="g37994">
-       style="display:inline">
-      <rect
-         transform="scale(-1,1)"
-         ry="4"
-         rx="4"
-         y="74.5"
-         x="-859.5"
-         height="19"
-         width="63.000004"
-         id="rect17456"
-         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="scale(-1,1)"
-         ry="4"
-         rx="4"
-         y="74"
-         x="-828"
-         height="20"
-         width="31"
-         id="rect17458"
-         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
       <g
-         transform="matrix(-1,0,0,1,1619.1239,-33.986291)"
+         id="g37996"
-         id="g17460"
+         transform="translate(-115,1277)">
-         style="display:inline">
+        <rect
-        <path
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect13475"
-           d="m 803.6322,115.48629 0,4.29495"
+           width="98"
-           id="path17462"
+           height="25"
-           inkscape:connector-curvature="0" />
+           x="644.5"
-        <path
+           y="484.61118"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           rx="4.7429576"
-           d="m 806.62805,115.48629 0,4.29495"
+           ry="3.8424656" />
-           id="path17464"
+        <rect
-           inkscape:connector-curvature="0" />
+           ry="3.8424656"
-        <path
+           rx="4.7429576"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           y="483.5"
-           d="m 809.6239,115.48629 0,4.29495"
+           x="644.5"
-           id="path17466"
+           height="25"
-           inkscape:connector-curvature="0" />
+           width="98"
+           id="rect38000"
+           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
       </g>
       <g
-         style="font-size:8.95877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         transform="translate(-49.946213,-1.890275)"
-         id="text17468"
+         id="g38002">
-         transform="translate(0.34375,0)">
+        <g
-        <path
+           transform="translate(-115,1247)"
-           d="m 837.28518,80.750726 c 0.63282,6e-6 1.19566,0.123947 1.68852,0.371824 0.49284,0.247888 0.8807,0.609505 1.16359,1.084851 0.28287,0.472439 0.42431,1.022155 0.42431,1.649149 0,0.635748 -0.13853,1.200045 -0.41556,1.692892 -0.27706,0.489934 -0.66638,0.870507 -1.16797,1.141719 -0.5016,0.271213 -1.07756,0.406819 -1.72789,0.406819 -0.42869,0 -0.83551,-0.06562 -1.22045,-0.196848 -0.38495,-0.134148 -0.73053,-0.32808 -1.03674,-0.581795 -0.30329,-0.256631 -0.54534,-0.589085 -0.72615,-0.997363 -0.17789,-0.408276 -0.26684,-0.869045 -0.26683,-1.382311 -10e-6,-0.638658 0.13997,-1.200039 0.41994,-1.684144 0.27996,-0.487011 0.66782,-0.858835 1.16359,-1.115472 0.49576,-0.259541 1.06297,-0.389315 1.70164,-0.389321 m 0.57305,1.089225 c -0.20123,-0.05249 -0.40683,-0.07873 -0.61679,-0.07874 -0.20998,5e-6 -0.41412,0.02625 -0.61242,0.07874 -0.19831,0.04958 -0.38933,0.129779 -0.57305,0.240592 -0.18081,0.107907 -0.33974,0.242055 -0.47681,0.402445 -0.13706,0.160399 -0.24642,0.358705 -0.32808,0.594918 -0.0816,0.233306 -0.12248,0.491395 -0.12248,0.774269 0,0.67366 0.20851,1.214627 0.62554,1.622903 0.41702,0.408278 0.93758,0.612416 1.56166,0.612416 0.25954,0 0.51034,-0.04229 0.7524,-0.126858 0.24496,-0.08457 0.47097,-0.20997 0.67803,-0.376198 0.20705,-0.166226 0.37328,-0.392236 0.49868,-0.678032 0.12539,-0.285792 0.18809,-0.610956 0.1881,-0.975492 -10e-6,-0.297455 -0.0437,-0.568668 -0.13123,-0.813638 -0.0875,-0.247878 -0.20415,-0.453475 -0.34995,-0.61679 -0.14291,-0.163307 -0.31059,-0.301829 -0.50306,-0.415568 -0.18956,-0.11373 -0.38641,-0.195385 -0.59054,-0.244967"
+           style="display:inline"
-           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="g38004">
-           id="path18599"
+          <rect
-           inkscape:connector-curvature="0" />
+             ry="3.7972314"
-        <path
+             rx="4.6871223"
-           d="m 843.5362,81.831203 0,1.17917 2.94834,0 0,1.014861 -2.94834,0 0,3.00713 -1.10673,0 0,-6.216022 4.31754,0 0,1.014861 -3.21081,0"
+             y="515.5"
-           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+             x="694.53046"
-           id="path18601"
+             height="25"
-           inkscape:connector-curvature="0"
+             width="45.969578"
-           sodipodi:nodetypes="ccccccccccc" />
+             id="rect38006"
-        <path
+             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-           d="m 849.71285,81.831203 0,1.17917 2.94834,0 0,1.014861 -2.94834,0 0,3.00713 -1.10672,0 0,-6.216022 4.31753,0 0,1.014861 -3.21081,0"
+          <path
-           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+             sodipodi:nodetypes="cc"
-           id="path18603"
+             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0"
+             d="m 699.09675,516.7365 36.86904,0"
-           sodipodi:nodetypes="ccccccccccc" />
+             id="path38016"
+             inkscape:path-effect="#path-effect77541-4"
+             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
+             inkscape:connector-curvature="0" />
+        </g>
       </g>
+      <text
+         xml:space="preserve"
+         style="font-size:13.79166794px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         x="520.29974"
+         y="1997.0011"
+         id="text75614"
+         sodipodi:linespacing="125%"
+         transform="scale(1.1236771,0.88993537)"><tspan
+           sodipodi:role="line"
+           id="tspan75616"
+           x="520.29974"
+           y="1997.0011">OFF</tspan></text>
     </g>
   </g>
 </svg>

data/theme/toggle-on-intl.svg

@@ -7,51 +7,113 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="65"
    height="22"
-   id="svg3199"
+   id="svg2857"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="toggle-on-intl.svg">
   <defs
-     id="defs3201">
+     id="defs2859">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_z="744.09448 : 526.18109 : 1"
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3207" />
+       id="perspective2865" />
     <inkscape:perspective
-       id="perspective3187"
+       id="perspective2843"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
        inkscape:vp_z="1 : 0.5 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient77461"
+       id="linearGradient77551"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
+       x1="1164.7644"
+       y1="962.93695"
+       x2="1164.7644"
+       y2="970.51404" />
+    <linearGradient
+       id="linearGradient77461"
+       inkscape:collect="always">
+      <stop
+         id="stop77463"
+         offset="0"
+         style="stop-color:#182f4c;stop-opacity:1" />
+      <stop
+         id="stop77465"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient38024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4"
+       is_visible="true" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#000000"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
+     inkscape:zoom="32"
-     inkscape:cx="49.147112"
+     inkscape:cx="17.255148"
-     inkscape:cy="17.532036"
+     inkscape:cy="8.9252639"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g37994"
-     showgrid="false"
+     showgrid="true"
-     inkscape:window-width="1412"
+     inkscape:window-width="2560"
-     inkscape:window-height="1067"
+     inkscape:window-height="1375"
      inkscape:window-x="0"
-     inkscape:window-y="26"
+     inkscape:window-y="27"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid12954"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata3204">
+     id="metadata2862">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -66,57 +128,65 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-342.5,-521.36218)">
+     transform="translate(-444.64286,-781.36218)">
     <g
-       style="display:inline"
+       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       transform="translate(-453.5,448.36218)"
+       id="g37994">
-       id="g16453">
-      <rect
-         style="color:#000000;fill:#4a90d9;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect16256-9-4"
-         width="63.000004"
-         height="19"
-         x="-859.5"
-         y="74.5"
-         rx="4"
-         ry="4"
-         transform="scale(-1,1)" />
-      <rect
-         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-         id="rect16258-5-4"
-         width="31"
-         height="20"
-         x="-860"
-         y="74"
-         rx="4"
-         ry="4"
-         transform="scale(-1,1)" />
       <g
-         style="display:inline"
+         id="g37996"
-         id="g16298-3-6"
+         transform="translate(-115,1277)">
-         transform="matrix(-1,0,0,1,1651.1322,-33.986291)">
+        <rect
-        <path
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           inkscape:connector-curvature="0"
+           id="rect13475"
-           id="path16265-3-5"
+           width="98"
-           d="m 803.6322,115.48629 0,4.29495"
+           height="25"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+           x="644.5"
-        <path
+           y="484.61118"
-           inkscape:connector-curvature="0"
+           rx="4.7429576"
-           id="path16265-0-2-0"
+           ry="3.8424656" />
-           d="m 806.62805,115.48629 0,4.29495"
+        <rect
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+           ry="3.8424656"
-        <path
+           rx="4.7429576"
-           inkscape:connector-curvature="0"
+           y="483.5"
-           id="path16265-8-7-1"
+           x="644.5"
-           d="m 809.6239,115.48629 0,4.29495"
+           height="25"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+           width="98"
+           id="rect38000"
+           style="color:#000000;fill:url(#linearGradient77551);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       </g>
-      <path
+      <g
-         style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="translate(2.0625,-2)"
-         d="m 16,27.9375 0,10.125"
+         id="g38002">
-         id="path19232"
+        <g
-         inkscape:connector-curvature="0"
+           transform="translate(-115,1247)"
-         transform="translate(796,51.00002)" />
+           style="display:inline"
+           id="g38004">
+          <rect
+             ry="3.7972314"
+             rx="4.6871223"
+             y="515.5"
+             x="694.53046"
+             height="25"
+             width="45.969578"
+             id="rect38006"
+             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 699.09675,516.7365 36.86904,0"
+             id="path38016"
+             inkscape:path-effect="#path-effect77541-4"
+             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         id="rect13678"
+         width="3.0646207"
+         height="12.414008"
+         x="554.77728"
+         y="1767.3566" />
     </g>
   </g>
 </svg>

data/theme/toggle-on-us.svg

@@ -7,13 +7,14 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="65"
    height="22"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="toggle-on-us.svg">
   <defs
      id="defs2859">
@@ -31,27 +32,86 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient77461"
+       id="linearGradient77551"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
+       x1="1164.7644"
+       y1="962.93695"
+       x2="1164.7644"
+       y2="970.51404" />
+    <linearGradient
+       id="linearGradient77461"
+       inkscape:collect="always">
+      <stop
+         id="stop77463"
+         offset="0"
+         style="stop-color:#182f4c;stop-opacity:1" />
+      <stop
+         id="stop77465"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient76469-7-7-4"
+       id="linearGradient38024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
+       x1="6"
+       y1="102.95528"
+       x2="6"
+       y2="84.505203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient76469-7-7-4">
+      <stop
+         style="stop-color:#2e3232;stop-opacity:1"
+         offset="0"
+         id="stop76471-7-1-5" />
+      <stop
+         style="stop-color:#3e4545;stop-opacity:1"
+         offset="1"
+         id="stop76473-9-0-0" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect77541-4"
+       is_visible="true" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#000000"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="19.689855"
+     inkscape:cx="33.380898"
-     inkscape:cy="2.0517979"
+     inkscape:cy="6.9658271"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g37994"
      showgrid="false"
-     inkscape:window-width="941"
+     inkscape:window-width="2560"
-     inkscape:window-height="751"
+     inkscape:window-height="1375"
-     inkscape:window-x="2577"
+     inkscape:window-x="0"
-     inkscape:window-y="206"
+     inkscape:window-y="27"
-     inkscape:window-maximized="0"
+     inkscape:window-maximized="1"
      borderlayer="true"
-     inkscape:showpageshadow="false" />
+     inkscape:showpageshadow="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     showborder="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid12954"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2862">
     <rdf:RDF>
@@ -70,61 +130,68 @@
      id="layer1"
      transform="translate(-444.64286,-781.36218)">
     <g
-       style="display:inline"
+       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       transform="translate(-351.35714,708.36218)"
+       id="g37994">
-       id="g16453">
-      <rect
-         style="color:#000000;fill:#4a90d9;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect16256-9-4"
-         width="63.000004"
-         height="19"
-         x="-859.5"
-         y="74.5"
-         rx="4"
-         ry="4"
-         transform="scale(-1,1)" />
-      <rect
-         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-         id="rect16258-5-4"
-         width="31"
-         height="20"
-         x="-860"
-         y="74"
-         rx="4"
-         ry="4"
-         transform="scale(-1,1)" />
       <g
-         style="display:inline"
+         id="g37996"
-         id="g16298-3-6"
+         transform="translate(-115,1277)">
-         transform="matrix(-1,0,0,1,1651.1322,-33.986291)">
+        <rect
-        <path
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           inkscape:connector-curvature="0"
+           id="rect13475"
-           id="path16265-3-5"
+           width="98"
-           d="m 803.6322,115.48629 0,4.29495"
+           height="25"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+           x="644.5"
-        <path
+           y="484.61118"
-           inkscape:connector-curvature="0"
+           rx="4.7429576"
-           id="path16265-0-2-0"
+           ry="3.8424656" />
-           d="m 806.62805,115.48629 0,4.29495"
+        <rect
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+           ry="3.8424656"
-        <path
+           rx="4.7429576"
-           inkscape:connector-curvature="0"
+           y="483.5"
-           id="path16265-8-7-1"
+           x="644.5"
-           d="m 809.6239,115.48629 0,4.29495"
+           height="25"
-           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+           width="98"
+           id="rect38000"
+           style="color:#000000;fill:url(#linearGradient77551);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       </g>
       <g
-         style="font-size:8.95877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         transform="translate(2.0625,-2)"
-         id="text42229-3-0">
+         id="g38002">
-        <path
+        <g
-           d="m 808.01473,80.573953 c 0.63283,6e-6 1.19567,0.123947 1.68852,0.371824 0.49284,0.247888 0.88071,0.609505 1.16359,1.084851 0.28287,0.472439 0.42431,1.022155 0.42432,1.649149 -10e-6,0.635748 -0.13853,1.200045 -0.41557,1.692892 -0.27705,0.489934 -0.66637,0.870506 -1.16796,1.141719 -0.50161,0.271212 -1.07757,0.406819 -1.72789,0.406819 -0.4287,0 -0.83552,-0.06562 -1.22046,-0.196848 -0.38495,-0.134148 -0.73053,-0.32808 -1.03673,-0.581795 -0.3033,-0.256631 -0.54535,-0.589085 -0.72615,-0.997363 -0.1779,-0.408276 -0.26684,-0.869045 -0.26684,-1.382311 0,-0.638658 0.13998,-1.200039 0.41994,-1.684144 0.27996,-0.487011 0.66782,-0.858835 1.16359,-1.115472 0.49576,-0.259541 1.06298,-0.389315 1.70164,-0.389321 m 0.57305,1.089225 c -0.20123,-0.05249 -0.40682,-0.07873 -0.61679,-0.07874 -0.20998,5e-6 -0.41411,0.02625 -0.61242,0.07874 -0.19831,0.04958 -0.38932,0.129779 -0.57304,0.240592 -0.18081,0.107907 -0.33975,0.242055 -0.47681,0.402445 -0.13707,0.160399 -0.24643,0.358705 -0.32808,0.594918 -0.0817,0.233305 -0.12249,0.491395 -0.12249,0.774269 0,0.67366 0.20851,1.214627 0.62554,1.622902 0.41703,0.408279 0.93758,0.612417 1.56166,0.612416 0.25955,10e-7 0.51035,-0.04228 0.7524,-0.126857 0.24496,-0.08457 0.47097,-0.20997 0.67803,-0.376199 0.20705,-0.166225 0.37328,-0.392236 0.49868,-0.678031 0.1254,-0.285792 0.1881,-0.610956 0.1881,-0.975492 0,-0.297455 -0.0437,-0.568668 -0.13123,-0.813638 -0.0875,-0.247878 -0.20414,-0.453475 -0.34995,-0.61679 -0.1429,-0.163307 -0.31059,-0.301829 -0.50306,-0.415568 -0.18956,-0.11373 -0.38641,-0.195385 -0.59054,-0.244967"
+           transform="translate(-115,1247)"
-           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           style="display:inline"
-           id="path18606" />
+           id="g38004">
-        <path
+          <rect
-           d="m 813.15903,80.639569 1.21608,0 3.4689,4.776844 0,-4.776844 1.10235,0 0,6.216022 -1.22921,0 -3.45577,-4.785594 0,4.785594 -1.10235,0 0,-6.216022"
+             ry="3.7972314"
-           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+             rx="4.6871223"
-           id="path18608" />
+             y="515.5"
+             x="694.53046"
+             height="25"
+             width="45.969578"
+             id="rect38006"
+             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 699.09675,516.7365 36.86904,0"
+             id="path38016"
+             inkscape:path-effect="#path-effect77541-4"
+             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
+             inkscape:connector-curvature="0" />
+        </g>
       </g>
+      <text
+         transform="scale(1.1000946,0.90901274)"
+         sodipodi:linespacing="125%"
+         id="text38018"
+         y="1955.5205"
+         x="495.94223"
+         style="font-size:13.29953671px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         xml:space="preserve"><tspan
+           y="1955.5205"
+           x="495.94223"
+           id="tspan38020"
+           sodipodi:role="line">ON</tspan></text>
     </g>
   </g>
 </svg>

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

@@ -17,7 +17,6 @@
   <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>
@@ -46,7 +45,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-keybinding-modes.xml"/>
+    <xi:include href="xml/shell-action-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

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -126,7 +127,7 @@ const AuthPrompt = new Lang.Class({
 
         this._initButtons();
 
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
         this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
         this._spinner.actor.opacity = 0;
         this._spinner.actor.show();
@@ -134,13 +135,12 @@ const AuthPrompt = new Lang.Class({
     },
 
     _onDestroy: function() {
-        this._userVerifier.clear();
+        this._userVerifier.destroy();
-        this._userVerifier.disconnectAll();
         this._userVerifier = null;
     },
 
     _initButtons: function() {
-        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button',
+        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button 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',
+        this.nextButton = new St.Button({ style_class: 'modal-dialog-button button',
                                           button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                           reactive: true,
                                           can_focus: true,
@@ -261,6 +261,7 @@ const AuthPrompt = new Lang.Class({
 
     _onVerificationComplete: function() {
         this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
+	this.cancelButton.reactive = false;
     },
 
     _onReset: function() {
@@ -419,17 +420,20 @@ const AuthPrompt = new Lang.Class({
     },
 
     setUser: function(user) {
+        let oldChild = this._userWell.get_child();
+        if (oldChild)
+            oldChild.destroy();
+
         if (user) {
             let userWidget = new UserWidget.UserWidget(user);
             this._userWell.set_child(userWidget.actor);
-        } else {
-            this._userWell.set_child(null);
         }
     },
 
     reset: function() {
         let oldStatus = this.verificationStatus;
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
+        this.cancelButton.reactive = true;
 
         if (oldStatus == AuthPromptStatus.VERIFYING)
             this._userVerifier.cancel();
@@ -498,6 +502,9 @@ 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,6 +26,7 @@ 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;
@@ -64,6 +65,8 @@ const UserListItem = new Lang.Class({
                                      reactive: true,
                                      x_align: St.Align.START,
                                      x_fill: true });
+        this.actor.connect('destroy',
+                           Lang.bind(this, this._onDestroy));
 
         this._userWidget = new UserWidget.UserWidget(this.user);
         layout.add(this._userWidget.actor);
@@ -87,6 +90,10 @@ const UserListItem = new Lang.Class({
             this.actor.remove_style_pseudo_class('logged-in');
     },
 
+    _onDestroy: function() {
+        this._user.disconnect(this._userChangedId);
+    },
+
     _onClicked: function() {
         this.emit('activate');
     },
@@ -358,29 +365,17 @@ const LoginDialog = new Lang.Class({
     Name: 'LoginDialog',
 
     _init: function(parentActor) {
-        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
+        this.actor = new Shell.GenericContainer({ style_class: 'login-dialog',
-                                     layout_manager: new Clutter.BinLayout(),
+                                                  visible: false });
-                                     style_class: 'login-dialog',
+        this.actor.get_accessible().set_role(Atk.Role.WINDOW);
-                                     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()
-        let gdmClient = new Gdm.Client();
+        this._gdmClient = new Gdm.Client();
-
-        if (GLib.getenv('GDM_GREETER_TEST') != '1') {
-            this._greeter = gdmClient.get_greeter_sync(null);
-
-            this._greeter.connect('default-session-name-changed',
-                                  Lang.bind(this, this._onDefaultSessionChanged));
-
-            this._greeter.connect('session-opened',
-                                  Lang.bind(this, this._onSessionOpened));
-            this._greeter.connect('timed-login-requested',
-                                  Lang.bind(this, this._onTimedLoginRequested));
-        }
 
         this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });
 
@@ -394,30 +389,23 @@ const LoginDialog = new Lang.Class({
                                Lang.bind(this, this._updateLogo));
 
         this._textureCache = St.TextureCache.get_default();
-        this._textureCache.connect('texture-file-changed',
+        this._updateLogoTextureId = this._textureCache.connect('texture-file-changed',
-                                   Lang.bind(this, this._updateLogoTexture));
+                                                               Lang.bind(this, this._updateLogoTexture));
 
         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(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
+        this._authPrompt = new AuthPrompt.AuthPrompt(this._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();
@@ -445,11 +433,25 @@ 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();
 
@@ -476,8 +478,182 @@ const LoginDialog = new Lang.Class({
         // If the user list is enabled, it should take key focus; make sure the
         // screen shield is initialized first to prevent it from stealing the
         // focus later
-        Main.layoutManager.connect('startup-complete',
+        this._startupCompleteId = Main.layoutManager.connect('startup-complete',
-                                   Lang.bind(this, this._updateDisableUserList));
+                                                             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() {
@@ -532,24 +708,38 @@ const LoginDialog = new Lang.Class({
         }
     },
 
-    _updateLogoTexture: function(cache, uri) {
+    _fadeInBannerView: function() {
-        if (this._logoFileUri != uri)
+        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;
 
         this._logoBin.destroy_all_children();
-        if (this._logoFileUri) {
+        if (this._logoFile) {
             let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,
+            this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
-                                                                      -1, _LOGO_ICON_HEIGHT,
+                                                                       -1, _LOGO_ICON_HEIGHT,
-                                                                      scaleFactor));
+                                                                       scaleFactor));
         }
     },
 
     _updateLogo: function() {
         let path = this._settings.get_string(GdmUtil.LOGO_KEY);
 
-        this._logoFileUri = path ? Gio.file_new_for_path(path).get_uri() : null;
+        this._logoFile = path ? Gio.file_new_for_path(path) : null;
-        this._updateLogoTexture(this._textureCache, this._logoFileUri);
+        this._updateLogoTexture(this._textureCache, this._logoFile);
     },
 
     _onPrompted: function() {
@@ -560,7 +750,24 @@ 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;
@@ -599,6 +806,7 @@ const LoginDialog = new Lang.Class({
                          { opacity: 255,
                            time: _FADE_ANIMATION_TIME,
                            transition: 'easeOutQuad' });
+        this._fadeInBannerView();
     },
 
     _showRealmLoginHint: function(realmManager, hint) {
@@ -638,6 +846,8 @@ const LoginDialog = new Lang.Class({
                                                         realmManager.release();
                                                     }));
         this._updateCancelButton();
+
+        this._authPrompt.updateSensitivity(true);
         this._showPrompt();
     },
 
@@ -665,10 +875,12 @@ const LoginDialog = new Lang.Class({
     },
 
     _gotGreeterSessionProxy: function(proxy) {
-        proxy.connect('g-properties-changed', Lang.bind(this, function() {
+        this._greeterSessionProxy = proxy;
-            if (proxy.Active)
+        this._greeterSessionProxyChangedId =
-                this._loginScreenSessionActivated();
+            proxy.connect('g-properties-changed', Lang.bind(this, function() {
-        }));
+                if (proxy.Active)
+                    this._loginScreenSessionActivated();
+            }));
     },
 
     _startSession: function(serviceName) {
@@ -851,6 +1063,7 @@ const LoginDialog = new Lang.Class({
     _showUserList: function() {
         this._ensureUserListLoaded();
         this._authPrompt.hide();
+        this._hideBannerView();
         this._sessionMenuButton.close();
         this._setUserListExpanded(true);
         this._notListedButton.show();
@@ -890,6 +1103,30 @@ const LoginDialog = new Lang.Class({
             this._userManager.disconnect(this._userManagerLoadedId);
             this._userManagerLoadedId = 0;
         }
+        if (this._userAddedId) {
+            this._userManager.disconnect(this._userAddedId);
+            this._userAddedId = 0;
+        }
+        if (this._userRemovedId) {
+            this._userManager.disconnect(this._userRemovedId);
+            this._userRemovedId = 0;
+        }
+        this._textureCache.disconnect(this._updateLogoTextureId);
+        Main.layoutManager.disconnect(this._startupCompleteId);
+        if (this._settings) {
+            this._settings.run_dispose();
+            this._settings = null;
+        }
+        if (this._greeter) {
+            this._greeter.disconnect(this._defaultSessionChangedId);
+            this._greeter.disconnect(this._sessionOpenedId);
+            this._greeter.disconnect(this._timedLoginRequestedId);
+            this._greeter = null;
+        }
+        if (this._greeterSessionProxy) {
+            this._greeterSessionProxy.disconnect(this._greeterSessionProxyChangedId);
+            this._greeterSessionProxy = null;
+        }
     },
 
     _loadUserList: function() {
@@ -904,15 +1141,15 @@ const LoginDialog = new Lang.Class({
             this._userList.addUser(users[i]);
         }
 
-        this._userManager.connect('user-added',
+        this._userAddedId = this._userManager.connect('user-added',
-                                  Lang.bind(this, function(userManager, user) {
+                                                      Lang.bind(this, function(userManager, user) {
-                                      this._userList.addUser(user);
+                                                          this._userList.addUser(user);
-                                  }));
+                                                      }));
 
-        this._userManager.connect('user-removed',
+        this._userRemovedId = this._userManager.connect('user-removed',
-                                  Lang.bind(this, function(userManager, user) {
+                                                        Lang.bind(this, function(userManager, user) {
-                                      this._userList.removeUser(user);
+                                                            this._userList.removeUser(user);
-                                  }));
+                                                        }));
 
         return GLib.SOURCE_REMOVE;
     },
@@ -926,7 +1163,7 @@ const LoginDialog = new Lang.Class({
         this.actor.show();
         this.actor.opacity = 0;
 
-        Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOGIN_SCREEN });
+        Main.pushModal(this.actor, { actionMode: Shell.ActionMode.LOGIN_SCREEN });
 
         Tweener.addTween(this.actor,
                          { opacity: 255,

js/gdm/util.js

@@ -142,10 +142,10 @@ const ShellUserVerifier = new Lang.Class({
         // after a user has been picked.
         this._checkForSmartcard();
 
-        this._smartcardManager.connect('smartcard-inserted',
+        this._smartcardInsertedId = this._smartcardManager.connect('smartcard-inserted',
-                                       Lang.bind(this, this._checkForSmartcard));
+                                                                   Lang.bind(this, this._checkForSmartcard));
-        this._smartcardManager.connect('smartcard-removed',
+        this._smartcardRemovedId = this._smartcardManager.connect('smartcard-removed',
-                                       Lang.bind(this, this._checkForSmartcard));
+                                                                  Lang.bind(this, this._checkForSmartcard));
 
         this._messageQueue = [];
         this._messageQueueTimeoutId = 0;
@@ -159,8 +159,8 @@ const ShellUserVerifier = new Lang.Class({
         if (this._oVirtCredentialsManager.hasToken())
             this._oVirtUserAuthenticated(this._oVirtCredentialsManager.getToken());
 
-        this._oVirtCredentialsManager.connect('user-authenticated',
+        this._oVirtUserAuthenticatedId = this._oVirtCredentialsManager.connect('user-authenticated',
-                                              Lang.bind(this, this._oVirtUserAuthenticated));
+                                                                               Lang.bind(this, this._oVirtUserAuthenticated));
     },
 
     begin: function(userName, hold) {
@@ -191,20 +191,37 @@ const ShellUserVerifier = new Lang.Class({
         }
     },
 
+    _clearUserVerifier: function() {
+        if (this._userVerifier) {
+            this._userVerifier.run_dispose();
+            this._userVerifier = null;
+        }
+    },
+
     clear: function() {
         if (this._cancellable) {
             this._cancellable.cancel();
             this._cancellable = null;
         }
 
-        if (this._userVerifier) {
+        this._clearUserVerifier();
-            this._userVerifier.run_dispose();
-            this._userVerifier = null;
-        }
-
         this._clearMessageQueue();
     },
 
+    destroy: function() {
+        this.clear();
+
+        this._settings.run_dispose();
+        this._settings = null;
+
+        this._smartcardManager.disconnect(this._smartcardInsertedId);
+        this._smartcardManager.disconnect(this._smartcardRemovedId);
+        this._smartcardManager = null;
+
+        this._oVirtCredentialsManager.disconnect(this._oVirtUserAuthenticatedId);
+        this._oVirtCredentialsManager = null;
+    },
+
     answerQuery: function(serviceName, answer) {
         if (!this.hasPendingMessages) {
             this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
@@ -283,9 +300,10 @@ const ShellUserVerifier = new Lang.Class({
 
         this._fprintManager.GetDefaultDeviceRemote(Gio.DBusCallFlags.NONE, this._cancellable, Lang.bind(this,
             function(device, error) {
-                if (!error && device)
+                if (!error && device) {
                     this._haveFingerprintReader = true;
                     this._updateDefaultService();
+                }
             }));
     },
 
@@ -326,6 +344,7 @@ const ShellUserVerifier = new Lang.Class({
 
     _reauthenticationChannelOpened: function(client, result) {
         try {
+            this._clearUserVerifier();
             this._userVerifier = client.open_reauthentication_channel_finish(result);
         } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
             return;
@@ -349,6 +368,7 @@ const ShellUserVerifier = new Lang.Class({
 
     _userVerifierGot: function(client, result) {
         try {
+            this._clearUserVerifier();
             this._userVerifier = client.get_user_verifier_finish(result);
         } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
             return;

js/js-resources.gresource.xml

@@ -64,6 +64,7 @@
     <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 extesion with
+    // Walk up the directory tree, looking for an extension with
     // the same UUID as a directory name.
     while (file != null) {
         let extension = extensions[file.get_basename()];

js/misc/ibusManager.js

@@ -1,13 +1,14 @@
 // -*- 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;
-    if (!('new_async' in IBus.Bus))
+    _checkIBusVersion(1, 5, 2);
-        throw "IBus version is too old";
     const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
 } catch (e) {
     var IBus = null;
@@ -16,6 +17,18 @@ 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();
@@ -28,6 +41,7 @@ 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)
@@ -42,6 +56,7 @@ 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));
@@ -106,6 +121,16 @@ 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;
@@ -155,6 +180,10 @@ 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);
     },
@@ -167,7 +196,10 @@ const IBusManager = new Lang.Class({
     },
 
     setEngine: function(id, callback) {
-        if (!IBus || !this._ready || id == this._currentEngineName) {
+        // 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 (callback)
                 callback();
             return;
@@ -176,5 +208,27 @@ 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/keyboardManager.js

@@ -35,7 +35,7 @@ function releaseKeyboard() {
 }
 
 function holdKeyboard() {
-    global.freeze_keyboard(global.get_current_time());
+    global.display.freeze_keyboard(global.get_current_time());
 }
 
 const KeyboardManager = new Lang.Class({

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
+            /* TRANSLATORS: this is the title of the wifi captive portal login
-            // window, until we know the title of the actual login page
+             * window, until we know the title of the actual login page */
             this.title = _("Web Authentication Redirect");
         }
     },

js/ui/altTab.js

@@ -81,7 +81,6 @@ 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/animation.js

@@ -12,7 +12,7 @@ const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const Animation = new Lang.Class({
     Name: 'Animation',
 
-    _init: function(filename, width, height, speed) {
+    _init: function(file, width, height, speed) {
         this.actor = new St.Bin();
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
         this._speed = speed;
@@ -23,7 +23,7 @@ const Animation = new Lang.Class({
         this._frame = 0;
 
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height, scaleFactor,
+        this._animations = St.TextureCache.get_default().load_sliced_image (file, width, height, scaleFactor,
                                                                             Lang.bind(this, this._animationsLoaded));
         this.actor.set_child(this._animations);
     },
@@ -82,7 +82,7 @@ const AnimatedIcon = new Lang.Class({
     Name: 'AnimatedIcon',
     Extends: Animation,
 
-    _init: function(filename, size) {
+    _init: function(file, size) {
-        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+        this.parent(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
     }
 });

js/ui/appDisplay.js

@@ -366,6 +366,8 @@ 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,
@@ -379,9 +381,7 @@ const AllView = new Lang.Class({
         this.actor.add_actor(this._scrollView);
 
         this._scrollView.set_policy(Gtk.PolicyType.NEVER,
-                                    Gtk.PolicyType.AUTOMATIC);
+                                    Gtk.PolicyType.EXTERNAL);
-        // we are only using ScrollView for the fade effect, hide scrollbars
-        this._scrollView.vscroll.hide();
         this._adjustment = this._scrollView.vscroll.adjustment;
 
         this._pageIndicators = new PageIndicators();
@@ -519,9 +519,19 @@ 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);
+
+            let icon = new AppIcon(app,
+                                   { isDraggable: favoritesWritable });
             this.addItem(icon);
         }));
 
@@ -765,6 +775,9 @@ 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 });
@@ -801,10 +814,19 @@ 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]);
+            let appIcon = new AppIcon(mostUsed[i],
+                                      { isDraggable: favoritesWritable });
             this._grid.addItem(appIcon, -1);
         }
     },
@@ -881,14 +903,14 @@ const AppDisplay = new Lang.Class({
         let view, button;
         view = new FrequentView();
         button = new St.Button({ label: _("Frequent"),
-                                 style_class: 'app-view-control',
+                                 style_class: 'app-view-control button',
                                  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',
+                                 style_class: 'app-view-control button',
                                  can_focus: true,
                                  x_expand: true });
         this._views[Views.ALL] = { 'view': view, 'control': button };
@@ -1267,6 +1289,7 @@ const FolderIcon = new Lang.Class({
             addAppId(appInfo.get_id());
         });
 
+        this.actor.visible = this.view.getAllItems().length > 0;
         this.view.loadGrid();
         this.emit('apps-changed');
     },
@@ -1524,15 +1547,33 @@ const AppIcon = new Lang.Class({
                                      can_focus: true,
                                      x_fill: true,
                                      y_fill: true });
+
+        this._dot = new St.Widget({ style_class: 'app-well-app-running-dot',
+                                    layout_manager: new Clutter.BinLayout(),
+                                    x_expand: true, y_expand: true,
+                                    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.actor.set_child(this._iconContainer);
+        this._iconContainer.add_child(this._dot);
+
         this.actor._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.actor.set_child(this.icon.actor);
+        this._iconContainer.add_child(this.icon.actor);
 
         this.actor.label_actor = this.icon.label;
 
@@ -1545,28 +1586,31 @@ const AppIcon = new Lang.Class({
         this._menu = null;
         this._menuManager = new PopupMenu.PopupMenuManager(this);
 
-        this._draggable = DND.makeDraggable(this.actor);
+        if (isDraggable) {
-        this._draggable.connect('drag-begin', Lang.bind(this,
+            this._draggable = DND.makeDraggable(this.actor);
-            function () {
+            this._draggable.connect('drag-begin', Lang.bind(this,
-                this._removeMenuTimeout();
+                function () {
-                Main.overview.beginItemDrag(this);
+                    this._removeMenuTimeout();
-            }));
+                    Main.overview.beginItemDrag(this);
-        this._draggable.connect('drag-cancelled', Lang.bind(this,
+                }));
-            function () {
+            this._draggable.connect('drag-cancelled', Lang.bind(this,
-                Main.overview.cancelledItemDrag(this);
+                function () {
-            }));
+                    Main.overview.cancelledItemDrag(this);
-        this._draggable.connect('drag-end', Lang.bind(this,
+                }));
-            function () {
+            this._draggable.connect('drag-end', Lang.bind(this,
-               Main.overview.endItemDrag(this);
+                function () {
-            }));
+                   Main.overview.endItemDrag(this);
+                }));
+        }
 
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
         this._menuTimeoutId = 0;
-        this._stateChangedId = this.app.connect('notify::state',
+        this._stateChangedId = this.app.connect('notify::state', Lang.bind(this,
-                                                Lang.bind(this,
+            function () {
-                                                          this._onStateChanged));
+                this._updateRunningStyle();
-        this._onStateChanged();
+            }));
+        this._updateRunningStyle();
     },
 
     _onDestroy: function() {
@@ -1587,11 +1631,11 @@ const AppIcon = new Lang.Class({
         }
     },
 
-    _onStateChanged: function() {
+    _updateRunningStyle: function() {
         if (this.app.state != Shell.AppState.STOPPED)
-            this.actor.add_style_class_name('running');
+            this._dot.show();
         else
-            this.actor.remove_style_class_name('running');
+            this._dot.hide();
     },
 
     _setPopupTimeout: function() {
@@ -1645,7 +1689,9 @@ const AppIcon = new Lang.Class({
     popupMenu: function() {
         this._removeMenuTimeout();
         this.actor.fake_release();
-        this._draggable.fakeRelease();
+
+        if (this._draggable)
+            this._draggable.fakeRelease();
 
         if (!this._menu) {
             this._menu = new AppIconMenu(this);
@@ -1748,6 +1794,8 @@ 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)
@@ -1785,7 +1833,10 @@ const AppIconMenu = new Lang.Class({
         if (!this._source.app.is_window_backed()) {
             this._appendSeparator();
 
-            if (this._source.app.can_open_new_window()) {
+            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) {
                 this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
                 this._newWindowMenuItem.connect('activate', Lang.bind(this, function() {
                     if (this._source.app.state == Shell.AppState.STOPPED)
@@ -1797,8 +1848,6 @@ 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));
@@ -1807,22 +1856,27 @@ const AppIconMenu = new Lang.Class({
                     this.emit('activate-window', null);
                 }));
             }
-            this._appendSeparator();
 
-            let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());
+            let canFavorite = this._settings.is_writable('favorite-apps');
 
-            if (isFavorite) {
+            if (canFavorite) {
-                let item = this._appendMenuItem(_("Remove from Favorites"));
+                this._appendSeparator();
-                item.connect('activate', Lang.bind(this, function() {
+
-                    let favs = AppFavorites.getAppFavorites();
+                let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());
-                    favs.removeFavorite(this._source.app.get_id());
+
-                }));
+                if (isFavorite) {
-            } else {
+                    let item = this._appendMenuItem(_("Remove from Favorites"));
-                let item = this._appendMenuItem(_("Add to Favorites"));
+                    item.connect('activate', Lang.bind(this, function() {
-                item.connect('activate', Lang.bind(this, function() {
+                        let favs = AppFavorites.getAppFavorites();
-                    let favs = AppFavorites.getAppFavorites();
+                        favs.removeFavorite(this._source.app.get_id());
-                    favs.addFavorite(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/background.js

@@ -106,6 +106,8 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
+const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
+
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
 const PRIMARY_COLOR_KEY = 'primary-color';
 const SECONDARY_COLOR_KEY = 'secondary-color';
@@ -125,6 +127,16 @@ const ANIMATION_MIN_WAKEUP_INTERVAL = 1.0;
 
 let _backgroundCache = null;
 
+function _fileEqual0(file1, file2) {
+    if (file1 == file2)
+        return true;
+
+    if (!file1 || !file2)
+        return false;
+
+    return file1.equal(file2);
+}
+
 const BackgroundCache = new Lang.Class({
     Name: 'BackgroundCache',
 
@@ -134,25 +146,25 @@ const BackgroundCache = new Lang.Class({
         this._backgroundSources = {};
     },
 
-    monitorFile: function(filename) {
+    monitorFile: function(file) {
-        if (this._fileMonitors[filename])
+        let key = file.hash();
+        if (this._fileMonitors[key])
             return;
 
-        let file = Gio.File.new_for_path(filename);
         let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
         monitor.connect('changed',
                         Lang.bind(this, function() {
-                            this.emit('file-changed', filename);
+                            this.emit('file-changed', file);
                         }));
 
-        this._fileMonitors[filename] = monitor;
+        this._fileMonitors[key] = monitor;
     },
 
     getAnimation: function(params) {
-        params = Params.parse(params, { filename: null,
+        params = Params.parse(params, { file: null,
                                         onLoaded: null });
 
-        if (this._animationFilename == params.filename) {
+        if (_fileEqual0(this._animationFile, params.file)) {
             if (params.onLoaded) {
                 let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
                     params.onLoaded(this._animation);
@@ -160,12 +172,13 @@ const BackgroundCache = new Lang.Class({
                 }));
                 GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
             }
+            return;
         }
 
-        let animation = new Animation({ filename: params.filename });
+        let animation = new Animation({ file: params.file });
 
         animation.load(Lang.bind(this, function() {
-                           this._animationFilename = params.filename;
+                           this._animationFile = params.file;
                            this._animation = animation;
 
                            if (params.onLoaded) {
@@ -218,14 +231,14 @@ const Background = new Lang.Class({
         params = Params.parse(params, { monitorIndex: 0,
                                         layoutManager: Main.layoutManager,
                                         settings: null,
-                                        filename: null,
+                                        file: null,
                                         style: null });
 
         this.background = new Meta.Background({ meta_screen: global.screen });
         this.background._delegate = this;
 
         this._settings = params.settings;
-        this._filename = params.filename;
+        this._file = params.file;
         this._style = params.style;
         this._monitorIndex = params.monitorIndex;
         this._layoutManager = params.layoutManager;
@@ -292,18 +305,21 @@ const Background = new Lang.Class({
             this.background.set_gradient(shadingType, color, secondColor);
     },
 
-    _watchFile: function(filename) {
+    _watchFile: function(file) {
-        if (this._fileWatches[filename])
+        let key = file.hash();
+        if (this._fileWatches[key])
             return;
 
-        this._cache.monitorFile(filename);
+        this._cache.monitorFile(file);
         let signalId = this._cache.connect('file-changed',
                                            Lang.bind(this, function(cache, changedFile) {
-                                               if (changedFile == filename) {
+                                               if (changedFile.equal(file)) {
+                                                   let imageCache = Meta.BackgroundImageCache.get_default();
+                                                   imageCache.purge(changedFile);
                                                    this.emit('changed');
                                                }
                                            }));
-        this._fileWatches[filename] = signalId;
+        this._fileWatches[key] = signalId;
     },
 
     _removeAnimationTimeout: function() {
@@ -326,9 +342,9 @@ const Background = new Lang.Class({
                                           this._animation.transitionProgress,
                                           this._style);
             } else if (files.length > 0) {
-                this.background.set_filename(files[0], this._style);
+                this.background.set_file(files[0], this._style);
             } else {
-                this.background.set_filename(null, this._style);
+                this.background.set_file(null, this._style);
             }
             this._queueUpdateAnimation();
         });
@@ -385,28 +401,28 @@ const Background = new Lang.Class({
         GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
     },
 
-    _loadAnimation: function(filename) {
+    _loadAnimation: function(file) {
-        this._cache.getAnimation({ filename: filename,
+        this._cache.getAnimation({ file: file,
-                                             onLoaded: Lang.bind(this, function(animation) {
+                                         onLoaded: Lang.bind(this, function(animation) {
-                                                 this._animation = animation;
+                                             this._animation = animation;
 
-                                                 if (!this._animation || this._cancellable.is_cancelled()) {
+                                             if (!this._animation || this._cancellable.is_cancelled()) {
-                                                     this._setLoaded();
+                                                 this._setLoaded();
-                                                     return;
+                                                 return;
-                                                 }
+                                             }
 
-                                                 this._updateAnimation();
+                                             this._updateAnimation();
-                                                 this._watchFile(filename);
+                                             this._watchFile(file);
-                                             })
+                                         })
-                                           });
+                                 });
     },
 
-    _loadImage: function(filename) {
+    _loadImage: function(file) {
-        this.background.set_filename(filename, this._style);
+        this.background.set_file(file, this._style);
-        this._watchFile(filename);
+        this._watchFile(file);
 
         let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(filename);
+        let image = cache.load(file);
         if (image.is_loaded())
             this._setLoaded();
         else {
@@ -418,11 +434,11 @@ const Background = new Lang.Class({
         }
     },
 
-    _loadFile: function(filename) {
+    _loadFile: function(file) {
-        if (filename.endsWith('.xml'))
+        if (file.get_basename().endsWith('.xml'))
-            this._loadAnimation(filename);
+            this._loadAnimation(file);
         else
-            this._loadImage(filename);
+            this._loadImage(file);
     },
 
     _load: function () {
@@ -430,12 +446,12 @@ const Background = new Lang.Class({
 
         this._loadPattern();
 
-        if (!this._filename) {
+        if (!this._file) {
             this._setLoaded();
             return;
         }
 
-        this._loadFile(this._filename);
+        this._loadFile(this._file);
     },
 });
 Signals.addSignalMethods(Background.prototype);
@@ -446,11 +462,12 @@ const SystemBackground = new Lang.Class({
     Name: 'SystemBackground',
 
     _init: function() {
-        let filename = global.datadir + '/theme/noise-texture.png';
+        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
 
         if (_systemBackground == null) {
             _systemBackground = new Meta.Background({ meta_screen: global.screen });
-            _systemBackground.set_filename(filename, GDesktopEnums.BackgroundStyle.WALLPAPER);
+            _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
+            _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
         }
 
         this.actor = new Meta.BackgroundActor({ meta_screen: global.screen,
@@ -458,7 +475,7 @@ const SystemBackground = new Lang.Class({
                                                 background: _systemBackground });
 
         let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(filename);
+        let image = cache.load(file);
         if (image.is_loaded()) {
             image = null;
             let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
@@ -507,20 +524,17 @@ const BackgroundSource = new Lang.Class({
     },
 
     getBackground: function(monitorIndex) {
-        let filename = null;
+        let file = null;
         let style;
 
         if (this._overrideImage != null) {
-            filename = this._overrideImage;
+            file = Gio.File.new_for_path(this._overrideImage);
             style = GDesktopEnums.BackgroundStyle.ZOOM; // Hardcode
         } else {
             style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
             if (style != GDesktopEnums.BackgroundStyle.NONE) {
                 let uri = this._settings.get_string(PICTURE_URI_KEY);
-                if (GLib.uri_parse_scheme(uri) != null)
+                file = Gio.File.new_for_commandline_arg(uri);
-                    filename = Gio.File.new_for_uri(uri).get_path();
-                else
-                    filename = uri;
             }
         }
 
@@ -528,7 +542,7 @@ const BackgroundSource = new Lang.Class({
         // they can have variants that depend on the aspect ratio and
         // size of the monitor; for other backgrounds we can use the
         // same background object for all monitors.
-        if (filename == null || !filename.endsWith('.xml'))
+        if (file == null || !file.get_basename().endsWith('.xml'))
             monitorIndex = 0;
 
         if (!(monitorIndex in this._backgrounds)) {
@@ -536,7 +550,7 @@ const BackgroundSource = new Lang.Class({
                 monitorIndex: monitorIndex,
                 layoutManager: this._layoutManager,
                 settings: this._settings,
-                filename: filename,
+                file: file,
                 style: style
             });
 
@@ -569,9 +583,9 @@ const Animation = new Lang.Class({
     Name: 'Animation',
 
     _init: function(params) {
-        params = Params.parse(params, { filename: null });
+        params = Params.parse(params, { file: null });
 
-        this.filename = params.filename;
+        this.file = params.file;
         this.keyFrameFiles = [];
         this.transitionProgress = 0.0;
         this.transitionDuration = 0.0;
@@ -579,9 +593,7 @@ const Animation = new Lang.Class({
     },
 
     load: function(callback) {
-        let file = Gio.File.new_for_path(this.filename);
+        this._show = new GnomeDesktop.BGSlideShow({ filename: this.file.get_path() });
-
-        this._show = new GnomeDesktop.BGSlideShow({ filename: this.filename });
 
         this._show.load_async(null,
                               Lang.bind(this,
@@ -601,16 +613,16 @@ const Animation = new Lang.Class({
         if (this._show.get_num_slides() < 1)
             return;
 
-        let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width, monitor.height);
+        let [progress, duration, isFixed, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
 
         this.transitionDuration = duration;
         this.transitionProgress = progress;
 
-        if (file1)
+        if (filename1)
-            this.keyFrameFiles.push(file1);
+            this.keyFrameFiles.push(Gio.File.new_for_path(filename1));
 
-        if (file2)
+        if (filename2)
-            this.keyFrameFiles.push(file2);
+            this.keyFrameFiles.push(Gio.File.new_for_path(filename2));
     },
 });
 Signals.addSignalMethods(Animation.prototype);

js/ui/calendar.js

@@ -13,9 +13,11 @@ const Shell = imports.gi.Shell;
 
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
+const ELLIPSIS_CHAR = '\u2026';
 
 // alias to prevent xgettext from picking up strings translated in GTK+
 const gtk30_ = Gettext_gtk30.gettext;
+const NC_ = function(context, str) { return str; };
 
 // in org.gnome.desktop.interface
 const CLOCK_FORMAT_KEY        = 'clock-format';
@@ -32,12 +34,10 @@ function _sameDay(dateA, dateB) {
     return _sameMonth(dateA, dateB) && (dateA.getDate() == dateB.getDate());
 }
 
-/* TODO: maybe needs config - right now we assume that Saturday and
- * Sunday are non-work days (not true in e.g. Israel, it's Sunday and
- * Monday there)
- */
 function _isWorkDay(date) {
-    return date.getDay() != 0 && date.getDay() != 6;
+    /* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
+    let days = C_('calendar-no-work', "06");
+    return days.indexOf(date.getDay().toString()) == -1;
 }
 
 function _getBeginningOfDay(date) {
@@ -58,19 +58,21 @@ function _getEndOfDay(date) {
     return ret;
 }
 
-function _formatEventTime(event, clockFormat) {
+function _formatEventTime(event, clockFormat, periodBegin, periodEnd) {
     let ret;
-    if (event.allDay) {
+    let allDay = (event.allDay || (event.date <= periodBegin && event.end >= periodEnd));
+    if (allDay) {
         /* Translators: Shown in calendar event list for all day events
          * Keep it short, best if you can use less then 10 characters
          */
         ret = C_("event list time", "All Day");
     } else {
+        let date = event.date >= periodBegin ? event.date : event.end;
         switch (clockFormat) {
         case '24h':
             /* Translators: Shown in calendar event list, if 24h format,
                \u2236 is a ratio character, similar to : */
-            ret = event.date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
+            ret = date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
             break;
 
         default:
@@ -79,30 +81,13 @@ function _formatEventTime(event, clockFormat) {
             /* Translators: Shown in calendar event list, if 12h format,
                \u2236 is a ratio character, similar to : and \u2009 is
                a thin space */
-            ret = event.date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
+            ret = date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
             break;
         }
     }
     return ret;
 }
 
-function _getCalendarWeekForDate(date) {
-    // Based on the algorithms found here:
-    // http://en.wikipedia.org/wiki/Talk:ISO_week_date
-    let midnightDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-    // Need to get Monday to be 1 ... Sunday to be 7
-    let dayOfWeek = 1 + ((midnightDate.getDay() + 6) % 7);
-    let nearestThursday = new Date(midnightDate.getFullYear(), midnightDate.getMonth(),
-                                   midnightDate.getDate() + (4 - dayOfWeek));
-
-    let jan1st = new Date(nearestThursday.getFullYear(), 0, 1);
-    let diffDate = nearestThursday - jan1st;
-    let dayNumber = Math.floor(Math.abs(diffDate) / MSECS_IN_DAY);
-    let weekNumber = Math.floor(dayNumber / 7) + 1;
-
-    return weekNumber;
-}
-
 function _getCalendarDayAbbreviation(dayNumber) {
     let abbreviations = [
         /* Translators: Calendar grid abbreviation for Sunday.
@@ -248,11 +233,24 @@ const DBusEventSource = new Lang.Class({
         this._initialized = false;
         this._dbusProxy = new CalendarServer();
         this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
+            let loaded = false;
+
             try {
                 this._dbusProxy.init_finish(result);
+                loaded = true;
             } catch(e) {
-                log('Error loading calendars: ' + e.message);
+                if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
-                return;
+                    // Ignore timeouts and install signals as normal, because with high
+                    // probability the service will appear later on, and we will get a
+                    // NameOwnerChanged which will finish loading
+                    //
+                    // (But still _initialized to false, because the proxy does not know
+                    // about the HasCalendars property and would cause an exception trying
+                    // to read it)
+                } else {
+                    log('Error loading calendars: ' + e.message);
+                    return;
+                }
             }
 
             this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
@@ -268,9 +266,11 @@ const DBusEventSource = new Lang.Class({
                 this.emit('notify::has-calendars');
             }));
 
-            this._initialized = true;
+            this._initialized = loaded;
-            this.emit('notify::has-calendars');
+            if (loaded) {
-            this._onNameAppeared();
+                this.emit('notify::has-calendars');
+                this._onNameAppeared();
+            }
         }));
     },
 
@@ -292,6 +292,7 @@ const DBusEventSource = new Lang.Class({
     },
 
     _onNameAppeared: function(owner) {
+        this._initialized = true;
         this._resetCache();
         this._loadEvents(true);
     },
@@ -361,6 +362,12 @@ const DBusEventSource = new Lang.Class({
                 result.push(event);
             }
         }
+        result.sort(function(event1, event2) {
+            // sort events by end time on ending day
+            let d1 = event1.date < begin && event1.end <= end ? event1.end : event1.date;
+            let d2 = event2.date < begin && event2.end <= end ? event2.end : event2.date;
+            return d1.getTime() - d2.getTime();
+        });
         return result;
     },
 
@@ -449,7 +456,7 @@ const Calendar = new Lang.Class({
         this._topBox = new St.BoxLayout();
         layout.attach(this._topBox, 0, 0, offsetCols + 7, 1);
 
-        this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
+        this._backButton = new St.Button({ style_class: 'calendar-change-month-back pager-button',
                                            accessible_name: _("Previous month"),
                                            can_focus: true });
         this._topBox.add(this._backButton);
@@ -459,7 +466,7 @@ const Calendar = new Lang.Class({
                                          can_focus: true });
         this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
 
-        this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward',
+        this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward pager-button',
                                               accessible_name: _("Next month"),
                                               can_focus: true });
         this._topBox.add(this._forwardButton);
@@ -594,6 +601,7 @@ const Calendar = new Lang.Class({
         beginDate.setHours(12);
 
         this._calendarBegin = new Date(beginDate);
+        this._markedAsToday = now;
 
         let year = beginDate.getYear();
 
@@ -661,7 +669,7 @@ const Calendar = new Lang.Class({
             this._buttons.push(button);
 
             if (this._useWeekdate && iter.getDay() == 4) {
-                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
+                let label = new St.Label({ text: iter.toLocaleFormat('%V'),
                                            style_class: 'calendar-day-base calendar-week-number'});
                 layout.attach(label, rtl ? 7 : 0, row, 1, 1);
             }
@@ -685,7 +693,7 @@ const Calendar = new Lang.Class({
         else
             this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);
 
-        if (!this._calendarBegin || !_sameMonth(this._selectedDate, this._calendarBegin))
+        if (!this._calendarBegin || !_sameMonth(this._selectedDate, this._calendarBegin) || !_sameDay(now, this._markedAsToday))
             this._rebuildCalendar();
 
         this._buttons.forEach(Lang.bind(this, function(button) {
@@ -721,12 +729,16 @@ const EventsList = new Lang.Class({
         this._eventSource.connect('changed', Lang.bind(this, this._update));
     },
 
-    _addEvent: function(event, index, includeDayName) {
+    _addEvent: function(event, index, includeDayName, periodBegin, periodEnd) {
         let dayString;
-        if (includeDayName)
+        if (includeDayName) {
-            dayString = _getEventDayAbbreviation(event.date.getDay());
+            if (event.date >= periodBegin)
-        else
+                dayString = _getEventDayAbbreviation(event.date.getDay());
+            else /* show event end day if it began earlier */
+                dayString = _getEventDayAbbreviation(event.end.getDay());
+        } else {
             dayString = '';
+        }
 
         let dayLabel = new St.Label({ style_class: 'events-day-dayname',
                                       text: dayString,
@@ -739,16 +751,30 @@ const EventsList = new Lang.Class({
 
         let layout = this.actor.layout_manager;
         layout.attach(dayLabel, rtl ? 2 : 0, index, 1, 1);
-
         let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
-        let timeString = _formatEventTime(event, clockFormat);
+        let timeString = _formatEventTime(event, clockFormat, periodBegin, periodEnd);
         let timeLabel = new St.Label({ style_class: 'events-day-time',
                                        text: timeString,
                                        y_align: Clutter.ActorAlign.START });
         timeLabel.clutter_text.line_wrap = false;
         timeLabel.clutter_text.ellipsize = false;
 
-        layout.attach(timeLabel, 1, index, 1, 1);
+        let preEllipsisLabel = new St.Label({ style_class: 'events-day-time-ellipses',
+                                              text: ELLIPSIS_CHAR,
+                                              y_align: Clutter.ActorAlign.START });
+        let postEllipsisLabel = new St.Label({ style_class: 'events-day-time-ellipses',
+                                               text: ELLIPSIS_CHAR,
+                                               y_align: Clutter.ActorAlign.START });
+        if (event.allDay || event.date >= periodBegin)
+            preEllipsisLabel.opacity = 0;
+        if (event.allDay || event.end <= periodEnd)
+            postEllipsisLabel.opacity = 0;
+
+        let timeLabelBoxLayout = new St.BoxLayout();
+        timeLabelBoxLayout.add(preEllipsisLabel);
+        timeLabelBoxLayout.add(timeLabel);
+        timeLabelBoxLayout.add(postEllipsisLabel);
+        layout.attach(timeLabelBoxLayout, 1, index, 1, 1);
 
         let titleLabel = new St.Label({ style_class: 'events-day-task',
                                         text: event.summary,
@@ -759,8 +785,8 @@ const EventsList = new Lang.Class({
         layout.attach(titleLabel, rtl ? 0 : 2, index, 1, 1);
     },
 
-    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
+    _addPeriod: function(header, index, periodBegin, periodEnd, includeDayName, showNothingScheduled) {
-        let events = this._eventSource.getEvents(begin, end);
+        let events = this._eventSource.getEvents(periodBegin, periodEnd);
 
         if (events.length == 0 && !showNothingScheduled)
             return index;
@@ -771,15 +797,14 @@ const EventsList = new Lang.Class({
         index++;
 
         for (let n = 0; n < events.length; n++) {
-            this._addEvent(events[n], index, includeDayName);
+            this._addEvent(events[n], index, includeDayName, periodBegin, periodEnd);
             index++;
         }
 
         if (events.length == 0 && showNothingScheduled) {
-            let now = new Date();
             /* Translators: Text to show if there are no events */
-            let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
+            let nothingEvent = new CalendarEvent(periodBegin, periodBegin, _("Nothing Scheduled"), true);
-            this._addEvent(nothingEvent, index, false);
+            this._addEvent(nothingEvent, index, false, periodBegin, periodEnd);
             index++;
         }
 
@@ -792,14 +817,17 @@ const EventsList = new Lang.Class({
         let dayBegin = _getBeginningOfDay(day);
         let dayEnd = _getEndOfDay(day);
 
-        let dayString;
+        let dayFormat;
         let now = new Date();
         if (_sameYear(day, now))
             /* Translators: Shown on calendar heading when selected day occurs on current year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d"));
+            dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
+                                                             "%A, %B %d"));
         else
             /* Translators: Shown on calendar heading when selected day occurs on different year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
+            dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
+                                                             "%A, %B %d, %Y"));
+        let dayString = day.toLocaleFormat(dayFormat);
         this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
     },
 

js/ui/components/autorunManager.js

@@ -24,11 +24,11 @@ const AutorunSetting = {
 };
 
 // misc utils
-function shouldAutorunMount(mount, forTransient) {
+function shouldAutorunMount(mount) {
     let root = mount.get_root();
     let volume = mount.get_volume();
 
-    if (!volume || (!volume.allowAutorun && forTransient))
+    if (!volume || !volume.allowAutorun)
         return false;
 
     if (root.is_native() && isMountRootHidden(root))
@@ -167,276 +167,38 @@ const AutorunManager = new Lang.Class({
         this._session = new GnomeSession.SessionManager();
         this._volumeMonitor = Gio.VolumeMonitor.get();
 
-        this._transDispatcher = new AutorunTransientDispatcher(this);
+        this._dispatcher = new AutorunDispatcher(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;
 
-        this._processMount(mount, true);
+        let discoverer = new ContentTypeDiscoverer(Lang.bind(this, function(mount, apps, contentTypes) {
+            this._dispatcher.addMount(mount, apps, contentTypes);
+        }));
+        discoverer.guessContentTypes(mount);
     },
 
     _onMountRemoved: function(monitor, mount) {
-        this._transDispatcher.removeMount(mount);
+        this._dispatcher.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 AutorunResidentNotification = new Lang.Class({
+const AutorunDispatcher = new Lang.Class({
-    Name: 'AutorunResidentNotification',
+    Name: 'AutorunDispatcher',
-    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;
@@ -482,7 +244,7 @@ const AutorunTransientDispatcher = new Lang.Class({
             return;
      
         // add a new source
-        this._sources.push(new AutorunTransientSource(this._manager, mount, apps));
+        this._sources.push(new AutorunSource(this._manager, mount, apps));
     },
 
     addMount: function(mount, apps, contentTypes) {
@@ -491,7 +253,7 @@ const AutorunTransientDispatcher = new Lang.Class({
             return;
 
         // if the mount doesn't want to be autorun, return
-        if (!shouldAutorunMount(mount, true))
+        if (!shouldAutorunMount(mount))
             return;
 
         let setting = this._getAutorunSettingForType(contentTypes[0]);
@@ -531,8 +293,8 @@ const AutorunTransientDispatcher = new Lang.Class({
     }
 });
 
-const AutorunTransientSource = new Lang.Class({
+const AutorunSource = new Lang.Class({
-    Name: 'AutorunTransientSource',
+    Name: 'AutorunSource',
     Extends: MessageTray.Source,
 
     _init: function(manager, mount, apps) {
@@ -542,7 +304,7 @@ const AutorunTransientSource = new Lang.Class({
 
         this.parent(mount.get_name());
 
-        this._notification = new AutorunTransientNotification(this._manager, this);
+        this._notification = new AutorunNotification(this._manager, this);
 
         // add ourselves as a source, and popup the notification
         Main.messageTray.add(this);
@@ -554,34 +316,24 @@ const AutorunTransientSource = new Lang.Class({
     }
 });
 
-const AutorunTransientNotification = new Lang.Class({
+const AutorunNotification = new Lang.Class({
-    Name: 'AutorunTransientNotification',
+    Name: 'AutorunNotification',
     Extends: MessageTray.Notification,
 
     _init: function(manager, source) {
-        this.parent(source, source.title, null, { customContent: true });
+        this.parent(source, source.title);
 
         this._manager = manager;
-        this._box = new St.BoxLayout({ style_class: 'hotplug-transient-box',
-                                       vertical: true });
-        this.addActor(this._box);
-
         this._mount = source.mount;
 
         source.apps.forEach(Lang.bind(this, function (app) {
             let actor = this._buttonForApp(app);
 
             if (actor)
-                this._box.add(actor, { x_fill: true,
+                this.addButton(actor);
-                                       x_align: St.Align.START });
         }));
 
-        this._box.add(this._buttonForEject(), { x_fill: true,
+        // set the notification to urgent, so that it expands out
-                                                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);
     },
 
@@ -601,7 +353,7 @@ const AutorunTransientNotification = new Lang.Class({
                                      x_fill: true,
                                      x_align: St.Align.START,
                                      button_mask: St.ButtonMask.ONE,
-                                     style_class: 'hotplug-notification-item' });
+                                     style_class: 'hotplug-notification-item button' });
 
         button.connect('clicked', Lang.bind(this, function() {
             startAppForMount(app, this._mount);
@@ -611,29 +363,11 @@ const AutorunTransientNotification = new Lang.Class({
         return button;
     },
 
-    _buttonForEject: function() {
+    _onClicked: function() {
-        let box = new St.BoxLayout();
+        this.parent();
-        let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                 style_class: 'hotplug-notification-item-icon' });
-        box.add(icon);
 
-        let label = new St.Bin({ y_align: St.Align.MIDDLE,
+        let app = Gio.app_info_get_default_for_type('inode/directory', false);
-                                 child: new St.Label
+        startAppForMount(app, this._mount);
-                                 ({ 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' });
+        let subject = new St.Label({ style_class: 'prompt-dialog-headline 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',
+        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
                                             text: this._content.title });
         messageBox.add(subjectLabel,
                        { y_fill:  false,
@@ -380,6 +380,12 @@ const VPNRequestHandler = new Lang.Class({
             argv.push('-i');
         if (flags & NMClient.SecretAgentGetSecretsFlags.REQUEST_NEW)
             argv.push('-r');
+        if (authHelper.supportsHints) {
+            for (let i = 0; i < hints.length; i++) {
+                argv.push('-t');
+                argv.push(hints[i]);
+            }
+        }
 
         this._newStylePlugin = authHelper.externalUIMode;
 
@@ -598,7 +604,9 @@ const NetworkAgent = new Lang.Class({
     Name: 'NetworkAgent',
 
     _init: function() {
-        this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent' });
+        this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
+                                                capabilities: NMClient.SecretAgentCapabilities.VPN_HINTS
+                                              });
 
         this._dialogs = { };
         this._vpnRequests = { };
@@ -698,16 +706,23 @@ const NetworkAgent = new Lang.Class({
                     let service = keyfile.get_string('VPN Connection', 'service');
                     let binary = keyfile.get_string('GNOME', 'auth-dialog');
                     let externalUIMode = false;
+                    let hints = false;
+
                     try {
                         externalUIMode = keyfile.get_boolean('GNOME', 'supports-external-ui-mode');
                     } catch(e) { } // ignore errors if key does not exist
+
+                    try {
+                        hints = keyfile.get_boolean('GNOME', 'supports-hints');
+                    } catch(e) { } // ignore errors if key does not exist
+
                     let path = binary;
                     if (!GLib.path_is_absolute(path)) {
                         path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
                     }
 
                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
-                        this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode };
+                        this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode, supportsHints: hints };
                     else
                         throw new Error('VPN plugin at %s is not executable'.format(path));
                 } catch(e) {

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',
+        this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
                                             text: _("Authentication Required") });
 
         messageBox.add(this._subjectLabel,

js/ui/components/telepathyClient.js

@@ -36,6 +36,8 @@ const NotificationDirection = {
     RECEIVED: 'chat-received'
 };
 
+const N_ = function(s) { return s; };
+
 function makeMessageFromTpMessage(tpMessage, direction) {
     let [text, flags] = tpMessage.to_text();
 
@@ -950,70 +952,70 @@ const ChatNotification = new Lang.Class({
             // Show only the time if date is on today
             if(daysAgo < 1){
                 /* Translators: Time in 24h format */
-                format = _("%H\u2236%M");
+                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 = _("Yesterday, %H\u2236%M");
+                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 = _("%A, %H\u2236%M");
+                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 = _("%B %d, %H\u2236%M");
+                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 = _("%B %d %Y, %H\u2236%M");
+                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 */
+                /* Translators: Time in 12h format */
-                format = _("%l\u2236%M %p");
+                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 = _("Yesterday, %l\u2236%M %p");
+                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 = _("%A, %l\u2236%M %p");
+                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 = _("%B %d, %l\u2236%M %p");
+                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 = _("%B %d %Y, %l\u2236%M %p");
+                format = N_("%B %d %Y, %l\u2236%M %p");
             }
         }
-        return date.toLocaleFormat(format);
+        return date.toLocaleFormat(Shell.util_translate_time_string(format));
     },
 
     appendTimestamp: function() {
@@ -1264,9 +1266,8 @@ const SubscriptionRequestNotification = new Lang.Class({
         let file = contact.get_avatar_file();
 
         if (file) {
-            let uri = file.get_uri();
             let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
+            iconBox.child = textureCache.load_file_async(file, iconBox._size, iconBox._size, scaleFactor);
         }
         else {
             iconBox.child = new St.Icon({ icon_name: 'avatar-default',

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_pixbuf_property(windows[i], 'icon');
+                        icon = textureCache.bind_cairo_surface_property(windows[i], 'icon');
                 }
 
                 items.push({ name: windows[i].title,

js/ui/dash.js

@@ -1,6 +1,7 @@
 // -*- 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;
@@ -269,6 +270,9 @@ 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;
@@ -424,6 +428,8 @@ 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() {
@@ -529,14 +535,17 @@ const Dash = new Lang.Class({
         let appIcon = new AppDisplay.AppIcon(app,
                                              { setSizeManually: true,
                                                showLabel: false });
-        appIcon._draggable.connect('drag-begin',
+        if (appIcon._draggable) {
-                                   Lang.bind(this, function() {
+            appIcon._draggable.connect('drag-begin',
-                                       appIcon.actor.opacity = 50;
+                                       Lang.bind(this, function() {
-                                   }));
+                                           appIcon.actor.opacity = 50;
-        appIcon._draggable.connect('drag-end',
+                                       }));
-                                   Lang.bind(this, function() {
+            appIcon._draggable.connect('drag-end',
-                                       appIcon.actor.opacity = 255;
+                                       Lang.bind(this, function() {
-                                   }));
+                                           appIcon.actor.opacity = 255;
+                                       }));
+        }
+
         appIcon.connect('menu-state-changed',
                         Lang.bind(this, function(appIcon, opened) {
                             this._itemMenuStateChanged(item, opened);
@@ -850,6 +859,9 @@ 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;
 
@@ -926,6 +938,9 @@ 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

@@ -3,6 +3,7 @@
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const GnomeDesktop = imports.gi.GnomeDesktop;
+const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Cairo = imports.cairo;
@@ -79,10 +80,6 @@ const DateMenuButton = new Lang.Class({
 
         this._calendar.connect('selected-date-changed',
                                Lang.bind(this, function(calendar, 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.
@@ -124,14 +121,19 @@ const DateMenuButton = new Lang.Class({
             if (isOpen) {
                 let now = new Date();
                 this._calendar.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));
             }
         }));
 
         // Done with hbox for calendar and event list
 
         this._clock = new GnomeDesktop.WallClock();
-        this._clock.connect('notify::clock', Lang.bind(this, this._updateClockAndDate));
+        this._clock.bind_property('clock', this._clockDisplay, 'text', GObject.BindingFlags.SYNC_CREATE);
-        this._updateClockAndDate();
 
         Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
         this._sessionUpdated();
@@ -141,7 +143,7 @@ const DateMenuButton = new Lang.Class({
         let now = new Date();
         return now.getYear() == date.getYear() &&
                now.getMonth() == date.getMonth() &&
-               now.getDay() == date.getDay();
+               now.getDate() == date.getDate();
     },
 
     _appInstalledChanged: function() {
@@ -167,6 +169,10 @@ const DateMenuButton = new Lang.Class({
         }
     },
 
+    _getEventSource: function() {
+        return new Calendar.DBusEventSource();
+    },
+
     _setEventSource: function(eventSource) {
         if (this._eventSource)
             this._eventSource.destroy();
@@ -184,7 +190,7 @@ const DateMenuButton = new Lang.Class({
         let eventSource;
         let showEvents = Main.sessionMode.showCalendarEvents;
         if (showEvents) {
-            eventSource = new Calendar.DBusEventSource();
+            eventSource = this._getEventSource();
         } else {
             eventSource = new Calendar.EmptyEventSource();
         }
@@ -196,16 +202,6 @@ const DateMenuButton = new Lang.Class({
         this._dateAndTimeSeparator.actor.visible = Main.sessionMode.allowSettings;
     },
 
-    _updateClockAndDate: function() {
-        this._clockDisplay.set_text(this._clock.clock);
-        /* 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 = _("%A %B %e, %Y");
-        let displayDate = new Date();
-        this._date.set_label(displayDate.toLocaleFormat(dateFormat));
-    },
-
     _getCalendarApp: function() {
         if (this._calendarApp !== undefined)
             return this._calendarApp;

js/ui/edgeDragAction.js

@@ -6,6 +6,8 @@ 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;
 
@@ -13,9 +15,10 @@ const EdgeDragAction = new Lang.Class({
     Name: 'EdgeDragAction',
     Extends: Clutter.GestureAction,
 
-    _init : function(side) {
+    _init : function(side, allowedModes) {
         this.parent();
         this._side = side;
+        this._allowedModes = allowedModes;
         this.set_n_touch_points(1);
 
         global.display.connect('grab-op-begin', Lang.bind(this, function() {
@@ -34,6 +37,9 @@ 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,6 +77,7 @@ 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,14 +203,16 @@ const InstallExtensionDialog = new Lang.Class({
 
         let message = _("Download and install “%s” from extensions.gnome.org?").format(info.name);
 
-        let box = new St.BoxLayout();
+        let box = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
+                                     vertical: false });
         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({ text: message });
+        let label = new St.Label({ style_class: 'prompt-dialog-headline',
+                                   text: message });
         box.add(label);
     },
 

js/ui/extensionSystem.js

@@ -74,7 +74,7 @@ function disableExtension(uuid) {
 
     if (extension.stylesheet) {
         let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-        theme.unload_stylesheet(extension.stylesheet.get_path());
+        theme.unload_stylesheet(extension.stylesheet);
     }
 
     try {
@@ -118,7 +118,7 @@ function enableExtension(uuid) {
         let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
         if (stylesheetFile.query_exists(null)) {
             let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-            theme.load_stylesheet(stylesheetFile.get_path());
+            theme.load_stylesheet(stylesheetFile);
             extension.stylesheet = stylesheetFile;
             break;
         }

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' });
+        this._previousButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-previous button' });
         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' });
+        this._nextButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-next button' });
         this._nextButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
         this._buttonBox.add(this._nextButton, { expand: true });
 

js/ui/iconGrid.js

@@ -20,6 +20,7 @@ const EXTRA_SPACE_ANIMATION_TIME = 0.25;
 const ANIMATION_TIME_IN = 0.350;
 const ANIMATION_TIME_OUT = 1/2 * ANIMATION_TIME_IN;
 const ANIMATION_MAX_DELAY_FOR_ITEM = 2/3 * ANIMATION_TIME_IN;
+const ANIMATION_BASE_DELAY_FOR_ITEM = 1/4 * ANIMATION_MAX_DELAY_FOR_ITEM;
 const ANIMATION_MAX_DELAY_OUT_FOR_ITEM = 2/3 * ANIMATION_TIME_OUT;
 const ANIMATION_FADE_IN_TIME_FOR_ITEM = 1/4 * ANIMATION_TIME_IN;
 
@@ -429,33 +430,30 @@ const IconGrid = new Lang.Class({
             return;
         }
 
+        // For few items the animation can be slow, so use a smaller
+        // delay when there are less than 4 items
+        // (ANIMATION_BASE_DELAY_FOR_ITEM = 1/4 *
+        // ANIMATION_MAX_DELAY_FOR_ITEM)
+        let maxDelay = Math.min(ANIMATION_BASE_DELAY_FOR_ITEM * actors.length,
+                                ANIMATION_MAX_DELAY_FOR_ITEM);
+
         for (let index = 0; index < actors.length; index++) {
             let actor = actors[index];
-            actor.opacity = 0;
             actor.reactive = false;
+            actor.set_scale(0, 0);
+            actor.set_pivot_point(0.5, 0.5);
 
-            let delay = index / actors.length * ANIMATION_MAX_DELAY_FOR_ITEM;
+            let delay = index / actors.length * maxDelay;
-            let [originalX, originalY] = actor.get_transformed_position();
-            let [originalWidth, originalHeight,,] = this._getAllocatedChildSizeAndSpacing(actor);
-
-            let actorClone = new Clutter.Clone({ source: actor });
-            Main.uiGroup.add_actor(actorClone);
-
-            actorClone.set_position(originalX, originalY);
-            actorClone.set_scale(0, 0);
-            actorClone.set_pivot_point(0.5, 0.5);
-            actorClone.set_size(originalWidth, originalHeight);
-
             let bounceUpTime = ANIMATION_TIME_IN / 4;
             let isLastItem = index == actors.length - 1;
-            Tweener.addTween(actorClone,
+            Tweener.addTween(actor,
                             { time: bounceUpTime,
                               transition: 'easeInOutQuad',
                               delay: delay,
                               scale_x: ANIMATION_BOUNCE_ICON_SCALE,
                               scale_y: ANIMATION_BOUNCE_ICON_SCALE,
                               onComplete: Lang.bind(this, function() {
-                                  Tweener.addTween(actorClone,
+                                  Tweener.addTween(actor,
                                                    { time: ANIMATION_TIME_IN - bounceUpTime,
                                                      transition: 'easeInOutQuad',
                                                      scale_x: 1,
@@ -463,10 +461,7 @@ const IconGrid = new Lang.Class({
                                                      onComplete: Lang.bind(this, function() {
                                                         if (isLastItem)
                                                             this._animationDone();
-
-                                                        actor.opacity = 255;
                                                         actor.reactive = true;
-                                                        actorClone.destroy();
                                                     })
                                                    });
                               })

js/ui/keyboard.js

@@ -75,6 +75,7 @@ const Key = new Lang.Class({
     _init : function(key) {
         this._key = key;
         this.actor = this._makeKey(key, GLib.markup_escape_text(key.label, -1));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
         this._extended_keys = this._key.get_extended_keys();
         this._extended_keyboard = null;
@@ -97,6 +98,13 @@ const Key = new Lang.Class({
         }
     },
 
+    _onDestroy: function() {
+        if (this._boxPointer) {
+            this._boxPointer.actor.destroy();
+            this._boxPointer = null;
+        }
+    },
+
     _makeKey: function (key, label) {
         let button = new St.Button ({ label: label,
                                       style_class: 'keyboard-key' });
@@ -179,14 +187,7 @@ const Keyboard = new Lang.Class({
         this._watchNameId = Gio.bus_watch_name(Gio.BusType.SESSION, CURSOR_BUS_NAME, 0,
                                                Lang.bind(this, this._sync),
                                                Lang.bind(this, this._sync));
-        this._daemonProxy = new CaribouDaemonProxy(Gio.DBus.session, CARIBOU_BUS_NAME,
+        this._daemonProxy = null;
-                                                   CARIBOU_OBJECT_PATH,
-                                                   Lang.bind(this, function(proxy, error) {
-                                                       if (error) {
-                                                           log(error.message);
-                                                           return;
-                                                       }
-                                                   }));
         this._cursorProxy = new CursorManagerProxy(Gio.DBus.session, CURSOR_BUS_NAME,
                                                    CURSOR_OBJECT_PATH,
                                                    Lang.bind(this, function(proxy, error) {
@@ -248,15 +249,28 @@ const Keyboard = new Lang.Class({
         this.actor = null;
 
         this._destroySource();
-        this._daemonProxy.QuitRemote(function (result, error) {
+        if (this._daemonProxy) {
-            if (error) {
+            this._daemonProxy.QuitRemote(function (result, error) {
-                log(error.message);
+                if (error) {
-                return;
+                    log(error.message);
-            }
+                    return;
-        });
+                }
+            });
+            this._daemonProxy = null;
+        }
     },
 
     _setupKeyboard: function() {
+        if (!this._daemonProxy) {
+            this._daemonProxy = new CaribouDaemonProxy(Gio.DBus.session, CARIBOU_BUS_NAME,
+                                                       CARIBOU_OBJECT_PATH,
+                                                       Lang.bind(this, function(proxy, error) {
+                                                           if (error) {
+                                                               log(error.message);
+                                                               return;
+                                                           }
+                                                       }));
+        }
         this._daemonProxy.RunRemote(function (result, error) {
             if (error) {
                 log(error.message);
@@ -602,7 +616,7 @@ const Keyboard = new Lang.Class({
 
     _moveTemporarily: function () {
         let currentWindow = global.screen.get_display().focus_window;
-        let rect = currentWindow.get_outer_rect();
+        let rect = currentWindow.get_frame_rect();
 
         let newX = rect.x;
         let newY = 3 * this.actor.height / 2;

js/ui/layout.js

@@ -20,7 +20,6 @@ const Tweener = imports.ui.tweener;
 const STARTUP_ANIMATION_TIME = 0.5;
 const KEYBOARD_ANIMATION_TIME = 0.15;
 const BACKGROUND_FADE_ANIMATION_TIME = 1.0;
-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
 // The message tray takes this much pressure
 // in the pressure barrier at once to release it.
@@ -160,10 +159,10 @@ const LayoutManager = new Lang.Class({
         this._isPopupWindowVisible = false;
         this._startingUp = true;
 
-        // Normally, the stage is always covered so Clutter doesn't need to clear
+        // We don't want to paint the stage background color because either
-        // it; however it becomes visible during the startup animation
+        // the SystemBackground we create or the MetaBackgroundActor inside
-        // See the comment below for a longer explanation
+        // global.window_group covers the entirety of the screen.
-        global.stage.background_color = DEFAULT_BACKGROUND_COLOR;
+        global.stage.no_clear_hint = true;
 
         // Set up stage hierarchy to group all UI actors under one container.
         this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
@@ -230,6 +229,10 @@ const LayoutManager = new Lang.Class({
         global.stage.remove_actor(global.top_window_group);
         this.uiGroup.add_actor(global.top_window_group);
 
+        let feedbackGroup = Meta.get_feedback_group_for_screen(global.screen);
+        global.stage.remove_actor(feedbackGroup);
+        this.uiGroup.add_actor(feedbackGroup);
+
         this._backgroundGroup = new Meta.BackgroundGroup();
         global.window_group.add_child(this._backgroundGroup);
         this._backgroundGroup.lower_bottom();
@@ -259,7 +262,6 @@ const LayoutManager = new Lang.Class({
 
         this._inOverview = true;
         this._updateVisibility();
-        this._updateRegions();
     },
 
     hideOverview: function() {
@@ -267,7 +269,6 @@ const LayoutManager = new Lang.Class({
 
         this._inOverview = false;
         this._updateVisibility();
-        this._queueUpdateRegions();
     },
 
     _sessionUpdated: function() {
@@ -421,10 +422,7 @@ const LayoutManager = new Lang.Class({
         this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
         this.panelBox.set_size(this.primaryMonitor.width, -1);
 
-        if (this.keyboardIndex < 0)
+        this.keyboardIndex = this.primaryIndex;
-            this.keyboardIndex = this.primaryIndex;
-        else
-            this._updateKeyboardBox();
 
         this.trayBox.set_position(this.bottomMonitor.x,
                                   this.bottomMonitor.y + this.bottomMonitor.height);
@@ -460,8 +458,8 @@ const LayoutManager = new Lang.Class({
     _setupTrayPressure: function() {
         this._trayPressure = new PressureBarrier(MESSAGE_TRAY_PRESSURE_THRESHOLD,
                                                  MESSAGE_TRAY_PRESSURE_TIMEOUT,
-                                                 Shell.KeyBindingMode.NORMAL |
+                                                 Shell.ActionMode.NORMAL |
-                                                 Shell.KeyBindingMode.OVERVIEW);
+                                                 Shell.ActionMode.OVERVIEW);
         this._trayPressure.setEventFilter(this._trayBarrierEventFilter);
         this._trayPressure.connect('trigger', function(barrier) {
             if (Main.layoutManager.bottomMonitor.inFullscreen)
@@ -589,10 +587,6 @@ const LayoutManager = new Lang.Class({
     //
     // When starting a normal user session, we want to grow it out of the middle
     // of the screen.
-    //
-    // Usually, we don't want to paint the stage background color because the
-    // MetaBackgroundActor inside global.window_group covers the entirety of the
-    // screen. So, we set no_clear_hint at the end of the animation.
 
     _prepareStartupAnimation: function() {
         // During the initial transition, add a simple actor to block all events,
@@ -673,10 +667,6 @@ const LayoutManager = new Lang.Class({
     },
 
     _startupAnimationComplete: function() {
-        // At this point, the UI group is covering everything, so
-        // we no longer need to clear the stage
-        global.stage.no_clear_hint = true;
-
         this._coverPane.destroy();
         this._coverPane = null;
 
@@ -915,9 +905,6 @@ const LayoutManager = new Lang.Class({
     },
 
     _queueUpdateRegions: function() {
-        if (Main.sessionMode.isGreeter)
-            return;
-
         if (this._startingUp)
             return;
 
@@ -951,13 +938,16 @@ const LayoutManager = new Lang.Class({
     },
 
     _updateRegions: function() {
-        let rects = [], struts = [], i;
-
         if (this._updateRegionIdle) {
             Meta.later_remove(this._updateRegionIdle);
             delete this._updateRegionIdle;
         }
 
+        // No need to update when we have a modal.
+        if (Main.modalCount > 0)
+            return GLib.SOURCE_REMOVE;
+
+        let rects = [], struts = [], i;
         let isPopupMenuVisible = global.top_window_group.get_children().some(isPopupMetaWindow);
         let wantsInputRegion = !isPopupMenuVisible;
 
@@ -983,46 +973,39 @@ const LayoutManager = new Lang.Class({
                 let y1 = Math.max(y, 0);
                 let y2 = Math.min(y + h, global.screen_height);
 
-                // NetWM struts are not really powerful enought to handle
+                // Metacity wants to know what side of the monitor the
-                // a multi-monitor scenario, they only describe what happens
+                // strut is considered to be attached to. First, we find
-                // around the outer sides of the full display region. However
+                // the monitor that contains the strut. If the actor is
-                // 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 the primary monitor, then it's obvious which
+                // border of that monitor, then it's obvious which side
-                // side to call it. If it's in a corner, we pick a 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
+                // arbitrarily. If it doesn't touch any edges, or it
-                // the width/height across the middle of the screen, then
+                // spans the width/height across the middle of the
-                // we don't create a strut for it at all.
+                // screen, then we don't create a strut for it at all.
+
+                let monitor = this.findMonitorForActor(actorData.actor);
                 let side;
-                let primary = this.primaryMonitor;
+                if (x1 <= monitor.x && x2 >= monitor.x + monitor.width) {
-                if (x1 <= primary.x && x2 >= primary.x + primary.width) {
+                    if (y1 <= monitor.y)
-                    if (y1 <= primary.y)
                         side = Meta.Side.TOP;
-                    else if (y2 >= primary.y + primary.height)
+                    else if (y2 >= monitor.y + monitor.height)
                         side = Meta.Side.BOTTOM;
                     else
                         continue;
-                } else if (y1 <= primary.y && y2 >= primary.y + primary.height) {
+                } else if (y1 <= monitor.y && y2 >= monitor.y + monitor.height) {
-                    if (x1 <= 0)
+                    if (x1 <= monitor.x)
                         side = Meta.Side.LEFT;
-                    else if (x2 >= primary.x + primary.width)
+                    else if (x2 >= monitor.x + monitor.width)
                         side = Meta.Side.RIGHT;
                     else
                         continue;
-                } else if (x1 <= 0)
+                } else if (x1 <= monitor.x)
                     side = Meta.Side.LEFT;
-                else if (y1 <= 0)
+                else if (y1 <= monitor.y)
                     side = Meta.Side.TOP;
-                else if (x2 >= global.screen_width)
+                else if (x2 >= monitor.x + monitor.width)
                     side = Meta.Side.RIGHT;
-                else if (y2 >= global.screen_height)
+                else if (y2 >= monitor.y + monitor.height)
                     side = Meta.Side.BOTTOM;
                 else
                     continue;
@@ -1043,7 +1026,13 @@ const LayoutManager = new Lang.Class({
         }
 
         return GLib.SOURCE_REMOVE;
-    }
+    },
+
+    modalEnded: function() {
+        // We don't update the stage input region while in a modal,
+        // so queue an update now.
+        this._queueUpdateRegions();
+    },
 });
 Signals.addSignalMethods(LayoutManager.prototype);
 
@@ -1071,8 +1060,8 @@ const HotCorner = new Lang.Class({
 
         this._pressureBarrier = new PressureBarrier(HOT_CORNER_PRESSURE_THRESHOLD,
                                                     HOT_CORNER_PRESSURE_TIMEOUT,
-                                                    Shell.KeyBindingMode.NORMAL |
+                                                    Shell.ActionMode.NORMAL |
-                                                    Shell.KeyBindingMode.OVERVIEW);
+                                                    Shell.ActionMode.OVERVIEW);
         this._pressureBarrier.connect('trigger', Lang.bind(this, this._toggleOverview));
 
         // Cache the three ripples instead of dynamically creating and destroying them.
@@ -1249,10 +1238,10 @@ const HotCorner = new Lang.Class({
 const PressureBarrier = new Lang.Class({
     Name: 'PressureBarrier',
 
-    _init: function(threshold, timeout, keybindingMode) {
+    _init: function(threshold, timeout, actionMode) {
         this._threshold = threshold;
         this._timeout = timeout;
-        this._keybindingMode = keybindingMode;
+        this._actionMode = actionMode;
         this._barriers = [];
         this._eventFilter = null;
 
@@ -1355,7 +1344,7 @@ const PressureBarrier = new Lang.Class({
             return;
 
         // Throw out all events not in the proper keybinding mode
-        if (!(this._keybindingMode & Main.keybindingMode))
+        if (!(this._actionMode & Main.actionMode))
             return;
 
         let slide = this._getDistanceAlongBarrier(barrier, event);

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 - 4; // -4 to hide the top corners
+        this._hiddenY = primary.y + Main.layoutManager.panelBox.height - myHeight;
         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, { keybindingMode: Shell.KeyBindingMode.LOOKING_GLASS }))
+        if (!Main.pushModal(this._entry, { actionMode: Shell.ActionMode.LOOKING_GLASS }))
             return;
 
         this._notebook.selectIndex(0);

js/ui/magnifier.js

@@ -1198,12 +1198,7 @@ const ZoomRegion = new Lang.Class({
 
         // Add a background for when the magnified uiGroup is scrolled
         // out of view (don't want to see desktop showing through).
-        this._background = new Clutter.Actor({ background_color: Main.DEFAULT_BACKGROUND_COLOR,
+        this._background = (new Background.SystemBackground()).actor;
-                                               layout_manager: new Clutter.BinLayout(),
-                                               width: global.screen_width,
-                                               height: global.screen_height });
-        let noiseTexture = (new Background.SystemBackground()).actor;
-        this._background.add_actor(noiseTexture);
         mainGroup.add_actor(this._background);
 
         // Clone the group that contains all of UI on the screen.  This is the

js/ui/main.js

@@ -4,6 +4,7 @@ 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;
@@ -20,6 +21,7 @@ const Keyboard = imports.ui.keyboard;
 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;
@@ -40,8 +42,6 @@ const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
 const Util = imports.misc.util;
 
-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
-
 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
 const STICKY_KEYS_ENABLE = 'stickykeys-enable';
 const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a';
@@ -58,13 +58,14 @@ 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 keybindingMode = Shell.KeyBindingMode.NONE;
+let actionMode = Shell.ActionMode.NONE;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@@ -77,18 +78,19 @@ let _cssStylesheet = null;
 let _a11ySettings = null;
 
 function _sessionUpdated() {
-    _loadDefaultStylesheet();
+    if (sessionMode.isPrimary)
+        _loadDefaultStylesheet();
 
     wm.setCustomKeybindingHandler('panel-main-menu',
-                                  Shell.KeyBindingMode.NORMAL |
+                                  Shell.ActionMode.NORMAL |
-                                  Shell.KeyBindingMode.OVERVIEW,
+                                  Shell.ActionMode.OVERVIEW,
                                   sessionMode.hasOverview ? Lang.bind(overview, overview.toggle) : null);
-    wm.allowKeybinding('overlay-key', Shell.KeyBindingMode.NORMAL |
+    wm.allowKeybinding('overlay-key', Shell.ActionMode.NORMAL |
-                                      Shell.KeyBindingMode.OVERVIEW);
+                                      Shell.ActionMode.OVERVIEW);
 
     wm.setCustomKeybindingHandler('panel-run-dialog',
-                                  Shell.KeyBindingMode.NORMAL |
+                                  Shell.ActionMode.NORMAL |
-                                  Shell.KeyBindingMode.OVERVIEW,
+                                  Shell.ActionMode.OVERVIEW,
                                   sessionMode.hasRunDialog ? openRunDialog : null);
 
     if (!sessionMode.hasRunDialog) {
@@ -111,6 +113,8 @@ 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();
@@ -131,6 +135,9 @@ function _initializeUI() {
     Shell.WindowTracker.get_default();
     Shell.AppUsage.get_default();
 
+    let resource = Gio.Resource.load(global.datadir + '/gnome-shell-theme.gresource');
+    resource._register();
+
     _loadDefaultStylesheet();
 
     // Setup the stage hierarchy early
@@ -145,6 +152,7 @@ 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();
@@ -204,32 +212,52 @@ function _initializeUI() {
     }
 
     layoutManager.connect('startup-complete', function() {
-        if (keybindingMode == Shell.KeyBindingMode.NONE) {
+        if (actionMode == Shell.ActionMode.NONE) {
-            keybindingMode = Shell.KeyBindingMode.NORMAL;
+            actionMode = Shell.ActionMode.NORMAL;
         }
         if (screenShield) {
             screenShield.lockIfWasLocked();
         }
-        if (LoginManager.haveSystemd() &&
+        if (sessionMode.currentMode != 'gdm' &&
-            sessionMode.currentMode != 'gdm' &&
             sessionMode.currentMode != 'initial-setup') {
-            // Do not import globally to not depend
+            Shell.Global.log_structured('GNOME Shell started at ' + _startDate,
-            // on systemd on non-systemd systems.
+                                        ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
-            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 _loadDefaultStylesheet() {
+function _getStylesheet(name) {
-    if (!sessionMode.isPrimary)
+    let stylesheet;
-        return;
 
-    let stylesheet = global.datadir + '/theme/' + sessionMode.stylesheetName;
+    stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + name);
-    if (_defaultCssStylesheet == stylesheet)
+    if (stylesheet.query_exists(null))
+        return stylesheet;
+
+    stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
+    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() {
+    let stylesheet = _getDefaultStylesheet();
+    if (_defaultCssStylesheet && _defaultCssStylesheet.equal(stylesheet))
         return;
 
     _defaultCssStylesheet = stylesheet;
@@ -241,7 +269,7 @@ function _loadDefaultStylesheet() {
  *
  * Get the theme CSS file that the shell will load
  *
- * Returns: A file path that contains the theme CSS,
+ * Returns: A #GFile that contains the theme CSS,
  *          null if using the default
  */
 function getThemeStylesheet() {
@@ -256,7 +284,7 @@ function getThemeStylesheet() {
  * Set the theme CSS file that the shell will load
  */
 function setThemeStylesheet(cssStylesheet) {
-    _cssStylesheet = cssStylesheet;
+    _cssStylesheet = cssStylesheet ? Gio.File.new_for_path(cssStylesheet) : null;
 }
 
 /**
@@ -341,7 +369,7 @@ function _findModal(actor) {
  *  - options: Meta.ModalOptions flags to indicate that the pointer is
  *             already grabbed
  *
- *  - keybindingMode: used to set the current Shell.KeyBindingMode to filter
+ *  - actionMode: used to set the current Shell.ActionMode to filter
  *                    global keybindings; the default of NONE will filter
  *                    out all keybindings
  *
@@ -350,7 +378,7 @@ function _findModal(actor) {
 function pushModal(actor, params) {
     params = Params.parse(params, { timestamp: global.get_current_time(),
                                     options: 0,
-                                    keybindingMode: Shell.KeyBindingMode.NONE });
+                                    actionMode: Shell.ActionMode.NONE });
 
     if (modalCount == 0) {
         if (!global.begin_modal(params.timestamp, params.options)) {
@@ -380,9 +408,9 @@ function pushModal(actor, params) {
                                 destroyId: actorDestroyId,
                                 prevFocus: prevFocus,
                                 prevFocusDestroyId: prevFocusDestroyId,
-                                keybindingMode: keybindingMode });
+                                actionMode: actionMode });
 
-    keybindingMode = params.keybindingMode;
+    actionMode = params.actionMode;
     global.stage.set_key_focus(actor);
     return true;
 }
@@ -408,7 +436,7 @@ function popModal(actor, timestamp) {
     if (focusIndex < 0) {
         global.stage.set_key_focus(null);
         global.end_modal(timestamp);
-        keybindingMode = Shell.KeyBindingMode.NORMAL;
+        actionMode = Shell.ActionMode.NORMAL;
 
         throw new Error('incorrect pop');
     }
@@ -421,7 +449,7 @@ function popModal(actor, timestamp) {
     if (focusIndex == modalActorFocusStack.length - 1) {
         if (record.prevFocus)
             record.prevFocus.disconnect(record.prevFocusDestroyId);
-        keybindingMode = record.keybindingMode;
+        actionMode = record.actionMode;
         global.stage.set_key_focus(record.prevFocus);
     } else {
         // If we have:
@@ -446,7 +474,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].keybindingMode = modalActorFocusStack[i - 1].keybindingMode;
+            modalActorFocusStack[i].actionMode = modalActorFocusStack[i - 1].actionMode;
         }
     }
     modalActorFocusStack.splice(focusIndex, 1);
@@ -454,9 +482,10 @@ function popModal(actor, timestamp) {
     if (modalCount > 0)
         return;
 
+    layoutManager.modalEnded();
     global.end_modal(timestamp);
     Meta.enable_unredirect_for_screen(global.screen);
-    keybindingMode = Shell.KeyBindingMode.NORMAL;
+    actionMode = Shell.ActionMode.NORMAL;
 }
 
 function createLookingGlass() {
@@ -624,7 +653,7 @@ const RestartMessage = new Lang.Class({
 
     _init : function(message) {
         this.parent({ shellReactive: true,
-                      styleClass: 'restart-message',
+                      styleClass: 'restart-message headline',
                       shouldFadeIn: false,
                       destroyOnClose: true });
 

js/ui/messageTray.js

@@ -494,7 +494,6 @@ const Notification = new Lang.Class({
         this.resident = false;
         // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
         this.isTransient = false;
-        this.isMusic = false;
         this.forFeedback = false;
         this.expanded = false;
         this.focused = false;
@@ -507,7 +506,6 @@ const Notification = new Lang.Class({
         this._titleFitsInBannerMode = true;
         this._spacing = 0;
         this._scrollPolicy = Gtk.PolicyType.AUTOMATIC;
-        this._imageBin = null;
         this._soundName = null;
         this._soundFile = null;
         this._soundPlayed = false;
@@ -611,10 +609,7 @@ const Notification = new Lang.Class({
             this._actionArea = null;
             this._buttonBox = null;
         }
-        if (params.clear)
+        if (!this._scrollArea && !this._actionArea)
-            this.unsetImage();
-
-        if (!this._scrollArea && !this._actionArea && !this._imageBin)
             this._table.remove_style_class_name('multi-line-notification');
 
         if (params.gicon) {
@@ -791,45 +786,11 @@ const Notification = new Lang.Class({
 
     _updateLastColumnSettings: function() {
         if (this._scrollArea)
-            this._table.child_set(this._scrollArea, { col: this._imageBin ? 2 : 1,
+            this._table.child_set(this._scrollArea, { col: 1,
-                                                      col_span: this._imageBin ? 1 : 2 });
+                                                      col_span: 2 });
         if (this._actionArea)
-            this._table.child_set(this._actionArea, { col: this._imageBin ? 2 : 1,
+            this._table.child_set(this._actionArea, { col: 1,
-                                                      col_span: this._imageBin ? 1 : 2 });
+                                                      col_span: 2 });
-    },
-
-    setImage: function(image) {
-        this.unsetImage();
-
-        if (!image)
-            return;
-
-        this._imageBin = new St.Bin({ opacity: 230,
-                                      child: image,
-                                      visible: this.expanded });
-
-        this._table.add_style_class_name('multi-line-notification');
-        this._table.add_style_class_name('notification-with-image');
-        this._addBannerBody();
-        this._updateLastColumnSettings();
-        this._table.add(this._imageBin, { row: 1,
-                                          col: 1,
-                                          row_span: 2,
-                                          x_expand: false,
-                                          y_expand: false,
-                                          x_fill: false,
-                                          y_fill: false });
-    },
-
-    unsetImage: function() {
-        if (this._imageBin) {
-            this._table.remove_style_class_name('notification-with-image');
-            this._table.remove_actor(this._imageBin);
-            this._imageBin = null;
-            this._updateLastColumnSettings();
-            if (!this._scrollArea && !this._actionArea)
-                this._table.remove_style_class_name('multi-line-notification');
-        }
     },
 
     addButton: function(button, callback) {
@@ -1061,8 +1022,6 @@ const Notification = new Lang.Class({
         this.actor.remove_style_class_name('notification-unexpanded');
 
         // Show additional content that we keep hidden in banner mode
-        if (this._imageBin)
-            this._imageBin.show();
         if (this._actionArea)
             this._actionArea.show();
         if (this._scrollArea)
@@ -1101,8 +1060,6 @@ const Notification = new Lang.Class({
         this.expanded = false;
 
         // Hide additional content that we keep hidden in banner mode
-        if (this._imageBin)
-            this._imageBin.hide();
         if (this._actionArea)
             this._actionArea.hide();
         if (this._scrollArea)
@@ -1159,6 +1116,7 @@ const SourceActor = new Lang.Class({
         this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this.actor.connect('allocate', Lang.bind(this, this._allocate));
         this.actor.connect('destroy', Lang.bind(this, function() {
+            this._source.disconnect(this._iconUpdatedId);
             this._actorDestroyed = true;
         }));
         this._actorDestroyed = false;
@@ -1170,7 +1128,7 @@ const SourceActor = new Lang.Class({
 
         this.actor.add_actor(this._iconBin);
 
-        this._source.connect('icon-updated', Lang.bind(this, this._updateIcon));
+        this._iconUpdatedId = this._source.connect('icon-updated', Lang.bind(this, this._updateIcon));
         this._updateIcon();
     },
 
@@ -1228,8 +1186,12 @@ const SourceActorWithLabel = new Lang.Class({
 
         this.actor.add_actor(this._counterBin);
 
-        this._source.connect('count-updated', Lang.bind(this, this._updateCount));
+        this._countUpdatedId = this._source.connect('count-updated', Lang.bind(this, this._updateCount));
         this._updateCount();
+
+        this.actor.connect('destroy', function() {
+            this._source.disconnect(this._countUpdatedId);
+        });
     },
 
     _allocate: function(actor, box, flags) {
@@ -1308,7 +1270,7 @@ const Source = new Lang.Class({
     },
 
     get isClearable() {
-        return !this.trayIcon && !this.isChat && !this.resident;
+        return !this.isChat && !this.resident;
     },
 
     countUpdated: function() {
@@ -1463,16 +1425,7 @@ const Source = new Lang.Class({
     // Default implementation is to destroy this source, but subclasses can override
     _lastNotificationRemoved: function() {
         this.destroy();
-    },
+    }
-
-    getMusicNotification: function() {
-        for (let i = 0; i < this.notifications.length; i++) {
-            if (this.notifications[i].isMusic)
-                return this.notifications[i];
-        }
-
-        return null;
-    },
 });
 Signals.addSignalMethods(Source.prototype);
 
@@ -1847,7 +1800,7 @@ const MessageTray = new Lang.Class({
         this.idleMonitor = Meta.IdleMonitor.get_core();
 
         this._grabHelper = new GrabHelper.GrabHelper(this.actor,
-                                                     { keybindingMode: Shell.KeyBindingMode.MESSAGE_TRAY });
+                                                     { actionMode: Shell.ActionMode.MESSAGE_TRAY });
         this._grabHelper.addActor(this._summaryBoxPointer.actor);
         this._grabHelper.addActor(this.actor);
 
@@ -1911,16 +1864,16 @@ const MessageTray = new Lang.Class({
         Main.wm.addKeybinding('toggle-message-tray',
                               new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
+                              Shell.ActionMode.NORMAL |
-                              Shell.KeyBindingMode.MESSAGE_TRAY |
+                              Shell.ActionMode.MESSAGE_TRAY |
-                              Shell.KeyBindingMode.OVERVIEW,
+                              Shell.ActionMode.OVERVIEW,
                               Lang.bind(this, this.toggleAndNavigate));
         Main.wm.addKeybinding('focus-active-notification',
                               new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
+                              Shell.ActionMode.NORMAL |
-                              Shell.KeyBindingMode.MESSAGE_TRAY |
+                              Shell.ActionMode.MESSAGE_TRAY |
-                              Shell.KeyBindingMode.OVERVIEW,
+                              Shell.ActionMode.OVERVIEW,
                               Lang.bind(this, this._expandActiveNotification));
 
         this._sources = new Map();
@@ -1946,7 +1899,9 @@ const MessageTray = new Lang.Class({
         this._messageTrayMenuButton.actor.connect('key-press-event',
                                                   Lang.bind(this, this._onTrayButtonKeyPress));
 
-        let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM);
+        let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM,
+                                                        Shell.ActionMode.NORMAL |
+                                                        Shell.ActionMode.OVERVIEW);
         gesture.connect('activated', Lang.bind(this, this.toggle));
         global.stage.add_action(gesture);
     },
@@ -2427,8 +2382,22 @@ const MessageTray = new Lang.Class({
             if (shouldShowNotification && nextNotification) {
                 let limited = this._busy || Main.layoutManager.bottomMonitor.inFullscreen;
                 let showNextNotification = (!limited || nextNotification.forFeedback || nextNotification.urgency == Urgency.CRITICAL);
-                if (showNextNotification)
+                if (showNextNotification) {
-                    this._showNotification();
+                    let len = this._notificationQueue.length;
+                    if (len > 1) {
+                        this._notificationQueue.length = 0;
+                        let source = new SystemNotificationSource();
+                        this.add(source);
+                        let notification = new Notification(source, ngettext("%d new message", "%d new messages", len).format(len));
+                        notification.setTransient(true);
+                        notification.connect('clicked', Lang.bind(this, function() {
+                            this.openTray();
+                        }));
+                        source.notify(notification);
+                    } else {
+                        this._showNotification();
+                    }
+                }
             }
         } else if (this._notificationState == State.SHOWN) {
             let expired = (this._userActiveWhileNotificationShown &&

js/ui/modalDialog.js

@@ -41,14 +41,14 @@ const ModalDialog = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
-                                        keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
+                                        actionMode: Shell.ActionMode.SYSTEM_MODAL,
                                         shouldFadeIn: true,
                                         shouldFadeOut: true,
                                         destroyOnClose: true });
 
         this.state = State.CLOSED;
         this._hasModal = false;
-        this._keybindingMode = params.keybindingMode;
+        this._actionMode = params.actionMode;
         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',
+        let button = new St.Button({ style_class: 'modal-dialog-button button',
                                      button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                      reactive:    true,
                                      can_focus:   true,
@@ -194,7 +194,7 @@ const ModalDialog = new Lang.Class({
     },
 
     placeSpinner: function(layoutInfo) {
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
         this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
         this._workSpinner.actor.opacity = 0;
         this._workSpinner.actor.show();
@@ -362,7 +362,7 @@ const ModalDialog = new Lang.Class({
         if (this._hasModal)
             return true;
         if (!Main.pushModal(this._group, { timestamp: timestamp,
-                                           keybindingMode: this._keybindingMode }))
+                                           actionMode: this._actionMode }))
             return false;
 
         this._hasModal = true;

js/ui/notificationDaemon.js

@@ -91,21 +91,6 @@ 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',
 
@@ -120,13 +105,10 @@ const FdoNotificationDaemon = new Lang.Class({
 
         this._nextNotificationId = 1;
 
-        Shell.WindowTracker.get_default().connect('notify::focus-app', Lang.bind(this, this._onFocusAppChanged));
+        Shell.WindowTracker.get_default().connect('notify::focus-app',
-        Main.overview.connect('hidden', Lang.bind(this, this._onFocusAppChanged));
+            Lang.bind(this, this._onFocusAppChanged));
-
+        Main.overview.connect('hidden',
-        this._trayManager = new Shell.TrayManager();
+            Lang.bind(this, this._onFocusAppChanged));
-        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) {
@@ -167,11 +149,10 @@ const FdoNotificationDaemon = new Lang.Class({
         return null;
     },
 
-    _lookupSource: function(title, pid, trayIcon) {
+    _lookupSource: function(title, pid) {
         for (let i = 0; i < this._sources.length; i++) {
             let source = this._sources[i];
-            if (source.pid == pid &&
+            if (source.pid == pid && source.initialTitle == title)
-                (source.initialTitle == title || source.trayIcon || trayIcon))
                 return source;
         }
         return null;
@@ -188,7 +169,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, trayIcon) {
+    _getSource: function(title, pid, ndata, sender) {
         if (!pid && !(ndata && ndata.notification))
             return null;
 
@@ -199,13 +180,13 @@ const FdoNotificationDaemon = new Lang.Class({
         if (ndata && ndata.notification)
             return ndata.notification.source;
 
-        let source = this._lookupSource(title, pid, trayIcon);
+        let source = this._lookupSource(title, pid);
         if (source) {
             source.setTitle(title);
             return source;
         }
 
-        let source = new FdoNotificationDaemonSource(title, pid, sender, trayIcon, ndata ? ndata.hints['desktop-entry'] : null);
+        let source = new FdoNotificationDaemonSource(title, pid, sender, ndata ? ndata.hints['desktop-entry'] : null);
 
         this._sources.push(source);
         source.connect('destroy', Lang.bind(this, function() {
@@ -330,19 +311,6 @@ 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,
@@ -370,26 +338,17 @@ 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, we show both an icon and
+        // one of 'image-data' or 'image-path' are specified, the icon and takes precedence.
-        // a large image.
+        if (!gicon && gimage)
-        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);
@@ -399,22 +358,18 @@ 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 {
+                else
-                    notification.addButton(this._makeButton(actionId, label, useActionIcons), Lang.bind(this, function() {
+                    notification.addAction(label, Lang.bind(this, function() {
                         this._emitActionInvoked(ndata.id, actionId);
                     }));
-                }
             }
         }
 
@@ -460,7 +415,7 @@ const FdoNotificationDaemon = new Lang.Class({
     GetCapabilities: function() {
         return [
             'actions',
-            'action-icons',
+            // 'action-icons',
             'body',
             // 'body-hyperlinks',
             // 'body-images',
@@ -503,20 +458,6 @@ 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();
     }
 });
 
@@ -524,10 +465,9 @@ const FdoNotificationDaemonSource = new Lang.Class({
     Name: 'FdoNotificationDaemonSource',
     Extends: MessageTray.Source,
 
-    _init: function(title, pid, sender, trayIcon, appId) {
+    _init: function(title, pid, sender, 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);
 
@@ -547,12 +487,6 @@ 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() {
@@ -570,15 +504,14 @@ 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.trayIcon && this.app)
+        if (this.app)
             this.destroy();
     },
 
     processNotification: function(notification, gicon) {
         if (gicon)
             this._gicon = gicon;
-        if (!this.trayIcon)
+        this.iconUpdated();
-            this.iconUpdated();
 
         let tracker = Shell.WindowTracker.get_default();
         if (notification.resident && this.app && tracker.focus_app == this.app)
@@ -587,29 +520,6 @@ 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;
 
@@ -617,16 +527,6 @@ 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)
@@ -652,8 +552,7 @@ const FdoNotificationDaemonSource = new Lang.Class({
     },
 
     _lastNotificationRemoved: function() {
-        if (!this.trayIcon)
+        this.destroy();
-            this.destroy();
     },
 
     openApp: function() {
@@ -674,11 +573,7 @@ const FdoNotificationDaemonSource = new Lang.Class({
     },
 
     createIcon: function(size) {
-        if (this.trayIcon) {
+        if (this.app) {
-            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,

js/ui/osdMonitorLabeler.js

@@ -0,0 +1,141 @@
+// -*- 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

@@ -509,7 +509,7 @@ const Overview = new Lang.Class({
             if (shouldBeModal) {
                 if (!this._modal) {
                     if (Main.pushModal(this._overview,
-                                       { keybindingMode: Shell.KeyBindingMode.OVERVIEW })) {
+                                       { actionMode: Shell.ActionMode.OVERVIEW })) {
                         this._modal = true;
                     } else {
                         this.hide();
@@ -605,9 +605,9 @@ const Overview = new Lang.Class({
                 return;
         }
 
-        this._animateNotVisible();
-
         this._shown = false;
+
+        this._animateNotVisible();
         this._syncGrab();
     },
 

js/ui/overviewControls.js

@@ -64,7 +64,8 @@ const SlideLayout = new Lang.Class({
         // flags only determine what to do if the allocated box is bigger
         // than the actor's box.
         let realDirection = getRtlSlideDirection(this._direction, child);
-        let alignX = (realDirection == SlideDirection.LEFT) ? (availWidth - natWidth) : 0;
+        let alignX = (realDirection == SlideDirection.LEFT) ? (availWidth - natWidth)
+                                                            : (availWidth - natWidth * this._slideX);
 
         let actorBox = new Clutter.ActorBox();
         actorBox.x1 = box.x1 + alignX + this._translationX;
@@ -456,9 +457,6 @@ const MessagesIndicator = new Lang.Class({
     },
 
     _onSourceAdded: function(tray, source) {
-        if (source.trayIcon)
-            return;
-
         source.connect('count-updated', Lang.bind(this, this._updateCount));
         this._sources.push(source);
         this._updateCount();

js/ui/panel.js

@@ -26,6 +26,7 @@ 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;
 
@@ -74,90 +75,6 @@ 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:
  *
@@ -181,6 +98,7 @@ 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));
@@ -189,33 +107,20 @@ const AppMenuButton = new Lang.Class({
         this.actor.bind_property("reactive", this.actor, "can-focus", 0);
         this.actor.reactive = false;
 
-        this._container = new Shell.GenericContainer();
+        this._container = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         bin.set_child(this._container);
-        this._container.connect('get-preferred-width', Lang.bind(this, this._getContentPreferredWidth));
-        this._container.connect('get-preferred-height', Lang.bind(this, this._getContentPreferredHeight));
-        this._container.connect('allocate', Lang.bind(this, this._contentAllocate));
 
         let textureCache = St.TextureCache.get_default();
         textureCache.connect('icon-theme-changed',
                              Lang.bind(this, this._onIconThemeChanged));
 
-        this._iconBox = new Shell.Slicer({ name: 'appMenuIcon' });
+        this._iconBox = new St.Bin({ style_class: 'app-menu-icon' });
-        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._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
+        this._label = new St.Label();
-        this._container.add_actor(this._hbox);
+        this._container.add_actor(this._label);
-
-        this._label = new TextShadower();
-        this._label.actor.y_align = Clutter.ActorAlign.CENTER;
-        this._hbox.add_actor(this._label.actor);
         this._arrow = PopupMenu.arrowIcon(St.Side.BOTTOM);
-        this._hbox.add_actor(this._arrow);
+        this._container.add_actor(this._arrow);
-
-        this._iconBottomClip = 0;
 
         this._visible = !Main.overview.visible;
         if (!this._visible)
@@ -273,25 +178,19 @@ const AppMenuButton = new Lang.Class({
     _onStyleChanged: function(actor) {
         let node = actor.get_theme_node();
         let [success, icon] = node.lookup_url('spinner-image', false);
-        if (!success || this._spinnerIcon == icon)
+        if (!success || (this._spinnerIcon && this._spinnerIcon.equal(icon)))
             return;
         this._spinnerIcon = icon;
         this._spinner = new Animation.AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
-        this._hbox.add_actor(this._spinner.actor);
+        this._container.add_actor(this._spinner.actor);
         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.get_faded_icon(2 * PANEL_ICON_SIZE, this._iconBox.text_direction);
+        let icon = this._targetApp.create_icon_texture(PANEL_ICON_SIZE - APP_MENU_ICON_MARGIN);
         this._iconBox.set_child(icon);
     },
 
@@ -302,16 +201,6 @@ 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;
@@ -344,64 +233,6 @@ const AppMenuButton = new Lang.Class({
         this._spinner.actor.show();
     },
 
-    _getContentPreferredWidth: function(actor, forHeight, alloc) {
-        let [minSize, naturalSize] = this._iconBox.get_preferred_width(forHeight);
-        alloc.min_size = minSize;
-        alloc.natural_size = naturalSize;
-        [minSize, naturalSize] = this._hbox.get_preferred_width(forHeight);
-        alloc.min_size = alloc.min_size + Math.max(0, minSize - Math.floor(alloc.min_size / 2));
-        alloc.natural_size = alloc.natural_size + Math.max(0, naturalSize - Math.floor(alloc.natural_size / 2));
-    },
-
-    _getContentPreferredHeight: function(actor, forWidth, alloc) {
-        let [minSize, naturalSize] = this._iconBox.get_preferred_height(forWidth);
-        alloc.min_size = minSize;
-        alloc.natural_size = naturalSize;
-        [minSize, naturalSize] = this._hbox.get_preferred_height(forWidth);
-        if (minSize > alloc.min_size)
-            alloc.min_size = minSize;
-        if (naturalSize > alloc.natural_size)
-            alloc.natural_size = naturalSize;
-    },
-
-    _contentAllocate: function(actor, box, flags) {
-        let allocWidth = box.x2 - box.x1;
-        let allocHeight = box.y2 - box.y1;
-        let childBox = new Clutter.ActorBox();
-
-        let [minWidth, minHeight, naturalWidth, naturalHeight] = this._iconBox.get_preferred_size();
-
-        let direction = this.actor.get_text_direction();
-
-        let yPadding = Math.floor(Math.max(0, allocHeight - naturalHeight) / 2);
-        childBox.y1 = yPadding;
-        childBox.y2 = childBox.y1 + Math.min(naturalHeight, allocHeight);
-        if (direction == Clutter.TextDirection.LTR) {
-            childBox.x1 = 0;
-            childBox.x2 = childBox.x1 + Math.min(naturalWidth, allocWidth);
-        } else {
-            childBox.x1 = Math.max(0, allocWidth - naturalWidth);
-            childBox.x2 = allocWidth;
-        }
-        this._iconBox.allocate(childBox, flags);
-
-        let iconWidth = childBox.x2 - childBox.x1;
-
-        [minWidth, naturalWidth] = this._hbox.get_preferred_width(-1);
-
-        childBox.y1 = 0;
-        childBox.y2 = allocHeight;
-
-        if (direction == Clutter.TextDirection.LTR) {
-            childBox.x1 = Math.floor(iconWidth / 2);
-            childBox.x2 = Math.min(childBox.x1 + naturalWidth, allocWidth);
-        } else {
-            childBox.x2 = allocWidth - Math.floor(iconWidth / 2);
-            childBox.x1 = Math.max(0, childBox.x2 - naturalWidth);
-        }
-        this._hbox.allocate(childBox, flags);
-    },
-
     _onAppStateChanged: function(appSys, app) {
         let state = app.state;
         if (state != Shell.AppState.STARTING) {
@@ -457,13 +288,18 @@ 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._label.setText(this._targetApp.get_name());
+                this._busyNotifyId = this._targetApp.connect('notify::busy', Lang.bind(this, this._sync));
+                this._label.set_text(this._targetApp.get_name());
                 this.actor.set_accessible_name(this._targetApp.get_name());
             }
         }
@@ -476,7 +312,7 @@ const AppMenuButton = new Lang.Class({
 
         let isBusy = (this._targetApp != null &&
                       (this._targetApp.get_state() == Shell.AppState.STARTING ||
-                       this._targetApp.get_state() == Shell.AppState.BUSY));
+                       this._targetApp.get_busy()));
         if (isBusy)
             this.startAnimation();
         else
@@ -887,7 +723,7 @@ const Panel = new Lang.Class({
 
         this.statusArea = {};
 
-        this.menuManager = new PopupMenu.PopupMenuManager(this, { keybindingMode: Shell.KeyBindingMode.TOPBAR_POPUP });
+        this.menuManager = new PopupMenu.PopupMenuManager(this, { actionMode: Shell.ActionMode.TOPBAR_POPUP });
 
         this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
         this.actor.add_actor(this._leftBox);
@@ -1019,7 +855,7 @@ const Panel = new Lang.Class({
         if (!dragWindow)
             return Clutter.EVENT_PROPAGATE;
 
-        let rect = dragWindow.get_outer_rect();
+        let rect = dragWindow.get_frame_rect();
         let [stageX, stageY] = event.get_coords();
 
         let allowDrag = dragWindow.maximized_vertically &&

js/ui/panelMenu.js

@@ -173,7 +173,8 @@ 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);
-        this.menu.actor.style = ('max-height: ' + Math.round(workArea.height) + 'px;');
+        let verticalMargins = this.menu.actor.margin_top + this.menu.actor.margin_bottom;
+        this.menu.actor.style = ('max-height: ' + Math.round(workArea.height - verticalMargins) + 'px;');
     },
 
     destroy: function() {

js/ui/popupMenu.js

@@ -91,6 +91,7 @@ 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));
@@ -114,15 +115,26 @@ 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;
     },
@@ -158,10 +170,17 @@ const PopupBaseMenuItem = new Lang.Class({
         if (activeChanged) {
             this.active = active;
             if (active) {
-                this.actor.add_style_pseudo_class('active');
+                this.actor.add_style_class_name('active');
                 this.actor.grab_key_focus();
             } else {
-                this.actor.remove_style_pseudo_class('active');
+                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.emit('active-changed', active);
         }
@@ -245,8 +264,8 @@ const PopupSeparatorMenuItem = new Lang.Class({
                            Lang.bind(this, this._syncVisibility));
         this._syncVisibility();
 
-        this._separator = new Separator.HorizontalSeparator({ style_class: 'popup-separator-menu-item' });
+        this._separator = new St.Widget({ style_class: 'popup-separator-menu-item' });
-        this.actor.add(this._separator.actor, { expand: true });
+        this.actor.add(this._separator, { expand: true });
     },
 
     _syncVisibility: function() {
@@ -1075,10 +1094,12 @@ 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');
         }
     },
 
@@ -1123,6 +1144,9 @@ 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;
     }

js/ui/screenShield.js

@@ -85,7 +85,8 @@ const Clock = new Lang.Class({
         let date = new Date();
         /* Translators: This is a time format for a date in
            long format */
-        this._date.text = date.toLocaleFormat(_("%A, %B %d"));
+        let dateFormat = Shell.util_translate_time_string(N_("%A, %B %d"));
+        this._date.text = date.toLocaleFormat(dateFormat);
     },
 
     destroy: function() {
@@ -100,18 +101,14 @@ const NotificationsBox = new Lang.Class({
     _init: function() {
         this.actor = new St.BoxLayout({ vertical: true,
                                         name: 'screenShieldNotifications',
-                                        style_class: 'screen-shield-notifications-box' });
+                                        style_class: 'screen-shield-notifications-container' });
-
-        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-box' });
+                                                   style_class: 'screen-shield-notifications-container' });
         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();
@@ -138,12 +135,11 @@ 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._musicBin.visible || this._notificationBox.visible;
+        this.actor.visible = this._notificationBox.visible;
     },
 
     _makeNotificationCountText: function(count, isChat) {
@@ -191,7 +187,7 @@ const NotificationsBox = new Lang.Class({
         for (let i = 0; i < source.notifications.length; i++) {
             let n = source.notifications[i];
 
-            if (n.acknowledged || n.isMusic)
+            if (n.acknowledged)
                 continue;
 
             let body = '';
@@ -212,29 +208,13 @@ 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 &&
+        box.visible = obj.visible && (source.unseenCount > 0);
-            (source.unseenCount > (musicNotification ? 1 : 0));
     },
 
     _sourceAdded: function(tray, source, initial) {
@@ -245,23 +225,16 @@ 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' });
+        obj.sourceBox = new St.BoxLayout({ style_class: 'screen-shield-notification-source',
+                                           x_expand: true });
         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);
         }));
@@ -322,8 +295,7 @@ const NotificationsBox = new Lang.Class({
             obj.countLabel.text = this._makeNotificationCountText(count, source.isChat);
         }
 
-        obj.sourceBox.visible = obj.visible &&
+        obj.sourceBox.visible = obj.visible && (source.unseenCount > 0);
-            (source.unseenCount > (obj.musicNotification ? 1 : 0));
 
         this._updateVisibility();
         if (obj.sourceBox.visible)
@@ -335,10 +307,7 @@ const NotificationsBox = new Lang.Class({
             return;
 
         obj.visible = source.policy.showInLockScreen;
-        if (obj.musicNotification)
+        obj.sourceBox.visible = obj.visible && source.unseenCount > 0;
-            obj.musicNotification.actor.visible = obj.visible;
-        obj.sourceBox.visible = obj.visible &&
-            source.unseenCount > (obj.musicNotification ? 1 : 0);
 
         this._updateVisibility();
         if (obj.sourceBox.visible)
@@ -365,13 +334,6 @@ 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);
@@ -646,14 +608,14 @@ const ScreenShield = new Lang.Class({
         if (this._isModal)
             return true;
 
-        this._isModal = Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
+        this._isModal = Main.pushModal(this.actor, { actionMode: Shell.ActionMode.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,
-                                                     keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
+                                                     actionMode: Shell.ActionMode.LOCK_SCREEN });
         return this._isModal;
     },
 
@@ -669,7 +631,9 @@ const ScreenShield = new Lang.Class({
         if (this._lockScreenState != MessageTray.State.SHOWN)
             return Clutter.EVENT_PROPAGATE;
 
-        let isEnter = (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_KP_Enter);
+        let isEnter = (symbol == Clutter.KEY_Return ||
+                       symbol == Clutter.KEY_KP_Enter ||
+                       symbol == Clutter.KEY_ISO_Enter);
         if (!isEnter && !(GLib.unichar_isprint(unichar) || symbol == Clutter.KEY_Escape))
             return Clutter.EVENT_PROPAGATE;
 
@@ -919,6 +883,11 @@ const ScreenShield = new Lang.Class({
 
         this._lockScreenState = MessageTray.State.HIDDEN;
         this._lockScreenGroup.hide();
+
+        if (this._dialog) {
+            this._dialog.actor.grab_key_focus();
+            this._dialog.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
     },
 
     _hideLockScreen: function(animate, velocity) {
@@ -1327,6 +1296,8 @@ const ScreenShield = new Lang.Class({
 
     // If the previous shell crashed, and gnome-session restarted us, then re-lock
     lockIfWasLocked: function() {
+        if (!this._settings.get_boolean(LOCK_ENABLED_KEY))
+            return;
         let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR);
         if (wasLocked === null)
             return;

js/ui/screencast.js

@@ -43,6 +43,8 @@ const ScreencastService = new Lang.Class({
 
         this._recorders = new Map();
 
+        this._lockdownSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.lockdown' });
+
         Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
     },
 
@@ -68,8 +70,8 @@ const ScreencastService = new Lang.Class({
         if (Main.sessionMode.allowScreencast)
             return;
 
-        this._recorders.clear();
+        for (let sender of this._recorders.keys())
-        this.emit('updated');
+            this._stopRecordingForSender(sender);
     },
 
     _onNameVanished: function(connection, name) {
@@ -97,13 +99,14 @@ const ScreencastService = new Lang.Class({
             recorder.set_pipeline(options['pipeline']);
         if (options['framerate'])
             recorder.set_framerate(options['framerate']);
-        if (options['draw-cursor'])
+        if ('draw-cursor' in options)
             recorder.set_draw_cursor(options['draw-cursor']);
     },
 
     ScreencastAsync: function(params, invocation) {
         let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast) {
+        if (!Main.sessionMode.allowScreencast ||
+            this._lockdownSettings.get_boolean('disable-save-to-disk')) {
             invocation.return_value(GLib.Variant.new('(bs)', returnValue));
             return;
         }
@@ -117,6 +120,8 @@ const ScreencastService = new Lang.Class({
             this._applyOptionalParameters(recorder, options);
             let [success, fileName] = recorder.record();
             returnValue = [success, fileName ? fileName : ''];
+            if (!success)
+                this._stopRecordingForSender(sender);
         }
 
         invocation.return_value(GLib.Variant.new('(bs)', returnValue));
@@ -124,7 +129,8 @@ const ScreencastService = new Lang.Class({
 
     ScreencastAreaAsync: function(params, invocation) {
         let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast) {
+        if (!Main.sessionMode.allowScreencast ||
+            this._lockdownSettings.get_boolean('disable-save-to-disk')) {
             invocation.return_value(GLib.Variant.new('(bs)', returnValue));
             return;
         }
@@ -150,6 +156,8 @@ const ScreencastService = new Lang.Class({
             this._applyOptionalParameters(recorder, options);
             let [success, fileName] = recorder.record();
             returnValue = [success, fileName ? fileName : ''];
+            if (!success)
+                this._stopRecordingForSender(sender);
         }
 
         invocation.return_value(GLib.Variant.new('(bs)', returnValue));

js/ui/screenshot.js

@@ -65,9 +65,44 @@ const ScreenshotService = new Lang.Class({
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenshotIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/Screenshot');
 
+        this._screenShooter = new Map();
+
+        this._lockdownSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.lockdown' });
+
         Gio.DBus.session.own_name('org.gnome.Shell.Screenshot', Gio.BusNameOwnerFlags.REPLACE, null, null);
     },
 
+    _createScreenshot: function(invocation) {
+        let sender = invocation.get_sender();
+        if (this._screenShooter.has(sender) ||
+            this._lockdownSettings.get_boolean('disable-save-to-disk')) {
+            invocation.return_value(GLib.Variant.new('(bs)', [false, '']));
+            return null;
+        }
+
+        let shooter = new Shell.Screenshot();
+        shooter._watchNameId =
+                        Gio.bus_watch_name(Gio.BusType.SESSION, sender, 0, null,
+                                           Lang.bind(this, this._onNameVanished));
+
+        this._screenShooter.set(sender, shooter);
+
+        return shooter;
+    },
+
+    _onNameVanished: function(connection, name) {
+        this._removeShooterForSender(name);
+    },
+
+    _removeShooterForSender: function(sender) {
+        let shooter = this._screenShooter.get(sender);
+        if (!shooter)
+            return;
+
+        Gio.bus_unwatch_name(shooter._watchNameId);
+        this._screenShooter.delete(sender);
+    },
+
     _checkArea: function(x, y, width, height) {
         return x >= 0 && y >= 0 &&
                width > 0 && height > 0 &&
@@ -76,9 +111,15 @@ const ScreenshotService = new Lang.Class({
     },
 
     _onScreenshotComplete: function(obj, result, area, filenameUsed, flash, invocation) {
-        if (flash && result) {
+        if (result) {
-            let flashspot = new Flashspot(area);
+            if (flash) {
-            flashspot.fire();
+                let flashspot = new Flashspot(area);
+                flashspot.fire(Lang.bind(this, function() {
+                    this._removeShooterForSender(invocation.get_sender());
+                }));
+            }
+            else
+                this._removeShooterForSender(invocation.get_sender());
         }
 
         let retval = GLib.Variant.new('(bs)', [result, filenameUsed]);
@@ -112,7 +153,9 @@ const ScreenshotService = new Lang.Class({
                                             "Invalid params");
             return;
         }
-        let screenshot = new Shell.Screenshot();
+        let screenshot = this._createScreenshot(invocation);
+        if (!screenshot)
+            return;
         screenshot.screenshot_area (x, y, width, height, filename,
                                 Lang.bind(this, this._onScreenshotComplete,
                                           flash, invocation));
@@ -120,7 +163,9 @@ const ScreenshotService = new Lang.Class({
 
     ScreenshotWindowAsync : function (params, invocation) {
         let [include_frame, include_cursor, flash, filename] = params;
-        let screenshot = new Shell.Screenshot();
+        let screenshot = this._createScreenshot(invocation);
+        if (!screenshot)
+            return;
         screenshot.screenshot_window (include_frame, include_cursor, filename,
                                   Lang.bind(this, this._onScreenshotComplete,
                                             flash, invocation));
@@ -128,7 +173,9 @@ const ScreenshotService = new Lang.Class({
 
     ScreenshotAsync : function (params, invocation) {
         let [include_cursor, flash, filename] = params;
-        let screenshot = new Shell.Screenshot();
+        let screenshot = this._createScreenshot(invocation);
+        if (!screenshot)
+            return;
         screenshot.screenshot(include_cursor, filename,
                           Lang.bind(this, this._onScreenshotComplete,
                                     flash, invocation));
@@ -302,7 +349,7 @@ const Flashspot = new Lang.Class({
         this.actor.set_position(area.x, area.y);
     },
 
-    fire: function() {
+    fire: function(doneCallback) {
         this.actor.show();
         this.actor.opacity = 255;
         Tweener.addTween(this.actor,
@@ -310,6 +357,8 @@ const Flashspot = new Lang.Class({
                            time: FLASHSPOT_ANIMATION_OUT_TIME,
                            transition: 'easeOutQuad',
                            onComplete: Lang.bind(this, function() {
+                               if (doneCallback)
+                                   doneCallback();
                                this.destroy();
                            })
                          });

js/ui/search.js

@@ -199,12 +199,9 @@ 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');
+                    log('Wrong number of result metas returned by search provider ' + this.provider.id +
+                        ': expected ' + metasNeeded.length + ' but got ' + metas.length);
                     callback(false);
                     return;
                 }
@@ -236,6 +233,7 @@ const SearchResultsBase = new Lang.Class({
             this._ensureResultActors(results, Lang.bind(this, function(successful) {
                 if (!successful) {
                     this._clearResultDisplay();
+                    callback();
                     return;
                 }
 
@@ -452,6 +450,24 @@ const SearchResults = new Lang.Class({
         this._updateResults(provider, results);
     },
 
+    _clearSearchTimeout: function() {
+        if (this._searchTimeoutId > 0) {
+            GLib.source_remove(this._searchTimeoutId);
+            this._searchTimeoutId = 0;
+        }
+    },
+
+    _reset: function() {
+        this._terms = [];
+        this._results = {};
+        this._clearDisplay();
+        this._clearSearchTimeout();
+        this._defaultResult = null;
+        this._startingSearch = false;
+
+        this._updateSearchProgress();
+    },
+
     _doSearch: function() {
         this._startingSearch = false;
 
@@ -470,10 +486,7 @@ const SearchResults = new Lang.Class({
 
         this._updateSearchProgress();
 
-        if (this._searchTimeoutId > 0) {
+        this._clearSearchTimeout();
-            GLib.source_remove(this._searchTimeoutId);
-            this._searchTimeoutId = 0;
-        }
     },
 
     _onSearchTimeout: function() {
@@ -483,24 +496,25 @@ const SearchResults = new Lang.Class({
     },
 
     setTerms: function(terms) {
+        // Check for the case of making a duplicate previous search before
+        // setting state of the current search or cancelling the search.
+        // This will prevent incorrect state being as a result of a duplicate
+        // search while the previous search is still active.
+        let searchString = terms.join(' ');
+        let previousSearchString = this._terms.join(' ');
+        if (searchString == previousSearchString)
+            return;
+
         this._startingSearch = true;
 
         this._cancellable.cancel();
         this._cancellable.reset();
 
-        if (!terms) {
+        if (terms.length == 0) {
-            if (this._searchTimeoutId > 0) {
+            this._reset();
-                GLib.source_remove(this._searchTimeoutId);
-                this._searchTimeoutId = 0;
-            }
             return;
         }
 
-        let searchString = terms.join(' ');
-        let previousSearchString = this._terms.join(' ');
-        if (searchString == previousSearchString)
-            return;
-
         let isSubSearch = false;
         if (this._terms.length > 0)
             isSubSearch = searchString.indexOf(previousSearchString) == 0;
@@ -535,6 +549,7 @@ const SearchResults = new Lang.Class({
             providerDisplay = new GridSearchResults(provider, this.actor);
 
         providerDisplay.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
+        providerDisplay.actor.hide();
         this._content.add(providerDisplay.actor);
         provider.display = providerDisplay;
     },

js/ui/shellDBus.js

@@ -25,6 +25,10 @@ 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> \
@@ -44,8 +48,7 @@ const GnomeShellIface = '<node> \
 </method> \
 <signal name="AcceleratorActivated"> \
     <arg name="action" type="u" /> \
-    <arg name="deviceid" type="u" /> \
+    <arg name="parameters" type="a{sv}" /> \
-    <arg name="timestamp" type="u" /> \
 </signal> \
 <property name="Mode" type="s" access="read" /> \
 <property name="OverviewActive" type="b" access="readwrite" /> \
@@ -90,6 +93,12 @@ 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));
     },
 
     /**
@@ -134,7 +143,7 @@ const GnomeShell = new Lang.Class({
             params[param] = params[param].deep_unpack();
 
         let monitorIndex = -1;
-        if (params['monitor'])
+        if (params['monitor'] >= 0)
             monitorIndex = params['monitor'];
 
         let icon = null;
@@ -190,11 +199,14 @@ 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('(uuu)', [action, deviceid, timestamp]));
+                               GLib.Variant.new('(ua{sv})', [action, params]));
     },
 
     _grabAcceleratorForSender: function(accelerator, flags, sender) {
@@ -232,11 +244,29 @@ 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 Main.overview.visible;
+        return this._cachedOverviewVisible;
     },
 
     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.05; /* Slider scrolling step in % */
+const SLIDER_SCROLL_STEP = 0.02; /* 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 / 10;
+            delta = -dy * SLIDER_SCROLL_STEP;
         }
 
         this._value = Math.min(Math.max(0, this._value + delta), 1);

js/ui/status/keyboard.js

@@ -155,6 +155,7 @@ 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
@@ -163,13 +164,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.KeyBindingMode.ALL,
+                                  Shell.ActionMode.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.KeyBindingMode.ALL,
+                                  Shell.ActionMode.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));
@@ -183,6 +184,7 @@ 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));
 
@@ -192,6 +194,7 @@ 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() {
@@ -239,8 +242,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.keybindingMode == Shell.KeyBindingMode.MESSAGE_TRAY ||
+        if (Main.actionMode == Shell.ActionMode.MESSAGE_TRAY ||
-            Main.keybindingMode == Shell.KeyBindingMode.TOPBAR_POPUP) {
+            Main.actionMode == Shell.ActionMode.TOPBAR_POPUP) {
             this._modifiersSwitcher();
             return;
         }
@@ -298,8 +301,7 @@ const InputSourceManager = new Lang.Class({
         this._inputSources = {};
         this._ibusSources = {};
 
-        let inputSourcesByShortName = {};
+        let infosList = [];
-
         for (let i = 0; i < nSources; i++) {
             let displayName;
             let shortName;
@@ -310,6 +312,8 @@ 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());
@@ -323,11 +327,24 @@ const InputSourceManager = new Lang.Class({
                 }
             }
 
-            if (!exists)
+            if (exists)
-                continue;
+                infosList.push({ type: type, id: id, displayName: displayName, shortName: shortName });
+        }
 
-            let is = new InputSource(type, id, displayName, shortName, i);
+        if (infosList.length == 0) {
+            let type = INPUT_SOURCE_TYPE_XKB;
+            let id = KeyboardManager.DEFAULT_LAYOUT;
+            let [ , displayName, shortName, , ] = this._xkbInfo.get_layout_info(id);
+            infosList.push({ type: type, id: id, displayName: displayName, shortName: shortName });
+        }
 
+        let inputSourcesByShortName = {};
+        for (let i = 0; i < infosList.length; i++) {
+            let is = new InputSource(infosList[i].type,
+                                     infosList[i].id,
+                                     infosList[i].displayName,
+                                     infosList[i].shortName,
+                                     i);
             is.connect('activate', Lang.bind(this, this._activateInputSource));
 
             if (!(is.shortName in inputSourcesByShortName))
@@ -367,8 +384,24 @@ const InputSourceManager = new Lang.Class({
         }
         this._mruSources = mruSources.concat(sourcesList);
 
-        if (this._mruSources.length > 0)
+        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;
+            }
             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) {
@@ -421,6 +454,27 @@ 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];
@@ -535,7 +589,6 @@ 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);
@@ -747,7 +800,7 @@ const InputSourceIndicator = new Lang.Class({
             let engineDesc = IBusManager.getIBusManager().getEngineDesc(source.id);
             if (engineDesc) {
                 xkbLayout = engineDesc.get_layout();
-                xkbVariant = '';
+                xkbVariant = engineDesc.get_layout_variant();
             }
         }
 

js/ui/status/network.js

@@ -876,7 +876,8 @@ const NMWirelessDialog = new Lang.Class({
                                                  x_align: Clutter.ActorAlign.CENTER,
                                                  y_align: Clutter.ActorAlign.CENTER });
 
-        this._noNetworksSpinner = new Animation.AnimatedIcon(global.datadir + '/theme/process-working.svg', 24, 24);
+        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        this._noNetworksSpinner = new Animation.AnimatedIcon(file, 24, 24);
         this._noNetworksBox.add_actor(this._noNetworksSpinner.actor);
         this._noNetworksBox.add_actor(new St.Label({ style_class: 'no-networks-label',
                                                      text: _("No Networks") }));
@@ -887,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' });
+        this._airplaneHeadline = new St.Label({ style_class: 'nm-dialog-airplane-headline 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' });
+        this._airplaneButton = new St.Button({ style_class: 'modal-dialog-button button' });
         this._airplaneButton.connect('clicked', Lang.bind(this, function() {
             if (this._rfkill.airplaneMode)
                 this._rfkill.airplaneMode = false;
@@ -1866,7 +1867,7 @@ const NMApplet = new Lang.Class({
     _connectionRemoved: function(connection) {
         let pos = this._connections.indexOf(connection);
         if (pos != -1)
-            this._connections.splice(connection, 1);
+            this._connections.splice(pos, 1);
 
         let section = connection._section;
 

js/ui/status/rfkill.js

@@ -15,6 +15,7 @@ const RfkillManagerInterface = '<node> \
 <interface name="org.gnome.SettingsDaemon.Rfkill"> \
 <property name="AirplaneMode" type="b" access="readwrite" /> \
 <property name="HardwareAirplaneMode" type="b" access="read" /> \
+<property name="ShouldShowAirplaneMode" type="b" access="read" /> \
 </interface> \
 </node>';
 
@@ -48,6 +49,10 @@ const RfkillManager = new Lang.Class({
         return this._proxy.HardwareAirplaneMode;
     },
 
+    get shouldShowAirplaneMode() {
+        return this._proxy.ShouldShowAirplaneMode;
+    },
+
     _changed: function() {
         this.emit('airplane-mode-changed');
     }
@@ -101,11 +106,10 @@ const Indicator = new Lang.Class({
     _sync: function() {
         let airplaneMode = this._manager.airplaneMode;
         let hwAirplaneMode = this._manager.hwAirplaneMode;
-        let changed = (airplaneMode != this._indicator.visible) ||
+        let showAirplaneMode = this._manager.shouldShowAirplaneMode;
-            (hwAirplaneMode != this._offItem.actor.visible);
 
-        this._indicator.visible = airplaneMode;
+        this._indicator.visible = (airplaneMode && showAirplaneMode);
-        this._item.actor.visible = airplaneMode;
+        this._item.actor.visible = (airplaneMode && showAirplaneMode);
         this._offItem.setSensitive(!hwAirplaneMode);
 
         if (hwAirplaneMode)

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._haveShutdown && !disabled;
+        this._suspendAction.visible = this._haveSuspend && !disabled;
         this._updateActionsVisibility();
     },
 

js/ui/switcherPopup.js

@@ -87,8 +87,6 @@ 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,
-                                          keybindingMode: Shell.KeyBindingMode.UNLOCK_SCREEN }))
+                                          actionMode: Shell.ActionMode.UNLOCK_SCREEN }))
             return false;
 
         this._isModal = true;

js/ui/userWidget.js

@@ -28,11 +28,12 @@ const Avatar = new Lang.Class({
                                         styleClass: 'framed-user-icon' });
         this._iconSize = params.iconSize;
 
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         this.actor = new St.Bin({ style_class: params.styleClass,
                                   track_hover: params.reactive,
                                   reactive: params.reactive,
-                                  width: this._iconSize,
+                                  width: this._iconSize * scaleFactor,
-                                  height: this._iconSize });
+                                  height: this._iconSize * scaleFactor });
     },
 
     setSensitive: function(sensitive) {

js/ui/viewSelector.js

@@ -65,7 +65,8 @@ const ShowOverviewAction = new Lang.Class({
     },
 
     vfunc_gesture_prepare : function(action, actor) {
-        return this.get_n_current_points() == this.get_n_touch_points();
+        return Main.actionMode == Shell.ActionMode.NORMAL &&
+               this.get_n_current_points() == this.get_n_touch_points();
     },
 
     _getBoundingRect : function(motion) {
@@ -193,27 +194,30 @@ 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.KeyBindingMode.NORMAL |
+                              Shell.ActionMode.NORMAL |
-                              Shell.KeyBindingMode.OVERVIEW,
+                              Shell.ActionMode.OVERVIEW,
                               Lang.bind(this, this._toggleAppsPage));
 
         Main.wm.addKeybinding('toggle-overview',
                               new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
+                              Shell.ActionMode.NORMAL |
-                              Shell.KeyBindingMode.OVERVIEW,
+                              Shell.ActionMode.OVERVIEW,
                               Lang.bind(Main.overview, Main.overview.toggle));
 
         let gesture;
 
-        gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT);
+        gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT,
+                                                    Shell.ActionMode.NORMAL);
         gesture.connect('activated', Lang.bind(this, function() {
             if (Main.overview.visible)
                 Main.overview.hide();

js/ui/windowManager.js

@@ -413,7 +413,7 @@ const TilePreview = new Lang.Class({
                                                    y: monitor.y,
                                                    width: monitor.width,
                                                    height: monitor.height });
-            let [, rect] = window.get_outer_rect().intersect(monitorRect);
+            let [, rect] = window.get_frame_rect().intersect(monitorRect);
             this.actor.set_size(rect.width, rect.height);
             this.actor.set_position(rect.x, rect.y);
             this.actor.opacity = 0;
@@ -478,7 +478,9 @@ const WorkspaceSwitchAction = new Lang.Class({
     },
 
     vfunc_gesture_prepare : function(action, actor) {
-        return this.get_n_current_points() == this.get_n_touch_points();
+        let allowedModes = Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW;
+        return this.get_n_current_points() == this.get_n_touch_points() &&
+               (allowedModes & Main.actionMode);
     },
 
     vfunc_gesture_end : function(action, actor) {
@@ -526,7 +528,7 @@ const AppSwitchAction = new Lang.Class({
     },
 
     vfunc_gesture_prepare : function(action, actor) {
-        if (Main.overview.visible) {
+        if (Main.actionMode != Shell.ActionMode.NORMAL) {
             this.cancel();
             return false;
         }
@@ -578,6 +580,35 @@ 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,179 +647,195 @@ const WindowManager = new Lang.Class({
         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.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-right',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-up',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-down',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-last',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-left',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-right',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-up',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-down',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-1',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-2',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-3',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-4',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-5',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-6',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-7',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-8',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-9',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-10',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-11',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-12',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-1',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-2',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-3',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-4',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-5',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-6',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-7',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-8',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-9',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-10',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-11',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-12',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-last',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-applications',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-group',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-applications-backward',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-group-backward',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-windows',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._startWindowSwitcher));
         this.setCustomKeybindingHandler('switch-windows-backward',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                         Lang.bind(this, this._startWindowSwitcher));
         this.setCustomKeybindingHandler('switch-panels',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW |
+                                        Shell.ActionMode.OVERVIEW |
-                                        Shell.KeyBindingMode.LOCK_SCREEN |
+                                        Shell.ActionMode.LOCK_SCREEN |
-                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
+                                        Shell.ActionMode.UNLOCK_SCREEN |
-                                        Shell.KeyBindingMode.LOGIN_SCREEN,
+                                        Shell.ActionMode.LOGIN_SCREEN,
                                         Lang.bind(this, this._startA11ySwitcher));
         this.setCustomKeybindingHandler('switch-panels-backward',
-                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.ActionMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW |
+                                        Shell.ActionMode.OVERVIEW |
-                                        Shell.KeyBindingMode.LOCK_SCREEN |
+                                        Shell.ActionMode.LOCK_SCREEN |
-                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
+                                        Shell.ActionMode.UNLOCK_SCREEN |
-                                        Shell.KeyBindingMode.LOGIN_SCREEN,
+                                        Shell.ActionMode.LOGIN_SCREEN,
                                         Lang.bind(this, this._startA11ySwitcher));
 
         this.addKeybinding('pause-resume-tweens',
                            new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
-                           Shell.KeyBindingMode.ALL,
+                           Shell.ActionMode.ALL,
                            Lang.bind(this, this._toggleTweens));
 
         this.addKeybinding('open-application-menu',
                            new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
-                           Shell.KeyBindingMode.NORMAL |
+                           Shell.ActionMode.NORMAL |
-                           Shell.KeyBindingMode.TOPBAR_POPUP,
+                           Shell.ActionMode.TOPBAR_POPUP,
                            Lang.bind(this, this._toggleAppMenu));
 
+        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]);
@@ -854,6 +901,44 @@ 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;
@@ -875,7 +960,7 @@ const WindowManager = new Lang.Class({
 
     removeKeybinding: function(name) {
         if (global.display.remove_keybinding(name))
-            this.allowKeybinding(name, Shell.KeyBindingMode.NONE);
+            this.allowKeybinding(name, Shell.ActionMode.NONE);
     },
 
     allowKeybinding: function(name, modes) {
@@ -883,7 +968,7 @@ const WindowManager = new Lang.Class({
     },
 
     _shouldAnimate: function() {
-        return !Main.overview.visible;
+        return !(Main.overview.visible || this._blockAnimations);
     },
 
     _shouldAnimateActor: function(actor, types) {
@@ -1074,10 +1159,8 @@ 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:
@@ -1232,18 +1315,36 @@ const WindowManager = new Lang.Class({
     },
 
     _filterKeybinding: function(shellwm, binding) {
-        if (Main.keybindingMode == Shell.KeyBindingMode.NONE)
+        if (Main.actionMode == Shell.ActionMode.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.keybindingMode == Shell.KeyBindingMode.NORMAL &&
+        if (Main.actionMode == Shell.ActionMode.NORMAL &&
             binding.is_builtin())
             return false;
 
-        return !(this._allowedKeybindings[binding.get_name()] & Main.keybindingMode);
+        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];
+        }
     },
 
     _switchWorkspace : function(shellwm, from, to, direction) {
@@ -1437,6 +1538,11 @@ 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) {
@@ -1501,4 +1607,18 @@ 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/windowMenu.js

@@ -75,7 +75,7 @@ const WindowMenu = new Lang.Class({
         }));
         if (window.is_above())
             item.setOrnament(PopupMenu.Ornament.DOT);
-        if (window.get_maximized() ||
+        if (window.get_maximized() == Meta.MaximizeFlags.BOTH ||
             type == Meta.WindowType.DOCK ||
             type == Meta.WindowType.DESKTOP ||
             type == Meta.WindowType.SPLASHSCREEN)

js/ui/workspace.js

@@ -254,7 +254,7 @@ const WindowClone = new Lang.Class({
     },
 
     _computeBoundingBox: function() {
-        let rect = this.metaWindow.get_outer_rect();
+        let rect = this.metaWindow.get_frame_rect();
 
         this.actor.get_children().forEach(function (child) {
             let realWindow;
@@ -264,7 +264,7 @@ const WindowClone = new Lang.Class({
                 realWindow = child.source;
 
             let metaWindow = realWindow.meta_window;
-            rect = rect.union(metaWindow.get_outer_rect());
+            rect = rect.union(metaWindow.get_frame_rect());
         }, this);
 
         // Convert from a MetaRectangle to a native JS object

js/ui/workspaceThumbnail.js

@@ -161,14 +161,14 @@ const WindowClone = new Lang.Class({
 
     _updateDialogPosition: function(realDialog, cloneDialog) {
         let metaDialog = realDialog.meta_window;
-        let dialogRect = metaDialog.get_outer_rect();
+        let dialogRect = metaDialog.get_frame_rect();
-        let rect = this.metaWindow.get_outer_rect();
+        let rect = this.metaWindow.get_frame_rect();
 
         cloneDialog.set_position(dialogRect.x - rect.x, dialogRect.y - rect.y);
     },
 
     _onPositionChanged: function() {
-        let rect = this.metaWindow.get_outer_rect();
+        let rect = this.metaWindow.get_frame_rect();
         this.actor.set_position(this.realWindow.x, this.realWindow.y);
     },
 
@@ -795,35 +795,13 @@ 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;
 
-            // ... move them down one.
+            Main.wm.insertWorkspace(newWorkspaceIndex);
-            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,8 +18,6 @@ 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,
@@ -538,6 +536,7 @@ 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,6 +30,7 @@ hi
 hu
 ia
 id
+is
 it
 ja
 kk
@@ -68,6 +69,7 @@ th
 tr
 ug 
 uk
+uz@cyrillic
 vi
 zh_CN
 zh_HK

po/da.po

@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 20:54+0200\n"
+"POT-Creation-Date: 2014-09-20 09:40+0200\n"
-"PO-Revision-Date: 2014-09-14 20:25+0200\n"
+"PO-Revision-Date: 2014-09-20 09:37+0200\n"
 "Last-Translator: Kris Thomsen <mail@kristhomsen.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -401,19 +401,19 @@ msgstr "Ofte"
 msgid "All"
 msgstr "Alle"
 
-#: ../js/ui/appDisplay.js:1789
+#: ../js/ui/appDisplay.js:1790
 msgid "New Window"
 msgstr "Nyt vindue"
 
-#: ../js/ui/appDisplay.js:1815 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1816 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"
 
-#: ../js/ui/appDisplay.js:1821
+#: ../js/ui/appDisplay.js:1822
 msgid "Add to Favorites"
 msgstr "Føj til favoritter"
 
-#: ../js/ui/appDisplay.js:1830
+#: ../js/ui/appDisplay.js:1831
 msgid "Show Details"
 msgstr "Vis detaljer"
 
@@ -1216,39 +1216,39 @@ msgstr "Vis kilde"
 msgid "Web Page"
 msgstr "Webside"
 
-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1327
 msgid "Open"
 msgstr "Åbn"
 
-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1334
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1631
 msgid "Notifications"
 msgstr "Beskeder"
 
-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1638
 msgid "Clear Messages"
 msgstr "Ryd beskeder"
 
-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1657
 msgid "Notification Settings"
 msgstr "Indstillinger for påmindelser"
 
-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1710
 msgid "Tray Menu"
 msgstr "Menu for statusfelt"
 
-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1934
 msgid "No Messages"
 msgstr "Ingen beskeder"
 
-#: ../js/ui/messageTray.js:1968
+#: ../js/ui/messageTray.js:1979
 msgid "Message Tray"
 msgstr "Besked-statusfelt"
 
-#: ../js/ui/messageTray.js:2971
+#: ../js/ui/messageTray.js:2992
 msgid "System Information"
 msgstr "Systeminformation"
 
@@ -1458,9 +1458,8 @@ msgid "Disable"
 msgstr "Slå fra"
 
 #: ../js/ui/status/location.js:73
-#, fuzzy
 msgid "Privacy Settings"
-msgstr "Indstillinger for strømstyring"
+msgstr "Indstillinger for privatliv"
 
 #: ../js/ui/status/location.js:176
 msgid "In Use"

po/fa.po

@@ -9,8 +9,8 @@ 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: 2014-08-28 07:38+0000\n"
+"POT-Creation-Date: 2014-10-06 19:42+0000\n"
-"PO-Revision-Date: 2014-08-28 20:57+0430\n"
+"PO-Revision-Date: 2014-10-10 10:51+0330\n"
 "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.6.9\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -81,16 +81,10 @@ msgstr ""
 "F2."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
-#| msgid "Uuids of extensions to enable"
 msgid "UUIDs of extensions to enable"
 msgstr "شناسه‌های UUID افزونه‌ها جهت فعال‌سازی"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
-#| msgid ""
-#| "GNOME Shell extensions have a uuid property; this key lists extensions "
-#| "which should be loaded. Any extension that wants to be loaded needs to be "
-#| "in this list. You can also manipulate this list with the EnableExtension "
-#| "and DisableExtension DBus methods on org.gnome.Shell."
 msgid ""
 "GNOME Shell extensions have a UUID property; this key lists extensions which "
 "should be loaded. Any extension that wants to be loaded needs to be in this "
@@ -143,14 +137,10 @@ msgid "History for the looking glass dialog"
 msgstr "تاریخچه برای نما محاوره شیشه‌ای"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
-#| msgid "Always show the 'Log out' menuitem in the user menu."
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "همیشه «خروج از سیستم» را در منو کاربر نمایش بده."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:14
-#| msgid ""
-#| "This key overrides the automatic hiding of the 'Log out' menuitem in "
-#| "single-user, single-session situations."
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
@@ -307,18 +297,17 @@ msgstr ""
 msgid "Captive Portal"
 msgstr "پرتال درگیر"
 
-#: ../js/extensionPrefs/main.js:127
+#: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "خطایی هنگام باز کردن محاوره‌ی ترجیحات برای %s رُخ داد:"
 
-#: ../js/extensionPrefs/main.js:159
+#: ../js/extensionPrefs/main.js:155
-#| msgid "Configure GNOME Shell Extensions"
 msgid "GNOME Shell Extensions"
 msgstr "افزونه‌های گنوم‌شل"
 
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
-#: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
+#: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:915
 msgid "Cancel"
@@ -378,50 +367,47 @@ msgstr "عدم توانایی در تجزیه فرمان:"
 
 #: ../js/misc/util.js:156
 #, javascript-format
-#| msgid "Execution of '%s' failed:"
 msgid "Execution of “%s” failed:"
 msgstr "اجرای «%s» شکست خورد:"
 
 #: ../js/portalHelper/main.js:85
-#| msgid "Authentication Required"
 msgid "Web Authentication Redirect"
 msgstr "تغییر مسیر برای تایید هویت وب"
 
-#: ../js/ui/appDisplay.js:660
+#: ../js/ui/appDisplay.js:772
 msgid "Frequently used applications will appear here"
 msgstr "برنامه‌های بیشتر استفاده شده در اینجا نمایش داده می‌شود"
 
-#: ../js/ui/appDisplay.js:771
+#: ../js/ui/appDisplay.js:883
 msgid "Frequent"
 msgstr "پُراستفاده"
 
-#: ../js/ui/appDisplay.js:778
+#: ../js/ui/appDisplay.js:890
 msgid "All"
 msgstr "همه"
 
-#: ../js/ui/appDisplay.js:1650
+#: ../js/ui/appDisplay.js:1790
 msgid "New Window"
 msgstr "پنجره‌ی جدید"
 
-#: ../js/ui/appDisplay.js:1673 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1816 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "حذف از مورد پسندها"
 
-#: ../js/ui/appDisplay.js:1679
+#: ../js/ui/appDisplay.js:1822
 msgid "Add to Favorites"
 msgstr "اضافه کردن به مورد پسندها"
 
-#: ../js/ui/appDisplay.js:1688
+#: ../js/ui/appDisplay.js:1831
-#| msgid "Show Text"
 msgid "Show Details"
 msgstr "نمایش جزئیات"
 
-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:132
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "مورد %s به مورد پسندهای شما اضافه شد."
 
-#: ../js/ui/appFavorites.js:156
+#: ../js/ui/appFavorites.js:166
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "مورد %s ازمورد پسندهای شما حذف شد."
@@ -613,11 +599,11 @@ msgstr "باز کردن با %s"
 msgid "Eject"
 msgstr "بیرون دادن"
 
-#: ../js/ui/components/keyring.js:93 ../js/ui/components/polkitAgent.js:285
+#: ../js/ui/components/keyring.js:94 ../js/ui/components/polkitAgent.js:285
 msgid "Password:"
 msgstr "گذرواژه"
 
-#: ../js/ui/components/keyring.js:113
+#: ../js/ui/components/keyring.js:120
 msgid "Type again:"
 msgstr "تلاش مجدد:"
 
@@ -656,9 +642,6 @@ msgstr "تایید هویت برای شبکه بی‌سیم لازم است"
 
 #: ../js/ui/components/networkAgent.js:319
 #, javascript-format
-#| msgid ""
-#| "Passwords or encryption keys are required to access the wireless network "
-#| "'%s'."
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
@@ -694,7 +677,6 @@ msgstr "گذرواژه شبکه پهن‌باند تلفن همراه"
 
 #: ../js/ui/components/networkAgent.js:346
 #, javascript-format
-#| msgid "A password is required to connect to '%s'."
 msgid "A password is required to connect to “%s”."
 msgstr "برای اتصال به «%s» گذرواژه لازم است."
 
@@ -744,23 +726,18 @@ msgstr "بی‌صدا"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:953
-#| msgctxt "event list time"
-#| msgid "%H∶%M"
 msgid "%H∶%M"
 msgstr "%OH∶%OM"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:960
-#| msgid "<b>Yesterday</b>, <b>%H:%M</b>"
 msgid "Yesterday, %H∶%M"
 msgstr "<b>دیروز</b>، <b>%OH:%OM"
 
 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:967
-#| msgctxt "event list time"
-#| msgid "%H∶%M"
 msgid "%A, %H∶%M"
 msgstr "%A، %OH∶%OM"
 
@@ -768,8 +745,6 @@ msgstr "%A، %OH∶%OM"
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30" */
 #: ../js/ui/components/telepathyClient.js:974
-#| msgctxt "event list time"
-#| msgid "%H∶%M"
 msgid "%B %d, %H∶%M"
 msgstr "%d %B، %OH∶%OM"
 
@@ -782,8 +757,6 @@ msgstr "%Od %OB %OY، %OH:%OM"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:986
-#| msgctxt "event list time"
-#| msgid "%l∶%M %p"
 msgid "%l∶%M %p"
 msgstr "%Ol∶%OM %p"
 
@@ -796,7 +769,6 @@ msgstr "دیروز، %OI:%OM"
 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1000
-#| msgid "%a %l:%M %p"
 msgid "%A, %l∶%M %p"
 msgstr "%A، %OH:%OM"
 
@@ -804,7 +776,6 @@ msgstr "%A، %OH:%OM"
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1007
-#| msgid "%a %b %e, %l:%M %p"
 msgid "%B %d, %l∶%M %p"
 msgstr "%Od %B، %OH:%OM"
 
@@ -812,7 +783,6 @@ msgstr "%Od %B، %OH:%OM"
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"*/
 #: ../js/ui/components/telepathyClient.js:1013
-#| msgid "%a %b %e, %l:%M %p"
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%Od %B، %OH:%OM"
 
@@ -1004,7 +974,7 @@ msgstr "نمایش حساب"
 msgid "Unknown reason"
 msgstr "دلیل ناشناخته"
 
-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:228
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:154
 msgid "Windows"
 msgstr "پنجره‌‌ها"
 
@@ -1016,105 +986,105 @@ msgstr "نمایش برنامه‌ها"
 msgid "Dash"
 msgstr "دَش"
 
-#: ../js/ui/dateMenu.js:96
+#: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "بازکردن تقویم"
 
-#: ../js/ui/dateMenu.js:100
+#: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "باز کردن ساعت‌ها"
 
-#: ../js/ui/dateMenu.js:107
+#: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "تنظیمات تاریخ و ساعت"
 
 #. 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:204
+#: ../js/ui/dateMenu.js:132
 msgid "%A %B %e, %Y"
 msgstr "%A %Od %B"
 
-#: ../js/ui/endSessionDialog.js:66
+#: ../js/ui/endSessionDialog.js:64
 #, javascript-format
 msgctxt "title"
 msgid "Log Out %s"
 msgstr "خروج از %s"
 
-#: ../js/ui/endSessionDialog.js:67
+#: ../js/ui/endSessionDialog.js:65
 msgctxt "title"
 msgid "Log Out"
 msgstr "خروج از سیستم"
 
-#: ../js/ui/endSessionDialog.js:69
+#: ../js/ui/endSessionDialog.js:67
 #, javascript-format
 msgid "%s will be logged out automatically in %d second."
 msgid_plural "%s will be logged out automatically in %d seconds."
 msgstr[0] "‏%s به طور خودکار در مدت %Id ثانیه از سیستم خارج خواهد شد."
 msgstr[1] "‏%s به طور خودکار در مدت %Id ثانیه از سیستم خارج خواهد شد."
 
-#: ../js/ui/endSessionDialog.js:74
+#: ../js/ui/endSessionDialog.js:72
 #, javascript-format
 msgid "You will be logged out automatically in %d second."
 msgid_plural "You will be logged out automatically in %d seconds."
 msgstr[0] "شما پس از %Id ثانیه به طور خودکار از سیستم خارج می‌شوید."
 msgstr[1] "شما پس از %Id ثانیه به طور خودکار از سیستم خارج می‌شوید."
 
-#: ../js/ui/endSessionDialog.js:80
+#: ../js/ui/endSessionDialog.js:78
 msgctxt "button"
 msgid "Log Out"
 msgstr "خروج از سیستم"
 
-#: ../js/ui/endSessionDialog.js:86
+#: ../js/ui/endSessionDialog.js:84
 msgctxt "title"
 msgid "Power Off"
 msgstr "خاموش کردن"
 
-#: ../js/ui/endSessionDialog.js:87
+#: ../js/ui/endSessionDialog.js:85
 msgctxt "title"
 msgid "Install Updates & Power Off"
 msgstr "نصب بروزرسانی‌ها و خاموش کردن"
 
-#: ../js/ui/endSessionDialog.js:89
+#: ../js/ui/endSessionDialog.js:87
 #, javascript-format
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
 msgstr[0] "سیستم پس از %Id ثانیه به طور خودکار خاموش می‌شود."
 msgstr[1] "سیستم پس از %Id ثانیه به طور خودکار خاموش می‌شود."
 
-#: ../js/ui/endSessionDialog.js:93
+#: ../js/ui/endSessionDialog.js:91
 msgctxt "checkbox"
 msgid "Install pending software updates"
 msgstr "نصب بروزرسانی‌هایِ در انتظار"
 
-#: ../js/ui/endSessionDialog.js:96 ../js/ui/endSessionDialog.js:113
+#: ../js/ui/endSessionDialog.js:94 ../js/ui/endSessionDialog.js:111
 msgctxt "button"
 msgid "Restart"
 msgstr "راه‌اندازی مجدد"
 
-#: ../js/ui/endSessionDialog.js:98
+#: ../js/ui/endSessionDialog.js:96
 msgctxt "button"
 msgid "Power Off"
 msgstr "خاموش کردن"
 
-#: ../js/ui/endSessionDialog.js:105
+#: ../js/ui/endSessionDialog.js:103
 msgctxt "title"
 msgid "Restart"
 msgstr "راه‌اندازی مجدد"
 
-#: ../js/ui/endSessionDialog.js:107
+#: ../js/ui/endSessionDialog.js:105
 #, javascript-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود."
 msgstr[1] "سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود."
 
-#: ../js/ui/endSessionDialog.js:121
+#: ../js/ui/endSessionDialog.js:119
 msgctxt "title"
 msgid "Restart & Install Updates"
 msgstr "راه‌اندازی مجدد و نصب بروزرسانی‌ها"
 
-#: ../js/ui/endSessionDialog.js:123
+#: ../js/ui/endSessionDialog.js:121
 #, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
 msgid_plural ""
@@ -1126,44 +1096,42 @@ msgstr[1] ""
 "سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را "
 "نصب می‌کند."
 
-#: ../js/ui/endSessionDialog.js:129
+#: ../js/ui/endSessionDialog.js:127
-#| msgctxt "button"
-#| msgid "Restart & Install"
 msgctxt "button"
 msgid "Restart &amp; Install"
 msgstr "راه‌اندازی مجدد و نصب"
 
-#: ../js/ui/endSessionDialog.js:130
+#: ../js/ui/endSessionDialog.js:128
 msgctxt "button"
 msgid "Install &amp; Power Off"
 msgstr "نصب و خاموش کردن"
 
-#: ../js/ui/endSessionDialog.js:131
+#: ../js/ui/endSessionDialog.js:129
 msgctxt "checkbox"
 msgid "Power off after updates are installed"
 msgstr "خاموش کردن بعد از نصب بروزرسانی‌ها"
 
-#: ../js/ui/endSessionDialog.js:315
+#: ../js/ui/endSessionDialog.js:338
 msgid "Running on battery power: please plug in before installing updates."
 msgstr ""
 "درحال اجرا بر روی انرژی باتری: لطفا قبل از نصب بروزرسانی‌ها، به برق وصل کنید."
 
-#: ../js/ui/endSessionDialog.js:332
+#: ../js/ui/endSessionDialog.js:355
 msgid "Some applications are busy or have unsaved work."
 msgstr "تعدادی از برنامه‌ها مشغول هستند یا کارهای ذخیره نشده دارند."
 
-#: ../js/ui/endSessionDialog.js:339
+#: ../js/ui/endSessionDialog.js:362
 msgid "Other users are logged in."
 msgstr "کاربران دیگر وارد سیستم هستند."
 
 #. Translators: Remote here refers to a remote session, like a ssh login */
-#: ../js/ui/endSessionDialog.js:619
+#: ../js/ui/endSessionDialog.js:640
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (دوردست)"
 
 #. Translators: Console here refers to a tty like a VT console */
-#: ../js/ui/endSessionDialog.js:622
+#: ../js/ui/endSessionDialog.js:643
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (پایانه)"
@@ -1174,11 +1142,10 @@ msgstr "نصب"
 
 #: ../js/ui/extensionDownloader.js:204
 #, javascript-format
-#| msgid "Download and install '%s' from extensions.gnome.org?"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "بارگیری و نصب «%s» از extensions.gnome.org؟"
 
-#: ../js/ui/keyboard.js:653 ../js/ui/status/keyboard.js:339
+#: ../js/ui/keyboard.js:700 ../js/ui/status/keyboard.js:523
 msgid "Keyboard"
 msgstr "صفحه‌کلید"
 
@@ -1200,8 +1167,8 @@ msgstr "مخفی کردن خطاها"
 msgid "Show Errors"
 msgstr "نمایش خطاها"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:62
+#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71
-#: ../js/ui/status/location.js:166
+#: ../js/ui/status/location.js:176
 msgid "Enabled"
 msgstr "به کار انداختن"
 
@@ -1209,7 +1176,7 @@ msgstr "به کار انداختن"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:169
+#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:179
 #: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "از کار انداختن"
@@ -1234,39 +1201,39 @@ msgstr "نمایش منبع"
 msgid "Web Page"
 msgstr "صفحه‌ی وب"
 
-#: ../js/ui/messageTray.js:1325
+#: ../js/ui/messageTray.js:1327
 msgid "Open"
 msgstr "بازکردن"
 
-#: ../js/ui/messageTray.js:1332
+#: ../js/ui/messageTray.js:1334
 msgid "Remove"
 msgstr "حذف"
 
-#: ../js/ui/messageTray.js:1629
+#: ../js/ui/messageTray.js:1631
 msgid "Notifications"
 msgstr "اعلان‌ها"
 
-#: ../js/ui/messageTray.js:1636
+#: ../js/ui/messageTray.js:1638
 msgid "Clear Messages"
 msgstr "پاک کردن پیام‌ها"
 
-#: ../js/ui/messageTray.js:1655
+#: ../js/ui/messageTray.js:1657
 msgid "Notification Settings"
 msgstr "تنظیمات اعلان‌ها"
 
-#: ../js/ui/messageTray.js:1708
+#: ../js/ui/messageTray.js:1710
 msgid "Tray Menu"
 msgstr "منو سینی"
 
-#: ../js/ui/messageTray.js:1925
+#: ../js/ui/messageTray.js:1934
 msgid "No Messages"
 msgstr "پیامی وجود ندارد"
 
-#: ../js/ui/messageTray.js:1963
+#: ../js/ui/messageTray.js:1979
 msgid "Message Tray"
 msgstr "سینی پیام"
 
-#: ../js/ui/messageTray.js:2966
+#: ../js/ui/messageTray.js:2992
 msgid "System Information"
 msgstr "اطلاعات سیستم"
 
@@ -1294,7 +1261,7 @@ msgstr "نمای‌کلی"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:246
 msgid "Type to search…"
 msgstr "برای جستجو تایپ کنید..."
 
@@ -1325,7 +1292,6 @@ msgid "Close"
 msgstr "بستن"
 
 #: ../js/ui/runDialog.js:277
-#| msgid "Estimating…"
 msgid "Restarting…"
 msgstr "درحال راه‌اندازی مجدد..."
 
@@ -1358,27 +1324,27 @@ msgstr "نمی‌توان قفل کرد"
 msgid "Lock was blocked by an application"
 msgstr "قفل توسط یک برنامه مسدود شده بود"
 
-#: ../js/ui/search.js:606
+#: ../js/ui/search.js:611
 msgid "Searching…"
 msgstr "درحال حستجو..."
 
-#: ../js/ui/search.js:652
+#: ../js/ui/search.js:613
 msgid "No results."
 msgstr "بدون نتیجه."
 
-#: ../js/ui/shellEntry.js:27
+#: ../js/ui/shellEntry.js:25
 msgid "Copy"
 msgstr "رونوشت"
 
-#: ../js/ui/shellEntry.js:32
+#: ../js/ui/shellEntry.js:30
 msgid "Paste"
 msgstr "چسباندن"
 
-#: ../js/ui/shellEntry.js:99
+#: ../js/ui/shellEntry.js:97
 msgid "Show Text"
 msgstr "نمایش متن"
 
-#: ../js/ui/shellEntry.js:101
+#: ../js/ui/shellEntry.js:99
 msgid "Hide Text"
 msgstr "مخفی‌کردن متن"
 
@@ -1464,26 +1430,27 @@ msgstr "متصل نیست"
 msgid "Brightness"
 msgstr "روشنایی"
 
-#: ../js/ui/status/keyboard.js:406
+#: ../js/ui/status/keyboard.js:547
 msgid "Show Keyboard Layout"
 msgstr "نمایش چیدمان صفحه‌کلید"
 
-#: ../js/ui/status/location.js:56
+#: ../js/ui/status/location.js:65
-#| msgid "Notifications"
 msgid "Location"
 msgstr "مکان"
 
-#: ../js/ui/status/location.js:63 ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:177
-#| msgid "Disabled"
 msgid "Disable"
 msgstr "از کار انداختن"
 
-#: ../js/ui/status/location.js:166
+#: ../js/ui/status/location.js:73
+msgid "Privacy Settings"
+msgstr "تنظیمات حریم‌خصوصی"
+
+#: ../js/ui/status/location.js:176
 msgid "In Use"
 msgstr "درحال استفاده"
 
-#: ../js/ui/status/location.js:170
+#: ../js/ui/status/location.js:180
-#| msgid "Enabled"
 msgid "Enable"
 msgstr "به کار انداختن"
 
@@ -1497,37 +1464,31 @@ msgid "Off"
 msgstr "خاموش"
 
 #: ../js/ui/status/network.js:459
-#| msgid "Connect"
 msgid "Connected"
 msgstr "متصل شده"
 
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu) */
 #: ../js/ui/status/network.js:463
-#| msgid "unmanaged"
 msgid "Unmanaged"
 msgstr "مدیریت نشده"
 
 #: ../js/ui/status/network.js:465
-#| msgid "disconnecting..."
 msgid "Disconnecting"
 msgstr "درحال قطع ارتباط"
 
 #: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1301
-#| msgid "Connection"
 msgid "Connecting"
 msgstr "درحال اتصال"
 
 #. Translators: this is for network connections that require some kind of key or password */
 #: ../js/ui/status/network.js:474
-#| msgid "authentication required"
 msgid "Authentication required"
 msgstr "تایید هویت لازم است"
 
 #. 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"
 msgid "Firmware missing"
 msgstr "میان‌افزار موجود نیست"
 
@@ -1542,7 +1503,6 @@ msgid "Connection failed"
 msgstr "اتصال شکست خورد"
 
 #: ../js/ui/status/network.js:504
-#| msgid "Wi-Fi Settings"
 msgid "Wired Settings"
 msgstr "تنظیمات اتصال سیمی"
 
@@ -1559,7 +1519,6 @@ msgid "Use as Internet connection"
 msgstr "استفاده به عنوان اتصال اینترنت"
 
 #: ../js/ui/status/network.js:813
-#| msgid "Airplane Mode"
 msgid "Airplane Mode is On"
 msgstr "حالت هواپیمایی روشن است"
 
@@ -1568,12 +1527,10 @@ msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "در زمان روشن بودن حالت هواپیمایی وای-فای غیرفعال می‌شود."
 
 #: ../js/ui/status/network.js:815
-#| msgid "Airplane Mode"
 msgid "Turn Off Airplane Mode"
 msgstr "خاموش کردن حالت هواپیمایی"
 
 #: ../js/ui/status/network.js:824
-#| msgid "Wi-Fi Settings"
 msgid "Wi-Fi is Off"
 msgstr "بی‌سیم خاموش است"
 
@@ -1582,7 +1539,6 @@ msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "برای اتصال به شبکه باید وای-فای روشن شود."
 
 #: ../js/ui/status/network.js:826
-#| msgid "Turn On"
 msgid "Turn On Wi-Fi"
 msgstr "روشن کردن بی‌سیم"
 
@@ -1636,7 +1592,6 @@ msgid "Network Settings"
 msgstr "تنظیمات شبکه"
 
 #: ../js/ui/status/network.js:1482
-#| msgid "Settings"
 msgid "VPN Settings"
 msgstr "تنظیمات VPN"
 
@@ -1730,17 +1685,16 @@ msgstr "ورود به سیستم بعنوان کاربری دیگر"
 msgid "Unlock Window"
 msgstr "بازکردن قفل پنجره"
 
-#: ../js/ui/viewSelector.js:232
+#: ../js/ui/viewSelector.js:158
 msgid "Applications"
 msgstr "برنامه‌ها"
 
-#: ../js/ui/viewSelector.js:236
+#: ../js/ui/viewSelector.js:162
 msgid "Search"
 msgstr "جستجو"
 
 #: ../js/ui/windowAttentionHandler.js:19
 #, javascript-format
-#| msgid "'%s' is ready"
 msgid "“%s” is ready"
 msgstr "«%s» آماده است"
 
@@ -1832,25 +1786,24 @@ msgstr[1] "%Iu ورودی"
 msgid "System Sounds"
 msgstr "صداهای سیستم"
 
-#: ../src/main.c:371
+#: ../src/main.c:373
 msgid "Print version"
 msgstr "چاپ نسخه"
 
-#: ../src/main.c:377
+#: ../src/main.c:379
 msgid "Mode used by GDM for login screen"
 msgstr "حالت استفاده شده توسط GDM برای صفحه ورود به سیستم"
 
-#: ../src/main.c:383
+#: ../src/main.c:385
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "استفاده از حالت مشخص، مثال «gdm» برای صفحه ورود به سیستم"
 
-#: ../src/main.c:389
+#: ../src/main.c:391
 msgid "List possible modes"
 msgstr "فهرست کردن حالت‌های ممکن"
 
 #: ../src/shell-app.c:666
 #, c-format
-#| msgid "Failed to launch '%s'"
 msgid "Failed to launch “%s”"
 msgstr "راه‌اندازی «%s» شکست خورد"