* src/AddSpouse.py: remove signal_autoconnect
* src/DisplayTrace.py: remove signal_autoconnect * src/EditSource.py: remove signal_autoconnect * src/ReadGedcom.py: two pass approach for handling forward refererencing notes * src/gramps.glade: remove signal mappings * src/plugins.glade: remove signal mappings svn: r5328
This commit is contained in:
Don Allingham
parent
677886956a
commit
91645849db
@ -1,3 +1,12 @@
|
||||
2005-10-17 Don Allingham <don@gramps-project.org>
|
||||
* src/AddSpouse.py: remove signal_autoconnect
|
||||
* src/DisplayTrace.py: remove signal_autoconnect
|
||||
* src/EditSource.py: remove signal_autoconnect
|
||||
* src/ReadGedcom.py: two pass approach for handling forward
|
||||
refererencing notes
|
||||
* src/gramps.glade: remove signal mappings
|
||||
* src/plugins.glade: remove signal mappings
|
||||
|
||||
2005-10-18 Julio Sanchez <jsanchez@users.sourceforge.net>
|
||||
* src/WriteGedcom.py: Add description and notes for media objects
|
||||
|
||||
|
||||
@ -60,6 +60,7 @@ import Marriage
|
||||
import NameDisplay
|
||||
import GenericFilter
|
||||
from QuestionDialog import ErrorDialog, QuestionDialog2
|
||||
from WindowUtils import GladeIf
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -94,6 +95,7 @@ class AddSpouse:
|
||||
# the same gender as the current person.
|
||||
|
||||
self.glade = gtk.glade.XML(const.gladeFile, "spouseDialog","gramps")
|
||||
self.gladeif = GladeIf(self.glade)
|
||||
|
||||
self.relation_def = self.glade.get_widget("reldef")
|
||||
self.rel_combo = self.glade.get_widget("rel_combo")
|
||||
@ -118,19 +120,25 @@ class AddSpouse:
|
||||
Utils.set_titles(self.window,
|
||||
self.glade.get_widget('title'),title,
|
||||
_('Choose Spouse/Partner'))
|
||||
|
||||
self.glade.signal_autoconnect({
|
||||
"on_select_spouse_clicked" : self.select_spouse_clicked,
|
||||
"on_spouse_help_clicked" : self.on_spouse_help_clicked,
|
||||
"on_show_toggled" : self.on_show_toggled,
|
||||
"on_new_spouse_clicked" : self.new_spouse_clicked,
|
||||
"destroy_passed_object" : Utils.destroy_passed_object
|
||||
})
|
||||
|
||||
self.gladeif.connect('button117','clicked',self.close)
|
||||
self.gladeif.connect('spouseDialog','delete_event',self.delete_event)
|
||||
self.gladeif.connect('spouse_ok','clicked',self.select_spouse_clicked)
|
||||
self.gladeif.connect('spouse_help','clicked',self.on_spouse_help_clicked)
|
||||
self.gladeif.connect('spouseNewPerson','clicked',self.new_spouse_clicked)
|
||||
self.gladeif.connect('show_all','clicked',self.on_show_toggled)
|
||||
|
||||
self.rel_combo.set_active(RelLib.Family.MARRIED)
|
||||
self.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
|
||||
gobject.idle_add(self.update_data)
|
||||
|
||||
def delete_event(self,obj):
|
||||
self.gladeif.close()
|
||||
|
||||
def close(self,obj):
|
||||
self.gladeif.close()
|
||||
self.window.close()
|
||||
|
||||
def build_all(self):
|
||||
return None
|
||||
|
||||
|
||||
@ -107,7 +107,9 @@ class DisplayTrace:
|
||||
|
||||
window.get_buffer().set_text(msg.getvalue())
|
||||
print msg.getvalue()
|
||||
self.glade.signal_autoconnect({'on_close_clicked':self.close})
|
||||
|
||||
window.connect('delete_event',self.close)
|
||||
self.glade.get_widget('button107').connect('clicked',self.close)
|
||||
|
||||
def close(self,obj):
|
||||
self.top.destroy()
|
||||
|
||||
@ -49,6 +49,7 @@ import RelLib
|
||||
import NameDisplay
|
||||
import Spell
|
||||
import GrampsDisplay
|
||||
from WindowUtils import GladeIf
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -87,6 +88,7 @@ class EditSource:
|
||||
|
||||
self.top_window = gtk.glade.XML(const.gladeFile,"sourceEditor","gramps")
|
||||
self.top = self.top_window.get_widget("sourceEditor")
|
||||
self.gladeif = GladeIf(self.top_window)
|
||||
|
||||
Utils.set_titles(self.top,self.top_window.get_widget('title'),
|
||||
_('Source Editor'))
|
||||
@ -138,20 +140,17 @@ class EditSource:
|
||||
if self.source.get_media_list():
|
||||
Utils.bold_label(self.gallery_label)
|
||||
|
||||
self.top_window.signal_autoconnect({
|
||||
"on_switch_page" : self.on_switch_page,
|
||||
"on_addphoto_clicked" : self.gallery.on_add_media_clicked,
|
||||
"on_selectphoto_clicked" : self.gallery.on_select_media_clicked,
|
||||
"on_deletephoto_clicked" : self.gallery.on_delete_media_clicked,
|
||||
"on_editphoto_clicked" : self.gallery.on_edit_media_clicked,
|
||||
"on_edit_properties_clicked": self.gallery.popup_change_description,
|
||||
"on_sourceEditor_help_clicked" : self.on_help_clicked,
|
||||
"on_sourceEditor_ok_clicked" : self.on_source_apply_clicked,
|
||||
"on_sourceEditor_cancel_clicked" : self.close,
|
||||
"on_sourceEditor_delete_event" : self.on_delete_event,
|
||||
"on_delete_data_clicked" : self.on_delete_data_clicked,
|
||||
"on_add_data_clicked" : self.on_add_data_clicked,
|
||||
})
|
||||
self.gladeif.connect('sourceEditor','delete_event',self.on_delete_event)
|
||||
self.gladeif.connect('button90','clicked',self.close)
|
||||
self.gladeif.connect('ok','clicked',self.on_source_apply_clicked)
|
||||
self.gladeif.connect('button166','clicked',self.on_help_clicked)
|
||||
self.gladeif.connect('notebook2','switch_page',self.on_switch_page)
|
||||
self.gladeif.connect('add_data','clicked',self.on_add_data_clicked)
|
||||
self.gladeif.connect('del_data','clicked',self.on_delete_data_clicked)
|
||||
self.gladeif.connect('add_photo','clicked',self.gallery.on_add_media_clicked)
|
||||
self.gladeif.connect('sel_photo','clicked',self.gallery.on_select_media_clicked)
|
||||
self.gladeif.connect('edit_photo','clicked',self.gallery.on_edit_media_clicked)
|
||||
self.gladeif.connect('delete_photo','clicked',self.gallery.on_delete_media_clicked)
|
||||
|
||||
if self.source.get_handle() == None or self.db.readonly:
|
||||
self.top_window.get_widget("edit_photo").set_sensitive(False)
|
||||
@ -219,6 +218,7 @@ class EditSource:
|
||||
def on_delete_event(self,obj,b):
|
||||
self.close_child_windows()
|
||||
self.remove_itself_from_menu()
|
||||
self.gladeif.close()
|
||||
gc.collect()
|
||||
|
||||
def on_help_clicked(self,obj):
|
||||
@ -229,6 +229,7 @@ class EditSource:
|
||||
self.gallery.close()
|
||||
self.close_child_windows()
|
||||
self.remove_itself_from_menu()
|
||||
self.gladeif.close()
|
||||
self.top.destroy()
|
||||
gc.collect()
|
||||
|
||||
|
||||
@ -197,7 +197,8 @@ def import2(database, filename, cb, codeset, use_trans):
|
||||
})
|
||||
|
||||
try:
|
||||
g = GedcomParser(database,filename,statusTop, codeset)
|
||||
np = NoteParser(filename, False)
|
||||
g = GedcomParser(database,filename,statusTop, codeset, np.get_map())
|
||||
except IOError,msg:
|
||||
Utils.destroy_passed_object(statusWindow)
|
||||
ErrorDialog(_("%s could not be opened\n") % filename,str(msg))
|
||||
@ -263,6 +264,52 @@ class GedcomDateParser(DateParser.DateParser):
|
||||
'sep' : 9, 'oct' : 10, 'nov' : 11, 'dec' : 12,
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
noteRE = re.compile(r"\s*\d+\s+\@(\S+)\@\s+NOTE(.*)$")
|
||||
contRE = re.compile(r"\s*\d+\s+CONT\s(.*)$")
|
||||
concRE = re.compile(r"\s*\d+\s+CONC\s(.*)$")
|
||||
|
||||
|
||||
class NoteParser:
|
||||
def __init__(self, filename,broken):
|
||||
self.nmap = {}
|
||||
|
||||
f = open(filename,"rU")
|
||||
innote = False
|
||||
|
||||
for line in f.xreadlines():
|
||||
|
||||
if innote:
|
||||
match = contRE.match(line)
|
||||
if match:
|
||||
noteobj.append("\n" + match.groups()[0])
|
||||
|
||||
match = concRE.match(line)
|
||||
if match:
|
||||
if broken:
|
||||
noteobj.append(" " + match.groups()[0])
|
||||
else:
|
||||
noteobj.append(match.groups()[0])
|
||||
continue
|
||||
innote = False
|
||||
else:
|
||||
match = noteRE.match(line)
|
||||
if match:
|
||||
data = match.groups()[0]
|
||||
noteobj = RelLib.Note()
|
||||
self.nmap["@%s@" % data] = noteobj
|
||||
noteobj.append(match.groups()[1])
|
||||
innote = True
|
||||
f.close()
|
||||
|
||||
def get_map(self):
|
||||
return self.nmap
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
@ -273,7 +320,7 @@ class GedcomParser:
|
||||
SyntaxError = "Syntax Error"
|
||||
BadFile = "Not a GEDCOM file"
|
||||
|
||||
def __init__(self, dbase, filename, window, codeset):
|
||||
def __init__(self, dbase, filename, window, codeset, smap):
|
||||
self.dp = GedcomDateParser()
|
||||
self.db = dbase
|
||||
self.person = None
|
||||
@ -281,8 +328,7 @@ class GedcomParser:
|
||||
self.media_map = {}
|
||||
self.fmap = {}
|
||||
self.smap = {}
|
||||
self.nmap = {}
|
||||
self.share_note = {}
|
||||
self.nmap = smap
|
||||
self.refn = {}
|
||||
self.added = {}
|
||||
self.gedmap = GedcomInfoDB()
|
||||
@ -537,7 +583,6 @@ class GedcomParser:
|
||||
src.set_note(note)
|
||||
self.db.add_source(src,self.trans)
|
||||
|
||||
self.break_note_links()
|
||||
t = time.time() - t
|
||||
msg = _('Import Complete: %d seconds') % t
|
||||
|
||||
@ -554,14 +599,6 @@ class GedcomParser:
|
||||
print "Individuals: %d" % self.indi_count
|
||||
return None
|
||||
|
||||
def break_note_links(self):
|
||||
for handle in self.share_note.keys():
|
||||
p = self.db.get_person_from_handle(handle)
|
||||
if p:
|
||||
note_id = self.share_note[handle]
|
||||
p.set_note_object(self.nmap[note_id])
|
||||
self.db.commit_person(p,self.trans)
|
||||
|
||||
def parse_trailer(self):
|
||||
matches = self.get_next()
|
||||
if matches[0] >= 0 and matches[1] != "TRLR":
|
||||
@ -697,11 +734,7 @@ class GedcomParser:
|
||||
source.set_title( matches[2][5:])
|
||||
self.db.commit_source(source, self.trans)
|
||||
elif matches[2][0:4] == "NOTE":
|
||||
noteobj = RelLib.Note()
|
||||
self.nmap[matches[1]] = noteobj
|
||||
text = matches[2][4:]
|
||||
noteobj.append(text + self.parse_note_continue(1))
|
||||
self.parse_note_data(1)
|
||||
self.ignore_sub_junk(1)
|
||||
elif matches[2] == "_LOC":
|
||||
# TODO: Add support for extended Locations.
|
||||
# See: http://en.wiki.genealogy.net/index.php/Gedcom_5.5EL
|
||||
@ -945,7 +978,11 @@ class GedcomParser:
|
||||
def parse_note_base(self,matches,obj,level,old_note,task):
|
||||
note = old_note
|
||||
if matches[2] and matches[2][0] == "@": # reference to a named note defined elsewhere
|
||||
self.share_note[obj.get_handle()] = matches[2]
|
||||
nobj = self.nmap.get(matches[2])
|
||||
if nobj:
|
||||
return nobj.get()
|
||||
else:
|
||||
return u""
|
||||
else:
|
||||
if old_note:
|
||||
note = "%s\n%s%s" % (old_note,matches[2],self.parse_continue_data(level))
|
||||
@ -969,6 +1006,8 @@ class GedcomParser:
|
||||
|
||||
if int(matches[0]) < 1:
|
||||
self.backup()
|
||||
if note:
|
||||
self.person.set_note(note)
|
||||
return
|
||||
elif matches[1] == "NAME":
|
||||
name = RelLib.Name()
|
||||
@ -2090,3 +2129,9 @@ def extract_temple(matches):
|
||||
|
||||
def create_id():
|
||||
return Utils.create_id()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
|
||||
a = NoteParser(sys.argv[1],False)
|
||||
|
||||
@ -3650,7 +3650,6 @@
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-5</property>
|
||||
<signal name="clicked" handler="on_select_spouse_clicked" object="spouseDialog"/>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
@ -3664,7 +3663,6 @@
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-11</property>
|
||||
<signal name="clicked" handler="on_spouse_help_clicked" last_modification_time="Tue, 18 Nov 2003 03:27:03 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
@ -3751,7 +3749,6 @@
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_new_spouse_clicked" object="spouseDialog"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2309">
|
||||
@ -3784,7 +3781,6 @@
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="on_show_toggled"/>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
@ -4739,7 +4735,6 @@ Other</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<property name="has_separator">False</property>
|
||||
<signal name="delete_event" handler="on_sourceEditor_delete_event" last_modification_time="Sat, 21 Feb 2004 02:58:41 GMT"/>
|
||||
|
||||
<child internal-child="vbox">
|
||||
<widget class="GtkVBox" id="dialog-vbox11">
|
||||
@ -4763,7 +4758,6 @@ Other</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-6</property>
|
||||
<signal name="clicked" handler="on_sourceEditor_cancel_clicked" last_modification_time="Sat, 21 Feb 2004 02:59:20 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
@ -4779,7 +4773,6 @@ Other</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-5</property>
|
||||
<signal name="clicked" handler="on_sourceEditor_ok_clicked" last_modification_time="Sat, 21 Feb 2004 02:59:36 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
@ -4793,7 +4786,6 @@ Other</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-11</property>
|
||||
<signal name="clicked" handler="on_sourceEditor_help_clicked" last_modification_time="Tue, 18 Nov 2003 03:51:32 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
@ -4842,7 +4834,6 @@ Other</property>
|
||||
<property name="tab_pos">GTK_POS_TOP</property>
|
||||
<property name="scrollable">False</property>
|
||||
<property name="enable_popup">False</property>
|
||||
<signal name="switch_page" handler="on_switch_page" object="sourceEditor"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTable" id="table17">
|
||||
@ -5269,7 +5260,6 @@ Other</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_add_data_clicked" last_modification_time="Wed, 24 Nov 2004 16:59:34 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2292">
|
||||
@ -5297,7 +5287,6 @@ Other</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_delete_data_clicked" last_modification_time="Wed, 24 Nov 2004 16:59:58 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2295">
|
||||
@ -5406,7 +5395,6 @@ Other</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_addphoto_clicked" object="sourceEditor"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2288">
|
||||
@ -5434,7 +5422,6 @@ Other</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_selectphoto_clicked" object="sourceEditor" last_modification_time="Fri, 12 Dec 2003 05:21:39 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2289">
|
||||
@ -5462,7 +5449,6 @@ Other</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_editphoto_clicked" object="sourceEditor" last_modification_time="Fri, 06 Feb 2004 20:06:09 GMT"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2290">
|
||||
@ -5490,7 +5476,6 @@ Other</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<signal name="clicked" handler="on_deletephoto_clicked" object="sourceEditor"/>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2291">
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<property name="has_separator">False</property>
|
||||
<signal name="delete_event" handler="on_plugstat_delete_event" last_modification_time="Sat, 20 Nov 2004 04:07:44 GMT"/>
|
||||
|
||||
<child internal-child="vbox">
|
||||
<widget class="GtkVBox" id="vbox37">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user