summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-11 01:24:05 (UTC)
committer simon <simon>2002-12-11 01:24:05 (UTC)
commit3ec7f32d0924c737664a6ad4dfb43dc3c20605d0 (patch) (side-by-side diff)
treebb9a9dcef582754293be5e1f7367c64e178c8243
parentd67ad1a6ef93d358beab268153cf2b0694e5f633 (diff)
downloadopie-3ec7f32d0924c737664a6ad4dfb43dc3c20605d0.zip
opie-3ec7f32d0924c737664a6ad4dfb43dc3c20605d0.tar.gz
opie-3ec7f32d0924c737664a6ad4dfb43dc3c20605d0.tar.bz2
- make more use of the Resource::* api for loading the data
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index c9d7db8..865ff91 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -69,13 +69,13 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo,
return button;
}
QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fileName )
{
- QBitmap mask( fileName );
+ QBitmap mask( Resource::findPixmap( fileName ) );
if ( mask.isNull() )
return mask;
QImage imgMask = mask.convertToImage();
uchar **dest = buttonMask.jumpTable();
for ( int y = 0; y < buttonMask.height(); y++ ) {
@@ -102,13 +102,13 @@ void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, co
QString skinPath = "opieplayer2/skins/" + name;
backgroundPixmap = QPixmap( Resource::loadPixmap( QString( "%1/background" ).arg( skinPath ) ) );
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 ) ) );
setupButtons( skinInfo, buttonCount,
- QPEApplication::qpeDir() + "/pics/" + skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( fileNameInfix ), buttonUpImage.size() );
+ skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( fileNameInfix ), buttonUpImage.size() );
}
void MediaWidget::closeEvent( QCloseEvent * )
{
mediaPlayerState.setList();
}