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, 10 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 6e9c14a..87e06ee 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -99,46 +99,41 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
99 | skin = cfg.readEntry("Skin","default"); | 99 | skin = cfg.readEntry("Skin","default"); |
100 | //skin = "scaleTest"; | 100 | //skin = "scaleTest"; |
101 | // color of background, frame, degree of transparency | 101 | // color of background, frame, degree of transparency |
102 | 102 | ||
103 | QString skinPath = "opieplayer2/skins/" + skin; | 103 | QString skinPath = "opieplayer2/skins/" + skin; |
104 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 104 | pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
105 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | 105 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); |
106 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | 106 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); |
107 | 107 | ||
108 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); | 108 | buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); |
109 | buttonMask.fill( 0 ); | 109 | buttonMask.fill( 0 ); |
110 | 110 | ||
111 | masks.reserve( buttonCount ); | 111 | for ( uint i = 0; i < buttons.size(); i++ ) { |
112 | |||
113 | for ( uint i = 0; i < masks.capacity(); i++ ) { | ||
114 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); | 112 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" ); |
115 | masks.push_back( QBitmap( filename ) ); | 113 | buttons[ i ].mask =QBitmap( filename ); |
116 | 114 | ||
117 | if ( !masks[i].isNull() ) { | 115 | if ( !buttons[i].mask.isNull() ) { |
118 | QImage imgMask = masks[i].convertToImage(); | 116 | QImage imgMask = buttons[i].mask.convertToImage(); |
119 | uchar **dest = buttonMask.jumpTable(); | 117 | uchar **dest = buttonMask.jumpTable(); |
120 | for ( int y = 0; y < imgUp.height(); y++ ) { | 118 | for ( int y = 0; y < imgUp.height(); y++ ) { |
121 | uchar *line = dest[y]; | 119 | uchar *line = dest[y]; |
122 | for ( int x = 0; x < imgUp.width(); x++ ) | 120 | for ( int x = 0; x < imgUp.width(); x++ ) |
123 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 121 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
124 | line[x] = i + 1; | 122 | line[x] = i + 1; |
125 | } | 123 | } |
126 | } | 124 | } |
127 | 125 | ||
128 | } | 126 | } |
129 | 127 | ||
130 | buttonPixUp.resize( masks.size(), QPixmap() ); | ||
131 | buttonPixDown.resize( masks.size(), QPixmap() ); | ||
132 | |||
133 | setBackgroundPixmap( pixBg ); | 128 | setBackgroundPixmap( pixBg ); |
134 | 129 | ||
135 | songInfo.setFocusPolicy( QWidget::NoFocus ); | 130 | songInfo.setFocusPolicy( QWidget::NoFocus ); |
136 | // changeTextColor( &songInfo ); | 131 | // changeTextColor( &songInfo ); |
137 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); | 132 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); |
138 | // songInfo.setFrameStyle( QFrame::NoFrame); | 133 | // songInfo.setFrameStyle( QFrame::NoFrame); |
139 | songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); | 134 | songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); |
140 | // songInfo.setForegroundColor(Qt::white); | 135 | // songInfo.setForegroundColor(Qt::white); |
141 | 136 | ||
142 | slider.setFixedHeight( 20 ); | 137 | slider.setFixedHeight( 20 ); |
143 | slider.setMinValue( 0 ); | 138 | slider.setMinValue( 0 ); |
144 | slider.setMaxValue( 1 ); | 139 | slider.setMaxValue( 1 ); |
@@ -206,28 +201,28 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
206 | slider.setFixedWidth( w - 110 ); | 201 | slider.setFixedWidth( w - 110 ); |
207 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); | 202 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
208 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); | 203 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); |
209 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); | 204 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); |
210 | 205 | ||
211 | upperLeftOfButtonMask.rx() = ( w - imgUp.width() ) / 2; | 206 | upperLeftOfButtonMask.rx() = ( w - imgUp.width() ) / 2; |
212 | upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; | 207 | upperLeftOfButtonMask.ry() = (( h - imgUp.height() ) / 2) - 10; |
213 | QPoint p = upperLeftOfButtonMask; | 208 | QPoint p = upperLeftOfButtonMask; |
214 | 209 | ||
215 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); | 210 | QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); |
216 | QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); | 211 | QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); |
217 | 212 | ||
218 | for ( uint i = 0; i < masks.size(); i++ ) { | 213 | for ( uint i = 0; i < buttons.size(); i++ ) { |
219 | if ( !masks[i].isNull() ) { | 214 | if ( !buttons[i].mask.isNull() ) { |
220 | buttonPixUp[i] = maskPixToMask( pixUp, masks[i] ); | 215 | buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask ); |
221 | buttonPixDown[i] = maskPixToMask( pixDn, masks[i] ); | 216 | buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask ); |
222 | } | 217 | } |
223 | } | 218 | } |
224 | } | 219 | } |
225 | 220 | ||
226 | void AudioWidget::sliderPressed() { | 221 | void AudioWidget::sliderPressed() { |
227 | audioSliderBeingMoved = TRUE; | 222 | audioSliderBeingMoved = TRUE; |
228 | } | 223 | } |
229 | 224 | ||
230 | 225 | ||
231 | void AudioWidget::sliderReleased() { | 226 | void AudioWidget::sliderReleased() { |
232 | audioSliderBeingMoved = FALSE; | 227 | audioSliderBeingMoved = FALSE; |
233 | if ( slider.width() == 0 ) | 228 | if ( slider.width() == 0 ) |
@@ -313,27 +308,27 @@ void AudioWidget::updateSlider( long i, long max ) { | |||
313 | } | 308 | } |
314 | 309 | ||
315 | 310 | ||
316 | void AudioWidget::setToggleButton( int i, bool down ) { | 311 | void AudioWidget::setToggleButton( int i, bool down ) { |
317 | qDebug("setToggleButton %d", i); | 312 | qDebug("setToggleButton %d", i); |
318 | if ( down != buttons[i].isDown ) { | 313 | if ( down != buttons[i].isDown ) { |
319 | toggleButton( i ); | 314 | toggleButton( i ); |
320 | } | 315 | } |
321 | } | 316 | } |
322 | 317 | ||
323 | void AudioWidget::paintButton( QPainter &p, int i ) { | 318 | void AudioWidget::paintButton( QPainter &p, int i ) { |
324 | if ( buttons[i].isDown ) { | 319 | if ( buttons[i].isDown ) { |
325 | p.drawPixmap( upperLeftOfButtonMask, buttonPixDown[i] ); | 320 | p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixDown ); |
326 | } else { | 321 | } else { |
327 | p.drawPixmap( upperLeftOfButtonMask, buttonPixUp[i] ); | 322 | p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixUp ); |
328 | } | 323 | } |
329 | } | 324 | } |
330 | 325 | ||
331 | 326 | ||
332 | void AudioWidget::skipFor() { | 327 | void AudioWidget::skipFor() { |
333 | skipDirection = +1; | 328 | skipDirection = +1; |
334 | startTimer( 50 ); | 329 | startTimer( 50 ); |
335 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); | 330 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); |
336 | } | 331 | } |
337 | 332 | ||
338 | void AudioWidget::skipBack() { | 333 | void AudioWidget::skipBack() { |
339 | skipDirection = -1; | 334 | skipDirection = -1; |