Diffstat (limited to 'noncore/net/mail/viewmail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 0947879..d86454c 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -175,32 +175,34 @@ m_mail2[0] = mail.To(); | |||
175 | m_mail2[1] = mail.CC(); | 175 | m_mail2[1] = mail.CC(); |
176 | m_mail2[2] = mail.Bcc(); | 176 | m_mail2[2] = mail.Bcc(); |
177 | 177 | ||
178 | setText(); | 178 | setText(); |
179 | } | 179 | } |
180 | 180 | ||
181 | 181 | ||
182 | 182 | ||
183 | ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) | 183 | ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) |
184 | : ViewMailBase(parent, name, fl), _inLoop(false) | 184 | : ViewMailBase(parent, name, fl), _inLoop(false) |
185 | { | 185 | { |
186 | m_gotBody = false; | 186 | m_gotBody = false; |
187 | deleted = false; | ||
187 | 188 | ||
188 | connect(reply, SIGNAL(activated()), SLOT(slotReply())); | 189 | connect(reply, SIGNAL(activated()), SLOT(slotReply())); |
189 | connect(forward, SIGNAL(activated()), SLOT(slotForward())); | 190 | connect(forward, SIGNAL(activated()), SLOT(slotForward())); |
190 | connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail( ) ) ); | 191 | connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail( ) ) ); |
191 | 192 | ||
192 | attachments->setEnabled(m_gotBody); | 193 | attachments->setEnabled(m_gotBody); |
193 | connect( attachments, SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem *, const QPoint & , int ) ) ); | 194 | connect( attachments, SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem *, const QPoint & , int ) ) ); |
194 | 195 | ||
196 | |||
195 | } | 197 | } |
196 | 198 | ||
197 | void ViewMail::setText() | 199 | void ViewMail::setText() |
198 | { | 200 | { |
199 | 201 | ||
200 | QString toString; | 202 | QString toString; |
201 | QString ccString; | 203 | QString ccString; |
202 | QString bccString; | 204 | QString bccString; |
203 | 205 | ||
204 | for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) { | 206 | for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) { |
205 | toString += (*it); | 207 | toString += (*it); |
206 | } | 208 | } |
@@ -324,24 +326,24 @@ void ViewMail::slotForward() | |||
324 | 326 | ||
325 | ftext += QString("\n%1\n") | 327 | ftext += QString("\n%1\n") |
326 | .arg( m_mail[2]); | 328 | .arg( m_mail[2]); |
327 | 329 | ||
328 | ftext += QString("----- End forwarded message -----\n"); | 330 | ftext += QString("----- End forwarded message -----\n"); |
329 | 331 | ||
330 | Settings *settings = new Settings(); | 332 | Settings *settings = new Settings(); |
331 | ComposeMail composer( settings ,this, 0, true); | 333 | ComposeMail composer( settings ,this, 0, true); |
332 | composer.setSubject( "Fwd: " + m_mail[1] ); | 334 | composer.setSubject( "Fwd: " + m_mail[1] ); |
333 | composer.setMessage( ftext ); | 335 | composer.setMessage( ftext ); |
334 | composer.showMaximized(); | 336 | composer.showMaximized(); |
335 | if ( QDialog::Accepted==composer.exec()) { | 337 | if ( QDialog::Accepted==composer.exec()) { |
336 | 338 | ||
337 | } | 339 | } |
338 | } | 340 | } |
339 | 341 | ||
340 | void ViewMail::slotDeleteMail( ) | 342 | void ViewMail::slotDeleteMail( ) |
341 | { | 343 | { |
342 | if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) { | 344 | if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) { |
343 | m_recMail.Wrapper()->deleteMail( m_recMail ); | 345 | m_recMail.Wrapper()->deleteMail( m_recMail ); |
344 | hide(); | 346 | hide(); |
345 | deleted = true; | 347 | deleted = true; |
346 | } | 348 | } |
347 | } | 349 | } |