[IMP] plugin_outlook, plugin_thunderbird: simplify wizards

bzr revid: rco@openerp.com-20120625103235-111al037cqvpaitr

4 files changed, 48 insertions, 57 deletions

diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 2b05282163f..9da90f3839c 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -28,24 +28,15 @@ class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
     _columns = {
-        'name':fields.char('Outlook Plug-in 32bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'name2':fields.char('Outlook Plug-in 64bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'description':fields.text('Description', readonly=True)
+        'plugin32': fields.char('Outlook Plug-in 32bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."),
+        'plugin64': fields.char('Outlook Plug-in 64bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."),
     }
-    
+
     def default_get(self, cr, uid, fields, context=None):
-        res = {}
-        plugin_32bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
-        plugin_64bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
-        description = """
-            Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
-            
-            System requirements:
-                1.  MS Outlook 2005 or above.
-                2.  MS .Net Framework 3.5 or above.
-            """
-        res['name'] = plugin_32bit_url
-        res['name2'] = plugin_64bit_url
-        res['description'] = description
+        res = super(outlook_installer, self).default_get(cr, uid, fields, context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        res['plugin32'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
+         res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
         return res
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c1e97fd7d53..13c1e6f32c4 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -19,14 +19,18 @@
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace">
                     </xpath>
-                   <xpath expr="//separator[@string='title']" position="after">
-                        <group colspan="8" height="450" width="750">
-                            <field name="name" widget="url" colspan="4"/>
-                            <field name="name2" widget="url" colspan="4"/>
-                            <newline/>
-                            <separator string="Installation and Configuration Steps" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="8"/>
+                    <xpath expr="//separator[@string='title']" position="after" version="7.0">
+                        <group>
+                            <field name="plugin32" widget="url"/>
+                            <field name="plugin64" widget="url"/>
                         </group>
+                        <separator string="Installation and Configuration Steps"/>
+                        <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
+                        <p>System requirements:</p>
+                        <ul>
+                            <li>1. MS Outlook 2005 or above.</li>
+                            <li>2. MS .Net Framework 3.5 or above.</li>
+                        </ul>
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 88d84c57cd2..6473758883d 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -27,31 +27,22 @@ class plugin_thunderbird_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'name':fields.char('File name', size=34),
-        'pdf_name':fields.char('File name', size=64),
-        'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
-        'plugin_file':fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
-        'pdf_file':fields.char('Installation Manual', size=264, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
-        'description':fields.text('Description', readonly=True)
+        'thunderbird': fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
+        'plugin_name': fields.char('File name', size=64),
+        'plugin_file': fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save this file and install it in Thunderbird."),
+        'pdf_file': fields.char('Installation Manual', size=256, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
     }
+
+    _defaults = {
+        'thunderbird': True,
+        'plugin_name': 'openerp_plugin.xpi',
+        'pdf_file': 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
+    }
+
     def default_get(self, cr, uid, fields, context=None):
-        res = {}
-        plugin_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')  + '/plugin_thunderbird/static/openerp_plugin.xpi'
-        description = """
-            Thunderbird plugin installation:
-                1.  Save the Thunderbird plug-in.
-                2.  From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
-                4.  Select the plug-in (the file named openerp_plugin.xpi).
-                5.  Click "Install Now".
-                6.  Restart Thunderbird.
-                7.  From the Thunderbird menubar: OpenERP -> Configuration.
-                8.  Configure your openerp server.
-            """
-        res['thunderbird'] = True,
-        res['name'] = 'openerp_plugin.xpi'
-        res['plugin_file'] = plugin_url
-        res['pdf_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
-        res['description'] = description
+        res = super(plugin_thunderbird_installer, self).default_get(cr, uid, fields, context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        res['plugin_file'] = base_url + '/plugin_thunderbird/static/openerp_plugin.xpi'
         return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 2c8249f4899..b57de9ccd45 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -19,18 +19,23 @@
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
                     <xpath expr="//separator[@string='title']" position="after">
-                        <group colspan="8" height="450" width="750">
+                        <group>
                             <field name="thunderbird" invisible="1"/>
-                            <field name="name" invisible="1"/>
-                            <field name="pdf_name" invisible="1"/>
-                            <newline/>
-                            <field name="plugin_file" filename="name" widget="url"/>
-                            <newline/>
-                            <field name="pdf_file" filename="pdf_name" widget="url"/>
-                            <newline/>
-                            <separator string="Installation and Configuration Steps" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="8"/>
+                            <field name="plugin_name" invisible="1"/>
+                            <field name="plugin_file" filename="plugin_name" widget="url"/>
+                            <field name="pdf_file" widget="url"/>
                         </group>
+                        <separator string="Installation and Configuration Steps"/>
+                        <p>Thunderbird plugin installation:</p>
+                        <ul>
+                            <li>1. Save the Thunderbird plug-in.</li>
+                            <li>2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
+                            <li>4. Select the plug-in (the file named openerp_plugin.xpi).</li>
+                            <li>5. Click "Install Now".</li>
+                            <li>6. Restart Thunderbird.</li>
+                            <li>7. From the Thunderbird menubar: OpenERP -> Configuration.</li>
+                            <li>8. Configure your openerp server.</li>
+                        </ul>
                     </xpath>
                     <separator string="title" position="attributes">
                          <attribute name="string">Install Thunderbird Plug-In</attribute>