use new internal teapot icon

This commit is contained in:
Olaf Leidinger 2014-10-15 00:57:39 +02:00
parent e76814fbb7
commit 2bb0c6a768

View File

@ -20,7 +20,6 @@ const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu; const PopupMenu = imports.ui.popupMenu;
const Panel = imports.ui.panel; const Panel = imports.ui.panel;
const Gettext = imports.gettext; const Gettext = imports.gettext;
const ExtensionUtils = imports.misc.extensionUtils; const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension(); const Me = ExtensionUtils.getCurrentExtension();
@ -149,18 +148,8 @@ const TeaTime = new Lang.Class({
this._settings = Utils.getSettings(); this._settings = Utils.getSettings();
if ( typeof St.IconType == 'undefined' ) { this._logo = new Me.imports.icon.TeaPot(24);
// St.IconType was removed in May 2012 by commit c21b1e5fe00a99936f67d358a931f3083304ebc8
// but it's needed for Gnome 3.4
this._logo = new St.Icon({ icon_name: 'utilities-teatime',
style_class : 'system-status-icon',
icon_size: 20 });
} else {
this._logo = new St.Icon({ icon_name: 'utilities-teatime',
icon_type: St.IconType.FULLCOLOR,
style_class : 'system-status-icon',
icon_size: 20 });
}
// set timer widget // set timer widget
this._textualTimer = new St.Label({ text: "", this._textualTimer = new St.Label({ text: "",
x_align: Clutter.ActorAlign.END, x_align: Clutter.ActorAlign.END,
@ -173,6 +162,8 @@ const TeaTime = new Lang.Class({
this._graphicalTimer.connect('repaint', Lang.bind(this, this._drawTimer)); this._graphicalTimer.connect('repaint', Lang.bind(this, this._drawTimer));
this.actor.add_actor(this._logo); this.actor.add_actor(this._logo);
this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
this._idleTimeout = null; this._idleTimeout = null;
this._createMenu(); this._createMenu();
@ -394,6 +385,7 @@ const TeaTime = new Lang.Class({
blue: color.blue, blue: color.blue,
alpha: color.alpha*0.3 alpha: color.alpha*0.3
}); });
this._logo.setColor(this._primaryColor);
} }
}); });