summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp13
-rw-r--r--noncore/multimedia/opieplayer2/skin.h2
2 files changed, 11 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 06453f9..d2e3b00 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -87,23 +87,23 @@ void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint butt
QImage Skin::backgroundImage() const
{
if ( d->backgroundImage.isNull() )
- d->backgroundImage = SkinCache::self().loadImage( QString( "%1/background" ).arg( m_skinPath ) );
+ d->backgroundImage = loadImage( QString( "%1/background" ).arg( m_skinPath ) );
return d->backgroundImage;
}
QImage Skin::buttonUpImage() const
{
if ( d->buttonUpImage.isNull() )
- d->buttonUpImage = SkinCache::self().loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
+ d->buttonUpImage = loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
return d->buttonUpImage;
}
QImage Skin::buttonDownImage() const
{
if ( d->buttonDownImage.isNull() )
- d->buttonDownImage = SkinCache::self().loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
+ d->buttonDownImage = loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
return d->buttonDownImage;
}
QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const
@@ -141,9 +141,9 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const
SkinData::ButtonMaskImageMap::Iterator it = d->buttonMasks.find( fileName );
if ( it == d->buttonMasks.end() ) {
QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
QString path = prefix + fileName + ".png";
- it = d->buttonMasks.insert( fileName, SkinCache::self().loadImage( path ) );
+ it = d->buttonMasks.insert( fileName, loadImage( path ) );
}
return *it;
}
@@ -153,8 +153,13 @@ QString Skin::defaultSkinName()
cfg.setGroup( "Options" );
return cfg.readEntry( "Skin", "default" );
}
+QImage Skin::loadImage( const QString &fileName )
+{
+ return QImage( Resource::findPixmap( fileName ) );
+}
+
SkinCache::SkinCache()
{
m_cache.setAutoDelete( true );
}
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 060ff73..e55832c 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -56,8 +56,10 @@ private:
void init( const QString &name );
void addButtonToMask( int tag, const QImage &maskImage ) const;
+ static QImage loadImage( const QString &fileName );
+
QString m_fileNameInfix;
QString m_skinPath;
SkinData *d;