-rw-r--r-- | noncore/net/mail/composemail.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mail/composemail.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 46 |
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 | |||
@@ -41,24 +41,25 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
41 | } | 41 | } |
42 | 42 | ||
43 | void ComposeMail::pickAddress( QLineEdit *line ) | 43 | void ComposeMail::pickAddress( QLineEdit *line ) |
44 | { | 44 | { |
45 | QString names = AddressPicker::getNames(); | 45 | QString names = AddressPicker::getNames(); |
46 | if ( line->text().isEmpty() ) { | 46 | if ( line->text().isEmpty() ) { |
47 | line->setText( names ); | 47 | line->setText( names ); |
48 | } else if ( !names.isEmpty() ) { | 48 | } else if ( !names.isEmpty() ) { |
49 | line->setText( line->text() + ", " + names ); | 49 | line->setText( line->text() + ", " + names ); |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | |||
53 | void ComposeMail::pickAddressTo() | 54 | void ComposeMail::pickAddressTo() |
54 | { | 55 | { |
55 | pickAddress( toLine ); | 56 | pickAddress( toLine ); |
56 | } | 57 | } |
57 | 58 | ||
58 | void ComposeMail::pickAddressCC() | 59 | void ComposeMail::pickAddressCC() |
59 | { | 60 | { |
60 | pickAddress( ccLine ); | 61 | pickAddress( ccLine ); |
61 | } | 62 | } |
62 | 63 | ||
63 | void ComposeMail::pickAddressBCC() | 64 | void ComposeMail::pickAddressBCC() |
64 | { | 65 | { |
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 | |||
@@ -26,37 +26,40 @@ protected: | |||
26 | 26 | ||
27 | 27 | ||
28 | class ComposeMail : public ComposeMailUI | 28 | class ComposeMail : public ComposeMailUI |
29 | { | 29 | { |
30 | Q_OBJECT | 30 | Q_OBJECT |
31 | 31 | ||
32 | public: | 32 | public: |
33 | ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); | 33 | ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); |
34 | 34 | ||
35 | public slots: | 35 | public slots: |
36 | void slotAdjustColumns(); | 36 | void slotAdjustColumns(); |
37 | 37 | ||
38 | |||
38 | protected slots: | 39 | protected slots: |
39 | void accept(); | 40 | void accept(); |
40 | 41 | ||
41 | private slots: | 42 | private slots: |
42 | void fillValues( int current ); | 43 | void fillValues( int current ); |
43 | void pickAddress( QLineEdit *line ); | 44 | void pickAddress( QLineEdit *line ); |
44 | void pickAddressTo(); | 45 | void pickAddressTo(); |
45 | void pickAddressCC(); | 46 | void pickAddressCC(); |
46 | void pickAddressBCC(); | 47 | void pickAddressBCC(); |
47 | void pickAddressReply(); | 48 | void pickAddressReply(); |
48 | void addAttachment(); | 49 | void addAttachment(); |
49 | void removeAttachment(); | 50 | void removeAttachment(); |
50 | 51 | ||
52 | |||
53 | |||
51 | private: | 54 | private: |
52 | Settings *settings; | 55 | Settings *settings; |
53 | QList<SMTPaccount> smtpAccounts; | 56 | QList<SMTPaccount> smtpAccounts; |
54 | 57 | ||
55 | }; | 58 | }; |
56 | 59 | ||
57 | class AttachViewItem : public QListViewItem | 60 | class AttachViewItem : public QListViewItem |
58 | { | 61 | { |
59 | public: | 62 | public: |
60 | AttachViewItem( QListView *parent, Attachment *att ); | 63 | AttachViewItem( QListView *parent, Attachment *att ); |
61 | Attachment *getAttachment() { return attachment; } | 64 | Attachment *getAttachment() { return attachment; } |
62 | 65 | ||
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,19 +1,19 @@ | |||
1 | #include <qtextbrowser.h> | 1 | #include <qtextbrowser.h> |
2 | #include <qmessagebox.h> | 2 | #include <qmessagebox.h> |
3 | #include <qaction.h> | 3 | #include <qaction.h> |
4 | #include <qapplication.h> | 4 | #include <qapplication.h> |
5 | 5 | ||
6 | //#include "mailfactory.h" | 6 | #include "settings.h" |
7 | //#include "composer.h" | 7 | #include "composemail.h" |
8 | #include "viewmail.h" | 8 | #include "viewmail.h" |
9 | 9 | ||
10 | AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore) | 10 | AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore) |
11 | : QListViewItem(parent), _attachItemStore(attachItemStore) | 11 | : QListViewItem(parent), _attachItemStore(attachItemStore) |
12 | { | 12 | { |
13 | setText(0, _attachItemStore.mimeType()); | 13 | setText(0, _attachItemStore.mimeType()); |
14 | setText(1, _attachItemStore.fileName()); | 14 | setText(1, _attachItemStore.fileName()); |
15 | setText(2, _attachItemStore.description()); | 15 | setText(2, _attachItemStore.description()); |
16 | } | 16 | } |
17 | 17 | ||
18 | AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore) | 18 | AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore) |
19 | : QListViewItem(parent), _attachItemStore(attachItemStore) | 19 | : QListViewItem(parent), _attachItemStore(attachItemStore) |
@@ -64,39 +64,40 @@ void ViewMail::setText() | |||
64 | } | 64 | } |
65 | for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) { | 65 | for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) { |
66 | ccString += (*it); | 66 | ccString += (*it); |
67 | } | 67 | } |
68 | for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) { | 68 | for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) { |
69 | bccString += (*it); | 69 | bccString += (*it); |
70 | } | 70 | } |
71 | 71 | ||
72 | setCaption( caption().arg( m_mail[0] ) ); | 72 | setCaption( caption().arg( m_mail[0] ) ); |
73 | 73 | ||
74 | _mailHtml = tr( | 74 | _mailHtml = tr( |
75 | "<html><body>" | 75 | "<html><body>" |
76 | "<div align=center><b>%1</b></div>" | 76 | "<div align=center><b><font color=#FF2222>%1</b></font></div>" |
77 | "<b>From:</b> %2<br>" | 77 | "<b>From:</b> %2<br>" |
78 | "<b>To:</b> %3<br>" | 78 | "<b>To:</b> %3<br>" |
79 | "%4" | 79 | "%4" |
80 | "%5" | 80 | "%5" |
81 | "<b>Date:</b> %6<hr>" | 81 | "<b>Date:</b> %6<hr>" |
82 | "<font face=fixed>%7</font>") | 82 | "<font face=fixed>") |
83 | .arg( deHtml( m_mail[1] ) ) | 83 | .arg( deHtml( m_mail[1] ) ) |
84 | .arg( deHtml( m_mail[0] ) ) | 84 | .arg( deHtml( m_mail[0] ) ) |
85 | .arg( deHtml( toString ) ) | 85 | .arg( deHtml( toString ) ) |
86 | .arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) ) | 86 | .arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) ) |
87 | .arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) ) | 87 | .arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) ) |
88 | .arg( m_mail[3] ) | 88 | .arg( m_mail[3] ); |
89 | .arg("%1"); | 89 | browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" ); |
90 | browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) ); | 90 | // remove later in favor of a real handling |
91 | _gotBody = true; | ||
91 | } | 92 | } |
92 | 93 | ||
93 | 94 | ||
94 | 95 | ||
95 | ViewMail::~ViewMail() | 96 | ViewMail::~ViewMail() |
96 | { | 97 | { |
97 | hide(); | 98 | hide(); |
98 | } | 99 | } |
99 | 100 | ||
100 | void ViewMail::hide() | 101 | void ViewMail::hide() |
101 | { | 102 | { |
102 | QWidget::hide(); | 103 | QWidget::hide(); |
@@ -126,50 +127,53 @@ QString ViewMail::deHtml(const QString &string) | |||
126 | string_.replace(QRegExp("\\n"), "<br>"); | 127 | string_.replace(QRegExp("\\n"), "<br>"); |
127 | return string_; | 128 | return string_; |
128 | } | 129 | } |
129 | 130 | ||
130 | void ViewMail::slotReply() | 131 | void ViewMail::slotReply() |
131 | { | 132 | { |
132 | if (!_gotBody) { | 133 | if (!_gotBody) { |
133 | QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok")); | 134 | QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok")); |
134 | return; | 135 | return; |
135 | } | 136 | } |
136 | 137 | ||
137 | QString rtext; | 138 | QString rtext; |
138 | // rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose | 139 | rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose |
139 | // .arg(_mail.envelope().from()[0].toString()) | 140 | .arg( m_mail[1] ) |
140 | // .arg(_mail.envelope().mailDate()); | 141 | .arg( m_mail[3] ); |
141 | 142 | ||
142 | //QString text = _mail.bodyPart(1).data(); | 143 | QString text = m_mail[2]; |
143 | //QStringList lines = QStringList::split(QRegExp("\\n"), text); | 144 | QStringList lines = QStringList::split(QRegExp("\\n"), text); |
144 | QStringList::Iterator it; | 145 | QStringList::Iterator it; |
145 | //for (it = lines.begin(); it != lines.end(); it++) { | 146 | for (it = lines.begin(); it != lines.end(); it++) { |
146 | // rtext += "> " + *it + "\n"; | 147 | rtext += "> " + *it + "\n"; |
147 | //} | 148 | } |
148 | rtext += "\n"; | 149 | rtext += "\n"; |
149 | 150 | ||
150 | QString prefix; | 151 | QString prefix; |
151 | //if (_mail.envelope().subject().find(QRegExp("^Re: *$")) != -1) prefix = ""; | 152 | if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = ""; |
152 | // else prefix = "Re: "; // no i18n on purpose | 153 | else prefix = "Re: "; // no i18n on purpose |
153 | 154 | ||
154 | //SendMail sendMail; | 155 | //SendMail sendMail; |
155 | //sendMail.setTo(_mail.envelope().from()[0].toString()); | 156 | //sendMail.setTo(_mail.envelope().from()[0].toString()); |
156 | //sendMail.setSubject(prefix + _mail.envelope().subject()); | 157 | //sendMail.setSubject(prefix + _mail.envelope().subject()); |
157 | //sendMail.setInReplyTo(_mail.envelope().messageId()); | 158 | //sendMail.setInReplyTo(_mail.envelope().messageId()); |
158 | //sendMail.setMessage(rtext); | 159 | //sendMail.setMessage(rtext); |
159 | 160 | ||
160 | //Composer composer(this, 0, true); | 161 | |
161 | //composer.setSendMail(sendMail); | 162 | /* ComposeMail composer(this, 0, true); |
162 | //composer.showMaximized(); | 163 | composer.setMessage( ); |
163 | //composer.exec(); | 164 | composer.showMaximized(); |
165 | composer.exec(); | ||
166 | */ | ||
167 | qDebug ( rtext ); | ||
164 | } | 168 | } |
165 | 169 | ||
166 | void ViewMail::slotForward() | 170 | void ViewMail::slotForward() |
167 | { | 171 | { |
168 | if (!_gotBody) { | 172 | if (!_gotBody) { |
169 | QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok")); | 173 | QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok")); |
170 | return; | 174 | return; |
171 | } | 175 | } |
172 | 176 | ||
173 | QString ftext; | 177 | QString ftext; |
174 | /*ftext += QString("\n----- Forwarded message from %1 -----\n\n") | 178 | /*ftext += QString("\n----- Forwarded message from %1 -----\n\n") |
175 | .arg(_mail.envelope().from()[0].toString()); | 179 | .arg(_mail.envelope().from()[0].toString()); |