| author | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
| commit | e6d3c651634eee7ff54675cc060ae94bd3ef41bd (patch) (side-by-side diff) | |
| tree | e11c8c4f4728dc3d93a2439cf92aa8972c6d9d4e /core | |
| parent | 0a553fa7c46beb00d2a852ecf61233569b5a5e4e (diff) | |
| download | opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.zip opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.gz opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.bz2 | |
Fixing package conflicts.
| -rw-r--r-- | core/apps/calibrate/calibrate.cpp | 4 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index c0ec933..945749b 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp @@ -38,15 +38,15 @@ Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) : showCross = TRUE; const int offset = 30; QRect desk = qApp->desktop()->geometry(); setGeometry( 0, 0, desk.width(), desk.height() ); if ( desk.height() < 250 ) { int w = desk.height()/3; - logo.convertFromImage(Resource::loadImage("opielogo").smoothScale(w,w)); + logo.convertFromImage(Resource::loadImage("launcher/launcher/opielogo").smoothScale(w,w)); } else { - logo = Resource::loadPixmap( "opielogo" ); + logo = Resource::loadPixmap( "launcher/launcher/opielogo" ); } cd.screenPoints[QWSPointerCalibrationData::TopLeft] = QPoint( offset, offset ); cd.screenPoints[QWSPointerCalibrationData::BottomLeft] = QPoint( offset, qt_screen->deviceHeight() - offset ); cd.screenPoints[QWSPointerCalibrationData::BottomRight] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset ); cd.screenPoints[QWSPointerCalibrationData::TopRight] = QPoint( qt_screen->deviceWidth() - offset, offset ); cd.screenPoints[QWSPointerCalibrationData::Center] = QPoint( qt_screen->deviceWidth()/2, qt_screen->deviceHeight()/2 ); 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 @@ -52,13 +52,13 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) { qDebug("starting playlistselector"); // #ifdef USE_PLAYLIST_BACKGROUND // setStaticBackground( TRUE ); // setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) ); - setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); + setBackgroundPixmap( Resource::loadPixmap( "launcher/launcher/opielogo" ) ); // #endif // addColumn("Title",236); // setAllColumnsShowFocus( TRUE ); addColumn( tr( "Playlist Selection" ) ); header()->hide(); setSorting( -1, FALSE ); @@ -70,13 +70,13 @@ PlayListSelection::~PlayListSelection() { // #ifdef USE_PLAYLIST_BACKGROUND void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { // qDebug("drawBackground"); p->fillRect( r, QBrush( white ) ); - QImage logo = Resource::loadImage( "opielogo" ); + QImage logo = Resource::loadImage( "launcher/launcher/opielogo" ); if ( !logo.isNull() ) p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); } // #endif |