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

Gedcom export, complete_rebuild fix, merge support

Browse Source 
svn: r1223
This commit is contained in:
Don Allingham 2002-12-14 05:07:09 +00:00
parent 170394d327
commit a08425ebc8
15 changed files with 194 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1567,7 +1567,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
RELEASE=pre6
RELEASE=pre7
VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x"
@ -1621,7 +1621,7 @@ fi
LANGUAGES="sv de fr es it pt_BR ru da_DK cs"
LANGUAGES="sv pl de fr es it pt_BR ru da_DK cs"
DISTLANGS=

2
gramps.spec
View File

@ -1,5 +1,5 @@
%define ver 0.9.0
%define rel pre6
%define rel pre7
%define prefix /usr
Summary: Genealogical Research and Analysis Management Programming System.

9
src/EditPerson.py
View File

@ -565,6 +565,8 @@ class EditPerson:
self.ntree.clear()
for name in self.nlist:
self.ntree.add([name.getName(),_(name.getType())],name)
if self.ntree:
self.ntree.select_row(0)
def redraw_url_list(self):
"""redraws the url list, disabling the go button if no url
@ -575,6 +577,7 @@ class EditPerson:
if len(self.ulist) > 0:
self.web_go.set_sensitive(0)
self.wtree.select_row(0)
else:
self.web_go.set_sensitive(0)
self.web_url.set_text("")
@ -587,12 +590,16 @@ class EditPerson:
location = "%s %s %s %s" % (addr.getStreet(),addr.getCity(),
addr.getState(),addr.getCountry())
self.ptree.add([addr.getDate(),location],addr)
if self.plist:
self.ptree.select_row(0)
def redraw_attr_list(self):
"""redraws the attribute list for the person"""
self.atree.clear()
for attr in self.alist:
self.atree.add([const.display_pattr(attr.getType()),attr.getValue()],attr)
if self.alist:
self.atree.select_row(0)
def redraw_event_list(self):
"""redraw_event_list - Update both the birth and death place combo
@ -606,6 +613,8 @@ class EditPerson:
for event in self.elist:
self.etree.add([const.display_pevent(event.getName()),event.getDescription(),
event.getQuoteDate(),event.getPlaceName()],event)
if self.elist:
self.etree.select_row(0)
# Remember old combo list input
prev_btext = Utils.strip_id(self.bplace.get_text())

3
src/EditPlace.py
View File

@ -118,7 +118,8 @@ class EditPlace:
self.build_columns(self.loc_list, [(_('City'),150), (_('County'),100),
(_('State'),100), (_('Country'),50)])
self.loc_list.set_model(self.loc_model)
self.loc_list.get_selection().connect('changed',self.on_loc_list_select_row)
self.sel = self.loc_list.get_selection()
self.sel.connect('changed',self.on_loc_list_select_row)
self.title.set_text(place.get_title())
mloc = place.get_main_location()

4
src/FamilyView.py
View File

@ -440,9 +440,9 @@ class FamilyView:
return
QuestionDialog(_('Delete Parents'),
_('Do you wish to remove the selected parents?'),
self.really_del_parents)
self.really_del_sp_parents)
def really_del_parents(self):
def really_del_sp_parents(self):
self.parent_deleter(self.selected_spouse,self.sp_selection)
def child_back(self,obj):

3
src/ListModel.py
View File

@ -22,7 +22,7 @@ from gobject import TYPE_STRING, TYPE_PYOBJECT
import gtk
class ListModel:
def __init__(self,tree,dlist,select_func=None,event_func=None):
def __init__(self,tree,dlist,select_func=None,event_func=None,mode=gtk.SELECTION_SINGLE):
self.tree = tree
l = len(dlist)
self.mylist = [TYPE_STRING]*l + [TYPE_PYOBJECT]
@ -30,6 +30,7 @@ class ListModel:
self.tree.set_rules_hint(gtk.TRUE)
self.new_model()
self.selection = self.tree.get_selection()
self.selection.set_mode(mode)
self.data_index = l

2
src/Makefile.in
View File

@ -136,7 +136,7 @@ pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop grampslib.so
EXTRA_DIST = grampslib.i
DIST_SOURCES = intl.c
DIST_SOURCES = intl.c grampslib_wrap.c
dist_pkgdata_DATA = ${pkgdata_DATA}
subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

6
src/Marriage.py
View File

