2006-10-03 Jerome Rapinat <romjerome@yahoo.fr>

* src/plugins/ChangeNames.py: fix path name

	* src/plugins/PatchNames.py: clean up


svn: r7349
This commit is contained in:
Don Allingham 2006-10-04 02:46:32 +00:00
parent 8cbd8c060f
commit 4487a56339
3 changed files with 24 additions and 23 deletions

View File

@ -1,11 +1,14 @@
2006-10-03 Jerome Rapinat <romjerome@yahoo.fr>
* src/plugins/ChangeNames.py: fix path name
2006-10-03 Don Allingham <don@gramps-project.org> 2006-10-03 Don Allingham <don@gramps-project.org>
* src/plugins/PatchNames.py: clean up
* src/GrampsLogger/_ErrorReportAssistant.py: capitalize "GRAMPS" * src/GrampsLogger/_ErrorReportAssistant.py: capitalize "GRAMPS"
* src/ViewManager.py: display buttons on first open * src/ViewManager.py: display buttons on first open
* src/Editors/_EditSourceRef.py: fix cancelling of text (bug #450) * src/Editors/_EditSourceRef.py: fix cancelling of text (bug #450)
* src/DisplayTabs/_NoteTab.py: fix cancelling of text * src/DisplayTabs/_NoteTab.py: fix cancelling of text
* src/DisplayTabs/_TextTab.py: fix cancelling of text * src/DisplayTabs/_TextTab.py: fix cancelling of text
2006-10-02 Don Allingham <don@gramps-project.org> 2006-10-02 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadXML.py: save description properly on read * src/GrampsDb/_ReadXML.py: save description properly on read
* src/RelLib/_Location.py: call parent class properly * src/RelLib/_Location.py: call parent class properly

View File

@ -92,7 +92,7 @@ class ChangeNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
def display(self): def display(self):
base = os.path.dirname(__file__) base = os.path.dirname(__file__)
glade_file = base + os.sep + "patchnames.glade" glade_file = os.path.join(base,"changenames.glade")
self.top = gtk.glade.XML(glade_file,"top","gramps") self.top = gtk.glade.XML(glade_file,"top","gramps")
window = self.top.get_widget('top') window = self.top.get_widget('top')
@ -101,11 +101,11 @@ class ChangeNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
"on_ok_clicked" : self.on_ok_clicked, "on_ok_clicked" : self.on_ok_clicked,
"on_help_clicked" : self.on_help_clicked, "on_help_clicked" : self.on_help_clicked,
}) })
self.list = self.top.get_widget("list") self.list = self.top.get_widget("list")
self.set_window(window,self.top.get_widget('title'),self.label) self.set_window(window,self.top.get_widget('title'),self.label)
self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, self.model = gtk.ListStore(bool, str, str)
gobject.TYPE_STRING)
r = gtk.CellRendererToggle() r = gtk.CellRendererToggle()
c = gtk.TreeViewColumn(_('Select'),r,active=0) c = gtk.TreeViewColumn(_('Select'),r,active=0)

View File

