summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/viewmail.cpp2
-rw-r--r--kmicromail/viewmailbase.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 1b74564..b434318 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -305,97 +305,97 @@ void ViewMail::setMail(const RecMailP&mail )
305 305
306 306
307ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) 307ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
308 : ViewMailBase(parent, name, fl), _inLoop(false) 308 : ViewMailBase(parent, name, fl), _inLoop(false)
309{ 309{
310 m_gotBody = false; 310 m_gotBody = false;
311 deleted = false; 311 deleted = false;
312 312
313 connect( reply, SIGNAL(activated()), SLOT(slotReply())); 313 connect( reply, SIGNAL(activated()), SLOT(slotReply()));
314 connect( forward, SIGNAL(activated()), SLOT(slotForward())); 314 connect( forward, SIGNAL(activated()), SLOT(slotForward()));
315 connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); 315 connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) );
316 connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); 316 connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
317 317
318 attachments->setEnabled(m_gotBody); 318 attachments->setEnabled(m_gotBody);
319 connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); 319 connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
320 320
321 readConfig(); 321 readConfig();
322 attachments->setSorting(-1); 322 attachments->setSorting(-1);
323} 323}
324 324
325void ViewMail::readConfig() 325void ViewMail::readConfig()
326{ 326{
327 Config cfg( "mail" ); 327 Config cfg( "mail" );
328 cfg.setGroup( "Settings" ); 328 cfg.setGroup( "Settings" );
329 m_showHtml = cfg.readBoolEntry( "showHtml", false ); 329 m_showHtml = cfg.readBoolEntry( "showHtml", false );
330 showHtml->setOn( m_showHtml ); 330 showHtml->setOn( m_showHtml );
331} 331}
332 332
333void ViewMail::setText() 333void ViewMail::setText()
334{ 334{
335 335
336 QString toString; 336 QString toString;
337 QString ccString; 337 QString ccString;
338 QString bccString; 338 QString bccString;
339 339
340 for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) 340 for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
341 { 341 {
342 toString += (*it); 342 toString += (*it);
343 } 343 }
344 for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) 344 for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
345 { 345 {
346 ccString += (*it); 346 ccString += (*it);
347 } 347 }
348 for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) 348 for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
349 { 349 {
350 bccString += (*it); 350 bccString += (*it);
351 } 351 }
352 352
353 setCaption( caption().arg( m_mail[0] ) ); 353 setCaption( tr("E-Mail by %1").arg( m_mail[0] ) );
354 354
355 m_mailHtml = "<html><body>" 355 m_mailHtml = "<html><body>"
356 "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>" 356 "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
357 "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>" 357 "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
358 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>" 358 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
359 "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>" 359 "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
360 "<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" + 360 "<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
361 tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>" 361 tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
362 "<b>" + tr( "Date" ) + ": </b> " + m_mail[3] + 362 "<b>" + tr( "Date" ) + ": </b> " + m_mail[3] +
363 "</td></tr></table><font face=fixed>"; 363 "</td></tr></table><font face=fixed>";
364 364
365 if ( !m_showHtml ) 365 if ( !m_showHtml )
366 { 366 {
367 browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" ); 367 browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
368 } 368 }
369 else 369 else
370 { 370 {
371 browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" ); 371 browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
372 } 372 }
373 // remove later in favor of a real handling 373 // remove later in favor of a real handling
374 m_gotBody = true; 374 m_gotBody = true;
375} 375}
376 376
377 377
378ViewMail::~ViewMail() 378ViewMail::~ViewMail()
379{ 379{
380 m_recMail->Wrapper()->cleanMimeCache(); 380 m_recMail->Wrapper()->cleanMimeCache();
381 hide(); 381 hide();
382} 382}
383 383
384void ViewMail::hide() 384void ViewMail::hide()
385{ 385{
386 QWidget::hide(); 386 QWidget::hide();
387 387
388 if (_inLoop) 388 if (_inLoop)
389 { 389 {
390 _inLoop = false; 390 _inLoop = false;
391 qApp->exit_loop(); 391 qApp->exit_loop();
392 392
393 } 393 }
394 394
395} 395}
396 396
397void ViewMail::exec() 397void ViewMail::exec()
398{ 398{
399 show(); 399 show();
400 400
401 if (!_inLoop) 401 if (!_inLoop)
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index c761815..2590481 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -1,66 +1,66 @@
1#include <qtextbrowser.h> 1#include <qtextbrowser.h>
2#include <qlistview.h> 2#include <qlistview.h>
3#include <qaction.h> 3#include <qaction.h>
4#include <qlabel.h> 4#include <qlabel.h>
5#include <qvbox.h> 5#include <qvbox.h>
6 6
7#include <qtoolbar.h> 7#include <qtoolbar.h>
8#include <qmenubar.h> 8#include <qmenubar.h>
9#include <kiconloader.h> 9#include <kiconloader.h>
10//#include <qpe/resource.h> 10//#include <qpe/resource.h>
11 11
12#include "viewmailbase.h" 12#include "viewmailbase.h"
13//#include "opendiag.h" 13//#include "opendiag.h"
14 14
15ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) 15ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
16 : QMainWindow(parent, name, fl) 16 : QMainWindow(parent, name, fl)
17{ 17{
18 setCaption(tr("E-Mail by %1")); 18
19 setToolBarsMovable(false); 19 setToolBarsMovable(false);
20 20
21 toolbar = new QToolBar(this); 21 toolbar = new QToolBar(this);
22 menubar = new QMenuBar( toolbar ); 22 menubar = new QMenuBar( toolbar );
23 mailmenu = new QPopupMenu( menubar ); 23 mailmenu = new QPopupMenu( menubar );
24 menubar->insertItem( tr( "Mail" ), mailmenu ); 24 menubar->insertItem( tr( "Mail" ), mailmenu );
25 25
26 toolbar->setHorizontalStretchable(true); 26 toolbar->setHorizontalStretchable(true);
27 addToolBar(toolbar); 27 addToolBar(toolbar);
28 28
29 QLabel *spacer = new QLabel(toolbar); 29 QLabel *spacer = new QLabel(toolbar);
30 spacer->setBackgroundMode(QWidget::PaletteButton); 30 spacer->setBackgroundMode(QWidget::PaletteButton);
31 toolbar->setStretchableWidget(spacer); 31 toolbar->setStretchableWidget(spacer);
32 32
33 reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this); 33 reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this);
34 reply->addTo(toolbar); 34 reply->addTo(toolbar);
35 reply->addTo(mailmenu); 35 reply->addTo(mailmenu);
36 36
37 forward = new QAction(tr("Forward"),SmallIcon("forward"), 0, 0, this); 37 forward = new QAction(tr("Forward"),SmallIcon("forward"), 0, 0, this);
38 forward->addTo(toolbar); 38 forward->addTo(toolbar);
39 forward->addTo(mailmenu); 39 forward->addTo(mailmenu);
40 40
41 attachbutton = new QAction(tr("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true); 41 attachbutton = new QAction(tr("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true);
42 attachbutton->addTo(toolbar); 42 attachbutton->addTo(toolbar);
43 attachbutton->addTo(mailmenu); 43 attachbutton->addTo(mailmenu);
44 connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); 44 connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
45 45
46 46
47 showHtml = new QAction( tr( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true ); 47 showHtml = new QAction( tr( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true );
48 showHtml->addTo( toolbar ); 48 showHtml->addTo( toolbar );
49 showHtml->addTo( mailmenu ); 49 showHtml->addTo( mailmenu );
50 50
51 deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this); 51 deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this);
52 deleteMail->addTo(toolbar); 52 deleteMail->addTo(toolbar);
53 deleteMail->addTo(mailmenu); 53 deleteMail->addTo(mailmenu);
54 54
55 QVBox *view = new QVBox(this); 55 QVBox *view = new QVBox(this);
56 setCentralWidget(view); 56 setCentralWidget(view);
57 57
58 attachments = new QListView(view); 58 attachments = new QListView(view);
59 attachments->setMinimumHeight(90); 59 attachments->setMinimumHeight(90);
60 attachments->setMaximumHeight(90); 60 attachments->setMaximumHeight(90);
61 attachments->setAllColumnsShowFocus(true); 61 attachments->setAllColumnsShowFocus(true);
62 attachments->addColumn("Mime Type", 60); 62 attachments->addColumn("Mime Type", 60);
63 attachments->addColumn(tr("Description"), 100); 63 attachments->addColumn(tr("Description"), 100);
64 attachments->addColumn(tr("Filename"), 80); 64 attachments->addColumn(tr("Filename"), 80);
65 attachments->addColumn(tr("Size"), 80); 65 attachments->addColumn(tr("Size"), 80);
66 attachments->setSorting(-1); 66 attachments->setSorting(-1);