author | harlekin <harlekin> | 2003-12-09 23:51:22 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-09 23:51:22 (UTC) |
commit | e8ca3ebcf4cf356497670a455f43e08a16c0f2aa (patch) (side-by-side diff) | |
tree | 0fa7ad39387559a527bee58d24cbc4ac50a35e23 /noncore | |
parent | c361d36374d9c333ffe4b853067858df5636e1a5 (diff) | |
download | opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.zip opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.tar.gz opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.tar.bz2 |
more updated to the mail viewer
-rw-r--r-- | noncore/net/mail/composemail.cpp | 17 | ||||
-rw-r--r-- | noncore/net/mail/composemail.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 50 |
3 files changed, 39 insertions, 31 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 88dd780..96787e4 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp @@ -10,8 +10,8 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m { settings = s; - + attList->addColumn( tr( "Name" ) ); attList->addColumn( tr( "Size" ) ); - + QList<Account> accounts = settings->getAccounts(); Account *it; @@ -27,5 +27,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m fillValues( fromBox->currentItem() ); } else { - QMessageBox::information( this, tr( "Problem" ), + QMessageBox::information( this, tr( "Problem" ), tr( "<p>Please create an SMTP account first.</p>" ), tr( "Ok" ) ); @@ -51,4 +51,5 @@ void ComposeMail::pickAddress( QLineEdit *line ) } + void ComposeMail::pickAddressTo() { @@ -94,5 +95,5 @@ void ComposeMail::slotAdjustColumns() { int currPage = tabWidget->currentPageIndex(); - + tabWidget->showPage( attachTab ); attList->setColumnWidth( 0, attList->visibleWidth() - 80 ); @@ -114,5 +115,5 @@ void ComposeMail::removeAttachment() { if ( !attList->currentItem() ) { - QMessageBox::information( this, tr( "Error" ), + QMessageBox::information( this, tr( "Error" ), tr( "<p>Please select a File.</p>" ), tr( "Ok" ) ); @@ -124,5 +125,5 @@ void ComposeMail::removeAttachment() void ComposeMail::accept() { - qDebug( "Sending Mail with " + + qDebug( "Sending Mail with " + smtpAccounts.at( fromBox->currentItem() )->getAccountName() ); Mail *mail = new Mail(); @@ -165,6 +166,6 @@ AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) attachment = att; qDebug( att->getMimeType() ); - setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? - Resource::loadPixmap( "UnknownDocument-14" ) : + setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? + Resource::loadPixmap( "UnknownDocument-14" ) : attachment->getDocLnk().pixmap() ); setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h index c7ae22a..196a471 100644 --- a/noncore/net/mail/composemail.h +++ b/noncore/net/mail/composemail.h @@ -36,4 +36,5 @@ public slots: void slotAdjustColumns(); + protected slots: void accept(); @@ -49,4 +50,6 @@ private slots: void removeAttachment(); + + private: Settings *settings; diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index cba9948..ed3ece9 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp @@ -4,6 +4,6 @@ #include <qapplication.h> -//#include "mailfactory.h" -//#include "composer.h" +#include "settings.h" +#include "composemail.h" #include "viewmail.h" @@ -74,5 +74,5 @@ void ViewMail::setText() _mailHtml = tr( "<html><body>" - "<div align=center><b>%1</b></div>" + "<div align=center><b><font color=#FF2222>%1</b></font></div>" "<b>From:</b> %2<br>" "<b>To:</b> %3<br>" @@ -80,5 +80,5 @@ void ViewMail::setText() "%5" "<b>Date:</b> %6<hr>" - "<font face=fixed>%7</font>") + "<font face=fixed>") .arg( deHtml( m_mail[1] ) ) .arg( deHtml( m_mail[0] ) ) @@ -86,7 +86,8 @@ void ViewMail::setText() .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[2] ) ); + .arg( m_mail[3] ); + browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" ); + // remove later in favor of a real handling + _gotBody = true; } @@ -136,19 +137,19 @@ void ViewMail::slotReply() QString rtext; -// rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose -// .arg(_mail.envelope().from()[0].toString()) -// .arg(_mail.envelope().mailDate()); - -// QString text = _mail.bodyPart(1).data(); -// QStringList lines = QStringList::split(QRegExp("\\n"), text); - QStringList::Iterator it; -// for (it = lines.begin(); it != lines.end(); it++) { -// rtext += "> " + *it + "\n"; -// } + rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose + .arg( m_mail[1] ) + .arg( m_mail[3] ); + + QString text = m_mail[2]; + QStringList lines = QStringList::split(QRegExp("\\n"), text); + QStringList::Iterator it; + for (it = lines.begin(); it != lines.end(); it++) { + rtext += "> " + *it + "\n"; + } rtext += "\n"; QString prefix; -// if (_mail.envelope().subject().find(QRegExp("^Re: *$")) != -1) prefix = ""; -// else prefix = "Re: "; // no i18n on purpose + if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = ""; + else prefix = "Re: "; // no i18n on purpose // SendMail sendMail; @@ -158,8 +159,11 @@ void ViewMail::slotReply() // sendMail.setMessage(rtext); -// Composer composer(this, 0, true); -// composer.setSendMail(sendMail); -// composer.showMaximized(); -// composer.exec(); + +/* ComposeMail composer(this, 0, true); + composer.setMessage( ); + composer.showMaximized(); + composer.exec(); +*/ + qDebug ( rtext ); } |