File _service:download_files:v2.1.5...master.patch of Package safeeyes

Overview Repositories Revisions Requests Users Attributes Meta

File _service:download_files:v2.1.5...master.patch of Package safeeyes (Revision f296b22f08c547097e2eadf4426e06ac)

Currently displaying revision f296b22f08c547097e2eadf4426e06ac , Show latest

From 47995183540c5b2766bc50083693475401809a78 Mon Sep 17 00:00:00 2001
From: Gobinath Loganathan <slgobinath@gmail.com>
Date: Thu, 5 Jan 2023 19:18:51 -0500
Subject: [PATCH 01/13] Install wheel in dependencies

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c475c77..4e0d704 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,6 +22,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install build
+          pip install wheel
 
       - name: Get Current Version
         run: |

From a158587311cec49d4a1d060ae10cebf6a08f2646 Mon Sep 17 00:00:00 2001
From: Porrumentzio <porrumentzio@riseup.net>
Date: Fri, 6 Jan 2023 10:08:40 +0000
Subject: [PATCH 02/13] Translated using Weblate (Basque)

Currently translated at 100.0% (116 of 116 strings)

Translation: Safe Eyes/Translations
Translate-URL: https://hosted.weblate.org/projects/safe-eyes/translations/eu/
---
 .../config/locale/eu/LC_MESSAGES/safeeyes.po  | 108 +++++++++---------
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/safeeyes/config/locale/eu/LC_MESSAGES/safeeyes.po b/safeeyes/config/locale/eu/LC_MESSAGES/safeeyes.po
index 1428c69..1f1c877 100644
--- a/safeeyes/config/locale/eu/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/eu/LC_MESSAGES/safeeyes.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-09-28 22:17+0000\n"
-"Last-Translator: Gontzal Manuel Pujana Onaindia <thadahdenyse@gmail.com>\n"
+"PO-Revision-Date: 2023-01-07 11:49+0000\n"
+"Last-Translator: Porrumentzio <porrumentzio@riseup.net>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/safe-eyes/"
 "translations/eu/>\n"
 "Language: eu\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.15.1-dev\n"
 
 # Short break
 msgid "Tightly close your eyes"
@@ -23,15 +23,15 @@ msgstr "Itxi begiak indarrez"
 
 # Short break
 msgid "Roll your eyes a few times to each side"
-msgstr "Mugitu begiak alde bakoitzera pare bat aldiz"
+msgstr "Mugitu begiak aldez alde"
 
 # Short break
 msgid "Rotate your eyes in clockwise direction"
-msgstr "Biratu begiak erlojuaren noranzkoan"
+msgstr "Biratu begiak erloju-orratzen noranzkoan"
 
 # Short break
 msgid "Rotate your eyes in counterclockwise direction"
-msgstr "Biratu begiak erlojuaren aurkako noranzkoan"
+msgstr "Biratu begiak erloju-orratzen kontrako noranzkoan"
 
 # Short break
 msgid "Blink your eyes"
@@ -71,7 +71,7 @@ msgstr "itxi uneko safeeyes instantzia eta irten"
 
 # Commandline arg description
 msgid "show the settings dialog"
-msgstr "erakutsi ezarpenen elkarrizketa-koadroa"
+msgstr "erakutsi ezarpenak"
 
 # Commandline arg description
 msgid "start safeeyes in debug mode"
@@ -90,8 +90,8 @@ msgid ""
 "Safe Eyes is running without an RPC server. Turn it on to use command-line "
 "arguments."
 msgstr ""
-"Safe Eyes RPC zerbitzaririk gabe exekutatzen ari da. Piztu ezazu komando-"
-"lerroko argumentuak erabiltzeko."
+"RPC zerbitzaririk gabe ari da exekutatzen Safe Eyes. Piztu zerbitzaria "
+"komando-lerroko argumentuak erabiltzeko."
 
 # About dialog
 msgid "Close"
@@ -103,8 +103,8 @@ msgid ""
 "Safe Eyes protects your eyes from eye strain (asthenopia) by reminding you "
 "to take breaks while you're working long hours at the computer"
 msgstr ""
-"Safe Eyes-ek zure begiak begi-neketik (astenopia) babesten ditu "
-"ordenagailuan ordu luzez zabiltzanean atsedenaldiak hartzeaz gogoraraziz"
+"Safe Eyes-ek begi-neketik (astenopiatik) babesten zaitu ordenagailuan ordu "
+"luzez zabiltzanean etenaldiak egiteko gogoraraziz"
 
 # About dialog
 msgid "License"
@@ -120,19 +120,19 @@ msgstr "Atzeratu"
 
 # Settings dialog
 msgid "Break duration (in seconds)"
-msgstr "Atsedenaldiaren iraupena (segundotan)"
+msgstr "Etenaldiaren iraupena (segundotan)"
 
 # Settings dialog
 msgid "Interval between two breaks (in minutes)"
-msgstr "Bi atsedenaldien arteko tartea (minututan)"
+msgstr "Bi etenaldiren arteko tartea (minututan)"
 
 # Settings dialog
 msgid "Time to prepare for a break (in seconds)"
-msgstr "Atsedenaldirako prestatzeko denbora (segundotan)"
+msgstr "Etenaldirako prestatzeko denbora (segundotan)"
 
 # Settings dialog
 msgid "Keyboard shortcuts disabled period (in seconds)"
-msgstr "Laster-teklak desgaitutako unea (segundotan)"
+msgstr "Laster-teklak desgaitutako aldia (segundotan)"
 
 # Settings dialog
 msgid "Postponement duration (in minutes)"
@@ -140,15 +140,15 @@ msgstr "Atzerapenaren iraupena (minututan)"
 
 # Settings dialog
 msgid "Show breaks in random order"
-msgstr "Erakutsi atsedenaldiak ausazko ordenean"
+msgstr "Erakutsi etenaldiak ausazko ordenan"
 
 # Settings dialog
 msgid "Strict break (No way to skip breaks)"
-msgstr "Atsedenaldi zorrotza (saltatzeko modurik ez)"
+msgstr "Etenaldi zorrotza (saltatzeko modurik ez)"
 
 # Settings dialog
 msgid "Allow postponing breaks"
