-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index d6f4080..a8f4ae9 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp | |||
@@ -73,40 +73,32 @@ Skin::Skin( const QString &fileNameInfix ) | |||
73 | : m_fileNameInfix( fileNameInfix ) | 73 | : m_fileNameInfix( fileNameInfix ) |
74 | { | 74 | { |
75 | init( defaultSkinName() ); | 75 | init( defaultSkinName() ); |
76 | } | 76 | } |
77 | 77 | ||
78 | Skin::~Skin() | 78 | Skin::~Skin() |
79 | { | 79 | { |
80 | SkinCache::self().store( m_skinPath, m_fileNameInfix, d ); | 80 | SkinCache::self().store( m_skinPath, m_fileNameInfix, d ); |
81 | } | 81 | } |
82 | 82 | ||
83 | void Skin::init( const QString &name ) | 83 | void Skin::init( const QString &name ) |
84 | { | 84 | { |
85 | m_skinPath = "opieplayer2/skins/" + name; | 85 | m_skinPath = "opieplayer2/skins/" + name; |
86 | d = SkinCache::self().lookupAndTake( m_skinPath, m_fileNameInfix ); | 86 | d = SkinCache::self().lookupAndTake( m_skinPath, m_fileNameInfix ); |
87 | } | 87 | } |
88 | 88 | ||
89 | void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) | ||
90 | { | ||
91 | backgroundPixmap(); | ||
92 | buttonUpImage(); | ||
93 | buttonDownImage(); | ||
94 | ( void )buttonMask( skinButtonInfo, buttonCount ); | ||
95 | } | ||
96 | |||
97 | QPixmap Skin::backgroundPixmap() const | 89 | QPixmap Skin::backgroundPixmap() const |
98 | { | 90 | { |
99 | if ( d->backgroundPixmap.isNull() ) | 91 | if ( d->backgroundPixmap.isNull() ) |
100 | d->backgroundPixmap = loadImage( QString( "%1/background" ).arg( m_skinPath ) ); | 92 | d->backgroundPixmap = loadImage( QString( "%1/background" ).arg( m_skinPath ) ); |
101 | return d->backgroundPixmap; | 93 | return d->backgroundPixmap; |
102 | } | 94 | } |
103 | 95 | ||
104 | QImage Skin::buttonUpImage() const | 96 | QImage Skin::buttonUpImage() const |
105 | { | 97 | { |
106 | if ( d->buttonUpImage.isNull() ) | 98 | if ( d->buttonUpImage.isNull() ) |
107 | d->buttonUpImage = loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); | 99 | d->buttonUpImage = loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); |
108 | return d->buttonUpImage; | 100 | return d->buttonUpImage; |
109 | } | 101 | } |
110 | 102 | ||
111 | QImage Skin::buttonDownImage() const | 103 | QImage Skin::buttonDownImage() const |
112 | { | 104 | { |
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h index 90062c2..bafebd3 100644 --- a/noncore/multimedia/opieplayer2/skin.h +++ b/noncore/multimedia/opieplayer2/skin.h | |||
@@ -25,34 +25,32 @@ | |||
25 | 25 | ||
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <qimage.h> | 27 | #include <qimage.h> |
28 | #include <qobject.h> | 28 | #include <qobject.h> |
29 | 29 | ||
30 | #include "mediawidget.h" | 30 | #include "mediawidget.h" |
31 | 31 | ||
32 | struct SkinData; | 32 | struct SkinData; |
33 | 33 | ||
34 | class Skin | 34 | class Skin |
35 | { | 35 | { |
36 | public: | 36 | public: |
37 | Skin( const QString &name, const QString &fileNameInfix ); | 37 | Skin( const QString &name, const QString &fileNameInfix ); |
38 | Skin( const QString &fileNameInfix ); | 38 | Skin( const QString &fileNameInfix ); |
39 | ~Skin(); | 39 | ~Skin(); |
40 | 40 | ||
41 | void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ); | ||
42 | |||
43 | QPixmap backgroundPixmap() const; | 41 | QPixmap backgroundPixmap() const; |
44 | QImage buttonUpImage() const; | 42 | QImage buttonUpImage() const; |
45 | QImage buttonDownImage() const; | 43 | QImage buttonDownImage() const; |
46 | 44 | ||
47 | QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const; | 45 | QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const; |
48 | 46 | ||
49 | QImage buttonMaskImage( const QString &fileName ) const; | 47 | QImage buttonMaskImage( const QString &fileName ) const; |
50 | 48 | ||
51 | static QString defaultSkinName(); | 49 | static QString defaultSkinName(); |
52 | 50 | ||
53 | private: | 51 | private: |
54 | void init( const QString &name ); | 52 | void init( const QString &name ); |
55 | 53 | ||
56 | void addButtonToMask( int tag, const QImage &maskImage ) const; | 54 | void addButtonToMask( int tag, const QImage &maskImage ) const; |
57 | 55 | ||
58 | static QImage loadImage( const QString &fileName ); | 56 | static QImage loadImage( const QString &fileName ); |