Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 5 |
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 QString skinPath = "opieplayer2/skins/" + name; backgroundPixmap = skin.backgroundImage(); - buttonUpImage = QImage( Resource::loadImage( QString( "%1/skin%2_up" ).arg( skinPath ).arg( fileNameInfix ) ) ); - buttonDownImage = QImage( Resource::loadImage( QString( "%1/skin%2_down" ).arg( skinPath ).arg( fileNameInfix ) ) ); + buttonUpImage = skin.buttonUpImage(); + buttonDownImage = skin.buttonDownImage(); setupButtons( skinInfo, buttonCount, 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 return QImage( Resource::findPixmap( QString( "%1/background" ).arg( m_skinPath ) ) ); } +QImage Skin::buttonUpImage() const +{ + return QImage( Resource::findPixmap( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) ); +} + +QImage Skin::buttonDownImage() const +{ + return QImage( Resource::findPixmap( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) ); +} + /* vim: et sw=4 ts=4 */ 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: Skin( const QString &name, const QString &fileNameInfix ); QImage backgroundImage() const; + QImage buttonUpImage() const; + QImage buttonDownImage() const; private: QString m_name; QString m_fileNameInfix; QString m_skinPath; + + Skin( const Skin & ); + Skin &operator=( const Skin & ); }; #endif // SKIN_H |