author | llornkcor <llornkcor> | 2002-08-20 02:12:07 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-20 02:12:07 (UTC) |
commit | 16b105a34b4e525cf6690e55beacf4baa57e60d7 (patch) (side-by-side diff) | |
tree | 8e3713e7483e11bbbe5ff7133bf505ca266a49e0 | |
parent | 0d336f310b310ba18af70185eed58be6e07c26d8 (diff) | |
download | opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.zip opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.tar.gz opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.tar.bz2 |
added 'initialzing' message to caption, until after xine is initialized
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
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 ); |