Add option to enable or disable post break sound

2019-02-10 10:42:29 -05:00 · 2019-02-10 10:42:29 -05:00 · 79d96a7932
parent deeab78d8b
commit 79d96a7932
38 changed files with 152 additions and 4 deletions
--- a/safeeyes/PluginManager.py
+++ b/safeeyes/PluginManager.py
@ -267,6 +267,11 @@ class PluginManager(object):
                # The plugin is already enabled or partially loaded due to break_override_allowed
                # Use the existing plugin object
                plugin_obj = self.__plugins[plugin['id']]
+                
+                # Update the config
+                plugin_obj['config'] = dict(plugin.get('settings', {}))
+                plugin_obj['config']['path'] = os.path.join(plugin_dir, plugin['id'])
+
                if plugin_obj['enabled']:
                    # Already loaded completely
                    return
--- a/safeeyes/config/locale/ar/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/ar/LC_MESSAGES/safeeyes.po
@ -283,6 +283,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/bg/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/bg/LC_MESSAGES/safeeyes.po
@ -281,6 +281,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/ca/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/ca/LC_MESSAGES/safeeyes.po
@ -285,6 +285,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/cs/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/cs/LC_MESSAGES/safeeyes.po
@ -284,6 +284,10 @@ msgstr "Přehrát zvukové upozornění před a po přestávkách"
 msgid "Play audible alert before breaks"
 msgstr "Přehrát zvukové upozornění před přestávkami"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Nerušit"
--- a/safeeyes/config/locale/da/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/da/LC_MESSAGES/safeeyes.po
@ -283,6 +283,10 @@ msgstr "Afspil lydvarsling før og efter pauser"
 msgid "Play audible alert before breaks"
 msgstr "Afspil lydvarsling før pauser"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Forstyr ikke"
--- a/safeeyes/config/locale/de/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/de/LC_MESSAGES/safeeyes.po
@ -285,6 +285,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Nicht stören"
--- a/safeeyes/config/locale/en_US/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/en_US/LC_MESSAGES/safeeyes.po
@ -285,6 +285,10 @@ msgstr "Play audible alert before and after breaks"
 msgid "Play audible alert before breaks"
 msgstr "Play audible alert before breaks"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr "Play audible alert after breaks"
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
--- a/safeeyes/config/locale/es/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/es/LC_MESSAGES/safeeyes.po
@ -284,6 +284,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "No molestar"
--- a/safeeyes/config/locale/et/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/et/LC_MESSAGES/safeeyes.po
@ -284,6 +284,10 @@ msgstr "Mängi helisignaali enne ja pärast pausi"
 msgid "Play audible alert before breaks"
 msgstr "Mängi helisignaali enne pausi"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Mitte segada"
--- a/safeeyes/config/locale/fa/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/fa/LC_MESSAGES/safeeyes.po
@ -284,6 +284,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/fr/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/fr/LC_MESSAGES/safeeyes.po
@ -288,6 +288,10 @@ msgstr "Jouer une alerte sonore avant et après les pauses"
 msgid "Play audible alert before breaks"
 msgstr "Jouer une alerte sonore avant les pauses"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
--- a/safeeyes/config/locale/hi/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/hi/LC_MESSAGES/safeeyes.po
@ -282,6 +282,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/hu/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/hu/LC_MESSAGES/safeeyes.po
@ -283,6 +283,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Ne Zavarj"
--- a/safeeyes/config/locale/id/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/id/LC_MESSAGES/safeeyes.po
@ -282,6 +282,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/it/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/it/LC_MESSAGES/safeeyes.po
@ -288,6 +288,10 @@ msgstr "Emetti un avviso sonoro prima e dopo le pause"
 msgid "Play audible alert before breaks"
 msgstr "Emetti un avviso sonoro dopo le pause"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
--- a/safeeyes/config/locale/lt/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/lt/LC_MESSAGES/safeeyes.po
@ -287,6 +287,10 @@ msgstr "Groti garsinį signalą prieš pertraukas ir po jų"
 msgid "Play audible alert before breaks"
 msgstr "Groti garsinį signalą prieš pertraukas"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Netrukdyti"
--- a/safeeyes/config/locale/mk/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/mk/LC_MESSAGES/safeeyes.po
@ -284,6 +284,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/nb/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/nb/LC_MESSAGES/safeeyes.po
@ -282,6 +282,10 @@ msgstr "Spill lydvarsel før og etter pauser"
 msgid "Play audible alert before breaks"
 msgstr "Lydvarsel før pauser"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Ikke forstyrr"
--- a/safeeyes/config/locale/nl/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/nl/LC_MESSAGES/safeeyes.po
@ -287,6 +287,10 @@ msgstr "Audiomelding afspelen vóór en ná pauzes"
 msgid "Play audible alert before breaks"
 msgstr "Audiomelding afspelen vóór pauzes"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Niet storen"
--- a/safeeyes/config/locale/pl/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/pl/LC_MESSAGES/safeeyes.po
@ -285,6 +285,10 @@ msgstr "Graj dźwiękowy alert przed i po przerwach"
 msgid "Play audible alert before breaks"
 msgstr "Odtwórz dźwięk przed przerwami"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Nie Przeszkadzać"
