From 4789e7d818ac8ca3139c04e8d36b6bf7738f2b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 17 Sep 2011 14:21:43 +0200
Subject: [PATCH] Remove tabpos attribute from notebook

issue2135
review110003
---
 tryton/gui/window/view_board/parser.py        | 23 +++++++------------
 .../window/view_form/view/form_gtk/parser.py  | 23 +++++++------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/tryton/gui/window/view_board/parser.py b/tryton/gui/window/view_board/parser.py
index 9550c03d49..bcf12b14f1 100644
--- a/tryton/gui/window/view_board/parser.py
+++ b/tryton/gui/window/view_board/parser.py
@@ -105,21 +105,14 @@ class ParserBoard(object):
                 container.newline()
             elif node.localName == 'notebook':
                 notebook = gtk.Notebook()
-                if attrs and 'tabpos' in attrs:
-                    pos = {'up':gtk.POS_TOP,
-                        'down':gtk.POS_BOTTOM,
-                        'left':gtk.POS_LEFT,
-                        'right':gtk.POS_RIGHT
-                    }[attrs['tabpos']]
-                else:
-                    if CONFIG['client.form_tab'] == 'top':
-                        pos = gtk.POS_TOP
-                    elif CONFIG['client.form_tab'] == 'left':
-                        pos = gtk.POS_LEFT
-                    elif CONFIG['client.form_tab'] == 'right':
-                        pos = gtk.POS_RIGHT
-                    elif CONFIG['client.form_tab'] == 'bottom':
-                        pos = gtk.POS_BOTTOM
+                if CONFIG['client.form_tab'] == 'top':
+                    pos = gtk.POS_TOP
+                elif CONFIG['client.form_tab'] == 'left':
+                    pos = gtk.POS_LEFT
+                elif CONFIG['client.form_tab'] == 'right':
+                    pos = gtk.POS_RIGHT
+                elif CONFIG['client.form_tab'] == 'bottom':
+                    pos = gtk.POS_BOTTOM
                 notebook.set_tab_pos(pos)
                 notebook.set_border_width(3)
                 container.wid_add(notebook,
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 4a76e6cbaf..0059a89f98 100644
--- a/tryton/gui/window/view_form/view/form_gtk/parser.py
+++ b/tryton/gui/window/view_form/view/form_gtk/parser.py
@@ -432,21 +432,14 @@ class ParserForm(ParserInterface):
                 notebook = gtk.Notebook()
                 notebook.set_scrollable(True)
                 notebook_list.append(notebook)
-                if attrs and 'tabpos' in attrs:
-                    pos = {'up':gtk.POS_TOP,
-                        'down':gtk.POS_BOTTOM,
-                        'left':gtk.POS_LEFT,
-                        'right':gtk.POS_RIGHT
-                    }[attrs['tabpos']]
-                else:
-                    if CONFIG['client.form_tab'] == 'top':
-                        pos = gtk.POS_TOP
-                    elif CONFIG['client.form_tab'] == 'left':
-                        pos = gtk.POS_LEFT
-                    elif CONFIG['client.form_tab'] == 'right':
-                        pos = gtk.POS_RIGHT
-                    elif CONFIG['client.form_tab'] == 'bottom':
-                        pos = gtk.POS_BOTTOM
+                if CONFIG['client.form_tab'] == 'top':
+                    pos = gtk.POS_TOP
+                elif CONFIG['client.form_tab'] == 'left':
+                    pos = gtk.POS_LEFT
+                elif CONFIG['client.form_tab'] == 'right':
+                    pos = gtk.POS_RIGHT
+                elif CONFIG['client.form_tab'] == 'bottom':
+                    pos = gtk.POS_BOTTOM
                 notebook.set_tab_pos(pos)
                 notebook.set_border_width(3)
                 container.wid_add(notebook,