-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 3 |
1 files changed, 2 insertions, 1 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; |
@@ -250,25 +251,25 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS | |||
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 ); |