FCL/sf/mw/phonesrv: comparison satui/satapp/src/satappuiprovider.cpp

equal deleted inserted replaced

-:427125ac6cb8
+:7eb70891911c
 const char *SATAPP_DOCML = ":/xml/satapp.docml";
 const char *SATAPP_SETUPMENU_VIEW = "setupmenu_view";
 const char *SATAPP_SELECTITEM_VIEW = "selectitem_view";
 // ======== MEMBER FUNCTIONS ==================================================
+// TODO: #ifndef _DEBUG need to be remove when orbit works well. Now the macro
+// is to avoid panic on emulator. Deleting pointer before create dialog is to
+// avoid memory leak in emulator.
 // ----------------------------------------------------------------------------
 // SatAppUiProvider
 // ----------------------------------------------------------------------------
 //
 const int aDuration)
 {
 TFLOGSTRING("SATAPP: SatAppUiProvider::showDisplayTextPopup call")
 resetUserResponse();
 stopShowWaitNote();
-// Create a note
+if (mDisplayPopup){
+delete mDisplayPopup;
+mDisplayPopup = NULL;
+}
 mDisplayPopup = new HbMessageBox(HbMessageBox::MessageTypeInformation);
 if (mDisplayPopup) {
 TFLOGSTRING(
 "SATAPP: SatAppUiProvider::showDisplayTextPopup note created")
 // Set the label as heading widget
-HbLabel *heading = new HbLabel(aHeading, mDisplayPopup);
+HbLabel *lHeading = new HbLabel(aHeading, mDisplayPopup);
-mDisplayPopup->setHeadingWidget(heading);
+mDisplayPopup->setHeadingWidget(lHeading);
 mDisplayPopup->setText(aContent);
+mDisplayPopup->setIconVisible(false);
 composeDialog(mDisplayPopup, aDuration, ESatDialogDisplayText);
 TFLOGSTRING(
 "SATAPP: SatAppUiProvider::showDisplayTextPopup duration before open")
 DialogWaiter waiter;
 mDisplayPopup->open(&waiter, SLOT(done(HbAction *)));
 waiter.wait();
 TFLOGSTRING(
 "SATAPP: SatAppUiProvider::showDisplayTextPopup duration end open")
+#ifndef _DEBUG
 delete mDisplayPopup;
 mDisplayPopup = 0;
+#endif
 }
 TFLOGSTRING("SATAPP: SatAppUiProvider::showDisplayTextPopup exit")
 return mUserRsp;
 }
 {
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInkeyQuery call")
 resetUserResponse();
 stopShowWaitNote();
-// Create a query
+if (mGetInkeyQuery){
+delete mGetInkeyQuery;
+mGetInkeyQuery = NULL;
+}
 mGetInkeyQuery = new HbInputDialog();
 if (mGetInkeyQuery) {
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInkeyQuery note created")
 // Set PromptText
 mGetInkeyQuery->setPromptText(aHeading);
 // Set ContentText
 QVariant vContent(aContent);
 mGetInkeyQuery->setValue(vContent);
 HbEditorInterface inputMode(mGetInkeyQuery->lineEdit());
+mGetInkeyQuery->lineEdit()->setFocus();
 if (ESatDigitOnly == aCharacterSet) {
 // digit mode, digits only (0 9, *, #, and +)
 inputMode.setFilter(HbPhoneNumberFilter::instance());
 } else {
 // char mode
 waiter.wait();
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInkeyQuery end pop")
 QString inputString = (mGetInkeyQuery->value()).toString();
 aContent = inputString;
+#ifndef _DEBUG
 delete mGetInkeyQuery;
 mGetInkeyQuery = 0;
+#endif
 }
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInkeyQuery exit")
 return mUserRsp;
 }
 if (aDuration) {
 duration = aDuration * KSymbianTimeConvertQtTime;
 }
 TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery duration=%d",
 duration)
+if (mYesNoPopup){
+delete mYesNoPopup;
+mYesNoPopup = NULL;
+}
 if (ESatYesNo == aCharacterSet) {
 mYesNoPopup = new SatAppGetInkeyNote(aText);
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery normal")
 composeDialog(mYesNoPopup, duration, ESatDialogGetYesNo);
 } else if (aImmediateDigitResponse){
 waiter.wait();
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery end pop")
 aDuration = time.elapsed() / KSymbianTimeConvertQtTime;
 TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetYesNoQuery duration out=%d",
 aDuration)
