author | simon <simon> | 2002-12-11 19:24:52 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 19:24:52 (UTC) |
commit | e59fabf981834292c2ed9b7192dd4f789cc4b7cb (patch) (unidiff) | |
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 | |||
85 | ( void )buttonMask( skinButtonInfo, buttonCount ); | 85 | ( void )buttonMask( skinButtonInfo, buttonCount ); |
86 | } | 86 | } |
87 | 87 | ||
88 | QImage Skin::backgroundImage() const | 88 | 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 | } |
94 | 94 | ||
95 | QImage Skin::buttonUpImage() const | 95 | 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 | } |
101 | 101 | ||
102 | QImage Skin::buttonDownImage() const | 102 | 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 | } |
108 | 108 | ||
109 | QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const | 109 | QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const |
110 | { | 110 | { |
111 | if ( !d->buttonMask.isNull() ) | 111 | if ( !d->buttonMask.isNull() ) |
@@ -139,24 +139,29 @@ void Skin::addButtonToMask( int tag, const QImage &maskImage ) const | |||
139 | QImage Skin::buttonMaskImage( const QString &fileName ) const | 139 | QImage Skin::buttonMaskImage( const QString &fileName ) const |
140 | { | 140 | { |
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 | ||
150 | QString Skin::defaultSkinName() | 150 | QString Skin::defaultSkinName() |
151 | { | 151 | { |
152 | Config cfg( "OpiePlayer" ); | 152 | Config cfg( "OpiePlayer" ); |
153 | cfg.setGroup( "Options" ); | 153 | cfg.setGroup( "Options" ); |
154 | return cfg.readEntry( "Skin", "default" ); | 154 | return cfg.readEntry( "Skin", "default" ); |
155 | } | 155 | } |
156 | 156 | ||
157 | QImage Skin::loadImage( const QString &fileName ) | ||
158 | { | ||
159 | return QImage( Resource::findPixmap( fileName ) ); | ||
160 | } | ||
161 | |||
157 | SkinCache::SkinCache() | 162 | SkinCache::SkinCache() |
158 | { | 163 | { |
159 | m_cache.setAutoDelete( true ); | 164 | m_cache.setAutoDelete( true ); |
160 | } | 165 | } |
161 | 166 | ||
162 | QImage SkinCache::loadImage( const QString &name ) | 167 | QImage SkinCache::loadImage( const QString &name ) |