From a5c95b42314fe8f7bdcfe2644e980d43c257fee0 Mon Sep 17 00:00:00 2001 From: harlekin Date: Sun, 18 Aug 2002 17:35:58 +0000 Subject: hack to make startup faster, still need sanity checks --- (limited to 'noncore') diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 604ed3a..6d867e5 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -128,6 +128,9 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { + + + setCaption( tr("OpiePlayer") ); Config cfg("OpiePlayer"); diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index 827f773..e951554 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp @@ -18,11 +18,12 @@ int main(int argc, char **argv) { mediaPlayerState = &st; PlayListWidget pl( 0, "playList" ); playList = &pl; + pl.showMaximized(); AudioWidget aw( 0, "audioUI" ); audioUI = &aw; VideoWidget vw( 0, "videoUI" ); videoUI = &vw; - + a.processEvents(); MediaPlayer mp( 0, "mediaPlayer" ); a.showMainDocumentWidget(&pl); diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 87f4f0c..5531e81 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -34,9 +34,8 @@ extern MediaPlayerState *mediaPlayerState; MediaPlayer::MediaPlayer( QObject *parent, const char *name ) : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { - - // xineControl = new XineControl(); -// QPEApplication::grabKeyboard(); // EVIL + qApp->processEvents(); + // QPEApplication::grabKeyboard(); // EVIL connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 874800a..39f5090 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -202,7 +202,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) ); QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch - + Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 ); QWidget *aTab; @@ -220,7 +220,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) audioView->setColumnAlignment(2, Qt::AlignRight); audioView->setAllColumnsShowFocus(TRUE); audioView->setSorting(0,TRUE); - + audioView->setMultiSelection( TRUE ); audioView->setSelectionMode( QListView::Extended); @@ -246,7 +246,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) videoView->setColumnAlignment(2, Qt::AlignRight); videoView->setAllColumnsShowFocus(TRUE); videoView->setSorting(0,TRUE); - + videoView->setMultiSelection( TRUE ); videoView->setSelectionMode( QListView::Extended); diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index ddb4d74..60a3563 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -35,6 +35,7 @@ #include #include + #include #include #include @@ -81,6 +82,8 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { + + setCaption( tr("OpiePlayer - Video") ); videoFrame = new XineVideoWidget ( this, "Video frame" ); -- cgit v0.9.0.2