summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mail/composemail.cpp1
-rw-r--r--noncore/net/mail/composemail.h3
-rw-r--r--noncore/net/mail/viewmail.cpp46
3 files changed, 29 insertions, 21 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
@@ -37,32 +37,33 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
}
void ComposeMail::pickAddress( QLineEdit *line )
{
QString names = AddressPicker::getNames();
if ( line->text().isEmpty() ) {
line->setText( names );
} else if ( !names.isEmpty() ) {
line->setText( line->text() + ", " + names );
}
}
+
void ComposeMail::pickAddressTo()
{
pickAddress( toLine );
}
void ComposeMail::pickAddressCC()
{
pickAddress( ccLine );
}
void ComposeMail::pickAddressBCC()
{
pickAddress( bccLine );
}
void ComposeMail::pickAddressReply()
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
@@ -22,45 +22,48 @@ protected:
QString selectedNames;
void accept();
};
class ComposeMail : public ComposeMailUI
{
Q_OBJECT
public:
ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
public slots:
void slotAdjustColumns();
+
protected slots:
void accept();
private slots:
void fillValues( int current );
void pickAddress( QLineEdit *line );
void pickAddressTo();
void pickAddressCC();
void pickAddressBCC();
void pickAddressReply();
void addAttachment();
void removeAttachment();
+
+
private:
Settings *settings;
QList<SMTPaccount> smtpAccounts;
};
class AttachViewItem : public QListViewItem
{
public:
AttachViewItem( QListView *parent, Attachment *att );
Attachment *getAttachment() { return attachment; }
private:
Attachment *attachment;
};
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
@@ -1,23 +1,23 @@
#include <qtextbrowser.h>
#include <qmessagebox.h>
#include <qaction.h>
#include <qapplication.h>
-//#include "mailfactory.h"
-//#include "composer.h"
+#include "settings.h"
+#include "composemail.h"
#include "viewmail.h"
AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)
: QListViewItem(parent), _attachItemStore(attachItemStore)
{
setText(0, _attachItemStore.mimeType());
setText(1, _attachItemStore.fileName());
setText(2, _attachItemStore.description());
}
AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
: QListViewItem(parent), _attachItemStore(attachItemStore)
{
setText(0, _attachItemStore.mimeType());
setText(1, _attachItemStore.fileName());
setText(2, _attachItemStore.description());
@@ -60,47 +60,48 @@ void ViewMail::setText()
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>"
- "<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>"
"%4"
"%5"
"<b>Date:</b> %6<hr>"
- "<font face=fixed>%7</font>")
+ "<font face=fixed>")
.arg( deHtml( m_mail[1] ) )
.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[2] ) );
+ .arg( m_mail[3] );
+ browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
+ // remove later in favor of a real handling
+ _gotBody = true;
}
ViewMail::~ViewMail()
{
hide();
}
void ViewMail::hide()
{
QWidget::hide();
if (_inLoop) {
_inLoop = false;
qApp->exit_loop();
@@ -122,58 +123,61 @@ QString ViewMail::deHtml(const QString &string)
QString string_ = string;
string_.replace(QRegExp("&"), "&amp;");
string_.replace(QRegExp("<"), "&lt;");
string_.replace(QRegExp(">"), "&gt;");
string_.replace(QRegExp("\\n"), "<br>");
return string_;
}
void ViewMail::slotReply()
{
if (!_gotBody) {
QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
return;
}
QString rtext;
-// rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose
-// .arg(_mail.envelope().from()[0].toString())
-// .arg(_mail.envelope().mailDate());
+ rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose
+ .arg( m_mail[1] )
+ .arg( m_mail[3] );
-// QString text = _mail.bodyPart(1).data();
-// QStringList lines = QStringList::split(QRegExp("\\n"), text);
+ 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";
-// }
+ 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());
// sendMail.setSubject(prefix + _mail.envelope().subject());
// 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()
{
if (!_gotBody) {
QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
return;
}
QString ftext;
/* ftext += QString("\n----- Forwarded message from %1 -----\n\n")
.arg(_mail.envelope().from()[0].toString());
if (!_mail.envelope().mailDate().isNull())
ftext += QString("Date: %1\n")
.arg(_mail.envelope().mailDate());
if (!_mail.envelope().from()[0].toString().isNull())