summaryrefslogtreecommitdiff
path: root/noncore
authorharlekin <harlekin>2002-08-02 10:47:50 (UTC)
committer harlekin <harlekin>2002-08-02 10:47:50 (UTC)
commit471dc69956af37e7c5f481c10482f280db853491 (patch) (unidiff)
tree48d05dfe1c626d277181cf76ee051047b2522483 /noncore
parentca057e02c3bacb8226d5209fcd9aa24009cdb78e (diff)
downloadopie-471dc69956af37e7c5f481c10482f280db853491.zip
opie-471dc69956af37e7c5f481c10482f280db853491.tar.gz
opie-471dc69956af37e7c5f481c10482f280db853491.tar.bz2
cleanups
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp24
2 files changed, 6 insertions, 19 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index cd53748..cce445b 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -1,8 +1,7 @@
1 1
2// code added by L. J. Potter Sat 03-02-2002 06:17:54
3#define QTOPIA_INTERNAL_FSLP 2#define QTOPIA_INTERNAL_FSLP
4#include <qpe/qcopenvelope_qws.h> 3#include <qpe/qcopenvelope_qws.h>
5 4
6#include <qpe/qpemenubar.h> 5#include <qpe/qpemenubar.h>
7#include <qpe/qpetoolbar.h> 6#include <qpe/qpetoolbar.h>
8#include <qpe/fileselector.h> 7#include <qpe/fileselector.h>
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index d3898a0..bce6b89 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -119,14 +119,14 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
119 setLength( mediaPlayerState->length() ); 119 setLength( mediaPlayerState->length() );
120 setPosition( mediaPlayerState->position() ); 120 setPosition( mediaPlayerState->position() );
121 setFullscreen( mediaPlayerState->fullscreen() ); 121 setFullscreen( mediaPlayerState->fullscreen() );
122 setPaused( mediaPlayerState->paused() ); 122 setPaused( mediaPlayerState->paused() );
123 setPlaying( mediaPlayerState->playing() ); 123 setPlaying( mediaPlayerState->playing() );
124 124
125 videoFrame = new XineVideoWidget( 200, 150 ,this, "Video frame" ); 125 videoFrame = new XineVideoWidget( 240, 155 ,this, "Video frame" );
126 videoFrame->setGeometry( QRect( 10, 20, 220, 160 ) ); 126 videoFrame->setGeometry( QRect( 0, 15 , 240 ,170 ) );
127} 127}
128 128
129 129
130VideoWidget::~VideoWidget() { 130VideoWidget::~VideoWidget() {
131 for ( int i = 0; i < 3; i++ ) { 131 for ( int i = 0; i < 3; i++ ) {
132 delete pixmaps[i]; 132 delete pixmaps[i];
@@ -285,34 +285,22 @@ void VideoWidget::makeVisible() {
285 285
286void VideoWidget::paintEvent( QPaintEvent * ) { 286void VideoWidget::paintEvent( QPaintEvent * ) {
287 QPainter p( this ); 287 QPainter p( this );
288 288
289 if ( mediaPlayerState->fullscreen() ) { 289 if ( mediaPlayerState->fullscreen() ) {
290 // Clear the background 290 // Clear the background
291// p.setBrush( QBrush( Qt::black ) ); 291 p.setBrush( QBrush( Qt::black ) );
292 //p.drawRect( rect() ); 292 videoFrame->setGeometry( QRect( 0, 0 , 240 ,340 ) );
293 293
294 } else { 294 } else {
295 // draw border 295 // draw the buttons
296 qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL );
297
298 // Clear the movie screen first
299// p.setBrush( QBrush( Qt::black ) );
300// p.drawRect( 9, 20, 220, 160 );
301
302 // draw current frame (centrally positioned from scaling to maintain aspect ratio)
303 //p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
304
305 // draw the buttons
306 for ( int i = 0; i < numButtons; i++ ) { 296 for ( int i = 0; i < numButtons; i++ ) {
307 paintButton( &p, i ); 297 paintButton( &p, i );
308 } 298 }
309
310 // draw the slider 299 // draw the slider
311 slider->repaint( TRUE ); 300 slider->repaint( TRUE );
312 //videoFrame->repaint( TRUE );
313 } 301 }
314} 302}
315 303
316 304
317void VideoWidget::closeEvent( QCloseEvent* ) { 305void VideoWidget::closeEvent( QCloseEvent* ) {
318 mediaPlayerState->setList(); 306 mediaPlayerState->setList();