@ -36,7 +36,6 @@ from gettext import gettext as _
# gnome/gtk # gnome/gtk
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gobject
import gtk import gtk
import gtk.glade import gtk.glade
@ -178,7 +177,7 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
def display(self): def display(self):
base = os.path.dirname(__file__) base = os.path.dirname(__file__)
glade_file = base + os.sep + "patchnames.glade" glade_file = os.path.join(base,"patchnames.glade")
self.top = gtk.glade.XML(glade_file,"top","gramps") self.top = gtk.glade.XML(glade_file,"top","gramps")
window = self.top.get_widget('top') window = self.top.get_widget('top')
@ -187,12 +186,11 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
"on_ok_clicked" : self.on_ok_clicked, "on_ok_clicked" : self.on_ok_clicked,
"on_help_clicked" : self.on_help_clicked, "on_help_clicked" : self.on_help_clicked,
}) })
self.list = self.top.get_widget("list") self.list = self.top.get_widget("list")
self.set_window(window,self.top.get_widget('title'),self.label) self.set_window(window,self.top.get_widget('title'),self.label)
self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, self.model = gtk.ListStore(bool, str, str, str, str)
gobject.TYPE_STRING, gobject.TYPE_STRING,
gobject.TYPE_STRING)
r = gtk.CellRendererToggle() r = gtk.CellRendererToggle()
r.connect('toggled',self.toggled) r.connect('toggled',self.toggled)
@ -222,8 +220,8 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
len(self.nick_list)+len(self.title_list) len(self.nick_list)+len(self.title_list)
+len(self.prefix1_list)+len(self.prefix2_list)) +len(self.prefix1_list)+len(self.prefix2_list))
for (id,name,nick) in self.nick_list: for (pid, name, nick) in self.nick_list:
p = self.db.get_person_from_handle(id) p = self.db.get_person_from_handle(pid)
gid = p.get_gramps_id() gid = p.get_gramps_id()
handle = self.model.append() handle = self.model.append()
self.model.set_value(handle,0,1) self.model.set_value(handle,0,1)
@ -231,11 +229,11 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
self.model.set_value(handle,2,_('Nickname')) self.model.set_value(handle,2,_('Nickname'))
self.model.set_value(handle,3,nick) self.model.set_value(handle,3,nick)
self.model.set_value(handle,4,p.get_primary_name().get_name()) self.model.set_value(handle,4,p.get_primary_name().get_name())
self.nick_hash[id] = handle self.nick_hash[pid] = handle
self.progress.step() self.progress.step()
for (id,title,name) in self.title_list: for (pid, title, name) in self.title_list:
p = self.db.get_person_from_handle(id) p = self.db.get_person_from_handle(pid)
gid = p.get_gramps_id() gid = p.get_gramps_id()
handle = self.model.append() handle = self.model.append()
self.model.set_value(handle,0,1) self.model.set_value(handle,0,1)
@ -243,11 +241,11 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
self.model.set_value(handle,2,_('Title')) self.model.set_value(handle,2,_('Title'))
self.model.set_value(handle,3,title) self.model.set_value(handle,3,title)
self.model.set_value(handle,4,p.get_primary_name().get_name()) self.model.set_value(handle,4,p.get_primary_name().get_name())
self.title_hash[id] = handle self.title_hash[pid] = handle
self.progress.step() self.progress.step()
for (id,fname,prefix) in self.prefix1_list: for (pid, fname, prefix) in self.prefix1_list:
p = self.db.get_person_from_handle(id) p = self.db.get_person_from_handle(pid)
gid = p.get_gramps_id() gid = p.get_gramps_id()
handle = self.model.append() handle = self.model.append()
self.model.set_value(handle,0,1) self.model.set_value(handle,0,1)
@ -255,11 +253,11 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
self.model.set_value(handle,2,_('Prefix')) self.model.set_value(handle,2,_('Prefix'))
self.model.set_value(handle,3,prefix) self.model.set_value(handle,3,prefix)
self.model.set_value(handle,4,p.get_primary_name().get_name()) self.model.set_value(handle,4,p.get_primary_name().get_name())
self.prefix1_hash[id] = handle self.prefix1_hash[pid] = handle
self.progress.step() self.progress.step()
for (id,sname,prefix) in self.prefix2_list: for (pid, sname, prefix) in self.prefix2_list:
p = self.db.get_person_from_handle(id) p = self.db.get_person_from_handle(pid)
gid = p.get_gramps_id() gid = p.get_gramps_id()
handle = self.model.append() handle = self.model.append()
self.model.set_value(handle,0,1) self.model.set_value(handle,0,1)
@ -267,7 +265,7 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
self.model.set_value(handle,2,_('Prefix')) self.model.set_value(handle,2,_('Prefix'))
self.model.set_value(handle,3,prefix) self.model.set_value(handle,3,prefix)
self.model.set_value(handle,4,p.get_primary_name().get_name()) self.model.set_value(handle,4,p.get_primary_name().get_name())
self.prefix2_hash[id] = handle self.prefix2_hash[pid] = handle
self.progress.step() self.progress.step()
self.progress.close() self.progress.close()