Start of new type classes

svn: r6340
This commit is contained in:
Don Allingham
2006-04-14 04:36:25 +00:00
parent efd56461dd
commit e99a795581
34 changed files with 462 additions and 164 deletions

View File

@@ -57,12 +57,12 @@ from PluginUtils import Tool, register_tool
# ChangeNames
#
#-------------------------------------------------------------------------
class ChangeNames(Tool.Tool, ManagedWindow,ManagedWindow):
class ChangeNames(Tool.Tool, ManagedWindow.ManagedWindow):
def __init__(self, dbstate, uistate, options_class, name, callback=None):
Tool.Tool.__init__(self, dbstate, options_class, name)
ManagedWindow.ManagedWindow.__init__(self, uistate, []. self)
ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
self.cb = callback
@@ -167,7 +167,7 @@ class ChangeNames(Tool.Tool, ManagedWindow,ManagedWindow):
self.db.request_rebuild()
self.parent.bookmarks.redraw()
self.close(obj)
self.cb(None,1)
self.cb()
#------------------------------------------------------------------------
#

View File

@@ -78,8 +78,8 @@ class ChangeTypes(Tool.Tool, ManagedWindow.ManagedWindow):
self.auto1 = self.glade.get_widget("original")
self.auto2 = self.glade.get_widget("new")
AutoComp.fill_combo(self.auto1,const.personalEvents)
AutoComp.fill_combo(self.auto2,const.personalEvents)
AutoComp.fill_combo(self.auto1,Utils.personal_events)
AutoComp.fill_combo(self.auto2,Utils.personal_events)
# Need to display localized event names
self.auto1.child.set_text(const.display_event(
self.options.handler.options_dict['fromtype']))

View File

@@ -236,7 +236,6 @@ class CheckIntegrity:
self.db.commit_person(p,self.trans)
self.progress.step()
def fix_encoding(self):
self.progress.set_pass(_('Looking for character encoding errors'),
self.db.get_number_of_media_objects())
@@ -887,6 +886,7 @@ class Report(ManagedWindow.ManagedWindow):
base = os.path.dirname(__file__)
glade_file = base + os.sep + "summary.glade"
topDialog = gtk.glade.XML(glade_file,"summary","gramps")
topDialog.get_widget("close").connect('clicked',self.close)
self.window = topDialog.get_widget("summary")
textwindow = topDialog.get_widget("textwindow")

View File

@@ -24,6 +24,8 @@
import gtk
import ListModel
import ManagedWindow
from PluginUtils import Tool, register_tool
_GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ]
@@ -32,20 +34,24 @@ _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ]
#
#
#-------------------------------------------------------------------------
class DumpGenderStats(Tool.Tool):
def __init__(self,db,person,options_class,name,callback=None,parent=None):
Tool.Tool.__init__(self,db,person,options_class,name)
class DumpGenderStats(Tool.Tool, ManagedWindow.ManagedWindow):
def __init__(self, dbstate, uistate, options_class, name, callback=None):
Tool.Tool.__init__(self, dbstate, options_class, name)
ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
stats_list = []
for name in db.genderStats.stats.keys():
for name in dbstate.db.genderStats.stats.keys():
stats_list.append(
(name,)
+ db.genderStats.stats[name]
+ (_GENDER[db.genderStats.guess_gender(name)],)
+ dbstate.db.genderStats.stats[name]
+ (_GENDER[dbstate.db.genderStats.guess_gender(name)],)
)
if parent:
if uistate:
titles = [
(_('Name'),1,100), (_('Male'),2,70),
(_('Female'),3,70), (_('Unknown'),4,70),
@@ -56,14 +62,14 @@ class DumpGenderStats(Tool.Tool):
model = ListModel.ListModel(treeview,titles)
for entry in stats_list:
model.add(entry,entry[0])
w = gtk.Window()
w.set_transient_for(parent.topWindow)
w.set_position(gtk.WIN_POS_MOUSE)
w.set_default_size(400,300)
self.window = gtk.Window()
self.window.set_default_size(400,300)
s = gtk.ScrolledWindow()
s.add(treeview)
w.add(s)
w.show_all()
self.window.add(s)
self.window.show_all()
else:
print "\t%s\t%s\t%s\t%s\t%s\n" % (
'Name','Male','Female','Unknown','Guess')

View File

@@ -248,8 +248,8 @@ class GraphViz:
family = self.database.get_family_from_handle(family_handle)
father_handle = family.get_father_handle()
mother_handle = family.get_mother_handle()
fadopted = frel != RelLib.ChildRef.CHILD_BIRTH
madopted = mrel != RelLib.ChildRef.CHILD_BIRTH
fadopted = frel != RelLib.ChildRefType.BIRTH
madopted = mrel != RelLib.ChildRefType.BIRTH
famid = family.get_gramps_id().replace('-','_')
if (self.show_families and
(father_handle and person_dict.has_key(father_handle) or

View File

@@ -1764,7 +1764,7 @@ class IndividualPage(BasePage):
val)
else:
of.write(nameof(person,self.exclude_private))
if rel != RelLib.ChildRef.CHILD_BIRTH:
if rel != RelLib.ChildRefType.BIRTH:
of.write('   (%s)' % Utils.format_child_relation(rel))
of.write('</td>\n')

View File

@@ -89,7 +89,9 @@ _sn_prefix_re = re.compile("^\s*(%s)\s+(.*)" % '|'.join(prefix_list),
class PatchNames(Tool.Tool, ManagedWindow.ManagedWindow):
def __init__(self, dbstate, uistate, options_class, name, callback=None):
Tool.Tool.__init__(self, dbstate, options_class, name)
ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
self.cb = callback
self.trans = self.db.transaction_begin()

View File

@@ -520,7 +520,7 @@ class TestcaseGenerator(Tool.Tool):
person2.add_family_handle(fam_h)
self.db.commit_person(person2,self.trans)
child = self.db.get_person_from_handle(child_h)
child.add_parent_family_handle(fam_h,(RelLib.ChildRef.CHILD_BIRTH,''),(RelLib.ChildRef.CHILD_BIRTH,''))
child.add_parent_family_handle(fam_h,RelLib.ChildRefType(),RelLib.ChildRefType())
self.db.commit_person(child,self.trans)
self.commit_transaction() # COMMIT TRANSACTION STEP

View File

@@ -18,6 +18,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_delete_event" last_modification_time="Thu, 24 Mar 2005 18:53:09 GMT"/>
@@ -33,7 +35,7 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button3">
<widget class="GtkButton" id="close">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@@ -74,6 +76,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">8</property>