summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-15 19:20:49 (UTC)
committer llornkcor <llornkcor>2002-08-15 19:20:49 (UTC)
commitf568b83e0ef16a0e3b46d41b2cfaa5fdda9d1d45 (patch) (side-by-side diff)
treeb813e08e89f295b36ffe5ac7981a07e163063090
parentc28cefd69ab4f1edb66248ae2651dafc6f7e2fcc (diff)
downloadopie-f568b83e0ef16a0e3b46d41b2cfaa5fdda9d1d45.zip
opie-f568b83e0ef16a0e3b46d41b2cfaa5fdda9d1d45.tar.gz
opie-f568b83e0ef16a0e3b46d41b2cfaa5fdda9d1d45.tar.bz2
new mask size/position. still needs non static
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp16
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
@@ -92,25 +92,25 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
QString skinPath = "opieplayer2/skins/" + skin;
pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
imgButtonMask->fill( 0 );
for ( int i = 0; i < 7; i++ ) {
QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png";
masks[i] = new QBitmap( filename );
- qDebug(filename);
+
if ( !masks[i]->isNull() ) {
QImage imgMask = masks[i]->convertToImage();
uchar **dest = imgButtonMask->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] = i + 1;
}
}
}
}
@@ -170,40 +170,36 @@ QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
}
QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) {
QPixmap *pixmap = new QPixmap( pix );
pixmap->setMask( mask );
return pixmap;
}
void VideoWidget::resizeEvent( QResizeEvent * ) {
int h = height();
int w = width();
int Vh = 160;
- //videoFrame->height();
int Vw = 220;
- //videoFrame->width();
-
slider->setFixedWidth( w - 20 );
slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) );
slider->setBackgroundOrigin( QWidget::ParentOrigin );
slider->setFocusPolicy( QWidget::NoFocus );
slider->setBackgroundPixmap( *pixBg );
xoff = 0;// ( imgUp->width() ) / 2;
- yoff = 180;//(( Vh - imgUp->height() ) / 2) - 10;
+ yoff = 185;//(( Vh - imgUp->height() ) / 2) - 10;
QPoint p( xoff, yoff );
-
QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p );
QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p );
for ( int i = 0; i < 7; i++ ) {
if ( !masks[i]->isNull() ) {
delete buttonPixUp[i];
delete buttonPixDown[i];
buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] );
buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] );
}
}
@@ -450,32 +446,32 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
case Key_F13: //mail
break;
case Key_Space: {
if(mediaPlayerState->playing()) {
mediaPlayerState->setPlaying(FALSE);
} else {
mediaPlayerState->setPlaying(TRUE);
}
}
break;
case Key_Down:
// toggleButton(6);
-// emit lessClicked();
-// emit lessReleased();
+ emit lessClicked();
+ emit lessReleased();
// toggleButton(6);
break;
case Key_Up:
// toggleButton(5);
-// emit moreClicked();
-// emit moreReleased();
+ emit moreClicked();
+ emit moreReleased();
// toggleButton(5);
break;
case Key_Right:
mediaPlayerState->setNext();
break;
case Key_Left:
mediaPlayerState->setPrev();
break;
case Key_Escape:
break;
};