author | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
commit | e6d3c651634eee7ff54675cc060ae94bd3ef41bd (patch) (unidiff) | |
tree | e11c8c4f4728dc3d93a2439cf92aa8972c6d9d4e /core/multimedia/opieplayer | |
parent | 0a553fa7c46beb00d2a852ecf61233569b5a5e4e (diff) | |
download | opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.zip opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.gz opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.bz2 |
Fixing package conflicts.
-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp index 47fc731..b5d8b78 100644 --- a/core/multimedia/opieplayer/playlistselection.cpp +++ b/core/multimedia/opieplayer/playlistselection.cpp | |||
@@ -46,43 +46,43 @@ private: | |||
46 | const DocLnk *fl; | 46 | const DocLnk *fl; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | 49 | ||
50 | PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) | 50 | PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) |
51 | : QListView( parent, name ) | 51 | : QListView( parent, name ) |
52 | { | 52 | { |
53 | qDebug("starting playlistselector"); | 53 | qDebug("starting playlistselector"); |
54 | // #ifdef USE_PLAYLIST_BACKGROUND | 54 | // #ifdef USE_PLAYLIST_BACKGROUND |
55 | // setStaticBackground( TRUE ); | 55 | // setStaticBackground( TRUE ); |
56 | // setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) ); | 56 | // setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) ); |
57 | 57 | ||
58 | setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); | 58 | setBackgroundPixmap( Resource::loadPixmap( "launcher/launcher/opielogo" ) ); |
59 | // #endif | 59 | // #endif |
60 | // addColumn("Title",236); | 60 | // addColumn("Title",236); |
61 | // setAllColumnsShowFocus( TRUE ); | 61 | // setAllColumnsShowFocus( TRUE ); |
62 | addColumn( tr( "Playlist Selection" ) ); | 62 | addColumn( tr( "Playlist Selection" ) ); |
63 | header()->hide(); | 63 | header()->hide(); |
64 | setSorting( -1, FALSE ); | 64 | setSorting( -1, FALSE ); |
65 | } | 65 | } |
66 | 66 | ||
67 | 67 | ||
68 | PlayListSelection::~PlayListSelection() { | 68 | PlayListSelection::~PlayListSelection() { |
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
72 | // #ifdef USE_PLAYLIST_BACKGROUND | 72 | // #ifdef USE_PLAYLIST_BACKGROUND |
73 | void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { | 73 | void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { |
74 | // qDebug("drawBackground"); | 74 | // qDebug("drawBackground"); |
75 | p->fillRect( r, QBrush( white ) ); | 75 | p->fillRect( r, QBrush( white ) ); |
76 | QImage logo = Resource::loadImage( "opielogo" ); | 76 | QImage logo = Resource::loadImage( "launcher/launcher/opielogo" ); |
77 | if ( !logo.isNull() ) | 77 | if ( !logo.isNull() ) |
78 | p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); | 78 | p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); |
79 | } | 79 | } |
80 | // #endif | 80 | // #endif |
81 | 81 | ||
82 | 82 | ||
83 | void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) { | 83 | void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) { |
84 | if ( event->state() == QMouseEvent::LeftButton ) { | 84 | if ( event->state() == QMouseEvent::LeftButton ) { |
85 | QListViewItem *currentItem = selectedItem(); | 85 | QListViewItem *currentItem = selectedItem(); |
86 | QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) ); | 86 | QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) ); |
87 | if ( currentItem && currentItem->itemAbove() == itemUnder ) | 87 | if ( currentItem && currentItem->itemAbove() == itemUnder ) |
88 | moveSelectedUp(); | 88 | moveSelectedUp(); |