[IMP,ADD]:configuration wizards & pixmaps

bzr revid: nch@tinyerp.com-20100505092718-at0x24fmfvji0iqb

diff --git a/bin/addons/base/res/config_pixmaps/1.png b/bin/addons/base/res/config_pixmaps/1.png
new file mode 100644 (file)
index 0000000..82b1df6
Binary files /dev/null and b/bin/addons/base/res/config_pixmaps/1.png differ

diff --git a/bin/addons/base/res/config_pixmaps/2.png b/bin/addons/base/res/config_pixmaps/2.png
new file mode 100644 (file)
index 0000000..b883d17
Binary files /dev/null and b/bin/addons/base/res/config_pixmaps/2.png differ

diff --git a/bin/addons/base/res/config_pixmaps/3.png b/bin/addons/base/res/config_pixmaps/3.png
new file mode 100644 (file)
index 0000000..5d6a19d
Binary files /dev/null and b/bin/addons/base/res/config_pixmaps/3.png differ

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index e885476..d474a00 100644 (file)
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -50,7 +50,16 @@ class res_config_configurable(osv.osv_memory):
         if total:
             return round(open*100./total)
         return 100.
-
+#    def default_get(self, cr, uid, fields_list, context=None):
+#        ''' Set Config Logo...
+#        '''
+#        defaults = super(res_config_configurable, self).default_get(
+#            cr, uid, fields_list, context=context)
+#        file_no = str(random.randint(1,3))
+#        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
+#        file_data = tools.file_open(path,'rb').read()
+#        defaults.update({'config_logo':base64.encodestring(file_data)})
+#        return defaults
     def _get_image(self, cr, uid, context=None):
         file_no = str(random.randint(1,3))
         path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 3981b8f..1615b8a 100644 (file)
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -7,23 +7,22 @@
       <field name="arch" type="xml">
        <form>
                <group colspan="4" col="8">
-               <group colspan="2">
+               <group colspan="4" width="200" height="250">
                        <field name="config_logo" widget="image" nolabel="1" colspan="1"/>
                        <newline/>
-                       <label align="0.0" string="description" width="200" colspan="1"/>
-               </group>
-               <group colspan="2">
-                       <separator string="vsep" position="vertical" colspan="2" rowspan="12"/>
+                       <label align="0.0" string="description" width="200" colspan="2"/>
+                       <separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
                </group>
                <group colspan="4">
                        <separator string="title" colspan="4"/>
                        <group string="res_config_contents"/>
                </group>
-              </group>
-               <group colspan="4" col="8">
+                       </group>
+               <group colspan="8" col="8">
                        <separator string="" colspan="8"/>
-                       <field name="progress" widget="progressbar" nolabel="1"/>
-                       <label string="" colspan="5"/>
+                       <group colspan="4" width="220">
+                               <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
+                       </group>
                                        <button name="action_skip" icon="gtk-goto-last" special="cancel"
                                type="object" string="Skip" colspan="1"/>
                        <button name="action_next" icon="gtk-go-forward"

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 5a489a5..126755c 100644 (file)
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -436,6 +436,7 @@
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="fill"/></rng:optional>
             <rng:optional><rng:attribute name="height"/></rng:optional>
+            <rng:optional><rng:attribute name="width"/></rng:optional>
             <rng:optional><rng:attribute name="name"/></rng:optional>
             <rng:optional><rng:attribute name="color" /></rng:optional>
             <rng:zeroOrMore>