From a113f7a859f117c400a34c544204ca307208ff82 Mon Sep 17 00:00:00 2001 From: Olaf Leidinger Date: Sun, 3 Nov 2013 22:30:50 +0100 Subject: [PATCH] Hopefully make it work for gnome-shell 3.8 and older --- src/extension.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/extension.js b/src/extension.js index e377dd3..2feace5 100644 --- a/src/extension.js +++ b/src/extension.js @@ -119,10 +119,16 @@ const PopupTeaMenuItem = new Lang.Class({ _init: function (sTeaname, nBrewtime, params) { this.parent(params); - this.tealabel = new St.Label({ text: sTeaname }); - this.timelabel = new St.Label({ text: Utils.formatTime(nBrewtime) }); - this.actor.add(this.tealabel, { expand: true }); - this.actor.add(this.timelabel); + if (this.actor instanceof St.BoxLayout) { + // will be used for gnome-shell 3.10 and possibly above + this.tealabel = new St.Label({ text: sTeaname }); + this.timelabel = new St.Label({ text: Utils.formatTime(nBrewtime) }); + this.actor.add(this.tealabel, { expand: true }); + this.actor.add(this.timelabel); + } else { + this.tealabel = new St.Label({ text: sTeaname + "\t\t" + Utils.formatTime(nBrewtime) }); + this.actor.add(this.tealabel, { expand: true }); + } } }); @@ -164,12 +170,10 @@ const TeaTime = new Lang.Class({ this.teaItemCont = new PopupMenu.PopupMenuSection(); /*******************/ - let head = new PopupMenu.PopupMenuSection(); - let settingsIcon = new St.Icon({ icon_name : 'gtk-preferences', icon_size: 15 }); - let item = new PopupMenu.PopupMenuItem(_("Show settings")); - - item.actor.set_pack_start(true); // pack the icon in front of the text label - item.actor.add(settingsIcon); + // maybe one day the PopupImageMenuItem works^^ + let head = new PopupMenu.PopupMenuSection(); + let item = new PopupMenu.PopupMenuItem(_("Show settings")); //, 'gtk-preferences'); +// item._icon.icon_size = 15; item.connect('activate', Lang.bind(this, this._showPreferences)); head.addMenuItem(item);