author | simon <simon> | 2002-12-11 12:34:12 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 12:34:12 (UTC) |
commit | 6f5e269efd9d6a5910251ce26750134e841f7b14 (patch) (unidiff) | |
tree | dce5253f8007272eae4260dbf4b75e5ef451e553 /noncore | |
parent | d24ad11763335834718485f14e90d8dab2611fa2 (diff) | |
download | opie-6f5e269efd9d6a5910251ce26750134e841f7b14.zip opie-6f5e269efd9d6a5910251ce26750134e841f7b14.tar.gz opie-6f5e269efd9d6a5910251ce26750134e841f7b14.tar.bz2 |
- starting with skin preloading
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 27 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 12 |
2 files changed, 35 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index fb1c9c4..7d05d80 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp | |||
@@ -11,5 +11,16 @@ Skin::Skin( const QString &name, const QString &fileNameInfix ) | |||
11 | 11 | ||
12 | void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) | ||
13 | { | ||
14 | backgroundImage(); | ||
15 | buttonUpImage(); | ||
16 | buttonDownImage(); | ||
17 | for ( uint i = 0; i < buttonCount; ++i ) | ||
18 | ( void )buttonMaskImage( skinButtonInfo[ i ].fileName ); | ||
19 | } | ||
20 | |||
12 | QImage Skin::backgroundImage() const | 21 | QImage Skin::backgroundImage() const |
13 | { | 22 | { |
14 | return QImage( Resource::findPixmap( QString( "%1/background" ).arg( m_skinPath ) ) ); | 23 | if ( m_backgroundImage.isNull() ) |
24 | m_backgroundImage = QImage( Resource::findPixmap( QString( "%1/background" ).arg( m_skinPath ) ) ); | ||
25 | return m_backgroundImage; | ||
15 | } | 26 | } |
@@ -18,3 +29,5 @@ QImage Skin::buttonUpImage() const | |||
18 | { | 29 | { |
19 | return QImage( Resource::findPixmap( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) ); | 30 | if ( m_buttonUpImage.isNull() ) |
31 | m_buttonUpImage = QImage( Resource::findPixmap( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) ); | ||
32 | return m_buttonUpImage; | ||
20 | } | 33 | } |
@@ -23,3 +36,5 @@ QImage Skin::buttonDownImage() const | |||
23 | { | 36 | { |
24 | return QImage( Resource::findPixmap( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) ); | 37 | if ( m_buttonDownImage.isNull() ) |
38 | m_buttonDownImage = QImage( Resource::findPixmap( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) ); | ||
39 | return m_buttonDownImage; | ||
25 | } | 40 | } |
@@ -28,5 +43,9 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const | |||
28 | { | 43 | { |
44 | ButtonMaskImageMap::Iterator it = m_buttonMasks.find( fileName ); | ||
45 | if ( it == m_buttonMasks.end() ) { | ||
29 | QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix ); | 46 | QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix ); |
30 | QString path = prefix + fileName + ".png"; | 47 | QString path = prefix + fileName + ".png"; |
31 | return QImage( Resource::findPixmap( path ) ); | 48 | it = m_buttonMasks.insert( fileName, QImage( Resource::findPixmap( path ) ) ); |
49 | } | ||
50 | return *it; | ||
32 | } | 51 | } |
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h index f160b3c..9276a5b 100644 --- a/noncore/multimedia/opieplayer2/skin.h +++ b/noncore/multimedia/opieplayer2/skin.h | |||
@@ -5,2 +5,5 @@ | |||
5 | #include <qimage.h> | 5 | #include <qimage.h> |
6 | #include <qmap.h> | ||
7 | |||
8 | #include "mediawidget.h" | ||
6 | 9 | ||
@@ -11,2 +14,4 @@ public: | |||
11 | 14 | ||
15 | void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ); | ||
16 | |||
12 | QImage backgroundImage() const; | 17 | QImage backgroundImage() const; |
@@ -22,2 +27,9 @@ private: | |||
22 | 27 | ||
28 | typedef QMap<QString, QImage> ButtonMaskImageMap; | ||
29 | |||
30 | mutable QImage m_backgroundImage; | ||
31 | mutable QImage m_buttonUpImage; | ||
32 | mutable QImage m_buttonDownImage; | ||
33 | mutable ButtonMaskImageMap m_buttonMasks; | ||
34 | |||
23 | Skin( const Skin & ); | 35 | Skin( const Skin & ); |