Package: kaffeine
Version: 0.8.6-2
Severity: wishlist
Tags: patch
Hi!
It would be nice and helpful for the user if the programmed channel of
a certain broadcast channel would be visible inside the EPG as well,
especially if the EPG could also be sorted by the programmed channel
id instead of something technical which is not easily grokable by the
end-user.
The attached patch adds the programmed channel id to the overview
table in the Electronic Program Guide. In addition to that the
overview page is sorted by programmed channel id which usually helps
recognise faster the channel/program.
Please apply the patch and forward it upstream.
Regards,
Joey
--
Open source is important from a technical angle. -- Linus Torvalds
Please always Cc to me when replying to me on the lists.
diff -u kaffeine-0.8.6/debian/changelog kaffeine-0.8.6/debian/changelog
--- kaffeine-0.8.6/debian/changelog
+++ kaffeine-0.8.6/debian/changelog
@@ -1,3 +1,12 @@
+kaffeine (0.8.6-2.1) unstable; urgency=low
+
+ * Non-maintainer version
+ * Display the programmed channel number in connection to the channel
+ name in the Electronic Program Guide [kaffeine/src/input/dvb/kevents.h,
+ kaffeine/src/input/dvb/kevents.cpp]
+
+ -- Joey Schulze <[EMAIL PROTECTED]> Mon, 28 Apr 2008 19:47:27 +0200
+
kaffeine (0.8.6-2) unstable; urgency=low
* Build with -fasynchronous-unwind-tables flags. (Closes: #469594)
only in patch2:
unchanged:
--- kaffeine-0.8.6.orig/kaffeine/src/input/dvb/kevents.h
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/kevents.h
@@ -41,7 +41,7 @@
public:
- EListViewItem( QListView *parent, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc );
+ EListViewItem( QListView *parent, QString chanNr, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc );
virtual int compare( QListViewItem *i, int col, bool ascending ) const;
EventDesc *event;
only in patch2:
unchanged:
--- kaffeine-0.8.6.orig/kaffeine/src/input/dvb/kevents.cpp
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/kevents.cpp
@@ -37,7 +37,7 @@
-EListViewItem::EListViewItem( QListView *parent, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc ) : KListViewItem( parent, chanName, eBegin, eDuration, eTitle )
+EListViewItem::EListViewItem( QListView *parent, QString chanNr, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc ) : KListViewItem( parent, chanNr, chanName, eBegin, eDuration, eTitle )
{
event = desc;
}
@@ -119,6 +119,7 @@
grid->addLayout( vbox, 0, 0 );
listView = new KListView( this, "listView" );
+ listView->addColumn( i18n( "Nr" ) );
listView->addColumn( i18n( "Channel" ) );
listView->addColumn( i18n( "Begin" ) );
listView->addColumn( i18n( "Duration" ) );
@@ -140,7 +141,7 @@
currentChannelEpgBtn->setGuiItem( KGuiItem(i18n("Current Channel"), icon->loadIconSet("date", KIcon::Small) ) );
searchBtn->setIconSet( icon->loadIconSet("locationbar_erase", KIcon::Small) );
- new EListViewItem( (QListView*)listView, "Une chaine", "99/99/99 99:99 9999", "99:99 99", "un titre de programme", 0 );
+ new EListViewItem( (QListView*)listView, "1", "Une chaine", "99/99/99 99:99 9999", "99:99 99", "un titre de programme", 0 );
resize( size );
connect( resetBtn , SIGNAL( pressed() ), this, SLOT( reset() ) );
@@ -175,6 +176,7 @@
EListViewItem *itt=0;
ChannelDesc *ch;
QString s, begin, duration, title;
+ QString num;
bool found;
for( k=0; k<events->getNSource(); k++ ) {
@@ -252,7 +254,8 @@
duration = desc->duration.toString("hh:mm");
title = desc->title;
- itt = new EListViewItem( (QListView*)listView, ch->name, begin, duration, title, desc );
+ num.setNum(ch->num);
+ itt = new EListViewItem( (QListView*)listView, num, ch->name, begin, duration, title, desc );
if ( !ch->pix.isNull() )
itt->setPixmap( 0, ch->pix );
@@ -384,7 +387,7 @@
QListViewItem *it = listView->currentItem();
if ( !it )
return;
- setMode( 2, it->text(0) );
+ setMode( 2, it->text(1) );
}
@@ -425,12 +428,14 @@
void KEvents::checkNewEvent()
{
int i;
+ int digits;
EventSource *esrc;
EventSid *es;
EventDesc *desc;
EListViewItem *itt=0;
ChannelDesc *ch;
QString s, t, channel, begin, duration, title;
+ QString num;
if ( mode==2 ) {
if ( !chan )
@@ -439,6 +444,7 @@
return;
if ( !(es=esrc->getEventSid( chan->tp.nid, chan->tp.tsid, chan->sid )) )
return;
+ num.setNum(chan->num);
i = 0;
while ( (desc=es->getEventDesc(i)) ) {
++i;
@@ -447,13 +453,14 @@
title = desc->title;
if ( title.isEmpty() )
continue;
- itt = new EListViewItem( (QListView*)listView, chan->name, begin, duration, title, desc );
+ itt = new EListViewItem( (QListView*)listView, num, chan->name, begin, duration, title, desc );
if ( !chan->pix.isNull() )
itt->setPixmap( 0, chan->pix );
}
return;
}
+ digits = QString::number((int)channels->count()).length();
for ( i=0; i<(int)channels->count(); i++ ) {
ch = channels->at(i);
if ( (desc=events->getEventDesc( ch->tp.source, ch->tp.nid, ch->tp.tsid, ch->sid, 0 )) ) {
@@ -462,7 +469,11 @@
title = desc->title;
if ( title.isEmpty() )
continue;
- itt = new EListViewItem( (QListView*)listView, ch->name, begin, duration, title, desc );
+ num.setNum(ch->num);
+ while ( num.length() < digits ) {
+ num.prepend( " " );
+ }
+ itt = new EListViewItem( (QListView*)listView, num, ch->name, begin, duration, title, desc );
if ( !ch->pix.isNull() )
itt->setPixmap( 0, ch->pix );
}
_______________________________________________
pkg-kde-extras mailing list
pkg-kde-extras@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras
