brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sessionMode: Add showCalendarEvents property

Browse Source 
Add a sessionMode.showCalendarEvents property, which determines
whether the calendar menu should contain an events section or not.

https://bugzilla.gnome.org/show_bug.cgi?id=676156
This commit is contained in:
Florian Müllner 2012-05-18 00:32:04 +02:00
parent 6bee51ed33
commit ba92cfa064
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/dateMenu.js
View File

@ -45,9 +45,7 @@ const DateMenuButton = new Lang.Class({
Name: 'DateMenuButton', Name: 'DateMenuButton',
Extends: PanelMenu.Button, Extends: PanelMenu.Button,
_init: function(params) { _init: function() {
params = Params.parse(params, { showEvents: true });
let item; let item;
let hbox; let hbox;
let vbox; let vbox;
@ -79,7 +77,7 @@ const DateMenuButton = new Lang.Class({
this._date.style_class = 'datemenu-date-label'; this._date.style_class = 'datemenu-date-label';
vbox.add(this._date); vbox.add(this._date);
if (params.showEvents) { if (Main.sessionMode.showCalendarEvents) {
this._eventSource = new Calendar.DBusEventSource(); this._eventSource = new Calendar.DBusEventSource();
this._eventList = new Calendar.EventsList(this._eventSource); this._eventList = new Calendar.EventsList(this._eventSource);
} else { } else {
@ -110,7 +108,7 @@ const DateMenuButton = new Lang.Class({
item.actor.reparent(vbox); item.actor.reparent(vbox);
} }
if (params.showEvents) { if (Main.sessionMode.showCalendarEvents) {
// Add vertical separator // Add vertical separator
item = new St.DrawingArea({ style_class: 'calendar-vertical-separator', item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',

5
js/ui/panel.js
View File

@ -978,10 +978,7 @@ const Panel = new Lang.Class({
} }
/* center */ /* center */
if (Main.sessionMode.sessionType == Shell.SessionType.USER) this._dateMenu = new DateMenu.DateMenuButton();
this._dateMenu = new DateMenu.DateMenuButton({ showEvents: true });
else
this._dateMenu = new DateMenu.DateMenuButton({ showEvents: false });
this._centerBox.add(this._dateMenu.actor, { y_fill: true }); this._centerBox.add(this._dateMenu.actor, { y_fill: true });
this._menus.addMenu(this._dateMenu.menu); this._menus.addMenu(this._dateMenu.menu);

2
js/ui/sessionMode.js
View File

@ -10,10 +10,12 @@ const DEFAULT_MODE = 'user';
const _modes = { const _modes = {
'gdm': { hasOverview: false, 'gdm': { hasOverview: false,
hasAppMenu: false, hasAppMenu: false,
showCalendarEvents: false,
sessionType: Shell.SessionType.GDM }, sessionType: Shell.SessionType.GDM },
'user': { hasOverview: true, 'user': { hasOverview: true,
hasAppMenu: true, hasAppMenu: true,
showCalendarEvents: true,
sessionType: Shell.SessionType.USER } sessionType: Shell.SessionType.USER }
}; };