From 26490e044d024b411d2acbddbe71397e6475c27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 19 Mar 2010 15:24:31 +0100
Subject: [PATCH] Replace child{1,2} attributes in xml views by a unique child

---
 tryton/gui/window/view_board/parser.py        | 11 +++++------
 .../window/view_form/view/form_gtk/parser.py  | 19 +++++--------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/tryton/gui/window/view_board/parser.py b/tryton/gui/window/view_board/parser.py
index 19a85aa58a..032062f97e 100644
--- a/tryton/gui/window/view_board/parser.py
+++ b/tryton/gui/window/view_board/parser.py
@@ -165,14 +165,13 @@ class ParserBoard(object):
                 widgets += new_widgets
                 if 'position' in attrs:
                     vpaned.set_position(int(attrs['position']))
-            elif node.localName == 'child1':
+            elif node.localName == 'child':
                 widget, new_widgets = self.parse(node, paned=paned, tooltips=tooltips)
                 widgets += new_widgets
-                paned.pack1(widget, resize=True, shrink=True)
-            elif node.localName == 'child2':
-                widget, new_widgets = self.parse(node, paned=paned, tooltips=tooltips)
-                widgets += new_widgets
-                paned.pack2(widget, resize=True, shrink=True)
+                if not paned.get_child1():
+                    paned.pack1(widget, resize=True, shrink=True)
+                elif not paned.get_child2():
+                    paned.pack2(widget, resize=True, shrink=True)
             elif node.localName == 'action':
                 name = str(attrs['name'])
                 widget_act = Action(self.window, attrs)
diff --git a/tryton/gui/window/view_form/view/form_gtk/parser.py b/tryton/gui/window/view_form/view/form_gtk/parser.py
index be01c74772..d48816a6c4 100644
--- a/tryton/gui/window/view_form/view/form_gtk/parser.py
+++ b/tryton/gui/window/view_form/view/form_gtk/parser.py
@@ -606,7 +606,7 @@ class ParserForm(ParserInterface):
                     dict_widget[widget_name].extend(widgets)
                 if 'position' in attrs:
                     vpaned.set_position(int(attrs['position']))
-            elif node.localName == 'child1':
+            elif node.localName == 'child':
                 widget, widgets, buttons, spam, notebook_list2, cursor_widget2 = \
                         self.parse(model_name, node, fields, paned=paned,
                                 tooltips=tooltips)
@@ -617,19 +617,10 @@ class ParserForm(ParserInterface):
                 for widget_name, widgets in widgets.iteritems():
                     dict_widget.setdefault(widget_name, [])
                     dict_widget[widget_name].extend(widgets)
-                paned.pack1(widget, resize=True, shrink=True)
-            elif node.localName == 'child2':
-                widget, widgets, buttons, spam, notebook_list, cursor_widget2 = \
-                        self.parse(model_name, node, fields, paned=paned,
-                                tooltips=tooltips)
-                if not cursor_widget:
-                    cursor_widget = cursor_widget2
-                notebook_list.extend(notebook_list2)
-                button_list += buttons
-                for widget_name, widgets in widgets.iteritems():
-                    dict_widget.setdefault(widget_name, [])
-                    dict_widget[widget_name].extend(widgets)
-                paned.pack2(widget, resize=True, shrink=True)
+                if not paned.get_child1():
+                    paned.pack1(widget, resize=True, shrink=True)
+                elif not paned.get_child2():
+                    paned.pack2(widget, resize=True, shrink=True)
         for (button, src, name, widget) in container.trans_box:
             button.connect('clicked', self.translate, model_name, name,
                     src, widget)