| -rw-r--r-- | libkdepim/addresseeview.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index 547441c..83aba48 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp @@ -37,8 +37,8 @@ #ifndef DESKTOP_VERSION -#include <qtopia/qcopenvelope_qws.h> -#include <qpe/qpeapplication.h> +#include <qtopia/qcopenvelope_qws.h> +#include <qpe/qpeapplication.h> #endif static int kphoneInstalled = 0; @@ -59,7 +59,7 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name ) //US QStyleSheet *sheet = styleSheet(); //US QStyleSheetItem *link = sheet->item( "a" ); //US link->setColor( KGlobalSettings::linkColor() ); - + } void AddresseeView::setSource(const QString& n) { @@ -88,14 +88,14 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) kphoneInstalled = -1; } if ( kphoneInstalled > 0 ) - kphoneAvail = true; + kphoneAvail = true; #if 0 if ( kphoneAvail ) qDebug("KPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPone avail "); else qDebug("NOOOOOOOOOOOo KPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPone avail "); #endif - + #endif mAddressee = addr; // clear view @@ -144,7 +144,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) } } - + for ( ; emailIt != emails.end(); ++emailIt ) { dynamicPart += QString( "<tr><td align=\"right\"><b>%1</b></td>" @@ -181,14 +181,14 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) .arg( formattedAddress ); } else { - + dynamicPart += QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\">%2</td></tr>" ) .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) //US .arg( (*addrIt).label().replace( '\n', "<br>" ) ); .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ ); - + } } @@ -208,9 +208,9 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) QString aOrga = ""; if ( true /*!mAddressee.role().isEmpty()*/ ) { aRole = "<tr>" - "<td align=\"left\">" + mAddressee.role() + "</td>" + "<td align=\"left\">" + mAddressee.role() + "</td>" "</tr>"; - } + } if ( true /*!mAddressee.organization().isEmpty()*/ ) { aOrga = "<tr>" "<td align=\"left\">" + mAddressee.organization() + "</td>" ; @@ -268,13 +268,13 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr ) } else { // no picture! mText = "<table width=\"100%\">\n"; - //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; + //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; #ifdef DESKTOP_VERSION mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>"; #else mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h2>"; #endif - + #ifdef DESKTOP_VERSION mText += "<font color=\"#FFFFFF\"> <em>" + name+"</em></font></h1>"; #else @@ -287,7 +287,7 @@ mText = "<table width=\"100%\">\n"; mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>" "<td align=\"left\"><b>%2</b></td></tr>" ) .arg( i18n(" ") ) - .arg( name ); + .arg( name ); */ if ( ! mAddressee.role().isEmpty() ) mText += QString("<tr><td align=\"right\"><b>%1</b></td>" @@ -302,11 +302,12 @@ mText = "<table width=\"100%\">\n"; mText += dynamicPart; mText += notes; mText += "</table>"; - + } // at last display it... setText( mText ); + } KABC::Addressee AddresseeView::addressee() const @@ -321,7 +322,7 @@ void AddresseeView::addTag(const QString & tag,const QString & text) QString str = "<" + tag + ">"; QString tmpText=text; QString tmpStr=str; - if(number !=-1) + if(number !=-1) { if (number > 0) { int pos=0; |