1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index f015228..8636957 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -240,101 +240,101 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
        }
        break ;
    case 1:
        if (  ( ( AttachItem* )item )->Partnumber() == -1 )
        {
            setText();
        }
        else
        {
            if (  m_recMail.Wrapper() != 0l )
            { // make sure that there is a wrapper , even after delete or simular actions
                browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
            }
        }
        break;
    }
    delete menu;
 }
 void ViewMail::setMail( RecMail mail )
 {
    m_recMail = mail;
    m_mail[0] = mail.getFrom();
    m_mail[1] = mail.getSubject();
    m_mail[3] = mail.getDate();
    m_mail[4] = mail.Msgid();
    m_mail2[0] = mail.To();
    m_mail2[1] = mail.CC();
    m_mail2[2] = mail.Bcc();
    setText();
 }
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
        : ViewMailBase(parent, name, fl), _inLoop(false)
 {
    m_gotBody = false;
    deleted = false;
    connect( reply, SIGNAL(activated()), SLOT(slotReply()));
    connect( forward, SIGNAL(activated()), SLOT(slotForward()));
-    connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail(  ) ) );
+    connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail() ) );
-    connect( showHtml, SIGNAL( toggled( bool ) ), SLOT( slotShowHtml( bool ) ) );
+    connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
    attachments->setEnabled(m_gotBody);
-    connect( attachments,  SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked(  QListViewItem *,  const QPoint & , int ) ) );
+    connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
    readConfig();
    attachments->setSorting(-1);
 }
 void ViewMail::readConfig()
 {
    Config cfg( "mail" );
    cfg.setGroup( "Settings" );
    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] ) );
    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>" );

diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index f015228..8636957 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp
@@ -240,101 +240,101 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
240	}	240	}
241	break ;	241	break ;
242		242
243	case 1:	243	case 1:
244	if ( ( ( AttachItem* )item )->Partnumber() == -1 )	244	if ( ( ( AttachItem* )item )->Partnumber() == -1 )
245	{	245	{
246	setText();	246	setText();
247	}	247	}
248	else	248	else
249	{	249	{
250	if ( m_recMail.Wrapper() != 0l )	250	if ( m_recMail.Wrapper() != 0l )
251	{ // make sure that there is a wrapper , even after delete or simular actions	251	{ // make sure that there is a wrapper , even after delete or simular actions
252	browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );	252	browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
253	}	253	}
254	}	254	}
255	break;	255	break;
256	}	256	}
257	delete menu;	257	delete menu;
258	}	258	}
259		259
260		260
261	void ViewMail::setMail( RecMail mail )	261	void ViewMail::setMail( RecMail mail )
262	{	262	{
263		263
264	m_recMail = mail;	264	m_recMail = mail;
265		265
266	m_mail[0] = mail.getFrom();	266	m_mail[0] = mail.getFrom();
267	m_mail[1] = mail.getSubject();	267	m_mail[1] = mail.getSubject();
268	m_mail[3] = mail.getDate();	268	m_mail[3] = mail.getDate();
269	m_mail[4] = mail.Msgid();	269	m_mail[4] = mail.Msgid();
270		270
271	m_mail2[0] = mail.To();	271	m_mail2[0] = mail.To();
272	m_mail2[1] = mail.CC();	272	m_mail2[1] = mail.CC();
273	m_mail2[2] = mail.Bcc();	273	m_mail2[2] = mail.Bcc();
274		274
275	setText();	275	setText();
276	}	276	}
277		277
278		278
279		279
280	ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)	280	ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)
281	: ViewMailBase(parent, name, fl), _inLoop(false)	281	: ViewMailBase(parent, name, fl), _inLoop(false)
282	{	282	{
283	m_gotBody = false;	283	m_gotBody = false;
284	deleted = false;	284	deleted = false;
285		285
286	connect( reply, SIGNAL(activated()), SLOT(slotReply()));	286	connect( reply, SIGNAL(activated()), SLOT(slotReply()));
287	connect( forward, SIGNAL(activated()), SLOT(slotForward()));	287	connect( forward, SIGNAL(activated()), SLOT(slotForward()));
288	connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail( ) ) );	288	connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) );
289	connect( showHtml, SIGNAL( toggled( bool ) ), SLOT( slotShowHtml( bool ) ) );	289	connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
290		290
291	attachments->setEnabled(m_gotBody);	291	attachments->setEnabled(m_gotBody);
292	connect( attachments, SIGNAL( clicked ( QListViewItem , const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem , const QPoint & , int ) ) );	292	connect( attachments, SIGNAL( clicked(QListViewItem,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem,const QPoint&, int) ) );
293		293
294	readConfig();	294	readConfig();
295	attachments->setSorting(-1);	295	attachments->setSorting(-1);
296	}	296	}
297		297
298	void ViewMail::readConfig()	298	void ViewMail::readConfig()
299	{	299	{
300	Config cfg( "mail" );	300	Config cfg( "mail" );
301	cfg.setGroup( "Settings" );	301	cfg.setGroup( "Settings" );
302	m_showHtml = cfg.readBoolEntry( "showHtml", false );	302	m_showHtml = cfg.readBoolEntry( "showHtml", false );
303	showHtml->setOn( m_showHtml );	303	showHtml->setOn( m_showHtml );
304	}	304	}
305		305
306	void ViewMail::setText()	306	void ViewMail::setText()
307	{	307	{
308		308
309	QString toString;	309	QString toString;
310	QString ccString;	310	QString ccString;
311	QString bccString;	311	QString bccString;
312		312
313	for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )	313	for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
314	{	314	{
315	toString += (*it);	315	toString += (*it);
316	}	316	}
317	for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )	317	for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
318	{	318	{
319	ccString += (*it);	319	ccString += (*it);
320	}	320	}
321	for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )	321	for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
322	{	322	{
323	bccString += (*it);	323	bccString += (*it);
324	}	324	}
325		325
326	setCaption( caption().arg( m_mail[0] ) );	326	setCaption( caption().arg( m_mail[0] ) );
327		327
328	m_mailHtml = "<html><body>"	328	m_mailHtml = "<html><body>"
329	"<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"	329	"<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
330	"<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"	330	"<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
331	"</td></tr><tr bgcolor=\"#EEEEE6\"><td>"	331	"</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
332	"<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"	332	"<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
333	"<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +	333	"<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
334	tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"	334	tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
335	"<b>" + tr( "Date" ) + ": </b> " + m_mail[3] +	335	"<b>" + tr( "Date" ) + ": </b> " + m_mail[3] +
336	"</td></tr></table><font face=fixed>";	336	"</td></tr></table><font face=fixed>";
337		337
338	if ( !m_showHtml )	338	if ( !m_showHtml )
339	{	339	{
340	browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );	340	browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );