merge master

Author: undefiened

.github/FUNDING.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Create Tag
         uses: mathieudutour/[email protected]
         with:
-          custom_tag: "v${{steps.get_current_version.outputs.project_version}}"
+          custom_tag: "${{steps.get_current_version.outputs.project_version}}"
           github_token: ${{ secrets.GH_API_SECRET }}
 
       - name: Build Changelog

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: Check translations
+
+# Drop permissions to minimum for security
+permissions:
+  contents: read
+
+on:
+  pull_request:
+  push:
+  workflow_dispatch:
+
+jobs:
+  check_translations:
+    name: Check translations
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+
+      - name: Install runtime dependencies
+        run: |
+          python3 -m pip install --upgrade pip setuptools wheel
+          python3 -m pip install polib
+
+      - name: Check translations
+        run: |
+          python3 validate_po.py

.github/workflows/translations.yml

@@ -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)
@@ -7,7 +9,6 @@
 [![Flathub](https://img.shields.io/flathub/v/io.github.slgobinath.SafeEyes)](https://flathub.org/apps/details/io.github.slgobinath.SafeEyes)
 [![Translation status](https://hosted.weblate.org/widgets/safe-eyes/-/translations/svg-badge.svg)](https://hosted.weblate.org/engage/safe-eyes/?utm_source=widget)
 [![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/slgobinath)
 
 Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder.
 
@@ -36,12 +37,21 @@ 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.
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/safeeyes.svg)](https://repology.org/project/safeeyes/versions)
+
+
+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:slgobinath/safeeyes
+sudo add-apt-repository ppa:safeeyes-team/safeeyes
 sudo apt update
 sudo apt install safeeyes
 ```
@@ -121,11 +131,11 @@ python3 -m safeeyes
 Safe Eyes installers install the required icons to `/usr/share/icons/hicolor`. When you run Safe Eyes from source without, some icons may not appear.
 
 
-### Install in Virtual Environment
+### Install in a virtual environment
 
-Some Linux systems like Cent OS do not have matching dependencies available in their repository. In such systems, you can install and use Safe Eyes in a Python Virtual Environment. The following instruction was tested on Cent OS 7.
+Some Linux systems like CentOS do not have matching dependencies available in their repository. In such systems, you can install and use Safe Eyes in a Python virtual environment.
 
-1. Install the necessary dependencies
+1. Install the necessary dependencies for CentOS 7
 
     ```bash
     sudo yum install python3-devel dbus dbus-devel cairo cairo-devel cairomm-devel libjpeg-turbo-devel pango pango-devel pangomm pangomm-devel gobject-introspection-devel cairo-gobject-devel
@@ -137,13 +147,12 @@ Some Linux systems like Cent OS do not have matching dependencies available in t
     mkdir ~/safeeyes
     cd ~/safeeyes/
 
-    pip3 install virtualenv --user
-    virtualenv --no-site-packages venv
+    python3 -m venv venv
     source venv/bin/activate
-    pip3 install dbus-python safeeyes
+    pip3 install safeeyes
     ```
 
-3. Start Safe Eyes from terminal
+3. Start Safe Eyes from the terminal
 
     ```bash
     cd ~/safeeyes & source venv/bin/activate
@@ -168,12 +177,23 @@ For more details, please check the issue: [#329](https://github.com/slgobinath/S
 
 Thirdparty plugins are available at another GitHub repository: [safeeyes-plugins](https://github.com/slgobinath/safeeyes-plugins). More details about how to write your own plugin and how to install third-party plugin are available there.
 
-## License
+## How to Release?
 
-GNU General Public License v3
+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)
+    - [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)
+    - [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`
+6. Create a pull-request from `master` to `release`
+7. Merge the PR to release **with merge commit** (Important to merge with merge commit)
 
-## IDE Support
 
-<p align="center">Thanks to JetBrains for offering IDE support to develop this Open Source project.</p>
+## License
 
-<p align="center"><a href="https://www.jetbrains.com/?from=SafeEyes"><img src="https://raw.githubusercontent.com/JetBrains/logos/master/web/jetbrains/jetbrains.svg?sanitize=true" width="64" align="center"></a></p>
+GNU General Public License v3

README.md

@@ -1,4 +1,18 @@
-safeeyes (2.1.5-0) lunar; urgency=high
+safeeyes (2.1.9) noble; urgency=medium
+
+  * Fix crash in smartpause
+
+ -- Gobinath Loganathan <[email protected]>  Tue, 18 Jun 2024 20:25:00 -0400
+
+safeeyes (2.1.8) noble; urgency=medium
+
+  * Support Python 3.12
+
+ -- Archisman Panigrahi <[email protected]>  Mon, 29 Apr 2024 02:09:48 -0400
+
+safeeyes (2.1.6-0) lunar; urgency=high
+  * Support Python 3.11
+
   * Minor bug fixes
 
   * Fix the ecd ..rror if there is no long break

build.sh

@@ -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
 Standards-Version: 3.9.6
-X-Python3-Version: >= 3.5
+X-Python3-Version: >= 3.12
 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.12.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.
  .

debian/changelog

@@ -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.
@@ -111,7 +90,7 @@ def main():
     args = parser.parse_args()
 
     # Initialize the logging
-    utility.intialize_logging(args.debug)
+    utility.initialize_logging(args.debug)
     utility.initialize_platform()
     config = Config()
 
@@ -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__':

debian/control

@@ -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 "حتى إعادة التشغيل"