diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index ed4111f..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,12 +0,0 @@ -# These are supported funding model platforms - -github: slgobinath -patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: 'https://www.paypal.com/paypalme/slgobinath' diff --git a/README.md b/README.md index 6f9d160..f26b094 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,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. @@ -41,7 +40,7 @@ Safe Eyes is available in Ubuntu PPA, Arch AUR, Gentoo and Python PyPI. You can ### Ubuntu, Linux Mint and other Ubuntu Derivatives ```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 +120,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 +136,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 ``` -3. Start Safe Eyes from terminal +3. Start Safe Eyes from the terminal ```bash cd ~/safeeyes & source venv/bin/activate @@ -187,9 +185,3 @@ Thirdparty plugins are available at another GitHub repository: [safeeyes-plugins ## License GNU General Public License v3 - -## IDE Support - -

Thanks to JetBrains for offering IDE support to develop this Open Source project.

- -

diff --git a/debian/changelog b/debian/changelog index fc406bd..f656523 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +safeeyes (2.1.9) noble; urgency=medium + + * Fix crash in smartpause + + -- Gobinath Loganathan Tue, 18 Jun 2024 20:25:00 -0400 + safeeyes (2.1.8) noble; urgency=medium * Support Python 3.12 diff --git a/safeeyes/glade/about_dialog.glade b/safeeyes/glade/about_dialog.glade index ca2e39d..9ebb8e5 100644 --- a/safeeyes/glade/about_dialog.glade +++ b/safeeyes/glade/about_dialog.glade @@ -71,7 +71,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.center 10 10 - Safe Eyes 2.1.8 + Safe Eyes 2.1.9 center diff --git a/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml b/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml index 8dc939e..e8d796d 100644 --- a/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml +++ b/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml @@ -47,7 +47,7 @@ https://slgobinath.github.io/SafeEyes/ - + diff --git a/safeeyes/safeeyes.py b/safeeyes/safeeyes.py index 1345e9c..f9b8bf4 100644 --- a/safeeyes/safeeyes.py +++ b/safeeyes/safeeyes.py @@ -40,7 +40,7 @@ from safeeyes.ui.settings_dialog import SettingsDialog gi.require_version('Gtk', '3.0') from gi.repository import Gtk -SAFE_EYES_VERSION = "2.1.8" +SAFE_EYES_VERSION = "2.1.9" class SafeEyes: @@ -71,8 +71,8 @@ class SafeEyes: self.show_about) self.context['api']['enable_safeeyes'] = lambda next_break_time=-1, reset_breaks=False: \ utility.execute_main_thread(self.enable_safeeyes, next_break_time, reset_breaks) - self.context['api']['disable_safeeyes'] = lambda status: utility.execute_main_thread( - self.disable_safeeyes, status) + self.context['api']['disable_safeeyes'] = lambda status=None, is_resting=False: utility.execute_main_thread( + self.disable_safeeyes, status, is_resting) self.context['api']['status'] = self.status self.context['api']['quit'] = lambda: utility.execute_main_thread( self.quit) diff --git a/safeeyes/utility.py b/safeeyes/utility.py index 3976140..ea25088 100644 --- a/safeeyes/utility.py +++ b/safeeyes/utility.py @@ -94,28 +94,16 @@ def start_thread(target_function, **args): thread.start() -# def execute_main_thread(target_function, args=None): +# def execute_main_thread(target_function, *args, **kwargs): # """ -# Execute the given function in main thread. +# Execute the given function in main thread, forwarding positional and keyword arguments. # """ -# if args: -# GLib.idle_add(lambda: target_function(args)) -# else: -# GLib.idle_add(target_function) -def execute_main_thread(target_function, arg1=None, arg2=None): +def execute_main_thread(target_function, *args, **kwargs): """ Execute the given function in main thread. """ - if arg1 is not None and arg2 is not None: - GLib.idle_add(lambda: target_function(arg1, arg2)) - elif arg1 is not None: - GLib.idle_add(lambda: target_function(arg1)) - elif arg2 is not None: - GLib.idle_add(lambda: target_function(arg2)) - else: - GLib.idle_add(target_function) - + GLib.idle_add(lambda: target_function(*args, **kwargs)) def system_locale(category=locale.LC_MESSAGES): """ diff --git a/setup.py b/setup.py index b4033bb..07a314b 100644 --- a/setup.py +++ b/setup.py @@ -78,14 +78,14 @@ def __package_data(): setuptools.setup( name="safeeyes", - version="2.1.8", + version="2.1.9", description="Protect your eyes from eye strain using this continuous breaks reminder.", long_description=long_description, long_description_content_type="text/markdown", author="Gobinath Loganathan", author_email="slgobinath@gmail.com", url="https://github.com/slgobinath/SafeEyes", - download_url="https://github.com/slgobinath/SafeEyes/archive/v2.1.8.tar.gz", + download_url="https://github.com/slgobinath/SafeEyes/archive/v2.1.9.tar.gz", packages=setuptools.find_packages(), package_data={'safeeyes': __package_data()}, data_files=__data_files(),