Diffstat (limited to 'noncore/net/mail/viewmail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index a64a168..5206220 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -198,3 +198,3 @@ void ViewMail::slotShowHtml( bool state ) | |||
198 | m_showHtml = state; | 198 | m_showHtml = state; |
199 | setText(); | 199 | setMainText(); |
200 | } | 200 | } |
@@ -208,3 +208,3 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
208 | { | 208 | { |
209 | setText(); | 209 | setMainText(); |
210 | return; | 210 | return; |
@@ -252,2 +252,11 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
252 | { | 252 | { |
253 | if (m_lastimagepart== (( AttachItem* )item )->Partnumber()) { | ||
254 | if (m_lastdlg) { | ||
255 | setUpdatesEnabled(false); | ||
256 | browser->hide(); | ||
257 | m_lastdlg->show(); | ||
258 | setUpdatesEnabled(true); | ||
259 | return; | ||
260 | } | ||
261 | } | ||
253 | QString tmpfile = QString("/tmp/opiemail-image-%1").arg(_icounter++); | 262 | QString tmpfile = QString("/tmp/opiemail-image-%1").arg(_icounter++); |
@@ -278,2 +287,3 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
278 | } | 287 | } |
288 | m_lastimagepart=(( AttachItem* )item )->Partnumber(); | ||
279 | } | 289 | } |
@@ -283,3 +293,3 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
283 | { | 293 | { |
284 | setText(); | 294 | setMainText(); |
285 | } | 295 | } |
@@ -289,3 +299,13 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
289 | { // make sure that there is a wrapper , even after delete or simular actions | 299 | { // make sure that there is a wrapper , even after delete or simular actions |
290 | browser->setText( m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) ); | 300 | if (m_lastdlg) { |
301 | m_lastdlg->hide(); | ||
302 | browser->show(); | ||
303 | } | ||
304 | if (m_lasttextpart == ( ( AttachItem* )item )->Partnumber() ) return; | ||
305 | m_lasttextpart = ( ( AttachItem* )item )->Partnumber(); | ||
306 | QString s = m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );; | ||
307 | if (item->text(0).right(4)!="html") { | ||
308 | s = QString("<html><body>\n<font face=fixed>%1</font></body></html>").arg(QStyleSheet::convertFromPlainText(s)); | ||
309 | } | ||
310 | browser->setText(s); | ||
291 | } | 311 | } |
@@ -313,3 +333,3 @@ void ViewMail::setMail(const RecMailP&mail ) | |||
313 | setCaption(tr("E-Mail by %1").arg( m_mail[0] ) ); | 333 | setCaption(tr("E-Mail by %1").arg( m_mail[0] ) ); |
314 | setText(); | 334 | setMainText(); |
315 | } | 335 | } |
@@ -334,2 +354,4 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) | |||
334 | _icounter = 0; | 354 | _icounter = 0; |
355 | m_lastimagepart = -1; | ||
356 | m_lasttextpart = -2; | ||
335 | 357 | ||
@@ -350,2 +372,3 @@ void ViewMail::slotImageInline(bool how) | |||
350 | m_lastdlg = 0; | 372 | m_lastdlg = 0; |
373 | m_lastimagepart = -1; | ||
351 | } | 374 | } |
@@ -363,3 +386,3 @@ void ViewMail::readConfig() | |||
363 | 386 | ||
364 | void ViewMail::setText() | 387 | void ViewMail::setMainText() |
365 | { | 388 | { |
@@ -374,2 +397,4 @@ void ViewMail::setText() | |||
374 | browser->show(); | 397 | browser->show(); |
398 | if (m_lasttextpart == -1) return; | ||
399 | m_lasttextpart = -1; | ||
375 | for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) | 400 | for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) |