summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 22:51:21 (UTC)
committer simon <simon>2002-12-02 22:51:21 (UTC)
commitb3bf297da8836a678a21f2ebe83e0f1961f91d97 (patch) (unidiff)
treefa5fa20421d833816d355c109458661b2f245177
parent649ea9e9586ce51847ebeb9c062290137c9248f4 (diff)
downloadopie-b3bf297da8836a678a21f2ebe83e0f1961f91d97.zip
opie-b3bf297da8836a678a21f2ebe83e0f1961f91d97.tar.gz
opie-b3bf297da8836a678a21f2ebe83e0f1961f91d97.tar.bz2
- centralized closeEvent implementation
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
6 files changed, 7 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 3070bc3..f6e6086 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -437,13 +437,8 @@ void AudioWidget::showEvent( QShowEvent* ) {
437 mouseMoveEvent( &event ); 437 mouseMoveEvent( &event );
438} 438}
439 439
440 440
441void AudioWidget::closeEvent( QCloseEvent* ) {
442 mediaPlayerState.setList();
443}
444
445
446void AudioWidget::paintEvent( QPaintEvent * pe ) { 441void AudioWidget::paintEvent( QPaintEvent * pe ) {
447 if ( !pe->erased() ) { 442 if ( !pe->erased() ) {
448 // Combine with background and double buffer 443 // Combine with background and double buffer
449 QPixmap pix( pe->rect().size() ); 444 QPixmap pix( pe->rect().size() );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 1778a30..f092699 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -84,9 +84,8 @@ protected:
84 void mouseMoveEvent( QMouseEvent *event ); 84 void mouseMoveEvent( QMouseEvent *event );
85 void mousePressEvent( QMouseEvent *event ); 85 void mousePressEvent( QMouseEvent *event );
86 void mouseReleaseEvent( QMouseEvent *event ); 86 void mouseReleaseEvent( QMouseEvent *event );
87 void timerEvent( QTimerEvent *event ); 87 void timerEvent( QTimerEvent *event );
88 void closeEvent( QCloseEvent *event );
89 void keyReleaseEvent( QKeyEvent *e); 88 void keyReleaseEvent( QKeyEvent *e);
90private slots: 89private slots:
91 void skipFor(); 90 void skipFor();
92 void skipBack(); 91 void skipBack();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 01a7295..2992fd6 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -37,8 +37,13 @@ MediaWidget::MediaWidget( MediaPlayerState &_mediaPlayerState, QWidget *parent,
37MediaWidget::~MediaWidget() 37MediaWidget::~MediaWidget()
38{ 38{
39} 39}
40 40
41void MediaWidget::closeEvent( QCloseEvent * )
42{
43 mediaPlayerState.setList();
44}
45
41void MediaWidget::handleCommand( Command command, bool buttonDown ) 46void MediaWidget::handleCommand( Command command, bool buttonDown )
42{ 47{
43 switch ( command ) { 48 switch ( command ) {
44 case Play: mediaPlayerState.togglePaused(); 49 case Play: mediaPlayerState.togglePaused();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 550f0fc..e3f09ce 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -44,8 +44,10 @@ signals:
44 void forwardReleased(); 44 void forwardReleased();
45 void backReleased(); 45 void backReleased();
46 46
47protected: 47protected:
48 virtual void closeEvent( QCloseEvent * );
49
48 void handleCommand( Command command, bool buttonDown ); 50 void handleCommand( Command command, bool buttonDown );
49 51
50 MediaPlayerState &mediaPlayerState; 52 MediaPlayerState &mediaPlayerState;
51}; 53};
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index b4ecb4c..41dddb7 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -446,13 +446,8 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
446 } 446 }
447} 447}
448 448
449 449
450void VideoWidget::closeEvent( QCloseEvent* ) {
451 mediaPlayerState.setList();
452}
453
454
455void VideoWidget::keyReleaseEvent( QKeyEvent *e) { 450void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
456 switch ( e->key() ) { 451 switch ( e->key() ) {
457////////////////////////////// Zaurus keys 452////////////////////////////// Zaurus keys
458 case Key_Home: 453 case Key_Home:
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 38eb726..149c78e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -90,9 +90,8 @@ protected:
90 void showEvent( QShowEvent *se ); 90 void showEvent( QShowEvent *se );
91 void mouseMoveEvent( QMouseEvent *event ); 91 void mouseMoveEvent( QMouseEvent *event );
92 void mousePressEvent( QMouseEvent *event ); 92 void mousePressEvent( QMouseEvent *event );
93 void mouseReleaseEvent( QMouseEvent *event ); 93 void mouseReleaseEvent( QMouseEvent *event );
94 void closeEvent( QCloseEvent *event );
95 void keyReleaseEvent( QKeyEvent *e); 94 void keyReleaseEvent( QKeyEvent *e);
96 95
97private: 96private:
98// Ticker songInfo; 97// Ticker songInfo;