1 files changed, 3 insertions, 6 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 0564e85..90be928 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -147,265 +147,262 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
        .arg( name )
        .arg( *emailIt )
        .arg( *emailIt );
        } else {
      dynamicPart += QString(
        "<tr><td align=\"right\"><b>%1</b></td>"
        "<td align=\"left\">%2</td></tr>" )
        .arg( type )
        .arg( *emailIt );
    }
  }
  if ( !mAddressee.url().url().isEmpty() ) {
    dynamicPart += QString(
      "<tr><td align=\"right\"><b>%1</b></td>"
      "<td align=\"left\">%2</td></tr>" )
      .arg( i18n( "Homepage" ) )
 //US      .arg( KStringHandler::tagURLs( mAddressee.url().url() ) );
      .arg( mAddressee.url().url() );
    //qDebug("AddresseeView::setAddressee has to be verified.");
  }
  KABC::Address::List addresses = mAddressee.addresses();
  KABC::Address::List::ConstIterator addrIt;
  for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) {
      if ( true /*(*addrIt).label().isEmpty()*/ ) {
      QString formattedAddress = (*addrIt).formattedAddress().stripWhiteSpace();
 //US      formattedAddress = formattedAddress.replace( '\n', "<br>" );
      //qDebug("adresss %s ",formattedAddress.latin1() );
       formattedAddress = formattedAddress.replace( QRegExp("\n"), "<br>" );
       //qDebug("AddresseeView::setAddressee has to be verified.");
      dynamicPart += QString(
        "<tr><td align=\"right\"><b>%1</b></td>"
        "<td align=\"left\">%2</td></tr>" )
        .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>" )*/ );
    }
  }
  QString notes;
  if ( !mAddressee.note().isEmpty() ) {
    notes = QString(
      "<tr>"
      "<td align=\"right\" valign=\"top\"><b>%1</b></td>"  // note label
      "<td align=\"left\">%2</td>"  // note
      "</tr>" ).arg( i18n( "Notes" ) )
 //US      .arg( mAddressee.note().replace( '\n', "<br>" ) );
      .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) );
    //qDebug("AddresseeView::setAddressee has to be verified.");
  }
  QString aRole = "";
  QString aOrga = "";
  if ( true /*!mAddressee.role().isEmpty()*/ ) {
      aRole = "<tr>"
          "<td align=\"left\">" + mAddressee.role() + "</td>"
          "</tr>";
  }
  if ( true /*!mAddressee.organization().isEmpty()*/ ) {
      aOrga = "<tr>"
          "<td align=\"left\">" + mAddressee.organization() + "</td>" ;
          "</tr>";
  }
  mText = "";
  QString picString = "";
  KABC::Picture picture = mAddressee.photo();
  bool picAvailintern = false;
  bool picAvailUrl = false;
  if (! picture.undefined() ) {
      picAvailintern = (picture.isIntern() && !picture.data().isNull());
      picAvailUrl = !picture.isIntern() &&  QFile::exists(picture.url() );
  }
  if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) {
      if (  picAvailintern ) {
          QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
      } else {
          if ( picAvailUrl ) {
              QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() ));
          } else {
          QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) );
          }
      }
      picString =  "<img src=\"myimage\" width=\"50\" height=\"70\">";
    mText = QString::fromLatin1(
  "<html>"
  "<body text=\"%1\" bgcolor=\"%2\">" // text and background color
  "<table>"
  "<tr>"
  "<td rowspan=\"3\" align=\"right\" valign=\"top\">"
  "%3"
  "</td>"
  "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>"  // name
  "</tr>"
  "%5"  // role
  "%6"  // organization
  "<td colspan=\"2\">&nbsp;</td>"
  "%7"  // dynamic part
  "%8"  // notes
  "</table>"
  "</body>"
  "</html>")
 //US
  .arg( /*KGlobalSettings::textColor().name()*/ "black" )
 //US
  .arg( /*KGlobalSettings::baseColor().name()*/ "white" )
  .arg( picString )
  .arg( name )
  .arg( aRole )
  .arg( aOrga )
  .arg( dynamicPart )
  .arg( notes );
  } else { // no picture!
 mText = "<table width=\"100%\">\n";
    //mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
 #ifdef DESKTOP_VERSION
    mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";
+    mText += "<font color=\"#FFFFFF\">" + name +"</font></h1>";
 #else
-    mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h2>";
+    mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h3>";
+    mText += "<font color=\"#FFFFFF\"> " + name +"</font></h3>";
 #endif
-#ifdef DESKTOP_VERSION
-    mText += "<font color=\"#FFFFFF\"> <em>" +  name+"</em></font></h1>";
-#else
-    mText += "<font color=\"#FFFFFF\"> <em>" +  name +"</em></font></h2>";
-#endif
    mText += "</td></tr>\n<tr  bgcolor=\"#EAF8FA\"><td>";
    mText += "<table><td colspan=\"2\">&nbsp;</td>";
    /*
      mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>"
        "<td align=\"left\"><b>%2</b></td></tr>" )
          .arg( i18n(" ") )
        .arg( name );
    */
      if ( ! mAddressee.role().isEmpty() )
      mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
        "<td align=\"left\">%2</td></tr>" )
          .arg( i18n(" ") )
        .arg( mAddressee.role());
      if ( ! mAddressee.organization().isEmpty() )
      mText += QString("<tr><td align=\"right\"><b>%1</b></td>"
        "<td align=\"left\">%2</td></tr>" )
          .arg( i18n(" ") )
        .arg( mAddressee.organization());
      mText += dynamicPart;
      mText += notes;
      mText += "</table>";
 }
  // at last display it...
  setText( mText );
 }
 QString AddresseeView::getPhoneNumbers( bool preferred )
 {  
  ExternalAppHandler* eah = ExternalAppHandler::instance();
  bool kphoneAvail = eah->isPhoneAppAvailable();
  bool kfaxAvail = eah->isFaxAppAvailable();
  bool ksmsAvail = eah->isSMSAppAvailable();
  bool kpagerAvail = eah->isPagerAppAvailable();
  bool ksipAvail = eah->isSIPAppAvailable();
  QString dynamicPart;
  KABC::PhoneNumber::List phones = mAddressee.phoneNumbers();
  KABC::PhoneNumber::List::ConstIterator phoneIt;
  QString extension;
  int phonetype;
  QString sms;
  for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
    phonetype = (*phoneIt).type();
    if ( ((phonetype & KABC::PhoneNumber::Pref) == 0 ) == preferred )
        continue;
    if (ksmsAvail &&
        (
                 ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) ||
         ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell)
        )
       )
    {
      sms = QString("<a href=\"smsto:%1  \">(sms)</a>" )
              .arg( (*phoneIt).number() );
    }
    else
      sms = "";
    extension = QString::null;
    if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) {
      if (kfaxAvail) extension = "faxto:";
    }
    else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) {
      if (kpagerAvail) extension = "pagerto:";
    }
    else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) {
      if (ksipAvail) extension = "sipto:";
    }
    else if (kphoneAvail) {
      extension = "phoneto:";
    }
    else
      extension = QString::null;
      if ( !extension.isEmpty() ) {
          dynamicPart += QString(
                                 "<tr><td align=\"right\"><b>%1</b></td>"
           "<td align=\"left\"><a href=\"%2%3  \">%4</a> %5</td></tr>" )
              .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
              .arg( extension )
              .arg( (*phoneIt).number() )
              .arg( (*phoneIt).number() )
              .arg( sms );
      } else {
          dynamicPart += QString(
                                 "<tr><td align=\"right\"><b>%1</b></td>"
                                 "<td align=\"left\">%2 %3</td></tr>" )
              .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
              .arg( (*phoneIt).number() )
              .arg( sms );
      }
  }
  return dynamicPart;
 }
 KABC::Addressee AddresseeView::addressee() const
 {
  return mAddressee;
 }
 void AddresseeView::addTag(const QString & tag,const QString & text)
 {
    if ( text.isEmpty() )
        return;
    int number=text.contains("\n");
    QString str = "<" + tag + ">";
    QString tmpText=text;
    QString tmpStr=str;
    if(number !=-1)
        {
            if (number > 0) {
                int pos=0;
                QString tmp;
                for(int i=0;i<=number;i++) {
                    pos=tmpText.find("\n");
                    tmp=tmpText.left(pos);
                    tmpText=tmpText.right(tmpText.length()-pos-1);
                    tmpStr+=tmp+"<br>";
                }
            }
            else tmpStr += tmpText;
            tmpStr+="</" + tag + ">";
            mText.append(tmpStr);
        }
    else