| -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 @@ -11,6 +11,6 @@ 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(); @@ -28,3 +28,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m } else { - QMessageBox::information( this, tr( "Problem" ), + QMessageBox::information( this, tr( "Problem" ), tr( "<p>Please create an SMTP account first.</p>" ), @@ -52,2 +52,3 @@ void ComposeMail::pickAddress( QLineEdit *line ) + void ComposeMail::pickAddressTo() @@ -95,3 +96,3 @@ void ComposeMail::slotAdjustColumns() int currPage = tabWidget->currentPageIndex(); - + tabWidget->showPage( attachTab ); @@ -115,3 +116,3 @@ void ComposeMail::removeAttachment() if ( !attList->currentItem() ) { - QMessageBox::information( this, tr( "Error" ), + QMessageBox::information( this, tr( "Error" ), tr( "<p>Please select a File.</p>" ), @@ -125,3 +126,3 @@ void ComposeMail::accept() { - qDebug( "Sending Mail with " + + qDebug( "Sending Mail with " + smtpAccounts.at( fromBox->currentItem() )->getAccountName() ); @@ -166,4 +167,4 @@ AttachViewItem::AttachViewItem( QListView *parent, 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() ); 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 @@ -37,2 +37,3 @@ public slots: + protected slots: @@ -50,2 +51,4 @@ private slots: + + private: 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 @@ -5,4 +5,4 @@ -//#include "mailfactory.h" -//#include "composer.h" +#include "settings.h" +#include "composemail.h" #include "viewmail.h" @@ -75,3 +75,3 @@ void ViewMail::setText() "<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>" @@ -81,3 +81,3 @@ void ViewMail::setText() "<b>Date:</b> %6<hr>" - "<font face=fixed>%7</font>") + "<font face=fixed>") .arg( deHtml( m_mail[1] ) ) @@ -87,5 +87,6 @@ void ViewMail::setText() .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; } @@ -137,12 +138,12 @@ 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"; @@ -150,4 +151,4 @@ void ViewMail::slotReply() 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 @@ -159,6 +160,9 @@ void ViewMail::slotReply() -// 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 ); } |