author | simon <simon> | 2002-12-11 19:24:52 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 19:24:52 (UTC) |
commit | e59fabf981834292c2ed9b7192dd4f789cc4b7cb (patch) (side-by-side diff) | |
tree | a2d9bb2b50a1a8ff9bd81d656f59e8df7da6f064 /noncore/multimedia/opieplayer2/skin.cpp | |
parent | 073b2388a8c9bd2cc3b4f98025f5fcda424df1c6 (diff) | |
download | opie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.zip opie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.tar.gz opie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.tar.bz2 |
- disable cache temporarily
Diffstat (limited to 'noncore/multimedia/opieplayer2/skin.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 13 |
1 files changed, 9 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 @@ -85,27 +85,27 @@ void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint butt ( void )buttonMask( skinButtonInfo, buttonCount ); } 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 { if ( !d->buttonMask.isNull() ) @@ -139,24 +139,29 @@ void Skin::addButtonToMask( int tag, const QImage &maskImage ) const 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; } QString Skin::defaultSkinName() { Config cfg( "OpiePlayer" ); 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 ); } QImage SkinCache::loadImage( const QString &name ) |