From 20c07b755976807b68d3940dbe7b4e487f2e5c69 Mon Sep 17 00:00:00 2001 From: rixx Date: Thu, 19 Mar 2015 14:49:22 +0100 Subject: replaced 'pause' by 'break' 'break' was already used for notifications and this way 'pause' can be used when a running Pomodoro needs to be paused (to be resumed later) --- py3status/modules/pomodoro.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'py3status/modules') diff --git a/py3status/modules/pomodoro.py b/py3status/modules/pomodoro.py index 1a167b9..9b8fb63 100644 --- a/py3status/modules/pomodoro.py +++ b/py3status/modules/pomodoro.py @@ -34,7 +34,7 @@ class Py3status: self.run = False elif event['button'] == 3: - self.__setup('pause') + self.__setup('break') self.run = False @property @@ -61,7 +61,7 @@ class Py3status: self.prefix = 'Pomodoro' self.timer = self.timer_pomodoro - elif status == 'pause': + elif status == 'break': self.prefix = 'Break #%d' % self.breaks if self.breaks > self.max_breaks: self.timer = self.timer_long_break @@ -80,9 +80,9 @@ class Py3status: self.run = False self.__i3_nagbar() if self.status == 'start': - self.__setup('pause') - self.status = 'pause' - elif self.status == 'pause': + self.__setup('break') + self.status = 'break' + elif self.status == 'break': self.__setup('start') self.status = 'start' @@ -114,7 +114,7 @@ class Py3status: if self.status == 'start': response['color'] = i3s_config['color_good'] - elif self.status == 'pause': + elif self.status == 'break': response['color'] = i3s_config['color_degraded'] else: response['color'] = i3s_config['color_bad'] -- cgit v1.3 From c2e23c442f9df310d94ff9b44835096a43257001 Mon Sep 17 00:00:00 2001 From: rixx Date: Thu, 19 Mar 2015 15:15:42 +0100 Subject: A second right-click stops the ongoing break In case a break is too long for you --- py3status/modules/pomodoro.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'py3status/modules') diff --git a/py3status/modules/pomodoro.py b/py3status/modules/pomodoro.py index 9b8fb63..db2a60d 100644 --- a/py3status/modules/pomodoro.py +++ b/py3status/modules/pomodoro.py @@ -34,7 +34,10 @@ class Py3status: self.run = False elif event['button'] == 3: - self.__setup('break') + if self.status == 'break': + self.__setup('start') + else: + self.__setup('break') self.run = False @property -- cgit v1.3 From 64a78c990dd072ba3d70e182c4f16e55c9e9ef3b Mon Sep 17 00:00:00 2001 From: rixx Date: Thu, 19 Mar 2015 15:22:53 +0100 Subject: Left click can now pause and resume a Pomodoro --- py3status/modules/pomodoro.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'py3status/modules') diff --git a/py3status/modules/pomodoro.py b/py3status/modules/pomodoro.py index db2a60d..bf86e96 100644 --- a/py3status/modules/pomodoro.py +++ b/py3status/modules/pomodoro.py @@ -27,7 +27,21 @@ class Py3status: if event['button'] == 1: if self.status == 'stop': self.status = 'start' - self.run = True + self.run = True + + elif self.status == 'break': + self.run = True + + elif self.status == 'start': + if self.run: + self.status = 'pause' + self.run = False + else: + self.run = True + + elif self.status == 'pause': + self.status = 'start' + self.run = True elif event['button'] == 2: self.__setup('stop') -- cgit v1.3 From 74c855d59f8aacc0b67261d2e5b7ac7402877360 Mon Sep 17 00:00:00 2001 From: rixx Date: Thu, 19 Mar 2015 15:25:02 +0100 Subject: added click-documentation --- py3status/modules/pomodoro.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'py3status/modules') diff --git a/py3status/modules/pomodoro.py b/py3status/modules/pomodoro.py index bf86e96..7fcecba 100644 --- a/py3status/modules/pomodoro.py +++ b/py3status/modules/pomodoro.py @@ -22,7 +22,12 @@ class Py3status: def on_click(self, i3s_output_list, i3s_config, event): """ - Handles click events + Handles click events: + - left click starts an inactive counter and pauses a running + Pomodoro + - middle click resets everything + - right click starts (and ends, if needed) a break + """ if event['button'] == 1: if self.status == 'stop': -- cgit v1.3