summaryrefslogtreecommitdiffabout
path: root/kmicromail/viewmail.cpp
Unidiff
Diffstat (limited to 'kmicromail/viewmail.cpp') (more/less context) (show whitespace changes)
-rw-r--r--kmicromail/viewmail.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 67b77f8..6e560d7 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -12,23 +12,23 @@
12//#include <opie2/ofiledialog.h> 12//#include <opie2/ofiledialog.h>
13//#include <opie2/oimagescrollview.h> 13//#include <opie2/oimagescrollview.h>
14 14
15#include <kfiledialog.h> 15#include <kfiledialog.h>
16#include <kdialog.h> 16#include <kdialog.h>
17 17
18#include <qpe/config.h>
19#include <qpe/qpeapplication.h> 18#include <qpe/qpeapplication.h>
20 19
21/* QT */ 20/* QT */
22#include <qtextbrowser.h> 21#include <qtextbrowser.h>
23#include <qmessagebox.h> 22#include <qmessagebox.h>
24#include <qtextstream.h> 23#include <qtextstream.h>
25#include <qaction.h> 24#include <qaction.h>
26#include <qpopupmenu.h> 25#include <qpopupmenu.h>
27#include <qfile.h> 26#include <qfile.h>
28#include <qlayout.h> 27#include <qlayout.h>
28#include "koprefs.h"
29 29
30//using namespace Opie::Ui; 30//using namespace Opie::Ui;
31//using namespace Opie::Core; 31//using namespace Opie::Core;
32 32
33AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, 33AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
34 const QString&fsize,int num,const QValueList<int>&path) 34 const QString&fsize,int num,const QValueList<int>&path)
@@ -323,15 +323,15 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
323 readConfig(); 323 readConfig();
324 attachments->setSorting(-1); 324 attachments->setSorting(-1);
325} 325}
326 326
327void ViewMail::readConfig() 327void ViewMail::readConfig()
328{ 328{
329 Config cfg( "mail" ); 329
330 cfg.setGroup( "Settings" ); 330 setFont ( KOPrefs::instance()->mReadFont );
331 m_showHtml = cfg.readBoolEntry( "showHtml", false ); 331 m_showHtml = KOPrefs::instance()->mViewAsHtml;
332 showHtml->setOn( m_showHtml ); 332 showHtml->setOn( m_showHtml );
333} 333}
334 334
335void ViewMail::setText() 335void ViewMail::setText()
336{ 336{
337 337
@@ -359,13 +359,13 @@ void ViewMail::setText()
359 "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>" 359 "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
360 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>" 360 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
361 "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>" 361 "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
362 "<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" + 362 "<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
363 tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>" 363 tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
364 "<b>" + tr( "Date" ) + ": </b> " + m_mail[3] + 364 "<b>" + tr( "Date" ) + ": </b> " + m_mail[3] +
365 "</td></tr></table><font face=fixed>"; 365 "</td></tr></table><font>";
366 366
367 if ( !m_showHtml ) 367 if ( !m_showHtml )
368 { 368 {
369 browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" ); 369 browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
370 } 370 }
371 else 371 else