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

4780: Error when hitting ESC or Close-button in name display editor

Browse Source 
svn: r17404
This commit is contained in:
Michiel Nauta 2011-05-04 17:07:01 +00:00
parent 5292fa5942
commit 75d144e6b5
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/configure.py
View File

@ -568,13 +568,10 @@ class GrampsPreferences(ConfigureDialog):
self.edit_button.set_sensitive(False) self.edit_button.set_sensitive(False)
self.remove_button.set_sensitive(False) self.remove_button.set_sensitive(False)
self.insert_button.set_sensitive(False) self.insert_button.set_sensitive(False)
self.__current_path = path
self.__current_text = f
def __edit_name(self, obj): def __edit_name(self, obj):
store, node = self.format_list.get_selection().get_selected() store, node = self.format_list.get_selection().get_selected()
path = self.fmt_model.get_path(node) path = self.fmt_model.get_path(node)
self.__current_path = path
self.edit_button.set_sensitive(False) self.edit_button.set_sensitive(False)
self.remove_button.set_sensitive(False) self.remove_button.set_sensitive(False)
self.insert_button.set_sensitive(False) self.insert_button.set_sensitive(False)
@ -601,14 +598,31 @@ class GrampsPreferences(ConfigureDialog):
iter = model.iter_next(iter) iter = model.iter_next(iter)
return False return False
def __cancel_change(self, obj): def __start_name_editing(self, dummy_renderer, dummy_editable, dummy_path):
self.__change_name("", self.__current_path, self.__current_text) """
Method called at the start of editing a name format.
"""
self.format_list.set_tooltip_text(_("Enter to save, Esc to cancel "
"editing"))
def __cancel_change(self, dummy_renderer):
"""
Break off the editing of a name format.
"""
self.format_list.set_tooltip_text('')
num = self.selected_fmt[COL_NUM]
if any(fmt[COL_NUM] == num for fmt in self.dbstate.db.name_formats):
return
else: # editing a new format not yet in db, cleanup is needed
self.fmt_model.remove(self.iter)
_nd.del_name_format(num)
self.insert_button.set_sensitive(True)
def __change_name(self, text, path, new_text): def __change_name(self, text, path, new_text):
""" """
If the new string is empty, do nothing. Otherwise, renaming the Called when a name format changed and needs to be stored in the db.
family tree is simply changing the contents of the name file.
""" """
self.format_list.set_tooltip_text('')
if len(new_text) > 0 and text != new_text: if len(new_text) > 0 and text != new_text:
# build a pattern from translated pattern: # build a pattern from translated pattern:
pattern = new_text pattern = new_text
@ -678,6 +692,7 @@ class GrampsPreferences(ConfigureDialog):
name_renderer, name_renderer,
text=COL_NAME) text=COL_NAME)
name_renderer.set_property('editable', False) name_renderer.set_property('editable', False)
name_renderer.connect('editing-started', self.__start_name_editing)
name_renderer.connect('edited', self.__change_name) name_renderer.connect('edited', self.__change_name)
name_renderer.connect('editing-canceled', self.__cancel_change) name_renderer.connect('editing-canceled', self.__cancel_change)
self.name_renderer = name_renderer self.name_renderer = name_renderer