sessionMode: Add allowSettings property
Add a sessionMode.allowSettings property, which determines whether menus in the top bar should allow access to System Settings or not. https://bugzilla.gnome.org/show_bug.cgi?id=676156
This commit is contained in:
parent
ba92cfa064
commit
a3fcb8c284
@ -888,8 +888,7 @@ const PopupMenuBase = new Lang.Class({
|
||||
},
|
||||
|
||||
addSettingsAction: function(title, desktopFile) {
|
||||
// Don't allow user settings to get edited unless we're in a user session
|
||||
if (Main.sessionMode.sessionType != Shell.SessionType.USER)
|
||||
if (!Main.sessionMode.allowSettings)
|
||||
return null;
|
||||
|
||||
let menuItem = this.addAction(title, function() {
|
||||
|
@ -11,11 +11,13 @@ const _modes = {
|
||||
'gdm': { hasOverview: false,
|
||||
hasAppMenu: false,
|
||||
showCalendarEvents: false,
|
||||
allowSettings: false,
|
||||
sessionType: Shell.SessionType.GDM },
|
||||
|
||||
'user': { hasOverview: true,
|
||||
hasAppMenu: true,
|
||||
showCalendarEvents: true,
|
||||
allowSettings: true,
|
||||
sessionType: Shell.SessionType.USER }
|
||||
};
|
||||
|
||||
|
@ -63,7 +63,11 @@ const XKBIndicator = new Lang.Class({
|
||||
|
||||
this._syncConfig();
|
||||
|
||||
if (Main.sessionMode.sessionType == Shell.SessionType.USER) {
|
||||
// re-using "allowSettings" for the keyboard layout is a bit shady,
|
||||
// but at least for now it is used as "allow popping up windows
|
||||
// from shell menus"; we can always add a separate sessionMode
|
||||
// option if need arises.
|
||||
if (Main.sessionMode.allowSettings) {
|
||||
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
|
||||
this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
|
||||
Main.overview.hide();
|
||||
|
@ -624,6 +624,7 @@ const UserMenuButton = new Lang.Class({
|
||||
let item;
|
||||
|
||||
item = new IMStatusChooserItem();
|
||||
if (Main.sessionMode.allowSettings)
|
||||
item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
|
||||
this.menu.addMenuItem(item);
|
||||
this._statusChooser = item;
|
||||
@ -636,9 +637,11 @@ const UserMenuButton = new Lang.Class({
|
||||
item = new PopupMenu.PopupSeparatorMenuItem();
|
||||
this.menu.addMenuItem(item);
|
||||
|
||||
if (Main.sessionMode.allowSettings) {
|
||||
item = new PopupMenu.PopupMenuItem(_("System Settings"));
|
||||
item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
|
||||
this.menu.addMenuItem(item);
|
||||
}
|
||||
|
||||
item = new PopupMenu.PopupAlternatingMenuItem(_("Power Off"),
|
||||
_("Suspend"));
|
||||
|
Loading…
Reference in New Issue
Block a user