4 files changed, 58 insertions, 24 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index b25db97..f19f93d 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -71,15 +71,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     QWidget *view = new QWidget(  this );
     setCentralWidget( view );
 
-
-    QWidget *d = QApplication::desktop();
-    QBoxLayout *layout;
-
-    if ( d->width() < d->height() ) {
-    layout = new QVBoxLayout( view );
-    } else {
-    layout = new QHBoxLayout( view );
-    }
+    layout = new QBoxLayout ( view, QBoxLayout::LeftToRight );
 
     folderView = new AccountView( view );
     folderView->header()->hide();
@@ -99,6 +91,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     layout->setStretchFactor( folderView, 1 );
     layout->setStretchFactor( mailView, 2 );
 
+    slotAdjustLayout();
+
     connect( mailView, SIGNAL( clicked( QListViewItem * ) ),this,
              SLOT( displayMail( QListViewItem * ) ) );
 
@@ -107,6 +101,19 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
    QTimer::singleShot( 1000, this, SLOT(  slotAdjustColumns() ) );
 }
 
+
+void MainWindow::slotAdjustLayout() {
+
+  QWidget *d = QApplication::desktop();
+
+  if ( d->width() < d->height() ) {
+    layout->setDirection( QBoxLayout::TopToBottom );
+    } else {
+    layout->setDirection( QBoxLayout::LeftToRight );
+  }
+  delete d;
+}
+
 void MainWindow::slotAdjustColumns()
 {
     bool hidden = folderView->isHidden();
@@ -149,7 +156,8 @@ void MainWindow::displayMail(QListViewItem*item)
     RecBody body = folderView->fetchBody(mail);
 
     ViewMail readMail( this );
-    readMail.setMailInfo( mail.getFrom(), "", mail.getSubject(), "", "", body.Bodytext() );
+
+    readMail.setMailInfo( mail.getFrom(), mail.To(), mail.getSubject(), mail.CC(), mail.Bcc(), mail.getDate(),  body.Bodytext() );
     readMail.showMaximized();
     readMail.exec();
 }
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index 6c87261..6c1cda0 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -26,6 +26,7 @@ protected slots:
     virtual void slotShowFolders( bool show );
     virtual void refreshMailView(QList<RecMail>*);
     virtual void displayMail(QListViewItem*);
+    void slotAdjustLayout();
     
 protected:
     QToolBar *toolBar;
@@ -35,7 +36,7 @@ protected:
             *editSettings, *editAccounts, *syncFolders;
     AccountView *folderView;
     QListView *mailView;
-
+    QBoxLayout *layout;
 };
 
 #endif
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index b648b34..cba9948 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -23,14 +23,15 @@ AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
         setText(2, _attachItemStore.description());
 }
 
-void ViewMail::setMailInfo( const QString & from, const QString & to, const QString & subject, const QString & cc, const QString & bcc, const QString & bodytext ) {
+void ViewMail::setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc, const QString & date, const QString & bodytext ) {
 
 m_mail[0] = from;
-m_mail[1] = to;
-m_mail[2] = subject;
-m_mail[3] = cc;
-m_mail[4] = bcc;
-m_mail[5] = bodytext;
+m_mail2[0] = to;
+m_mail[1] = subject;
+m_mail2[1] = cc;
+m_mail2[2] = bcc;
+m_mail[2] = bodytext;
+m_mail[3] = date;
 
 setText();
 
@@ -54,6 +55,20 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
 void ViewMail::setText()
 {
 
+  QString toString;
+  QString ccString;
+  QString bccString;
+
+  for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
+                  toString += (*it);
+  }
+  for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
+                  ccString += (*it);
+  }
+  for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
+                  bccString += (*it);
+  }
+
  setCaption( caption().arg( m_mail[0] ) );
 
      _mailHtml = tr(
@@ -65,14 +80,14 @@ void ViewMail::setText()
                 "%5"
                 "<b>Date:</b> %6<hr>"
                 "<font face=fixed>%7</font>")
-                .arg( deHtml( m_mail[2] ) )
-                .arg( deHtml( m_mail[0] ) )
                 .arg( deHtml( m_mail[1] ) )
-                .arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( m_mail[3] ) ) )
-                .arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( m_mail[4] ) ) )
-                .arg( tr("(no date)" ) )
+                .arg( deHtml( m_mail[0] ) )
+                .arg( deHtml( toString ) )
+                .arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )
+                .arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) )
+                .arg( m_mail[3] )
                 .arg("%1");
-        browser->setText( QString(_mailHtml) + deHtml( m_mail[5] ) );
+        browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) );
 }
 
 
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 9d3c6e4..615939a 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -3,6 +3,7 @@
 
 #include <qlistview.h>
 #include <qmap.h>
+#include <qstringlist.h>
 
 #include "viewmailbase.h"
 //#include "imapresponse.h"
@@ -49,7 +50,7 @@ public:
         void hide();
         void exec();
     static QString appName() { return QString::fromLatin1("mail"); }
-        void setMailInfo( const QString & from, const QString & to, const QString & subject, const QString & cc, const QString & bcc, const QString & bodytext );
+        void setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc,const QString & date, const QString & bodytext );
 
 protected:
         //void fillList(IMAPResponseBODYSTRUCTURE &structure);
@@ -68,7 +69,16 @@ private:
         //IMAPHandler *_handler;
         QString _mailHtml;
         bool _gotBody;
+
+        // 0 from
+        // 1 subject
+        // 2 bodytext
+        // 3 date
         QMap <int,QString>  m_mail;
+        // 0 to
+        // 1 cc
+        // 2 bcc
+        QMap <int,QStringList> m_mail2;
 
 };