From 52197bdf8fa24fa60a57bd2d797ffc01bae56ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 4 Oct 2011 19:51:07 +0200
Subject: [PATCH] Better layout of some views

---
 trytond/ir/module/module.xml | 41 ++++++++++++++++++------------------
 trytond/ir/rule.xml          |  4 ++--
 trytond/ir/translation.xml   | 22 +++++++++++++------
 trytond/res/user.xml         |  8 ++++---
 4 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/trytond/ir/module/module.xml b/trytond/ir/module/module.xml
index 7e17a6a40c..d8bcca6ada 100644
--- a/trytond/ir/module/module.xml
+++ b/trytond/ir/module/module.xml
@@ -137,13 +137,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Welcome to the module configuration wizard!" col="2">
-                    <image name="tryton-dialog-information"/>
-                    <group col="1" id="labels">
-                        <label string="You will be able to configure your installation"
-                            yalign="0.0" id="configure"/>
-                        <label string="depending on the modules you have installed."
-                            yalign="0.0" id="depending"/>
-                    </group>
+                    <image name="tryton-dialog-information" xexpand="0"
+                        xfill="0"/>
+                    <label string="You will be able to configure your installation depending on the modules you have installed."
+                        id="configure"
+                        yalign="0.0" xalign="0.0" xexpand="1"/>
                 </form>
                 ]]>
             </field>
@@ -165,17 +163,17 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="System Upgrade" col="2">
-                    <image name="tryton-dialog-information"/>
-                    <group col="4" id="labels">
-                        <label yalign="0.0"
-                            string="Your system will be upgraded."
-                            colspan="4" id="upgraded"/>
-                        <label yalign="0.0"
-                            string="Note that this operation my take a few minutes."
-                            colspan="4" id="operation"/>
-                        <separator name="module_info"/>
-                        <field name="module_info" colspan="4"/>
+                    <image name="tryton-dialog-information" xexpand="0"
+                        xfill="0"/>
+                    <group col="1" id="labels">
+                        <label string="Your system will be upgraded." id="upgraded"
+                            yalign="0.0" xalign="0.0" xexpand="1"/>
+                        <label string="Note that this operation my take a few minutes."
+                            id="operation"
+                            yalign="0.0" xalign="0.0" xexpand="1"/>
                     </group>
+                    <separator name="module_info" colspan="2"/>
+                    <field name="module_info" colspan="2"/>
                 </form>
                 ]]>
             </field>
@@ -186,10 +184,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                <form string="System upgrade done" col="1">
-                    <label yalign="0.0"
-                        string="The modules have been upgraded / installed !"
-                        id="modules"/>
+                <form string="System upgrade done" col="2">
+                    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+                    <label string="The modules have been upgraded / installed !"
+                        id="modules"
+                        yalign="0.0" xalign="0.0" xexpand="1"/>
                 </form>
                 ]]>
             </field>
diff --git a/trytond/ir/rule.xml b/trytond/ir/rule.xml
index ce8deae52c..d87e51035d 100644
--- a/trytond/ir/rule.xml
+++ b/trytond/ir/rule.xml
@@ -29,9 +29,9 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="name" colspan="5"/>
                     <field name="rules" colspan="6"/>
                     <label string="The rule is satisfied if at least one test is True"
-                        colspan="6" yalign="0.0" id="satisfied"/>
+                        colspan="6" xalign="0.0" id="satisfied"/>
                     <label string="If there is no test defined, the rule is always satisfied if not global"
-                        colspan="6" yalign="0.0" id="no_test"/>
+                        colspan="6" xalign="0.0" id="no_test"/>
                 </form>
                 ]]>
             </field>
diff --git a/trytond/ir/translation.xml b/trytond/ir/translation.xml
index a83b8a5bcb..043ef9fc1b 100644
--- a/trytond/ir/translation.xml
+++ b/trytond/ir/translation.xml
@@ -261,8 +261,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                <form string="Set Report Translations">
-                    <label string="Synchronize Report Translations?" id="synchronize"/>
+                <form string="Set Report Translations" col="2">
+                    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+                    <label string="Synchronize Report Translations?" id="synchronize"
+                        yalign="0.0" xalign="0.0" xexpand="1"/>
                 </form>
                 ]]>
             </field>
@@ -273,8 +275,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                <form string="Set Report Translations">
-                    <label string="Set Translations Succeed!" id="succeed"/>
+                <form string="Set Report Translations" col="2">
+                    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+                    <label string="Set Translations Succeed!" id="succeed"
+                        yalign="0.0" xalign="0.0" xexpand="1"/>
                 </form>
                 ]]>
             </field>
@@ -295,8 +299,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                <form string="Clean Translations">
-                    <label string="Clean Translations?" id="clean"/>
+                <form string="Clean Translations" col="2">
+                    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+                    <label string="Clean Translations?" id="clean"
+                        yalign="0.0" xalign="0.0" xexpand="1"/>
                 </form>
                 ]]>
             </field>
@@ -308,7 +314,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Clean Translations">
-                    <label string="Clean Translations Succeed!" id="succeed"/>
+                    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+                    <label string="Clean Translations Succeed!" id="succeed"
+                        yalign="0.0" xalign="0.0" xexpand="1"/>
                 </form>
                 ]]>
             </field>
diff --git a/trytond/res/user.xml b/trytond/res/user.xml
index 17f421c92b..72a229eeb6 100644
--- a/trytond/res/user.xml
+++ b/trytond/res/user.xml
@@ -150,12 +150,14 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Add Users" col="2">
-                    <image name="tryton-dialog-information"/>
+                    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
                     <group col="1" id="labels">
                         <label string="You can now add some users into the system."
-                            yalign="0.0" id="add"/>
+                            id="add"
+                            yalign="0.0" xalign="0.0" xexpand="1"/>
                         <label string="Be careful that the login must be unique!"
-                            yalign="0.0" id="carefull"/>
+                            id="carefull"
+                            yalign="0.0" xalign="0.0" xexpand="1"/>
                     </group>
                 </form>
                 ]]>