-msgstr "Baimendu atsedenaldiak atzeratzea"
+msgstr "Baimendu etenaldiak atzeratzea"
 
 # Settings dialog
 msgid "Persist the internal state"
@@ -164,7 +164,9 @@ msgstr "RPC zerbitzaririk gabe, komandu-lineako komanduek ez dute funtzionatuko"
 
 # Settings dialog
 msgid "Long break interval must be a multiple of short break interval"
-msgstr "Atsedenaldik luzeak, motzen multzoa izan behar du"
+msgstr ""
+"Etenaldi luzeen arteko tarteak motzen arteko tartearen multiploa izan behar "
+"du"
 
 # Settings dialog
 msgid "Reset"
@@ -172,7 +174,7 @@ msgstr "Berrezarri"
 
 # Settings dialog
 msgid "Are you sure you want to reset all settings to default?"
-msgstr "Ziur ezarpen guztiak lehenetsitakoetara berrezarri nahi dituzula?"
+msgstr "Ziur ezarpen guztiak lehenetsietara berrezarri nahi dituzula?"
 
 # Settings dialog
 msgid "Options"
@@ -180,11 +182,11 @@ msgstr "Aukerak"
 
 # Settings dialog
 msgid "Short Breaks"
-msgstr "Atsedenaldi motzak"
+msgstr "Etenaldi motzak"
 
 # Settings dialog
 msgid "Long Breaks"
-msgstr "Atsedenaldi luzeak"
+msgstr "Etenaldi luzeak"
 
 # Settings dialog
 msgid "Delete"
@@ -192,7 +194,7 @@ msgstr "Ezabatu"
 
 # Settings dialog
 msgid "Are you sure you want to delete this break?"
-msgstr "Ziur atsedenaldi hau ezabatu nahi duzula?"
+msgstr "Ziur etenaldi hau ezabatu nahi duzula?"
 
 # Settings dialog
 msgid "You can't undo this action."
@@ -200,11 +202,11 @@ msgstr "Ekintza hau ezin da desegin."
 
 # Settings dialog
 msgid "Break"
-msgstr "Atsedenaldia"
+msgstr "Etenaldia"
 
 # Settings dialog
 msgid "Breaks"
-msgstr "Atsedenaldiak"
+msgstr "Etenaldiak"
 
 # Settings dialog
 msgid "Plugins"
@@ -256,7 +258,7 @@ msgstr "Denbora (minututan)"
 
 # Settings dialog
 msgid "Break Settings"
-msgstr "Atsedenaldien ezarpenak"
+msgstr "Etenaldien ezarpenak"
 
 # Settings dialog
 msgid "Plugin Settings"
@@ -284,7 +286,7 @@ msgstr "Gehitu %(resource)s baliabidea %(config_resource)s direktorioan"
 
 # Settings dialog
 msgid "New Break"
-msgstr "Atsedenaldi berria"
+msgstr "Etenaldi berria"
 
 # Settings dialog
 msgid "Remove"
@@ -304,15 +306,15 @@ msgstr "Abisu entzungarria"
 
 # plugin/audiblealert
 msgid "Play audible alert before and after breaks"
-msgstr "Erreproduzitu abisu entzungarria atsedenaldien aurretik eta ondoren"
+msgstr "Erreproduzitu abisu entzungarri bat etenaldien aurretik eta ondoren"
 
 # plugin/audiblealert
 msgid "Play audible alert before breaks"
-msgstr "Erreproduzitu abisu entzungarria atsedenaldien aurretik"
+msgstr "Erreproduzitu abisu entzungarria etenaldien aurretik"
 
 # plugin/audiblealert
 msgid "Play audible alert after breaks"
-msgstr "Erreproduzitu abisu entzungarria atsedenaldien ondoren"
+msgstr "Erreproduzitu abisu entzungarria etenaldien ondoren"
 
 # plugin/donotdisturb
 msgid "Do Not Disturb"
@@ -320,11 +322,11 @@ msgstr "Ez molestatu"
 
 # plugin/donotdisturb
 msgid "Skip break if the active window is in fullscreen mode"
-msgstr "Saltatu atsedenaldia uneko leihoa pantaila osoan badago"
+msgstr "Saltatu etenaldia leiho aktiboa pantaila osoan badago"
 
 # plugin/donotdisturb
 msgid "Do not interrupt these windows anytime"
-msgstr "Ez eten honako leihoetan edonola ere"
+msgstr "Ez eten honako leihoetan inoiz ere"
 
 # plugin/donotdisturb
 msgid "Interrupt these windows regardless of their state"
@@ -356,15 +358,15 @@ msgstr "Jakinarazpena"
 
 # plugin/notification
 msgid "Show a system notification before breaks"
-msgstr "Erakutsi sistemako jakinarazpena atsedenaldien aurretik"
+msgstr "Erakutsi sistemako jakinarazpen bat etenaldien aurretik"
 
 # plugin/notification
 msgid "Ready for a short break in %s seconds"
-msgstr "Prestatu %s segundo barru atsedenaldi motza egiteko"
+msgstr "Prestatu %s segundo barru etenaldi motza egiteko"
 
 # plugin/notification
 msgid "Ready for a long break in %s seconds"
-msgstr "Prestatu %s segundo barru atsedenaldi luzea egiteko"
+msgstr "Prestatu %s segundo barru etenaldi luzea egiteko"
 
 # plugin/screensaver
 msgid "Screensaver"
@@ -373,7 +375,7 @@ msgstr "Pantaila babeslea"
 # plugin/screensaver
 msgid "Lock the screen after long breaks by starting screensaver"
 msgstr ""
-"Blokeatu pantaila atsedenaldi luzeen ondoren pantaila-babeslea erakutsiz"
+"Blokeatu pantaila etenaldi luzeen ondoren eta erakutsi pantaila-babeslea"
 
 # plugin/screensaver
 msgid "Custom screensaver command"
@@ -381,7 +383,7 @@ msgstr "Pantaila-babeslearentzako komando pertsonalizatua"
 
 # plugin/screensaver
 msgid "Minimum seconds to skip without screensaver"
