equal
deleted
inserted
replaced
20 #include <hbaction.h> |
20 #include <hbaction.h> |
21 #include <hbdialog.h> |
21 #include <hbdialog.h> |
22 #include <sysutil.h> |
22 #include <sysutil.h> |
23 #include <hbscrollarea.h> |
23 #include <hbscrollarea.h> |
24 #include <etel.h> |
24 #include <etel.h> |
|
25 #include <eikenv.h> |
25 #include <featmgr.h> |
26 #include <featmgr.h> |
26 #include <etelmm.h> |
27 #include <etelmm.h> |
|
28 #include <apgtask.h> |
|
29 #include <coemain.h> |
27 #include <hbnotificationdialog.h> |
30 #include <hbnotificationdialog.h> |
28 #include <centralrepository.h> |
31 #include <centralrepository.h> |
29 #include <sysversioninfo.h> |
32 #include <sysversioninfo.h> |
30 #include "nsmldmsyncprivatecrkeys.h" |
33 #include "nsmldmsyncprivatecrkeys.h" |
31 #include "dmadvancedview.h" |
34 #include "dmadvancedview.h" |
113 exit->setText(QString("txt_common_menu_exit")); |
116 exit->setText(QString("txt_common_menu_exit")); |
114 QObject::connect(exit, SIGNAL(triggered()), this, SLOT(OnExit())); |
117 QObject::connect(exit, SIGNAL(triggered()), this, SLOT(OnExit())); |
115 |
118 |
116 mSoftKeyBackAction = new HbAction(Hb::BackNaviAction ,this); |
119 mSoftKeyBackAction = new HbAction(Hb::BackNaviAction ,this); |
117 mSoftKeyBackAction->setText("Back"); |
120 mSoftKeyBackAction->setText("Back"); |
|
121 fotaPortraitView->setNavigationAction(mSoftKeyBackAction); |
|
122 fotaLandscapeView->setNavigationAction(mSoftKeyBackAction); |
118 connect(mSoftKeyBackAction, SIGNAL(triggered()), this, SLOT(backtoMainWindow())); |
123 connect(mSoftKeyBackAction, SIGNAL(triggered()), this, SLOT(backtoMainWindow())); |
119 |
124 |
120 |
125 |
121 i=0; |
126 i=0; |
122 QString str; |
127 QString str; |
545 // ----------------------------------------------------------------------------- |
550 // ----------------------------------------------------------------------------- |
546 // |
551 // |
547 void DMFotaView::backtoMainWindow() |
552 void DMFotaView::backtoMainWindow() |
548 { |
553 { |
549 qDebug("DMFotaView::backtoMainWindow >>"); |
554 qDebug("DMFotaView::backtoMainWindow >>"); |
550 qApp->quit(); |
555 QString appName = qApp->applicationName(); |
551 qDebug("DMFotaView::backtoMainWindow <<"); |
556 QString cpAppTitle("Control panel"); |
|
557 mMainWindow->removeView(fotaPortraitView); |
|
558 mMainWindow->removeView(fotaLandscapeView); |
|
559 fotaPortraitView->deleteLater(); |
|
560 fotaLandscapeView->deleteLater(); |
|
561 fotaPortraitView = NULL; |
|
562 fotaLandscapeView = NULL; |
|
563 if (appName == cpAppTitle) |
|
564 { |
|
565 TApaTaskList taskList(CEikonEnv::Static()->WsSession()); |
|
566 TApaTask task = taskList.FindApp(KControlPanelAppUid); |
|
567 if (task.Exists()) |
|
568 { |
|
569 task.BringToForeground(); |
|
570 } |
|
571 } |
|
572 qApp->quit(); |
|
573 qDebug("DMFotaView::backtoMainWindow <<"); |
552 } |
574 } |
553 |
575 |
554 // ----------------------------------------------------------------------------- |
576 // ----------------------------------------------------------------------------- |
555 // DMFotaView::OnHelp |
577 // DMFotaView::OnHelp |
556 // Displays Help contents |
578 // Displays Help contents |