author | zecke <zecke> | 2004-09-24 15:10:31 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-24 15:10:31 (UTC) |
commit | 5ec51a8bb49a0a668bb2d7ab652a1a1e776a0e42 (patch) (unidiff) | |
tree | 6be2b6e609bac292dcd7dae2d7e79b3a454a835f /noncore | |
parent | 8e903cd3ea735adf066e156462602987691a4c69 (diff) | |
download | opie-5ec51a8bb49a0a668bb2d7ab652a1a1e776a0e42.zip opie-5ec51a8bb49a0a668bb2d7ab652a1a1e776a0e42.tar.gz opie-5ec51a8bb49a0a668bb2d7ab652a1a1e776a0e42.tar.bz2 |
Give Status for Sking Loading and Finishing Loading
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index 5d8929e..b2c1649 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp | |||
@@ -19,24 +19,25 @@ | |||
19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "skin.h" | 23 | #include "skin.h" |
24 | #include "singleton.h" | 24 | #include "singleton.h" |
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | 26 | ||
27 | #include <qcache.h> | 27 | #include <qcache.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | 29 | ||
30 | #include <qpe/config.h> | 30 | #include <qpe/config.h> |
31 | #include <qpe/global.h> | ||
31 | 32 | ||
32 | #include <assert.h> | 33 | #include <assert.h> |
33 | 34 | ||
34 | struct SkinData | 35 | struct SkinData |
35 | { | 36 | { |
36 | typedef QMap<QString, QImage> ButtonMaskImageMap; | 37 | typedef QMap<QString, QImage> ButtonMaskImageMap; |
37 | 38 | ||
38 | QPixmap backgroundPixmap; | 39 | QPixmap backgroundPixmap; |
39 | QImage buttonUpImage; | 40 | QImage buttonUpImage; |
40 | QImage buttonDownImage; | 41 | QImage buttonDownImage; |
41 | QImage buttonMask; | 42 | QImage buttonMask; |
42 | ButtonMaskImageMap buttonMasks; | 43 | ButtonMaskImageMap buttonMasks; |
@@ -170,29 +171,29 @@ SkinCache::SkinCache() | |||
170 | // ... and one background pixmap | 171 | // ... and one background pixmap |
171 | m_backgroundPixmapCache.setMaxCost( 1 ); | 172 | m_backgroundPixmapCache.setMaxCost( 1 ); |
172 | } | 173 | } |
173 | 174 | ||
174 | SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &fileNameInfix ) | 175 | SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &fileNameInfix ) |
175 | { | 176 | { |
176 | QString key = skinPath + fileNameInfix; | 177 | QString key = skinPath + fileNameInfix; |
177 | 178 | ||
178 | SkinData *data = m_cache.take( key ); | 179 | SkinData *data = m_cache.take( key ); |
179 | if ( !data ) | 180 | if ( !data ) |
180 | data = new SkinData; | 181 | data = new SkinData; |
181 | else | 182 | else |
182 | odebug << "SkinCache: hit" << oendl; | 183 | odebug << "SkinCache: hit" << oendl; |
183 | 184 | ||
184 | QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath ); | 185 | QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath ); |
185 | if ( bgPixmap ) { | 186 | if ( bgPixmap ) { |
186 | odebug << "SkinCache: hit on bgpixmap" << oendl; | 187 | odebug << "SkinCache: hit on bgpixmap" << oendl; |
187 | data->backgroundPixmap = *bgPixmap; | 188 | data->backgroundPixmap = *bgPixmap; |
188 | } | 189 | } |
189 | else | 190 | else |
190 | data->backgroundPixmap = QPixmap(); | 191 | data->backgroundPixmap = QPixmap(); |
191 | 192 | ||
192 | return data; | 193 | return data; |
193 | } | 194 | } |
194 | 195 | ||
195 | void SkinCache::store( const QString &skinPath, const QString &fileNameInfix, SkinData *data ) | 196 | void SkinCache::store( const QString &skinPath, const QString &fileNameInfix, SkinData *data ) |
196 | { | 197 | { |
197 | QPixmap *backgroundPixmap = new QPixmap( data->backgroundPixmap ); | 198 | QPixmap *backgroundPixmap = new QPixmap( data->backgroundPixmap ); |
198 | 199 | ||
@@ -210,114 +211,114 @@ void SkinCache::store( const QString &skinPath, const QString &fileNameInfix, Sk | |||
210 | } | 211 | } |
211 | 212 | ||
212 | SkinLoader::IncrementalLoader::IncrementalLoader( const Info &info ) | 213 | SkinLoader::IncrementalLoader::IncrementalLoader( const Info &info ) |
213 | : m_skin( info.skinName, info.fileNameInfix ), m_info( info ) | 214 | : m_skin( info.skinName, info.fileNameInfix ), m_info( info ) |
214 | { | 215 | { |
215 | m_currentState = LoadBackgroundPixmap; | 216 | m_currentState = LoadBackgroundPixmap; |
216 | } | 217 | } |
217 | 218 | ||
218 | SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadStep() | 219 | SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadStep() |
219 | { | 220 | { |
220 | switch ( m_currentState ) { | 221 | switch ( m_currentState ) { |
221 | case LoadBackgroundPixmap: | 222 | case LoadBackgroundPixmap: |
222 | odebug << "load bgpixmap" << oendl; | 223 | odebug << "load bgpixmap" << oendl; |
223 | m_skin.backgroundPixmap(); | 224 | m_skin.backgroundPixmap(); |
224 | m_currentState = LoadButtonUpImage; | 225 | m_currentState = LoadButtonUpImage; |
225 | break; | 226 | break; |
226 | case LoadButtonUpImage: | 227 | case LoadButtonUpImage: |
227 | odebug << "load upimage" << oendl; | 228 | odebug << "load upimage" << oendl; |
228 | m_skin.buttonUpImage(); | 229 | m_skin.buttonUpImage(); |
229 | m_currentState = LoadButtonDownImage; | 230 | m_currentState = LoadButtonDownImage; |
230 | break; | 231 | break; |
231 | case LoadButtonDownImage: | 232 | case LoadButtonDownImage: |
232 | odebug << "load downimage" << oendl; | 233 | odebug << "load downimage" << oendl; |
233 | m_skin.buttonDownImage(); | 234 | m_skin.buttonDownImage(); |
234 | m_currentState = LoadButtonMasks; | 235 | m_currentState = LoadButtonMasks; |
235 | m_currentButton = 0; | 236 | m_currentButton = 0; |
236 | break; | 237 | break; |
237 | case LoadButtonMasks: | 238 | case LoadButtonMasks: |
238 | odebug << "load button masks " << m_currentButton << "" << oendl; | 239 | odebug << "load button masks " << m_currentButton << "" << oendl; |
239 | m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName ); | 240 | m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName ); |
240 | 241 | ||
241 | m_currentButton++; | 242 | m_currentButton++; |
242 | if ( m_currentButton >= m_info.buttonCount ) | 243 | if ( m_currentButton >= m_info.buttonCount ) |
243 | m_currentState = LoadButtonMask; | 244 | m_currentState = LoadButtonMask; |
244 | 245 | ||
245 | break; | 246 | break; |
246 | case LoadButtonMask: | 247 | case LoadButtonMask: |
247 | odebug << "load whole mask" << oendl; | 248 | odebug << "load whole mask" << oendl; |
248 | m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount ); | 249 | m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount ); |
249 | return LoadingCompleted; | 250 | return LoadingCompleted; |
250 | } | 251 | } |
251 | 252 | ||
252 | return MoreToCome; | 253 | return MoreToCome; |
253 | } | 254 | } |
254 | 255 | ||
255 | SkinLoader::SkinLoader() | 256 | SkinLoader::SkinLoader() |
256 | : m_currentLoader( 0 ), m_timerId( -1 ) | 257 | : m_currentLoader( 0 ), m_timerId( -1 ) |
257 | { | 258 | { |
258 | } | 259 | } |
259 | 260 | ||
260 | SkinLoader::~SkinLoader() | 261 | SkinLoader::~SkinLoader() |
261 | { | 262 | { |
262 | odebug << "SkinLoader::~SkinLoader()" << oendl; | 263 | Global::statusMessage( tr( "Loading of Skin finished" ) ); |
263 | killTimers(); | 264 | killTimers(); |
264 | delete m_currentLoader; | 265 | delete m_currentLoader; |
265 | } | 266 | } |
266 | 267 | ||
267 | void SkinLoader::schedule( const MediaWidget::GUIInfo &guiInfo ) | 268 | void SkinLoader::schedule( const MediaWidget::GUIInfo &guiInfo ) |
268 | { | 269 | { |
269 | schedule( Skin::defaultSkinName(), guiInfo ); | 270 | schedule( Skin::defaultSkinName(), guiInfo ); |
270 | } | 271 | } |
271 | 272 | ||
272 | void SkinLoader::schedule( const QString &skinName, const MediaWidget::GUIInfo &guiInfo ) | 273 | void SkinLoader::schedule( const QString &skinName, const MediaWidget::GUIInfo &guiInfo ) |
273 | { | 274 | { |
274 | pendingSkins << Info( skinName, guiInfo ); | 275 | pendingSkins << Info( skinName, guiInfo ); |
275 | } | 276 | } |
276 | 277 | ||
277 | void SkinLoader::start() | 278 | void SkinLoader::start() |
278 | { | 279 | { |
279 | assert( m_timerId == -1 ); | 280 | assert( m_timerId == -1 ); |
280 | m_timerId = startTimer( 100 /* ms */ ); | 281 | m_timerId = startTimer( 100 /* ms */ ); |
281 | odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; | 282 | odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; |
282 | } | 283 | } |
283 | 284 | ||
284 | void SkinLoader::timerEvent( QTimerEvent *ev ) | 285 | void SkinLoader::timerEvent( QTimerEvent *ev ) |
285 | { | 286 | { |
286 | if ( ev->timerId() != m_timerId ) { | 287 | if ( ev->timerId() != m_timerId ) { |
287 | QObject::timerEvent( ev ); | 288 | QObject::timerEvent( ev ); |
288 | return; | 289 | return; |
289 | } | 290 | } |
290 | 291 | ||
291 | if ( !m_currentLoader ) { | 292 | if ( !m_currentLoader ) { |
292 | 293 | ||
293 | if ( pendingSkins.isEmpty() ) { | 294 | if ( pendingSkins.isEmpty() ) { |
294 | odebug << "all jobs done" << oendl; | 295 | odebug << "all jobs done" << oendl; |
295 | killTimer( m_timerId ); | 296 | killTimer( m_timerId ); |
296 | m_timerId = -1; | 297 | m_timerId = -1; |
297 | // ### qt3: use deleteLater(); | 298 | // ### qt3: use deleteLater(); |
298 | QTimer::singleShot( 0, this, SLOT( deleteMe() ) ); | 299 | QTimer::singleShot( 0, this, SLOT( deleteMe() ) ); |
299 | return; | 300 | return; |
300 | } | 301 | } |
301 | 302 | ||
302 | Info nfo = *pendingSkins.begin(); | 303 | Info nfo = *pendingSkins.begin(); |
303 | pendingSkins.remove( pendingSkins.begin() ); | 304 | pendingSkins.remove( pendingSkins.begin() ); |
304 | 305 | ||
305 | m_currentLoader = new IncrementalLoader( nfo ); | 306 | m_currentLoader = new IncrementalLoader( nfo ); |
306 | odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl; | 307 | odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl; |
307 | } | 308 | } |
308 | 309 | ||
309 | if ( m_currentLoader->loadStep() == IncrementalLoader::LoadingCompleted ) { | 310 | if ( m_currentLoader->loadStep() == IncrementalLoader::LoadingCompleted ) { |
310 | delete m_currentLoader; | 311 | delete m_currentLoader; |
311 | m_currentLoader = 0; | 312 | m_currentLoader = 0; |
312 | } | 313 | } |
313 | 314 | ||
314 | odebug << "finished step" << oendl; | 315 | odebug << "finished step" << oendl; |
315 | } | 316 | } |
316 | 317 | ||
317 | void SkinLoader::deleteMe() | 318 | void SkinLoader::deleteMe() |
318 | { | 319 | { |
319 | delete this; | 320 | delete this; |
320 | } | 321 | } |
321 | 322 | ||
322 | /* vim: et sw=4 ts=4 | 323 | /* vim: et sw=4 ts=4 |
323 | */ | 324 | */ |