diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntmainwindow.cpp --- a/phonebookui/pbkcommonui/src/cntmainwindow.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntmainwindow.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -18,24 +18,30 @@ #include "cntmainwindow.h" #include "cntdefaultviewmanager.h" #include "cntviewnavigator.h" -#include +#include "cntkeygrabber.h" #include CntMainWindow::CntMainWindow(QWidget *parent, int defaultView) : HbMainWindow(parent), - mViewManager(NULL) + mViewManager(NULL), + mDefaultView(defaultView) { CNT_ENTRY - + + CntKeyGrabber *keyGrabber = new CntKeyGrabber(this, this); + if (defaultView != noView) { CntViewNavigator* navigator = new CntViewNavigator(this); - navigator->addException( editView, namesView ); - navigator->addException( FavoritesMemberView, collectionView ); + navigator->addException( favoritesMemberView, collectionView ); navigator->addEffect( groupMemberView, groupActionsView ); navigator->addEffect( groupActionsView, groupMemberView ); - navigator->addEffect( commLauncherView, historyView ); - navigator->addEffect( historyView, commLauncherView ); + navigator->addEffect( contactCardView, historyView ); + navigator->addEffect( historyView, contactCardView ); + navigator->addRoot( namesView ); + navigator->addRoot( collectionView ); + navigator->addRoot( groupMemberView ); + navigator->addRoot( favoritesMemberView ); mViewManager = new CntDefaultViewManager( this ); mViewManager->setViewNavigator( navigator ); @@ -59,20 +65,4 @@ CNT_EXIT } -/* - * Lets let views handle send/end key press events, because if toolbar or menu has been focused - * the view wont get the key press events - */ -void CntMainWindow::keyPressEvent(QKeyEvent *event) -{ - if (event->key() == Qt::Key_Yes || event->key() == Qt::Key_No) - { - emit keyPressed(event); - } - else - { - HbMainWindow::keyPressEvent(event); - } -} - // end of file