brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f2d883dab2
gnome-shell/js/ui/userMenu.js

737 lines
27 KiB
JavaScript
Raw Normal View History

*.js: Make emacs modelines consistent js2-mode is no longer developed and we recommend js-mode these days, so switch the modelines to specify that, and make them consistent across all files. https://bugzilla.gnome.org/show_bug.cgi?id=660358
2011-09-28 09:16:26 -04:00
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
Replace GdmUser with AccountsService The GdmUser copy+paste code has been superseded by AccountsService, so kill the former and use the latter. https://bugzilla.gnome.org/show_bug.cgi?id=650893
2011-05-10 10:13:05 -04:00
const AccountsService = imports.gi.AccountsService;
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
const Gio = imports.gi.Gio;
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
const GLib = imports.gi.GLib;
const Lang = imports.lang;
userMenu: fix line wrapping The previous wrapping code hardcoded a width in pixels, making it non-text-zoom-friendly. Specify a CSS width in pts, and fix the userMenu code to completely opt out of the popupMenu column behavior. Hack PopupComboBoxMenuItem slightly to deal with the fact that the pop-up no longer gets setColumnWidth'ed. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-08-23 13:15:31 -04:00
const Pango = imports.gi.Pango;
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
const Shell = imports.gi.Shell;
const St = imports.gi.St;
statusMenu: change IM presence when needed (#617207)
2011-02-28 11:03:35 -05:00
const Tp = imports.gi.TelepathyGLib;
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
const UPowerGlib = imports.gi.UPowerGlib;
a11y: Setting role on several panel ui elements https://bugzilla.gnome.org/show_bug.cgi?id=667432
2012-02-27 11:31:10 -05:00
const Atk = imports.gi.Atk;
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
[GnomeSession] split out the gnome-session presence D-Bus interface Split this out of js/ui/statusMenu.js https://bugzilla.gnome.org/show_bug.cgi?id=608667
2010-04-29 13:13:20 -04:00
const GnomeSession = imports.misc.gnomeSession;
Exit the overview when activating most items In all the cases where we activate GNOME 2 UI, e.g. the shutdown dialog, pop out of the overview. Otherwise, it's fairly broken since you won't see the result of your action. https://bugzilla.gnome.org/show_bug.cgi?id=620525
2010-06-03 19:21:08 -04:00
const Main = imports.ui.main;
Resolve cyclic dependency on StatusMenu Solved by splitting the base class (PanelMenuButton) in a separate module, ui.panelMenu, which is meant to hold also other reusable button classes. https://bugzilla.gnome.org/show_bug.cgi?id=621705
2010-06-22 17:02:26 -04:00
const PanelMenu = imports.ui.panelMenu;
[popupMenu] split this out from panel.js We want to use this menu style in other places as well https://bugzilla.gnome.org/show_bug.cgi?id=619541
2010-05-20 11:18:46 -04:00
const PopupMenu = imports.ui.popupMenu;
screensaver: factor out a ScreenSaverProxy helper class This class will be shared between StatusMenu and the upcoming AutomountManager classes. https://bugzilla.gnome.org/show_bug.cgi?id=653520
2011-07-12 11:42:33 -04:00
const ScreenSaver = imports.misc.screenSaver;
util: add Util.spawn and friends Add Util.spawn, Util.spawnCommandLine, and Util.spawnDesktop for spawning a command/argv/.desktop file in the background, automatically handling errors via MessageTray.SystemNotificationSource(), and Util.trySpawn, Util.trySpawnCommandLine, and Utils.trySpawnDesktop that don't do automatic error handling (but do at least clean up the error message in the exception a bit). Update various other bits of code around the shell to use the new methods. https://bugzilla.gnome.org/show_bug.cgi?id=635089
2010-11-17 11:43:08 -05:00
const Util = imports.misc.util;
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
const DISABLE_LOG_OUT_KEY = 'disable-log-out';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
const DIALOG_ICON_SIZE = 64;
const IMStatus = {
AVAILABLE: 0,
BUSY: 1,
HIDDEN: 2,
AWAY: 3,
IDLE: 4,
OFFLINE: 5,
LAST: 6
};
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
// Adapted from gdm/gui/user-switch-applet/applet.c
//
// Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
// Copyright (C) 2008,2009 Red Hat, Inc.
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
const IMStatusItem = new Lang.Class({
Name: 'IMStatusItem',
Extends: PopupMenu.PopupBaseMenuItem,
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
_init: function(label, iconName) {
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
this.parent();
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this.actor.add_style_class_name('status-chooser-status-item');
this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
this.addActor(this._icon);
if (iconName)
this._icon.icon_name = iconName;
this.label = new St.Label({ text: label });
a11y: userMenu: support for IMStatus combobox and suspend/power-off label https://bugzilla.gnome.org/show_bug.cgi?id=671404
2012-03-15 14:04:54 -04:00
this.actor.label_actor = this.label;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this.addActor(this.label);
}
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
});
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
const IMUserNameItem = new Lang.Class({
Name: 'IMUserNameItem',
Extends: PopupMenu.PopupBaseMenuItem,
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
_init: function() {
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
this.parent({ reactive: false,
style_class: 'status-chooser-user-name' });
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._wrapper = new Shell.GenericContainer();
this._wrapper.connect('get-preferred-width',
Lang.bind(this, this._wrapperGetPreferredWidth));
this._wrapper.connect('get-preferred-height',
Lang.bind(this, this._wrapperGetPreferredHeight));
this._wrapper.connect('allocate',
Lang.bind(this, this._wrapperAllocate));
this.addActor(this._wrapper, { expand: true, span: -1 });
this.label = new St.Label();
this.label.clutter_text.set_line_wrap(true);
userMenu: fix line wrapping The previous wrapping code hardcoded a width in pixels, making it non-text-zoom-friendly. Specify a CSS width in pts, and fix the userMenu code to completely opt out of the popupMenu column behavior. Hack PopupComboBoxMenuItem slightly to deal with the fact that the pop-up no longer gets setColumnWidth'ed. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-08-23 13:15:31 -04:00
this.label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._wrapper.add_actor(this.label);
},
_wrapperGetPreferredWidth: function(actor, forHeight, alloc) {
userMenu: fix line wrapping The previous wrapping code hardcoded a width in pixels, making it non-text-zoom-friendly. Specify a CSS width in pts, and fix the userMenu code to completely opt out of the popupMenu column behavior. Hack PopupComboBoxMenuItem slightly to deal with the fact that the pop-up no longer gets setColumnWidth'ed. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-08-23 13:15:31 -04:00
alloc.min_size = 1;
alloc.natural_size = 1;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
},
_wrapperGetPreferredHeight: function(actor, forWidth, alloc) {
[alloc.min_size, alloc.natural_size] = this.label.get_preferred_height(forWidth);
},
_wrapperAllocate: function(actor, box, flags) {
this.label.allocate(box, flags);
}
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
});
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
const IMStatusChooserItem = new Lang.Class({
Name: 'IMStatusChooserItem',
Extends: PopupMenu.PopupBaseMenuItem,
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
_init: function() {
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
this.parent({ reactive: false,
style_class: 'status-chooser' });
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._iconBin = new St.Button({ style_class: 'status-chooser-user-icon' });
this.addActor(this._iconBin);
this._iconBin.connect('clicked', Lang.bind(this,
function() {
this.activate();
}));
this._section = new PopupMenu.PopupMenuSection();
this.addActor(this._section.actor);
this._name = new IMUserNameItem();
this._section.addMenuItem(this._name);
this._combo = new PopupMenu.PopupComboBoxMenuItem({ style_class: 'status-chooser-combo' });
this._section.addMenuItem(this._combo);
let item;
item = new IMStatusItem(_("Available"), 'user-available');
this._combo.addMenuItem(item, IMStatus.AVAILABLE);
item = new IMStatusItem(_("Busy"), 'user-busy');
this._combo.addMenuItem(item, IMStatus.BUSY);
item = new IMStatusItem(_("Hidden"), 'user-invisible');
this._combo.addMenuItem(item, IMStatus.HIDDEN);
item = new IMStatusItem(_("Away"), 'user-away');
this._combo.addMenuItem(item, IMStatus.AWAY);
item = new IMStatusItem(_("Idle"), 'user-idle');
this._combo.addMenuItem(item, IMStatus.IDLE);
item = new IMStatusItem(_("Unavailable"), 'user-offline');
this._combo.addMenuItem(item, IMStatus.OFFLINE);
this._combo.connect('active-item-changed',
Lang.bind(this, this._changeIMStatus));
this._presence = new GnomeSession.Presence();
screensaver, gnomesession: port to GDBus based bindings Port org.gnome.ScreenSaver and org.gnome.SessionManager glue code to use GDBus, and move /org/gnome/Shell/EndSessionDialog to the GDBus connection, so it is backed by the org.gnome.Shell name. https://bugzilla.gnome.org/show_bug.cgi?id=648651
2011-08-16 08:24:39 -04:00
this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
user-menu: Fix fallout from GDBus port - replace some left-over references to GnomeSession.Presence.setStatus() - the correct replacement for GnomeSession.Presence.getStatus() is *not* GnomeSession.Presence.connectSignal('StatusChanged')
2011-11-11 16:41:47 -05:00
this._sessionStatusChanged(status);
screensaver, gnomesession: port to GDBus based bindings Port org.gnome.ScreenSaver and org.gnome.SessionManager glue code to use GDBus, and move /org/gnome/Shell/EndSessionDialog to the GDBus connection, so it is backed by the org.gnome.Shell name. https://bugzilla.gnome.org/show_bug.cgi?id=648651
2011-08-16 08:24:39 -04:00
}));
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
this._sessionPresenceRestored = false;
this._imPresenceRestored = false;
user-menu: Keep track of current presence We keep track of presence changes by connecting to the Tp.AccountManager:most-available-presence-changed signal. However, if multiple accounts are in use, telepathy may lie to us and emit the signal even when the most available presence is unchanged. Work around this by keeping track of the current presence ourselves. https://bugzilla.gnome.org/show_bug.cgi?id=657703
2011-09-02 08:15:31 -04:00
this._currentPresence = undefined;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
user-menu: Add missing semi-colons
2011-10-20 16:54:41 -04:00
this._accountMgr = Tp.AccountManager.dup();
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._accountMgr.connect('most-available-presence-changed',
Lang.bind(this, this._IMStatusChanged));
user-menu: Disable combo box if no accounts are enabled If no telepathy accounts have been set up or enabled, the IM status chooser won't have any effect. To avoid confusing behavior, make the status selector insensitive in that case. https://bugzilla.gnome.org/show_bug.cgi?id=662800
2011-10-26 15:16:08 -04:00
this._accountMgr.connect('account-enabled',
Lang.bind(this, this._IMAccountsChanged));
this._accountMgr.connect('account-disabled',
Lang.bind(this, this._IMAccountsChanged));
this._accountMgr.connect('account-removed',
Lang.bind(this, this._IMAccountsChanged));
userMenu: Consider account-validity for sensitivity We currently only update the status chooser's sensitivity if accounts are added, removed or enabled; unfortunately during account creation, the account may become enabled before it is actually valid, so the status chooser remains insensitive. Fix by listening to validity changes as well. https://bugzilla.gnome.org/show_bug.cgi?id=672265
2012-03-16 17:47:42 -04:00
this._accountMgr.connect('account-validity-changed',
Lang.bind(this, this._IMAccountsChanged));
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._accountMgr.prepare_async(null, Lang.bind(this,
function(mgr) {
user-menu: Restore previous IM presence on startup Move the saved user-set presence to GSettings, so it is preserved between logins. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-09-30 12:54:45 -04:00
let [presence, status, msg] = mgr.get_most_available_presence();
let savedPresence = global.settings.get_int('saved-im-presence');
user-menu: Disable combo box if no accounts are enabled If no telepathy accounts have been set up or enabled, the IM status chooser won't have any effect. To avoid confusing behavior, make the status selector insensitive in that case. https://bugzilla.gnome.org/show_bug.cgi?id=662800
2011-10-26 15:16:08 -04:00
this._IMAccountsChanged(mgr);
user-menu: Restore previous IM presence on startup Move the saved user-set presence to GSettings, so it is preserved between logins. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-09-30 12:54:45 -04:00
if (savedPresence == presence) {
this._IMStatusChanged(mgr, presence, status, msg);
} else {
this._setComboboxPresence(savedPresence);
status = this._statusForPresence(savedPresence);
msg = msg ? msg : '';
mgr.set_all_requested_presences(savedPresence, status, msg);
}
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
}));
Replace GdmUser with AccountsService The GdmUser copy+paste code has been superseded by AccountsService, so kill the former and use the latter. https://bugzilla.gnome.org/show_bug.cgi?id=650893
2011-05-10 10:13:05 -04:00
this._userManager = AccountsService.UserManager.get_default();
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
Replace GdmUser with AccountsService The GdmUser copy+paste code has been superseded by AccountsService, so kill the former and use the latter. https://bugzilla.gnome.org/show_bug.cgi?id=650893
2011-05-10 10:13:05 -04:00
this._user = this._userManager.get_user(GLib.get_user_name());
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._userLoadedId = this._user.connect('notify::is-loaded',
Lang.bind(this,
this._updateUser));
this._userChangedId = this._user.connect('changed',
Lang.bind(this,
this._updateUser));
userMenu: Update the user information if the object is already loaded Any time we get a cached user object from the AccountsService, it will already be loaded. https://bugzilla.gnome.org/show_bug.cgi?id=658605
2011-09-08 17:11:45 -04:00
this.actor.connect('notify::mapped', Lang.bind(this, function() {
if (this.actor.mapped)
this._updateUser();
}));
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
},
IMStatusChooserItem: clean up signal handlers on destroy() Extensions (like alternative-status-menu) expect that calling destroy() on a menu item will not leave signal handlers around. https://bugzilla.gnome.org/show_bug.cgi?id=660520
2011-10-17 09:18:25 -04:00
destroy: function() {
// clean up signal handlers
if (this._userLoadedId != 0) {
this._user.disconnect(this._userLoadedId);
this._userLoadedId = 0;
}
if (this._userChangedId != 0) {
this._user.disconnect(this._userChangedId);
this._userChangedId = 0;
}
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
this.parent();
IMStatusChooserItem: clean up signal handlers on destroy() Extensions (like alternative-status-menu) expect that calling destroy() on a menu item will not leave signal handlers around. https://bugzilla.gnome.org/show_bug.cgi?id=660520
2011-10-17 09:18:25 -04:00
},
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
// Override getColumnWidths()/setColumnWidths() to make the item
// independent from the overall column layout of the menu
getColumnWidths: function() {
return [];
},
setColumnWidths: function(widths) {
},
_updateUser: function() {
let iconFile = null;
if (this._user.is_loaded) {
this._name.label.set_text(this._user.get_real_name());
iconFile = this._user.get_icon_file();
if (!GLib.file_test(iconFile, GLib.FileTest.EXISTS))
iconFile = null;
} else {
this._name.label.set_text("");
}
if (iconFile)
this._setIconFromFile(iconFile);
else
this._setIconFromName('avatar-default');
},
_setIconFromFile: function(iconFile) {
Fix some fallout from background-size addition Commit 25948f214e replaced the old hardcoded scaling behavior of background-images with the CSS-compliant option to control that behavior with the background-size property. Fix some fallout from the changed default scaling behavior.
2012-01-09 19:48:14 -05:00
this._iconBin.set_style('background-image: url("' + iconFile + '");' +
'background-size: contain;');
userMenu: Don't show the default avatar over a newly selected one When we replace the default avatar image with a real image, we need to remove the default avatar image. https://bugzilla.gnome.org/show_bug.cgi?id=657657
2011-08-29 17:41:10 -04:00
this._iconBin.child = null;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
},
_setIconFromName: function(iconName) {
this._iconBin.set_style(null);
if (iconName != null) {
let textureCache = St.TextureCache.get_default();
let icon = textureCache.load_icon_name(this._iconBin.get_theme_node(),
iconName,
St.IconType.SYMBOLIC,
DIALOG_ICON_SIZE);
this._iconBin.child = icon;
this._iconBin.show();
} else {
this._iconBin.child = null;
this._iconBin.hide();
}
},
_statusForPresence: function(presence) {
switch(presence) {
case Tp.ConnectionPresenceType.AVAILABLE:
don't translate IM status They are well-known strings defined in the Telepathy spec and so shouldn't be translated. https://bugzilla.gnome.org/show_bug.cgi?id=657696
2011-08-30 08:35:20 -04:00
return 'available';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
case Tp.ConnectionPresenceType.BUSY:
don't translate IM status They are well-known strings defined in the Telepathy spec and so shouldn't be translated. https://bugzilla.gnome.org/show_bug.cgi?id=657696
2011-08-30 08:35:20 -04:00
return 'busy';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
case Tp.ConnectionPresenceType.OFFLINE:
don't translate IM status They are well-known strings defined in the Telepathy spec and so shouldn't be translated. https://bugzilla.gnome.org/show_bug.cgi?id=657696
2011-08-30 08:35:20 -04:00
return 'offline';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
case Tp.ConnectionPresenceType.HIDDEN:
don't translate IM status They are well-known strings defined in the Telepathy spec and so shouldn't be translated. https://bugzilla.gnome.org/show_bug.cgi?id=657696
2011-08-30 08:35:20 -04:00
return 'hidden';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
case Tp.ConnectionPresenceType.AWAY:
don't translate IM status They are well-known strings defined in the Telepathy spec and so shouldn't be translated. https://bugzilla.gnome.org/show_bug.cgi?id=657696
2011-08-30 08:35:20 -04:00
return 'away';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
case Tp.ConnectionPresenceType.EXTENDED_AWAY:
don't translate IM status They are well-known strings defined in the Telepathy spec and so shouldn't be translated. https://bugzilla.gnome.org/show_bug.cgi?id=657696
2011-08-30 08:35:20 -04:00
return 'xa';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
default:
don't translate IM status They are well-known strings defined in the Telepathy spec and so shouldn't be translated. https://bugzilla.gnome.org/show_bug.cgi?id=657696
2011-08-30 08:35:20 -04:00
return 'unknown';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
}
},
user-menu: Disable combo box if no accounts are enabled If no telepathy accounts have been set up or enabled, the IM status chooser won't have any effect. To avoid confusing behavior, make the status selector insensitive in that case. https://bugzilla.gnome.org/show_bug.cgi?id=662800
2011-10-26 15:16:08 -04:00
_IMAccountsChanged: function(mgr) {
let accounts = mgr.get_valid_accounts().filter(function(account) {
return account.enabled;
});
this._combo.setSensitive(accounts.length > 0);
},
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
_IMStatusChanged: function(accountMgr, presence, status, message) {
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
if (!this._imPresenceRestored)
this._imPresenceRestored = true;
user-menu: Keep track of current presence We keep track of presence changes by connecting to the Tp.AccountManager:most-available-presence-changed signal. However, if multiple accounts are in use, telepathy may lie to us and emit the signal even when the most available presence is unchanged. Work around this by keeping track of the current presence ourselves. https://bugzilla.gnome.org/show_bug.cgi?id=657703
2011-09-02 08:15:31 -04:00
if (presence == this._currentPresence)
return;
this._currentPresence = presence;
user-menu: Restore previous IM presence on startup Move the saved user-set presence to GSettings, so it is preserved between logins. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-09-30 12:54:45 -04:00
this._setComboboxPresence(presence);
user-menu: Keep track of current presence We keep track of presence changes by connecting to the Tp.AccountManager:most-available-presence-changed signal. However, if multiple accounts are in use, telepathy may lie to us and emit the signal even when the most available presence is unchanged. Work around this by keeping track of the current presence ourselves. https://bugzilla.gnome.org/show_bug.cgi?id=657703
2011-09-02 08:15:31 -04:00
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
if (!this._sessionPresenceRestored) {
user-menu: Fix fallout from GDBus port - replace some left-over references to GnomeSession.Presence.setStatus() - the correct replacement for GnomeSession.Presence.getStatus() is *not* GnomeSession.Presence.connectSignal('StatusChanged')
2011-11-11 16:41:47 -05:00
this._sessionStatusChanged(this._presence.status);
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
return;
}
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
if (presence == Tp.ConnectionPresenceType.AVAILABLE)
user-menu: Fix fallout from GDBus port - replace some left-over references to GnomeSession.Presence.setStatus() - the correct replacement for GnomeSession.Presence.getStatus() is *not* GnomeSession.Presence.connectSignal('StatusChanged')
2011-11-11 16:41:47 -05:00
this._presence.status = GnomeSession.PresenceStatus.AVAILABLE;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
user-menu: Be more cautious about saving status When requesting a presence change, the actual presence set by mission control does not necessarily match the requested presence (if an active account does not support the requested presence), which may result in the wrong presence being restored. As a fix, be more cautious about saving status by assuming that users do not request presence changes between an automatic presence change request and the actual change. https://bugzilla.gnome.org/show_bug.cgi?id=661485
2011-10-11 15:53:29 -04:00
// We ignore the actual value of _expectedPresence and never safe
// the first presence change after an "automatic" change, assuming
// that it is the response to our request; this is to account for
// mission control falling back to "similar" presences if an account
// type does not implement the requested presence.
if (!this._expectedPresence)
user-menu: Restore previous IM presence on startup Move the saved user-set presence to GSettings, so it is preserved between logins. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-09-30 12:54:45 -04:00
global.settings.set_int('saved-im-presence', presence);
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
else
this._expectedPresence = undefined;
user-menu: Restore previous IM presence on startup Move the saved user-set presence to GSettings, so it is preserved between logins. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-09-30 12:54:45 -04:00
},
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
user-menu: Restore previous IM presence on startup Move the saved user-set presence to GSettings, so it is preserved between logins. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-09-30 12:54:45 -04:00
_setComboboxPresence: function(presence) {
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
let activatedItem;
if (presence == Tp.ConnectionPresenceType.AVAILABLE)
activatedItem = IMStatus.AVAILABLE;
else if (presence == Tp.ConnectionPresenceType.BUSY)
activatedItem = IMStatus.BUSY;
else if (presence == Tp.ConnectionPresenceType.HIDDEN)
activatedItem = IMStatus.HIDDEN;
else if (presence == Tp.ConnectionPresenceType.AWAY)
activatedItem = IMStatus.AWAY;
else if (presence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
activatedItem = IMStatus.IDLE;
else
activatedItem = IMStatus.OFFLINE;
this._combo.setActiveItem(activatedItem);
for (let i = 0; i < IMStatus.LAST; i++) {
if (i == IMStatus.AVAILABLE || i == IMStatus.OFFLINE)
continue; // always visible
this._combo.setItemVisible(i, i == activatedItem);
}
},
_changeIMStatus: function(menuItem, id) {
let [presence, s, msg] = this._accountMgr.get_most_available_presence();
let newPresence, status;
if (id == IMStatus.AVAILABLE) {
newPresence = Tp.ConnectionPresenceType.AVAILABLE;
} else if (id == IMStatus.OFFLINE) {
newPresence = Tp.ConnectionPresenceType.OFFLINE;
} else
return;
status = this._statusForPresence(newPresence);
Use '' for non-translated strings Pay attention to the style guidelines. https://bugzilla.gnome.org/show_bug.cgi?id=660600
2011-09-30 17:30:47 -04:00
msg = msg ? msg : '';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._accountMgr.set_all_requested_presences(newPresence, status, msg);
},
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
getIMPresenceForSessionStatus: function(sessionStatus) {
user-menu: Restore previous IM presence on startup Move the saved user-set presence to GSettings, so it is preserved between logins. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-09-30 12:54:45 -04:00
// Restore the last user-set presence when coming back from
// BUSY/IDLE (otherwise the last user-set presence matches
// the current one)
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
if (sessionStatus == GnomeSession.PresenceStatus.AVAILABLE)
user-menu: Restore previous IM presence on startup Move the saved user-set presence to GSettings, so it is preserved between logins. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-09-30 12:54:45 -04:00
return global.settings.get_int('saved-im-presence');
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
if (sessionStatus == GnomeSession.PresenceStatus.BUSY) {
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
// Only change presence if the current one is "more present" than
// busy, or if coming back from idle
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
if (this._currentPresence == Tp.ConnectionPresenceType.AVAILABLE ||
this._currentPresence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
return Tp.ConnectionPresenceType.BUSY;
}
if (sessionStatus == GnomeSession.PresenceStatus.IDLE) {
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
// Only change presence if the current one is "more present" than
// idle
user-menu: Don't change HIDDEN to EXTENDED_AWAY When the session status changes to IDLE, we automatically adjust the IM presence; however, we should treat HIDDEN the same as OFFLINE and not change the presence. https://bugzilla.gnome.org/show_bug.cgi?id=642408
2011-10-19 09:15:14 -04:00
if (this._currentPresence != Tp.ConnectionPresenceType.OFFLINE &&
this._currentPresence != Tp.ConnectionPresenceType.HIDDEN)
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
return Tp.ConnectionPresenceType.EXTENDED_AWAY;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
}
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
return this._currentPresence;
},
screensaver, gnomesession: port to GDBus based bindings Port org.gnome.ScreenSaver and org.gnome.SessionManager glue code to use GDBus, and move /org/gnome/Shell/EndSessionDialog to the GDBus connection, so it is backed by the org.gnome.Shell name. https://bugzilla.gnome.org/show_bug.cgi?id=648651
2011-08-16 08:24:39 -04:00
_sessionStatusChanged: function(sessionStatus) {
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
if (!this._imPresenceRestored)
return;
userMenu: Only save session status when necessary Saving the status to GSettings is pointless if it did not actually change. If done during login, it is actually harmful, as it causes dconf-service to be started. https://bugzilla.gnome.org/show_bug.cgi?id=668214
2012-01-19 13:04:56 -05:00
let savedStatus = global.settings.get_int('saved-session-presence');
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
if (!this._sessionPresenceRestored) {
userMenu: Do not save/restore IDLE session status When restoring the previous sesssion presence, we forcefully set gnome-session's status. In the case of IDLE, this will trigger the screensaver, which is clearly unwanted first thing after login. We should only save and restore statuses that are explicitly set by the user anyway, so limit presence saving to AVAILABLE and BUSY statuses. https://bugzilla.gnome.org/show_bug.cgi?id=665701
2012-03-03 02:35:03 -05:00
// We should never save/restore a status other than AVAILABLE
// or BUSY
if (savedStatus != GnomeSession.PresenceStatus.AVAILABLE &&
savedStatus != GnomeSession.PresenceStatus.BUSY)
savedStatus = GnomeSession.PresenceStatus.AVAILABLE;
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
if (sessionStatus != savedStatus) {
screensaver, gnomesession: port to GDBus based bindings Port org.gnome.ScreenSaver and org.gnome.SessionManager glue code to use GDBus, and move /org/gnome/Shell/EndSessionDialog to the GDBus connection, so it is backed by the org.gnome.Shell name. https://bugzilla.gnome.org/show_bug.cgi?id=648651
2011-08-16 08:24:39 -04:00
this._presence.status = savedStatus;
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
return;
}
this._sessionPresenceRestored = true;
}
userMenu: Only save session status when necessary Saving the status to GSettings is pointless if it did not actually change. If done during login, it is actually harmful, as it causes dconf-service to be started. https://bugzilla.gnome.org/show_bug.cgi?id=668214
2012-01-19 13:04:56 -05:00
if ((sessionStatus == GnomeSession.PresenceStatus.AVAILABLE ||
sessionStatus == GnomeSession.PresenceStatus.BUSY) &&
savedStatus != sessionStatus)
userMenu: Do not save/restore IDLE session status When restoring the previous sesssion presence, we forcefully set gnome-session's status. In the case of IDLE, this will trigger the screensaver, which is clearly unwanted first thing after login. We should only save and restore statuses that are explicitly set by the user anyway, so limit presence saving to AVAILABLE and BUSY statuses. https://bugzilla.gnome.org/show_bug.cgi?id=665701
2012-03-03 02:35:03 -05:00
global.settings.set_int('saved-session-presence', sessionStatus);
user-menu: Restore previous session presence at startup Save the session presence in GSettings and restore it on startup. https://bugzilla.gnome.org/show_bug.cgi?id=659021
2011-10-05 20:47:18 -04:00
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
let [presence, s, msg] = this._accountMgr.get_most_available_presence();
let newPresence, status;
let newPresence = this.getIMPresenceForSessionStatus(sessionStatus);
if (!newPresence || newPresence == presence)
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
return;
status = this._statusForPresence(newPresence);
Use '' for non-translated strings Pay attention to the style guidelines. https://bugzilla.gnome.org/show_bug.cgi?id=660600
2011-09-30 17:30:47 -04:00
msg = msg ? msg : '';
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._expectedPresence = newPresence;
this._accountMgr.set_all_requested_presences(newPresence, status, msg);
}
Port PopupMenu to new Lang.Class framework The Lang module in gjs has recently gained a small yet powerful Class framework, that should help improve the readability of code when using complex inheritance. This commit starts porting shell code, by rewriting all classes in popupMenu.js (and all derived classes) to Lang.Class. https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 08:10:48 -05:00
});
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
Port PanelMenu to new class framework Second patch in the class framework, now it's the turn of PanelMenu (buttons, menus and status indicators). https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 09:38:48 -05:00
const UserMenuButton = new Lang.Class({
Name: 'UserMenuButton',
Extends: PanelMenu.Button,
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
_init: function() {
Port PanelMenu to new class framework Second patch in the class framework, now it's the turn of PanelMenu (buttons, menus and status indicators). https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 09:38:48 -05:00
this.parent(0.0);
a11y: Setting role on several panel ui elements https://bugzilla.gnome.org/show_bug.cgi?id=667432
2012-02-27 11:31:10 -05:00
this.actor.accessible_role = Atk.Role.MENU;
userMenu: belatedly rename CSS to match the new filename https://bugzilla.gnome.org/show_bug.cgi?id=651299
2011-09-07 12:23:27 -04:00
let box = new St.BoxLayout({ name: 'panelUserMenu' });
panel: allow padding around panel buttons to shrink for narrow screens (eg, portrait orientation) https://bugzilla.gnome.org/show_bug.cgi?id=651299
2011-06-09 11:50:24 -04:00
this.actor.add_actor(box);
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
Replace GdmUser with AccountsService The GdmUser copy+paste code has been superseded by AccountsService, so kill the former and use the latter. https://bugzilla.gnome.org/show_bug.cgi?id=650893
2011-05-10 10:13:05 -04:00
this._userManager = AccountsService.UserManager.get_default();
statusMenu: port to new gdmuser api https://bugzilla.gnome.org/show_bug.cgi?id=631888
2010-10-07 18:22:20 -04:00
Replace GdmUser with AccountsService The GdmUser copy+paste code has been superseded by AccountsService, so kill the former and use the latter. https://bugzilla.gnome.org/show_bug.cgi?id=650893
2011-05-10 10:13:05 -04:00
this._user = this._userManager.get_user(GLib.get_user_name());
[GnomeSession] split out the gnome-session presence D-Bus interface Split this out of js/ui/statusMenu.js https://bugzilla.gnome.org/show_bug.cgi?id=608667
2010-04-29 13:13:20 -04:00
this._presence = new GnomeSession.Presence();
Status Menu: use Gnome Session DBus for shutdown and logout Around 2.91.90, gnome-session-save was renamed to gnome-session-quit. This commit restores compatibility with the older gnome-session, for those testing under GNOME 2.32 or below, by calling the DBus methods directly. https://bugzilla.gnome.org/show_bug.cgi?id=644591
2011-03-12 15:34:01 -05:00
this._session = new GnomeSession.SessionManager();
user-status: Hide "Power off" option if shutdown is disabled Due to lockdown settings or Polkit policy, shutdown may not be available. If this is the case, the "Power off ..." action should be hidden from the user status menu. https://bugzilla.gnome.org/show_bug.cgi?id=652038
2011-06-03 18:10:55 -04:00
this._haveShutdown = true;
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
user-menu: Add missing semi-colons
2011-10-20 16:54:41 -04:00
this._accountMgr = Tp.AccountManager.dup();
statusMenu: change IM presence when needed (#617207)
2011-02-28 11:03:35 -05:00
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
this._upClient = new UPowerGlib.Client();
screensaver: factor out a ScreenSaverProxy helper class This class will be shared between StatusMenu and the upcoming AutomountManager classes. https://bugzilla.gnome.org/show_bug.cgi?id=653520
2011-07-12 11:42:33 -04:00
this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
this._iconBox = new St.Bin();
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
box.add(this._iconBox, { y_align: St.Align.MIDDLE, y_fill: false });
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
Merge St.TextureCache and Shell.TextureCache Brute force merge these two by essentially replacing St.TextureCache with a (renamed) Shell.TextureCache. One function was added for convenience, namely "st_texture_cache_load_file_simple". St.TextureCache had a function to load a texture from a filename, and it returned NULL on error but only half the callers actually checked this. This function is better. https://bugzilla.gnome.org/show_bug.cgi?id=607500
2010-02-09 12:42:07 -05:00
let textureCache = St.TextureCache.get_default();
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._offlineIcon = new St.Icon({ icon_name: 'user-offline',
style_class: 'popup-menu-icon' });
this._availableIcon = new St.Icon({ icon_name: 'user-available',
style_class: 'popup-menu-icon' });
this._busyIcon = new St.Icon({ icon_name: 'user-busy',
style_class: 'popup-menu-icon' });
this._invisibleIcon = new St.Icon({ icon_name: 'user-invisible',
style_class: 'popup-menu-icon' });
this._awayIcon = new St.Icon({ icon_name: 'user-away',
style_class: 'popup-menu-icon' });
this._idleIcon = new St.Icon({ icon_name: 'user-idle',
style_class: 'popup-menu-icon' });
user-menu: Minor style fix Use cameCase for properties/methods defined in JS and under_score for properties/methods imported from C.
2011-10-20 16:44:09 -04:00
this._accountMgr.connect('most-available-presence-changed',
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
Lang.bind(this, this._updatePresenceIcon));
user-menu: Minor style fix Use cameCase for properties/methods defined in JS and under_score for properties/methods imported from C.
2011-10-20 16:44:09 -04:00
this._accountMgr.prepare_async(null, Lang.bind(this,
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
function(mgr) {
let [presence, s, msg] = mgr.get_most_available_presence();
this._updatePresenceIcon(mgr, presence, s, msg);
}));
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
statusMenu: port to new gdmuser api https://bugzilla.gnome.org/show_bug.cgi?id=631888
2010-10-07 18:22:20 -04:00
this._name = new St.Label();
a11y: Setting a name/label_actor for several items on the panel https://bugzilla.gnome.org/show_bug.cgi?id=667376
2012-01-05 13:00:06 -05:00
this.actor.label_actor = this._name;
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
box.add(this._name, { y_align: St.Align.MIDDLE, y_fill: false });
statusMenu: port to new gdmuser api https://bugzilla.gnome.org/show_bug.cgi?id=631888
2010-10-07 18:22:20 -04:00
this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUserName));
this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUserName));
userMenu: Update the user information if the object is already loaded Any time we get a cached user object from the AccountsService, it will already be loaded. https://bugzilla.gnome.org/show_bug.cgi?id=658605
2011-09-08 17:11:45 -04:00
this._updateUserName();
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
this._createSubMenu();
user-menu: Fix fallout from GDBus port - replace some left-over references to GnomeSession.Presence.setStatus() - the correct replacement for GnomeSession.Presence.getStatus() is *not* GnomeSession.Presence.connectSignal('StatusChanged')
2011-11-11 16:41:47 -05:00
this._updateSwitch(this._presence.status);
this._presence.connectSignal('StatusChanged', Lang.bind(this, function (proxy, senderName, [status]) {
this._updateSwitch(status);
}));
Replace GdmUser with AccountsService The GdmUser copy+paste code has been superseded by AccountsService, so kill the former and use the latter. https://bugzilla.gnome.org/show_bug.cgi?id=650893
2011-05-10 10:13:05 -04:00
this._userManager.connect('notify::is-loaded',
Lang.bind(this, this._updateSwitchUser));
user-menu: Hide "Switch user" on single user machines Ignoring remote logins, the "Switch user" action is meaningless for single user setups. Do not show it in that case. https://bugzilla.gnome.org/show_bug.cgi?id=657011
2011-10-18 14:57:24 -04:00
this._userManager.connect('notify::has-multiple-users',
Lang.bind(this, this._updateSwitchUser));
Replace GdmUser with AccountsService The GdmUser copy+paste code has been superseded by AccountsService, so kill the former and use the latter. https://bugzilla.gnome.org/show_bug.cgi?id=650893
2011-05-10 10:13:05 -04:00
this._userManager.connect('user-added',
Lang.bind(this, this._updateSwitchUser));
this._userManager.connect('user-removed',
Lang.bind(this, this._updateSwitchUser));
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
Lang.bind(this, this._updateSwitchUser));
this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
Lang.bind(this, this._updateLogout));
user-status: Hide "Power off" option if shutdown is disabled Due to lockdown settings or Polkit policy, shutdown may not be available. If this is the case, the "Power off ..." action should be hidden from the user status menu. https://bugzilla.gnome.org/show_bug.cgi?id=652038
2011-06-03 18:10:55 -04:00
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
Lang.bind(this, this._updateLockScreen));
this._updateSwitchUser();
this._updateLogout();
this._updateLockScreen();
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
user-status: Hide "Power off" option if shutdown is disabled Due to lockdown settings or Polkit policy, shutdown may not be available. If this is the case, the "Power off ..." action should be hidden from the user status menu. https://bugzilla.gnome.org/show_bug.cgi?id=652038
2011-06-03 18:10:55 -04:00
// Whether shutdown is available or not depends on both lockdown
// settings (disable-log-out) and Polkit policy - the latter doesn't
// notify, so we update the menu item each time the menu opens or
// the lockdown setting changes, which should be close enough.
this.menu.connect('open-state-changed', Lang.bind(this,
function(menu, open) {
if (open)
this._updateHaveShutdown();
}));
this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
Lang.bind(this, this._updateHaveShutdown));
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
this._upClient.connect('notify::can-suspend', Lang.bind(this, this._updateSuspendOrPowerOff));
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
_onDestroy: function() {
statusMenu: port to new gdmuser api https://bugzilla.gnome.org/show_bug.cgi?id=631888
2010-10-07 18:22:20 -04:00
this._user.disconnect(this._userLoadedId);
this._user.disconnect(this._userChangedId);
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
_updateUserName: function() {
statusMenu: port to new gdmuser api https://bugzilla.gnome.org/show_bug.cgi?id=631888
2010-10-07 18:22:20 -04:00
if (this._user.is_loaded)
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._name.set_text(this._user.get_real_name());
statusMenu: port to new gdmuser api https://bugzilla.gnome.org/show_bug.cgi?id=631888
2010-10-07 18:22:20 -04:00
else
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
this._name.set_text("");
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
_updateSwitchUser: function() {
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
user-menu: Hide "Switch user" on single user machines Ignoring remote logins, the "Switch user" action is meaningless for single user setups. Do not show it in that case. https://bugzilla.gnome.org/show_bug.cgi?id=657011
2011-10-18 14:57:24 -04:00
if (allowSwitch &&
this._userManager.can_switch() &&
this._userManager.has_multiple_users)
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this._loginScreenItem.actor.show();
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
else
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this._loginScreenItem.actor.hide();
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
},
_updateLogout: function() {
let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
Refactor show()/hide() sequences We seem to have a lot of code that does something along the lines of: if (condition) actor.show(); else actor.hide(); ClutterActor already has such a thing for exactly this purpose: the 'visible' property. Use it instead of the mess above. https://bugzilla.gnome.org/show_bug.cgi?id=672272
2012-03-16 18:53:14 -04:00
this._logoutItem.actor.visible = allowLogout;
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
},
_updateLockScreen: function() {
let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
Refactor show()/hide() sequences We seem to have a lot of code that does something along the lines of: if (condition) actor.show(); else actor.hide(); ClutterActor already has such a thing for exactly this purpose: the 'visible' property. Use it instead of the mess above. https://bugzilla.gnome.org/show_bug.cgi?id=672272
2012-03-16 18:53:14 -04:00
this._logoutItem.actor.visible = allowLockScreen;
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
user-status: Hide "Power off" option if shutdown is disabled Due to lockdown settings or Polkit policy, shutdown may not be available. If this is the case, the "Power off ..." action should be hidden from the user status menu. https://bugzilla.gnome.org/show_bug.cgi?id=652038
2011-06-03 18:10:55 -04:00
_updateHaveShutdown: function() {
this._session.CanShutdownRemote(Lang.bind(this,
function(result, error) {
if (!error) {
this._haveShutdown = result;
this._updateSuspendOrPowerOff();
}
}));
},
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
_updateSuspendOrPowerOff: function() {
this._haveSuspend = this._upClient.get_can_suspend();
if (!this._suspendOrPowerOffItem)
return;
Refactor show()/hide() sequences We seem to have a lot of code that does something along the lines of: if (condition) actor.show(); else actor.hide(); ClutterActor already has such a thing for exactly this purpose: the 'visible' property. Use it instead of the mess above. https://bugzilla.gnome.org/show_bug.cgi?id=672272
2012-03-16 18:53:14 -04:00
this._suspendOrPowerOffItem.actor.visible = this._haveShutdown || this._haveSuspend;
user-status: Hide "Power off" option if shutdown is disabled Due to lockdown settings or Polkit policy, shutdown may not be available. If this is the case, the "Power off ..." action should be hidden from the user status menu. https://bugzilla.gnome.org/show_bug.cgi?id=652038
2011-06-03 18:10:55 -04:00
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
// If we can't suspend show Power Off... instead
// and disable the alt key
if (!this._haveSuspend) {
this._suspendOrPowerOffItem.updateText(_("Power Off..."), null);
user-status: Hide "Power off" option if shutdown is disabled Due to lockdown settings or Polkit policy, shutdown may not be available. If this is the case, the "Power off ..." action should be hidden from the user status menu. https://bugzilla.gnome.org/show_bug.cgi?id=652038
2011-06-03 18:10:55 -04:00
} else if (!this._haveShutdown) {
this._suspendOrPowerOffItem.updateText(_("Suspend"), null);
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
} else {
Add gettext macro to message to enable translation.
2011-03-24 14:11:20 -04:00
this._suspendOrPowerOffItem.updateText(_("Suspend"), _("Power Off..."));
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
}
},
screensaver, gnomesession: port to GDBus based bindings Port org.gnome.ScreenSaver and org.gnome.SessionManager glue code to use GDBus, and move /org/gnome/Shell/EndSessionDialog to the GDBus connection, so it is backed by the org.gnome.Shell name. https://bugzilla.gnome.org/show_bug.cgi?id=648651
2011-08-16 08:24:39 -04:00
_updateSwitch: function(status) {
user-menu: Rename "Do Not Disturb" to "Notifications" At least for the foreseeable future, the gnome-session desktop presence won't be used for anything but suppressing (non-urgent) notifications. To clarify this behavior, rename the "Do Not Disturb" switch to "Notifications" (and adjust the switch logic accordingly). https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-04 12:39:37 -04:00
let active = status == GnomeSession.PresenceStatus.AVAILABLE;
this._notificationsSwitch.setToggleState(active);
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
},
_updatePresenceIcon: function(accountMgr, presence, status, message) {
if (presence == Tp.ConnectionPresenceType.AVAILABLE)
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
this._iconBox.child = this._availableIcon;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
else if (presence == Tp.ConnectionPresenceType.BUSY)
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
this._iconBox.child = this._busyIcon;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
else if (presence == Tp.ConnectionPresenceType.HIDDEN)
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
this._iconBox.child = this._invisibleIcon;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
else if (presence == Tp.ConnectionPresenceType.AWAY)
this._iconBox.child = this._awayIcon;
else if (presence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
this._iconBox.child = this._idleIcon;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
else
this._iconBox.child = this._offlineIcon;
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
},
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
_createSubMenu: function() {
let item;
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
item = new IMStatusChooserItem();
item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
this._statusChooser = item;
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
user-menu: Rename "Do Not Disturb" to "Notifications" At least for the foreseeable future, the gnome-session desktop presence won't be used for anything but suppressing (non-urgent) notifications. To clarify this behavior, rename the "Do Not Disturb" switch to "Notifications" (and adjust the switch logic accordingly). https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-04 12:39:37 -04:00
item = new PopupMenu.PopupSwitchMenuItem(_("Notifications"));
PopupSwitchMenuItem: allow toggling without closing the menu Similar to what Gtk does, now toggling with Space does not close the menu. https://bugzilla.gnome.org/show_bug.cgi?id=664416
2011-11-21 08:16:51 -05:00
item.connect('toggled', Lang.bind(this, this._updatePresenceStatus));
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
user-menu: Rename "Do Not Disturb" to "Notifications" At least for the foreseeable future, the gnome-session desktop presence won't be used for anything but suppressing (non-urgent) notifications. To clarify this behavior, rename the "Do Not Disturb" switch to "Notifications" (and adjust the switch logic accordingly). https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-04 12:39:37 -04:00
this._notificationsSwitch = item;
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
[popupMenu] split this out from panel.js We want to use this menu style in other places as well https://bugzilla.gnome.org/show_bug.cgi?id=619541
2010-05-20 11:18:46 -04:00
item = new PopupMenu.PopupSeparatorMenuItem();
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
item = new PopupMenu.PopupMenuItem(_("Online Accounts"));
item.connect('activate', Lang.bind(this, this._onOnlineAccountsActivate));
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
[statusMenu] Fix ellipsis in menu entries According to the HIG we should use ellipsis when: "Label the menu item with a trailing ellipsis ("...") only if the command requires further input from the user before it can be performed. Do not add an ellipsis to items that only present a confirmation dialog (such as Delete), or that do not require further input (such as Properties, Preferences or About)" So adjust the use of ellipsis to match that. Pointed out by Michael Monreal.
2010-11-22 15:19:37 -05:00
item = new PopupMenu.PopupMenuItem(_("System Settings"));
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
[popupMenu] split this out from panel.js We want to use this menu style in other places as well https://bugzilla.gnome.org/show_bug.cgi?id=619541
2010-05-20 11:18:46 -04:00
item = new PopupMenu.PopupSeparatorMenuItem();
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
PopupImageMenuItem: always show icon, on the right, not the left In the new mockups, the user menu icons are on the right, not the left. Also, get rid of the idea of optional icons; the design doesn't have icons on those items, and there probably aren't going to be symbolic versions of some of those icons anyway. So if the caller specifies PopupImageMenuItem, then always show an icon, and just use regular PopupMenuItems for the items that don't have icons in the current design. https://bugzilla.gnome.org/show_bug.cgi?id=631193
2010-10-19 11:59:23 -04:00
item = new PopupMenu.PopupMenuItem(_("Lock Screen"));
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
this._lockScreenItem = item;
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
PopupImageMenuItem: always show icon, on the right, not the left In the new mockups, the user menu icons are on the right, not the left. Also, get rid of the idea of optional icons; the design doesn't have icons on those items, and there probably aren't going to be symbolic versions of some of those icons anyway. So if the caller specifies PopupImageMenuItem, then always show an icon, and just use regular PopupMenuItems for the items that don't have icons in the current design. https://bugzilla.gnome.org/show_bug.cgi?id=631193
2010-10-19 11:59:23 -04:00
item = new PopupMenu.PopupMenuItem(_("Switch User"));
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
this._loginScreenItem = item;
PopupImageMenuItem: always show icon, on the right, not the left In the new mockups, the user menu icons are on the right, not the left. Also, get rid of the idea of optional icons; the design doesn't have icons on those items, and there probably aren't going to be symbolic versions of some of those icons anyway. So if the caller specifies PopupImageMenuItem, then always show an icon, and just use regular PopupMenuItems for the items that don't have icons in the current design. https://bugzilla.gnome.org/show_bug.cgi?id=631193
2010-10-19 11:59:23 -04:00
item = new PopupMenu.PopupMenuItem(_("Log Out..."));
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
user-status: Honor lockdown settings Right now, the user status menu always contains actions to logout and lock the screen, and the user switching action only depends on the technical availability of the functionality. All those items should honor the lockdown settings defined in org.gnome.desktop.lockdown. https://bugzilla.gnome.org/show_bug.cgi?id=645335
2011-03-21 08:51:46 -04:00
this._logoutItem = item;
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
statusMenu: fix menu items to match latest mockups Rename a few, and add Suspend and Restart, although currently they do the same thing as Shut Down (ie, they bring up a dialog that lets you do any of those three). This will be fixed later when we have the in-shell modal dialogs for these features. https://bugzilla.gnome.org/show_bug.cgi?id=631193
2010-10-19 12:04:58 -04:00
item = new PopupMenu.PopupSeparatorMenuItem();
this.menu.addMenuItem(item);
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"),
_("Power Off..."));
[panel] Port user status menu to panel menu https://bugzilla.gnome.org/show_bug.cgi?id=613804
2010-05-10 09:46:54 -04:00
this.menu.addMenuItem(item);
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
this._suspendOrPowerOffItem = item;
item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
this._updateSuspendOrPowerOff();
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
_updatePresenceStatus: function(item, event) {
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
let status;
if (item.state) {
status = GnomeSession.PresenceStatus.AVAILABLE;
} else {
status = GnomeSession.PresenceStatus.BUSY;
user-menu: Minor style fix Use cameCase for properties/methods defined in JS and under_score for properties/methods imported from C.
2011-10-20 16:44:09 -04:00
let [presence, s, msg] = this._accountMgr.get_most_available_presence();
user-menu: Explain why disabling notifications changes IM status While the current behavior of setting the IM status to "busy" while notifications are disabled makes sense, as incoming messages are very likely to be missed, it is not immediately obvious. Display a transient notification to explain the behavior to the user. https://bugzilla.gnome.org/show_bug.cgi?id=652718
2011-09-09 12:49:04 -04:00
let newPresence = this._statusChooser.getIMPresenceForSessionStatus(status);
if (newPresence != presence &&
newPresence == Tp.ConnectionPresenceType.BUSY)
Main.notify(_("Your chat status will be set to busy"),
_("Notifications are now disabled, including chat messages. Your online status has been adjusted to let others know that you might not see their messages."));
}
user-menu: Fix fallout from GDBus port - replace some left-over references to GnomeSession.Presence.setStatus() - the correct replacement for GnomeSession.Presence.getStatus() is *not* GnomeSession.Presence.connectSignal('StatusChanged')
2011-11-11 16:41:47 -05:00
this._presence.status = status;
Add Presence items to the status menu https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 16:34:13 -05:00
},
statusMenu: fix menu items to match latest mockups Rename a few, and add Suspend and Restart, although currently they do the same thing as Shut Down (ie, they bring up a dialog that lets you do any of those three). This will be fixed later when we have the in-shell modal dialogs for these features. https://bugzilla.gnome.org/show_bug.cgi?id=631193
2010-10-19 12:04:58 -04:00
_onMyAccountActivate: function() {
Exit the overview when activating most items In all the cases where we activate GNOME 2 UI, e.g. the shutdown dialog, pop out of the overview. Otherwise, it's fairly broken since you won't see the result of your action. https://bugzilla.gnome.org/show_bug.cgi?id=620525
2010-06-03 19:21:08 -04:00
Main.overview.hide();
Kill off ShellAppInfo, move into ShellApp This dramatically thins down and sanitizes the application code. The ShellAppSystem changes in a number of ways: * Preferences are special cased more explicitly; they aren't apps, they're shortcuts for an app), and we don't have many of them, so don't need e.g. the optimizations in ShellAppSystem for searching. * get_app() changes to lookup_app() and returns null if an app isn't found. The semantics where it tried to find the .desktop file if we didn't know about it were just broken; I am pretty sure no caller needs this, and if they do we'll fix them. * ShellAppSystem maintains two indexes on apps (by desktop file id and by GMenuTreeEntry), but is no longer in the business of dealing with GMenuTree as far as hierarchy and categories go. That is moved up into js/ui/appDisplay.js. Actually, it flattens both apps and settings. Also, ShellWindowTracker is now the sole reference-owner for window-backed apps. We still do the weird "window:0x1234beef" id for these apps, but a reference is not stored in ShellAppSystem. The js/ui/appDisplay.js code is rewritten, and sucks a lot less. Variable names are clearer: _apps -> _appIcons _filterApp -> _visibleApps _filters -> _categoryBox Similarly for function names. We no longer call (for every app) a recursive lookup in GMenuTree to see if it's in a particular section on every category switch; it's all cached. NOTE - this intentionally reverts the incremental loading code from commit 7813c5b93f6bcde8c4beae286e82bfc472b2b656. It's fast enough here without that. https://bugzilla.gnome.org/show_bug.cgi?id=648149
2011-04-21 13:35:01 -04:00
let app = Shell.AppSystem.get_default().lookup_setting('gnome-user-accounts-panel.desktop');
ShellApp: Change activation API Since almost all of the callers of shell_app_activate were using the default workspace (by passing -1), remove that parameter. Add a new shell_app_activate_full() API which takes a workspace as well as a timestamp; previously we might have been ignoring event timestamps from elsewhere. https://bugzilla.gnome.org/show_bug.cgi?id=648149
2011-08-11 05:35:23 -04:00
app.activate();
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
user-menu: Implement new mockups The current user status menu allow to set the session status, which also influences the IM status when signed in with mission-control. However, the way it is presented to the user makes it hard to figure out how the statuses interact or that there are two distinct status in the first place. Therefore, use a separate control for each status, and update the overall look to match gnome-contacts. https://bugzilla.gnome.org/show_bug.cgi?id=652837
2011-07-28 10:59:03 -04:00
_onOnlineAccountsActivate: function() {
Main.overview.hide();
let app = Shell.AppSystem.get_default().lookup_setting('gnome-online-accounts-panel.desktop');
app.activate(-1);
},
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
_onPreferencesActivate: function() {
Exit the overview when activating most items In all the cases where we activate GNOME 2 UI, e.g. the shutdown dialog, pop out of the overview. Otherwise, it's fairly broken since you won't see the result of your action. https://bugzilla.gnome.org/show_bug.cgi?id=620525
2010-06-03 19:21:08 -04:00
Main.overview.hide();
Kill off ShellAppInfo, move into ShellApp This dramatically thins down and sanitizes the application code. The ShellAppSystem changes in a number of ways: * Preferences are special cased more explicitly; they aren't apps, they're shortcuts for an app), and we don't have many of them, so don't need e.g. the optimizations in ShellAppSystem for searching. * get_app() changes to lookup_app() and returns null if an app isn't found. The semantics where it tried to find the .desktop file if we didn't know about it were just broken; I am pretty sure no caller needs this, and if they do we'll fix them. * ShellAppSystem maintains two indexes on apps (by desktop file id and by GMenuTreeEntry), but is no longer in the business of dealing with GMenuTree as far as hierarchy and categories go. That is moved up into js/ui/appDisplay.js. Actually, it flattens both apps and settings. Also, ShellWindowTracker is now the sole reference-owner for window-backed apps. We still do the weird "window:0x1234beef" id for these apps, but a reference is not stored in ShellAppSystem. The js/ui/appDisplay.js code is rewritten, and sucks a lot less. Variable names are clearer: _apps -> _appIcons _filterApp -> _visibleApps _filters -> _categoryBox Similarly for function names. We no longer call (for every app) a recursive lookup in GMenuTree to see if it's in a particular section on every category switch; it's all cached. NOTE - this intentionally reverts the incremental loading code from commit 7813c5b93f6bcde8c4beae286e82bfc472b2b656. It's fast enough here without that. https://bugzilla.gnome.org/show_bug.cgi?id=648149
2011-04-21 13:35:01 -04:00
let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
ShellApp: Change activation API Since almost all of the callers of shell_app_activate were using the default workspace (by passing -1), remove that parameter. Add a new shell_app_activate_full() API which takes a workspace as well as a timestamp; previously we might have been ignoring event timestamps from elsewhere. https://bugzilla.gnome.org/show_bug.cgi?id=648149
2011-08-11 05:35:23 -04:00
app.activate();
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
_onLockScreenActivate: function() {
Exit the overview when activating most items In all the cases where we activate GNOME 2 UI, e.g. the shutdown dialog, pop out of the overview. Otherwise, it's fairly broken since you won't see the result of your action. https://bugzilla.gnome.org/show_bug.cgi?id=620525
2010-06-03 19:21:08 -04:00
Main.overview.hide();
statusMenu: Use the screensaver's dbus interface directly Use the dbus interface instead of calling gnome-screensaver-command. https://bugzilla.gnome.org/show_bug.cgi?id=643357
2011-03-09 15:59:26 -05:00
this._screenSaverProxy.LockRemote();
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
_onLoginScreenActivate: function() {
Exit the overview when activating most items In all the cases where we activate GNOME 2 UI, e.g. the shutdown dialog, pop out of the overview. Otherwise, it's fairly broken since you won't see the result of your action. https://bugzilla.gnome.org/show_bug.cgi?id=620525
2010-06-03 19:21:08 -04:00
Main.overview.hide();
statusMenu.js: Ensure screensaver is locked before switching users Somewhat similar to (see bug 637540), we need to lock the screensaver *before* asking GDM to switch. https://bugzilla.gnome.org/show_bug.cgi?id=654565
2011-07-05 09:29:05 -04:00
// Ensure we only move to GDM after the screensaver has activated; in some
// OS configurations, the X server may block event processing on VT switch
statusMenu: Fix typo in user switching commit
2011-07-13 17:43:23 -04:00
this._screenSaverProxy.SetActiveRemote(true, Lang.bind(this, function() {
Replace GdmUser with AccountsService The GdmUser copy+paste code has been superseded by AccountsService, so kill the former and use the latter. https://bugzilla.gnome.org/show_bug.cgi?id=650893
2011-05-10 10:13:05 -04:00
this._userManager.goto_login_session();
statusMenu.js: Ensure screensaver is locked before switching users Somewhat similar to (see bug 637540), we need to lock the screensaver *before* asking GDM to switch. https://bugzilla.gnome.org/show_bug.cgi?id=654565
2011-07-05 09:29:05 -04:00
}));
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
_onQuitSessionActivate: function() {
Exit the overview when activating most items In all the cases where we activate GNOME 2 UI, e.g. the shutdown dialog, pop out of the overview. Otherwise, it's fairly broken since you won't see the result of your action. https://bugzilla.gnome.org/show_bug.cgi?id=620525
2010-06-03 19:21:08 -04:00
Main.overview.hide();
Status Menu: use Gnome Session DBus for shutdown and logout Around 2.91.90, gnome-session-save was renamed to gnome-session-quit. This commit restores compatibility with the older gnome-session, for those testing under GNOME 2.32 or below, by calling the DBus methods directly. https://bugzilla.gnome.org/show_bug.cgi?id=644591
2011-03-12 15:34:01 -05:00
this._session.LogoutRemote(0);
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
},
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
_onSuspendOrPowerOffActivate: function() {
Exit the overview when activating most items In all the cases where we activate GNOME 2 UI, e.g. the shutdown dialog, pop out of the overview. Otherwise, it's fairly broken since you won't see the result of your action. https://bugzilla.gnome.org/show_bug.cgi?id=620525
2010-06-03 19:21:08 -04:00
Main.overview.hide();
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
if (this._haveSuspend &&
this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
userMenu: Fix comment
2012-02-26 15:23:01 -05:00
// Ensure we only suspend after locking the screen
userMenu: Fix LockRemote call Commit 37cbfe29 replace the SetActiveRemote with a LockRemote call but didn't change the paramters, so remove the incorrect boolean parameter. https://bugzilla.gnome.org/show_bug.cgi?id=670820
2012-02-28 10:41:34 -05:00
this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
statusMenu: Lock screen before suspending We need to lock the screen before suspending the system to prevent unauthorized access to the system / account. https://bugzilla.gnome.org/show_bug.cgi?id=643357
2011-03-09 15:59:50 -05:00
this._upClient.suspend_sync(null);
}));
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
} else {
Status Menu: use Gnome Session DBus for shutdown and logout Around 2.91.90, gnome-session-save was renamed to gnome-session-quit. This commit restores compatibility with the older gnome-session, for those testing under GNOME 2.32 or below, by calling the DBus methods directly. https://bugzilla.gnome.org/show_bug.cgi?id=644591
2011-03-12 15:34:01 -05:00
this._session.ShutdownRemote();
statusMenu: change how we stop the system This updates the way we stop the system to somewhat match the designs here: https://live.gnome.org/GnomeShell/Design/Whiteboards/SystemStopRestart We suspend by default unless suspend is unavailable, and offer shutdown as a choice by hold down the alt key. https://bugzilla.gnome.org/show_bug.cgi?id=636680
2011-02-04 18:37:54 -05:00
}
Port ShellStatusMenu to javascript https://bugzilla.gnome.org/show_bug.cgi?id=601458
2009-11-10 12:13:58 -05:00
}
Port PanelMenu to new class framework Second patch in the class framework, now it's the turn of PanelMenu (buttons, menus and status indicators). https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 09:38:48 -05:00
});
Reference in New Issue Copy Permalink