[gnome-break-timer/dylanmccall/meson-build: 18/25] Remove trailing whitespace from all files
- From: Dylan McCall <dylanmccall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-break-timer/dylanmccall/meson-build: 18/25] Remove trailing whitespace from all files
- Date: Wed, 23 Jan 2019 04:04:31 +0000 (UTC)
commit aae1cd8d40e0d65dec83acd45d5104adc4c8bf7e
Author: Dylan McCall <dylan dylanmccall com>
Date: Wed Jan 9 23:38:04 2019 -0800
Remove trailing whitespace from all files
common/IBreakHelper.vala | 6 +--
common/ISessionStatus.vala | 6 +--
common/NaturalTime.vala | 22 +++++------
helper/BreakManager.vala | 22 +++++------
helper/HelperApplication.vala | 20 +++++-----
helper/ScreenOverlay.vala | 34 ++++++++---------
helper/SessionStatus.vala | 8 ++--
helper/UIManager.vala | 14 +++----
helper/activity-monitor/ActivityMonitor.vala | 18 ++++-----
helper/break/BreakController.vala | 24 ++++++------
helper/break/BreakType.vala | 8 ++--
helper/break/BreakView.vala | 8 ++--
helper/break/TimerBreakController.vala | 34 ++++++++---------
helper/break/TimerBreakStatusWidget.vala | 16 ++++----
helper/break/TimerBreakType.vala | 10 ++---
helper/break/TimerBreakView.vala | 16 ++++----
helper/main.vala | 6 +--
helper/microbreak/MicroBreakController.vala | 8 ++--
helper/microbreak/MicroBreakType.vala | 6 +--
helper/microbreak/MicroBreakView.vala | 6 +--
helper/restbreak/RestBreakController.vala | 6 +--
helper/restbreak/RestBreakType.vala | 6 +--
helper/restbreak/RestBreakView.vala | 10 ++---
helper/util/Countdown.vala | 44 +++++++++++-----------
helper/util/PausableTimeout.vala | 28 +++++++-------
helper/util/SimpleFocusManager.vala | 28 +++++++-------
helper/util/StatefulTimer.vala | 6 +--
helper/util/Util.vala | 6 +--
settings/BreakManager.vala | 12 +++---
settings/BreakSettingsDialog.vala | 6 +--
settings/BreakType.vala | 6 +--
settings/CircleCounter.vala | 6 +--
settings/MainWindow.vala | 6 +--
settings/MicroBreakType.vala | 6 +--
settings/OverlayArrow.vala | 6 +--
settings/RestBreakType.vala | 6 +--
settings/SettingsApplication.vala | 6 +--
settings/TimeChooser.vala | 6 +--
settings/TimerBreakType.vala | 6 +--
settings/main.vala | 6 +--
.../activity-monitor/activity-monitor_runner.vala | 6 +--
tests/activity-monitor/test_ActivityMonitor.vala | 6 +--
tests/breaks/breaks_runner.vala | 6 +--
tests/breaks/test_TimerBreakController.vala | 8 ++--
tests/common/common_runner.vala | 6 +--
tests/common/test_NaturalTime.vala | 6 +--
tests/helper-util/helper_util_runner.vala | 6 +--
tests/helper-util/test_Countdown.vala | 12 +++---
tests/helper-util/test_StatefulTimer.vala | 6 +--
tests/tests.vala | 10 ++---
50 files changed, 288 insertions(+), 288 deletions(-)
---
diff --git a/common/IBreakHelper.vala b/common/IBreakHelper.vala
index e664cdb..b007dbf 100644
--- a/common/IBreakHelper.vala
+++ b/common/IBreakHelper.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/common/ISessionStatus.vala b/common/ISessionStatus.vala
index 76de8e4..f34942f 100644
--- a/common/ISessionStatus.vala
+++ b/common/ISessionStatus.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/common/NaturalTime.vala b/common/NaturalTime.vala
index 1e47c89..d706072 100644
--- a/common/NaturalTime.vala
+++ b/common/NaturalTime.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -23,20 +23,20 @@ public class NaturalTime : Object {
private struct TimeUnit {
public int seconds;
public FormatTimeCb format_time;
-
+
public TimeUnit (int seconds, FormatTimeCb format_time) {
this.seconds = seconds;
this.format_time = format_time;
}
-
+
public string format_seconds (int seconds, out int output_value) {
output_value = seconds / this.seconds;
return this.format_time(output_value);
}
}
-
+
private TimeUnit[] units { get; private set; }
-
+
private NaturalTime () {
this.units = {
TimeUnit (1, (time) => {
@@ -60,7 +60,7 @@ public class NaturalTime : Object {
return _instance;
}
}
-
+
/**
* Get a natural label for the given time in seconds. Converts seconds
* to a unit that will represent the time as accurately as possible,
@@ -82,7 +82,7 @@ public class NaturalTime : Object {
}
return label_unit.format_seconds (seconds, out output_value);
}
-
+
/**
* Get a natural label for the given time in seconds. Converts seconds
* to a unit that will represent the time as cleanly as possible,
@@ -102,7 +102,7 @@ public class NaturalTime : Object {
}
return label_unit.format_seconds (seconds, out output_value);
}
-
+
/**
* Get a natural label for the given time in seconds, in an imprecise
* format intented for a countdown. Precision is unimportant, so this
@@ -116,7 +116,7 @@ public class NaturalTime : Object {
int seconds_softened = soften_seconds_for_countdown (seconds);
return get_simplest_label_for_seconds (seconds_softened, out output_value);
}
-
+
/**
* Get a natural label for the given time in seconds, in an imprecise
* format intented for a countdown. Precision is unimportant, so this
diff --git a/helper/BreakManager.vala b/helper/BreakManager.vala
index 37fef35..2745ef4 100644
--- a/helper/BreakManager.vala
+++ b/helper/BreakManager.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -26,7 +26,7 @@ public class BreakManager : Object {
private Settings settings;
public bool master_enabled { get; set; }
public string[] selected_break_ids { get; set; }
-
+
public BreakManager (UIManager ui_manager) {
this.ui_manager = ui_manager;
@@ -67,7 +67,7 @@ public class BreakManager : Object {
}
}
}
-
+
public void load_breaks (ActivityMonitor activity_monitor) {
this.add_break (new MicroBreakType (activity_monitor));
this.add_break (new RestBreakType (activity_monitor));
@@ -78,11 +78,11 @@ public class BreakManager : Object {
public Gee.Set<string> all_break_ids () {
return this.breaks.keys;
}
-
+
public Gee.Collection<BreakType> all_breaks () {
return this.breaks.values;
}
-
+
public BreakType? get_break_type_for_name (string name) {
return this.breaks.get (name);
}
@@ -103,7 +103,7 @@ public class BreakManager : Object {
[DBus (name = "org.gnome.BreakTimer")]
public class BreakHelperServer : Object, IBreakHelper {
private weak BreakManager break_manager;
-
+
public BreakHelperServer (BreakManager break_manager) {
this.break_manager = break_manager;
}
@@ -117,7 +117,7 @@ public class BreakHelperServer : Object, IBreakHelper {
}
return null;
}
-
+
public bool is_active () {
bool active = false;
foreach (BreakType break_type in this.break_manager.all_breaks ()) {
@@ -129,7 +129,7 @@ public class BreakHelperServer : Object, IBreakHelper {
public string[] get_break_ids () {
return this.break_manager.all_break_ids ().to_array ();
}
-
+
public string[] get_status_messages () {
var messages = new Gee.ArrayList<string> ();
foreach (BreakType break_type in break_manager.all_breaks ()) {
@@ -138,7 +138,7 @@ public class BreakHelperServer : Object, IBreakHelper {
}
return messages.to_array ();
}
-
+
public void activate_break (string break_name) {
BreakType? break_type = this.break_manager.get_break_type_for_name (break_name);
if (break_type != null) break_type.break_controller.activate ();
diff --git a/helper/HelperApplication.vala b/helper/HelperApplication.vala
index 4c53b7e..15f33a0 100644
--- a/helper/HelperApplication.vala
+++ b/helper/HelperApplication.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -21,7 +21,7 @@ public class HelperApplication : Gtk.Application {
const string app_id = Config.HELPER_DESKTOP_ID;
const string app_name = _("GNOME Break Timer");
const int DATA_VERSION = 0;
-
+
private static const string STYLE_DATA =
"""
@define-color bg_top rgba(218, 236, 237, 0.80);
@@ -64,7 +64,7 @@ public class HelperApplication : Gtk.Application {
flags: ApplicationFlags.FLAGS_NONE
);
Environment.set_application_name (app_name);
-
+
// Keep running for one minute after the last break is disabled
this.set_inactivity_timeout (60 * 1000);
@@ -80,23 +80,23 @@ public class HelperApplication : Gtk.Application {
base.startup ();
Notify.init (app_name);
-
+
/* set up custom gtk style for application */
Gdk.Screen screen = Gdk.Screen.get_default ();
Gtk.CssProvider style_provider = new Gtk.CssProvider ();
-
+
try {
style_provider.load_from_data (STYLE_DATA, -1);
} catch (Error error) {
GLib.warning ("Error loading style data: %s", error.message);
}
-
+
Gtk.StyleContext.add_provider_for_screen (
screen,
style_provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
);
-
+
this.session_status = new SessionStatus (this);
try {
@@ -105,7 +105,7 @@ public class HelperApplication : Gtk.Application {
GLib.error ("Failed to initialize activity monitor backend");
}
this.activity_monitor = new ActivityMonitor (session_status, activity_monitor_backend);
-
+
this.ui_manager = new UIManager (this, session_status, false);
this.break_manager = new BreakManager (ui_manager);
this.break_manager.load_breaks (activity_monitor);
diff --git a/helper/ScreenOverlay.vala b/helper/ScreenOverlay.vala
index 415a78c..22ee50a 100644
--- a/helper/ScreenOverlay.vala
+++ b/helper/ScreenOverlay.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40,10 +40,10 @@ public class ScreenOverlay : Gtk.Window {
private uint fade_timeout;
private delegate void FadeCompleteCb ();
-
+
public ScreenOverlay () {
Object (type: Gtk.WindowType.POPUP);
-
+
this.format = Format.FULL;
this.wrapper_grid = new Gtk.Grid ();
@@ -51,11 +51,11 @@ public class ScreenOverlay : Gtk.Window {
this.wrapper_grid.show ();
this.wrapper_grid.set_halign (Gtk.Align.CENTER);
this.wrapper_grid.set_valign (Gtk.Align.CENTER);
-
+
Gdk.Screen screen = this.get_screen ();
screen.composited_changed.connect (this.on_screen_composited_changed);
this.on_screen_composited_changed (screen);
-
+
Gtk.StyleContext style = this.get_style_context ();
style.add_class ("_screen-overlay");
@@ -73,7 +73,7 @@ public class ScreenOverlay : Gtk.Window {
}
this.set_visual (screen_visual);
}
-
+
private void on_realize () {
this.apply_format (this.format);
}
@@ -86,7 +86,7 @@ public class ScreenOverlay : Gtk.Window {
case Format.MINI:
this.input_shape_combine_region ( (Cairo.Region)null);
-
+
this.set_size_request (-1, -1);
this.resize (1, 1);
@@ -97,14 +97,14 @@ public class ScreenOverlay : Gtk.Window {
case Format.FULL:
/* empty input region to ignore any input */
this.input_shape_combine_region (new Cairo.Region ());
-
+
Gdk.Screen screen = this.get_screen ();
int monitor = screen.get_monitor_at_window (this.get_window ());
Gdk.Rectangle geom;
screen.get_monitor_geometry (monitor, out geom);
-
+
string? session = Environment.get_variable ("DESKTOP_SESSION");
-
+
if (session == "gnome-shell") {
/* make sure the overlay doesn't cause the top panel to hide */
// FIXME: position _properly_ around panel, using _NET_WORKAREA or a maximized toplevel
window
@@ -115,11 +115,11 @@ public class ScreenOverlay : Gtk.Window {
}
this.fade_in ();
-
+
break;
}
}
-
+
public void set_format (Format format) {
this.format = format;
if (this.get_realized ()) this.apply_format (format);
@@ -194,14 +194,14 @@ public class ScreenOverlay : Gtk.Window {
int start_x;
int start_y;
this.get_position (out start_x, out start_y);
-
+
int shake_count = 0;
double velocity_x = 1.5;
double velocity_y = 0;
-
+
double move_x = start_x;
double move_y = start_y;
-
+
Timeout.add (15, () => {
if (shake_count < 42) {
if (move_x - start_x > 6 || move_x - start_x < -6) {
diff --git a/helper/SessionStatus.vala b/helper/SessionStatus.vala
index d1cc5db..051b6d8 100644
--- a/helper/SessionStatus.vala
+++ b/helper/SessionStatus.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -58,7 +58,7 @@ public class SessionStatus : ISessionStatus, Object {
GLib.warning ("Error connecting to screensaver service: %s", error.message);
}
}
-
+
private void screensaver_disappeared () {
this.screensaver.active_changed.disconnect (this.screensaver_active_changed_cb);
this.screensaver = null;
diff --git a/helper/UIManager.vala b/helper/UIManager.vala
index a45d38b..ed5256f 100644
--- a/helper/UIManager.vala
+++ b/helper/UIManager.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -47,7 +47,7 @@ public class UIManager : SimpleFocusManager {
this.ui_manager.request_focus (this, this.focus_priority);
}
}
-
+
protected void release_ui_focus () {
this.ui_manager.release_focus (this);
}
@@ -151,7 +151,7 @@ public class UIManager : SimpleFocusManager {
private weak Gtk.Application application;
private ISessionStatus session_status;
-
+
public bool quiet_mode { get; set; default=false; }
public int64 quiet_mode_expire_time { get; set; }
@@ -167,7 +167,7 @@ public class UIManager : SimpleFocusManager {
private static string DESKTOP_ENTRY_BASENAME = Config.HELPER_DESKTOP_ID.slice (
0, Config.HELPER_DESKTOP_ID.last_index_of (".desktop")
);
-
+
public UIManager (Gtk.Application application, ISessionStatus session_status, bool with_overlay) {
this.application = application;
this.session_status = session_status;
@@ -175,7 +175,7 @@ public class UIManager : SimpleFocusManager {
if (with_overlay) {
this.screen_overlay = new ScreenOverlay ();
}
-
+
Settings settings = new Settings ("org.gnome.BreakTimer");
settings.bind ("quiet-mode", this, "quiet-mode", SettingsBindFlags.DEFAULT);
settings.bind ("quiet-mode-expire-time", this, "quiet-mode-expire-time", SettingsBindFlags.DEFAULT);
diff --git a/helper/activity-monitor/ActivityMonitor.vala b/helper/activity-monitor/ActivityMonitor.vala
index 3c38327..1b832ee 100644
--- a/helper/activity-monitor/ActivityMonitor.vala
+++ b/helper/activity-monitor/ActivityMonitor.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -57,21 +57,21 @@ public class ActivityMonitor : Object {
public signal void detected_idle (UserActivity activity);
public signal void detected_activity (UserActivity activity);
-
+
private PausableTimeout poll_activity_timeout;
private UserActivity last_activity;
private int64 last_active_timestamp;
private ISessionStatus session_status;
private ActivityMonitorBackend backend;
-
+
public ActivityMonitor (ISessionStatus session_status, ActivityMonitorBackend backend) {
this.session_status = session_status;
this.backend = backend;
this.poll_activity_timeout = new PausableTimeout (this.poll_activity_cb, 1);
session_status.unlocked.connect (this.unlocked_cb);
-
+
this.last_activity = UserActivity ();
}
@@ -123,7 +123,7 @@ public class ActivityMonitor : Object {
this.detected_idle (activity);
}
}
-
+
/**
* Determines user activity level since the last call to this function.
* This function is ugly and stateful, so it shouldn't be called from
@@ -178,7 +178,7 @@ public class ActivityMonitor : Object {
activity.time_correction = activity.idle_time - this.fuzzy_seconds;
}
*/
-
+
return activity;
}
}
@@ -213,7 +213,7 @@ public abstract class ActivityMonitorBackend : Object {
int64 now_monotonic = Util.get_monotonic_time_seconds ();
int64 real_time_delta = (int64) (now_real - this.last_real_time);
int64 monotonic_time_delta = (int64) (now_monotonic - this.last_monotonic_time).abs ();
-
+
if (this.last_real_time > 0 && this.last_monotonic_time > 0) {
if (real_time_delta > monotonic_time_delta) {
sleep_time = (int64) (real_time_delta - monotonic_time_delta);
diff --git a/helper/break/BreakController.vala b/helper/break/BreakController.vala
index 3f41e0d..f652517 100644
--- a/helper/break/BreakController.vala
+++ b/helper/break/BreakController.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -52,7 +52,7 @@ public abstract class BreakController : Object {
SKIPPED,
SATISFIED
}
-
+
/** The break has been enabled. It will monitor user activity and emit activated () or finished ()
signals until it is disabled. */
public signal void enabled ();
/** The break has been disabled. Its timers have been stopped and it will not do anything until it is
enabled again. */
@@ -60,9 +60,9 @@ public abstract class BreakController : Object {
/** The break is going to happen soon */
public signal void warned ();
- /** The break is no longer going to start soon */
+ /** The break is no longer going to start soon */
public signal void unwarned ();
-
+
/** The break has been activated and is now counting down aggressively until it is satisfied. */
public signal void activated ();
/** The break has been satisfied. This can happen at any time, including while the break is waiting or
after it has been activiated. */
@@ -72,7 +72,7 @@ public abstract class BreakController : Object {
public signal void active_changed ();
private int64? activate_timestamp { get; set; }
-
+
public BreakController () {
this.state = State.DISABLED;
this.activate_timestamp = null;
@@ -100,7 +100,7 @@ public abstract class BreakController : Object {
this.activate_timestamp = json_root.get_int_member ("activate_timestamp");
}
}
-
+
/**
* Set whether the break is enabled or disabled. If it is enabled,
* it will periodically update in the background, and if it is
@@ -119,14 +119,14 @@ public abstract class BreakController : Object {
this.disabled ();
}
}
-
+
/**
* @return True if the break is enabled and waiting to start automatically
*/
public bool is_enabled () {
return this.state != State.DISABLED;
}
-
+
/**
* @return True if the break has been activated, is in focus, and expects to be satisfied
*/
@@ -144,7 +144,7 @@ public abstract class BreakController : Object {
return 0;
}
}
-
+
/**
* Start a break. This is usually triggered automatically by the break
* controller itself, but it may be triggered externally as well.
@@ -158,7 +158,7 @@ public abstract class BreakController : Object {
this.activated ();
}
}
-
+
/**
* The break's requirements have been satisfied. Start counting from
* the beginning again.
diff --git a/helper/break/BreakType.vala b/helper/break/BreakType.vala
index 66d6d6f..3b0f544 100644
--- a/helper/break/BreakType.vala
+++ b/helper/break/BreakType.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -23,7 +23,7 @@ public abstract class BreakType : Object {
public BreakView break_view;
protected Settings settings;
-
+
public BreakType (string id, Settings settings) {
this.id = id;
this.settings = settings;
diff --git a/helper/break/BreakView.vala b/helper/break/BreakView.vala
index 3f2323e..d0516b1 100644
--- a/helper/break/BreakView.vala
+++ b/helper/break/BreakView.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -21,7 +21,7 @@ public abstract class BreakView : UIManager.UIFragment {
protected weak BreakController break_controller;
private int64 last_break_notification_time = 0;
-
+
public BreakView (BreakController break_controller, UIManager ui_manager) {
this.ui_manager = ui_manager;
this.break_controller = break_controller;
diff --git a/helper/break/TimerBreakController.vala b/helper/break/TimerBreakController.vala
index 7723b8f..78baf3c 100644
--- a/helper/break/TimerBreakController.vala
+++ b/helper/break/TimerBreakController.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -28,7 +28,7 @@ namespace BreakTimer.Helper {
public abstract class TimerBreakController : BreakController {
public int interval { get; set; }
public int duration { get; set; }
-
+
protected Countdown interval_countdown;
protected Countdown duration_countdown;
protected PausableTimeout countdowns_timeout;
@@ -37,11 +37,11 @@ public abstract class TimerBreakController : BreakController {
private StatefulTimer counting_timer = new StatefulTimer ();
private StatefulTimer delayed_timer = new StatefulTimer ();
-
+
public TimerBreakController (ActivityMonitor activity_monitor, int fuzzy_seconds = 0) {
base ();
this.fuzzy_seconds = fuzzy_seconds;
-
+
this.interval_countdown = new Countdown (this.interval);
this.duration_countdown = new Countdown (this.duration);
this.countdowns_timeout = new PausableTimeout (this.update_countdowns, 1);
@@ -57,10 +57,10 @@ public abstract class TimerBreakController : BreakController {
activity_monitor.detected_activity.connect (this.detected_activity_cb);
activity_monitor.detected_idle.connect (this.detected_idle_cb);
-
+
this.enabled.connect (this.enabled_cb);
this.disabled.connect (this.disabled_cb);
-
+
this.activated.connect (this.activated_cb);
this.finished.connect (this.finished_cb);
}
@@ -88,26 +88,26 @@ public abstract class TimerBreakController : BreakController {
this.counting_timer.deserialize (json_root.get_string_member ("counting_timer"));
this.delayed_timer.deserialize (json_root.get_string_member ("delayed_timer"));
}
-
+
private void enabled_cb () {
this.interval_countdown.continue ();
this.duration_countdown.pause ();
this.countdowns_timeout.start ();
}
-
+
private void disabled_cb () {
this.interval_countdown.pause ();
this.duration_countdown.pause ();
this.countdowns_timeout.stop ();
}
-
+
private void activated_cb () {
this.interval_countdown.pause ();
this.duration_countdown.continue ();
this.counting_timer.reset ();
this.delayed_timer.reset ();
}
-
+
private void finished_cb (BreakController.FinishedReason reason) {
if (reason > BreakController.FinishedReason.DISABLED) {
this.interval_countdown.reset ();
@@ -116,7 +116,7 @@ public abstract class TimerBreakController : BreakController {
this.delayed_timer.reset ();
}
}
-
+
bool is_warned;
private void warn () {
if (! is_warned) {
@@ -130,14 +130,14 @@ public abstract class TimerBreakController : BreakController {
this.unwarned ();
}
}
-
+
/**
* @return Time until the next scheduled break, in seconds.
*/
public int starts_in () {
return this.interval_countdown.get_time_remaining ();
}
-
+
/**
* @return Idle time remaining until the break is satisfied.
*/
@@ -153,7 +153,7 @@ public abstract class TimerBreakController : BreakController {
this.skip ();
this.interval_countdown.continue_from (resume_after - this.interval);
}
-
+
/**
* @return Total length of the break, taking into account extra time that
* may have been added outside of the break's settings.
@@ -213,7 +213,7 @@ public abstract class TimerBreakController : BreakController {
} else {
lap_time = (int)this.delayed_timer.lap_time ();
}
-
+
this.duration_countdown.pause ();
if (this.state == State.WAITING) {
this.interval_countdown.continue ();
diff --git a/helper/break/TimerBreakStatusWidget.vala b/helper/break/TimerBreakStatusWidget.vala
index 333682b..4c2238d 100644
--- a/helper/break/TimerBreakStatusWidget.vala
+++ b/helper/break/TimerBreakStatusWidget.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -22,19 +22,19 @@ public class TimerBreakStatusWidget : Gtk.Grid, IScreenOverlayContent {
private Gtk.Label timer_label;
private Gtk.Label message_label;
-
+
public TimerBreakStatusWidget (TimerBreakController timer_break) {
Object ();
this.timer_break = timer_break;
-
+
this.set_column_spacing (12);
this.set_row_spacing (12);
-
+
this.timer_label = new Gtk.Label (null);
this.attach (this.timer_label, 0, 0, 1, 1);
Gtk.StyleContext timer_style = this.timer_label.get_style_context ();
timer_style.add_class ("_timer-label");
-
+
this.message_label = new Gtk.Label (null);
this.attach (this.message_label, 0, 1, 1, 1);
this.message_label.set_line_wrap (true);
@@ -64,7 +64,7 @@ public class TimerBreakStatusWidget : Gtk.Grid, IScreenOverlayContent {
// usually called when the widget is about to appear.
this.active_changed_cb ();
}
-
+
/** Set a reassuring message to accompany the break timer */
public void set_message (string message) {
this.message_label.set_text (message);
diff --git a/helper/break/TimerBreakType.vala b/helper/break/TimerBreakType.vala
index 01cff86..6f9b9f2 100644
--- a/helper/break/TimerBreakType.vala
+++ b/helper/break/TimerBreakType.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -53,12 +53,12 @@ public abstract class TimerBreakType : BreakType {
private class BreakHelper_TimerBreakServer : Object, IBreakHelper_TimerBreak {
private weak TimerBreakController break_controller;
private weak TimerBreakView break_view;
-
+
public BreakHelper_TimerBreakServer (TimerBreakController break_controller, TimerBreakView break_view) {
this.break_controller = break_controller;
this.break_view = break_view;
}
-
+
public TimerBreakStatus get_status () {
return TimerBreakStatus () {
is_enabled = this.break_controller.is_enabled (),
diff --git a/helper/break/TimerBreakView.vala b/helper/break/TimerBreakView.vala
index 198c4f6..db4dec9 100644
--- a/helper/break/TimerBreakView.vala
+++ b/helper/break/TimerBreakView.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -21,25 +21,25 @@ public abstract class TimerBreakView : BreakView {
protected TimerBreakController timer_break {
get { return (TimerBreakController)this.break_controller; }
}
-
+
public TimerBreakView (TimerBreakController timer_break, UIManager ui_manager) {
base (timer_break, ui_manager);
}
-
+
public override string get_status_message () {
string message;
-
+
int starts_in = this.timer_break.starts_in ();
int time_remaining = this.timer_break.get_time_remaining ();
string state_label = this.timer_break.state.to_string ();
-
+
message = "%s%s, I:%d, D:%d".printf (
this.has_ui_focus () ? ">" : "",
state_label,
starts_in,
time_remaining
);
-
+
return message;
}
diff --git a/helper/main.vala b/helper/main.vala
index d41719a..5c10de1 100644
--- a/helper/main.vala
+++ b/helper/main.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/helper/microbreak/MicroBreakController.vala b/helper/microbreak/MicroBreakController.vala
index e8b9b37..2beeeae 100644
--- a/helper/microbreak/MicroBreakController.vala
+++ b/helper/microbreak/MicroBreakController.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -29,7 +29,7 @@ public class MicroBreakController : TimerBreakController {
this.delayed.connect (this.delayed_cb);
}
-
+
private void delayed_cb (int lap_time, int total_time) {
this.duration_countdown.reset ();
}
diff --git a/helper/microbreak/MicroBreakType.vala b/helper/microbreak/MicroBreakType.vala
index e490c66..6999e04 100644
--- a/helper/microbreak/MicroBreakType.vala
+++ b/helper/microbreak/MicroBreakType.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/helper/microbreak/MicroBreakView.vala b/helper/microbreak/MicroBreakView.vala
index 5db9a67..3483608 100644
--- a/helper/microbreak/MicroBreakView.vala
+++ b/helper/microbreak/MicroBreakView.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/helper/restbreak/RestBreakController.vala b/helper/restbreak/RestBreakController.vala
index 25953e5..ff02176 100644
--- a/helper/restbreak/RestBreakController.vala
+++ b/helper/restbreak/RestBreakController.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/helper/restbreak/RestBreakType.vala b/helper/restbreak/RestBreakType.vala
index 6d7caed..028ac51 100644
--- a/helper/restbreak/RestBreakType.vala
+++ b/helper/restbreak/RestBreakType.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/helper/restbreak/RestBreakView.vala b/helper/restbreak/RestBreakView.vala
index 3bcf6e6..cd9046d 100644
--- a/helper/restbreak/RestBreakView.vala
+++ b/helper/restbreak/RestBreakView.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40,7 +40,7 @@ public class RestBreakView : TimerBreakView {
private int64 original_start_time = 0;
private bool was_skipped = false;
private bool proceeding_happily = false;
-
+
public RestBreakView (RestBreakController rest_break, UIManager ui_manager) {
base (rest_break, ui_manager);
this.focus_priority = FocusPriority.HIGH;
@@ -158,7 +158,7 @@ public class RestBreakView : TimerBreakView {
return false;
});
}
-
+
this.rest_break.counting.connect (this.counting_cb);
this.rest_break.delayed.connect (this.delayed_cb);
this.rest_break.current_duration_changed.connect (this.current_duration_changed_cb);
diff --git a/helper/util/Countdown.vala b/helper/util/Countdown.vala
index 1545ae7..3772bf3 100644
--- a/helper/util/Countdown.vala
+++ b/helper/util/Countdown.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -30,13 +30,13 @@ public class Countdown : Object {
COUNTING
}
private State state;
-
+
private int base_duration;
-
+
private int64 start_time;
private int stop_time_elapsed;
private int penalty;
-
+
public Countdown (int base_duration) {
this.base_duration = base_duration;
this.reset ();
@@ -86,7 +86,7 @@ public class Countdown : Object {
}
}
}
-
+
/**
* Stop the countdown and forget its current position.
* This is the same as calling Countdown.start (), except the countdown
@@ -97,7 +97,7 @@ public class Countdown : Object {
this.stop_time_elapsed = 0;
this.state = State.STOPPED;
}
-
+
/**
* Start counting down from the time set with set_base_duration.
* This is the same as calling Countdown.stop () followed by
@@ -106,7 +106,7 @@ public class Countdown : Object {
public void start () {
this.start_from (0);
}
-
+
/**
* Start counting with the time offset by the given number of seconds.
* Useful if the countdown should have started in the past.
@@ -118,7 +118,7 @@ public class Countdown : Object {
this.reset ();
this.continue_from (start_offset);
}
-
+
/**
* Pause the countdown, keeping its current position.
*/
@@ -126,7 +126,7 @@ public class Countdown : Object {
this.stop_time_elapsed = this.get_time_elapsed ();
this.state = State.PAUSED;
}
-
+
/**
* Start the countdown, continuing from the current position if
* possible.
@@ -136,7 +136,7 @@ public class Countdown : Object {
this.continue_from (0);
}
}
-
+
/**
* If not already counting, start counting with the time offset by the
* given number of seconds. This is like start_from, but it never resets
@@ -190,7 +190,7 @@ public class Countdown : Object {
public void set_penalty (int penalty) {
this.penalty = penalty;
}
-
+
/**
* @return the current time penalty for the countdown.
* @see set_penalty
@@ -198,7 +198,7 @@ public class Countdown : Object {
public int get_penalty () {
return this.penalty;
}
-
+
/**
* @return true if the countdown is currently counting, or false if it is
* either stopped or paused.
@@ -206,22 +206,22 @@ public class Countdown : Object {
public bool is_counting () {
return this.state == State.COUNTING;
}
-
+
/**
* Sets the base duration for the countdown. This is how long the
* countdown will last from when it is freshly started.
- *
+ *
* The base duration can be changed while the countdown is counting. The
* elapsed time will not change, while the remaining time will increase or
* decrease based on that elapsed time, the new base duration, and the
* current penalty.
- *
+ *
* @param base_duration the new base duration for the countdown
*/
public void set_base_duration (int base_duration) {
this.base_duration = base_duration;
}
-
+
/**
* Returns the current duration for the countdown. This is not the same as
* the base duration: it takes into account the penalty, as well. The
@@ -231,7 +231,7 @@ public class Countdown : Object {
public int get_duration () {
return int.max (0, this.base_duration + this.penalty);
}
-
+
/**
* Returns the amount of time that the countdown has been counting, if at
* all. If the countdown is paused, this will return the elapsed time from
@@ -240,15 +240,15 @@ public class Countdown : Object {
*/
public int get_time_elapsed () {
int time_elapsed = this.stop_time_elapsed;
-
+
if (this.state == State.COUNTING) {
int64 now = Util.get_real_time_seconds ();
time_elapsed += (int) (now - this.start_time);
}
-
+
return int.max (0, time_elapsed);
}
-
+
/**
* Returns the time remaining until the countdown will be finished, or 0
* if the countdown is already finished. If the countdown is not counting,
diff --git a/helper/util/PausableTimeout.vala b/helper/util/PausableTimeout.vala
index ecdc361..52b73c9 100644
--- a/helper/util/PausableTimeout.vala
+++ b/helper/util/PausableTimeout.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -25,12 +25,12 @@ namespace BreakTimer.Helper {
*/
public class PausableTimeout : Object {
public delegate void TimeoutCB (PausableTimeout timeout, int delta_millisecs);
-
+
private unowned TimeoutCB timeout_cb;
private uint source_id;
private int frequency;
private int64 last_time;
-
+
public PausableTimeout (TimeoutCB callback, int frequency) {
this.timeout_cb = callback;
this.frequency = frequency;
@@ -48,46 +48,46 @@ public class PausableTimeout : Object {
this.frequency = int.parse (data_parts[0]);
this.last_time = int64.parse (data_parts[1]);
}
-
+
private bool timeout_wrapper () {
int64 now = Util.get_monotonic_time ();
int64 time_delta = now - this.last_time;
this.last_time = now;
-
+
int delta_millisecs = (int) (time_delta / 1000);
this.timeout_cb (this, delta_millisecs);
-
+
return true;
}
public void run_once () {
this.timeout_wrapper ();
}
-
+
public void start () {
if (this.is_running ()) {
Source.remove (this.source_id);
}
-
+
this.last_time = Util.get_monotonic_time ();
-
+
this.source_id = Timeout.add_seconds (this.frequency, this.timeout_wrapper);
}
-
+
public void set_frequency (int frequency) {
this.frequency = frequency;
if (this.is_running ()) {
this.start ();
}
}
-
+
public void stop () {
if (this.is_running ()) {
Source.remove (this.source_id);
this.source_id = 0;
}
}
-
+
public bool is_running () {
return this.source_id > 0;
}
diff --git a/helper/util/SimpleFocusManager.vala b/helper/util/SimpleFocusManager.vala
index 1693f18..4d74201 100644
--- a/helper/util/SimpleFocusManager.vala
+++ b/helper/util/SimpleFocusManager.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -39,7 +39,7 @@ public class SimpleFocusManager : Object {
private class Request : Object {
public IFocusable owner;
public FocusPriority priority;
-
+
public static int priority_compare_func (Request a, Request b) {
if (a.priority < b.priority) {
return -1;
@@ -50,18 +50,18 @@ public class SimpleFocusManager : Object {
}
}
}
-
+
private SList<Request> focus_requests;
private Request? current_focus;
-
+
public SimpleFocusManager () {
this.focus_requests = new SList<Request> ();
this.current_focus = null;
}
-
+
private void set_focus (Request? new_focus) {
Request? old_focus = this.current_focus;
-
+
if (new_focus != old_focus) {
this.current_focus = new_focus;
// the order is important so new_focus can gracefully replace old_focus
@@ -73,7 +73,7 @@ public class SimpleFocusManager : Object {
}
}
}
-
+
private void update_focus () {
Request? new_focus = null;
if (this.focus_requests.length () > 0) {
@@ -81,32 +81,32 @@ public class SimpleFocusManager : Object {
}
this.set_focus (new_focus);
}
-
+
private bool focus_requested (IFocusable focusable) {
foreach (Request request in this.focus_requests) {
if (request.owner == focusable) return true;
}
return false;
}
-
+
public void request_focus (IFocusable focusable, FocusPriority priority) {
if (! this.focus_requested (focusable)) {
Request request = new Request ();
request.owner = focusable;
request.priority = priority;
-
+
this.focus_requests.insert_sorted (request, Request.priority_compare_func);
this.update_focus ();
}
}
-
+
public void release_focus (IFocusable focusable) {
foreach (Request request in this.focus_requests) {
if (request.owner == focusable) this.focus_requests.remove (request);
}
this.update_focus ();
}
-
+
public bool is_focusing (IFocusable focusable) {
return this.current_focus != null && this.current_focus.owner == focusable;
}
diff --git a/helper/util/StatefulTimer.vala b/helper/util/StatefulTimer.vala
index 7da0306..c443241 100644
--- a/helper/util/StatefulTimer.vala
+++ b/helper/util/StatefulTimer.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/helper/util/Util.vala b/helper/util/Util.vala
index 1901761..cec24cf 100644
--- a/helper/util/Util.vala
+++ b/helper/util/Util.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/BreakManager.vala b/settings/BreakManager.vala
index a8ab8ac..b94277f 100644
--- a/settings/BreakManager.vala
+++ b/settings/BreakManager.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -57,7 +57,7 @@ public class BreakManager : Object {
public signal void break_status_available ();
public signal void break_added (BreakType break_type);
public signal void status_changed ();
-
+
public void load_breaks () {
this.add_break (new MicroBreakType ());
this.add_break (new RestBreakType ());
@@ -71,7 +71,7 @@ public class BreakManager : Object {
public Gee.Set<string> all_break_ids () {
return this.breaks.keys;
}
-
+
public unowned GLib.List<BreakType> all_breaks () {
return this.breaks_ordered;
}
@@ -82,7 +82,7 @@ public class BreakManager : Object {
public bool is_working () {
return (this.master_enabled == false || this.breaks.size == 0 || this.break_helper != null);
}
-
+
public BreakType? get_break_type_for_name (string name) {
return this.breaks.get (name);
}
diff --git a/settings/BreakSettingsDialog.vala b/settings/BreakSettingsDialog.vala
index e11e7bd..bbe2bff 100644
--- a/settings/BreakSettingsDialog.vala
+++ b/settings/BreakSettingsDialog.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/BreakType.vala b/settings/BreakType.vala
index 0ae8979..3136638 100644
--- a/settings/BreakType.vala
+++ b/settings/BreakType.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/CircleCounter.vala b/settings/CircleCounter.vala
index a89320b..ed58ba0 100644
--- a/settings/CircleCounter.vala
+++ b/settings/CircleCounter.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/MainWindow.vala b/settings/MainWindow.vala
index 864f026..ce71f02 100644
--- a/settings/MainWindow.vala
+++ b/settings/MainWindow.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/MicroBreakType.vala b/settings/MicroBreakType.vala
index 23500e5..898a9f7 100644
--- a/settings/MicroBreakType.vala
+++ b/settings/MicroBreakType.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/OverlayArrow.vala b/settings/OverlayArrow.vala
index bd7daa7..f68cf47 100644
--- a/settings/OverlayArrow.vala
+++ b/settings/OverlayArrow.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/RestBreakType.vala b/settings/RestBreakType.vala
index d931822..790a98e 100644
--- a/settings/RestBreakType.vala
+++ b/settings/RestBreakType.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/SettingsApplication.vala b/settings/SettingsApplication.vala
index fa542eb..489573a 100644
--- a/settings/SettingsApplication.vala
+++ b/settings/SettingsApplication.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/TimeChooser.vala b/settings/TimeChooser.vala
index 429db69..363fed3 100644
--- a/settings/TimeChooser.vala
+++ b/settings/TimeChooser.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/TimerBreakType.vala b/settings/TimerBreakType.vala
index 0f75f36..09881fa 100644
--- a/settings/TimerBreakType.vala
+++ b/settings/TimerBreakType.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/settings/main.vala b/settings/main.vala
index 1a9afc5..34a4490 100644
--- a/settings/main.vala
+++ b/settings/main.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/tests/activity-monitor/activity-monitor_runner.vala
b/tests/activity-monitor/activity-monitor_runner.vala
index 438264e..b6017d0 100644
--- a/tests/activity-monitor/activity-monitor_runner.vala
+++ b/tests/activity-monitor/activity-monitor_runner.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/tests/activity-monitor/test_ActivityMonitor.vala
b/tests/activity-monitor/test_ActivityMonitor.vala
index 73e04b6..79efecd 100644
--- a/tests/activity-monitor/test_ActivityMonitor.vala
+++ b/tests/activity-monitor/test_ActivityMonitor.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/tests/breaks/breaks_runner.vala b/tests/breaks/breaks_runner.vala
index e12285c..84b3213 100644
--- a/tests/breaks/breaks_runner.vala
+++ b/tests/breaks/breaks_runner.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/tests/breaks/test_TimerBreakController.vala b/tests/breaks/test_TimerBreakController.vala
index b6f5fbc..2138880 100644
--- a/tests/breaks/test_TimerBreakController.vala
+++ b/tests/breaks/test_TimerBreakController.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -151,7 +151,7 @@ public class test_TimerBreakController : TestSuiteWithActivityMonitor {
for (int step = 0; step < test_TimerBreakController.DEFAULT_INTERVAL; step++) {
context.time_step (false, 1, 1);
- assert (context.break_timestep_log[0] == "counting");
+ assert (context.break_timestep_log[0] == "counting");
}
context.break_controller.assert_timers (expected_starts_in, expected_remaining);
}
diff --git a/tests/common/common_runner.vala b/tests/common/common_runner.vala
index 05b3906..fa338d2 100644
--- a/tests/common/common_runner.vala
+++ b/tests/common/common_runner.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/tests/common/test_NaturalTime.vala b/tests/common/test_NaturalTime.vala
index 3cb0c34..15c8da0 100644
--- a/tests/common/test_NaturalTime.vala
+++ b/tests/common/test_NaturalTime.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/tests/helper-util/helper_util_runner.vala b/tests/helper-util/helper_util_runner.vala
index 9160330..175e246 100644
--- a/tests/helper-util/helper_util_runner.vala
+++ b/tests/helper-util/helper_util_runner.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/tests/helper-util/test_Countdown.vala b/tests/helper-util/test_Countdown.vala
index b53419f..d271be5 100644
--- a/tests/helper-util/test_Countdown.vala
+++ b/tests/helper-util/test_Countdown.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -297,15 +297,15 @@ public class test_Countdown : TestSuiteWithActivityMonitor {
var countdown = new Countdown (30);
var data_0 = countdown.serialize ();
-
+
countdown.start ();
context.time_step (false, 10, 10);
var data_1 = countdown.serialize ();
-
+
countdown.pause ();
var data_2 = countdown.serialize ();
context.time_step (false, 10, 10);
-
+
this.assert_deserialize (30, data_0, false, 0, 30);
this.assert_deserialize (30, data_1, true, 10, 20);
this.assert_deserialize (30, data_2, false, 10, 20);
diff --git a/tests/helper-util/test_StatefulTimer.vala b/tests/helper-util/test_StatefulTimer.vala
index 92dee63..5a30bc2 100644
--- a/tests/helper-util/test_StatefulTimer.vala
+++ b/tests/helper-util/test_StatefulTimer.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/tests/tests.vala b/tests/tests.vala
index 50ecd86..d0c35f5 100644
--- a/tests/tests.vala
+++ b/tests/tests.vala
@@ -1,16 +1,16 @@
/*
* This file is part of GNOME Break Timer.
- *
+ *
* GNOME Break Timer is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* GNOME Break Timer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNOME Break Timer. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -127,7 +127,7 @@ class TestRunner : Object {
public virtual void global_setup () {
Environment.set_variable ("LANGUAGE", "C", true);
-
+
try {
var tmp_path = DirUtils.make_tmp ("gnome-break-timer-test-XXXXXX");
tmp_dir = File.new_for_path (tmp_path);
@@ -216,7 +216,7 @@ public class TestSuiteWithActivityMonitor : SimpleTestSuite {
this.activity_log = new Gee.ArrayList<ActivityMonitor.UserActivity?> ();
this.refresh_environment ();
}
-
+
public override void teardown () {
Util._do_override_time = false;
Util._override_real_time = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
