Hello community, here is the log from the commit of package gnome-pomodoro for openSUSE:Factory checked in at 2019-05-03 22:43:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-pomodoro (Old) and /work/SRC/openSUSE:Factory/.gnome-pomodoro.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-pomodoro" Fri May 3 22:43:44 2019 rev:13 rq:693279 version:0.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-pomodoro/gnome-pomodoro.changes 2018-12-04 20:55:27.460777501 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-pomodoro.new.5148/gnome-pomodoro.changes 2019-05-03 22:43:45.435409558 +0200 @@ -1,0 +2,11 @@ +Mon Apr 8 08:33:03 UTC 2019 - mvetter@suse.com + +- Update to version 0.15.1: + + Minor code cleanups to support ES6 syntax + + Support for GNOME Shell 3.32 + + Fix for build with vala 0.44.1 + + Updated German translation + + Fix for handle error recreating existing folder + + Minor code cleanups + +------------------------------------------------------------------- Old: ---- 0.14.0.tar.gz New: ---- 0.15.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-pomodoro.spec ++++++ --- /var/tmp/diff_new_pack.OvdiuL/_old 2019-05-03 22:43:47.143413154 +0200 +++ /var/tmp/diff_new_pack.OvdiuL/_new 2019-05-03 22:43:47.143413154 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-pomodoro # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global __requires_exclude typelib\\(Meta\\) Name: gnome-pomodoro -Version: 0.14.0 +Version: 0.15.1 Release: 0 Summary: A time management utility for GNOME License: GPL-3.0-or-later ++++++ 0.14.0.tar.gz -> 0.15.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/NEWS new/gnome-pomodoro-0.15.1/NEWS --- old/gnome-pomodoro-0.14.0/NEWS 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/NEWS 2019-04-07 06:52:57.000000000 +0200 @@ -1,3 +1,17 @@ +2019-04-07 Arun Mahapatra <pratikarun@gmail.com> + Release version 0.15.1: + + * Minor code cleanups + +2019-04-07 Arun Mahapatra <pratikarun@gmail.com> + Release version 0.15.0: + + * Minor code cleanups to support ES6 syntax + * Support for GNOME Shell 3.32 (thanks @demokritos) + * Fix for build with vala 0.44.1 (thanks @snizovtsev) + * Updated German translation (thanks @c7hm4r) + * Fix for handle error recreating existing folder (thanks @Rj7) + 2018-11-24 Kamil Prusko <kamilprusko@gmail.com> Release version 0.14.0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/configure.ac new/gnome-pomodoro-0.15.1/configure.ac --- old/gnome-pomodoro-0.14.0/configure.ac 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/configure.ac 2019-04-07 06:52:57.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.69]) AC_INIT([gnome-pomodoro], - [0.14.0], + [0.15.1], [https://github.com/codito/gnome-pomodoro/issues], [gnome-pomodoro], [http://gnomepomodoro.org]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/lib/about-dialog.vala new/gnome-pomodoro-0.15.1/lib/about-dialog.vala --- old/gnome-pomodoro-0.14.0/lib/about-dialog.vala 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/lib/about-dialog.vala 2019-04-07 06:52:57.000000000 +0200 @@ -39,7 +39,7 @@ "Kamil Prusko <kamilprusko@gmail.com>" }; this.translator_credits = _("translator-credits"); - this.copyright = "Copyright \xc2\xa9 2011-2018 Arun Mahapatra, Kamil Prusko"; + this.copyright = "Copyright \xc2\xa9 2011-2019 Arun Mahapatra, Kamil Prusko"; this.license_type = Gtk.License.GPL_3_0; this.destroy_with_parent = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/lib/application.vala new/gnome-pomodoro-0.15.1/lib/application.vala --- old/gnome-pomodoro-0.14.0/lib/application.vala 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/lib/application.vala 2019-04-07 06:52:57.000000000 +0200 @@ -66,7 +66,7 @@ FAILURE = 1 } - private struct Options + private class Options { public static bool no_default_window = false; public static bool preferences = false; @@ -146,7 +146,7 @@ public unowned Gtk.Window get_last_focused_window () { - unowned List<weak Gtk.Window> windows = this.get_windows (); + unowned List<Gtk.Window> windows = this.get_windows (); return windows != null ? windows.first ().data @@ -284,7 +284,12 @@ var adapter = new Gom.Adapter (); try { - file.get_parent ().make_directory_with_parents (); + try { + file.get_parent ().make_directory_with_parents (); + } + catch (GLib.Error error) { + GLib.debug ("Failed to create directory: %s", error.message); + } /* Open database handle */ adapter.open_sync (file.get_uri ()); @@ -298,7 +303,7 @@ // var object_types = new GLib.List<GLib.Type> (); // object_types.prepend (typeof (Pomodoro.Entry)); // object_types.prepend (typeof (Pomodoro.AggregatedEntry)); -// +// // repository.automatic_migrate_sync (Pomodoro.Application.REPOSITORY_VERSION, // (owned) object_types); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/plugins/gnome/extension/dialogs.js new/gnome-pomodoro-0.15.1/plugins/gnome/extension/dialogs.js --- old/gnome-pomodoro-0.14.0/plugins/gnome/extension/dialogs.js 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/plugins/gnome/extension/dialogs.js 2019-04-07 06:52:57.000000000 +0200 @@ -162,14 +162,12 @@ }); -var BlurredLightbox = new Lang.Class({ - Name: 'PomodoroBlurredLightbox', - Extends: Lightbox.Lightbox, +var BlurredLightbox = class extends Lightbox.Lightbox { - _init(container, params) { + constructor(container, params) { params.radialEffect = false; - this.parent(container, params); + super(container, params); if (Clutter.feature_available(Clutter.FeatureFlags.SHADERS_GLSL)) { // TODO: Try consolidate these effects into one @@ -192,7 +190,7 @@ } this.actor.add_style_class_name('extension-pomodoro-lightbox'); - }, + } show(fadeInTime) { fadeInTime = fadeInTime || 0; @@ -225,7 +223,7 @@ } this.actor.show(); - }, + } hide(fadeOutTime) { fadeOutTime = fadeOutTime || 0; @@ -257,7 +255,7 @@ }); } } -}); +}; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/plugins/gnome/extension/indicator.js new/gnome-pomodoro-0.15.1/plugins/gnome/extension/indicator.js --- old/gnome-pomodoro-0.14.0/plugins/gnome/extension/indicator.js 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/plugins/gnome/extension/indicator.js 2019-04-07 06:52:57.000000000 +0200 @@ -63,12 +63,10 @@ }; -var IndicatorMenu = new Lang.Class({ - Name: 'PomodoroIndicatorMenu', - Extends: PopupMenu.PopupMenu, +var IndicatorMenu = class extends PopupMenu.PopupMenu { - _init(indicator) { - this.parent(indicator.actor, St.Align.START, St.Side.TOP); + constructor(indicator) { + super(indicator.actor, St.Align.START, St.Side.TOP); this._isPaused = null; this._timerState = null; @@ -81,7 +79,7 @@ this.indicator = indicator; this._populate(); - }, + } _createActionButton(iconName, accessibleName) { let button = new St.Button({ reactive: true, @@ -91,7 +89,7 @@ style_class: 'system-menu-action extension-pomodoro-indicator-menu-action' }); button.child = new St.Icon({ icon_name: iconName }); return button; - }, + } _onTimerClicked() { this.close(); @@ -100,19 +98,19 @@ Extension.extension.dialog.open(true); Extension.extension.dialog.pushModal(); } - }, + } _onStartClicked() { this.indicator.timer.start(); this.close(); - }, + } _onStopClicked() { this.indicator.timer.stop(); this.close(); - }, + } _onPauseClicked() { if (!this.indicator.timer.isPaused ()) { @@ -123,7 +121,7 @@ this.close(); } - }, + } _populate() { let toggleItem = new PopupMenu.PopupMenuItem(_("Pomodoro Timer"), @@ -182,7 +180,7 @@ this.addAction(_("Preferences"), this._activatePreferences.bind(this)); this.addAction(_("Stats"), this._activateStats.bind(this)); this.addAction(_("Quit"), this._activateQuit.bind(this)); - }, + } addStateMenuItem(name, label) { if (!this._stateItems) { @@ -198,7 +196,7 @@ this._stateItems[name] = menuItem; return menuItem; - }, + } _onActorMapped(actor) { if (actor.mapped && this._timerUpdateId == 0) { @@ -210,7 +208,7 @@ this.indicator.timer.disconnect(this._timerUpdateId); this._timerUpdateId = 0; } - }, + } _onTimerUpdate() { let timer = this.indicator.timer; @@ -253,7 +251,7 @@ } this.timerLabel.set_text(this._formatTime(remaining)); - }, + } _formatTime(remaining) { if (remaining < 0.0) { @@ -264,27 +262,27 @@ let seconds = Math.floor(remaining % 60); return '%02d:%02d'.format(minutes, seconds); - }, + } _activateStats() { let timestamp = global.get_current_time(); this.indicator.timer.showMainWindow('stats', timestamp); - }, + } _activatePreferences() { let timestamp = global.get_current_time(); this.indicator.timer.showPreferences(timestamp); - }, + } _activateQuit() { this.indicator.timer.quit(); - }, + } _activateState(stateName) { this.indicator.timer.setState(stateName); - }, + } destroy() { if (this._timerUpdateId) { @@ -299,15 +297,17 @@ this.indicator = null; - this.parent(); + super.destroy(); } -}); +}; -var TextIndicator = new Lang.Class({ - Name: 'PomodoroTextIndicator', +var TextIndicator = GObject.registerClass( +class PomodoroTextIndicator extends GObject.Object { _init(timer) { + super._init(); + this._initialized = false; this._state = Timer.State.NULL; this._minHPadding = 0; @@ -318,7 +318,7 @@ this.timer = timer; - this.actor = new Shell.GenericContainer({ reactive: true }); + this.actor = new St.Widget({ reactive: true }); this.actor._delegate = this; this.label = new St.Label({ style_class: 'system-status-label', @@ -335,9 +335,6 @@ }); this.actor.add_child(this.label); - this.actor.connect('get-preferred-width', this._getPreferredWidth.bind(this)); - this.actor.connect('get-preferred-height', this._getPreferredHeight.bind(this)); - this.actor.connect('allocate', this._allocate.bind(this)); this.actor.connect('style-changed', this._onStyleChanged.bind(this)); this.actor.connect('destroy', this._onActorDestroy.bind(this)); @@ -354,7 +351,7 @@ else { this.actor.set_opacity(FADE_OUT_OPACITY * 255); } - }, + } _onStyleChanged(actor) { let themeNode = actor.get_theme_node(); @@ -366,46 +363,12 @@ this._natHPadding = themeNode.get_length('-natural-hpadding'); this._digitWidth = metrics.get_approximate_digit_width() / Pango.SCALE; this._charWidth = metrics.get_approximate_char_width() / Pango.SCALE; - }, + } _getWidth() { return Math.ceil(4 * this._digitWidth + 0.5 * this._charWidth); - }, - - _getPreferredWidth(actor, forHeight, alloc) { - let child = actor.get_first_child(); - let minWidth = this._getWidth(); - let naturalWidth = minWidth; - - minWidth += 2 * this._minHPadding; - naturalWidth += 2 * this._natHPadding; - - if (child) { - [alloc.min_size, alloc.natural_size] = child.get_preferred_width(-1); - } - else { - alloc.min_size = alloc.natural_size = 0; - } - - if (alloc.min_size < minWidth) { - alloc.min_size = minWidth; - } - - if (alloc.natural_size < naturalWidth) { - alloc.natural_size = naturalWidth; - } - }, + } - _getPreferredHeight(actor, forWidth, alloc) { - let child = actor.get_first_child(); - - if (child) { - [alloc.min_size, alloc.natural_size] = child.get_preferred_height(-1); - } - else { - alloc.min_size = alloc.natural_size = 0; - } - }, _getText(state, remaining) { if (remaining < 0.0) { @@ -416,7 +379,7 @@ let seconds = Math.floor(remaining % 60); return '%02d:%02d'.format(minutes, seconds); - }, + } _onTimerUpdate() { let state = this.timer.getState(); @@ -440,33 +403,8 @@ } this.label.set_text(this._getText(state, remaining)); - }, - - _allocate(actor, box, flags) { - let child = actor.get_first_child(); - if (!child) - return; - - let [minWidth, natWidth] = child.get_preferred_width(-1); - - let availWidth = box.x2 - box.x1; - let availHeight = box.y2 - box.y1; - - let childBox = new Clutter.ActorBox(); - childBox.y1 = 0; - childBox.y2 = availHeight; - - if (natWidth + 2 * this._natHPadding <= availWidth) { - childBox.x1 = this._natHPadding; - childBox.x2 = availWidth - this._natHPadding; - } - else { - childBox.x1 = this._minHPadding; - childBox.x2 = availWidth - this._minHPadding; - } + } - child.allocate(childBox, flags); - }, _onActorDestroy() { if (this._onTimerUpdateId) { @@ -477,7 +415,7 @@ this.actor._delegate = null; this.emit('destroy'); - }, + } destroy() { this.actor.destroy(); @@ -486,20 +424,19 @@ Signals.addSignalMethods(TextIndicator.prototype); -var ShortTextIndicator = new Lang.Class({ - Name: 'PomodoroShortTextIndicator', - Extends: TextIndicator, +var ShortTextIndicator = GObject.registerClass( +class PomodoroShortTextIndicator extends TextIndicator { _init(timer) { - this.parent(timer); + super._init(timer); this.label.set_x_align(Clutter.ActorAlign.END); - }, + } _getWidth() { return Math.ceil(2 * this._digitWidth + 1 * this._charWidth); - }, + } _getText(state, remaining) { if (remaining < 0.0) { @@ -519,11 +456,12 @@ } }); - -var IconIndicator = new Lang.Class({ - Name: 'PomodoroIconIndicator', +var IconIndicator = GObject.registerClass( +class PomodoroIconIndicator extends GObject.Object { _init(timer) { + super._init(); + this._state = Timer.State.NULL; this._progress = 0.0; this._minHPadding = 0; @@ -536,7 +474,7 @@ this.timer = timer; - this.actor = new Shell.GenericContainer({ reactive: true }); + this.actor = new St.Widget({ reactive: true }); this.actor._delegate = this; this.icon = new St.DrawingArea({ style_class: 'system-status-icon' }); @@ -545,9 +483,6 @@ this.icon.connect('destroy', this._onIconDestroy.bind(this)); this.actor.add_child(this.icon); - this.actor.connect('get-preferred-width', this._getPreferredWidth.bind(this)); - this.actor.connect('get-preferred-height', this._getPreferredHeight.bind(this)); - this.actor.connect('allocate', this._allocate.bind(this)); this.actor.connect('style-changed', this._onStyleChanged.bind(this)); this.actor.connect('destroy', this._onActorDestroy.bind(this)); @@ -556,7 +491,7 @@ this._onTimerUpdate(); this._state = this.timer.getState(); - }, + } _onIconStyleChanged(actor) { let themeNode = actor.get_theme_node(); @@ -566,7 +501,7 @@ [actor.min_height, actor.natural_height] = themeNode.adjust_preferred_height(size, size); this._iconSize = size; - }, + } _onIconRepaint(area) { let cr = area.get_context(); @@ -612,14 +547,14 @@ } cr.$dispose(); - }, + } _onIconDestroy() { if (this._timerUpdateId) { this.timer.disconnect(this._timerUpdateId); this._timerUpdateId = 0; } - }, + } _onStyleChanged(actor) { let themeNode = actor.get_theme_node(); @@ -629,7 +564,7 @@ this._minVPadding = themeNode.get_length('-minimum-vpadding'); this._natVPadding = themeNode.get_length('-natural-vpadding'); - let color = themeNode.get_foreground_color() + let color = themeNode.get_foreground_color(); this._primaryColor = color; this._secondaryColor = new Clutter.Color({ red: color.red, @@ -637,35 +572,8 @@ blue: color.blue, alpha: color.alpha * FADE_OUT_OPACITY }); - }, - - _getPreferredWidth(actor, forHeight, alloc) { - let child = actor.get_first_child(); - - if (child) { - [alloc.min_size, alloc.natural_size] = child.get_preferred_width(-1); - } - else { - alloc.min_size = alloc.natural_size = 0; - } - - alloc.min_size += 2 * this._minHPadding; - alloc.natural_size += 2 * this._natHPadding; - }, - - _getPreferredHeight(actor, forWidth, alloc) { - let child = actor.get_first_child(); - - if (child) { - [alloc.min_size, alloc.natural_size] = child.get_preferred_height(-1); - } - else { - alloc.min_size = alloc.natural_size = 0; - } + } - alloc.min_size += 2 * this._minVPadding; - alloc.natural_size += 2 * this._natVPadding; - }, _onTimerUpdate() { let state = this.timer.getState(); @@ -676,34 +584,8 @@ this._progress = progress; this.icon.queue_repaint(); } - }, - - _allocate(actor, box, flags) { - let child = actor.get_first_child(); - if (!child) { - return; - } - - let availWidth = box.x2 - box.x1; - let availHeight = box.y2 - box.y1; - - let [minWidth, natWidth] = child.get_preferred_width(availHeight); - - let childBox = new Clutter.ActorBox(); - childBox.y1 = 0; - childBox.y2 = availHeight; - - if (natWidth + 2 * this._natHPadding <= availWidth) { - childBox.x1 = this._natHPadding; - childBox.x2 = availWidth - this._natHPadding; - } - else { - childBox.x1 = this._minHPadding; - childBox.x2 = availWidth - this._minHPadding; - } + } - child.allocate(childBox, flags); - }, _onActorDestroy() { if (this._timerUpdateId) { @@ -717,7 +599,7 @@ this.actor._delegate = null; this.emit('destroy'); - }, + } destroy() { this.actor.destroy(); @@ -726,12 +608,11 @@ Signals.addSignalMethods(IconIndicator.prototype); -var Indicator = new Lang.Class({ - Name: 'PomodoroIndicator', - Extends: PanelMenu.Button, +var Indicator = GObject.registerClass( +class PomodoroIndicator extends PanelMenu.Button { _init(timer, type) { - this.parent(St.Align.START, _("Pomodoro"), true); + super._init(St.Align.START, _("Pomodoro"), true); this.timer = timer; this.widget = null; @@ -745,6 +626,7 @@ this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); this._hbox.pack_start = true; + this._hbox.set_y_align(Clutter.ActorAlign.CENTER); this._hbox.add_child(this._arrow); this.actor.add_child(this._hbox); @@ -755,7 +637,7 @@ this._timerPausedId = this.timer.connect('paused', this._onTimerPaused.bind(this)); this._timerResumedId = this.timer.connect('resumed', this._onTimerResumed.bind(this)); - }, + } setType(type) { if (this.widget) { @@ -783,7 +665,7 @@ GObject.BindingFlags.SYNC_CREATE); this._hbox.add_child(this.widget.actor); - }, + } _onBlinked() { this._blinking = false; @@ -791,7 +673,7 @@ if (this.timer.isPaused()) { this._blink(); } - }, + } _blink() { if (!this._blinking) { @@ -837,11 +719,11 @@ }); } } - }, + } _onTimerPaused() { this._blink(); - }, + } _onTimerResumed() { if (this._blinking) { @@ -865,7 +747,7 @@ this._blinkTimeoutSource = 0; } } - }, + } _onActorDestroy() { Tweener.removeTweens(this._hbox); @@ -885,9 +767,9 @@ this.icon.destroy(); this.icon = null; } - }, + } destroy() { - this.parent(); + super.destroy(); } }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/plugins/gnome/extension/metadata.json.in new/gnome-pomodoro-0.15.1/plugins/gnome/extension/metadata.json.in --- old/gnome-pomodoro-0.14.0/plugins/gnome/extension/metadata.json.in 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/plugins/gnome/extension/metadata.json.in 2019-04-07 06:52:57.000000000 +0200 @@ -2,7 +2,7 @@ "uuid": "@EXTENSION_UUID@", "name": "Pomodoro", "description": "Desktop integration for Pomodoro application.", - "shell-version": ["3.30", "3.28", "3.26", "3.24", "3.22", "3.20", "3.18", "3.16"], + "shell-version": ["3.32", "3.30", "3.28", "3.26", "3.24", "3.22", "3.20", "3.18", "3.16"], "url": "@PACKAGE_URL@", "version": "@PACKAGE_VERSION@" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/plugins/gnome/extension/notifications.js new/gnome-pomodoro-0.15.1/plugins/gnome/extension/notifications.js --- old/gnome-pomodoro-0.14.0/plugins/gnome/extension/notifications.js 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/plugins/gnome/extension/notifications.js 2019-04-07 06:52:57.000000000 +0200 @@ -65,14 +65,14 @@ } -var Source = new Lang.Class({ - Name: 'PomodoroNotificationSource', - Extends: MessageTray.Source, +var Source = class extends MessageTray.Source { - ICON_NAME: 'gnome-pomodoro', + constructor() { + let icon_name = 'gnome-pomodoro'; - _init() { - this.parent(_("Pomodoro Timer"), this.ICON_NAME); + super(_("Pomodoro Timer"), icon_name); + + this.ICON_NAME = icon_name; this._idleId = 0; @@ -94,13 +94,13 @@ }); this._patch = patch; this._patch.apply(); - }, + } /* override parent method */ _createPolicy() { return new MessageTray.NotificationPolicy({ showInLockScreen: true, detailsInLockScreen: true }); - }, + } _lastNotificationRemoved() { this._idleId = Mainloop.idle_add(() => { @@ -112,7 +112,7 @@ }); GLib.Source.set_name_by_id(this._idleId, '[gnome-pomodoro] this._lastNotificationRemoved'); - }, + } /* override parent method */ _onNotificationDestroy(notification) { @@ -127,7 +127,7 @@ } this.countUpdated(); - }, + } destroyNotifications() { let notifications = this.notifications.slice(); @@ -135,10 +135,10 @@ notifications.forEach((notification) => { notification.destroy(); }); - }, + } destroy() { - this.parent(); + super.destroy(); if (this._patch) { this._patch.revert(); @@ -150,27 +150,25 @@ this._idleId = 0; } } -}); +}; -var Notification = new Lang.Class({ - Name: 'PomodoroNotification', - Extends: MessageTray.Notification, +var Notification = class extends MessageTray.Notification { - _init(title, description, params) { - this.parent(null, title, description, params); + constructor(title, description, params) { + super(null, title, description, params); this._restoreForFeedback = false; // We want notifications to be shown right after the action, // therefore urgency bump. this.setUrgency(MessageTray.Urgency.HIGH); - }, + } activate() { - this.parent(); + super.activate(); Main.panel.closeCalendar(); - }, + } show() { if (this.source && this.source.isPlaceholder) { @@ -201,21 +199,19 @@ Utils.logWarning('Called Notification.show() after destroy()'); } } -}); +}; -var PomodoroStartNotification = new Lang.Class({ - Name: 'PomodoroStartNotification', - Extends: Notification, +var PomodoroStartNotification = class extends Notification { /** * Notification pops up a little before Pomodoro starts and changes message once started. */ - _init(timer) { + constructor(timer) { let title = _("Pomodoro"); - this.parent(title, '', null); + super(title, '', null); this.setResident(true); this.setForFeedback(true); @@ -226,7 +222,7 @@ this._timerStateChangedId = this.timer.connect('state-changed', this._onTimerStateChanged.bind(this)); this._onTimerStateChanged(); - }, + } _onTimerStateChanged() { let title, @@ -267,7 +263,7 @@ this.emit('changed'); } - }, + } _getBodyText() { let remaining = Math.max(this.timer.getRemaining(), 0.0); @@ -279,7 +275,7 @@ "%d minutes remaining", minutes).format(minutes) : ngettext("%d second remaining", "%d seconds remaining", seconds).format(seconds); - }, + } /** * createBanner() is used only to display a notification popup. @@ -289,7 +285,7 @@ let banner, extendButton; - banner = this.parent(); + banner = super.createBanner(); banner.canClose = function() { return false; }; @@ -341,7 +337,7 @@ onTimerUpdate(); return banner; - }, + } destroy(reason) { if (this._timerStateChangedId != 0) { @@ -349,19 +345,17 @@ this._timerStateChangedId = 0; } - return this.parent(reason); + return super.destroy(reason); } -}); +}; -var PomodoroEndNotification = new Lang.Class({ - Name: 'PomodoroEndNotification', - Extends: Notification, +var PomodoroEndNotification = class extends Notification { - _init(timer) { + constructor(timer) { let title = ''; - this.parent(title, null, null); + super(title, null, null); this.setResident(true); this.setForFeedback(true); @@ -372,7 +366,7 @@ this._timerStateChangedId = this.timer.connect('state-changed', this._onTimerStateChanged.bind(this)); this._onTimerStateChanged(); - }, + } _onTimerStateChanged() { let title, @@ -412,7 +406,7 @@ this.emit('changed'); } - }, + } _getBodyText() { let remaining = Math.max(this.timer.getRemaining(), 0.0); @@ -424,10 +418,10 @@ "%d minutes remaining", minutes).format(minutes) : ngettext("%d second remaining", "%d seconds remaining", seconds).format(seconds); - }, + } createBanner() { - let banner = this.parent(); + let banner = super.createBanner(); banner.canClose = function() { return false; @@ -476,7 +470,7 @@ onTimerUpdate(); return banner; - }, + } destroy(reason) { if (this._timerStateChangedId != 0) { @@ -484,17 +478,15 @@ this._timerStateChangedId = 0; } - return this.parent(reason); + return super.destroy(reason); } -}); +}; -var ScreenShieldNotification = new Lang.Class({ - Name: 'PomodoroScreenShieldNotification', - Extends: Notification, +var ScreenShieldNotification = class extends Notification { - _init(timer) { - this.parent('', null, null); + constructor(timer) { + super('', null, null); this.timer = timer; this.source = getDefaultSource(); @@ -520,7 +512,7 @@ this._screenShieldPatch = patch; this._onTimerUpdate(); - }, + } _onTimerStateChanged() { let state = this.timer.getState(); @@ -531,7 +523,7 @@ if (this.source !== null) { this.source.setTitle(title ? title : ''); } - }, + } _onTimerElapsedChanged() { let remaining = Math.max(this.timer.getRemaining(), 0.0); @@ -547,7 +539,7 @@ "%d minutes remaining", minutes).format(minutes) : ngettext("%d second remaining", "%d seconds remaining", seconds).format(seconds); - }, + } _onTimerUpdate() { let timerState = this.timer.getState(), @@ -589,7 +581,7 @@ this._screenShieldPatch.revert(); } } - }, + } destroy(reason) { if (this._timerUpdateId != 0) { @@ -602,25 +594,23 @@ this._screenShieldPatch = null; } - return this.parent(reason); + return super.destroy(reason); } -}); +}; -var IssueNotification = new Lang.Class({ - Name: 'PomodoroIssueNotification', +var IssueNotification = class extends MessageTray.Notification { /* Use base class instead of PomodoroNotification, in case * issue is caused by our implementation. */ - Extends: MessageTray.Notification, - _init(message) { + constructor(message) { let source = getDefaultSource(); let title = _("Pomodoro Timer"); let url = Config.PACKAGE_BUGREPORT; - this.parent(source, title, message, { bannerMarkup: true }); + super(source, title, message, { bannerMarkup: true }); this.setTransient(true); this.setUrgency(MessageTray.Urgency.HIGH); @@ -629,7 +619,7 @@ Util.trySpawnCommandLine('xdg-open ' + GLib.shell_quote(url)); this.destroy(); }); - }, + } show() { if (!Main.messageTray.contains(this.source)) { @@ -638,15 +628,13 @@ this.source.notify(this); } -}); +}; -var TimerBanner = new Lang.Class({ - Name: 'PomodoroTimerNotificationBanner', - Extends: Calendar.NotificationMessage, +var TimerBanner = class extends Calendar.NotificationMessage { - _init(notification) { - this.parent(notification); + constructor(notification) { + super(notification); this.timer = notification.timer; @@ -669,19 +657,19 @@ this.connect('close', this._onClose.bind(this)); this.actor.connect('destroy', this._onActorDestroy.bind(this)); - }, + } /* override parent method */ canClose() { return false; - }, + } addButton(button, callback) { button.connect('clicked', callback); this._mediaControls.add_actor(button); return button; - }, + } addAction(label, callback) { let button = new St.Button({ style_class: 'extension-pomodoro-message-action', @@ -690,7 +678,7 @@ can_focus: true }); return this.addButton(button, callback); - }, + } _getBodyText() { let remaining = Math.max(this.timer.getRemaining(), 0.0); @@ -702,7 +690,7 @@ "%d minutes remaining", minutes).format(minutes) : ngettext("%d second remaining", "%d seconds remaining", seconds).format(seconds); - }, + } _onTimerStateChanged() { let state = this.timer.getState(); @@ -718,7 +706,7 @@ if (title && this.titleLabel && this.titleLabel.clutter_text) { this.setTitle(title); } - }, + } _onTimerElapsedChanged() { if (this.bodyLabel && this.bodyLabel.actor.clutter_text) { @@ -729,7 +717,7 @@ this.setBody(bodyText); } } - }, + } _onTimerUpdate() { let timerState = this.timer.getState(); @@ -745,20 +733,20 @@ if (this._timerState != Timer.State.NULL) { this._onTimerElapsedChanged(); } - }, + } /* override parent method */ _onUpdated(n, clear) { - }, + } _onClose() { if (this._timerUpdateId != 0) { this.timer.disconnect(this._timerUpdateId); this._timerUpdateId = 0; } - }, + } _onActorDestroy() { this._onClose(); } -}); +}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-pomodoro-0.14.0/po/de.po new/gnome-pomodoro-0.15.1/po/de.po --- old/gnome-pomodoro-0.14.0/po/de.po 2018-11-24 18:30:13.000000000 +0100 +++ new/gnome-pomodoro-0.15.1/po/de.po 2019-04-07 06:52:57.000000000 +0200 @@ -193,7 +193,7 @@ #: data/resources/screen-notification.ui:89 #: plugins/gnome/extension/dialogs.js:591 msgid "It's time to take a break" -msgstr "Es ist Zeit eine Pause einzulegen" +msgstr "Es ist Zeit, eine Pause einzulegen" #: data/resources/stats-view.ui:28 msgid "Nothing to see yet" @@ -561,11 +561,11 @@ #: plugins/sounds/sounds-plugin.vala:35 plugins/sounds/sounds-plugin.vala:403 msgid "Clock Ticking" -msgstr "Uhr ticken" +msgstr "Uhrticken" #: plugins/sounds/sounds-plugin.vala:36 plugins/sounds/sounds-plugin.vala:404 msgid "Timer Ticking" -msgstr "Stoppuhr ticken" +msgstr "Stoppuhrticken" #: plugins/sounds/sounds-plugin.vala:37 plugins/sounds/sounds-plugin.vala:405 msgid "Woodland Birds"