Settings dialog reset Safe Eyes only if there are any changes. Fix #200
This commit is contained in:
Gobinath
parent
5a996c411f
commit
b927113c76
|
|
@ -63,18 +63,24 @@ class SafeEyes(object):
|
|||
self.context['desktop'] = Utility.desktop_environment()
|
||||
self.context['locale'] = system_locale
|
||||
self.context['api'] = {}
|
||||
self.context['api']['show_settings'] = lambda: Utility.execute_main_thread(self.show_settings)
|
||||
self.context['api']['show_about'] = lambda: Utility.execute_main_thread(self.show_about)
|
||||
self.context['api']['enable_safeeyes'] = lambda next_break_time=-1: Utility.execute_main_thread(self.enable_safeeyes, next_break_time)
|
||||
self.context['api']['disable_safeeyes'] = lambda status: Utility.execute_main_thread(self.disable_safeeyes, status)
|
||||
self.context['api']['show_settings'] = lambda: Utility.execute_main_thread(
|
||||
self.show_settings)
|
||||
self.context['api']['show_about'] = lambda: Utility.execute_main_thread(
|
||||
self.show_about)
|
||||
self.context['api']['enable_safeeyes'] = lambda next_break_time=- \
|
||||
1: Utility.execute_main_thread(self.enable_safeeyes, next_break_time)
|
||||
self.context['api']['disable_safeeyes'] = lambda status: Utility.execute_main_thread(
|
||||
self.disable_safeeyes, status)
|
||||
self.context['api']['status'] = self.status
|
||||
self.context['api']['quit'] = lambda: Utility.execute_main_thread(self.quit)
|
||||
self.context['api']['quit'] = lambda: Utility.execute_main_thread(
|
||||
self.quit)
|
||||
if self.config.get('persist_state'):
|
||||
self.context['session'] = Utility.open_session()
|
||||
else:
|
||||
self.context['session'] = {'plugin': {}}
|
||||
|
||||
self.break_screen = BreakScreen(self.context, self.on_skipped, self.on_postponed, Utility.STYLE_SHEET_PATH)
|
||||
self.break_screen = BreakScreen(
|
||||
self.context, self.on_skipped, self.on_postponed, Utility.STYLE_SHEET_PATH)
|
||||
self.break_screen.initialize(self.config)
|
||||
self.plugins_manager = PluginManager(self.context, self.config)
|
||||
self.safe_eyes_core = SafeEyesCore(self.context)
|
||||
|
|
@ -85,7 +91,8 @@ class SafeEyes(object):
|
|||
self.safe_eyes_core.on_stop_break += self.stop_break
|
||||
self.safe_eyes_core.on_update_next_break += self.update_next_break
|
||||
self.safe_eyes_core.initialize(self.config)
|
||||
self.context['api']['take_break'] = lambda: Utility.execute_main_thread(self.safe_eyes_core.take_break)
|
||||
self.context['api']['take_break'] = lambda: Utility.execute_main_thread(
|
||||
self.safe_eyes_core.take_break)
|
||||
self.context['api']['has_breaks'] = self.safe_eyes_core.has_breaks
|
||||
self.context['api']['postpone'] = self.safe_eyes_core.postpone
|
||||
self.plugins_manager.init(self.context, self.config)
|
||||
|
|
@ -111,7 +118,8 @@ class SafeEyes(object):
|
|||
if not self.settings_dialog_active:
|
||||
logging.info("Show Settings dialog")
|
||||
self.settings_dialog_active = True
|
||||
settings_dialog = SettingsDialog(self.config, self.save_settings)
|
||||
settings_dialog = SettingsDialog(
|
||||
self.config.clone(), self.save_settings)
|
||||
settings_dialog.show()
|
||||
|
||||
def show_about(self):
|
||||
|
|
@ -158,7 +166,8 @@ class SafeEyes(object):
|
|||
"""
|
||||
DBusGMainLoop(set_as_default=True)
|
||||
bus = dbus.SystemBus()
|
||||
bus.add_signal_receiver(self.handle_suspend_callback, 'PrepareForSleep', 'org.freedesktop.login1.Manager', 'org.freedesktop.login1')
|
||||
bus.add_signal_receiver(self.handle_suspend_callback, 'PrepareForSleep',
|
||||
'org.freedesktop.login1.Manager', 'org.freedesktop.login1')
|
||||
|
||||
def on_skipped(self):
|
||||
"""
|
||||
|
|
@ -181,8 +190,12 @@ class SafeEyes(object):
|
|||
Listen to Settings dialog Save action and write to the config file.
|
||||
"""
|
||||
self.settings_dialog_active = False
|
||||
logging.info("Saving settings to safeeyes.json")
|
||||
|
||||
if self.config == config:
|
||||
# Config is not modified
|
||||
return
|
||||
|
||||
logging.info("Saving settings to safeeyes.json")
|
||||
# Stop the Safe Eyes core
|
||||
if self.active:
|
||||
self.plugins_manager.stop()
|
||||
|
|
@ -255,9 +268,11 @@ class SafeEyes(object):
|
|||
Update the next break to plugins and save the session.
|
||||
"""
|
||||
self.plugins_manager.update_next_break(break_obj, break_time)
|
||||
self._status = _('Next break at %s') % (Utility.format_time(break_time))
|
||||
self._status = _('Next break at %s') % (
|
||||
Utility.format_time(break_time))
|
||||
if self.config.get('persist_state'):
|
||||
Utility.write_json(Utility.SESSION_FILE_PATH, self.context['session'])
|
||||
Utility.write_json(Utility.SESSION_FILE_PATH,
|
||||
self.context['session'])
|
||||
|
||||
def stop_break(self):
|
||||
"""
|
||||
|
|
@ -284,6 +299,7 @@ class SafeEyes(object):
|
|||
Save the session object to the session file.
|
||||
"""
|
||||
if self.config.get('persist_state'):
|
||||
Utility.write_json(Utility.SESSION_FILE_PATH, self.context['session'])
|
||||
Utility.write_json(Utility.SESSION_FILE_PATH,
|
||||
self.context['session'])
|
||||
else:
|
||||
Utility.delete(Utility.SESSION_FILE_PATH)
|
||||
|
|
|
|||
|
|
@ -172,10 +172,12 @@ class BreakQueue(object):
|
|||
|
||||
# Validate time value
|
||||
if not isinstance(duration, int) or duration <= 0:
|
||||
logging.error('Invalid break duration in: ' + str(break_config))
|
||||
logging.error('Invalid break duration in: ' +
|
||||
str(break_config))
|
||||
continue
|
||||
|
||||
break_obj = Break(break_type, name, interval, duration, image, plugins)
|
||||
break_obj = Break(break_type, name, interval,
|
||||
duration, image, plugins)
|
||||
if head is None:
|
||||
head = break_obj
|
||||
tail = break_obj
|
||||
|
|
@ -232,33 +234,37 @@ class Config(object):
|
|||
The configuration of Safe Eyes.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
def __init__(self, init=True):
|
||||
# Read the config files
|
||||
self.__user_config = Utility.load_json(Utility.CONFIG_FILE_PATH)
|
||||
self.__system_config = Utility.load_json(Utility.SYSTEM_CONFIG_FILE_PATH)
|
||||
self.__system_config = Utility.load_json(
|
||||
Utility.SYSTEM_CONFIG_FILE_PATH)
|
||||
self.__force_upgrade = ['long_breaks', 'short_breaks']
|
||||
|
||||
if self.__user_config is None:
|
||||
Utility.initialize_safeeyes()
|
||||
self.__user_config = self.__system_config
|
||||
self.save()
|
||||
else:
|
||||
system_config_version = self.__system_config['meta']['config_version']
|
||||
meta_obj = self.__user_config.get('meta', None)
|
||||
if meta_obj is None:
|
||||
# Corrupted user config
|
||||
if init:
|
||||
if self.__user_config is None:
|
||||
Utility.initialize_safeeyes()
|
||||
self.__user_config = self.__system_config
|
||||
self.save()
|
||||
else:
|
||||
user_config_version = str(meta_obj.get('config_version', '0.0.0'))
|
||||
if LooseVersion(user_config_version) != LooseVersion(system_config_version):
|
||||
# Update the user config
|
||||
self.__merge_dictionary(self.__user_config, self.__system_config)
|
||||
system_config_version = self.__system_config['meta']['config_version']
|
||||
meta_obj = self.__user_config.get('meta', None)
|
||||
if meta_obj is None:
|
||||
# Corrupted user config
|
||||
self.__user_config = self.__system_config
|
||||
# Update the style sheet
|
||||
Utility.replace_style_sheet()
|
||||
else:
|
||||
user_config_version = str(
|
||||
meta_obj.get('config_version', '0.0.0'))
|
||||
if LooseVersion(user_config_version) != LooseVersion(system_config_version):
|
||||
# Update the user config
|
||||
self.__merge_dictionary(
|
||||
self.__user_config, self.__system_config)
|
||||
self.__user_config = self.__system_config
|
||||
# Update the style sheet
|
||||
Utility.replace_style_sheet()
|
||||
|
||||
Utility.merge_plugins(self.__user_config)
|
||||
self.save()
|
||||
Utility.merge_plugins(self.__user_config)
|
||||
self.save()
|
||||
|
||||
def __merge_dictionary(self, old_dict, new_dict):
|
||||
"""
|
||||
|
|
@ -277,6 +283,10 @@ class Config(object):
|
|||
else:
|
||||
new_dict[key] = old_value
|
||||
|
||||
def clone(self):
|
||||
config = Config(init=False)
|
||||
return config
|
||||
|
||||
def save(self):
|
||||
"""
|
||||
Save the configuration to file.
|
||||
|
|
@ -298,6 +308,12 @@ class Config(object):
|
|||
"""
|
||||
self.__user_config[key] = value
|
||||
|
||||
def __eq__(self, config):
|
||||
return self.__user_config == config.__user_config
|
||||
|
||||
def __ne__(self, config):
|
||||
return self.__user_config != config.__user_config
|
||||
|
||||
|
||||
class TrayAction(object):
|
||||
"""
|
||||
|
|
|
|||
Loading…
Reference in New Issue