diff --git a/src/EditFamily.py b/src/EditFamily.py
index e52a64409..11e0087cd 100644
--- a/src/EditFamily.py
+++ b/src/EditFamily.py
@@ -55,19 +55,20 @@ import Spell
import GrampsDisplay
import RelLib
import ReportUtils
-import DisplayTabs
import AutoComp
import GrampsWidgets
from DdTargets import DdTargets
from WindowUtils import GladeIf
+from DisplayTabs import *
+from GrampsWidgets import *
#-------------------------------------------------------------------------
#
#
#
#-------------------------------------------------------------------------
-class AttrEmbedList(DisplayTabs.EmbeddedList):
+class AttrEmbedList(EmbeddedList):
_HANDLE_COL = -1
@@ -78,9 +79,8 @@ class AttrEmbedList(DisplayTabs.EmbeddedList):
def __init__(self,dbstate,uistate,track,data):
self.data = data
- DisplayTabs.EmbeddedList.__init__(self, dbstate, uistate, track,
- _('Attributes'),
- DisplayTabs.FamilyAttrModel)
+ EmbeddedList.__init__(self, dbstate, uistate, track,
+ _('Attributes'), FamilyAttrModel)
def get_data(self):
return self.data
@@ -88,7 +88,7 @@ class AttrEmbedList(DisplayTabs.EmbeddedList):
def column_order(self):
return ((1,0),(1,1))
-class ChildEmbedList(DisplayTabs.EmbeddedList):
+class ChildEmbedList(EmbeddedList):
_HANDLE_COL = 8
@@ -105,9 +105,8 @@ class ChildEmbedList(DisplayTabs.EmbeddedList):
def __init__(self,dbstate,uistate,track,family):
self.family = family
- DisplayTabs.EmbeddedList.__init__(self, dbstate, uistate, track,
- _('Children'),
- DisplayTabs.ChildModel)
+ EmbeddedList.__init__(self, dbstate, uistate, track,
+ _('Children'), ChildModel)
def get_icon_name(self):
return 'gramps-person'
@@ -166,6 +165,7 @@ class EditFamily(DisplayState.ManagedWindow):
return id(self.family.handle)
def build_interface(self):
+
self.top = gtk.glade.XML(const.placesFile,"marriageEditor","gramps")
self.gladeif = GladeIf(self.top)
self.window = self.top.get_widget("marriageEditor")
@@ -217,14 +217,14 @@ class EditFamily(DisplayState.ManagedWindow):
self.child_list = ChildEmbedList(self.dbstate,self.uistate,
self.track, self.family)
- self.event_list = DisplayTabs.EventEmbedList(self.dbstate,self.uistate,
- self.track,self.family)
+ self.event_list = EventEmbedList(self.dbstate,self.uistate,
+ self.track,self.family)
self.attr_list = AttrEmbedList(self.dbstate, self.uistate, self.track,
self.family.get_attribute_list())
- self.note_tab = DisplayTabs.NoteTab(self.dbstate, self.uistate, self.track,
- self.family.get_note_object())
- self.gallery_tab = DisplayTabs.GalleryTab(self.dbstate, self.uistate, self.track,
- self.family.get_media_list())
+ self.note_tab = NoteTab(self.dbstate, self.uistate, self.track,
+ self.family.get_note_object())
+ self.gallery_tab = GalleryTab(self.dbstate, self.uistate, self.track,
+ self.family.get_media_list())
self.notebook.insert_page(self.child_list)
self.notebook.set_tab_label(self.child_list,self.child_list.get_tab_widget())
diff --git a/src/gramps.glade b/src/gramps.glade
index ab2399826..e95561601 100644
--- a/src/gramps.glade
+++ b/src/gramps.glade
@@ -2229,44 +2229,27 @@
+
+
+ True
+
+
+ 0
+ False
+ False
+
+
+
6
True
- 3
- 3
+ 2
+ 8
False
6
12
-
-
- True
- <b>Relationship Information</b>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 3
- 0
- 1
- fill
-
-
-
-
True
@@ -2296,6 +2279,28 @@
+
+
+ True
+ True
+ False
+ True
+ 0
+
+ True
+ *
+ False
+
+
+ 2
+ 3
+ 1
+ 2
+ fill
+
+
+
+
True
@@ -2315,10 +2320,10 @@
0
- 1
- 2
- 2
- 3
+ 3
+ 4
+ 1
+ 2
fill
@@ -2332,30 +2337,109 @@
True
- 2
- 3
- 2
- 3
- fill
+ 4
+ 5
+ 1
+ 2
fill
-
+
True
- True
- False
- True
- 0
-
- True
- *
- False
+ Marker:
+ True
+ False
+ GTK_JUSTIFY_CENTER
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
- 2
- 3
+ 5
+ 6
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ True
+ False
+ True
+ True
+
+
+ 6
+ 7
+ 1
+ 2
+ fill
+
+
+
+
+
+ True
+ <b>Relationship Information</b>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 8
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+
+
+
+ True
+ locked.png
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+
+
+ 7
+ 8
1
2
fill