mitch/gnome-shell-teatime
1
0
Fork 0
mirror of https://github.com/oleid/gnome-shell-teatime.git synced 2022-04-29 18:53:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45 from kgorbi/master

Browse Source 
Add "Stop Timer" menu option.
This commit is contained in:
oleid 2018-03-18 21:35:46 +01:00 committed by GitHub
commit e5a5e61398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/extension.js
View File

@ -138,23 +138,29 @@ const PopupTeaMenuItem = new Lang.Class({
this.tealabel = new St.Label({ this.tealabel = new St.Label({
text: sTeaname text: sTeaname
}); });
this.timelabel = new St.Label({ if (nBrewtime != 0) {
text: Utils.formatTime(nBrewtime) this.timelabel = new St.Label({
}); text: Utils.formatTime(nBrewtime)
});
}
if (this.actor instanceof St.BoxLayout) { if (this.actor instanceof St.BoxLayout) {
// will be used for gnome-shell 3.10 and possibly above where this.actor is BoxLayout // will be used for gnome-shell 3.10 and possibly above where this.actor is BoxLayout
this.actor.add(this.tealabel, { this.actor.add(this.tealabel, {
expand: true expand: true
}); });
this.actor.add(this.timelabel); if (nBrewtime != 0) {
this.actor.add(this.timelabel);
}
} else { } else {
this.addActor(this.tealabel, { this.addActor(this.tealabel, {
expand: true expand: true
}); });
this.addActor(this.timelabel, { if (nBrewtime != 0) {
expand: false this.addActor(this.timelabel, {
}); expand: false
});
}
} }
} }
}); });
@ -232,6 +238,11 @@ const TeaTime = new Lang.Class({
// fill with new teas // fill with new teas
let list = this._settings.get_value(this.config_keys.steep_times).unpack(); let list = this._settings.get_value(this.config_keys.steep_times).unpack();
let menuItem = new PopupTeaMenuItem("Stop Timer", 0);
menuItem.connect('activate', Lang.bind(this, function () {
this._stopCountdown();
}));
this.teaItemCont.addMenuItem(menuItem);
for (let teaname in list) { for (let teaname in list) {
let time = list[teaname].get_uint32(); let time = list[teaname].get_uint32();
@ -329,6 +340,13 @@ const TeaTime = new Lang.Class({
if (this._idleTimeout != null) Mainloop.source_remove(this._idleTimeout); if (this._idleTimeout != null) Mainloop.source_remove(this._idleTimeout);
this._idleTimeout = Mainloop.timeout_add_seconds(dt, Lang.bind(this, this._doCountdown)); this._idleTimeout = Mainloop.timeout_add_seconds(dt, Lang.bind(this, this._doCountdown));
}, },
_stopCountdown: function () {
if (this._idleTimeout != null) Mainloop.source_remove(this._idleTimeout);
this.actor.remove_actor(this._bGraphicalCountdown ?
this._graphicalTimer : this._textualTimer);
this.actor.add_actor(this._logo);
this._idleTimeout = null;
},
_getRemainingSec: function () { _getRemainingSec: function () {
let a = new Date(); let a = new Date();
return (this._stopTime.getTime() - a.getTime()) * 1e-3; return (this._stopTime.getTime() - a.getTime()) * 1e-3;
@ -345,9 +363,7 @@ const TeaTime = new Lang.Class({
if (remainingTime <= 0) { if (remainingTime <= 0) {
// count down finished, switch display again // count down finished, switch display again
this.actor.remove_actor(this._bGraphicalCountdown ? this._stopCountdown();
this._graphicalTimer : this._textualTimer);
this.actor.add_actor(this._logo);
this._playSound(); this._playSound();
if (!Utils.isGnome34() && this._settings.get_boolean(this.config_keys.fullscreen_notification)) { if (!Utils.isGnome34() && this._settings.get_boolean(this.config_keys.fullscreen_notification)) {
@ -357,8 +373,6 @@ const TeaTime = new Lang.Class({
this._showNotification(_("Your tea is ready!"), this._showNotification(_("Your tea is ready!"),
_("Drink it, while it is hot!")); _("Drink it, while it is hot!"));
} }
this._idleTimeout = null;
return false; return false;
} else { } else {
this._updateTimerDisplay(remainingTime); this._updateTimerDisplay(remainingTime);