[gnome-shell] sessionMode: Add showCalendarEvents property
- From: Florian MÃllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] sessionMode: Add showCalendarEvents property
- Date: Tue, 22 May 2012 17:46:35 +0000 (UTC)
commit ba92cfa0643b639acdc623f7f337aa174556301b
Author: Florian MÃllner <fmuellner gnome org>
Date: Fri May 18 00:32:04 2012 +0200
sessionMode: Add showCalendarEvents property
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
js/ui/dateMenu.js | 8 +++-----
js/ui/panel.js | 5 +----
js/ui/sessionMode.js | 2 ++
3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 616e45a..656ac0e 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -45,9 +45,7 @@ const DateMenuButton = new Lang.Class({
Name: 'DateMenuButton',
Extends: PanelMenu.Button,
- _init: function(params) {
- params = Params.parse(params, { showEvents: true });
-
+ _init: function() {
let item;
let hbox;
let vbox;
@@ -79,7 +77,7 @@ const DateMenuButton = new Lang.Class({
this._date.style_class = 'datemenu-date-label';
vbox.add(this._date);
- if (params.showEvents) {
+ if (Main.sessionMode.showCalendarEvents) {
this._eventSource = new Calendar.DBusEventSource();
this._eventList = new Calendar.EventsList(this._eventSource);
} else {
@@ -110,7 +108,7 @@ const DateMenuButton = new Lang.Class({
item.actor.reparent(vbox);
}
- if (params.showEvents) {
+ if (Main.sessionMode.showCalendarEvents) {
// Add vertical separator
item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
diff --git a/js/ui/panel.js b/js/ui/panel.js
index eb3a9e7..d712b9e 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -978,10 +978,7 @@ const Panel = new Lang.Class({
}
/* center */
- if (Main.sessionMode.sessionType == Shell.SessionType.USER)
- this._dateMenu = new DateMenu.DateMenuButton({ showEvents: true });
- else
- this._dateMenu = new DateMenu.DateMenuButton({ showEvents: false });
+ this._dateMenu = new DateMenu.DateMenuButton();
this._centerBox.add(this._dateMenu.actor, { y_fill: true });
this._menus.addMenu(this._dateMenu.menu);
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 3e05400..df25923 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -10,10 +10,12 @@ const DEFAULT_MODE = 'user';
const _modes = {
'gdm': { hasOverview: false,
hasAppMenu: false,
+ showCalendarEvents: false,
sessionType: Shell.SessionType.GDM },
'user': { hasOverview: true,
hasAppMenu: true,
+ showCalendarEvents: true,
sessionType: Shell.SessionType.USER }
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]