--- a/safeeyes/config/locale/pt/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/pt/LC_MESSAGES/safeeyes.po
@ -287,6 +287,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Não Perturbe"
--- a/safeeyes/config/locale/ru/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/ru/LC_MESSAGES/safeeyes.po
@ -283,6 +283,10 @@ msgstr "Подавать звуковой сигнал до и после пер
 msgid "Play audible alert before breaks"
 msgstr "Подавать звуковой сигнал перед перерывом"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Не беспокоить"
--- a/safeeyes/config/locale/safeeyes.pot
+++ b/safeeyes/config/locale/safeeyes.pot
@ -270,6 +270,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/sk/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/sk/LC_MESSAGES/safeeyes.po
@ -284,6 +284,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Nerušuj ma"
--- a/safeeyes/config/locale/sv/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/sv/LC_MESSAGES/safeeyes.po
@ -281,6 +281,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/ta/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/ta/LC_MESSAGES/safeeyes.po
@ -287,6 +287,10 @@ msgstr "இடைவேளைகளின் ஆரம்பத்திலு
 msgid "Play audible alert before breaks"
 msgstr "இடைவேளைகளின் தொடக்கத்தில் ஒலிச் சமிக்ஞய்"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr "இடைவேளைகளின் முடிவில் ஒலிச் சமிக்ஞய்"
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "தொந்தரவு செய்ய வேண்டாம்"
--- a/safeeyes/config/locale/tr/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/tr/LC_MESSAGES/safeeyes.po
@ -285,6 +285,10 @@ msgstr "Aralardan önce ve sonra sesli uyarıyı çal"
 msgid "Play audible alert before breaks"
 msgstr "Ara vermeden önce sesli uyarı çal"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Rahatsız etme"
--- a/safeeyes/config/locale/ug/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/ug/LC_MESSAGES/safeeyes.po
@ -281,6 +281,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/config/locale/uk/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/uk/LC_MESSAGES/safeeyes.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.5-dev\n"

 # Short break
@ -287,6 +287,10 @@ msgstr "Відтворювати звукове попередження до і
 msgid "Play audible alert before breaks"
 msgstr "Відтворювати звукове попередження перед перервами"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Не турбувати"
--- a/safeeyes/config/locale/vi/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/vi/LC_MESSAGES/safeeyes.po
@ -285,6 +285,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "Không Làm Phiền"
--- a/safeeyes/config/locale/zh_CN/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/zh_CN/LC_MESSAGES/safeeyes.po
@ -284,6 +284,10 @@ msgstr "休息前后播放声音"
 msgid "Play audible alert before breaks"
 msgstr "休息前播放声音"

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr "免打扰"
--- a/safeeyes/config/locale/zh_TW/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/zh_TW/LC_MESSAGES/safeeyes.po
@ -282,6 +282,10 @@ msgstr ""
 msgid "Play audible alert before breaks"
 msgstr ""

+# plugin/audiblealert
+msgid "Play audible alert after breaks"
+msgstr ""
+
 # plugin/donotdisturb
 msgid "Do Not Disturb"
 msgstr ""
--- a/safeeyes/plugins/audiblealert/config.json
+++ b/safeeyes/plugins/audiblealert/config.json
@ -2,7 +2,7 @@
    "meta": {
        "name": "Audible Alert",
        "description": "Play audible alert before and after breaks",
-        "version": "0.0.2"
+        "version": "0.0.3"
    },
    "dependencies": {
        "python_modules": [],
@ -16,6 +16,12 @@
        "label": "Play audible alert before breaks",
        "type": "BOOL",
        "default": true
+    },
+    {
+        "id": "post_break_alert",
+        "label": "Play audible alert after breaks",
+        "type": "BOOL",
+        "default": true
    }],
    "break_override_allowed": true
 }
--- a/safeeyes/plugins/audiblealert/plugin.py
+++ b/safeeyes/plugins/audiblealert/plugin.py
@ -25,6 +25,7 @@ from safeeyes import Utility

 context = None
 pre_break_alert = False
+post_break_alert = False


 def play_sound(resource_name):
@ -51,9 +52,11 @@ def init(ctx, safeeyes_config, plugin_config):
    """
    global context
    global pre_break_alert
+    global post_break_alert
    logging.debug('Initialize Audible Alert plugin')
    context = ctx
    pre_break_alert = plugin_config['pre_break_alert']
+    post_break_alert = plugin_config['post_break_alert']


 def on_pre_break(break_obj):
@ -71,6 +74,6 @@ def on_stop_break():
    After the break, play the alert sound
    """
    # Do not play if the break is skipped or postponed
-    if context['skipped'] or context['postponed']:
+    if context['skipped'] or context['postponed'] or not post_break_alert:
        return
    play_sound('on_stop_break.wav')
--- a/safeeyes/resource/on_pre_break.wav
+++ b/safeeyes/resource/on_pre_break.wav
--- a/safeeyes/resource/on_stop_break.wav
+++ b/safeeyes/resource/on_stop_break.wav
--- a/safeeyes/settings.py
+++ b/safeeyes/settings.py
@ -152,6 +152,12 @@ class SettingsDialog(object):
            if response_id == Gtk.ResponseType.OK:
                Utility.reset_config()
                self.config = Config()
+                # Remove breaks from the container
+                self.box_short_breaks.foreach(lambda element: self.box_short_breaks.remove(element))
+                self.box_long_breaks.foreach(lambda element: self.box_long_breaks.remove(element))
+                # Remove plugins from the container
+                self.box_plugins.foreach(lambda element: self.box_plugins.remove(element))
+                # Initialize again
                self.__initialize(self.config)
            widget.destroy()