diff --git a/gramps/src/EditPerson.glade b/gramps/src/EditPerson.glade
index a4c5738d3..ec3dca314 100644
--- a/gramps/src/EditPerson.glade
+++ b/gramps/src/EditPerson.glade
@@ -115,7 +115,7 @@
GtkTable
table16
- 2
+ 3
2
False
0
@@ -221,6 +221,65 @@
False
+
+
+ GtkHBox
+ hbox19
+ False
+ 0
+
+ 1
+ 2
+ 2
+ 3
+ 0
+ 0
+ False
+ True
+ False
+ False
+ True
+ True
+
+
+
+ GtkButton
+ button99
+ True
+
+ clicked
+ on_birth_source_clicked
+
+ Sun, 03 Jun 2001 20:10:22 GMT
+
+
+ GTK_RELIEF_NORMAL
+
+ 0
+ True
+ False
+
+
+
+
+ GtkButton
+ button100
+ True
+
+ clicked
+ on_birth_note_clicked
+
+ Sun, 03 Jun 2001 20:10:35 GMT
+
+
+ GTK_RELIEF_NORMAL
+
+ 0
+ True
+ False
+
+
+
@@ -248,7 +307,7 @@
GtkTable
table17
- 2
+ 3
2
False
0
@@ -355,6 +414,65 @@
False
+
+
+ GtkHBox
+ hbox20
+ False
+ 0
+
+ 1
+ 2
+ 2
+ 3
+ 0
+ 0
+ False
+ True
+ False
+ False
+ True
+ True
+
+
+
+ GtkButton
+ button101
+ True
+
+ clicked
+ on_death_source_clicked
+
+ Sun, 03 Jun 2001 20:10:45 GMT
+
+
+ GTK_RELIEF_NORMAL
+
+ 0
+ True
+ False
+
+
+
+
+ GtkButton
+ button102
+ True
+
+ clicked
+ on_death_note_clicked
+
+ Sun, 03 Jun 2001 20:10:54 GMT
+
+
+ GTK_RELIEF_NORMAL
+
+ 0
+ True
+ False
+
+
+
diff --git a/gramps/src/EditPerson.py b/gramps/src/EditPerson.py
index 8f3f99370..9937f21cf 100644
--- a/gramps/src/EditPerson.py
+++ b/gramps/src/EditPerson.py
@@ -49,6 +49,7 @@ import utils
import Config
from RelLib import *
import RelImage
+import Sources
_ = intl.gettext
@@ -126,6 +127,10 @@ class EditPerson:
self.selectedIcon = -1
self.top_window.signal_autoconnect({
+ "on_death_note_clicked" : on_death_note_clicked,
+ "on_death_source_clicked" : on_death_source_clicked,
+ "on_birth_note_clicked" : on_birth_note_clicked,
+ "on_birth_source_clicked" : on_birth_source_clicked,
"on_eventAddBtn_clicked" : on_event_add_clicked,
"on_eventDeleteBtn_clicked" : on_event_delete_clicked,
"on_nameList_select_row" : on_name_list_select_row,
@@ -1132,9 +1137,71 @@ def on_event_note_clicked(obj):
#
#
#-------------------------------------------------------------------------
-def on_showsource_clicked(obj):
- import Sources
+def on_birth_note_clicked(obj):
+ edit_person_obj = obj.get_data(EDITPERSON)
+ editnote = libglade.GladeXML(const.editnoteFile,"editnote")
+ data = edit_person_obj.person.getBirth()
+ textobj = editnote.get_widget("notetext")
+ en_obj = editnote.get_widget("editnote")
+ en_obj.set_data("n",data)
+ en_obj.set_data("w",textobj)
+ textobj.set_point(0)
+ textobj.insert_defaults(data.getNote())
+ textobj.set_word_wrap(1)
+
+ editnote.signal_autoconnect({
+ "on_save_note_clicked" : on_save_note_clicked,
+ "destroy_passed_object" : utils.destroy_passed_object
+ })
+
+#-------------------------------------------------------------------------
+#
+#
+#
+#-------------------------------------------------------------------------
+def on_death_note_clicked(obj):
+ edit_person_obj = obj.get_data(EDITPERSON)
+ editnote = libglade.GladeXML(const.editnoteFile,"editnote")
+ textobj = editnote.get_widget("notetext")
+ data = edit_person_obj.person.getDeath()
+ en_obj = editnote.get_widget("editnote")
+ en_obj.set_data("n",data)
+ en_obj.set_data("w",textobj)
+
+ textobj.set_point(0)
+ textobj.insert_defaults(data.getNote())
+ textobj.set_word_wrap(1)
+
+ editnote.signal_autoconnect({
+ "on_save_note_clicked" : on_save_note_clicked,
+ "destroy_passed_object" : utils.destroy_passed_object
+ })
+
+#-------------------------------------------------------------------------
+#
+#
+#
+#-------------------------------------------------------------------------
+def on_death_source_clicked(obj):
+ edit_person_obj = obj.get_data(EDITPERSON)
+ Sources.SourceEditor(edit_person_obj.person.getDeath(),edit_person_obj.db)
+
+#-------------------------------------------------------------------------
+#
+#
+#
+#-------------------------------------------------------------------------
+def on_birth_source_clicked(obj):
+ edit_person_obj = obj.get_data(EDITPERSON)
+ Sources.SourceEditor(edit_person_obj.person.getBirth(),edit_person_obj.db)
+
+#-------------------------------------------------------------------------
+#
+#
+#
+#-------------------------------------------------------------------------
+def on_showsource_clicked(obj):
row = obj.get_data(INDEX)
edit_person_obj = obj.get_data(EDITPERSON)
if row >= 0:
diff --git a/gramps/src/Sources.py b/gramps/src/Sources.py
index 53e49b910..da68d423b 100644
--- a/gramps/src/Sources.py
+++ b/gramps/src/Sources.py
@@ -208,5 +208,3 @@ def on_source_changed(obj):
src_entry.get_widget("sdate").set_sensitive(active)
src_entry.get_widget("stext").set_sensitive(active)
src_entry.get_widget("scomment").set_sensitive(active)
-
-
diff --git a/gramps/src/gramps.glade b/gramps/src/gramps.glade
index dc4abb3f1..d38f3233c 100644
--- a/gramps/src/gramps.glade
+++ b/gramps/src/gramps.glade
@@ -3023,7 +3023,7 @@
GtkLabel
label186
-
+
GTK_JUSTIFY_CENTER
False
0.5
diff --git a/gramps/src/marriage.glade b/gramps/src/marriage.glade
index 22257e395..a849fcaff 100644
--- a/gramps/src/marriage.glade
+++ b/gramps/src/marriage.glade
@@ -123,7 +123,7 @@
GtkLabel
label202
-
+
GTK_JUSTIFY_CENTER
False
0.5
diff --git a/gramps/src/plugins/ReadGedcom.py b/gramps/src/plugins/ReadGedcom.py
index fccd45d4b..f4717635d 100644
--- a/gramps/src/plugins/ReadGedcom.py
+++ b/gramps/src/plugins/ReadGedcom.py
@@ -71,7 +71,6 @@ nameRegexp = re.compile(r"([\S\s]*\S)?\s*/([^/]+)?/\s*,?\s*([\S]+)?")
#
#-------------------------------------------------------------------------
def find_file(fullname,altpath):
- print "trying",fullname
if os.path.isfile(fullname):
type = gnome.mime.type(fullname)
if type[0:6] != "image/":
@@ -483,7 +482,6 @@ class GedcomParser:
while 1:
matches = self.get_next()
- print matches[0],matches[1],matches[2]
if int(matches[0]) == 0:
self.backup()
return
@@ -540,7 +538,6 @@ class GedcomParser:
pass
elif matches[1] == "FAMS":
family = self.db.findFamily(matches[2],self.fmap)
- print self.person.getPrimaryName().getName(),matches[2]
self.person.addFamily(family)
note = self.parse_optional_note(2)
elif matches[1] == "FAMC":
diff --git a/gramps/src/po/sv.po b/gramps/src/po/sv.po
index d96f928d6..3683bce60 100644
--- a/gramps/src/po/sv.po
+++ b/gramps/src/po/sv.po
@@ -2351,96 +2351,3 @@ msgstr "till"
#: glade.c:1092
msgid "to:"
msgstr "till:"
-
-#, fuzzy
-#~ msgid "Birth date : "
-#~ msgstr "Födelsedatum: "
-
-
-msgid "name"
-msgstr "namn"
-
-#: glade.c:1107 glade.c:1109
-msgid "to"
-msgstr "till"
-
-#: glade.c:1098
-msgid "to:"
-msgstr "till:"
-
-#~ msgid "Abiword"
-#~ msgstr "Abiword"
-
-#~ msgid "From"
-#~ msgstr "Från"
-
-#~ msgid "From : "
-#~ msgstr "Från: "
-
-#~ msgid "GRAMPS - Merge People"
-#~ msgstr "GRAMPS - Slå ihop individer"
-
-#~ msgid "Reletivity - Source Information"
-#~ msgstr "Släktskap - Källinformation"
-
-#~ msgid "To"
-#~ msgstr "Till"
-
-#~ msgid "To : "
-#~ msgstr "Till: "
-
-#~ msgid " as the home person?"
-#~ msgstr " som proband?"
-
-#~ msgid " is not a valid date format, and has been\n"
-#~ msgstr " är inte ett korrekt datumformat, och har\n"
-
-#~ msgid "Country :"
-#~ msgstr "Land:"
-
-#~ msgid "Do you wish to set "
-#~ msgstr "Vill du ställa in "
-
-#~ msgid "Unknown Format"
-#~ msgstr "Okänt format"
-
-#~ msgid "apr"
-#~ msgstr "apr"
-
-#~ msgid "aug"
-#~ msgstr "aug"
-
-#~ msgid "dec"
-#~ msgstr "dec"
-
-#~ msgid "feb"
-#~ msgstr "feb"
-
-#~ msgid "ignored as the date of the event."
-#~ msgstr "ignoreras som datum för händelsen."
-
-#~ msgid "jan"
-#~ msgstr "jan"
-
-#~ msgid "jul"
-#~ msgstr "jul"
-
-#~ msgid "jun"
-#~ msgstr "jun"
-
-#~ msgid "mar"
-#~ msgstr "mar"
-
-#~ msgid "may"
-#~ msgstr "maj"
-
-#~ msgid "nov"
-#~ msgstr "nov"
-
-#~ msgid "oct"
-#~ msgstr "okt"
-
-#~ msgid "sep"
-#~ msgstr "sep"
-
-