- more image loading functionality moved to the Skin class

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
@@ -107,4 +107,4 @@ void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, co
     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();
 
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
@@ -16,2 +16,12 @@ QImage Skin::backgroundImage() const
 
+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
@@ -12,2 +12,4 @@ public:
     QImage backgroundImage() const;
+    QImage buttonUpImage() const;
+    QImage buttonDownImage() const;
 
@@ -17,2 +19,5 @@ private:
     QString m_skinPath;
+
+    Skin( const Skin & );
+    Skin &operator=( const Skin & );
 };