* 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, 17 insertions, 11 deletions

diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
index 6b65b0ef..ab375540 100644
--- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp
+++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
@@ -38,8 +38,9 @@
 class KopeteGroupViewItem::Private
 {
 public:
+	Kopete::UI::ListView::GroupBoxComponent *hbox;
 	Kopete::UI::ListView::ImageComponent *image;
-	Kopete::UI::ListView::DisplayNameComponent *name;
+	Kopete::UI::ListView::TextComponent *name;
 	Kopete::UI::ListView::TextComponent *count;
 	std::auto_ptr<Kopete::UI::ListView::ToolTipSource> toolTipSource;
 };
@@ -93,12 +94,14 @@ void KopeteGroupViewItem::initLVI()
 	d->toolTipSource.reset( new Kopete::UI::ListView::GroupToolTipSource( this ) );
 
 	using namespace Kopete::UI::ListView;
-	Component *hbox = new BoxComponent( this, BoxComponent::Horizontal );
-	d->image = new ImageComponent( hbox );
-	d->name = new DisplayNameComponent( hbox );
+	d->hbox = new GroupBoxComponent( this, BoxComponent::Horizontal );
+
+	Component	*hbox = d->hbox;
+	//d->image = new ImageComponent( hbox );
+	d->name = new TextComponent( hbox );
 	d->count = new TextComponent( hbox );
 
-	d->image->setToolTipSource( d->toolTipSource.get() );
+//	d->image->setToolTipSource( d->toolTipSource.get() );
 	d->name->setToolTipSource( d->toolTipSource.get() );
 	d->count->setToolTipSource( d->toolTipSource.get() );
 
@@ -131,17 +134,20 @@ TQString KopeteGroupViewItem::toolTip() const
 
 void KopeteGroupViewItem::slotConfigChanged()
 {
-	updateIcon();
+	if (d->hbox != NULL)
+		d->hbox->reloadTheme();
+
+	//	updateIcon();
 	updateVisibility();
 
 	d->name->setColor( KopetePrefs::prefs()->contactListGroupNameColor() );
+	d->count->setColor( KopetePrefs::prefs()->contactListGroupNameColor() );
 
 	TQFont font = listView()->font();
 	if ( KopetePrefs::prefs()->contactListUseCustomFonts() )
-		font = KopetePrefs::prefs()->contactListCustomNormalFont();
+		font = KopetePrefs::prefs()->contactListCustomGroupFont();
 	d->name->setFont( font );
-
-	d->count->setFont( KopetePrefs::prefs()->contactListSmallFont() );
+	d->count->setFont( font );
 }
 
 void KopeteGroupViewItem::refreshDisplayName()
@@ -242,7 +248,7 @@ void KopeteGroupViewItem::updateIcon()
 		else
 			open = SmallIcon( KOPETE_GROUP_DEFAULT_OPEN_ICON );
 
-		d->image->setPixmap( open );
+//		d->image->setPixmap( open );
 	}
 	else
 	{
@@ -251,7 +257,7 @@ void KopeteGroupViewItem::updateIcon()
 		else
 			closed = SmallIcon( KOPETE_GROUP_DEFAULT_CLOSED_ICON );
 
-		d->image->setPixmap( closed );
+//		d->image->setPixmap( closed );
 	}
 }