[IMP] fetchmail: review+cleanup

bzr revid: odo@openerp.com-20110908010700-n7fk9hzwb60v80cq

1 files changed, 39 insertions, 45 deletions

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index d3470cec6eb..5f5c094a454 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -7,12 +7,12 @@
             <field name="model">email.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('waiting');gray:state in('done')" string="POP/IMAP Servers">
+                <tree colors="blue:state in ('draft');" string="POP/IMAP Servers">
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="user"/>
                     <field name="is_ssl"/>
                     <field name="object_id"/>
+                    <field name="date"/>
                     <field name="message_ids" string="# of emails"/>
                     <field name="state"/>
                 </tree>
@@ -29,16 +29,14 @@
                         <field name="name" select="1" colspan="4"/>
                         <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                         <field name="date" select="1"/>
-                        <field name="attach"/>
-                        <field name="active" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Server &amp; Login">
-                            <group col="2" colspan="2">
+                            <group col="4" colspan="2">
                                 <separator string="Server Information" colspan="2"/>
-                                <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
-                                <field name="server" />
+                                <field name="server" colspan="4"/>
                                 <field name="port" />
+                                <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="Login Information" colspan="2"/>
@@ -46,24 +44,28 @@
                                 <field name="password" password="True" />
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Auto Reply?" colspan="2"/>
-                                <field name="action_id"/>
-                                <field name="user_id"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Process Parameter" colspan="2"/>
+                                <separator string="Automated Processing" colspan="2"/>
                                 <field name="object_id"/>
-                                <field name="priority"/>
+                                <field name="action_id"/>
                             </group>
                             <separator string="Description" colspan="4"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
+                        <page string="Advanced">
+                            <group colspan="2" col="2">
+                                <separator string="Advanced options" colspan="2"/>
+                                <field name="priority"/>
+                                <field name="attach"/>
+                                <field name="original"/>
+                                <field name="active" select="1"/>
+                            </group>
+                        </page>
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" select="1"/>
                         <button string="Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
-                        <button string="Fetch Emails" type="object" name="button_fetch_mail" states="done"/>
-                        <button string="Set to Draft" type="object" name="set_draft" icon="gtk-convert"/>
+                        <button string="Fetch Now" type="object" name="fetch_mail" states="done"/>
+                        <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                     </group>
                 </form>
             </field>
@@ -93,7 +95,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_email_server_tree">
-            <field name="name">Incomming Servers</field>
+            <field name="name">Incoming Mail Servers</field>
             <field name="res_model">email.server</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -102,47 +104,39 @@
         </record>
 
         <menuitem
-            parent="mail.menu_config_email"
+            parent="base.next_id_15"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
-            name="Incomming Servers"
+            name="Incoming Mail Servers"
+            sequence="40"
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-	      <field name="name">mail.message.tree</field>
-	      <field name="model">mail.message</field>
-	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="mail.view_email_message_tree"/>
-	      <field name="arch" type="xml">
-	          <field name="user_id" position="after">
-	              <field name="server_id" select="1"/>
-	          </field>
-	      </field>
+          <field name="name">mail.message.tree</field>
+          <field name="model">mail.message</field>
+          <field name="type">tree</field>
+          <field name="inherit_id" ref="mail.view_email_message_tree"/>
+          <field name="arch" type="xml">
+              <field name="user_id" position="after">
+                  <field name="server_id" select="1"/>
+              </field>
+          </field>
       </record>
 
       <record model="ir.ui.view" id="email_message_search_view">
-	      <field name="name">mail.message.inherit.search</field>
-	      <field name="model">mail.message</field>
-	      <field name="type">search</field>
-	      <field name="inherit_id" ref="mail.view_email_message_search"/>
-	      <field name="arch" type="xml">
-			<xpath expr="/search/group/filter[@string='Thread']" position="before">
+          <field name="name">mail.message.inherit.search</field>
+          <field name="model">mail.message</field>
+          <field name="type">search</field>
+          <field name="inherit_id" ref="mail.view_email_message_search"/>
+          <field name="arch" type="xml">
+            <xpath expr="/search/group/filter[@string='Thread']" position="before">
                 <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
             </xpath>
-	      </field>
-      </record>
-
-      <record id="action_view_mail_message_emails" model="ir.actions.act_window">
-            <field name="name">Messages</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_emails': 1}</field>
-            <field name="search_view_id" ref="email_message_search_view"/>
+          </field>
       </record>
 
       <act_window
-            context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
+            context="{'search_default_server_id': active_id, 'default_server_id': active_id}"
             id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('server_id', '=', active_id)]"
             res_model="mail.message" src_model="email.server"/>