Please review this at http://codereview.appspot.com/635041/show
Affected files:
M tryton/gui/window/view_board/parser.py
M tryton/gui/window/view_form/view/form_gtk/parser.py
Index: tryton/gui/window/view_board/parser.py
===================================================================
--- a/tryton/gui/window/view_board/parser.py
+++ b/tryton/gui/window/view_board/parser.py
@@ -165,14 +165,13 @@
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)
Index: tryton/gui/window/view_form/view/form_gtk/parser.py
===================================================================
--- 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 @@
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 @@
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)
--
Cédric Krier
B2CK SPRL
Rue de Rotterdam, 4
4000 Liège
Belgium
Tel: +32 472 54 46 59
Email/Jabber: [email protected]
Website: http://www.b2ck.com/
pgp1FCKskofJ0.pgp
Description: PGP signature
