correct implementation for QCop "nextView()":

 - if we are not active, raise the window
 - if we are active, switch to the next view
(this is needed for the new appskey framework)

1 files changed, 15 insertions, 10 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index c0a744a..7dcf156 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -654,60 +654,65 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 		    stopTimer = startTimer( 5000 );
 		}
 
 		QDialog dlg( this, 0, TRUE );
 		QVBoxLayout *vb = new QVBoxLayout( &dlg );
 		QScrollView *view = new QScrollView( &dlg, "scrollView");
 		view->setResizePolicy( QScrollView::AutoOneFit );
 		vb->addWidget( view );
 		QLabel *lblMsg = new QLabel( msg, &dlg );
 		view->addChild( lblMsg );
 		QPushButton *cmdOk = new QPushButton( tr("OK"), &dlg );
 		connect( cmdOk, SIGNAL(clicked()), &dlg, SLOT(accept()) );
 		vb->addWidget( cmdOk );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 		dlg.showMaximized();
 #endif
 		needShow = dlg.exec();
 
 		if ( bSound )
 		    killTimer( stopTimer );
 	    }
 	}
     } else if ( msg == "nextView()" ) {
-	QWidget* cur = views->visibleWidget();
-	if ( cur ) {
-	    if ( cur == dayView )
-		viewWeek();
-	    else if ( cur == weekView )
-		viewWeekLst();
-	    else if ( cur == weekLstView )
-		viewMonth();
-	    else if ( cur == monthView )
-		viewDay();
+	if ( !qApp-> activeWindow ( )) {
 	    needShow = TRUE;
 	}
+	else {
+	    QWidget* cur = views->visibleWidget();
+	    if ( cur ) {
+		if ( cur == dayView )
+		    viewWeek();
+		else if ( cur == weekView )
+		    viewWeekLst();
+		else if ( cur == weekLstView )
+		    viewMonth();
+		else if ( cur == monthView )
+		    viewDay();
+		needShow = TRUE;
+	    }
+	}
     }
     if ( needShow ) {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	showMaximized();
 #else
 	show();
 #endif
 	raise();
 	QPEApplication::setKeepRunning();
 	setActiveWindow();
     }
 }
 
 void DateBook::reload()
 {
     db->reload();
     if ( dayAction->isOn() )
 	viewDay();
     else if ( weekAction->isOn() )
 	viewWeek();
     else if ( monthAction->isOn() )
 	viewMonth();
     syncing = FALSE;
 }