Merge branch 'master' into user-applet-pf-picture

data/theme/cinnamon.css

@@ -2185,3 +2185,8 @@ StScrollBar StButton#vhandle:hover {
   -pie-border-color: rgba(200, 200, 200, 0.8);
   -pie-background-color: rgba(140, 140, 140, 0.6);;
 }
+
+.user-icon {
+    border: 2px solid #868686;
+    border-radius: 99px;
+}

files/usr/share/cinnamon/applets/inhibit@cinnamon.org/applet.js

@@ -12,6 +12,40 @@ const Util = imports.misc.util;
 const INHIBIT_IDLE_FLAG = 8;
 const INHIBIT_SLEEP_FLAG = 4;
 
+class InhibitAppletIcon {
+    constructor(applet, notificationStatus, inhibitStatus) {
+        this._applet = applet;
+        this.icon_name = 'inhibit';
+        this.notificationStatus = notificationStatus;
+        this.inhibitStatus = inhibitStatus;
+    }
+
+    setAppletIcon() {
+        this._applet.set_applet_icon_symbolic_name(this.getAppletIcon());
+    }
+
+    getAppletIcon() {
+        let appletIcon = this.icon_name;
+        if (this.inhibitStatus) {
+            appletIcon += '-active';
+        }
+        if (this.notificationStatus) {
+            appletIcon += '-notifications-disabled';
+        }
+        return appletIcon;
+    }
+
+    toggleNotificationStatus() {
+        this.notificationStatus = !this.notificationStatus;
+        this.setAppletIcon();
+    }
+
+    toggleInhibitStatus(status) {
+        this.inhibitStatus = status;
+        this.setAppletIcon();
+    }
+}
+
 class InhibitSwitch extends PopupMenu.PopupBaseMenuItem {
     constructor(applet) {
         super();
@@ -80,10 +114,10 @@ class InhibitSwitch extends PopupMenu.PopupBaseMenuItem {
 
         if (current_state & INHIBIT_IDLE_FLAG ||
             current_state & INHIBIT_SLEEP_FLAG) {
-            this._applet.set_applet_icon_symbolic_name('inhibit-active');
+            this._applet.icon.toggleInhibitStatus(true);
             this._applet.set_applet_tooltip(_("Power management: inhibited"));
         } else {
-            this._applet.set_applet_icon_symbolic_name('inhibit');
+            this._applet.icon.toggleInhibitStatus(false);
             this._applet.set_applet_tooltip(_("Power management: active"));
         }
 
@@ -214,7 +248,7 @@ class InhibitorMenuSection extends PopupMenu.PopupMenuSection {
     }
 
     resetInhibitors() {
-        // Abort any in-progress update or else it may continue to add menu items 
+        // Abort any in-progress update or else it may continue to add menu items
         // even after we've cleared them.
         this._updateId++;
 
@@ -232,7 +266,7 @@ class InhibitorMenuSection extends PopupMenu.PopupMenuSection {
     }
 
     updateInhibitors(sessionProxy) {
-        // Grab a new ID for this update while at the same time aborting any other in-progress 
+        // Grab a new ID for this update while at the same time aborting any other in-progress
         // update. We don't want to end up with duplicate menu items!
         let updateId = ++this._updateId;
 
@@ -358,17 +392,20 @@ class CinnamonInhibitApplet extends Applet.IconApplet {
         this.inhibitSwitch = new InhibitSwitch(this);
         this.menu.addMenuItem(this.inhibitSwitch);
 
-        this.set_applet_icon_symbolic_name('inhibit');
         this.set_applet_tooltip(_("Inhibit applet"));
 
         this.notif_settings = new Gio.Settings({ schema_id: "org.cinnamon.desktop.notifications" });
         this.notificationsSwitch = new PopupMenu.PopupSwitchMenuItem(_("Notifications"), this.notif_settings.get_boolean("display-notifications"));
 
+        this.icon = new InhibitAppletIcon(this, !this.notificationsSwitch.state, !this.inhibitSwitch.state);
+        this.icon.setAppletIcon();
+
         this.notif_settings.connect('changed::display-notifications', Lang.bind(this, function() {
             this.notificationsSwitch.setToggleState(this.notif_settings.get_boolean("display-notifications"));
         }));
         this.notificationsSwitch.connect('toggled', Lang.bind(this, function() {
             this.notif_settings.set_boolean("display-notifications", this.notificationsSwitch.state);
+            this.icon.toggleNotificationStatus();
         }));
 
         this.menu.addMenuItem(this.notificationsSwitch);

files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js

@@ -4,7 +4,6 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;
-const Mainloop = imports.mainloop;
 const Gio = imports.gi.Gio;
 const Cairo = imports.cairo;
 const Signals = imports.signals;
@@ -390,7 +389,7 @@ class CinnamonKeyboardApplet extends Applet.TextIconApplet {
         this._setLayoutItems(layoutItems);
         this._setLayoutIcons(layoutIcons);
 
-        Mainloop.idle_add(() => this._syncGroup());
+        this._syncGroup();
     }
 
     _syncGroup() {

files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js

@@ -9,6 +9,9 @@ const AccountsService = imports.gi.AccountsService;
 const GnomeSession = imports.misc.gnomeSession;
 const ScreenSaver = imports.misc.screenSaver;
 const Settings = imports.ui.settings;
+const UserWidget = imports.ui.userWidget;
+
+const DIALOG_ICON_SIZE = 64;
 
 
 const USER_DEFAULT_PIC_PATH = "/usr/share/cinnamon/faces/user-generic.png"
@@ -32,9 +35,13 @@ class CinnamonUserApplet extends Applet.TextIconApplet {
         this._contentSection = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(this._contentSection);
 
+        this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name());
+        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._onUserChanged));
+        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._onUserChanged));
+
         let userBox = new St.BoxLayout({ style_class: 'user-box', reactive: true, vertical: false });
 
-        this._userIcon = new St.Bin({ style_class: 'user-icon'});
+        this._userIcon = new UserWidget.Avatar(this._user, { iconSize: DIALOG_ICON_SIZE });
 
         this.settings.bind("display-name", "disp_name", this._updateLabel);
 
@@ -130,10 +137,6 @@ class CinnamonUserApplet extends Applet.TextIconApplet {
         }));
         this.menu.addMenuItem(item);
 
-        this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name());
-        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._onUserChanged));
-        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._onUserChanged));
-
         this._onUserChanged();
         this.set_show_label_in_vertical_panels(false);
     }
@@ -156,16 +159,7 @@ class CinnamonUserApplet extends Applet.TextIconApplet {
             this.set_applet_tooltip(this._user.get_real_name());
             this.userLabel.set_text (this._user.get_real_name());
             if (this._userIcon) {
-                let iconFileName = this._user.get_icon_file();
-                let iconFile = Gio.file_new_for_path(iconFileName);
-                let icon;
-                if (iconFile.query_exists(null)) {
-                    icon = new Gio.FileIcon({file: iconFile});
-                } else {
-                    icon = new Gio.ThemedIcon({name: 'avatar-default'});
-                }
-                let img = St.TextureCache.get_default().load_gicon(null, icon, 48);
-                this._userIcon.set_child (img);
+                this._userIcon.update();
                 this._userIcon.show();
             }
             this._updateLabel();