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
@@ -329,49 +329,49 @@ void ViewMail::readConfig()
    m_showHtml =  cfg.readBoolEntry( "showHtml", false );
    showHtml->setOn( m_showHtml );
 }
 void ViewMail::setText()
 {
    QString toString;
    QString ccString;
    QString bccString;
    for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
    {
        toString += (*it);
    }
    for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
    {
        ccString += (*it);
    }
    for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
    {
        bccString += (*it);
    }
-    setCaption( caption().arg( m_mail[0] ) );
+    setCaption( tr("E-Mail by %1").arg( m_mail[0] ) );
    m_mailHtml = "<html><body>"
                 "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
                 "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
                 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
                 "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
                 "<b>" + tr(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
                 tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
                 "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
                 "</td></tr></table><font face=fixed>";
    if ( !m_showHtml )
    {
        browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
    }
    else
    {
        browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
    }
    // remove later in favor of a real handling
    m_gotBody = true;
 }
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index c761815..2590481 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -1,42 +1,42 @@
 #include <qtextbrowser.h>
 #include <qlistview.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qtoolbar.h>
 #include <qmenubar.h>
 #include <kiconloader.h>
 //#include <qpe/resource.h>
 #include "viewmailbase.h"
 //#include "opendiag.h"
 ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
        : QMainWindow(parent, name, fl)
 {
-        setCaption(tr("E-Mail by %1"));
        setToolBarsMovable(false);
        toolbar = new QToolBar(this);
  menubar = new QMenuBar( toolbar );
  mailmenu = new QPopupMenu( menubar );
  menubar->insertItem( tr( "Mail" ), mailmenu );
        toolbar->setHorizontalStretchable(true);
        addToolBar(toolbar);
        QLabel *spacer = new QLabel(toolbar);
        spacer->setBackgroundMode(QWidget::PaletteButton);
        toolbar->setStretchableWidget(spacer);
        reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this);
        reply->addTo(toolbar);
         reply->addTo(mailmenu);
        forward = new QAction(tr("Forward"),SmallIcon("forward"), 0, 0, this);
        forward->addTo(toolbar);
        forward->addTo(mailmenu);
        attachbutton = new QAction(tr("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true);
        attachbutton->addTo(toolbar);

diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 1b74564..b434318 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp
@@ -329,49 +329,49 @@ void ViewMail::readConfig()
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
333	void ViewMail::setText()	333	void 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


diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp index c761815..2590481 100644 --- a/kmicromail/viewmailbase.cpp +++ b/kmicromail/viewmailbase.cpp
@@ -1,42 +1,42 @@
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
15	ViewMailBase::ViewMailBase(QWidget parent, const char name, WFlags fl)	15	ViewMailBase::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);