From 84394c8805f9ffa4f098e4d531f8af4a1851dfd6 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sat, 14 Jan 2006 18:02:07 +0000
Subject: [PATCH] * src/DisplayTabs.py: fix scrolled window *
 src/EditFamily.py: delete button * src/gramps.glade: clean up the window.

svn: r5752
---
 gramps2/ChangeLog          | 5 +++++
 gramps2/src/DisplayTabs.py | 3 ++-
 gramps2/src/EditFamily.py  | 5 ++++-
 gramps2/src/gramps.glade   | 9 +++++----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 5154069c1..6e06687f1 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-14  Don Allingham  <don@gramps-project.org>
+	* src/DisplayTabs.py: fix scrolled window
+	* src/EditFamily.py: delete button
+	* src/gramps.glade: clean up the window.
+	
 2006-01-13  Don Allingham  <don@gramps-project.org>
 	* src/const.py.in: remove unused variables
 	* src/gramps.glade: remove unused dialogs
diff --git a/gramps2/src/DisplayTabs.py b/gramps2/src/DisplayTabs.py
index 83c7711fc..544f4f078 100644
--- a/gramps2/src/DisplayTabs.py
+++ b/gramps2/src/DisplayTabs.py
@@ -51,8 +51,9 @@ class EmbeddedList(gtk.HBox):
         self.selection.connect('changed',self.selection_changed)
         
         scroll = gtk.ScrolledWindow()
+        scroll.set_shadow_type(gtk.SHADOW_IN)
         scroll.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
-        scroll.add_with_viewport(self.tree)
+        scroll.add(self.tree)
         self.pack_start(scroll,True)
         self.columns = []
         self.build_columns()
diff --git a/gramps2/src/EditFamily.py b/gramps2/src/EditFamily.py
index 2febd8a52..69f5cc49d 100644
--- a/gramps2/src/EditFamily.py
+++ b/gramps2/src/EditFamily.py
@@ -145,7 +145,10 @@ class ChildEmbedList(DisplayTabs.EmbeddedList):
         print "Add Button Clicked"
 
     def del_button_clicked(self,obj):
-        print "Del Button Clicked"
+        handle = self.get_selected()
+        if handle:
+            self.family.remove_child_handle(handle)
+            self.rebuild()
 
     def edit_button_clicked(self,obj):
         handle = self.get_selected()
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index 750f47674..ab2399826 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -2234,7 +2234,7 @@
 	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="n_rows">3</property>
-	      <property name="n_columns">8</property>
+	      <property name="n_columns">3</property>
 	      <property name="homogeneous">False</property>
 	      <property name="row_spacing">6</property>
 	      <property name="column_spacing">12</property>
@@ -2259,7 +2259,7 @@
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">8</property>
+		  <property name="right_attach">3</property>
 		  <property name="top_attach">0</property>
 		  <property name="bottom_attach">1</property>
 		  <property name="x_options">fill</property>
@@ -2333,7 +2333,7 @@
 		</widget>
 		<packing>
 		  <property name="left_attach">2</property>
-		  <property name="right_attach">8</property>
+		  <property name="right_attach">3</property>
 		  <property name="top_attach">2</property>
 		  <property name="bottom_attach">3</property>
 		  <property name="x_options">fill</property>
@@ -2355,9 +2355,10 @@
 		</widget>
 		<packing>
 		  <property name="left_attach">2</property>
-		  <property name="right_attach">8</property>
+		  <property name="right_attach">3</property>
 		  <property name="top_attach">1</property>
 		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>