Prevent disable/quit after notification in strict break mode
This commit is contained in:
Gobinath
parent
68bc9313ac
commit
faa015fe7a
|
|
@ -28,203 +28,223 @@ APPINDICATOR_ID = 'safeeyes'
|
|||
|
||||
class TrayIcon:
|
||||
|
||||
def __init__(self, config, language, on_show_settings, on_show_about, on_enable, on_disable, on_quite):
|
||||
logging.info("Initialize the tray icon")
|
||||
self.on_show_settings = on_show_settings
|
||||
self.on_show_about = on_show_about
|
||||
self.on_quite = on_quite
|
||||
self.on_enable = on_enable
|
||||
self.on_disable = on_disable
|
||||
self.language = language
|
||||
self.dateTime = None
|
||||
self.active = True
|
||||
self.wakeup_time = None
|
||||
self.idle_condition = threading.Condition()
|
||||
self.lock = threading.Lock()
|
||||
def __init__(self, config, language, on_show_settings, on_show_about, on_enable, on_disable, on_quite):
|
||||
logging.info("Initialize the tray icon")
|
||||
self.on_show_settings = on_show_settings
|
||||
self.on_show_about = on_show_about
|
||||
self.on_quite = on_quite
|
||||
self.on_enable = on_enable
|
||||
self.on_disable = on_disable
|
||||
self.language = language
|
||||
self.dateTime = None
|
||||
self.active = True
|
||||
self.wakeup_time = None
|
||||
self.idle_condition = threading.Condition()
|
||||
self.lock = threading.Lock()
|
||||
|
||||
# Construct the tray icon
|
||||
self.indicator = appindicator.Indicator.new(
|
||||
APPINDICATOR_ID, "safeeyes_enabled", appindicator.IndicatorCategory.APPLICATION_STATUS)
|
||||
self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE)
|
||||
# Construct the tray icon
|
||||
self.indicator = appindicator.Indicator.new(
|
||||
APPINDICATOR_ID, "safeeyes_enabled", appindicator.IndicatorCategory.APPLICATION_STATUS)
|
||||
self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE)
|
||||
|
||||
# Construct the context menu
|
||||
self.menu = Gtk.Menu()
|
||||
# Construct the context menu
|
||||
self.menu = Gtk.Menu()
|
||||
|
||||
# Next break info menu item
|
||||
self.item_info = Gtk.ImageMenuItem()
|
||||
img_timer = Gtk.Image()
|
||||
img_timer.set_from_icon_name("safeeyes_timer", 16)
|
||||
self.item_info.set_image(img_timer)
|
||||
# Next break info menu item
|
||||
self.item_info = Gtk.ImageMenuItem()
|
||||
img_timer = Gtk.Image()
|
||||
img_timer.set_from_icon_name("safeeyes_timer", 16)
|
||||
self.item_info.set_image(img_timer)
|
||||
|
||||
self.item_separator = Gtk.SeparatorMenuItem()
|
||||
self.item_separator = Gtk.SeparatorMenuItem()
|
||||
|
||||
self.item_enable = Gtk.MenuItem()
|
||||
self.item_enable.connect('activate', self.on_enable_clicked)
|
||||
self.item_enable = Gtk.MenuItem()
|
||||
self.item_enable.connect('activate', self.on_enable_clicked)
|
||||
|
||||
self.item_disable = Gtk.MenuItem()
|
||||
self.item_disable.connect('activate', self.on_disable_clicked)
|
||||
self.item_disable = Gtk.MenuItem()
|
||||
self.item_disable.connect('activate', self.on_disable_clicked)
|
||||
|
||||
self.sub_menu_disable = Gtk.Menu()
|
||||
self.sub_menu_items = []
|
||||
self.sub_menu_disable = Gtk.Menu()
|
||||
self.sub_menu_items = []
|
||||
|
||||
# Read disable options and build the sub menu
|
||||
for disable_option in config['disable_options']:
|
||||
time_in_minutes = disable_option['time']
|
||||
# Validate time value
|
||||
if not isinstance(time_in_minutes, int) or time_in_minutes <= 0:
|
||||
logging.error('Invalid time in disable option: ' + str(time_in_minutes))
|
||||
continue
|
||||
time_unit = disable_option['unit'].lower()
|
||||
if time_unit == 'seconds' or time_unit == 'second':
|
||||
time_in_minutes = int(time_in_minutes / 60)
|
||||
elif time_unit == 'minutes' or time_unit == 'minute':
|
||||
time_in_minutes = int(time_in_minutes * 1)
|
||||
elif time_unit == 'hours' or time_unit == 'hour':
|
||||
time_in_minutes = int(time_in_minutes * 60)
|
||||
else:
|
||||
# Invalid unit
|
||||
logging.error('Invalid unit in disable option: ' + str(disable_option))
|
||||
continue
|
||||
# Read disable options and build the sub menu
|
||||
for disable_option in config['disable_options']:
|
||||
time_in_minutes = disable_option['time']
|
||||
# Validate time value
|
||||
if not isinstance(time_in_minutes, int) or time_in_minutes <= 0:
|
||||
logging.error('Invalid time in disable option: ' + str(time_in_minutes))
|
||||
continue
|
||||
time_unit = disable_option['unit'].lower()
|
||||
if time_unit == 'seconds' or time_unit == 'second':
|
||||
time_in_minutes = int(time_in_minutes / 60)
|
||||
elif time_unit == 'minutes' or time_unit == 'minute':
|
||||
time_in_minutes = int(time_in_minutes * 1)
|
||||
elif time_unit == 'hours' or time_unit == 'hour':
|
||||
time_in_minutes = int(time_in_minutes * 60)
|
||||
else:
|
||||
# Invalid unit
|
||||
logging.error('Invalid unit in disable option: ' + str(disable_option))
|
||||
continue
|
||||
|
||||
# Create submenu
|
||||
sub_menu_item = Gtk.MenuItem()
|
||||
sub_menu_item.connect('activate', self.on_disable_clicked, time_in_minutes)
|
||||
self.sub_menu_items.append([sub_menu_item, disable_option['label'], disable_option['time']])
|
||||
self.sub_menu_disable.append(sub_menu_item)
|
||||
# Create submenu
|
||||
sub_menu_item = Gtk.MenuItem()
|
||||
sub_menu_item.connect('activate', self.on_disable_clicked, time_in_minutes)
|
||||
self.sub_menu_items.append([sub_menu_item, disable_option['label'], disable_option['time']])
|
||||
self.sub_menu_disable.append(sub_menu_item)
|
||||
|
||||
# Disable until restart submenu
|
||||
self.sub_menu_item_until_restart = Gtk.MenuItem()
|
||||
self.sub_menu_item_until_restart.connect('activate', self.on_disable_clicked, -1)
|
||||
self.sub_menu_disable.append(self.sub_menu_item_until_restart)
|
||||
# Disable until restart submenu
|
||||
self.sub_menu_item_until_restart = Gtk.MenuItem()
|
||||
self.sub_menu_item_until_restart.connect('activate', self.on_disable_clicked, -1)
|
||||
self.sub_menu_disable.append(self.sub_menu_item_until_restart)
|
||||
|
||||
# Add the sub menu to the enable/disable menu
|
||||
self.item_disable.set_submenu(self.sub_menu_disable)
|
||||
# Add the sub menu to the enable/disable menu
|
||||
self.item_disable.set_submenu(self.sub_menu_disable)
|
||||
|
||||
# Settings menu item
|
||||
self.item_settings = Gtk.MenuItem()
|
||||
self.item_settings.connect('activate', self.show_settings)
|
||||
# Settings menu item
|
||||
self.item_settings = Gtk.MenuItem()
|
||||
self.item_settings.connect('activate', self.show_settings)
|
||||
|
||||
# About menu item
|
||||
self.item_about = Gtk.MenuItem()
|
||||
self.item_about.connect('activate', self.show_about)
|
||||
# About menu item
|
||||
self.item_about = Gtk.MenuItem()
|
||||
self.item_about.connect('activate', self.show_about)
|
||||
|
||||
# Quit menu item
|
||||
self.item_quit = Gtk.MenuItem()
|
||||
self.item_quit.connect('activate', self.quit_safe_eyes)
|
||||
# Quit menu item
|
||||
self.item_quit = Gtk.MenuItem()
|
||||
self.item_quit.connect('activate', self.quit_safe_eyes)
|
||||
|
||||
self.set_labels(language)
|
||||
self.set_labels(language)
|
||||
|
||||
# At startup, no need for activate menu
|
||||
self.item_enable.set_sensitive(False)
|
||||
# At startup, no need for activate menu
|
||||
self.item_enable.set_sensitive(False)
|
||||
|
||||
# Append all menu items and show the menu
|
||||
self.menu.append(self.item_info)
|
||||
self.menu.append(self.item_separator)
|
||||
self.menu.append(self.item_enable)
|
||||
self.menu.append(self.item_disable)
|
||||
self.menu.append(self.item_settings)
|
||||
self.menu.append(self.item_about)
|
||||
self.menu.append(self.item_quit)
|
||||
self.menu.show_all()
|
||||
# Append all menu items and show the menu
|
||||
self.menu.append(self.item_info)
|
||||
self.menu.append(self.item_separator)
|
||||
self.menu.append(self.item_enable)
|
||||
self.menu.append(self.item_disable)
|
||||
self.menu.append(self.item_settings)
|
||||
self.menu.append(self.item_about)
|
||||
self.menu.append(self.item_quit)
|
||||
self.menu.show_all()
|
||||
|
||||
self.indicator.set_menu(self.menu)
|
||||
self.indicator.set_menu(self.menu)
|
||||
|
||||
def set_labels(self, language):
|
||||
self.language = language
|
||||
for entry in self.sub_menu_items:
|
||||
entry[0].set_label(self.language['ui_controls'][entry[1]].format(entry[2]))
|
||||
def set_labels(self, language):
|
||||
self.language = language
|
||||
for entry in self.sub_menu_items:
|
||||
entry[0].set_label(self.language['ui_controls'][entry[1]].format(entry[2]))
|
||||
|
||||
self.sub_menu_item_until_restart.set_label(self.language['ui_controls']['until_restart'])
|
||||
self.item_enable.set_label(self.language['ui_controls']['enable'])
|
||||
self.item_disable.set_label(self.language['ui_controls']['disable'])
|
||||
self.sub_menu_item_until_restart.set_label(self.language['ui_controls']['until_restart'])
|
||||
self.item_enable.set_label(self.language['ui_controls']['enable'])
|
||||
self.item_disable.set_label(self.language['ui_controls']['disable'])
|
||||
|
||||
if self.active:
|
||||
if self.dateTime:
|
||||
self.__set_next_break_info()
|
||||
else:
|
||||
if self.wakeup_time:
|
||||
self.item_info.set_label(self.language['messages']['disabled_until_x'].format(Utility.format_time(self.wakeup_time)))
|
||||
else:
|
||||
self.item_info.set_label(self.language['messages']['disabled_until_restart'])
|
||||
if self.active:
|
||||
if self.dateTime:
|
||||
self.__set_next_break_info()
|
||||
else:
|
||||
if self.wakeup_time:
|
||||
self.item_info.set_label(self.language['messages']['disabled_until_x'].format(Utility.format_time(self.wakeup_time)))
|
||||
else:
|
||||
self.item_info.set_label(self.language['messages']['disabled_until_restart'])
|
||||
|
||||
self.item_settings.set_label(self.language['ui_controls']['settings'])
|
||||
self.item_about.set_label(self.language['ui_controls']['about'])
|
||||
self.item_quit.set_label(self.language['ui_controls']['quit'])
|
||||
self.item_settings.set_label(self.language['ui_controls']['settings'])
|
||||
self.item_about.set_label(self.language['ui_controls']['about'])
|
||||
self.item_quit.set_label(self.language['ui_controls']['quit'])
|
||||
|
||||
def show_icon(self):
|
||||
Utility.execute_main_thread(self.indicator.set_status, appindicator.IndicatorStatus.ACTIVE)
|
||||
def show_icon(self):
|
||||
Utility.execute_main_thread(self.indicator.set_status, appindicator.IndicatorStatus.ACTIVE)
|
||||
|
||||
def hide_icon(self):
|
||||
Utility.execute_main_thread(self.indicator.set_status, appindicator.IndicatorStatus.PASSIVE)
|
||||
def hide_icon(self):
|
||||
Utility.execute_main_thread(self.indicator.set_status, appindicator.IndicatorStatus.PASSIVE)
|
||||
|
||||
def quit_safe_eyes(self, *args):
|
||||
self.on_quite()
|
||||
with self.lock:
|
||||
self.active = True
|
||||
# Notify all schedulers
|
||||
self.idle_condition.acquire()
|
||||
self.idle_condition.notify_all()
|
||||
self.idle_condition.release()
|
||||
def quit_safe_eyes(self, *args):
|
||||
self.on_quite()
|
||||
with self.lock:
|
||||
self.active = True
|
||||
# Notify all schedulers
|
||||
self.idle_condition.acquire()
|
||||
self.idle_condition.notify_all()
|
||||
self.idle_condition.release()
|
||||
|
||||
def show_settings(self, *args):
|
||||
self.on_show_settings()
|
||||
def show_settings(self, *args):
|
||||
self.on_show_settings()
|
||||
|
||||
def show_about(self, *args):
|
||||
self.on_show_about()
|
||||
def show_about(self, *args):
|
||||
self.on_show_about()
|
||||
|
||||
def next_break_time(self, dateTime):
|
||||
logging.info("Update next break information")
|
||||
self.dateTime = dateTime
|
||||
self.__set_next_break_info()
|
||||
def next_break_time(self, dateTime):
|
||||
logging.info("Update next break information")
|
||||
self.dateTime = dateTime
|
||||
self.__set_next_break_info()
|
||||
|
||||
def __set_next_break_info(self):
|
||||
formatted_time = Utility.format_time(self.dateTime)
|
||||
message = self.language['messages']['next_break_at'].format(formatted_time)
|
||||
def __set_next_break_info(self):
|
||||
formatted_time = Utility.format_time(self.dateTime)
|
||||
message = self.language['messages']['next_break_at'].format(formatted_time)
|
||||
|
||||
Utility.execute_main_thread(self.item_info.set_label, message)
|
||||
Utility.execute_main_thread(self.item_info.set_label, message)
|
||||
|
||||
def on_enable_clicked(self, *args):
|
||||
# active = self.item_enable.get_active()
|
||||
if not self.active:
|
||||
with self.lock:
|
||||
logging.info('Enable Safe Eyes')
|
||||
self.active = True
|
||||
self.indicator.set_icon("safeeyes_enabled")
|
||||
self.item_info.set_sensitive(True)
|
||||
self.item_enable.set_sensitive(False)
|
||||
self.item_disable.set_sensitive(True)
|
||||
self.on_enable()
|
||||
# Notify all schedulers
|
||||
self.idle_condition.acquire()
|
||||
self.idle_condition.notify_all()
|
||||
self.idle_condition.release()
|
||||
def on_enable_clicked(self, *args):
|
||||
# active = self.item_enable.get_active()
|
||||
if not self.active:
|
||||
with self.lock:
|
||||
logging.info('Enable Safe Eyes')
|
||||
self.active = True
|
||||
self.indicator.set_icon("safeeyes_enabled")
|
||||
self.item_info.set_sensitive(True)
|
||||
self.item_enable.set_sensitive(False)
|
||||
self.item_disable.set_sensitive(True)
|
||||
self.on_enable()
|
||||
# Notify all schedulers
|
||||
self.idle_condition.acquire()
|
||||
self.idle_condition.notify_all()
|
||||
self.idle_condition.release()
|
||||
|
||||
def on_disable_clicked(self, *args):
|
||||
# active = self.item_enable.get_active()
|
||||
if self.active and len(args) > 1:
|
||||
logging.info('Disable Safe Eyes')
|
||||
self.active = False
|
||||
self.indicator.set_icon("safeeyes_disabled")
|
||||
self.item_info.set_sensitive(False)
|
||||
self.item_enable.set_sensitive(True)
|
||||
self.item_disable.set_sensitive(False)
|
||||
self.on_disable()
|
||||
def on_disable_clicked(self, *args):
|
||||
# active = self.item_enable.get_active()
|
||||
if self.active and len(args) > 1:
|
||||
logging.info('Disable Safe Eyes')
|
||||
self.active = False
|
||||
self.indicator.set_icon("safeeyes_disabled")
|
||||
self.item_info.set_sensitive(False)
|
||||
self.item_enable.set_sensitive(True)
|
||||
self.item_disable.set_sensitive(False)
|
||||
self.on_disable()
|
||||
|
||||
time_to_wait = args[1]
|
||||
if time_to_wait <= 0:
|
||||
self.wakeup_time = None
|
||||
self.item_info.set_label(self.language['messages']['disabled_until_restart'])
|
||||
else:
|
||||
self.wakeup_time = datetime.datetime.now() + datetime.timedelta(minutes=time_to_wait)
|
||||
Utility.start_thread(self.__schedule_resume, time_minutes=time_to_wait)
|
||||
self.item_info.set_label(self.language['messages']['disabled_until_x'].format(Utility.format_time(self.wakeup_time)))
|
||||
time_to_wait = args[1]
|
||||
if time_to_wait <= 0:
|
||||
self.wakeup_time = None
|
||||
self.item_info.set_label(self.language['messages']['disabled_until_restart'])
|
||||
else:
|
||||
self.wakeup_time = datetime.datetime.now() + datetime.timedelta(minutes=time_to_wait)
|
||||
Utility.start_thread(self.__schedule_resume, time_minutes=time_to_wait)
|
||||
self.item_info.set_label(self.language['messages']['disabled_until_x'].format(Utility.format_time(self.wakeup_time)))
|
||||
|
||||
|
||||
def __schedule_resume(self, time_minutes):
|
||||
self.idle_condition.acquire()
|
||||
self.idle_condition.wait(time_minutes * 60) # Convert to seconds
|
||||
self.idle_condition.release()
|
||||
"""
|
||||
This method is called by the core to prevent user from disabling Safe Eyes after the notification.
|
||||
"""
|
||||
def lock_menu(self):
|
||||
if self.active:
|
||||
# self.item_disable.set_sensitive(False)
|
||||
# self.item_settings.set_sensitive(False)
|
||||
# self.item_quit.set_sensitive(False)
|
||||
self.menu.set_sensitive(False)
|
||||
|
||||
with self.lock:
|
||||
if not self.active:
|
||||
Utility.execute_main_thread(self.item_enable.activate)
|
||||
"""
|
||||
This method is called by the core to activate the disable menu after the the break.
|
||||
"""
|
||||
def unlock_menu(self):
|
||||
if self.active:
|
||||
# self.item_disable.set_sensitive(True)
|
||||
# self.item_settings.set_sensitive(True)
|
||||
# self.item_quit.set_sensitive(True)
|
||||
self.menu.set_sensitive(True)
|
||||
|
||||
def __schedule_resume(self, time_minutes):
|
||||
self.idle_condition.acquire()
|
||||
self.idle_condition.wait(time_minutes * 60) # Convert to seconds
|
||||
self.idle_condition.release()
|
||||
|
||||
with self.lock:
|
||||
if not self.active:
|
||||
Utility.execute_main_thread(self.item_enable.activate)
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ def show_about():
|
|||
Receive the signal from core and pass it to the Notification.
|
||||
"""
|
||||
def show_notification():
|
||||
if config['strict_break']:
|
||||
Utility.execute_main_thread(tray_icon.lock_menu)
|
||||
notification.show(config['pre_break_warning_time'])
|
||||
|
||||
"""
|
||||
|
|
@ -74,6 +76,8 @@ def show_alert(message):
|
|||
logging.info("Show the break screen")
|
||||
notification.close()
|
||||
break_screen.show_message(message)
|
||||
if config['strict_break'] and is_active:
|
||||
Utility.execute_main_thread(tray_icon.unlock_menu)
|
||||
|
||||
"""
|
||||
Receive the stop break signal from core and pass it to the break screen.
|
||||
|
|
|
|||
Loading…
Reference in New Issue