* Part 2/2 of Chakra patches

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1172713 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 5 deletions

diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index b336a6cd..7d4cb12a 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -149,8 +149,9 @@ class KopeteMetaContactLVI::Private
 {
 public:
 	Private() : metaContactIcon( 0L ), nameText( 0L ), extraText( 0L ), contactIconBox( 0L ),
-	            currentMode( -1 ), currentIconMode( -1 ) {}
-	ListView::ImageComponent *metaContactIcon;
+	            currentMode( -1 ), currentIconMode( -1 ), hbox(NULL) {}
+	ListView::ContactBoxComponent *hbox;
+	ListView::FaceComponent *metaContactIcon;
 	ListView::DisplayNameComponent *nameText;
 	ListView::DisplayNameComponent *extraText;
 	ListView::BoxComponent *contactIconBox;
@@ -649,6 +650,9 @@ void KopeteMetaContactLVI::slotAddToNewGroup()
 
 void KopeteMetaContactLVI::slotConfigChanged()
 {
+	if (d->hbox != NULL)
+   	d->hbox->reloadTheme();
+
     setDisplayMode( KopetePrefs::prefs()->contactListDisplayMode(),
                     KopetePrefs::prefs()->contactListIconMode() );
 
@@ -720,13 +724,15 @@ void KopeteMetaContactLVI::setDisplayMode( int mode, int iconmode )
 
 	// generate our contents
 	using namespace ListView;
-	Component *hbox = new BoxComponent( this, BoxComponent::Horizontal );
+	d->hbox = new ContactBoxComponent( this, BoxComponent::Horizontal );
+	d->hbox->reloadTheme();
+	Component	*hbox = d->hbox;
 	d->spacerBox = new BoxComponent( hbox, BoxComponent::Horizontal );
 	
 	if (iconmode == KopetePrefs::PhotoPic) {
 		Component *imageBox = new BoxComponent( hbox, BoxComponent::Vertical );
 		new VSpacerComponent( imageBox );
-		d->metaContactIcon = new ImageComponent( imageBox, d->iconSize + 2 , d->iconSize + 2 );
+		d->metaContactIcon = new FaceComponent( imageBox, d->iconSize , d->iconSize );
 		new VSpacerComponent( imageBox );
 		if(!metaContact()->photoSource() && !Kopete::KABCPersistence::self()->addressBook()->findByUid( metaContact()->metaContactId() ).isEmpty()   )
 		{	//if the photo is the one of the kaddressbook,  track every change in the adressbook, it might be the photo of our contact.
@@ -734,9 +740,11 @@ void KopeteMetaContactLVI::setDisplayMode( int mode, int iconmode )
 				 this , TQT_SLOT(slotPhotoChanged()));
 		}
 	} else {
-		d->metaContactIcon = new ImageComponent( hbox );
+		d->metaContactIcon = new FaceComponent( hbox );
 	}
 	 
+	new SpacerComponent(hbox, 8, 8);
+
 	if( mode == KopetePrefs::Detailed )
 	{
 		d->contactIconSize = IconSize( KIcon::Small );