+#ifndef _DEBUG
 delete mYesNoPopup;
 mYesNoPopup = 0;
+#endif
 }
 if (ESatYesNo == aCharacterSet) {
 mDigitalRsp = mUserRsp;
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetYesNoQuery:yes/no rsp")
 }
 TFLOGSTRING3("SATAPP: SatAppUiProvider::showGetInputQuery \
 min %d max %d length", minLength, maxLength)
 resetUserResponse();
 stopShowWaitNote();
 mMinLength = minLength;
-// Create a query
+if (mGetInputQuery){
+delete mGetInputQuery;
+mGetInputQuery = NULL;
+}
 mGetInputQuery = new HbInputDialog();
-// Set PromptText
 mGetInputQuery->setPromptText(heading);
-// Set ContentText
 QVariant vContent(content);
 mGetInputQuery->setValue(vContent);
 HbEditorInterface inputMode(mGetInputQuery->lineEdit());
+mGetInputQuery->lineEdit()->setFocus();
 if (ESatDigitOnly == characterSet) {
 // digit mode, digits only (0 9, *, #, and +)
 inputMode.setFilter(HbPhoneNumberFilter::instance());
 } else {
 // char mode
 this, SLOT(updateQueryAction(QString)));
 mGetInputQuery->lineEdit()->setMaxLength(maxLength);
 composeDialog(mGetInputQuery, KDefaultSelectionTimeoutMseconds, ESatDialogGetInput);
 // Sets the "OK"-action/button
-if (0 == minLength || content.length() >= minLength) {
+if ((0 == minLength || content.length() >= minLength) &&
-HbAction* okAction = new HbAction(hbTrId("txt_sat_general_ok"),
+mGetInputQuery->actions().at(0)) {
-mGetInputQuery);
+mGetInputQuery->actions().at(0)->setEnabled(true);
-bool ret = connect(okAction, SIGNAL(triggered()),
+}
-this, SLOT(userPrimaryResponse()));
-TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetInputQuery \
-connect okAction: %d", ret)
-mGetInputQuery->setPrimaryAction(okAction);
-} else {
-// Set default primary action is 0
-mGetInputQuery->setPrimaryAction(0);
-}
 if (aHideInput) {
 mGetInputQuery->lineEdit()->setEchoMode(HbLineEdit::Password);
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInputQuery hide")
 }
 mGetInputQuery->open(&waiter, SLOT(done(HbAction *)));
 waiter.wait();
 TFLOGSTRING("SATAPP: SatAppUiProvider::showGetInputQuery end pop")
 content = (mGetInputQuery->value()).toString();
+#ifndef _DEBUG
 delete mGetInputQuery;
 mGetInputQuery = 0;
