Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 2.2.0 #600

Merged
merged 49 commits into from
Jul 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
bd51aed
Added plugin for limiting the number of consecutive skips or postpones
undefiened May 28, 2023
3428759
Fixed comment
undefiened May 28, 2023
bc7ae63
Added an icon
undefiened Jul 8, 2023
a54c164
Removed copyright
undefiened Jul 8, 2023
a33235b
Correctly detect all possible GNOME sessions in screen saver plugin l…
antoninkriz Nov 13, 2023
d93b048
Add dbus-python to required dependencies
terop Dec 30, 2023
e995446
Fix some typos
terop Dec 30, 2023
2786f55
donotdisturb: fix for GNOME
rhendric Apr 24, 2024
e087e8b
Remove build.sh
terop Dec 30, 2023
0346736
Merge pull request #557 from terop/update_build_sh
nifadyev Jun 26, 2024
bbcae91
Merge pull request #546 from antoninkriz/patch-1
deltragon Jun 26, 2024
a156cea
Merge pull request #571 from rhendric/rhendric/donotdisturb-gnome
deltragon Jun 26, 2024
1159d6c
Merge pull request #556 from terop/fix_typos
archisman-panigrahi Jun 26, 2024
5c0884f
Remove use of distutils
terop Dec 30, 2023
55693cb
Merge pull request #554 from terop/remove_looseversion
archisman-panigrahi Jun 26, 2024
8ad89e5
Merge pull request #555 from terop/add_dbus-python
deltragon Jun 26, 2024
603e1d7
Update locale files
slgobinath Jun 27, 2024
1c59cee
Translated using Weblate (Chinese (Simplified))
aerowolf Jun 26, 2024
d02e7d8
Merge branch 'origin/master' into Weblate.
weblate Jun 27, 2024
e2f54a8
README: Add updating translation to release checklist
archisman-panigrahi Jun 27, 2024
15b79ae
Merge pull request #590 from slgobinath/archisman-panigrahi-translati…
slgobinath Jun 27, 2024
e850b0a
Translated using Weblate (Turkish)
oersen Jun 27, 2024
0606fe1
Merge branch 'origin/master' into Weblate.
weblate Jun 28, 2024
08f5d57
Update installation section on README
archisman-panigrahi Jun 29, 2024
05b8b20
Merge pull request #593 from slgobinath/archisman-panigrahi-readme-up…
archisman-panigrahi Jun 29, 2024
8a78f71
Translated using Weblate (Spanish)
gallegonovato Jun 29, 2024
a4f0807
Merge branch 'origin/master' into Weblate.
weblate Jun 30, 2024
981988a
fix MetaInfo errors
Jul 1, 2024
64dc114
Merge pull request #594 from otuva/metainfo-fix
archisman-panigrahi Jul 1, 2024
60c45d2
Translated using Weblate (Italian)
albanobattistella Jul 2, 2024
6c9b00d
Translated using Weblate (Lithuanian)
embar- Jul 1, 2024
05d95ad
Merge branch 'origin/master' into Weblate.
weblate Jul 2, 2024
d834af9
Remove uses of deprecated gtk3 apis (#560)
deltragon Jul 3, 2024
56393cc
Fix icon in settings window
archisman-panigrahi Jul 6, 2024
321869c
Merge pull request #596 from archisman-panigrahi/master
archisman-panigrahi Jul 6, 2024
76551f0
fix another icon name in settings dialog
archisman-panigrahi Jul 6, 2024
bb59e6e
Merge pull request #597 from archisman-panigrahi/master
archisman-panigrahi Jul 6, 2024
657f803
Add Icon to README
archisman-panigrahi Jul 6, 2024
26242e8
Merge pull request #598 from slgobinath/archisman-panigrahi-readme-up…
archisman-panigrahi Jul 6, 2024
aa90e9b
Translated using Weblate (Slovak)
Jul 9, 2024
2707ea0
Merge branch 'origin/master' into Weblate.
weblate Jul 10, 2024
ff6c395
merge master
undefiened Jul 10, 2024
fabdc4a
added copyright
undefiened Jul 10, 2024
e91f8a5
Update README.md: Save space in repology tag and add minimum python v…
archisman-panigrahi Jul 11, 2024
3df23f1
Merge pull request #526 from undefiened/limit_consecutive_skips
archisman-panigrahi Jul 14, 2024
6477d1c
Update all translation files
archisman-panigrahi Jul 14, 2024
dfd471d
Update version: 2.2.0
archisman-panigrahi Jul 14, 2024
cd16750
Bring back support for python 3.10 in Ubuntu 22.04
archisman-panigrahi Jul 14, 2024
27c98e7
Merge pull request #599 from archisman-panigrahi/master
archisman-panigrahi Jul 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -100,6 +111,7 @@ Ensure to meet the following dependencies:
- python3-psutil
- xprintidle (optional)
- wlrctl (wayland optional)
- Python 3.10+

**To install Safe Eyes:**

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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`
Expand Down
8 changes: 0 additions & 8 deletions build.sh

This file was deleted.

6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
safeeyes (2.2.0) jammy; urgency=medium

* Limit consecutive skips

-- Archisman Panigrahi <apandada1@gmail.com> Sun, 14 Jul 2024 09:30:12 -0400

safeeyes (2.1.9) noble; urgency=medium

* Fix crash in smartpause
Expand Down
6 changes: 3 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Source: safeeyes
Section: utils
Priority: optional
Maintainer: Gobinath Loganathan <slgobinath@gmail.com>
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.
.
Expand Down
25 changes: 1 addition & 24 deletions safeeyes/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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__':
Expand Down
28 changes: 28 additions & 0 deletions safeeyes/config/locale/ar/LC_MESSAGES/safeeyes.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 "حتى إعادة التشغيل"
Expand All @@ -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 "مهلة تصفير الإعدادات (ساعات)"
28 changes: 28 additions & 0 deletions safeeyes/config/locale/bg/LC_MESSAGES/safeeyes.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 "До рестартиране"
Expand All @@ -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 ""
31 changes: 30 additions & 1 deletion safeeyes/config/locale/ca/LC_MESSAGES/safeeyes.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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 ""
28 changes: 28 additions & 0 deletions safeeyes/config/locale/cs/LC_MESSAGES/safeeyes.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)"
28 changes: 28 additions & 0 deletions safeeyes/config/locale/da/LC_MESSAGES/safeeyes.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)"
Loading
Loading