-msgstr "Pantaila-babeslerik gabe saltatzeko gutxieneko segundoak"
+msgstr "Pantaila-babesle erakutsi gabe saltatzeko segundoak"
 
 # plugin/screensaver
 msgid "Lock screen"
@@ -397,17 +399,17 @@ msgstr "Pausatu Safe Eyes sistema inaktibo badago"
 
 # plugin/smartpause
 msgid "Minimum idle time to pause Safe Eyes (in seconds)"
-msgstr "Safe Eyes pausatzeko gutxieneko denbora inaktiboa (segundotan)"
+msgstr "Safe Eyes pausatzeko pasa behar den denbora inaktiboa (segundotan)"
 
 # plugin/smartpause
 msgid "Interpret idle time equivalent to upcoming break duration as a break"
 msgstr ""
-"Interpretatu hurrengo atsedenaldiaren iraupenaren baliokidea den denbora "
-"inaktiboa atsedenaldi gisa"
+"Tratatu denbora inaktiboa etenaldi gisa, inaktibo emandako denbora datorren "
+"etenaldiaren iraupen berekoa izan bada"
 
 # plugin/smartpause
 msgid "Postpone the next break until the system becomes idle"
-msgstr "Atzeratu hurrengo atsedenaldia sistema inaktibo egon arte"
+msgstr "Atzeratu hurrengo etenaldia sistema inaktibo egon arte"
 
 #: plugins/trayicon
 msgid "Tray Icon"
@@ -419,7 +421,7 @@ msgstr "Erakutsi erretiluko ikonoa jakinarazpenen eremuan"
 
 #: plugins/trayicon
 msgid "Show next break time in tray icon"
-msgstr "Erakutsi hurrengo atsedenaldia erretiluko ikonoan"
+msgstr "Erakutsi hurrengo etenaldia erretiluko ikonoan"
 
 #: plugins/trayicon
 msgid "Allow disabling Safe Eyes"
@@ -448,28 +450,28 @@ msgstr "Gaitu Safe Eyes"
 #: plugins/trayicon
 msgid "For %d Hour"
 msgid_plural "For %d Hours"
-msgstr[0] "Ordu %derako"
-msgstr[1] "%d ordurako"
+msgstr[0] "Ordu %dez"
+msgstr[1] "%d orduz"
 
 #: plugins/trayicon
 msgid "For %d Minute"
 msgid_plural "For %d Minutes"
-msgstr[0] "Minutu %derako"
-msgstr[1] "%d minuturako"
+msgstr[0] "Minutu %dez"
+msgstr[1] "%d minutuz"
 
 #: plugins/trayicon
 msgid "For %d Second"
 msgid_plural "For %d Seconds"
-msgstr[0] "Segundo %derako"
-msgstr[1] "%d segundorako"
+msgstr[0] "Segundo %dez"
+msgstr[1] "%d segundoz"
 
 #: plugins/trayicon
 msgid "Next break at %s"
-msgstr "Hurrengo atsedenaldia: %s"
+msgstr "Hurrengo etenaldia: %s"
 
 #: plugins/trayicon
 msgid "No Breaks Available"
-msgstr "Atsedenaldirik ez erabilgarri"
+msgstr "Etenaldirik ez erabilgarri"
 
 #: plugins/trayicon
 msgid "Settings"
@@ -477,7 +479,7 @@ msgstr "Ezarpenak"
 
 #: plugins/trayicon
 msgid "Take a break now"
-msgstr "Hartu atsedenaldia orain"
+msgstr "Egin orain etenaldia"
 
 #: plugins/trayicon
 msgid "Until restart"
@@ -485,7 +487,7 @@ msgstr "Berrabiarazi arte"
 
 #: plugins/trayicon
 msgid "Quit"
-msgstr "Utzi"
+msgstr "Irten"
 
 # plugin/mediacontrol
 msgid "Media Control"
@@ -493,7 +495,7 @@ msgstr "Multimediaren kontrola"
 
 # plugin/mediacontrol
 msgid "Pause media players from the break screen"
-msgstr "Pausatu multimedia erreproduzitzaileak atsedenaldiaren pantailatik"
+msgstr "Pausatu multimedia etenaldiaren pantailatik"
 
 # plugin/mediacontrol
 msgid "Pause media"

From 9e64e65fcec23da372d5b7d9dea60a16442842c6 Mon Sep 17 00:00:00 2001
From: Gobinath <slgobinath@gmail.com>
Date: Mon, 10 May 2021 19:03:12 -0400
Subject: [PATCH 03/13] Add sub-menu to take any, short or long breaks

---
 safeeyes/config/locale/safeeyes.pot    | 12 +++++++++
 safeeyes/core.py                       | 26 +++++++++----------
 safeeyes/model.py                      | 36 ++++++++++++--------------
 safeeyes/plugins/healthstats/plugin.py | 13 +---------
 safeeyes/plugins/trayicon/plugin.py    | 32 ++++++++++++++++++-----
 safeeyes/safeeyes.py                   |  7 +++--
 6 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/safeeyes/config/locale/safeeyes.pot b/safeeyes/config/locale/safeeyes.pot
index 6352149..aea416e 100644
--- a/safeeyes/config/locale/safeeyes.pot
+++ b/safeeyes/config/locale/safeeyes.pot
@@ -456,6 +456,18 @@ msgstr ""
 msgid "Take a break now"
 msgstr ""
 
+#: plugins/trayicon
+msgid "Any break"
+msgstr ""
+
+#: plugins/trayicon
+msgid "Short break"
+msgstr ""
+
+#: plugins/trayicon
+msgid "Long break"
+msgstr ""
+
 #: plugins/trayicon
 msgid "Until restart"
 msgstr ""
diff --git a/safeeyes/core.py b/safeeyes/core.py
index f51a8c0..178bb9f 100644
--- a/safeeyes/core.py
+++ b/safeeyes/core.py
@@ -131,7 +131,7 @@ def postpone(self, duration=-1):
         logging.debug("Postpone the break for %d seconds", self.postpone_duration)
         self.context['postponed'] = True
 
