summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 14:41:19 (UTC)
committer simon <simon>2002-12-09 14:41:19 (UTC)
commit174c4a427750a3829ffd81a87454be8abf61ee30 (patch) (side-by-side diff)
treee6b8d73afe4426707698396cc3c0086d712983f9
parent3f88070b9be5209cdd88caa0afd7f7294d3b1764 (diff)
downloadopie-174c4a427750a3829ffd81a87454be8abf61ee30.zip
opie-174c4a427750a3829ffd81a87454be8abf61ee30.tar.gz
opie-174c4a427750a3829ffd81a87454be8abf61ee30.tar.bz2
- merged the two button setup loops
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 87e06ee..c148820 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -86,12 +86,6 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ),
audioSliderBeingMoved( false )
{
- for ( uint i = 0; i < buttonCount; ++i ) {
- Button button;
- button.type = skinInfo[ i ].type;
- buttons.push_back( button );
- }
-
setCaption( tr("OpiePlayer") );
Config cfg("OpiePlayer");
@@ -108,12 +102,15 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 );
buttonMask.fill( 0 );
- for ( uint i = 0; i < buttons.size(); i++ ) {
+ for ( uint i = 0; i < buttonCount; i++ ) {
+ Button button;
+ button.type = skinInfo[ i ].type;
+
QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" );
- buttons[ i ].mask =QBitmap( filename );
+ button.mask =QBitmap( filename );
- if ( !buttons[i].mask.isNull() ) {
- QImage imgMask = buttons[i].mask.convertToImage();
+ 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];
@@ -123,6 +120,7 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
}
}
+ buttons.push_back( button );
}
setBackgroundPixmap( pixBg );