summaryrefslogtreecommitdiff
authorsandman <sandman>2002-12-22 19:02:29 (UTC)
committer sandman <sandman>2002-12-22 19:02:29 (UTC)
commitc5de1fcc13b32e7c1f893dc3f8a1385b8698ebaf (patch) (side-by-side diff)
tree3d9373bb500716cb8739e885fe5aa908e14283dc
parent3ae485ccb47ca618bc00d96a0e81c978a1cfbdaf (diff)
downloadopie-c5de1fcc13b32e7c1f893dc3f8a1385b8698ebaf.zip
opie-c5de1fcc13b32e7c1f893dc3f8a1385b8698ebaf.tar.gz
opie-c5de1fcc13b32e7c1f893dc3f8a1385b8698ebaf.tar.bz2
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)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp25
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
@@ -674,20 +674,25 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
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();