From e8ca3ebcf4cf356497670a455f43e08a16c0f2aa Mon Sep 17 00:00:00 2001 From: harlekin Date: Tue, 09 Dec 2003 23:51:22 +0000 Subject: more updated to the mail viewer --- 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 @@ -9,10 +9,10 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m : ComposeMailUI( parent, name, modal, flags ) { settings = s; - + attList->addColumn( tr( "Name" ) ); attList->addColumn( tr( "Size" ) ); - + QList accounts = settings->getAccounts(); Account *it; for ( it = accounts.first(); it; it = accounts.next() ) { @@ -26,7 +26,7 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m if ( smtpAccounts.count() > 0 ) { fillValues( fromBox->currentItem() ); } else { - QMessageBox::information( this, tr( "Problem" ), + QMessageBox::information( this, tr( "Problem" ), tr( "

Please create an SMTP account first.

" ), tr( "Ok" ) ); } @@ -50,6 +50,7 @@ void ComposeMail::pickAddress( QLineEdit *line ) } } + void ComposeMail::pickAddressTo() { pickAddress( toLine ); @@ -93,7 +94,7 @@ void ComposeMail::fillValues( int current ) void ComposeMail::slotAdjustColumns() { int currPage = tabWidget->currentPageIndex(); - + tabWidget->showPage( attachTab ); attList->setColumnWidth( 0, attList->visibleWidth() - 80 ); attList->setColumnWidth( 1, 80 ); @@ -113,7 +114,7 @@ void ComposeMail::addAttachment() void ComposeMail::removeAttachment() { if ( !attList->currentItem() ) { - QMessageBox::information( this, tr( "Error" ), + QMessageBox::information( this, tr( "Error" ), tr( "

Please select a File.

" ), tr( "Ok" ) ); } else { @@ -123,7 +124,7 @@ void ComposeMail::removeAttachment() void ComposeMail::accept() { - qDebug( "Sending Mail with " + + qDebug( "Sending Mail with " + smtpAccounts.at( fromBox->currentItem() )->getAccountName() ); Mail *mail = new Mail(); SMTPaccount *smtp = smtpAccounts.at( fromBox->currentItem() ); @@ -164,8 +165,8 @@ 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() ); setText( 1, QString::number( att->getSize() ) ); 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 @@ -35,6 +35,7 @@ public: public slots: void slotAdjustColumns(); + protected slots: void accept(); @@ -48,6 +49,8 @@ private slots: void addAttachment(); void removeAttachment(); + + private: Settings *settings; QList smtpAccounts; 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 @@ -3,8 +3,8 @@ #include #include -//#include "mailfactory.h" -//#include "composer.h" +#include "settings.h" +#include "composemail.h" #include "viewmail.h" AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore) @@ -73,21 +73,22 @@ void ViewMail::setText() _mailHtml = tr( "" - "

" + "

" "From: %2
" "To: %3
" "%4" "%5" "Date: %6

" - "%7") + "") .arg( deHtml( m_mail[1] ) ) .arg( deHtml( m_mail[0] ) ) .arg( deHtml( toString ) ) .arg( tr("Cc: %1
").arg( deHtml( ccString ) ) ) .arg( tr("Bcc: %1
").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] ) + "" ); + // remove later in favor of a real handling + _gotBody = true; } @@ -135,21 +136,21 @@ 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; // sendMail.setTo(_mail.envelope().from()[0].toString()); @@ -157,10 +158,13 @@ void ViewMail::slotReply() // sendMail.setInReplyTo(_mail.envelope().messageId()); // 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 ); } void ViewMail::slotForward() -- cgit v0.9.0.2