summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/skin.h5
3 files changed, 17 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 617e0fe..2031b4d 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -105,8 +105,8 @@ void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, co
105 105
106 QString skinPath = "opieplayer2/skins/" + name; 106 QString skinPath = "opieplayer2/skins/" + name;
107 backgroundPixmap = skin.backgroundImage(); 107 backgroundPixmap = skin.backgroundImage();
108 buttonUpImage = QImage( Resource::loadImage( QString( "%1/skin%2_up" ).arg( skinPath ).arg( fileNameInfix ) ) ); 108 buttonUpImage = skin.buttonUpImage();
109 buttonDownImage = QImage( Resource::loadImage( QString( "%1/skin%2_down" ).arg( skinPath ).arg( fileNameInfix ) ) ); 109 buttonDownImage = skin.buttonDownImage();
110 110
111 setupButtons( skinInfo, buttonCount, 111 setupButtons( skinInfo, buttonCount,
112 skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( fileNameInfix ), buttonUpImage.size() ); 112 skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( fileNameInfix ), buttonUpImage.size() );
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 097b29a..352368f 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -14,5 +14,15 @@ QImage Skin::backgroundImage() const
14 return QImage( Resource::findPixmap( QString( "%1/background" ).arg( m_skinPath ) ) ); 14 return QImage( Resource::findPixmap( QString( "%1/background" ).arg( m_skinPath ) ) );
15} 15}
16 16
17QImage Skin::buttonUpImage() const
18{
19 return QImage( Resource::findPixmap( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) );
20}
21
22QImage Skin::buttonDownImage() const
23{
24 return QImage( Resource::findPixmap( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) );
25}
26
17/* vim: et sw=4 ts=4 27/* vim: et sw=4 ts=4
18 */ 28 */
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 3c09e43..85f9e57 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -10,11 +10,16 @@ public:
10 Skin( const QString &name, const QString &fileNameInfix ); 10 Skin( const QString &name, const QString &fileNameInfix );
11 11
12 QImage backgroundImage() const; 12 QImage backgroundImage() const;
13 QImage buttonUpImage() const;
14 QImage buttonDownImage() const;
13 15
14private: 16private:
15 QString m_name; 17 QString m_name;
16 QString m_fileNameInfix; 18 QString m_fileNameInfix;
17 QString m_skinPath; 19 QString m_skinPath;
20
21 Skin( const Skin & );
22 Skin &operator=( const Skin & );
18}; 23};
19 24
20#endif // SKIN_H 25#endif // SKIN_H