Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 8fe572f..238770b 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -98,13 +98,13 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
98 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); | 98 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); |
99 | imgButtonMask->fill( 0 ); | 99 | imgButtonMask->fill( 0 ); |
100 | 100 | ||
101 | for ( int i = 0; i < 7; i++ ) { | 101 | for ( int i = 0; i < 7; i++ ) { |
102 | QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png"; | 102 | QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png"; |
103 | masks[i] = new QBitmap( filename ); | 103 | masks[i] = new QBitmap( filename ); |
104 | qDebug(filename); | 104 | |
105 | if ( !masks[i]->isNull() ) { | 105 | if ( !masks[i]->isNull() ) { |
106 | QImage imgMask = masks[i]->convertToImage(); | 106 | QImage imgMask = masks[i]->convertToImage(); |
107 | uchar **dest = imgButtonMask->jumpTable(); | 107 | uchar **dest = imgButtonMask->jumpTable(); |
108 | for ( int y = 0; y < imgUp->height(); y++ ) { | 108 | for ( int y = 0; y < imgUp->height(); y++ ) { |
109 | uchar *line = dest[y]; | 109 | uchar *line = dest[y]; |
110 | for ( int x = 0; x < imgUp->width(); x++ ) { | 110 | for ( int x = 0; x < imgUp->width(); x++ ) { |
@@ -176,28 +176,24 @@ QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) { | |||
176 | } | 176 | } |
177 | 177 | ||
178 | void VideoWidget::resizeEvent( QResizeEvent * ) { | 178 | void VideoWidget::resizeEvent( QResizeEvent * ) { |
179 | int h = height(); | 179 | int h = height(); |
180 | int w = width(); | 180 | int w = width(); |
181 | int Vh = 160; | 181 | int Vh = 160; |
182 | //videoFrame->height(); | ||
183 | int Vw = 220; | 182 | int Vw = 220; |
184 | //videoFrame->width(); | ||
185 | |||
186 | 183 | ||
187 | slider->setFixedWidth( w - 20 ); | 184 | slider->setFixedWidth( w - 20 ); |
188 | slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) ); | 185 | slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) ); |
189 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); | 186 | slider->setBackgroundOrigin( QWidget::ParentOrigin ); |
190 | slider->setFocusPolicy( QWidget::NoFocus ); | 187 | slider->setFocusPolicy( QWidget::NoFocus ); |
191 | slider->setBackgroundPixmap( *pixBg ); | 188 | slider->setBackgroundPixmap( *pixBg ); |
192 | 189 | ||
193 | xoff = 0;// ( imgUp->width() ) / 2; | 190 | xoff = 0;// ( imgUp->width() ) / 2; |
194 | yoff = 180;//(( Vh - imgUp->height() ) / 2) - 10; | 191 | yoff = 185;//(( Vh - imgUp->height() ) / 2) - 10; |
195 | QPoint p( xoff, yoff ); | 192 | QPoint p( xoff, yoff ); |
196 | 193 | ||
197 | |||
198 | QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p ); | 194 | QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p ); |
199 | QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p ); | 195 | QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p ); |
200 | 196 | ||
201 | for ( int i = 0; i < 7; i++ ) { | 197 | for ( int i = 0; i < 7; i++ ) { |
202 | if ( !masks[i]->isNull() ) { | 198 | if ( !masks[i]->isNull() ) { |
203 | delete buttonPixUp[i]; | 199 | delete buttonPixUp[i]; |
@@ -456,20 +452,20 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | |||
456 | mediaPlayerState->setPlaying(TRUE); | 452 | mediaPlayerState->setPlaying(TRUE); |
457 | } | 453 | } |
458 | } | 454 | } |
459 | break; | 455 | break; |
460 | case Key_Down: | 456 | case Key_Down: |
461 | // toggleButton(6); | 457 | // toggleButton(6); |
462 | // emit lessClicked(); | 458 | emit lessClicked(); |
463 | // emit lessReleased(); | 459 | emit lessReleased(); |
464 | // toggleButton(6); | 460 | // toggleButton(6); |
465 | break; | 461 | break; |
466 | case Key_Up: | 462 | case Key_Up: |
467 | // toggleButton(5); | 463 | // toggleButton(5); |
468 | // emit moreClicked(); | 464 | emit moreClicked(); |
469 | // emit moreReleased(); | 465 | emit moreReleased(); |
470 | // toggleButton(5); | 466 | // toggleButton(5); |
471 | break; | 467 | break; |
472 | case Key_Right: | 468 | case Key_Right: |
473 | mediaPlayerState->setNext(); | 469 | mediaPlayerState->setNext(); |
474 | break; | 470 | break; |
475 | case Key_Left: | 471 | case Key_Left: |