| -rw-r--r-- | kmicromail/viewmail.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 726f540..685b4e4 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp | |||
| @@ -99,6 +99,18 @@ void ViewMail::setBody(const RecBodyP&body ) | |||
| 99 | 99 | ||
| 100 | m_body = body; | 100 | m_body = body; |
| 101 | m_mail[2] = body->Bodytext(); | 101 | m_mail[2] = body->Bodytext(); |
| 102 | m_showHtml = KOPrefs::instance()->mViewAsHtml; | ||
| 103 | if ( m_showHtml ) { | ||
| 104 | if ( m_mail[2].find ("<html>",0,false ) > -1 ) { | ||
| 105 | qDebug("html mail "); | ||
| 106 | } else { | ||
| 107 | qDebug("no html mail "); | ||
| 108 | m_showHtml = false; | ||
| 109 | } | ||
| 110 | } | ||
| 111 | showHtml->blockSignals( true ); | ||
| 112 | showHtml->setOn( m_showHtml ); | ||
| 113 | showHtml->blockSignals( false ); | ||
| 102 | // qDebug("********text %s ",m_mail[2].latin1() ); | 114 | // qDebug("********text %s ",m_mail[2].latin1() ); |
| 103 | attachbutton->setEnabled(body->Parts().count()>0); | 115 | attachbutton->setEnabled(body->Parts().count()>0); |
| 104 | attachments->setEnabled(body->Parts().count()>0); | 116 | attachments->setEnabled(body->Parts().count()>0); |
| @@ -331,7 +343,14 @@ void ViewMail::setMail(const RecMailP&mail ) | |||
| 331 | setText(); | 343 | setText(); |
| 332 | } | 344 | } |
| 333 | 345 | ||
| 334 | 346 | void ViewMail::slotNextMail() | |
| 347 | { | ||
| 348 | nextMail->blockSignals( true ); | ||
| 349 | setCaption(i18n("Displaying next mail...please wait!")); | ||
| 350 | qApp->processEvents(); | ||
| 351 | emit showNextMail(this); | ||
| 352 | nextMail->blockSignals( false ); | ||
| 353 | } | ||
| 335 | 354 | ||
| 336 | ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) | 355 | ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) |
| 337 | : ViewMailBase(parent, name, fl), _inLoop(false) | 356 | : ViewMailBase(parent, name, fl), _inLoop(false) |
| @@ -339,6 +358,7 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) | |||
| 339 | m_gotBody = false; | 358 | m_gotBody = false; |
| 340 | deleted = false; | 359 | deleted = false; |
| 341 | sourceOn = false; | 360 | sourceOn = false; |
| 361 | readConfig(); | ||
| 342 | connect( reply, SIGNAL(activated()), SLOT(slotReply())); | 362 | connect( reply, SIGNAL(activated()), SLOT(slotReply())); |
| 343 | connect( forward, SIGNAL(activated()), SLOT(slotForward())); | 363 | connect( forward, SIGNAL(activated()), SLOT(slotForward())); |
| 344 | connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); | 364 | connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); |
| @@ -351,7 +371,6 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) | |||
| 351 | attachments->setEnabled(m_gotBody); | 371 | attachments->setEnabled(m_gotBody); |
| 352 | connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); | 372 | connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); |
| 353 | 373 | ||
| 354 | readConfig(); | ||
| 355 | attachments->setSorting(-1); | 374 | attachments->setSorting(-1); |
| 356 | } | 375 | } |
| 357 | 376 | ||