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
@@ -614,140 +614,145 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 	QDataStream ds(data,IO_ReadOnly);
 	QDateTime when; int warn;
 	ds >> when >> warn;
 
 	// check to make it's okay to continue,
 	// this is the case that the time was set ahead, and
 	// we are forced given a stale alarm...
 	QDateTime current = QDateTime::currentDateTime();
 	if ( current.time().hour() != when.time().hour()
 	     && current.time().minute() != when.time().minute() )
 	    return;
 
 	QValueList<EffectiveEvent> list = db->getEffectiveEvents(when.addSecs(warn*60));
 	if ( list.count() > 0 ) {
 	    QString msg;
 	    bool bSound = FALSE;
 	    int stopTimer = 0;
 	    bool found = FALSE;
 	    for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
 		  it!=list.end(); ++it ) {
 		if ( (*it).event().hasAlarm() ) {
 		    found = TRUE;
 		    msg += "<CENTER><B>" + (*it).description() + "</B>"
 			   + "<BR>" + (*it).location() + "<BR>"
 			   + TimeString::dateString((*it).event().start(),ampm)
 			   + (warn
 			      ? tr(" (in " + QString::number(warn)
 				   + tr(" minutes)"))
 			      : QString(""))
 			   + "<BR>"
 			   + (*it).notes() + "</CENTER>";
 		    if ( (*it).event().alarmSound() != Event::Silent ) {
 			bSound = TRUE;
 		    }
 		}
 	    }
 	    if ( found ) {
 		if ( bSound ) {
 		    Sound::soundAlarm();
 		    alarmCounter = 0;
 		    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;
 }
 
 void DateBook::flush()
 {
     syncing = TRUE;
     db->save();
 }
 
 void DateBook::timerEvent( QTimerEvent *e )
 {
     if ( alarmCounter < 10 ) {
 	alarmCounter++;
 	Sound::soundAlarm();
     }
     else
 	killTimer( e->timerId() );
 }
 
 void DateBook::changeClock( bool newClock )
 {
     ampm = newClock;
     // repaint the affected objects...
     if (dayView) dayView->redraw();
     if (weekView) weekView->redraw();
     if (weekLstView) weekLstView->redraw();
 }
 
 void DateBook::changeWeek( bool m )
 {
     /* no need to redraw, each widget catches.  Do need to
        store though for widgets we haven't made yet */
     onMonday = m;
 }
 
 void DateBook::slotToday()
 {
     // we need to view today using default view
     viewDefault(QDate::currentDate());
 }
 
 void DateBook::closeEvent( QCloseEvent *e )