@ -131,7 +131,7 @@ class Marriage:
self.gallery.load_images()
etitles = [(_('Event'),0,150),(_('Date'),1,150),(_('Place'),2,150)]
atitles = [(_('Attribute'),-1,150),(_('Value'),-1,150)]
atitles = [(_('Attribute'),0,150),(_('Value'),1,150)]
self.etree = ListModel.ListModel(self.event_list, etitles,
self.on_select_row,
@ -315,11 +315,15 @@ class Marriage:
for attr in self.alist:
d = [const.display_fattr(attr.getType()),attr.getValue()]
self.atree.add(d,attr)
if self.alist:
self.atree.select_row(0)
def redraw_event_list(self):
self.etree.clear()
for data in self.elist:
self.etree.add([data.getName(),data.getQuoteDate(),data.getPlaceName()],data)
if self.elist:
self.etree.select_row(0)
def get_widget(self,name):
return self.top.get_widget(name)

19
src/PlaceView.py
View File

@ -77,6 +77,7 @@ class PlaceView:
self.id2col = {}
self.selection = self.list.get_selection()
self.selection.set_mode(gtk.SELECTION_MULTIPLE)
colno = 0
for title in _column_headers:
renderer = gtk.CellRendererText ()
@ -128,16 +129,16 @@ class PlaceView:
self.list.connect('button-press-event',self.button_press)
def merge(self):
if len(self.place_list.selection) != 2:
mlist = []
self.selection.selected_foreach(self.blist,mlist)
if len(mlist) != 2:
msg = _("Exactly two places must be selected to perform a merge")
ErrorDialog(msg)
else:
import MergeData
p1 = self.place_list.get_row_data(self.place_list.selection[0])
P2 = self.place_list.get_row_data(self.place_list.selection[1])
p1 = self.db.getPlace(p1)
p2 = self.db.getPlace(p2)
MergeData.MergePlaces(self.db,p1,p2,self.load_places)
MergeData.MergePlaces(self.db,mlist[0],mlist[1],self.load_places)
def button_press(self,obj,event):
if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1:
@ -217,6 +218,6 @@ class PlaceView:
place = self.db.getPlace(id)
EditPlace.EditPlace(self, place, self.update_display)
def blist(self,store,path,iter,list):
id = self.db.getPlace(store.get_value(iter,1))
list.append(id)

2
src/const.py
View File

@ -100,7 +100,7 @@ startup = 1
#
#-------------------------------------------------------------------------
progName = "GRAMPS"
version = "0.9.0-pre6"
version = "0.9.0-pre7"
copyright = "© 2001-2002 Donald N. Allingham"
authors = ["Donald N. Allingham", "David Hampton","Donald A. Peterson"]
comments = _("GRAMPS (Genealogical Research and Analysis "

58
src/gramps_main.py
View File

@ -187,21 +187,22 @@ class Gramps:
self.pl_yz = self.gtop.get_widget("pl_yz")
self.pl_other = self.gtop.get_widget("pl_other")
m = gtk.SELECTION_MULTIPLE
self.pl_page = [
ListModel.ListModel(self.pl_ab, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_cd, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_ef, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_gh, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_ij, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_kl, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_mn, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_op, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_qr, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_st, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_uv, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_wx, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_yz, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_other, pl_titles, self.row_changed, self.alpha_event),
ListModel.ListModel(self.pl_ab, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_cd, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_ef, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_gh, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_ij, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_kl, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_mn, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_op, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_qr, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_st, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_uv, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_wx, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_yz, pl_titles, self.row_changed, self.alpha_event,m),
ListModel.ListModel(self.pl_other, pl_titles, self.row_changed, self.alpha_event,m),
]
self.person_list = self.pl_page[0].tree
@ -398,10 +399,10 @@ class Gramps:
self.editbtn.set_sensitive(val)
def row_changed(self,obj):
store,iter = obj.get_selected()
if iter:
id = store.get_value(iter,1)
self.change_active_person(self.db.getPerson(id))
mlist = []
self.person_selection.selected_foreach(self.blist,mlist)
if mlist:
self.change_active_person(mlist[0])
def on_show_plugin_status(self,obj):
Plugins.PluginStatus()
@ -503,21 +504,25 @@ class Gramps:
def on_gramps_report_bug_activate(self,obj):
import gnome.url
gnome.url.show("http://sourceforge.net/tracker/?group_id=25770&atid=385137")
def blist(self,store,path,iter,list):
id = self.db.getPerson(store.get_value(iter,1))
list.append(id)
def on_merge_activate(self,obj):
"""Calls up the merge dialog for the selection"""
page = self.notebook.get_current_page()
if page == 0:
if len(self.person_list.selection) != 2:
mlist = []
self.person_selection.selected_foreach(self.blist,mlist)
if len(mlist) != 2:
msg = _("Exactly two people must be selected to perform a merge")
ErrorDialog(msg)
else:
import MergeData
p1 = self.person_list.get_row_data(self.person_list.selection[0])
p2 = self.person_list.get_row_data(self.person_list.selection[1])
p1 = self.db.getPerson(p1)
p2 = self.db.getPerson(p2)
MergeData.MergePeople(self.db,p1,p2,self.merge_update,
MergeData.MergePeople(self.db,mlist[0],mlist[1],self.merge_update,
self.update_after_edit)
elif page == 4:
self.place_view.merge()
@ -638,6 +643,7 @@ class Gramps:
def full_update(self):
"""Brute force display update, updating all the pages"""
self.complete_rebuild()
self.family_view.load_family()
self.source_view.load_sources()
@ -1354,11 +1360,7 @@ class Gramps:
def complete_rebuild(self):
self.status_text(_("Updating display..."))
keys = self.alpha_page.keys()
for key in keys:
self.alpha_page[key].new_model()
self.apply_filter()
for key in keys:
self.alpha_page[key].connect_model()
self.modify_statusbar()
def apply_filter(self):

2
src/plugins/Summary.py
View File

@ -130,7 +130,7 @@ def report(database,person):
top = topDialog.get_widget("summary")
textwindow = topDialog.get_widget("textwindow")
textwindow.show_string(text)
textwindow.get_buffer().set_text(text)
top.show()
#-------------------------------------------------------------------------

2
src/plugins/WriteGedcom.py
View File

@ -917,7 +917,7 @@ class GedcomWriter:
else:
if surPref:
self.g.write("2 SURN %s %s\n" % (surPref,surName))
else if surName:
elif surName:
self.g.write("2 SURN %s\n" % surName)
if name.getSuffix() != "":

5
src/plugins/count_anc.py
View File

@ -41,8 +41,7 @@ class CountAncestors:
def __init__(self,database,person):
text = ""
base = os.path.dirname(__file__)
glade_file = base + os.sep + "summary.glade"
glade_file = "%s/summary.glade" % os.path.dirname(__file__)
topDialog = gtk.glade.XML(glade_file,"summary")
topDialog.signal_autoconnect({
"destroy_passed_object" : Utils.destroy_passed_object,
@ -81,7 +80,7 @@ class CountAncestors:
top = topDialog.get_widget("summary")
textwindow = topDialog.get_widget("textwindow")
topDialog.get_widget("summaryTitle").set_text(title)
textwindow.show_string(text)
textwindow.get_buffer().set_text(text)
top.show()
#-------------------------------------------------------------------------

222
src/plugins/summary.glade
View File

@ -1,111 +1,139 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
<requires lib="gnome" />
<widget class="GtkDialog" id="summary">
<property name="title" translatable="yes">Database Summary - GRAMPS</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="modal">no</property>
<property name="allow_shrink">yes</property>
<property name="allow_grow">yes</property>
<property name="visible">yes</property>
<property name="window-position">GTK_WIN_POS_NONE</property>
<widget class="GtkDialog" id="summary">
<property name="visible">True</property>
<property name="title" translatable="yes">Database Summary - GRAMPS</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="default_width">450</property>
<property name="default_height">400</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="homogeneous">no</property>
<property name="spacing">0</property>
<property name="visible">yes</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="border_width">10</property>
<property name="homogeneous">yes</property>
<property name="spacing">5</property>
<property name="visible">yes</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">30</property>
<property name="visible">yes</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">30</property>
<child>
<widget class="GtkButton" id="button3">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
<property name="label">gtk-close</property>
<property name="use_stock">yes</property>
<property name="use_underline">yes</property>
<child>
<widget class="GtkButton" id="button3">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="clicked" handler="destroy_passed_object" object="summary"/>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<signal name="clicked" handler="destroy_passed_object" object="summary" />
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">yes</property>
<property name="fill">yes</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">no</property>
<property name="fill">yes</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="homogeneous">no</property>
<property name="spacing">0</property>
<property name="visible">yes</property>
<child>
<widget class="GtkLabel" id="summaryTitle">
<property name="visible">True</property>
<property name="label" translatable="yes">Database Summary</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">8</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="summaryTitle">
<property name="label" translatable="yes">Database Summary</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="width-request">500</property>
<property name="height-request">16</property>
<property name="visible">yes</property>
</widget>
<packing>
<property name="padding">8</property>
<property name="expand">no</property>
<property name="fill">no</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
</widget>
<packing>
<property name="padding">4</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
<property name="visible">yes</property>
</widget>
<packing>
<property name="padding">4</property>
<property name="expand">no</property>
<property name="fill">yes</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTextView" id="textwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_NONE</property>
<property name="cursor_visible">True</property>
<property name="pixels_above_lines">0</property>
<property name="pixels_below_lines">0</property>
<property name="pixels_inside_wrap">0</property>
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes"></property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</child>
</widget>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">yes</property>
<property name="fill">yes</property>
</packing>
</child>
</widget>
</child>
</widget>
</glade-interface>