(on_apply_clicked): Properly save entered types, including custom.

svn: r7253
This commit is contained in:
Alex Roitman 2006-08-24 19:56:51 +00:00
parent 031f9211da
commit 61157d5f55
2 changed files with 9 additions and 6 deletions

View File

@ -1,5 +1,6 @@
2006-08-24 Alex Roitman <shura@gramps-project.org> 2006-08-24 Alex Roitman <shura@gramps-project.org>
* src/plugins/ChangeTypes.py (run_tool): Properly set the new type. * src/plugins/ChangeTypes.py (run_tool): Properly set the new type.
(on_apply_clicked): Properly save entered types, including custom.
2006-08-23 Alex Roitman <shura@gramps-project.org> 2006-08-23 Alex Roitman <shura@gramps-project.org>
* src/DataViews/_PersonView.py (person_removed): Properly create * src/DataViews/_PersonView.py (person_removed): Properly create

View File

@ -82,8 +82,7 @@ class ChangeTypes(Tool.BatchTool, ManagedWindow.ManagedWindow):
self.auto1 = self.glade.get_widget("original") self.auto1 = self.glade.get_widget("original")
self.auto2 = self.glade.get_widget("new") self.auto2 = self.glade.get_widget("new")
event_names = [item[1] for item in EventType._DATAMAP event_names = [item[1] for item in EventType._DATAMAP if item[0] > 0 ]
if item[0] > 0 ]
event_names.sort(locale.strcoll) event_names.sort(locale.strcoll)
AutoComp.fill_combo(self.auto1,event_names) AutoComp.fill_combo(self.auto1,event_names)
AutoComp.fill_combo(self.auto2,event_names) AutoComp.fill_combo(self.auto2,event_names)
@ -151,10 +150,13 @@ class ChangeTypes(Tool.BatchTool, ManagedWindow.ManagedWindow):
def on_apply_clicked(self,obj): def on_apply_clicked(self,obj):
# Need to store English names for later comparison # Need to store English names for later comparison
self.options.handler.options_dict['fromtype'] = EventType._I2EMAP[ the_type = EventType()
EventType._S2IMAP[self.auto1.child.get_text()]]
self.options.handler.options_dict['totype'] = EventType._I2EMAP[ the_type.set(self.auto1.child.get_text())
EventType._S2IMAP[self.auto2.child.get_text()]] self.options.handler.options_dict['fromtype'] = the_type.xml_str()
the_type.set(self.auto2.child.get_text())
self.options.handler.options_dict['totype'] = the_type.xml_str()
modified,msg = self.run_tool(cli=False) modified,msg = self.run_tool(cli=False)
OkDialog(_('Change types'),msg,self.window) OkDialog(_('Change types'),msg,self.window)