1 files changed, 102 insertions, 38 deletions

diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index dff1888..2cedc51 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -21,2 +21,3 @@
 #include <qmessagebox.h>
+#include <qvbox.h>
 #include <qfile.h>
@@ -28,2 +29,3 @@
 #include "emailclient.h"
+#include "writemail.h"
 
@@ -42,3 +44,3 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   : QMainWindow( parent, name, fl )
-{
+{ 
   emailHandler = new EmailHandler();
@@ -55,2 +57,4 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
+ 
+  
   connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
@@ -67,4 +71,3 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) );
-  
-  
+
   connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this,
@@ -86,2 +89,7 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   mailboxView->setCurrentTab(0);  //ensure that inbox has focus
+  
+  /*channel = new QCopChannel( "QPE/Application/mailit", this );
+  connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
+        this, SLOT(receive(const QCString&, const QByteArray&)) );*/
+
 }
@@ -106,25 +114,4 @@ void EmailClient::init()
 {
-  statusBar = new QStatusBar(this);
-  statusBar->setSizeGripEnabled(FALSE);
-  
-  status1Label = new QLabel( tr("Idle"), statusBar);
-  status2Label = new QLabel("", statusBar);
-  connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
-    status2Label, SLOT(setText(const QString &)) );
-  connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
-    status2Label, SLOT(setText(const QString &)) );
-  
-  progressBar = new QProgressBar(statusBar);
-
-  connect(emailHandler, SIGNAL(mailboxSize(int)),
-    this, SLOT(setTotalSize(int)) );
-  connect(emailHandler, SIGNAL(currentMailSize(int)),
-    this, SLOT(setMailSize(int)) );
-  connect(emailHandler, SIGNAL(downloadedSize(int)),
-    this, SLOT(setDownloadedSize(int)) );
-
-  statusBar->addWidget(status1Label);
-  statusBar->addWidget(progressBar);
-  statusBar->addWidget(status2Label);
-  
+  initStatusBar(this);
+   
   setToolBarsMovable(FALSE);
@@ -196,4 +183,7 @@ void EmailClient::init()
   inboxView->setAllColumnsShowFocus(TRUE);
-  QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n It keeps the fetched mail which can be viewed by double clicking the entry.\n"
-          "                             A blue attachment icon shows whether this mail has attachments."));
+  QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n"
+  "It keeps the fetched mail which can be \n"
+  "viewed by double clicking the entry.\n"
+  "blue attachment icon shows whether this \n"
+  "mailhas attachments.\n"));
 
@@ -212,3 +202,5 @@ void EmailClient::init()
 
-  QWhatsThis::add(outboxView,QWidget::tr("This is the oubox view.\n It keeps the queued mails to send which can be reviewed by double clicking the entry."));
+  QWhatsThis::add(outboxView,QWidget::tr("This is the outbox view.\n"
+  "It keeps the queued mails to send which can be \n"
+  "reviewed by double clicking the entry."));
   grid_3->addWidget( outboxView, 0, 0 );
@@ -220,2 +212,29 @@ void EmailClient::init()
 
+void EmailClient::initStatusBar(QWidget* parent)
+{
+  statusBar = new QStatusBar(parent);
+  statusBar->setSizeGripEnabled(FALSE);
+  
+  status1Label = new QLabel( tr("Idle"), statusBar);
+  status2Label = new QLabel("", statusBar);
+  connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
+    status2Label, SLOT(setText(const QString &)) );
+  connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
+    status2Label, SLOT(setText(const QString &)) );
+  
+  progressBar = new QProgressBar(statusBar);
+
+  connect(emailHandler, SIGNAL(mailboxSize(int)),
+    this, SLOT(setTotalSize(int)) );
+  connect(emailHandler, SIGNAL(currentMailSize(int)),
+    this, SLOT(setMailSize(int)) );
+  connect(emailHandler, SIGNAL(downloadedSize(int)),
+    this, SLOT(setDownloadedSize(int)) );
+
+  statusBar->addWidget(status1Label);
+  statusBar->addWidget(progressBar);
+  statusBar->addWidget(status2Label);
+
+}
+
 void EmailClient::compose()
@@ -321,3 +340,3 @@ void EmailClient::getNewMail() {
   //get any previous mails not downloaded and add to queue
-  mailDownloadList.clear();
+  /*mailDownloadList.clear();
   Email *mailPtr;
@@ -330,3 +349,3 @@ void EmailClient::getNewMail() {
     item = (EmailListItem *) item->nextSibling();
-  }
+  }*/
   
@@ -340,3 +359,3 @@ void EmailClient::getAllNewMail()
   currentAccount = accountList.first();
-  getNewMail();
+  getNewMail();  
 }
@@ -350,5 +369,6 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   mailconf->setGroup(newMail.id);
-    
+  
   if (fromDisk) 
   {
+    
     newMail.downloaded = mailconf->readBoolEntry("downloaded");
@@ -360,2 +380,3 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   {  //mail arrived from server
+  
     newMail.serverId = mail.serverId;
@@ -920,3 +941,3 @@ void EmailClient::inboxItemReleased()
 
-void EmailClient::timerEvent(QTimerEvent *e)
+/*void EmailClient::timerEvent(QTimerEvent *e)
 {
@@ -937,4 +958,4 @@ void EmailClient::timerEvent(QTimerEvent *e)
   if (action) delete action;
-  */  
-}
+   
+}*/
 
@@ -955,4 +976,2 @@ void EmailClient::download(Email* mail)
         tempMailDownloadList.sizeInsert(mail->serverId, mail->size);
-        if (accountList.count()>0)
-                qDebug("Accounts present");
         
@@ -968 +987,46 @@ void EmailClient::download(Email* mail)
 }
+
+void EmailClient::receive(const QCString& msg, const QByteArray& data)
+{
+        /*if (msg=="getMail()")
+        {
+                /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+                QVBoxLayout *vbProg = new QVBoxLayout( &qd );
+        
+                initStatusBar(&qd);
+                
+                if (statusBar==0)
+                {
+                        qDebug("No Bar ...");
+                        //statusBar=new ProgressBar(&qd);
+                }
+                statusBar->show();
+                vbProg->addWidget(statusBar);
+                qd.showMaximized();
+                qd.show();
+                emit getAllNewMail();
+                //qd.exec();
+        }
+        else if (msg=="compose()")
+                {
+                QDialog qd(qApp->activeWindow(),"Getting mail",true);
+                
+                WriteMail wm(&qd,"write new mail");
+                QVBoxLayout vbProg( &qd );
+                
+                wm.showMaximized();
+                vbProg.addWidget(&wm);
+                
+                qd.showMaximized();
+                
+                emit composeRequested();
+                qd.exec();
+                
+                QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
+        }
+                
+        else if (msg=="dialog()")
+        {
+            QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
+        }*/
+}