dvbpanel.diff

Index: dvbpanel.cpp===================================================================--- dvbpanel.cpp	(revision 657532)+++ dvbpanel.cpp	(working copy)@@ -31,6 +31,7 @@ #include <qapplication.h> #include <qpopupmenu.h> #include <qmap.h>+#include <qregexp.h>  #include <kiconloader.h> #include <klocale.h>@@ -1034,7 +1035,7 @@ 	bool cont=false; 	QPtrList<Transponder> trans = getSourcesStatus(); 	trans.setAutoDelete( true );-+	QString tsource; 	channelsCb->clear(); 	for ( i=0; i<(int)channels.count(); i++ ) { 		chan = channels.at(i);@@ -1061,7 +1062,8 @@ 		} 		else if ( currentCategory!="All" && chan->category!=currentCategory ) 			continue;-		it = new KListViewItem( channelsCb, QString().sprintf("%04d", chan->num), chan->name, chan->tp.source );+		tsource=chan->tp.source;+		it = new KListViewItem( channelsCb, QString().sprintf("%04d", chan->num), chan->name, QString().sprintf("%s-%05lu%c",tsource.remove( QRegExp(".*-")).ascii(), chan->tp.freq, chan->tp.pol) ); 		it->setDragEnabled( true ); 		if ( !chan->pix.isNull() ) 			it->setPixmap( 1, chan->pix );@@ -2042,7 +2044,7 @@ 	QString s, c, t, u, type; 	int pos, tpos; 	ChannelDesc *chan;-	QString src="";+	QString src="",tsource; 	int ns; 	KListViewItem *it; 	QPixmap pix;@@ -2277,7 +2279,8 @@ 			}  			chan->pix.load( dvbConfig->dvbConfigIconsDir+chan->name );-			it = new KListViewItem( channelsCb, QString().sprintf("%04d", chan->num), chan->name, chan->tp.source );+			tsource=chan->tp.source;+			it = new KListViewItem( channelsCb, QString().sprintf("%04d", chan->num), chan->name, QString().sprintf("%s-%05lu%c",tsource.remove( QRegExp(".*-")).ascii(), chan->tp.freq, chan->tp.pol) ); 			it->setDragEnabled( true ); 			if ( !chan->pix.isNull() ) 				it->setPixmap( 1, chan->pix );