-    def take_break(self):
+    def take_break(self, break_type = None):
         """
         Calling this method stops the scheduler and show the next break screen
         """
@@ -139,15 +139,15 @@ def take_break(self):
             return
         if not self.context['state'] == State.WAITING:
             return
-        utility.start_thread(self.__take_break)
+        utility.start_thread(self.__take_break, break_type=break_type)
 
-    def has_breaks(self):
+    def has_breaks(self, break_type = None):
         """
-        Check whether Safe Eyes has breaks or not.
+        Check whether Safe Eyes has breaks or not. Use the break_type to check for either short or long break.
         """
-        return not self.break_queue.is_empty()
+        return not self.break_queue.is_empty(break_type)
 
-    def __take_break(self):
+    def __take_break(self, break_type = None):
         """
         Show the next break screen
         """
@@ -167,7 +167,7 @@ def __take_break(self):
             time.sleep(1)  # Wait for 1 sec to ensure the sceduler is dead
             self.running = True
 
-        utility.execute_main_thread(self.__fire_start_break)
+        utility.execute_main_thread(self.__fire_start_break, break_type)
 
     def __scheduler_job(self):
         """
@@ -243,9 +243,10 @@ def __postpone_break(self):
         self.__wait_for(self.postpone_duration)
         utility.execute_main_thread(self.__fire_start_break)
 
-    def __fire_start_break(self):
+    def __fire_start_break(self, break_type = None):
+        break_obj = self.break_queue.get_break(break_type)
         # Show the break screen
-        if not self.on_start_break.fire(self.break_queue.get_break()):
+        if not self.on_start_break.fire(break_obj):
             # Plugins want to ignore this break
             self.__start_next_break()
             return
@@ -258,15 +259,14 @@ def __fire_start_break(self):
             # Wait in user thread
             utility.start_thread(self.__postpone_break)
         else:
-            self.start_break.fire(self.break_queue.get_break())
-            utility.start_thread(self.__start_break)
+            self.start_break.fire(break_obj)
+            utility.start_thread(self.__start_break, break_obj = break_obj)
 
-    def __start_break(self):
+    def __start_break(self, break_obj):
         """
         Start the break screen.
         """
         self.context['state'] = State.BREAK
-        break_obj = self.break_queue.get_break()
         countdown = break_obj.duration
         total_break_time = countdown
 
diff --git a/safeeyes/model.py b/safeeyes/model.py
index cbd5590..888b3f7 100644
--- a/safeeyes/model.py
+++ b/safeeyes/model.py
@@ -84,7 +84,6 @@ def __init__(self, config, context):
         self.__current_break = None
         self.__current_long = 0
         self.__current_short = 0
-        self.__shorts_taken = 0
         self.__short_break_time = config.get('short_break_interval')
         self.__long_break_time = config.get('long_break_interval')
         self.__is_random_order = config.get('random_order')
@@ -113,15 +112,18 @@ def __init__(self, config, context):
                     while brk != current_break and brk.name != last_break:
                         brk = self.next()
 
-    def get_break(self):
+    def get_break(self, break_type = None):
         if self.__current_break is None:
-            self.__current_break = self.next()
+            self.__current_break = self.next(break_type)
+        elif break_type is not None and self.__current_break.type != break_type:
+            self.__current_break = self.next(break_type)
+
         return self.__current_break
 
     def is_long_break(self):
         return self.__current_break is not None and self.__current_break.type == BreakType.LONG_BREAK
 
-    def next(self):
+    def next(self, break_type = None):
         break_obj = None
         shorts = self.__short_queue
         longs  = self.__long_queue
@@ -133,22 +135,11 @@ def next(self):
             break_obj = self.__next_long()
         elif longs is None:
             break_obj = self.__next_short()
-        elif longs[self.__current_long].time <= shorts[self.__current_short].time:
+        elif break_type == BreakType.LONG_BREAK or longs[self.__current_long].time <= shorts[self.__current_short].time:
             break_obj = self.__next_long()
         else:
             break_obj = self.__next_short()
 
-        # Shorts and longs exist -> set cycle on every long
-        if break_obj.type == BreakType.LONG_BREAK:
-            self.context['new_cycle'] = True
-            self.__shorts_taken = 0
-        # Only shorts exist -> set cycle when enough short breaks pass
-        elif self.__shorts_taken  == self.__cycle_len:
-            self.context['new_cycle'] = True
-            self.__shorts_taken = 0
-        else:
-            self.context['new_cycle'] = False
-
         if self.__current_break is not None:
             # Reset the time of long breaks
             if self.__current_break.type == BreakType.LONG_BREAK:
@@ -166,8 +157,16 @@ def reset(self):
         for break_object in self.__long_queue:
             break_object.time = self.__long_break_time
 
-    def is_empty(self):
-        return self.__short_queue is None and self.__long_queue is None
+    def is_empty(self, break_type = None):
+        """
+        Check if the given break type is empty or not. If the break_type is None, check for both short and long breaks.
+        """
+        if break_type == BreakType.SHORT_BREAK:
+            return self.__short_queue is None
+        elif break_type == BreakType.LONG_BREAK:
+            return self.__long_queue is None
+        else:
+            return self.__short_queue is None and self.__long_queue is None
 
     def __next_short(self):
         longs  = self.__long_queue
@@ -185,7 +184,6 @@ def __next_short(self):
         if self.__current_short == 0 and self.__is_random_order:
             self.__build_shorts()
 
-        self.__shorts_taken += 1
         return break_obj
 
     def __next_long(self):
diff --git a/safeeyes/plugins/healthstats/plugin.py b/safeeyes/plugins/healthstats/plugin.py
index d66c9ae..041bf98 100644
--- a/safeeyes/plugins/healthstats/plugin.py
+++ b/safeeyes/plugins/healthstats/plugin.py
@@ -27,7 +27,6 @@
 context = None
 no_of_skipped_breaks = 0
 no_of_breaks = 0
-no_of_cycles = -1
 session = None
 safe_eyes_start_time = datetime.datetime.now()
 total_idle_time = 0
@@ -46,7 +45,6 @@ def init(ctx, safeeyes_config, plugin_config):
     global session
     global no_of_skipped_breaks
     global no_of_breaks
-    global no_of_cycles
     global statistics_reset_cron
     global safe_eyes_start_time
     global total_idle_time
@@ -71,7 +69,6 @@ def init(ctx, safeeyes_config, plugin_config):
         if session is None:
             session = {'no_of_skipped_breaks': 0,
                        'no_of_breaks': 0,
-                       'no_of_cycles': -1,
                        'safe_eyes_start_time': safe_eyes_start_time.strftime("%Y-%m-%d %H:%M:%S"),
                        'total_idle_time': 0,
                        'last_screen_time': -1,
@@ -79,7 +76,6 @@ def init(ctx, safeeyes_config, plugin_config):
             context['session']['plugin']['healthstats'] = session
         no_of_skipped_breaks = session.get('no_of_skipped_breaks', 0)
         no_of_breaks = session.get('no_of_breaks', 0)
-        no_of_cycles = session.get('no_of_cycles', -1)
         total_idle_time = session.get('total_idle_time', 0)
         last_screen_time = session.get('last_screen_time', -1)
         str_time = session.get('safe_eyes_start_time', None)
@@ -115,12 +111,8 @@ def get_widget_title(break_obj):
         return ""
 
     global no_of_breaks
-    global no_of_cycles
     no_of_breaks += 1
-    if context['new_cycle']:
-        no_of_cycles += 1
     session['no_of_breaks'] = no_of_breaks
-    session['no_of_cycles'] = no_of_cycles
     session['safe_eyes_start_time'] = safe_eyes_start_time.strftime("%Y-%m-%d %H:%M:%S")
     session['total_idle_time'] = total_idle_time
     session['last_screen_time'] = last_screen_time
@@ -129,7 +121,6 @@ def get_widget_title(break_obj):
 
 def _reset_stats():
     global no_of_breaks
-    global no_of_cycles
     global safe_eyes_start_time
     global total_idle_time
     global no_of_skipped_breaks
@@ -154,10 +145,8 @@ def _reset_stats():
         last_screen_time = round((total_duration_sec - total_idle_time) / 60)
         total_idle_time = 0
         no_of_breaks = 0
-        no_of_cycles = 0
         no_of_skipped_breaks = 0
         session['no_of_breaks'] = 0
-        session['no_of_cycles'] = 0
         session['no_of_skipped_breaks'] = 0
         session['safe_eyes_start_time'] = safe_eyes_start_time.strftime("%Y-%m-%d %H:%M:%S")
         session['total_idle_time'] = total_idle_time
@@ -195,7 +184,7 @@ def get_widget_content(break_obj):
         elif screen_time < last_screen_time:
             symbol = '-'
         screen_time_diff = ' ( {}{:02d}:{:02d} )'.format(symbol, hrs_diff, mins_diff)
-    return "{}\tBREAKS: {}\tSKIPPED: {}\tCYCLES: {}\tSCREEN TIME: {}{}".format(heart, no_of_breaks, no_of_skipped_breaks, no_of_cycles, time_format, screen_time_diff)
+    return "{}\tBREAKS: {}\tSKIPPED: {}\tSCREEN TIME: {}{}".format(heart, no_of_breaks, no_of_skipped_breaks, time_format, screen_time_diff)
 
 
 def on_start():
diff --git a/safeeyes/plugins/trayicon/plugin.py b/safeeyes/plugins/trayicon/plugin.py
index 9fb3b48..de90326 100644
--- a/safeeyes/plugins/trayicon/plugin.py
+++ b/safeeyes/plugins/trayicon/plugin.py
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
+from safeeyes.model import BreakType
 import gi
 gi.require_version('Gtk', '3.0')
 try:
@@ -85,10 +86,8 @@ def __init__(self, context, plugin_config):
         self.item_enable.connect('activate', self.on_enable_clicked)
 
         self.item_disable = Gtk.MenuItem()
-        self.item_disable.connect('activate', self.on_disable_clicked)
-
         self.sub_menu_disable = Gtk.Menu()
-        self.sub_menu_items = []
+        self.sub_menu_disable_items = []
 
         # Read disable options and build the sub menu
         for disable_option in plugin_config['disable_options']:
@@ -116,7 +115,7 @@ def __init__(self, context, plugin_config):
             # Create submenu
             sub_menu_item = Gtk.MenuItem()
             sub_menu_item.connect('activate', self.on_disable_clicked, time_in_minutes)
-            self.sub_menu_items.append([sub_menu_item, label, disable_option['time']])
+            self.sub_menu_disable_items.append([sub_menu_item, label, disable_option['time']])
             self.sub_menu_disable.append(sub_menu_item)
 
         # Disable until restart submenu
@@ -129,7 +128,19 @@ def __init__(self, context, plugin_config):
 
         # Settings menu item
         self.item_manual_break = Gtk.MenuItem()
-        self.item_manual_break.connect('activate', self.on_manual_break_clicked)
+
+        self.sub_menu_manual_next_break = Gtk.MenuItem()
+        self.sub_menu_manual_next_break.connect('activate', self.on_manual_break_clicked, None)
+        self.sub_menu_manual_next_short_break = Gtk.MenuItem()
+        self.sub_menu_manual_next_short_break.connect('activate', self.on_manual_break_clicked, BreakType.SHORT_BREAK)
+        self.sub_menu_manual_next_long_break = Gtk.MenuItem()
+        self.sub_menu_manual_next_long_break.connect('activate', self.on_manual_break_clicked, BreakType.LONG_BREAK)
+
+        self.sub_menu_manual_break = Gtk.Menu()
+        self.sub_menu_manual_break.append(self.sub_menu_manual_next_break)
+        self.sub_menu_manual_break.append(self.sub_menu_manual_next_short_break)
+        self.sub_menu_manual_break.append(self.sub_menu_manual_next_long_break)
+        self.item_manual_break.set_submenu(self.sub_menu_manual_break)
 
         # Settings menu item
         self.item_settings = Gtk.MenuItem()
@@ -182,7 +193,7 @@ def set_labels(self):
         """
         Update the text of menu items based on the selected language.
         """
-        for entry in self.sub_menu_items:
+        for entry in self.sub_menu_disable_items:
             # print(self.context['locale'].ngettext('For %d Hour', 'For %d Hours', 1) % 1)
             entry[0].set_label(self.context['locale'].ngettext(entry[1][0], entry[1][1], entry[2]) % entry[2])
 
@@ -213,6 +224,9 @@ def set_labels(self):
         self.item_manual_break.set_sensitive(breaks_found and self.active)
 
         self.item_manual_break.set_label(_('Take a break now'))
+        self.sub_menu_manual_next_break.set_label(_('Any break'))
+        self.sub_menu_manual_next_short_break.set_label(_('Short break'))
+        self.sub_menu_manual_next_long_break.set_label(_('Long break'))
         self.item_settings.set_label(_('Settings'))
         self.item_about.set_label(_('About'))
         self.item_quit.set_label(_('Quit'))
@@ -282,7 +296,11 @@ def on_manual_break_clicked(self, *args):
         """
         Trigger a break manually.
         """
-        self.take_break()
+        if len(args) > 1:
+            break_type = args[1]
+            self.take_break(break_type)
+        else:
+            self.take_break()
 
     def on_enable_clicked(self, *args):
         """
