summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-24 15:10:31 (UTC)
committer zecke <zecke>2004-09-24 15:10:31 (UTC)
commit5ec51a8bb49a0a668bb2d7ab652a1a1e776a0e42 (patch) (side-by-side diff)
tree6be2b6e609bac292dcd7dae2d7e79b3a454a835f
parent8e903cd3ea735adf066e156462602987691a4c69 (diff)
downloadopie-5ec51a8bb49a0a668bb2d7ab652a1a1e776a0e42.zip
opie-5ec51a8bb49a0a668bb2d7ab652a1a1e776a0e42.tar.gz
opie-5ec51a8bb49a0a668bb2d7ab652a1a1e776a0e42.tar.bz2
Give Status for Sking Loading and Finishing Loading
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp25
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
@@ -27,8 +27,9 @@
#include <qcache.h>
#include <qtimer.h>
#include <qpe/config.h>
+#include <qpe/global.h>
#include <assert.h>
struct SkinData
@@ -178,13 +179,13 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file
SkinData *data = m_cache.take( key );
if ( !data )
data = new SkinData;
else
- odebug << "SkinCache: hit" << oendl;
+ odebug << "SkinCache: hit" << oendl;
QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath );
if ( bgPixmap ) {
- odebug << "SkinCache: hit on bgpixmap" << oendl;
+ odebug << "SkinCache: hit on bgpixmap" << oendl;
data->backgroundPixmap = *bgPixmap;
}
else
data->backgroundPixmap = QPixmap();
@@ -218,34 +219,34 @@ SkinLoader::IncrementalLoader::IncrementalLoader( const Info &info )
SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadStep()
{
switch ( m_currentState ) {
case LoadBackgroundPixmap:
- odebug << "load bgpixmap" << oendl;
+ odebug << "load bgpixmap" << oendl;
m_skin.backgroundPixmap();
m_currentState = LoadButtonUpImage;
break;
case LoadButtonUpImage:
- odebug << "load upimage" << oendl;
+ odebug << "load upimage" << oendl;
m_skin.buttonUpImage();
m_currentState = LoadButtonDownImage;
break;
case LoadButtonDownImage:
- odebug << "load downimage" << oendl;
+ odebug << "load downimage" << oendl;
m_skin.buttonDownImage();
m_currentState = LoadButtonMasks;
m_currentButton = 0;
break;
case LoadButtonMasks:
- odebug << "load button masks " << m_currentButton << "" << oendl;
+ odebug << "load button masks " << m_currentButton << "" << oendl;
m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName );
m_currentButton++;
if ( m_currentButton >= m_info.buttonCount )
m_currentState = LoadButtonMask;
break;
case LoadButtonMask:
- odebug << "load whole mask" << oendl;
+ odebug << "load whole mask" << oendl;
m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount );
return LoadingCompleted;
}
@@ -258,9 +259,9 @@ SkinLoader::SkinLoader()
}
SkinLoader::~SkinLoader()
{
- odebug << "SkinLoader::~SkinLoader()" << oendl;
+ Global::statusMessage( tr( "Loading of Skin finished" ) );
killTimers();
delete m_currentLoader;
}
@@ -277,9 +278,9 @@ void SkinLoader::schedule( const QString &skinName, const MediaWidget::GUIInfo &
void SkinLoader::start()
{
assert( m_timerId == -1 );
m_timerId = startTimer( 100 /* ms */ );
- odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl;
+ odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl;
}
void SkinLoader::timerEvent( QTimerEvent *ev )
{
@@ -290,9 +291,9 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
if ( !m_currentLoader ) {
if ( pendingSkins.isEmpty() ) {
- odebug << "all jobs done" << oendl;
+ odebug << "all jobs done" << oendl;
killTimer( m_timerId );
m_timerId = -1;
// ### qt3: use deleteLater();
QTimer::singleShot( 0, this, SLOT( deleteMe() ) );
@@ -302,17 +303,17 @@ void SkinLoader::timerEvent( QTimerEvent *ev )
Info nfo = *pendingSkins.begin();
pendingSkins.remove( pendingSkins.begin() );
m_currentLoader = new IncrementalLoader( nfo );
- odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl;
+ odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl;
}
if ( m_currentLoader->loadStep() == IncrementalLoader::LoadingCompleted ) {
delete m_currentLoader;
m_currentLoader = 0;
}
- odebug << "finished step" << oendl;
+ odebug << "finished step" << oendl;
}
void SkinLoader::deleteMe()
{