From 23d80230a95b4358259684acf376ac53d10fb5c4 Mon Sep 17 00:00:00 2001
From: Benny Malengier <benny.malengier@gramps-project.org>
Date: Fri, 5 Mar 2010 22:52:24 +0000
Subject: [PATCH] 3441: Need to connect on_result_delete_event on glade dialogs
 - part 2

svn: r14642
---
 src/ReportBase/_StyleEditor.py | 19 ++++++++++++++++---
 src/glade/mergedata.glade      |  7 +++++++
 src/glade/styleeditor.glade    |  6 ++++++
 src/plugins/tool/check.glade   |  2 ++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/ReportBase/_StyleEditor.py b/src/ReportBase/_StyleEditor.py
index 5b8cee878..685bcba5c 100644
--- a/src/ReportBase/_StyleEditor.py
+++ b/src/ReportBase/_StyleEditor.py
@@ -88,12 +88,13 @@ class StyleListDisplay(object):
                                   _('Document Styles')         )
                                              
         self.top.connect_signals({
-            "destroy_passed_object" : self.__close, 
+            "destroy_passed_object" : self.__close,
             "on_ok_clicked" : self.on_ok_clicked, 
             "on_add_clicked" : self.on_add_clicked, 
             "on_delete_clicked" : self.on_delete_clicked, 
             "on_button_press" : self.on_button_press, 
-            "on_edit_clicked" : self.on_edit_clicked
+            "on_edit_clicked" : self.on_edit_clicked,
+            "on_save_style_clicked" : dummy_callback,
             })
 
         title_label = self.top.get_object('title')
@@ -198,7 +199,12 @@ class StyleEditor(object):
         
         self.top.connect_signals({
             "on_save_style_clicked" : self.on_save_style_clicked, 
-            "destroy_passed_object" : self.__close, 
+            "destroy_passed_object" : self.__close,
+            "on_ok_clicked" : dummy_callback, 
+            "on_add_clicked" : dummy_callback, 
+            "on_delete_clicked" : dummy_callback, 
+            "on_button_press" : dummy_callback, 
+            "on_edit_clicked" : dummy_callback,
             })
 
         self.pname = self.top.get_object('pname')
@@ -363,3 +369,10 @@ class StyleEditor(object):
         self.current_name =  store.get_value(node, 0)
         self.current_p = objs[0]
         self.draw()
+
+def dummy_callback(obj):
+    """Dummy callback to satisfy gtkbuilder on connect of signals. 
+    There are two widgets in the glade file, although only one is needed, 
+    the signals of the other must be connected too
+    """
+    pass
diff --git a/src/glade/mergedata.glade b/src/glade/mergedata.glade
index 2d5411c81..20525802f 100644
--- a/src/glade/mergedata.glade
+++ b/src/glade/mergedata.glade
@@ -10,10 +10,12 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="place_title">
                 <property name="visible">True</property>
@@ -242,10 +244,12 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="merge_title">
                 <property name="visible">True</property>
@@ -447,6 +451,7 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkTable" id="table8">
             <property name="visible">True</property>
@@ -956,11 +961,13 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox4">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <object class="GtkVBox" id="vbox5">
             <property name="visible">True</property>
             <property name="border_width">12</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="people_title">
diff --git a/src/glade/styleeditor.glade b/src/glade/styleeditor.glade
index f18603830..d2a949dd4 100644
--- a/src/glade/styleeditor.glade
+++ b/src/glade/styleeditor.glade
@@ -10,9 +10,11 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="title">
                 <property name="visible">True</property>
@@ -53,6 +55,7 @@
                 <child>
                   <object class="GtkVButtonBox" id="vbuttonbox1">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">10</property>
                     <property name="layout_style">start</property>
                     <child>
@@ -185,9 +188,11 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="title1">
                 <property name="visible">True</property>
@@ -277,6 +282,7 @@
                       <object class="GtkVBox" id="vbox3">
                         <property name="visible">True</property>
                         <property name="border_width">12</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="pname">
diff --git a/src/plugins/tool/check.glade b/src/plugins/tool/check.glade
index 4f1d0f03f..b444a2be0 100644
--- a/src/plugins/tool/check.glade
+++ b/src/plugins/tool/check.glade
@@ -12,10 +12,12 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="border_width">6</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="title">