diff --git a/safeeyes/safeeyes.py b/safeeyes/safeeyes.py
index 9ce47eb..709ec0c 100644
--- a/safeeyes/safeeyes.py
+++ b/safeeyes/safeeyes.py
@@ -93,8 +93,7 @@ def __init__(self, system_locale, config):
         self.safe_eyes_core.on_stop_break += self.stop_break
         self.safe_eyes_core.on_update_next_break += self.update_next_break
         self.safe_eyes_core.initialize(self.config)
-        self.context['api']['take_break'] = lambda: utility.execute_main_thread(
-            self.safe_eyes_core.take_break)
+        self.context['api']['take_break'] = self.take_break
         self.context['api']['has_breaks'] = self.safe_eyes_core.has_breaks
         self.context['api']['postpone'] = self.safe_eyes_core.postpone
         self.plugins_manager.init(self.context, self.config)
@@ -295,11 +294,11 @@ def stop_break(self):
         self.plugins_manager.stop_break()
         return True
 
-    def take_break(self):
+    def take_break(self, break_type = None):
         """
         Take a break now.
         """
-        self.safe_eyes_core.take_break()
+        utility.execute_main_thread(self.safe_eyes_core.take_break, break_type)
 
     def status(self):
         """

From 788e2b43af4c1fb6d49714234ad026caf4e757b9 Mon Sep 17 00:00:00 2001
From: AdamPS <5490095+AdamPS@users.noreply.github.com>
Date: Mon, 23 Jan 2023 15:51:52 +0000
Subject: [PATCH 04/13] Improve error message to include information from the
 exception

---
 safeeyes/plugin_manager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/safeeyes/plugin_manager.py b/safeeyes/plugin_manager.py
index 4127872..9e8a53f 100644
--- a/safeeyes/plugin_manager.py
+++ b/safeeyes/plugin_manager.py
@@ -84,8 +84,8 @@ def init(self, context, config):
         for plugin in config.get('plugins'):
             try:
                 self.__load_plugin(plugin)
-            except BaseException:
-                logging.error('Error in loading the plugin: %s', plugin['id'])
+            except BaseException as e:
+                logging.error('Error in loading the plugin %s: %s', plugin['id'], e)
                 continue
         # Initialize the plugins
         for plugin in self.__plugins_on_init:

From 9a76aa4211a37f73d7cc976925308a3f0770ae1f Mon Sep 17 00:00:00 2001
From: AdamPS <5490095+AdamPS@users.noreply.github.com>
Date: Tue, 24 Jan 2023 16:49:30 +0000
Subject: [PATCH 05/13] #347 Take short or long breaks from tray

Correction: get_break() should not alter the break queue.
---
 safeeyes/core.py  | 13 ++++++++-----
 safeeyes/model.py | 14 +++++++++-----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/safeeyes/core.py b/safeeyes/core.py
index 178bb9f..00a7f98 100644
--- a/safeeyes/core.py
+++ b/safeeyes/core.py
@@ -167,7 +167,9 @@ def __take_break(self, break_type = None):
             time.sleep(1)  # Wait for 1 sec to ensure the sceduler is dead
             self.running = True
 
-        utility.execute_main_thread(self.__fire_start_break, break_type)
+        if break_type is not None and self.break_queue.get_break().type != break_type:
+            self.break_queue.next(break_type)
+        utility.execute_main_thread(self.__fire_start_break)
 
     def __scheduler_job(self):
         """
