[IMP] fetchmail: Usability improvements.

bzr revid: uco@tinyerp.com-20101104111928-m7i3q8wyaig0qw54

1 files changed, 47 insertions, 73 deletions

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index b49161eacc7..0b74b20637b 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -8,11 +8,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');black:state in ('wating');gray:state in('done')" string="POP/IMAP Servers">
-                    <field name="name" select="1"/>
-                    <field name="type" select="1"/>
-                    <field name="user" select="1"/>
-                    <field name="is_ssl" select="1"/>
-                    <field name="state" select="1"/>
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="user"/>
+                    <field name="is_ssl"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -58,63 +58,65 @@
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" select="1"/>
-                        <button string="Fetch Emails" type="object" name="button_fetch_mail"/>
+                        <button string="Confirm" type="object" name="button_confirm_login" states="draft"/>
+                        <button string="Fetch Emails" type="object" name="button_fetch_mail" states="done"/>
                         <button string="Set to Draft" type="object" name="set_draft"/>
                     </group>
                 </form>
             </field>
         </record>
         
-        <record model="ir.actions.act_window" id="action_email_server_tree">
-            <field name="name">POP Servers</field>
-            <field name="res_model">email.server</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'type':'pop'}</field>
-            <field name="domain">[('type','=','pop')]</field>
+        <record model="ir.ui.view" id="view_email_server_search">
+            <field name="name">email.server.search</field>
+            <field name="model">email.server</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Email Servers">
+                    <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
+                    <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
+                    <separator orientation="vertical"/>
+                    <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="object_id"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
         </record>
-
-        <menuitem 
-            parent="base.menu_config" 
-            id="menu_action_fetchmail_server_tree" 
-            name="Fetchmail Services"
-        />
-        
-        <menuitem 
-            parent="menu_action_fetchmail_server_tree" 
-            id="menu_action_email_server_tree" 
-            action="action_email_server_tree"
-        />
         
-        <record model="ir.actions.act_window" id="action_email_server_tree_imap">
-            <field name="name">IMAP Servers</field>
+        <record model="ir.actions.act_window" id="action_email_server_tree">
+            <field name="name">Email Servers</field>
             <field name="res_model">email.server</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'type':'imap'}</field>
-            <field name="domain">[('type','=','imap')]</field>
+            <field name="search_view_id" ref="view_email_server_search"/>
         </record>
-        
+
         <menuitem 
-            parent="menu_action_fetchmail_server_tree" 
-            id="menu_action_email_server_tree_imap" 
-            action="action_email_server_tree_imap"
+            parent="base.menu_mail_gateway" 
+            id="menu_action_fetchmail_server_tree"
+            action="action_email_server_tree" 
+            name="Email Servers"
         />
         
       <record model="ir.ui.view" id="mailgate_message_tree_view">
-                <field name="name">mailgate.message.tree</field>
-                <field name="model">mailgate.message</field>
-                <field name="type">tree</field>
-                <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/>
-                <field name="arch" type="xml">
-                    <field name="user_id" position="after">
-                        <field name="server_id" select="1"/>
-                        <field name="ref_id"/>
-                    </field>
-                </field>
-            </record>
+	      <field name="name">mailgate.message.tree</field>
+	      <field name="model">mailgate.message</field>
+	      <field name="type">tree</field>
+	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/>
+	      <field name="arch" type="xml">
+	          <field name="user_id" position="after">
+	              <field name="server_id" select="1"/>
+	              <field name="ref_id"/>
+	          </field>
+	      </field>
+      </record>
 
         <act_window 
             context="{'server_id': active_id}"
@@ -122,33 +124,5 @@
             id="act_server_history" name="Email History"
             res_model="mailgate.message" src_model="email.server"/>
             
-        <record model="ir.actions.act_window" id="action_mailgate_message_tree">
-            <field name="name">Received Email History</field>
-            <field name="res_model">mailgate.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'server_type':'imap'}</field>
-        </record>
-        
-        <menuitem 
-            parent="menu_action_email_server_tree_imap" 
-            id="menu_action_mailgate_message_tree" 
-            action="action_mailgate_message_tree"/>
-            
-        <record model="ir.actions.act_window" id="action_mailgate_message_tree_pop">
-            <field name="name">Received Email History</field>
-            <field name="res_model">mailgate.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'server_type':'pop'}</field>
-        </record>
-        
-        <menuitem 
-            parent="menu_action_email_server_tree" 
-            id="menu_action_mailgate_message_tree_pop" 
-            action="action_mailgate_message_tree_pop"/>
-
     </data>
 </openerp>