From 16b105a34b4e525cf6690e55beacf4baa57e60d7 Mon Sep 17 00:00:00 2001 From: llornkcor Date: Tue, 20 Aug 2002 02:12:07 +0000 Subject: added 'initialzing' message to caption, until after xine is initialized --- (limited to 'noncore') diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 0f8242b..6a48b82 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -34,6 +34,8 @@ extern MediaPlayerState *mediaPlayerState; MediaPlayer::MediaPlayer( QObject *parent, const char *name ) : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { + playList->setCaption(tr("OpiePlayer: Initializating")); + qApp->processEvents(); // QPEApplication::grabKeyboard(); // EVIL connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); @@ -58,6 +60,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) volControl = new VolumeControl; xineControl = new XineControl(); + playList->setCaption(tr("OpiePlayer")); } MediaPlayer::~MediaPlayer() { @@ -263,7 +266,7 @@ void MediaPlayer::blank( bool b ) { } close( fd ); } else { - qDebug("<< /dev/fb0 could not be opend >>"); + qDebug("<< /dev/fb0 could not be opened >>"); } } @@ -289,7 +292,8 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { } } -void MediaPlayer::cleanUp() { +void MediaPlayer::cleanUp() {// this happens on closing + // QPEApplication::grabKeyboard(); // QPEApplication::ungrabKeyboard(); } diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 251c2e5..5c804f5 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -99,7 +99,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) setBackgroundMode( PaletteButton ); - setCaption( tr("OpiePlayer") ); +// setCaption( tr("OpiePlayer") ); setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) ); setToolBarsMovable( FALSE ); -- cgit v0.9.0.2