| 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 | |
| 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 | ||||
| -rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 2 | ||||
| -rw-r--r-- | pics/launcher/opielogo.png (renamed from pics/opielogo.png) | bin | 12347 -> 12347 bytes |
4 files changed, 5 insertions, 5 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 @@ -43,5 +43,5 @@ Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) : 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" ); } 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 @@ -57,3 +57,3 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) - setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); + setBackgroundPixmap( Resource::loadPixmap( "launcher/launcher/opielogo" ) ); // #endif @@ -75,3 +75,3 @@ void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { p->fillRect( r, QBrush( white ) ); - QImage logo = Resource::loadImage( "opielogo" ); + QImage logo = Resource::loadImage( "launcher/launcher/opielogo" ); if ( !logo.isNull() ) diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index ecb13bc..27c4cf5 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp @@ -68,3 +68,3 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) QLabel *palmtopLogo = new QLabel( this ); - QImage logo1 = Resource::loadImage( "opielogo" ); + QImage logo1 = Resource::loadImage( "launcher/launcher/opielogo" ); logo1 = logo1.smoothScale( 50, 55 ); diff --git a/pics/opielogo.png b/pics/launcher/opielogo.png Binary files differindex 0adc183..0adc183 100644 --- a/pics/opielogo.png +++ b/pics/launcher/opielogo.png |