+#endif
 TFLOGSTRING2("SATAPP: SatAppUiProvider::showGetInputQuery mUserRsp =%d exit",
 mUserRsp)
 return mUserRsp;
 }
 //
 void SatAppUiProvider::updateQueryAction(QString text)
 {
 TFLOGSTRING("SATAPP: SatAppUiProvider::updateQueryAction call")
 // Get Input
-if (mGetInputQuery) {
+if (mGetInputQuery && mGetInputQuery->actions().at(0)) {
-if (text.length() >= mMinLength) {
+if (text.length() >= mMinLength ) {
-if (!mGetInputQuery->primaryAction()) {
+mGetInputQuery->actions().at(0)->setEnabled(true);
-HbAction *okAction = new HbAction(hbTrId("txt_sat_general_ok"),
-mGetInputQuery);
-bool ret = connect(
-okAction, SIGNAL(triggered()),
-this, SLOT(userPrimaryResponse()));
-TFLOGSTRING2("SATAPP: SatAppUiProvider::updateQueryAction \
-get input connect okAction: %d", ret)
-mGetInputQuery->setPrimaryAction(okAction);
-}
-TFLOGSTRING("SATAPP: SatAppUiProvider::updateQueryAction \
-get input  OK")
 } else {
-if (mGetInputQuery->primaryAction()) {
+mGetInputQuery->actions().at(0)->setEnabled(false);
-mGetInputQuery->removeAction(mGetInputQuery->primaryAction());
-}
-TFLOGSTRING("SATAPP: SatAppUiProvider::updateQueryAction \
-get input no OK Action")
 }
 }
 // Get InKey
-if (mGetInkeyQuery) {
+if (mGetInkeyQuery && mGetInkeyQuery->actions().at(0)) {
-if (!mGetInkeyQuery->primaryAction() && (text.length() == 1)) {
+if (1 == text.length()) {
-HbAction *okAction = new HbAction(hbTrId("txt_sat_general_ok"),
+mGetInkeyQuery->actions().at(0)->setEnabled(true);
-mGetInkeyQuery);
+} else {
-bool ret = connect(okAction, SIGNAL(triggered()),
+mGetInkeyQuery->actions().at(0)->setEnabled(false);
-this, SLOT(userPrimaryResponse()));
-TFLOGSTRING2("SATAPP: SatAppUiProvider::updateQueryAction \
-get inkey  connect okAction: %d", ret)
-mGetInkeyQuery->setPrimaryAction(okAction);
-TFLOGSTRING("SATAPP: SatAppUiProvider::updateQueryAction \
-get inkey OK")
-} else {
-if (mGetInkeyQuery->primaryAction()) {
-mGetInkeyQuery->removeAction(mGetInkeyQuery->primaryAction());
-}
-TFLOGSTRING("SATAPP: SatAppUiProvider::updateQueryAction \
-get inkey not OK Action")
 }
 }
 TFLOGSTRING("SATAPP: SatAppUiProvider::updateQueryAction exit")
 }
 const QString &aText,
 bool &aActionAccepted)
 {
 TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmSendQuery call")
 resetUserResponse();
-mConfirmSendQuery = new HbMessageBox();
+if (mConfirmSendQuery){
+delete mConfirmSendQuery;
+mConfirmSendQuery = NULL;
+}
+mConfirmSendQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
 if(mConfirmSendQuery) {
 mConfirmSendQuery->setText(aText);
 composeDialog(mConfirmSendQuery, 0, ESatDialogConfirmSend);
 TFLOGSTRING("SATAPP: SatAppUiProvider::confirmSend before open")
 DialogWaiter waiter;
 mConfirmSendQuery->open(&waiter, SLOT(done(HbAction *)));
 waiter.wait();
 TFLOGSTRING("SATAPP: SatAppUiProvider::confirmSend after open")
+#ifndef _DEBUG
 delete mConfirmSendQuery;
 mConfirmSendQuery = 0;
+#endif
 }
 aActionAccepted = (EUserPrimaryResponse == mUserRsp) ? true : false;
 TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmSendQuery exit")
 }
 delete mWaitNote;
 mWaitNote = 0;
 }
 mWaitNote = new HbProgressDialog(HbProgressDialog::WaitDialog);
 //remove the default cancel softkey
-mWaitNote->removeAction(mWaitNote->primaryAction());
+if (mWaitNote){
-if(aText.isEmpty()) {
+mWaitNote->clearActions();
-mWaitNote->setText(hbTrId("txt_sat_sendingtextmessage"));
+if(aText.isEmpty()) {
-} else {
+mWaitNote->setText(hbTrId("txt_sat_sendingtextmessage"));
-mWaitNote->setText(aText);
+} else {
-}
+mWaitNote->setText(aText);
-mWaitNote->show();
+}
-// Extend showing sms wait note  timer for test
+mWaitNote->show();
-extendNoteShowtime();
+// Extend showing sms wait note  timer for test
+extendNoteShowtime();
+}
 TFLOGSTRING("SATAPP: SatAppUiProvider::showSmsWaitNote exit")
 }
 // ----------------------------------------------------------------------------
 // showDtmfWaitNote
 mWaitNote = 0;
 }
 mWaitNote = new HbProgressDialog(HbProgressDialog::WaitDialog);
 //remove the default cancel softkey
