author | zautrix <zautrix> | 2005-02-24 11:19:48 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-24 11:19:48 (UTC) |
commit | ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb (patch) (unidiff) | |
tree | b3b4c6ee66b7ae39fad43622a2badacdbe9ed4e1 /kmicromail/viewmail.cpp | |
parent | 66ea8a0023a2a58e7887a41c265f2a7112b6b625 (diff) | |
download | kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.zip kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.tar.gz kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.tar.bz2 |
ompi html fixes
-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 | |||
@@ -90,24 +90,36 @@ AttachItem* ViewMail::lastChild(AttachItem*parent) | |||
90 | while( (temp=(AttachItem*)item->nextSibling())) | 90 | while( (temp=(AttachItem*)item->nextSibling())) |
91 | { | 91 | { |
92 | item = temp; | 92 | item = temp; |
93 | } | 93 | } |
94 | return item; | 94 | return item; |
95 | } | 95 | } |
96 | 96 | ||
97 | void ViewMail::setBody(const RecBodyP&body ) | 97 | void ViewMail::setBody(const RecBodyP&body ) |
98 | { | 98 | { |
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); |
105 | if (body->Parts().count()==0) | 117 | if (body->Parts().count()==0) |
106 | { | 118 | { |
107 | return; | 119 | return; |
108 | } | 120 | } |
109 | AttachItem * curItem=0; | 121 | AttachItem * curItem=0; |
110 | AttachItem * parentItem = 0; | 122 | AttachItem * parentItem = 0; |
111 | QString type=body->Description()->Type()+"/"+body->Description()->Subtype(); | 123 | QString type=body->Description()->Type()+"/"+body->Description()->Subtype(); |
112 | QString desc,fsize; | 124 | QString desc,fsize; |
113 | double s = body->Description()->Size(); | 125 | double s = body->Description()->Size(); |
@@ -322,45 +334,52 @@ void ViewMail::setMail(const RecMailP&mail ) | |||
322 | m_mail[0] = mail->getFrom(); | 334 | m_mail[0] = mail->getFrom(); |
323 | m_mail[1] = mail->getSubject(); | 335 | m_mail[1] = mail->getSubject(); |
324 | m_mail[3] = mail->getDate(); | 336 | m_mail[3] = mail->getDate(); |
325 | m_mail[4] = mail->Msgid(); | 337 | m_mail[4] = mail->Msgid(); |
326 | 338 | ||
327 | m_mail2[0] = mail->To(); | 339 | m_mail2[0] = mail->To(); |
328 | m_mail2[1] = mail->CC(); | 340 | m_mail2[1] = mail->CC(); |
329 | m_mail2[2] = mail->Bcc(); | 341 | m_mail2[2] = mail->Bcc(); |
330 | 342 | ||
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) |
338 | { | 357 | { |
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() ) ); |
345 | connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); | 365 | connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); |
346 | connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); | 366 | connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); |
347 | connect( nextMail, SIGNAL( activated() ), SLOT( slotNextMail() ) ); | 367 | connect( nextMail, SIGNAL( activated() ), SLOT( slotNextMail() ) ); |
348 | connect( viewSource, SIGNAL( activated() ), SLOT( slotViewSource() ) ); | 368 | connect( viewSource, SIGNAL( activated() ), SLOT( slotViewSource() ) ); |
349 | connect( downloadMail, SIGNAL( activated() ), SIGNAL( signalDownloadMail() ) ); | 369 | connect( downloadMail, SIGNAL( activated() ), SIGNAL( signalDownloadMail() ) ); |
350 | 370 | ||
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 | ||
358 | void ViewMail::readConfig() | 377 | void ViewMail::readConfig() |
359 | { | 378 | { |
360 | 379 | ||
361 | setFont ( KOPrefs::instance()->mReadFont ); | 380 | setFont ( KOPrefs::instance()->mReadFont ); |
362 | m_showHtml = KOPrefs::instance()->mViewAsHtml; | 381 | m_showHtml = KOPrefs::instance()->mViewAsHtml; |
363 | showHtml->setOn( m_showHtml ); | 382 | showHtml->setOn( m_showHtml ); |
364 | } | 383 | } |
365 | 384 | ||
366 | void ViewMail::setText() | 385 | void ViewMail::setText() |