Merge pull request #600 from slgobinath/master

release 2.2.0

README.md

@@ -1,3 +1,5 @@
+<img src="safeeyes/platform/icons/hicolor/64x64/apps/io.github.slgobinath.SafeEyes.png" align="left">
+
 # Safe Eyes
 
 [![Release](https://img.shields.io/github/v/release/slgobinath/SafeEyes)](https://github.com/slgobinath/SafeEyes/releases)
@@ -35,10 +37,19 @@ optional arguments:
 
 ## Installation guide
 
-Safe Eyes is available in Ubuntu PPA, Arch AUR, Gentoo and Python PyPI. You can choose any installation source and install on any Linux system with Python 3.
+Safe Eyes is available on the official repositories of many popular the distributions.
+
+<a href="https://repology.org/project/safeeyes/versions">
+    <img src="https://repology.org/badge/vertical-allrepos/safeeyes.svg" alt="Packaging status" align="right">
+</a>
+
+It is also available in Ubuntu PPA, Arch AUR, Gentoo and Python PyPI. You can choose any installation source and install on any Linux system with Python 3.
+
 
 ### Ubuntu, Linux Mint and other Ubuntu Derivatives
 
+The official Safe Eyes PPA hosts the latest version of safeeyes for Ubuntu 22.04 and above. On older versions of Ubuntu, an older version of Safe Eyes is available on the official repositories.
+
 ```bash
 sudo add-apt-repository ppa:safeeyes-team/safeeyes
 sudo apt update
@@ -100,6 +111,7 @@ Ensure to meet the following dependencies:
 - python3-psutil
 - xprintidle (optional)
 - wlrctl (wayland optional)
+- Python 3.10+
 
 **To install Safe Eyes:**
 
@@ -138,7 +150,7 @@ Some Linux systems like CentOS do not have matching dependencies available in th
 
     python3 -m venv venv
     source venv/bin/activate
-    pip3 install dbus-python safeeyes
+    pip3 install safeeyes
     ```
 
 3. Start Safe Eyes from the terminal
@@ -168,13 +180,14 @@ Thirdparty plugins are available at another GitHub repository: [safeeyes-plugins
 
 ## How to Release?
 
+0. Run `update-po.sh` to generate new translation files (which will be eventually updated by translators). Commit and push the changes to the master branch.
 1. Checkout the latest commits from the `master` branch
 2. Run `python3 -m safeeyes` to make sure nothing is broken
 3. Update the Safe Eyes version in the following places (Open the project in VSCode and search for the current version):
-    - [setup.py](https://github.com/slgobinath/SafeEyes/blob/master/setup.py#L81)
-    - [setup.py](https://github.com/slgobinath/SafeEyes/blob/master/setup.py#L88)
+    - [setup.py](https://github.com/slgobinath/SafeEyes/blob/master/setup.py#L83)
+    - [setup.py](https://github.com/slgobinath/SafeEyes/blob/master/setup.py#L90)
     - [safeeyes.py](https://github.com/slgobinath/SafeEyes/blob/master/safeeyes/safeeyes.py#L43)
-    - [io.github.slgobinath.SafeEyes.metainfo.xml](https://github.com/slgobinath/SafeEyes/blob/master/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml#L50)
+    - [io.github.slgobinath.SafeEyes.metainfo.xml](https://github.com/slgobinath/SafeEyes/blob/master/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml#L56)
     - [about_dialog.glade](https://github.com/slgobinath/SafeEyes/blob/master/safeeyes/glade/about_dialog.glade#L74)
 4. Update the [changelog](https://github.com/slgobinath/SafeEyes/blob/master/debian/changelog) (for Ubuntu release)
 5. Commit the changes to `master`

debian/changelog

@@ -1,3 +1,9 @@
+safeeyes (2.2.0) jammy; urgency=medium
+
+  * Limit consecutive skips
+
+ -- Archisman Panigrahi <[email protected]>  Sun, 14 Jul 2024 09:30:12 -0400
+
 safeeyes (2.1.9) noble; urgency=medium
 
   * Fix crash in smartpause

debian/control

@@ -2,14 +2,14 @@ Source: safeeyes
 Section: utils
 Priority: optional
 Maintainer: Gobinath Loganathan <[email protected]>
-Build-Depends: debhelper (>= 10), dh-python, python3, python3-setuptools
+Build-Depends: debhelper (>= 10), dh-python, python3, python3-packaging, python3-setuptools
 Standards-Version: 3.9.6
-X-Python3-Version: >= 3.5
+X-Python3-Version: >= 3.10
 Homepage: https://github.com/slgobinath/SafeEyes/
 
 Package: safeeyes
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-ayatanaappindicator3-0.1, python3 (>= 3.5.0), python3-xlib, python3-dbus, gir1.2-notify-0.7, python3-babel, x11-utils, xprintidle, alsa-utils, python3-psutil, python3-croniter
+Depends: ${misc:Depends}, ${python3:Depends}, gir1.2-ayatanaappindicator3-0.1, python3 (>= 3.10.0), python3-xlib, python3-dbus, gir1.2-notify-0.7, python3-babel, x11-utils, xprintidle, alsa-utils, python3-psutil, python3-croniter
 Description: Safe Eyes
  Safe Eyes is a simple tool to remind you to take periodic breaks for your eyes. This is essential for anyone spending more time on the computer to avoid eye strain and other physical problems.
  .

safeeyes/__main__.py

@@ -25,19 +25,14 @@
 import logging
 import signal
 import sys
-from threading import Timer
 
-import gi
 import psutil
 from safeeyes import utility
 from safeeyes.model import Config
 from safeeyes.safeeyes import SafeEyes
 from safeeyes.safeeyes import SAFE_EYES_VERSION
 from safeeyes.rpc import RPCClient
 
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-
 gettext.install('safeeyes', utility.LOCALE_PATH)
 
 
@@ -68,22 +63,6 @@ def __running():
     return False
 
 
-def __evaluate_arguments(args, safe_eyes):
-    """
-    Evaluate the arguments and execute the operations.
-    """
-    if args.about:
-        utility.execute_main_thread(safe_eyes.show_about)
-    elif args.disable:
-        utility.execute_main_thread(safe_eyes.disable_safeeyes)
-    elif args.enable:
-        utility.execute_main_thread(safe_eyes.enable_safeeyes)
-    elif args.settings:
-        utility.execute_main_thread(safe_eyes.show_settings)
-    elif args.take_break:
-        utility.execute_main_thread(safe_eyes.take_break)
-
-
 def main():
     """
     Start the Safe Eyes.
@@ -147,10 +126,8 @@ def main():
             sys.exit(0)
         elif not args.quit:
             logging.info("Starting Safe Eyes")
-            safe_eyes = SafeEyes(system_locale, config)
+            safe_eyes = SafeEyes(system_locale, config, args)
             safe_eyes.start()
-            Timer(1.0, lambda: __evaluate_arguments(args, safe_eyes)).start()
-            Gtk.main()
 
 
 if __name__ == '__main__':

safeeyes/config/locale/ar/LC_MESSAGES/safeeyes.po

@@ -486,6 +486,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 "حتى إعادة التشغيل"
@@ -506,6 +518,22 @@ msgstr "أوقِف مشغلات الوسائط في شاشة فترة الاست
 msgid "Pause media"
 msgstr "أوقِف الوسائط"
 
+# plugin/limitconsecutiveskipping
+msgid "Limit Consecutive Skipping"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "How many skips or postpones are allowed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Limit how many breaks can be skipped or postponed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Skipped or postponed %d/%d breaks in a row"
+msgstr ""
+
 # plugin/healthstats
 #~ msgid "Interval to reset statistics (in hours)"
 #~ msgstr "مهلة تصفير الإعدادات (ساعات)"

safeeyes/config/locale/bg/LC_MESSAGES/safeeyes.po

@@ -472,6 +472,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 "До рестартиране"
@@ -491,3 +503,19 @@ msgstr ""
 # plugin/mediacontrol
 msgid "Pause media"
 msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Limit Consecutive Skipping"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "How many skips or postpones are allowed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Limit how many breaks can be skipped or postponed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Skipped or postponed %d/%d breaks in a row"
+msgstr ""

safeeyes/config/locale/ca/LC_MESSAGES/safeeyes.po

@@ -171,7 +171,8 @@ msgstr "Restablir"
 
 # Settings dialog
 msgid "Are you sure you want to reset all settings to default?"
-msgstr "De veritat que voleu restablir les preferències als valors per defecte?"
+msgstr ""
+"De veritat que voleu restablir les preferències als valors per defecte?"
 
 # Settings dialog
 msgid "Options"
@@ -475,6 +476,18 @@ msgstr "Configuració"
 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 "Fins que es reinicïi"
@@ -494,3 +507,19 @@ msgstr ""
 # plugin/mediacontrol
 msgid "Pause media"
 msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Limit Consecutive Skipping"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "How many skips or postpones are allowed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Limit how many breaks can be skipped or postponed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Skipped or postponed %d/%d breaks in a row"
+msgstr ""

safeeyes/config/locale/cs/LC_MESSAGES/safeeyes.po

@@ -482,6 +482,18 @@ msgstr "Nastavení"
 msgid "Take a break now"
 msgstr "Udělat si přestávku"
 
+#: plugins/trayicon
+msgid "Any break"
+msgstr ""
+
+#: plugins/trayicon
+msgid "Short break"
+msgstr ""
+
+#: plugins/trayicon
+msgid "Long break"
+msgstr ""
+
 #: plugins/trayicon
 msgid "Until restart"
 msgstr "Do restartu"
@@ -502,6 +514,22 @@ msgstr "Pozastavit přehrávače médií z obrazovky přestávky"
 msgid "Pause media"
 msgstr "Pozastavit média"
 
+# plugin/limitconsecutiveskipping
+msgid "Limit Consecutive Skipping"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "How many skips or postpones are allowed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Limit how many breaks can be skipped or postponed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Skipped or postponed %d/%d breaks in a row"
+msgstr ""
+
 # plugin/healthstats
 #~ msgid "Interval to reset statistics (in hours)"
 #~ msgstr "Interval pro resetování statistik (v hodinách)"

safeeyes/config/locale/da/LC_MESSAGES/safeeyes.po

@@ -475,6 +475,18 @@ msgstr "Indstillinger"
 msgid "Take a break now"
 msgstr "Hold pause nu"
 
+#: plugins/trayicon
+msgid "Any break"
+msgstr ""
+
+#: plugins/trayicon
+msgid "Short break"
+msgstr ""
+
+#: plugins/trayicon
+msgid "Long break"
+msgstr ""
+
 #: plugins/trayicon
 msgid "Until restart"
 msgstr "Indtil genstart"
@@ -495,6 +507,22 @@ msgstr "Pause multimedieafspillere fra pause skærm"
 msgid "Pause media"
 msgstr "Pause medier"
 
+# plugin/limitconsecutiveskipping
+msgid "Limit Consecutive Skipping"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "How many skips or postpones are allowed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Limit how many breaks can be skipped or postponed in a row"
+msgstr ""
+
+# plugin/limitconsecutiveskipping
+msgid "Skipped or postponed %d/%d breaks in a row"
+msgstr ""
+
 # plugin/healthstats
 #~ msgid "Interval to reset statistics (in hours)"
 #~ msgstr "Interval for nulstilling af statistik (i timer)"