ompi fixes

1 files changed, 28 insertions, 11 deletions

diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index 6227f6d..cef55ab 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -2,43 +2,49 @@
 #include "accountview.h"
 #include "accountitem.h"
 #include "selectstore.h"
 
 #include <libmailwrapper/settings.h>
 #include <libmailwrapper/mailwrapper.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qcheckbox.h>
+#include <qtimer.h>
 #include <qspinbox.h>
 #include <klocale.h>
+#include <kmessagebox.h>
 
 using namespace Opie::Core;
 AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
         : QListView( parent, name, flags )
 {
-    connect( this, SIGNAL( selectionChanged(QListViewItem*) ),
-             SLOT( refresh(QListViewItem*) ) );
-    connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
-             SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) );
+    //connect( this, SIGNAL( selectionChanged(QListViewItem*) ),
+    //       SLOT( refresh(QListViewItem*) ) );
+    connect( this, SIGNAL( clicked(QListViewItem*) ),
+           SLOT( refresh(QListViewItem*) ) );
+    connect( this, SIGNAL( returnPressed(QListViewItem*) ),
+           SLOT( refresh(QListViewItem*) ) );
+     connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
+          SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) );
     setSorting(0);
 }
 
 AccountView::~AccountView()
 {
     imapAccounts.clear();
     mhAccounts.clear();
 }
 
 void AccountView::slotContextMenu(int id)
 {
     AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
     if (!view) return;
     view->contextMenuSelected(id);
 }
 
@@ -78,71 +84,82 @@ void AccountView::populate( QList<Account> list )
             /* must not be hold 'cause it isn't required */
             (void) new POP3viewItem( pop3, this );
         }
          else if ( it->getType() == MAILLIB::A_NNTP )
         {
             NNTPaccount *nntp = static_cast<NNTPaccount *>(it);
             /* must not be hold 'cause it isn't required */
             (void) new NNTPviewItem( nntp, this );
        }
      }
 }
 
 void AccountView::refresh(QListViewItem *item)
 {
     if ( item )
     {
+        int result = KMessageBox::warningContinueCancel(this,
+                                                        i18n("Refresh\n%1\n?").arg( item->text(0) ),
+                                                        i18n("Refresh"),i18n("Refresh"),i18n("Cancel"),
+                                                        true);
+        if (result != KMessageBox::Continue) return;
         m_currentItem = item;
-        QValueList<RecMailP> headerlist;
-        AccountViewItem *view = static_cast<AccountViewItem *>(item);
-        view->refresh(headerlist);
-        emit refreshMailview(headerlist);
+        topLevelWidget()->setCaption( i18n ( "Refreshing %1 ... please wait" ). arg ( m_currentItem->text( 0 ) ) ) ;
+        QTimer::singleShot( 500, this, SLOT ( refreshCurrentSelected() ) );
+     
     }
 }
 void AccountView::refreshOutgoing()
 {
     m_currentItem = currentItem();
     if ( !m_currentItem ) return;
     AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
     if ( !view->getFolder() )
         return;
     QString bName = view->getFolder()->getDisplayName();
     if (bName.startsWith("/")&&bName.length()>1)
     {
         bName.replace(0,1,"");
     }
     int pos = bName.findRev("/");
     if (pos > 0)
     {
         bName.replace(0,pos+1,"");
     }
     //qDebug("name *%s* ",bName.lower().latin1() );
     if ( bName.lower() == "outgoing" || bName.lower() == "sent" ||  bName.lower() == "sendfailed" ) {
         refreshCurrent();
         // qDebug("refresh ");
     }
 }
-
-void AccountView::refreshCurrent()
+void AccountView::refreshCurrentSelected()
 {
-    m_currentItem = currentItem();
     if ( !m_currentItem ) return;
     QValueList<RecMailP> headerlist;
     AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
     view->refresh(headerlist);
     emit refreshMailview(headerlist);
+    topLevelWidget()->setCaption( i18n ( "KOpieMail/Pi" ) ) ;
+}
+
+void AccountView::refreshCurrent()
+{
+    m_currentItem = currentItem();
+    if ( !m_currentItem ) return;
+    topLevelWidget()->setCaption( i18n ( "Refreshing %1 ... please wait" ). arg ( m_currentItem->text( 0 ) ) ) ;
+    QTimer::singleShot( 500, this, SLOT ( refreshCurrentSelected() ) );
 }
 
 void AccountView::refreshAll()
 {
 }
 
 RecBodyP AccountView::fetchBody(const RecMailP&aMail)
 {
     QListViewItem*item = selectedItem ();
     if (!item) return new RecBody();
     AccountViewItem *view = static_cast<AccountViewItem *>(item);
     return view->fetchBody(aMail);
 }
 
 void AccountView::setupFolderselect(Selectstore*sels)
 {