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
@@ -89,5 +89,5 @@ QImage 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}
@@ -96,5 +96,5 @@ QImage 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}
@@ -103,5 +103,5 @@ QImage 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}
@@ -143,5 +143,5 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const
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;
@@ -155,4 +155,9 @@ QString Skin::defaultSkinName()
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{
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
@@ -58,4 +58,6 @@ private:
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;