diff -r 608f67c22514 -r 896e9dbc5f19 qtinternetradio/ui/src/irviewmanager.cpp --- a/qtinternetradio/ui/src/irviewmanager.cpp Tue Jul 06 14:07:20 2010 +0300 +++ b/qtinternetradio/ui/src/irviewmanager.cpp Wed Aug 18 09:40:26 2010 +0300 @@ -71,13 +71,18 @@ iCrossLineShowing(false), iCrossLineTimer(NULL), iExitTimer(NULL), - iExiting(false) + iExiting(false), + iIsEmbedded(XQServiceUtil::isEmbedded()) { iBackAction = new HbAction(Hb::BackNaviAction, this); connect(iBackAction, SIGNAL(triggered()), this, SLOT(backToPreviousView())); - iExitAction = new HbAction(Hb::QuitNaviAction, this); - connect(iExitAction, SIGNAL(triggered()), this, SLOT(lower())); + iExitAction = new HbAction(Hb::QuitNaviAction, this); + + if( !iIsEmbedded ) + { + connect(iExitAction, SIGNAL(triggered()), this, SLOT(lower())); + } connect(this, SIGNAL(viewReady()), this, SLOT(handleViewReady())); connect(this, SIGNAL(currentViewChanged(HbView*)), this, SLOT(handleCurrentViewChanged(HbView*))); @@ -100,6 +105,11 @@ void IRViewManager::setApplication(IRApplication *aApplication) { iApplication = aApplication; + + if( iIsEmbedded ) + { + connect(iExitAction, SIGNAL(triggered()), iApplication, SIGNAL(quit())); + } } /* @@ -369,7 +379,7 @@ HbActivityManager *activityManager = qobject_cast(qApp)->activityManager(); //for embedded applications, don't publish activity. If backup activity is available, need to restore - if (XQServiceUtil::isEmbedded()) + if ( iIsEmbedded ) { if (!iActivityBackup.activityId.isEmpty()) { @@ -415,8 +425,8 @@ } void IRViewManager::removeActivity() -{ - if (XQServiceUtil::isEmbedded()) +{ + if ( iIsEmbedded ) { backupActivity(); } @@ -424,7 +434,7 @@ HbActivityManager *activityManager = qobject_cast(qApp)->activityManager(); activityManager->removeActivity(KActivityMainView); activityManager->removeActivity(KActivityPlayingView); -} +} void IRViewManager::backupActivity() { @@ -589,7 +599,7 @@ void IRViewManager::handleSaveScreenShot() { - if (!XQServiceUtil::isEmbedded()) + if ( !iIsEmbedded ) { TIRViewId id = currentViewId(); iScreenShots[id] = QPixmap::grabWidget(this, rect()); @@ -697,9 +707,9 @@ crossLineReset(); viewport()->repaint(); #ifdef SUBTITLE_STR_BY_LOCID - HbMessageBox::information(hbTrId("txt_common_info_exiting"), (QObject*)NULL, NULL); + HbMessageBox::information(hbTrId("txt_common_info_exiting"), (QObject*)NULL, NULL, HbMessageBox::Ok); #else - HbMessageBox::information(hbTrId("Exiting..."), (QObject*)NULL, NULL); + HbMessageBox::information(hbTrId("Exiting..."), (QObject*)NULL, NULL, HbMessageBox::Ok); #endif qApp->quit(); iExiting = true;