@@ -243,8 +245,8 @@ def __postpone_break(self):
         self.__wait_for(self.postpone_duration)
         utility.execute_main_thread(self.__fire_start_break)
 
-    def __fire_start_break(self, break_type = None):
-        break_obj = self.break_queue.get_break(break_type)
+    def __fire_start_break(self):
+        break_obj = self.break_queue.get_break()
         # Show the break screen
         if not self.on_start_break.fire(break_obj):
             # Plugins want to ignore this break
@@ -260,13 +262,14 @@ def __fire_start_break(self, break_type = None):
             utility.start_thread(self.__postpone_break)
         else:
             self.start_break.fire(break_obj)
-            utility.start_thread(self.__start_break, break_obj = break_obj)
+            utility.start_thread(self.__start_break)
 
-    def __start_break(self, break_obj):
+    def __start_break(self):
         """
         Start the break screen.
         """
         self.context['state'] = State.BREAK
+        break_obj = self.break_queue.get_break()
         countdown = break_obj.duration
         total_break_time = countdown
 
diff --git a/safeeyes/model.py b/safeeyes/model.py
index 888b3f7..5dd3ee8 100644
--- a/safeeyes/model.py
+++ b/safeeyes/model.py
@@ -114,11 +114,15 @@ def __init__(self, config, context):
 
     def get_break(self, break_type = None):
         if self.__current_break is None:
-            self.__current_break = self.next(break_type)
-        elif break_type is not None and self.__current_break.type != break_type:
-            self.__current_break = self.next(break_type)
+            self.__current_break = self.next()
 
