From 2d6d662b931151a751dc715bc4cc15ef1deb06df Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 3 Nov 2010 11:58:18 +0530
Subject: [FIX]: Change domain for mailgate.message in fetchmail.

bzr revid: atp@tinyerp.co.in-20101103062818-m7qne4mhr6ehwclp
---
 addons/fetchmail/fetchmail_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 1d0cf21be08..f854e2819ec 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -129,7 +129,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
             <field name="context">{'type':'imap'}</field>
-            <field name="domain">[('type','=','imap')]</field>
+            <field name="domain">[('server_type','=','imap')]</field>
         </record>
         
         <menuitem 
@@ -144,7 +144,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
             <field name="context">{'type':'pop'}</field>
-            <field name="domain">[('type','=','pop')]</field>
+            <field name="domain">[('server_type','=','pop')]</field>
         </record>
         
         <menuitem 
-- 
cgit v1.2.3


From 0aa395f53bd630eeb293d2316d3facce2ff81b33 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 4 Nov 2010 16:49:28 +0530
Subject: [IMP] fetchmail: Usability improvements.

bzr revid: uco@tinyerp.com-20101104111928-m7i3q8wyaig0qw54
---
 addons/fetchmail/fetchmail_view.xml | 120 ++++++++++++++----------------------
 1 file changed, 47 insertions(+), 73 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

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>
-- 
cgit v1.2.3


From 1b4563ea686afbbe6f5a7bd2a8d74dd66f8655a5 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 4 Nov 2010 18:51:37 +0530
Subject: [IMP] fetchmail, mail_gateway: Usability improvements.

bzr revid: uco@tinyerp.com-20101104132137-7g2yxwrwr276hdio
---
 addons/fetchmail/fetchmail_view.xml | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'addons/fetchmail/fetchmail_view.xml')

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 0b74b20637b..ecdb4acfb3b 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -12,6 +12,8 @@
                     <field name="type"/>
                     <field name="user"/>
                     <field name="is_ssl"/>
+                    <field name="object_id"/>
+                    <field name="message_ids" string="# of emails"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -117,11 +119,39 @@
 	          </field>
 	      </field>
       </record>
+      
+      <record model="ir.ui.view" id="mailgate_message_search_view">
+	      <field name="name">mailgate.message.inherit.search</field>
+	      <field name="model">mailgate.message</field>
+	      <field name="type">search</field>
+	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_search"/>
+	      <field name="arch" type="xml">
+			<xpath expr="/search/field[@name='name']" position="before">
+			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
+			     <separator orientation="vertical"/>
+			</xpath>
+			<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">mailgate.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="mailgate_message_search_view"/>
+      </record>
+        
+      <menuitem id="base.menu_email_gateway_form"
+               parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
 
-        <act_window 
+      <act_window 
             context="{'server_id': active_id}"
             domain="[('server_id', '=', active_id)]"
-            id="act_server_history" name="Email History"
+            id="act_server_history" name="Emails"
             res_model="mailgate.message" src_model="email.server"/>
             
     </data>
-- 
cgit v1.2.3