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

2008-01-08 Raphael Ackermann <raphael.ackermann@gmail.com>

Browse Source 
* src/Editors/_EditFamily.py: import fixes
	* src/plugins/FindDupes.py: variable typo fix
	0001428: In EditFamily: NameError



svn: r9752
This commit is contained in:
Raphael Ackermann 2008-01-08 15:27:28 +00:00
parent 626485fb38
commit 56d33a2c4f
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-01-08 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/Editors/_EditFamily.py: import fixes
* src/plugins/FindDupes.py: variable typo fix
0001428: In EditFamily: NameError
2008-01-08 Benny Malengier <benny.malengier@gramps-project.org> 2008-01-08 Benny Malengier <benny.malengier@gramps-project.org>
* src/DisplayTabs/_BackRefList.py: don't do sel change when dirty * src/DisplayTabs/_BackRefList.py: don't do sel change when dirty

15
src/Editors/_EditFamily.py
View File

@ -25,9 +25,7 @@
# python modules # python modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gettext import gettext as _ from bsddb import db as bsddb_db
import cPickle as pickle
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# enable logging for error handling # enable logging for error handling
@ -41,23 +39,20 @@ log = logging.getLogger(".")
# GTK/Gnome modules # GTK/Gnome modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk from gtk import glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import Utils import Utils
from BasicUtils import name_displayer from BasicUtils import name_displayer
import gen.lib import gen.lib
import Config
import Errors import Errors
from _EditPrimary import EditPrimary from _EditPrimary import EditPrimary
from ReportBase import ReportUtils from ReportBase import ReportUtils
from DdTargets import DdTargets
from DisplayTabs import \ from DisplayTabs import \
EmbeddedList,EventEmbedList,SourceEmbedList,FamilyAttrEmbedList,\ EmbeddedList,EventEmbedList,SourceEmbedList,FamilyAttrEmbedList,\
NoteTab,GalleryTab,FamilyLdsEmbedList, ChildModel NoteTab,GalleryTab,FamilyLdsEmbedList, ChildModel
@ -265,7 +260,7 @@ class ChildEmbedList(EmbeddedList):
try: try:
EditChildRef(n, self.dbstate, self.uistate, self.track, EditChildRef(n, self.dbstate, self.uistate, self.track,
ref, self.child_ref_edited) ref, self.child_ref_edited)
except Errors.WindowActiveError, msg: except Errors.WindowActiveError:
pass pass
break break
@ -484,7 +479,7 @@ class EditFamily(EditPrimary):
def build_interface(self): def build_interface(self):
self.top = gtk.glade.XML(const.GLADE_FILE,"family_editor","gramps") self.top = glade.XML(const.GLADE_FILE,"family_editor","gramps")
self.set_window(self.top.get_widget("family_editor"), None, self.get_menu_title()) self.set_window(self.top.get_widget("family_editor"), None, self.get_menu_title())
@ -841,7 +836,7 @@ class EditFamily(EditPrimary):
def save(self,*obj): def save(self,*obj):
try: try:
self.__do_save() self.__do_save()
except self.db.DBRunRecoveryError, msg: except bsddb_db.DBRunRecoveryError, msg:
QuestionDialog.RunDatabaseRepair(msg[1]) QuestionDialog.RunDatabaseRepair(msg[1])
def __do_save(self): def __do_save(self):

3
src/plugins/FindDupes.py
View File

@ -35,7 +35,6 @@ from gettext import gettext as _
# GNOME libraries # GNOME libraries
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk
import gtk.glade import gtk.glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -606,7 +605,7 @@ class ShowMatches(ManagedWindow.ManagedWindow):
continue continue
pn1 = name_displayer.display(p1) pn1 = name_displayer.display(p1)
pn2 = name_displayer.display(p2) pn2 = name_displayer.display(p2)
self.list.add([c, pn1, pn2,c2],(p1key,p2key)) self.list.add([c1, pn1, pn2,c2],(p1key,p2key))
def on_do_merge_clicked(self,obj): def on_do_merge_clicked(self,obj):
store,iter = self.list.selection.get_selected() store,iter = self.list.selection.get_selected()