summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-18 21:26:21 (UTC)
committer kergoth <kergoth>2002-03-18 21:26:21 (UTC)
commite6d3c651634eee7ff54675cc060ae94bd3ef41bd (patch) (side-by-side diff)
treee11c8c4f4728dc3d93a2439cf92aa8972c6d9d4e
parent0a553fa7c46beb00d2a852ecf61233569b5a5e4e (diff)
downloadopie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.zip
opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.gz
opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.bz2
Fixing package conflicts.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/calibrate/calibrate.cpp4
-rw-r--r--core/multimedia/opieplayer/playlistselection.cpp4
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp2
-rw-r--r--pics/launcher/opielogo.png (renamed from pics/opielogo.png)bin12347 -> 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
@@ -42,7 +42,7 @@ Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) :
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 );
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
@@ -56,5 +56,5 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
// setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
- setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
+ setBackgroundPixmap( Resource::loadPixmap( "launcher/launcher/opielogo" ) );
// #endif
// addColumn("Title",236);
@@ -74,5 +74,5 @@ 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 );
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
@@ -67,5 +67,5 @@ 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 );
QPixmap logo1Pixmap;
diff --git a/pics/opielogo.png b/pics/launcher/opielogo.png
index 0adc183..0adc183 100644
--- a/pics/opielogo.png
+++ b/pics/launcher/opielogo.png
Binary files differ