Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 23d12ec..fd18dbb 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -96,36 +96,13 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye QString skinPath = "opieplayer2/skins/" + skin; backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); - buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); - buttonMask.fill( 0 ); - - for ( uint i = 0; i < buttonCount; i++ ) { - Button button; - button.command = skinInfo[ i ].command; - button.type = skinInfo[ i ].type; - - QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); - button.mask =QBitmap( filename ); - - if ( !button.mask.isNull() ) { - QImage imgMask = button.mask.convertToImage(); - uchar **dest = buttonMask.jumpTable(); - for ( int y = 0; y < imgUp.height(); y++ ) { - uchar *line = dest[y]; - for ( int x = 0; x < imgUp.width(); x++ ) - if ( !qRed( imgMask.pixel( x, y ) ) ) - line[x] = button.command + 1; - } - } - - buttons.push_back( button ); - } + setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", imgUp.size() ); setBackgroundPixmap( backgroundPixmap ); songInfo.setFocusPolicy( QWidget::NoFocus ); // changeTextColor( &songInfo ); // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); |