-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 | |||
@@ -51,4 +51,5 @@ void ComposeMail::pickAddress( QLineEdit *line ) | |||
51 | } | 51 | } |
52 | 52 | ||
53 | |||
53 | void ComposeMail::pickAddressTo() | 54 | void ComposeMail::pickAddressTo() |
54 | { | 55 | { |
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: | |||
36 | void slotAdjustColumns(); | 36 | void slotAdjustColumns(); |
37 | 37 | ||
38 | |||
38 | protected slots: | 39 | protected slots: |
39 | void accept(); | 40 | void accept(); |
@@ -49,4 +50,6 @@ private slots: | |||
49 | void removeAttachment(); | 50 | void removeAttachment(); |
50 | 51 | ||
52 | |||
53 | |||
51 | private: | 54 | private: |
52 | Settings *settings; | 55 | 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 @@ | |||
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 | ||
@@ -74,5 +74,5 @@ void ViewMail::setText() | |||
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>" |
@@ -80,5 +80,5 @@ void ViewMail::setText() | |||
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] ) ) |
@@ -86,7 +86,8 @@ void ViewMail::setText() | |||
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 | ||
@@ -136,19 +137,19 @@ void ViewMail::slotReply() | |||
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; |
@@ -158,8 +159,11 @@ void ViewMail::slotReply() | |||
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 | ||