summaryrefslogtreecommitdiff
Unidiff
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
87 87
88QImage Skin::backgroundImage() const 88QImage Skin::backgroundImage() const
89{ 89{
90 if ( d->backgroundImage.isNull() ) 90 if ( d->backgroundImage.isNull() )
91 d->backgroundImage = SkinCache::self().loadImage( QString( "%1/background" ).arg( m_skinPath ) ); 91 d->backgroundImage = loadImage( QString( "%1/background" ).arg( m_skinPath ) );
92 return d->backgroundImage; 92 return d->backgroundImage;
93} 93}
94 94
95QImage Skin::buttonUpImage() const 95QImage Skin::buttonUpImage() const
96{ 96{
97 if ( d->buttonUpImage.isNull() ) 97 if ( d->buttonUpImage.isNull() )
98 d->buttonUpImage = SkinCache::self().loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); 98 d->buttonUpImage = loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
99 return d->buttonUpImage; 99 return d->buttonUpImage;
100} 100}
101 101
102QImage Skin::buttonDownImage() const 102QImage Skin::buttonDownImage() const
103{ 103{
104 if ( d->buttonDownImage.isNull() ) 104 if ( d->buttonDownImage.isNull() )
105 d->buttonDownImage = SkinCache::self().loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); 105 d->buttonDownImage = loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
106 return d->buttonDownImage; 106 return d->buttonDownImage;
107} 107}
108 108
109QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const 109QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const
@@ -141,9 +141,9 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const
141 SkinData::ButtonMaskImageMap::Iterator it = d->buttonMasks.find( fileName ); 141 SkinData::ButtonMaskImageMap::Iterator it = d->buttonMasks.find( fileName );
142 if ( it == d->buttonMasks.end() ) { 142 if ( it == d->buttonMasks.end() ) {
143 QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix ); 143 QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
144 QString path = prefix + fileName + ".png"; 144 QString path = prefix + fileName + ".png";
145 it = d->buttonMasks.insert( fileName, SkinCache::self().loadImage( path ) ); 145 it = d->buttonMasks.insert( fileName, loadImage( path ) );
146 } 146 }
147 return *it; 147 return *it;
148} 148}
149 149
@@ -153,8 +153,13 @@ QString Skin::defaultSkinName()
153 cfg.setGroup( "Options" ); 153 cfg.setGroup( "Options" );
154 return cfg.readEntry( "Skin", "default" ); 154 return cfg.readEntry( "Skin", "default" );
155} 155}
156 156
157QImage Skin::loadImage( const QString &fileName )
158{
159 return QImage( Resource::findPixmap( fileName ) );
160}
161
157SkinCache::SkinCache() 162SkinCache::SkinCache()
158{ 163{
159 m_cache.setAutoDelete( true ); 164 m_cache.setAutoDelete( true );
160} 165}
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:
56 void init( const QString &name ); 56 void init( const QString &name );
57 57
58 void addButtonToMask( int tag, const QImage &maskImage ) const; 58 void addButtonToMask( int tag, const QImage &maskImage ) const;
59 59
60 static QImage loadImage( const QString &fileName );
61
60 QString m_fileNameInfix; 62 QString m_fileNameInfix;
61 QString m_skinPath; 63 QString m_skinPath;
62 64
63 SkinData *d; 65 SkinData *d;