Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweaks to saving config keys (save keys without default, pylint, etc.)

Browse Source
This commit is contained in:
Paul Franklin 2016-12-12 19:59:45 -08:00
parent 48bab7bed1
commit 5929f2066e
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gramps/gen/utils/configmanager.py
View File

@ -327,33 +327,29 @@ class ConfigManager:
filename = self.filename filename = self.filename
if filename: if filename:
try: try:
head = os.path.split( filename )[0] head = os.path.split(filename)[0]
os.makedirs( head ) os.makedirs(head)
except OSError as exp: except OSError as exp:
if exp.errno != errno.EEXIST: if exp.errno != errno.EEXIST:
raise raise
try: try:
with open(filename, "w", encoding="utf-8") as key_file: with open(filename, "w", encoding="utf-8") as key_file:
key_file.write(";; Gramps key file\n") key_file.write(";; Gramps key file\n")
key_file.write((";; Automatically created at %s" % key_file.write(";; Automatically created at %s" %
time.strftime("%Y/%m/%d %H:%M:%S")) + "\n\n") time.strftime("%Y/%m/%d %H:%M:%S") + "\n\n")
sections = sorted(self.data) for section in sorted(self.data):
for section in sections: key_file.write("[%s]\n" % section)
key_file.write(("[%s]\n") % section) for key in sorted(self.data[section]):
keys = sorted(self.data[section])
for key in keys:
value = self.data[section][key] value = self.data[section][key]
# If it has a default: default = "" # might be a third-party setting
if self.has_default("%s.%s" % (section, key)): if self.has_default("%s.%s" % (section, key)):
if value == self.get_default("%s.%s" % (section, key)): if value == self.get_default("%s.%s"
% (section, key)):
default = ";;" default = ";;"
else: if isinstance(value, int):
default = "" value = int(value) # TODO why is this needed?
if isinstance(value, int): key_file.write("%s%s=%s\n" % (default, key,
value = int(value) repr(value)))
key_file.write(("%s%s=%s\n")% (default,
key,
repr(value)))
key_file.write("\n") key_file.write("\n")
# else, no filename given; nothing to save so do nothing quietly # else, no filename given; nothing to save so do nothing quietly
except IOError as err: except IOError as err:

9
gramps/gui/managedwindow.py
View File

@ -545,8 +545,8 @@ class ManagedWindow:
Takes care of closing children and removing itself from menu. Takes care of closing children and removing itself from menu.
""" """
self._save_position(save_config=False) # the next line will save it
self._save_size() self._save_size()
self._save_position()
self.clean_up() self.clean_up()
self.uistate.gwm.close_track(self.track) self.uistate.gwm.close_track(self.track)
self.opened = False self.opened = False
@ -596,16 +596,19 @@ class ManagedWindow:
vert_position = config.get(self.vert_position_key) vert_position = config.get(self.vert_position_key)
self.window.move(horiz_position, vert_position) self.window.move(horiz_position, vert_position)
def _save_position(self): def _save_position(self, save_config=True):
""" """
Save the window's position to the config file Save the window's position to the config file
(You can set save_config False if a _save_size() will instantly follow)
""" """
# self.horiz_position_key is set in the subclass (or in setup_configs) # self.horiz_position_key is set in the subclass (or in setup_configs)
if self.horiz_position_key is not None: if self.horiz_position_key is not None:
(horiz_position, vert_position) = self.window.get_position() (horiz_position, vert_position) = self.window.get_position()
config.set(self.horiz_position_key, horiz_position) config.set(self.horiz_position_key, horiz_position)
config.set(self.vert_position_key, vert_position) config.set(self.vert_position_key, vert_position)
config.save() if save_config:
config.save()
def setup_configs(self, config_base, def setup_configs(self, config_base,
default_width, default_height, default_width, default_height,