1 files changed, 166 insertions, 34 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 667a5e2..202a718 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -58,2 +58,3 @@
 using namespace KABC;
+bool AddresseeView::sFullDetailsMode = false;
@@ -102,16 +103,22 @@ void AddresseeView::setSource(const QString& n)
 {
-    //qDebug("********AddresseeView::setSource %s", n.latin1());
+   qDebug("********AddresseeView::setSource %s", n.latin1());
-  if ( n.left( 6 ) == "mailto" )
+   if ( n == "allDetails" ) {
-    ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
+       sFullDetailsMode = true;
-  else if ( n.left( 7 ) == "phoneto" )
+       setAddressee( mCurrentContact );
-    ExternalAppHandler::instance()->callByPhone(  n.mid(8) );
+   } else  if ( n == "notAllDetails" ) {
-  else if ( n.left( 5 ) == "faxto" )
+       sFullDetailsMode = false;
-    ExternalAppHandler::instance()->callByFax(  n.mid(6) );
+       setAddressee( mCurrentContact );
-  else if ( n.left( 5 ) == "smsto" )
+   } else if ( n.left( 6 ) == "mailto" )
-    ExternalAppHandler::instance()->callBySMS(  n.mid(6) );
+       ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
-  else if ( n.left( 7 ) == "pagerto" )
+   else if ( n.left( 7 ) == "phoneto" )
-    ExternalAppHandler::instance()->callByPager(  n.mid(8) );
+       ExternalAppHandler::instance()->callByPhone(  n.mid(8) );
-  else if ( n.left( 5 ) == "sipto" )
+   else if ( n.left( 5 ) == "faxto" )
-    ExternalAppHandler::instance()->callBySIP(  n.mid(6) );
+       ExternalAppHandler::instance()->callByFax(  n.mid(6) );
+   else if ( n.left( 5 ) == "smsto" )
+       ExternalAppHandler::instance()->callBySMS(  n.mid(6) );
+   else if ( n.left( 7 ) == "pagerto" )
+       ExternalAppHandler::instance()->callByPager(  n.mid(8) );
+   else if ( n.left( 5 ) == "sipto" )
+       ExternalAppHandler::instance()->callBySIP(  n.mid(6) );
@@ -124,3 +131,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
  //setText( QString::null );
+  mCurrentContact = mAddressee;
  if ( mAddressee.isEmpty() ) {
@@ -189,11 +196,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
-  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.");
-  }
@@ -225,13 +224,146 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
  }
+ 
+ 
+    QString notes;
+    if ( sFullDetailsMode ) {
+        notes = QString(
+                        "<tr><td align=\"right\"><b>%1</b></td>"
+                        "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" )
+            .arg( i18n("Details:") )
+            .arg( i18n("Click here to hide!") );
+     
+        QString tempX = mAddressee.secrecy().asString();
+        
+        notes += QString(
+                         "<tr><td align=\"right\"><b>%1</b></td>"
+                         "<td align=\"left\">%2</td></tr>" )
+            .arg(  "" )
+            .arg( tempX );
+        
+        tempX = mAddressee.categories().join(" - ");
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Category" ) )
+                .arg( tempX );
+        } 
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-Profession" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Profession" ) )
+                .arg( tempX );
+        } 
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-Office" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Office" ) )
+                .arg( tempX );
+        }
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-Department" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Department" ) )
+                .arg( tempX );
+        } 
+        
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-ManagersName" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Manager" ) )
+                .arg( tempX );
+        } 
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-AssistantsName" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Assistant" ) )
+                .arg( tempX );
+        } 
+        if ( !mAddressee.url().url().isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Homepage" ) )
+                .arg( mAddressee.url().url() );
+        }
+        tempX = mAddressee.nickName();
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Nickname" ) )
+                .arg( tempX );
+        }
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Messanger" ) )
+                .arg( tempX );
+        }
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Gender" ) )
+                .arg( i18n(tempX) );
+        } 
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
+        if ( !tempX.isEmpty() ) {
+            QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d");
+            tempX = KGlobal::locale()->formatDate(dt, true);
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Anniversary" ) )
+                .arg( tempX );
+        } 
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Spouse" ) )
+                .arg( tempX );
+        } 
+        tempX = mAddressee.custom( "KADDRESSBOOK", "X-Children" );
+        if ( !tempX.isEmpty() ) {
+            notes += QString(
+                             "<tr><td align=\"right\"><b>%1</b></td>"
+                             "<td align=\"left\">%2</td></tr>" )
+                .arg( i18n( "Children" ) )
+                .arg( tempX );
+        } 
+       
+      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.");
+      }
+  } else {
+      notes = QString(
+            "<tr><td align=\"right\"><b>%1</b></td>"
+           "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" )
+          .arg( i18n("Details:") )
+          .arg( i18n("Click here to show!") );
-  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.");
  }

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 667a5e2..202a718 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp
@@ -58,2 +58,3 @@
58	using namespace KABC;	58	using namespace KABC;
		59	bool AddresseeView::sFullDetailsMode = false;
