diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 0eae450bf..0d704450a 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,9 +1,11 @@ 2005-10-17 Don Allingham + * src/gedcomimport.glade: use expanders for information and + warning windows. * 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 + refererencing notes, less obscure names * src/gramps.glade: remove signal mappings * src/plugins.glade: remove signal mappings diff --git a/gramps2/src/ReadGedcom.py b/gramps2/src/ReadGedcom.py index 7f7526cd9..44d50ad85 100644 --- a/gramps2/src/ReadGedcom.py +++ b/gramps2/src/ReadGedcom.py @@ -277,7 +277,7 @@ concRE = re.compile(r"\s*\d+\s+CONC\s(.*)$") class NoteParser: def __init__(self, filename,broken): - self.nmap = {} + self.name_map = {} f = open(filename,"rU") innote = False @@ -302,13 +302,13 @@ class NoteParser: if match: data = match.groups()[0] noteobj = RelLib.Note() - self.nmap["@%s@" % data] = noteobj + self.name_map["@%s@" % data] = noteobj noteobj.append(match.groups()[1]) innote = True f.close() def get_map(self): - return self.nmap + return self.name_map #------------------------------------------------------------------------- # @@ -320,7 +320,7 @@ class GedcomParser: SyntaxError = "Syntax Error" BadFile = "Not a GEDCOM file" - def __init__(self, dbase, filename, window, codeset, smap): + def __init__(self, dbase, filename, window, codeset, note_map): self.dp = GedcomDateParser() self.db = dbase self.person = None @@ -328,7 +328,7 @@ class GedcomParser: self.media_map = {} self.fmap = {} self.smap = {} - self.nmap = smap + self.note_map = note_map self.refn = {} self.added = {} self.gedmap = GedcomInfoDB() @@ -978,9 +978,9 @@ 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 - nobj = self.nmap.get(matches[2]) - if nobj: - return nobj.get() + note_obj = self.note_map.get(matches[2]) + if note_obj: + return note_obj.get() else: return u"" else: diff --git a/gramps2/src/gedcomimport.glade b/gramps2/src/gedcomimport.glade index 7705bd5c6..09ec4fafa 100644 --- a/gramps2/src/gedcomimport.glade +++ b/gramps2/src/gedcomimport.glade @@ -10,7 +10,6 @@ GTK_WIN_POS_CENTER True 600 - 500 True False True @@ -18,6 +17,8 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False @@ -38,6 +39,10 @@ 0.5 0 6 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 5 @@ -50,7 +55,7 @@ 12 True - 10 + 8 5 False 6 @@ -69,6 +74,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -93,6 +102,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -117,6 +130,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -141,6 +158,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -161,7 +182,7 @@ 0 True - * + * False @@ -173,129 +194,6 @@ - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 1 - 5 - 6 - 7 - fill - - - - - - True - <b>Information</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 5 - 5 - 6 - fill - - - - - - - True - <b>Warning messages</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 5 - 8 - 9 - fill - - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 1 - 5 - 9 - 10 - fill - - - True @@ -305,7 +203,7 @@ 0 True - * + * False @@ -330,6 +228,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 3 @@ -350,7 +252,7 @@ 10 True - * + * False @@ -371,7 +273,7 @@ 0 True - * + * False @@ -392,7 +294,7 @@ 10 True - * + * False @@ -417,6 +319,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 3 @@ -437,7 +343,7 @@ 0 True - * + * False @@ -462,6 +368,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 3 @@ -472,6 +382,145 @@ + + + + True + True + False + 0 + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + True + <b>Information</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + 5 + 5 + 6 + fill + + + + + + True + True + False + 0 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + True + <b>Warning messages</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + 5 + 7 + 8 + fill + + 0 @@ -524,6 +573,8 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False False @@ -577,6 +628,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 6 @@ -598,6 +653,10 @@ 0.5 6 6 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -636,6 +695,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -652,6 +715,8 @@ ANSEL ANSI (iso-8859-1) ASCII UNICODE + False + True 0