Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-02-15 10:11:20 +01:00
commit c9a2177aec
5 changed files with 11 additions and 7 deletions

8
debian/changelog vendored
View File

@ -1,10 +1,14 @@
safeeyes (2.0.2-3) artful; urgency=high safeeyes (2.0.4-1) xenial; urgency=high
* Fix issues with locales
* Add new command line option: --status
* Fix multi-display issue * Fix multi-display issue
* Fix hard coded time in notification * Fix hard coded time in notification
* Completely rededesigned architecture and user interface * Completely redesigned architecture and user interface
* Show next break time in tray icon in supported environments * Show next break time in tray icon in supported environments

View File

@ -39,7 +39,7 @@ from safeeyes.settings import SettingsDialog
gi.require_version('Gtk', '3.0') gi.require_version('Gtk', '3.0')
from gi.repository import Gtk from gi.repository import Gtk
SAFE_EYES_VERSION = "2.0.2" SAFE_EYES_VERSION = "2.0.4"
class SafeEyes(object): class SafeEyes(object):

View File

@ -71,7 +71,7 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</pro
<property name="valign">center</property> <property name="valign">center</property>
<property name="margin_top">10</property> <property name="margin_top">10</property>
<property name="margin_bottom">10</property> <property name="margin_bottom">10</property>
<property name="label" translatable="yes">Safe Eyes 2.0.2</property> <property name="label" translatable="yes">Safe Eyes 2.0.4</property>
<property name="justify">center</property> <property name="justify">center</property>
<attributes> <attributes>
<attribute name="style" value="normal"/> <attribute name="style" value="normal"/>

View File

@ -114,7 +114,7 @@ def __start_idle_monitor():
smart_pause_activated = True smart_pause_activated = True
idle_start_time = datetime.datetime.now() idle_start_time = datetime.datetime.now()
logging.info('Pause Safe Eyes due to system idle') logging.info('Pause Safe Eyes due to system idle')
disable_safe_eyes() disable_safe_eyes(None)
elif system_idle_time < idle_time and context['state'] == State.STOPPED: elif system_idle_time < idle_time and context['state'] == State.STOPPED:
logging.info('Resume Safe Eyes due to user activity') logging.info('Resume Safe Eyes due to user activity')
smart_pause_activated = False smart_pause_activated = False

View File

@ -70,13 +70,13 @@ __data_files = list(_data_files('share'))
setuptools.setup( setuptools.setup(
name="safeeyes", name="safeeyes",
version="2.0.2.1", version="2.0.4",
description="Protect your eyes from eye strain using this continuous breaks reminder.", description="Protect your eyes from eye strain using this continuous breaks reminder.",
long_description=long_description, long_description=long_description,
author="Gobinath Loganathan", author="Gobinath Loganathan",
author_email="slgobinath@gmail.com", author_email="slgobinath@gmail.com",
url="https://github.com/slgobinath/SafeEyes", url="https://github.com/slgobinath/SafeEyes",
download_url="https://github.com/slgobinath/SafeEyes/archive/v2.0.2.1.tar.gz", download_url="https://github.com/slgobinath/SafeEyes/archive/v2.0.3.tar.gz",
packages=setuptools.find_packages(), packages=setuptools.find_packages(),
package_data={'safeeyes': __package_data()}, package_data={'safeeyes': __package_data()},
data_files=__data_files, data_files=__data_files,