author | harlekin <harlekin> | 2003-12-09 18:02:33 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-09 18:02:33 (UTC) |
commit | 0b7d74768f00be986f44bfbd61a6342fc854cc3a (patch) (side-by-side diff) | |
tree | 2e314f0d73e3c720783618870fb6d2e16b4acf3e /noncore | |
parent | a30efc4ca72e7689ee35b178d28db82054431fe9 (diff) | |
download | opie-0b7d74768f00be986f44bfbd61a6342fc854cc3a.zip opie-0b7d74768f00be986f44bfbd61a6342fc854cc3a.tar.gz opie-0b7d74768f00be986f44bfbd61a6342fc854cc3a.tar.bz2 |
more updates
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 28 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 39 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.h | 12 |
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 @@ -70,17 +70,9 @@ 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(); folderView->addColumn( tr( "Mailbox" ) ); @@ -98,16 +90,31 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) layout->addWidget( mailView ); layout->setStretchFactor( folderView, 1 ); layout->setStretchFactor( mailView, 2 ); + slotAdjustLayout(); + connect( mailView, SIGNAL( clicked( QListViewItem * ) ),this, SLOT( displayMail( QListViewItem * ) ) ); connect(folderView,SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*))); 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(); if ( hidden ) folderView->show(); @@ -148,9 +155,10 @@ void MainWindow::displayMail(QListViewItem*item) RecMail mail = ((MailListViewItem*)item)->data(); 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 @@ -25,8 +25,9 @@ public slots: protected slots: virtual void slotShowFolders( bool show ); virtual void refreshMailView(QList<RecMail>*); virtual void displayMail(QListViewItem*); + void slotAdjustLayout(); protected: QToolBar *toolBar; QMenuBar *menuBar; @@ -34,8 +35,8 @@ protected: QAction *composeMail, *sendQueued, *showFolders, *searchMails, *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 @@ -22,16 +22,17 @@ AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore) setText(1, _attachItemStore.fileName()); 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(); } @@ -53,8 +54,22 @@ 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( "<html><body>" @@ -64,16 +79,16 @@ void ViewMail::setText() "%4" "%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 @@ -2,8 +2,9 @@ #define VIEWMAIL_H #include <qlistview.h> #include <qmap.h> +#include <qstringlist.h> #include "viewmailbase.h" //#include "imapresponse.h" //#include "mailtable.h" @@ -48,9 +49,9 @@ 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); QString deHtml(const QString &string); @@ -67,9 +68,18 @@ private: // IMAPResponseFETCH _mail; // 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; }; #endif |