-        return self.__current_break
+        if break_type is None or self.__current_break.type == break_type:
+            return self.__current_break
+
+        if break_type == BreakType.LONG_BREAK:
+            return self.__long_queue[self.__current_long]
+
+        return self.__short_queue[self.__current_short]
 
     def is_long_break(self):
         return self.__current_break is not None and self.__current_break.type == BreakType.LONG_BREAK
@@ -153,7 +157,7 @@ def next(self, break_type = None):
     def reset(self):
         for break_object in self.__short_queue:
             break_object.time = self.__short_break_time
-        
+
         for break_object in self.__long_queue:
             break_object.time = self.__long_break_time

From 201e6d2982591e86911d42d245d3c5b7a0ddd5fc Mon Sep 17 00:00:00 2001
From: AdamPS <5490095+AdamPS@users.noreply.github.com>
Date: Tue, 24 Jan 2023 17:22:51 +0000
Subject: [PATCH 06/13] Fix incorrectly skipped long breaks #443 (#444)

* Improve error message to include information from the exception

* #347 Take short or long breaks from tray

Correction: get_break() should not alter the break queue.

* Fix incorrectly skipped long breaks
---
 safeeyes/model.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/safeeyes/model.py b/safeeyes/model.py
index 5dd3ee8..63c88e8 100644
--- a/safeeyes/model.py
+++ b/safeeyes/model.py
@@ -132,6 +132,19 @@ def next(self, break_type = None):
         shorts = self.__short_queue
         longs  = self.__long_queue
 
+        # Reset break that has just ended
+        if self.is_long_break():
+            self.__current_break.time = self.__long_break_time
+            if self.__current_long == 0 and self.__is_random_order:
+                # Shuffle queue
+                self.__build_longs()
+        elif self.__current_break:
+            # Reduce the break time from the next long break (default)
+            if longs:
+                longs[self.__current_long].time -= shorts[self.__current_short].time
+            if self.__current_short == 0 and self.__is_random_order:
+                self.__build_shorts()
+
         if self.is_empty():
             return None
 
@@ -144,11 +157,6 @@ def next(self, break_type = None):
         else:
             break_obj = self.__next_short()
 
-        if self.__current_break is not None:
-            # Reset the time of long breaks
-            if self.__current_break.type == BreakType.LONG_BREAK:
-                self.__current_break.time = self.__long_break_time
-
         self.__current_break = break_obj
         self.context['session']['break'] = self.__current_break.name
 
@@ -177,17 +185,10 @@ def __next_short(self):
         shorts = self.__short_queue
         break_obj = shorts[self.__current_short]
         self.context['break_type'] = 'short'
-        # Reduce the break time from the next long break (default)
-        if longs:
-            longs[self.__current_long].time -= shorts[self.__current_short].time
 
         # Update the index to next
         self.__current_short = (self.__current_short + 1) % len(shorts)
 
-        # Shuffle queue
-        if self.__current_short == 0 and self.__is_random_order:
-            self.__build_shorts()
-
         return break_obj
 
     def __next_long(self):
@@ -198,10 +199,6 @@ def __next_long(self):
         # Update the index to next
         self.__current_long = (self.__current_long + 1) % len(longs)
 
-        # Shuffle queue
-        if self.__current_long == 0 and self.__is_random_order:
-            self.__build_longs()
-
         return break_obj
 
     def __build_queue(self, break_type, break_configs, break_time, break_duration):

From 7bde5d03686573f47cc396c299197d976077bc2a Mon Sep 17 00:00:00 2001
From: Yi Yunseok <ironyunseok@protonmail.com>
Date: Thu, 2 Feb 2023 04:48:05 +0000
Subject: [PATCH 07/13] Translated using Weblate (Korean)

Currently translated at 100.0% (116 of 116 strings)

Translation: Safe Eyes/Translations
Translate-URL: https://hosted.weblate.org/projects/safe-eyes/translations/ko/
---
 safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po b/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po
index 142e694..d4972f5 100644
--- a/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2021-02-24 07:50+0000\n"
-"Last-Translator: Lee Yunseok <ironyunseok@protonmail.com>\n"
+"PO-Revision-Date: 2023-02-03 06:02+0000\n"
+"Last-Translator: Yi Yunseok <ironyunseok@protonmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/safe-eyes/"
 "translations/ko/>\n"
 "Language: ko\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.5\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 # Short break
 msgid "Tightly close your eyes"
@@ -346,7 +346,7 @@ msgstr "세이프 아이즈 사용에 기반한 통계 표시"
 
 # plugin/healthstats
 msgid "Statistics reset interval (cron expression)"
-msgstr "통계 재설정 간격 (크론 표현식)"
+msgstr "통계 초기화 간격 (cron 표현식)"
 
 # plugin/notification
 msgid "Notification"

From d1a9f7d0b561e580f1cb88d833d422c799ba0c05 Mon Sep 17 00:00:00 2001
From: Luna Jernberg <droidbittin@gmail.com>
Date: Fri, 10 Feb 2023 10:45:12 +0000
Subject: [PATCH 08/13] Translated using Weblate (Swedish)

Currently translated at 100.0% (116 of 116 strings)

Translation: Safe Eyes/Translations
Translate-URL: https://hosted.weblate.org/projects/safe-eyes/translations/sv/
---
 safeeyes/config/locale/sv/LC_MESSAGES/safeeyes.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/safeeyes/config/locale/sv/LC_MESSAGES/safeeyes.po b/safeeyes/config/locale/sv/LC_MESSAGES/safeeyes.po
index 03aa466..fc4d298 100644
--- a/safeeyes/config/locale/sv/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/sv/LC_MESSAGES/safeeyes.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2021-08-18 00:37+0000\n"
+"PO-Revision-Date: 2023-02-11 11:39+0000\n"
 "Last-Translator: Luna Jernberg <droidbittin@gmail.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/safe-eyes/"
 "translations/sv/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.8-dev\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 # Short break
 msgid "Tightly close your eyes"
@@ -138,7 +138,7 @@ msgstr "Uppskjutningsvaraktighet (i minuter)"
 
 # Settings dialog
 msgid "Show breaks in random order"