59		60
@@ -102,16 +103,22 @@ void AddresseeView::setSource(const QString& n)
102	{	103	{
103	//qDebug("********AddresseeView::setSource %s", n.latin1());	104	qDebug("********AddresseeView::setSource %s", n.latin1());
104		105
105	if ( n.left( 6 ) == "mailto" )	106	if ( n == "allDetails" ) {
106	ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );	107	sFullDetailsMode = true;
107	else if ( n.left( 7 ) == "phoneto" )	108	setAddressee( mCurrentContact );
108	ExternalAppHandler::instance()->callByPhone( n.mid(8) );	109	} else if ( n == "notAllDetails" ) {
109	else if ( n.left( 5 ) == "faxto" )	110	sFullDetailsMode = false;
110	ExternalAppHandler::instance()->callByFax( n.mid(6) );	111	setAddressee( mCurrentContact );
111	else if ( n.left( 5 ) == "smsto" )	112	} else if ( n.left( 6 ) == "mailto" )
112	ExternalAppHandler::instance()->callBySMS( n.mid(6) );	113	ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
113	else if ( n.left( 7 ) == "pagerto" )	114	else if ( n.left( 7 ) == "phoneto" )
114	ExternalAppHandler::instance()->callByPager( n.mid(8) );	115	ExternalAppHandler::instance()->callByPhone( n.mid(8) );
115	else if ( n.left( 5 ) == "sipto" )	116	else if ( n.left( 5 ) == "faxto" )
116	ExternalAppHandler::instance()->callBySIP( n.mid(6) );	117	ExternalAppHandler::instance()->callByFax( n.mid(6) );
		118	else if ( n.left( 5 ) == "smsto" )
		119	ExternalAppHandler::instance()->callBySMS( n.mid(6) );
		120	else if ( n.left( 7 ) == "pagerto" )
		121	ExternalAppHandler::instance()->callByPager( n.mid(8) );
		122	else if ( n.left( 5 ) == "sipto" )
		123	ExternalAppHandler::instance()->callBySIP( n.mid(6) );
117		124
@@ -124,3 +131,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
124	//setText( QString::null );	131	//setText( QString::null );
125		132	mCurrentContact = mAddressee;
126	if ( mAddressee.isEmpty() ) {	133	if ( mAddressee.isEmpty() ) {
@@ -189,11 +196,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
189		196
190	if ( !mAddressee.url().url().isEmpty() ) {	197
191	dynamicPart += QString(
192	"<tr><td align=\"right\"><b>%1</b></td>"
193	"<td align=\"left\">%2</td></tr>" )
194	.arg( i18n( "Homepage" ) )
195	//US .arg( KStringHandler::tagURLs( mAddressee.url().url() ) );
196	.arg( mAddressee.url().url() );
197	//qDebug("AddresseeView::setAddressee has to be verified.");
198	}
199		198
@@ -225,13 +224,146 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
225	}	224	}
		225
		226
		227	QString notes;
		228	if ( sFullDetailsMode ) {
		229	notes = QString(
		230	"<tr><td align=\"right\"><b>%1</b></td>"
		231	"<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" )
		232	.arg( i18n("Details:") )
		233	.arg( i18n("Click here to hide!") );
		234
		235	QString tempX = mAddressee.secrecy().asString();
		236
		237	notes += QString(
		238	"<tr><td align=\"right\"><b>%1</b></td>"
		239	"<td align=\"left\">%2</td></tr>" )
		240	.arg( "" )
		241	.arg( tempX );
		242
		243
		244	tempX = mAddressee.categories().join(" - ");
		245	if ( !tempX.isEmpty() ) {
		246	notes += QString(
		247	"<tr><td align=\"right\"><b>%1</b></td>"
		248	"<td align=\"left\">%2</td></tr>" )
		249	.arg( i18n( "Category" ) )
		250	.arg( tempX );
		251	}
		252	tempX = mAddressee.custom( "KADDRESSBOOK", "X-Profession" );
		253	if ( !tempX.isEmpty() ) {
		254	notes += QString(
		255	"<tr><td align=\"right\"><b>%1</b></td>"
		256	"<td align=\"left\">%2</td></tr>" )
		257	.arg( i18n( "Profession" ) )
		258	.arg( tempX );
		259	}
		260	tempX = mAddressee.custom( "KADDRESSBOOK", "X-Office" );
		261	if ( !tempX.isEmpty() ) {
		262	notes += QString(
		263	"<tr><td align=\"right\"><b>%1</b></td>"
		264	"<td align=\"left\">%2</td></tr>" )
		265	.arg( i18n( "Office" ) )
		266	.arg( tempX );
		267	}
		268	tempX = mAddressee.custom( "KADDRESSBOOK", "X-Department" );
		269	if ( !tempX.isEmpty() ) {
		270	notes += QString(
		271	"<tr><td align=\"right\"><b>%1</b></td>"
		272	"<td align=\"left\">%2</td></tr>" )
		273	.arg( i18n( "Department" ) )
		274	.arg( tempX );
		275	}
		276
		277	tempX = mAddressee.custom( "KADDRESSBOOK", "X-ManagersName" );
		278	if ( !tempX.isEmpty() ) {
		279	notes += QString(
		280	"<tr><td align=\"right\"><b>%1</b></td>"
		281	"<td align=\"left\">%2</td></tr>" )
		282	.arg( i18n( "Manager" ) )
		283	.arg( tempX );
		284	}
		285	tempX = mAddressee.custom( "KADDRESSBOOK", "X-AssistantsName" );
		286	if ( !tempX.isEmpty() ) {
		287	notes += QString(
		288	"<tr><td align=\"right\"><b>%1</b></td>"
		289	"<td align=\"left\">%2</td></tr>" )
		290	.arg( i18n( "Assistant" ) )
		291	.arg( tempX );
		292	}
		293	if ( !mAddressee.url().url().isEmpty() ) {
		294	notes += QString(
		295	"<tr><td align=\"right\"><b>%1</b></td>"
		296	"<td align=\"left\">%2</td></tr>" )
		297	.arg( i18n( "Homepage" ) )
		298	.arg( mAddressee.url().url() );
		299	}
		300	tempX = mAddressee.nickName();
		301	if ( !tempX.isEmpty() ) {
		302	notes += QString(
		303	"<tr><td align=\"right\"><b>%1</b></td>"
		304	"<td align=\"left\">%2</td></tr>" )
		305	.arg( i18n( "Nickname" ) )
		306	.arg( tempX );
		307	}
		308	tempX = mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" );
		309	if ( !tempX.isEmpty() ) {
		310	notes += QString(
		311	"<tr><td align=\"right\"><b>%1</b></td>"
		312	"<td align=\"left\">%2</td></tr>" )
		313	.arg( i18n( "Messanger" ) )
		314	.arg( tempX );
		315	}
		316	tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
		317	if ( !tempX.isEmpty() ) {
		318	notes += QString(
		319	"<tr><td align=\"right\"><b>%1</b></td>"
		320	"<td align=\"left\">%2</td></tr>" )
		321	.arg( i18n( "Gender" ) )
		322	.arg( i18n(tempX) );
		323	}
		324	tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
		325	if ( !tempX.isEmpty() ) {
		326	QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d");
		327	tempX = KGlobal::locale()->formatDate(dt, true);
		328	notes += QString(
		329	"<tr><td align=\"right\"><b>%1</b></td>"
		330	"<td align=\"left\">%2</td></tr>" )
		331	.arg( i18n( "Anniversary" ) )
		332	.arg( tempX );
		333	}
		334	tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" );
		335	if ( !tempX.isEmpty() ) {
		336	notes += QString(
		337	"<tr><td align=\"right\"><b>%1</b></td>"
		338	"<td align=\"left\">%2</td></tr>" )
		339	.arg( i18n( "Spouse" ) )
		340	.arg( tempX );
		341	}
		342	tempX = mAddressee.custom( "KADDRESSBOOK", "X-Children" );
		343	if ( !tempX.isEmpty() ) {
		344	notes += QString(
		345	"<tr><td align=\"right\"><b>%1</b></td>"
		346	"<td align=\"left\">%2</td></tr>" )
		347	.arg( i18n( "Children" ) )
		348	.arg( tempX );
		349	}
		350
		351	if ( !mAddressee.note().isEmpty() ) {
		352	notes += QString(
		353	"<tr>"
		354	"<td align=\"right\" valign=\"top\"><b>%1</b></td>" // note label
		355	"<td align=\"left\">%2</td>" // note
		356	"</tr>" ).arg( i18n( "Notes" ) )
		357	//US .arg( mAddressee.note().replace( '\n', "<br>" ) );
		358	.arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) );
		359	//qDebug("AddresseeView::setAddressee has to be verified.");
		360	}
		361	} else {
		362	notes = QString(
		363	"<tr><td align=\"right\"><b>%1</b></td>"
		364	"<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" )
		365	.arg( i18n("Details:") )
		366	.arg( i18n("Click here to show!") );
		367
226		368
227	QString notes;
228	if ( !mAddressee.note().isEmpty() ) {
229	notes = QString(
230	"<tr>"
231	"<td align=\"right\" valign=\"top\"><b>%1</b></td>" // note label
232	"<td align=\"left\">%2</td>" // note
233	"</tr>" ).arg( i18n( "Notes" ) )
234	//US .arg( mAddressee.note().replace( '\n', "<br>" ) );
235	.arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) );
236	//qDebug("AddresseeView::setAddressee has to be verified.");
237	}	369	}