-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 3 |
5 files changed, 13 insertions, 7 deletions
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 | |||
@@ -130,2 +130,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
130 | QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { | 130 | QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { |
131 | |||
132 | |||
133 | |||
131 | setCaption( tr("OpiePlayer") ); | 134 | setCaption( tr("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 | |||
@@ -20,2 +20,3 @@ int main(int argc, char **argv) { | |||
20 | playList = &pl; | 20 | playList = &pl; |
21 | pl.showMaximized(); | ||
21 | AudioWidget aw( 0, "audioUI" ); | 22 | AudioWidget aw( 0, "audioUI" ); |
@@ -24,3 +25,3 @@ int main(int argc, char **argv) { | |||
24 | videoUI = &vw; | 25 | videoUI = &vw; |
25 | 26 | a.processEvents(); | |
26 | MediaPlayer mp( 0, "mediaPlayer" ); | 27 | MediaPlayer mp( 0, "mediaPlayer" ); |
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 | |||
@@ -36,5 +36,4 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | |||
36 | 36 | ||
37 | 37 | qApp->processEvents(); | |
38 | // xineControl = new XineControl(); | 38 | // QPEApplication::grabKeyboard(); // EVIL |
39 | // QPEApplication::grabKeyboard(); // EVIL | ||
40 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 39 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
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 | |||
@@ -204,3 +204,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
204 | 204 | ||
205 | 205 | ||
206 | Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 ); | 206 | Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 ); |
@@ -222,3 +222,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
222 | audioView->setSorting(0,TRUE); | 222 | audioView->setSorting(0,TRUE); |
223 | 223 | ||
224 | audioView->setMultiSelection( TRUE ); | 224 | audioView->setMultiSelection( TRUE ); |
@@ -248,3 +248,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
248 | videoView->setSorting(0,TRUE); | 248 | videoView->setSorting(0,TRUE); |
249 | 249 | ||
250 | videoView->setMultiSelection( TRUE ); | 250 | videoView->setMultiSelection( TRUE ); |
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 | |||
@@ -37,2 +37,3 @@ | |||
37 | 37 | ||
38 | |||
38 | #include <qwidget.h> | 39 | #include <qwidget.h> |
@@ -83,2 +84,4 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
83 | QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | 84 | QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { |
85 | |||
86 | |||
84 | setCaption( tr("OpiePlayer - Video") ); | 87 | setCaption( tr("OpiePlayer - Video") ); |