-bool ret = connect(mWaitNote->primaryAction(), SIGNAL(triggered()),
+bool ret = connect(mWaitNote->actions().at(0), SIGNAL(triggered()),
 this, SLOT(cancelResponse()));
 TFLOGSTRING2("SATAPP: SatAppUiProvider::showDtmfWaitNote \
 primaryAction=%d", ret)
 if(aText.isEmpty()) {
 mWaitNote->setText(hbTrId("txt_sat_senddtmf_wait_note"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmSetUpCallQUery length 0")
 } else {
 alphaId.append(aText);
 TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmSetUpCallQUery exit")
 }
-mSetUpCallQuery = new HbMessageBox(HbMessageBox::MessageTypeInformation);
+if (mSetUpCallQuery){
+delete mSetUpCallQuery;
+mSetUpCallQuery = NULL;
+}
+mSetUpCallQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
 if(mSetUpCallQuery) {
 mSetUpCallQuery->setText(alphaId);
 composeDialog(mSetUpCallQuery, 0, ESatDialogSetUpCall);
 TFLOGSTRING("SATAPP: SatAppSetUpCall::showSetUpCallConfirm before open")
 DialogWaiter waiter;
 mSetUpCallQuery->open(&waiter, SLOT(done(HbAction *)));
 waiter.wait();
 TFLOGSTRING("SATAPP: SatAppSetUpCall::showSetUpCallConfirm after open")
+#ifndef _DEBUG
 delete mSetUpCallQuery;
 mSetUpCallQuery = 0;
+#endif
 }
 aActionAccepted = (EUserPrimaryResponse == mUserRsp) ? true : false;
 TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmSetUpCallQUery exit")
 }
 mMinLength = 0;
 TFLOGSTRING("SATAPP: SatAppUiProvider::resetUserResponse exit")
 }
 // ----------------------------------------------------------------------------
-// composeDialog
+// composeDialog: make sure dlg has 2 buttons
 // ----------------------------------------------------------------------------
 //
 void SatAppUiProvider::composeDialog(
 HbDialog *dlg,
 int aDuration,
 TSatAppDialogActionType type,
-bool aModal,
+bool aModal/* = true*/,
-HbDialog::DismissPolicy aDismissPolicy)
+HbDialog::DismissPolicy aDismissPolicy/* = HbDialog::NoDismiss*/)
 {
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog call")
 dlg->setModal(aModal);
 dlg->setDismissPolicy(aDismissPolicy);
 if (aDuration){
 dlg->setTimeout(aDuration);
 } else {
 dlg->setTimeout(HbDialog::NoTimeout);
 }
-HbAction *primaryAction = 0;
+dlg->clearActions();
-HbAction *secondaryAction = 0;
+HbAction *primaryAction = new HbAction(dlg);
+dlg->addAction(primaryAction);
+bool ret = connect(primaryAction, SIGNAL(triggered()),
+this, SLOT(userPrimaryResponse()));
+TFLOGSTRING2("SATAPP: SatAppUiProvider::composeDialog \
+primaryAction=%d", ret)
+HbAction *secondaryAction = new HbAction(dlg);
+dlg->addAction(secondaryAction);
+ret = connect(secondaryAction, SIGNAL(triggered()),
+this, SLOT(userSecondaryResponse()));
+TFLOGSTRING2("SATAPP: SatAppUiProvider::composeDialog \
+secondaryAction=%d", ret)
 if (ESatDialogDisplayText == type){
-primaryAction = new HbAction(hbTrId("txt_sat_general_ok"), dlg);
+primaryAction->setText(hbTrId("txt_sat_general_ok"));
-secondaryAction = new HbAction(hbTrId("txt_sat_general_back"), dlg);
+secondaryAction->setText(hbTrId("txt_sat_general_back"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \
 ESatDialogDisplayText")
 } else if (ESatDialogGetInput == type){
-secondaryAction = new HbAction(hbTrId("txt_sat_general_cancel"), dlg);
+primaryAction->setText(hbTrId("txt_sat_general_ok"));
+primaryAction->setEnabled(false);
+secondaryAction->setText(hbTrId("txt_sat_general_cancel"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \
 ESatDialogGetInput")
 } else if (ESatDialogGetInkey == type){
-secondaryAction = new HbAction(hbTrId("txt_sat_general_cancel"), dlg);
+primaryAction->setText(hbTrId("txt_sat_general_ok"));
+primaryAction->setEnabled(false);
+secondaryAction->setText(hbTrId("txt_sat_general_cancel"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \
 ESatDialogGetInkey")
 } else if (ESatDialogGetYesNo == type){
-primaryAction = new HbAction(hbTrId("txt_sat_general_yes"), dlg);
+primaryAction->setText(hbTrId("txt_sat_general_yes"));
-secondaryAction = new HbAction(hbTrId("txt_sat_general_no"), dlg);
+secondaryAction->setText(hbTrId("txt_sat_general_no"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \
 ESatDialogGetYesNo")
 } else if (ESatDialogGetDigitalRsp == type){
-secondaryAction = new HbAction(hbTrId("txt_sat_general_cancel"), dlg);
+dlg->removeAction(primaryAction);
+secondaryAction->setText(hbTrId("txt_sat_general_cancel"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \
 ESatDialogGetDigitalRsp")
 } else if (ESatDialogSetUpCall == type){
-primaryAction = new HbAction(hbTrId("txt_sat_general_call"), dlg);
+primaryAction->setText(hbTrId("txt_sat_general_call"));
-secondaryAction = new HbAction(hbTrId("txt_sat_general_cancel"), dlg);
+secondaryAction->setText(hbTrId("txt_sat_general_cancel"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \
 ESatDialogSetUpCall")
 } else if (ESatDialogConfirmSend == type){
-primaryAction = new HbAction(hbTrId("txt_sat_general_send"), dlg);
+primaryAction->setText(hbTrId("txt_sat_general_send"));
-secondaryAction = new HbAction(hbTrId("txt_sat_general_cancel"), dlg);
+secondaryAction->setText(hbTrId("txt_sat_general_cancel"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \
 ESatDialogConfirmSend")
-}else if (ESatDialogConfirmBip == type){
+} else if (ESatDialogConfirmBip == type){
-primaryAction = new HbAction(hbTrId("txt_sat_general_ok"), dlg);
+primaryAction->setText(hbTrId("txt_sat_general_ok"));
-secondaryAction = new HbAction(hbTrId("txt_sat_general_cancel"), dlg);
+secondaryAction->setText(hbTrId("txt_sat_general_cancel"));
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog \
 ESatDialogConfirmBip")
 }
-if (primaryAction) {
-bool ret = connect(
-primaryAction, SIGNAL(triggered()),
-this, SLOT(userPrimaryResponse()));
-TFLOGSTRING2("SATAPP: SatAppUiProvider::composeDialog \
-primaryAction=%d", ret)
-}
-dlg->setPrimaryAction(primaryAction);
-if (secondaryAction) {
-bool ret = connect(
-secondaryAction, SIGNAL(triggered()),
-this, SLOT(userSecondaryResponse()));
-TFLOGSTRING2("SATAPP: SatAppUiProvider::composeDialog \
-secondaryAction=%d", ret)
-}
-dlg->setSecondaryAction(secondaryAction);
 TFLOGSTRING("SATAPP: SatAppUiProvider::composeDialog exit")
 }
 // ----------------------------------------------------------------------------
 // docmlLoader
 if (mWaitNote) {
 delete mWaitNote;
 mWaitNote = 0;
 }
 mWaitNote = new HbProgressDialog(HbProgressDialog::WaitDialog);
-mWaitNote->removeAction(mWaitNote->primaryAction());
+mWaitNote->clearActions();
 if (aText.length()) {
 if (!aSelfExplanatoryIcon)  {
 TFLOGSTRING("SATAPP: SatAppUiProvider::showSsWaitNote !Icon")
 mWaitNote->setText(aText);
 } else {
 if (mWaitNote) {
 delete mWaitNote;
 mWaitNote = 0;
 }
 mWaitNote = new HbProgressDialog(HbProgressDialog::WaitDialog);
-mWaitNote->removeAction(mWaitNote->primaryAction());
+mWaitNote->clearActions();
 mWaitNote->setText(hbTrId("txt_sat_wait_note_without_delay"));
 mWaitNote->show();
 TFLOGSTRING("SATAPP: SatAppUiProvider::showWaitNoteWithoutDelay exit")
 }
 // ----------------------------------------------------------------------------
 //
 void SatAppUiProvider::showSsErrorNote()
 {
 TFLOGSTRING("SATAPP: SatAppUiProvider::showSsErrorNote")
-HbMessageBox *msgBox = new HbMessageBox(HbMessageBox::MessageTypeInformation);
+HbMessageBox::warning(hbTrId("txt_sat_sendss_error_note"));
-msgBox->setText(hbTrId("txt_sat_sendss_error_note"));
-DialogWaiter waiter;
-msgBox->open(&waiter, SLOT(done(HbAction *)));
-waiter.wait();
-delete msgBox;
-msgBox = NULL;
 TFLOGSTRING("SATAPP: SatAppUiProvider::showSsErrorNote exit")
 }
 // ----------------------------------------------------------------------------
 // showConfirmOpenChannelQuery
 QString title = aText;
 if (!aText.length()){
 title = hbTrId("txt_sat_openchannel_confirm_note");
 }
-mConfirmBipQuery = new HbMessageBox();
+mConfirmBipQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
 if(mConfirmBipQuery) {
 // Sets the "Yes"-action/button
 mConfirmBipQuery->setText(title);
 composeDialog(mConfirmBipQuery, 0, ESatDialogConfirmBip);
 TFLOGSTRING("SATAPP: SatAppUiProvider::showConfirmOpenChannelQuery before open")
 DialogWaiter waiter;
 mConfirmBipQuery->open(&waiter, SLOT(done(HbAction *)));
 if (!mWaitNote) {
 mWaitNote = new HbProgressDialog(HbProgressDialog::WaitDialog);
 mWaitNote->setText(aText);
 //remove the default cancel softkey
-bool ret = connect(mWaitNote->primaryAction(), SIGNAL(triggered()),
+bool ret = connect(mWaitNote->actions().at(0), SIGNAL(triggered()),
 this, SLOT(cancelResponse()));
 TFLOGSTRING2("SATAPP: SatAppUiProvider::showDtmfWaitNote \
 primaryAction=%d", ret)
 mWaitNote->show();
 // ----------------------------------------------------------------------------
 //
 void SatAppUiProvider::showMoSmControlNote(const QString &aText)
 {
 TFLOGSTRING("SATAPP: SatAppUiProvider::showMoSmControlNote")
-HbMessageBox *msgBox = new HbMessageBox(HbMessageBox::MessageTypeInformation);
+HbMessageBox::information(aText);
-msgBox->setText(aText);
-msgBox->setTimeout(KMoSmControlTimeOut);
-DialogWaiter waiter;
-msgBox->open(&waiter, SLOT(done(HbAction *)));
-waiter.wait();
-delete msgBox;
 TFLOGSTRING("SATAPP: SatAppUiProvider::showMoSmControlNote exit")
 }
 // ----------------------------------------------------------------------------
 if (mWaitNote) {
 delete mWaitNote;
 mWaitNote = 0;
 }
 mWaitNote = new HbProgressDialog(HbProgressDialog::WaitDialog);
-mWaitNote->removeAction(mWaitNote->primaryAction());
+mWaitNote->clearActions();
 mWaitNote->setText(aText);
 mWaitNote->show();
 TFLOGSTRING("SATAPP: SatAppUiProvider::showCloseChannelWaitNote exit")
 }
 // ----------------------------------------------------------------------------
 //
 void SatAppUiProvider::showSatInfoNote(const QString &aText)
 {
 TFLOGSTRING("SATAPP: SatAppUiProvider::showSatInfoNote")
-HbMessageBox *msgBox = new HbMessageBox(HbMessageBox::MessageTypeInformation);
+HbMessageBox::information(aText);
-msgBox->setText(aText);
-DialogWaiter waiter;
-msgBox->open(&waiter, SLOT(done(HbAction *)));
-waiter.wait();
-delete msgBox;
-msgBox = 0;
 TFLOGSTRING("SATAPP: SatAppUiProvider::showSatInfoNote exit")
 }
 // End of file

changeset 27	7eb70891911c
parent 23	427125ac6cb8
child 31	a2467631ae02