-msgstr ""
+msgstr "Visa avbrott i slumpmässig ordning"
 
 # Settings dialog
 msgid "Strict break (No way to skip breaks)"

From 0874be58c285383407e4589cce3c4622f643e932 Mon Sep 17 00:00:00 2001
From: Yi Yunseok <ironyunseok@protonmail.com>
Date: Thu, 16 Feb 2023 05:23:49 +0000
Subject: [PATCH 09/13] Translated using Weblate (Korean)

Currently translated at 100.0% (116 of 116 strings)

Translation: Safe Eyes/Translations
Translate-URL: https://hosted.weblate.org/projects/safe-eyes/translations/ko/
---
 safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po b/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po
index d4972f5..31dd539 100644
--- a/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2023-02-03 06:02+0000\n"
+"PO-Revision-Date: 2023-02-17 05:35+0000\n"
 "Last-Translator: Yi Yunseok <ironyunseok@protonmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/safe-eyes/"
 "translations/ko/>\n"
@@ -346,7 +346,7 @@ msgstr "세이프 아이즈 사용에 기반한 통계 표시"
 
 # plugin/healthstats
 msgid "Statistics reset interval (cron expression)"
-msgstr "통계 초기화 간격 (cron 표현식)"
+msgstr "통계 초기화 간격 (크론 표현식)"
 
 # plugin/notification
 msgid "Notification"

From cae19b0f28f14036d1a2a4c840bf3e6f68c02b6f Mon Sep 17 00:00:00 2001
From: AHOHNMYC <lqwh2h2cwa@protonmail.com>
Date: Tue, 21 Mar 2023 16:18:16 +0000
Subject: [PATCH 10/13] Translated using Weblate (Russian)

Currently translated at 100.0% (116 of 116 strings)

Translation: Safe Eyes/Translations
Translate-URL: https://hosted.weblate.org/projects/safe-eyes/translations/ru/
---
 safeeyes/config/locale/ru/LC_MESSAGES/safeeyes.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/safeeyes/config/locale/ru/LC_MESSAGES/safeeyes.po b/safeeyes/config/locale/ru/LC_MESSAGES/safeeyes.po
index e5c140c..17f57d1 100644
--- a/safeeyes/config/locale/ru/LC_MESSAGES/safeeyes.po
+++ b/safeeyes/config/locale/ru/LC_MESSAGES/safeeyes.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-12-21 05:47+0000\n"
-"Last-Translator: Dmitriy Q <krotesk@mail.ru>\n"
+"PO-Revision-Date: 2023-03-22 16:41+0000\n"
+"Last-Translator: AHOHNMYC <lqwh2h2cwa@protonmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/safe-eyes/"
 "translations/ru/>\n"
 "Language: ru\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
-"X-Generator: Weblate 4.15.1-dev\n"
+"X-Generator: Weblate 4.16.2-dev\n"
 
 # Short break
 msgid "Tightly close your eyes"
@@ -157,11 +157,11 @@ msgstr "Сохранять внутреннее состояние"
 
 # Settings dialog
 msgid "Use RPC server to receive runtime commands"
-msgstr "Использовать RPC-сервер для получения запущенных команд"
+msgstr "Используйте RPC сервер для получения команд во время работы приложения"
 
 # Settings dialog
 msgid "Without the RPC server, command-line commands may not work"
-msgstr "Без RPC сервера команды из командной строки могут не работать"
+msgstr "Без RPC сервера команды из командной строки могут не сработать"
 
 # Settings dialog
 msgid "Long break interval must be a multiple of short break interval"

From 682a027d0443f7627587a0710819aa0ca804b664 Mon Sep 17 00:00:00 2001
From: Ilario Gelmetti <iochesonome@gmail.com>
Date: Tue, 18 Apr 2023 02:02:26 +0200
Subject: [PATCH 11/13] Remove executable permission from safeeyes.desktop
 (#512)

---
 safeeyes/platform/safeeyes.desktop | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 safeeyes/platform/safeeyes.desktop

diff --git a/safeeyes/platform/safeeyes.desktop b/safeeyes/platform/safeeyes.desktop
old mode 100755
new mode 100644

From 06d8f491c49613ad8dec3417be6b8ddc49abe46a Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Tue, 18 Apr 2023 02:06:11 +0200
Subject: [PATCH 12/13] Fix support for Python 3.11 (fixes #491) (#505)

Co-authored-by: tibequadorian <tibequadorian@posteo.de>
---
 safeeyes/utility.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/safeeyes/utility.py b/safeeyes/utility.py
index bf2dede..7e08735 100644
--- a/safeeyes/utility.py
+++ b/safeeyes/utility.py
@@ -666,7 +666,7 @@ def has_method(module, method_name, no_of_args=0):
     Check whether the given function is defined in the module or not.
     """
     if hasattr(module, method_name):
-        if len(inspect.getargspec(getattr(module, method_name)).args) == no_of_args:
+        if len(inspect.getfullargspec(getattr(module, method_name)).args) == no_of_args:
             return True
     return False

From 45a633d31fc16f2c3fc2da23bc598b7a10aabff0 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Tue, 18 Apr 2023 02:06:26 +0200
Subject: [PATCH 13/13] Display a traceback of plugin loading errors when
 --debug is given (#506)

---
 safeeyes/plugin_manager.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/safeeyes/plugin_manager.py b/safeeyes/plugin_manager.py
index 9e8a53f..6dfaa7a 100644
--- a/safeeyes/plugin_manager.py
+++ b/safeeyes/plugin_manager.py
@@ -85,6 +85,10 @@ def init(self, context, config):
             try:
                 self.__load_plugin(plugin)
             except BaseException as e:
+                traceback_wanted = logging.getLogger().getEffectiveLevel() == logging.DEBUG
+                if traceback_wanted:
+                    import traceback
+                    traceback.print_exc()
                 logging.error('Error in loading the plugin %s: %s', plugin['id'], e)
                 continue
         # Initialize the plugins

Places

File _service:download_files:v2.1.5...master.patch of Package safeeyes (Revision f296b22f08c547097e2eadf4426e06ac)

Places