[MERGE] thunderbird : Merged Ravi's branch for thunderbird push mail with accented...

[odoo/odoo.git] / addons / thunderbird / thunderbird_installer.xml

diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index b7a66d4..0059cdf 100644 (file)
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -12,14 +12,20 @@
                   <attribute name="string">Thunderbird Plug-In Configuration</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Thunderbird</attribute>
+                   <attribute name="string">Thunderbird Plug-In</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
               </xpath>
-             <xpath expr="//button[@string='Install Modules']" position="attributes">
-               <attribute name="string">Configure</attribute>
-             </xpath>
+                 <xpath expr="//button[@string='Install Modules']" position="replace">
+                <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                <button name="action_next" icon="gtk-go-forward"
+                        type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
+              <xpath expr="//button[@string='Skip']" position="replace">
+                <button name="action_skip" icon="gtk-jump-to" special="cancel"
+                        type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
               <xpath expr='//separator[@string="vsep"]' position='attributes'>
                                <attribute name='string'></attribute>
                                <attribute name='rowspan'>15</attribute>
@@ -33,7 +39,7 @@
 
                   <field name="plugin_file" filename="name"/>
                   <newline/>
-                  <field name="pdf_file" filename="pdf_name"/>
+                  <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"/>
@@ -44,7 +50,7 @@
     </record>
 
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
-      <field name="name">Thunderbird Module Installation</field>
+      <field name="name">Thunderbird Plug-In Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -54,63 +60,25 @@
     </record>
 
     <record id="thunderbird_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_thunderbird_installer"/>
-      <field name="sequence">3</field>
+        <field name="action_id" ref="action_thunderbird_installer"/>
+        <field name="restart">always</field>
+        <field name="sequence">3</field>
     </record>
 
-       <!--  Configuration wizard.  -->
-
-    <record id="view_thunderbird_wizard" model="ir.ui.view">
-      <field name="name">thunderbird.wizard</field>
-      <field name="model">thunderbird.installer</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-          <form string= "Thunderbird Installation">
-              <group colspan="4">
-                  <separator string="Configure Thunderbird Module" colspan="4"/>
-                  <group colspan="4" col="10">
-                      <group colspan="2">
-                          <image name="gtk-dialog-info"/>
-                          <newline/>
-                          <label align="0.0" string="This module allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new object like a lead, a phone call, claim and many more." width="200"/>
-                       </group>
-                       <group colspan="8">
-                                 <field name="thunderbird" invisible="1"/>
-                                 <field name="name" invisible="1"/>
-                                 <field name="pdf_name" invisible="1"/>
-                                 <newline/>
-
-                                 <field name="plugin_file" filename="name"/>
-                                 <newline/>
-                                 <field name="pdf_file" filename="pdf_name"/>
-                                 <newline/>
-                                 <separator string="Installation and Configuration Steps" colspan="4"/>
-                                 <field name="description" nolabel="1" colspan="8"/>
-                              </group>
-                   </group>
-             </group>
-             <separator string="" colspan="4"/>
-             <group colspan="4">
-                 <label align="0.0" string="" colspan="3"/>
-                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-             </group>
-         </form>
-      </field>
-    </record>
 
     <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Thunderbird Module Installation</field>
+      <field name="name">Thunderbird Plug-In Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
-      <field name="view_id" ref="view_thunderbird_wizard"/>
+      <field name="view_id" ref="view_thunderbird_installer"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
       <field name="target">new</field>
+      <field name="context">{'menu':True}</field>
     </record>
 
-    <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
-       <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config_mail" sequence="10" />
-       <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird" parent="base.menu_base_config_plugins" sequence="10" />
+       <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
+       <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
 
   </data>
 </openerp>