FCL/sf/app/phone: comparison phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpphonenotes.cpp

equal deleted inserted replaced

-:2f8f8080a020
+:ebdbd102c78a
 m_isNoteShowingOngoing(false),
 m_passwordDialog(NULL),
 m_passwordValidator(NULL)
 {
 DPRINT << ": IN";
 m_notesQueue = new QQueue<QObject*>();
 m_cpSettingsWrapper = new CpSettingsWrapper;
 DPRINT << ": OUT";
 }
 QObject* note(NULL);
 foreach (note, *m_notesQueue) {
 delete note;
 }
 delete m_notesQueue;
+if(m_passwordDialog) {
+delete m_passwordDialog;
+}
 DPRINT << ": OUT";
 }
 /*!
 DPRINT << ": IN";
 HbDeviceProgressDialog *note =
 new HbDeviceProgressDialog(HbProgressDialog::WaitDialog, this);
 note->setText(text);
+QAction *action = new QAction(hbTrId("txt_common_button_hide"), this);
+//Ownership of action is not transferred. Deleted when note closes.
+note->setAction(action, HbDeviceProgressDialog::CancelButtonRole );
 noteId = reinterpret_cast<int>(note);
 DPRINT << ", NOTEID: " << noteId;
 QObject::connect(
 note, SIGNAL(aboutToClose()),
 this, SLOT(activeNoteAboutToClose()));
 serviceListPopup->setContentWidget(serviceList.take());
 HbAction *backAction =
 new HbAction(hbTrId("txt_common_button_back"), serviceListPopup.data());
 serviceListPopup->setPrimaryAction(backAction);
-serviceListPopup->exec();
+HbDialog *serviceListPopupDialog = serviceListPopup.take();
+QObject::connect(
+serviceListPopupDialog, SIGNAL(finished(HbAction*)),
+serviceListPopupDialog, SLOT(deleteLater()));
+serviceListPopupDialog->show();
 DPRINT << ": OUT";
 }
 /*!
 int index = m_notesQueue->indexOf(reinterpret_cast<QObject *>(noteId));
 Q_ASSERT(-1 < index);
 QObject *note = m_notesQueue->at(index);
 DPRINT << ": NOTEID: " << noteId;
 if (qobject_cast<HbDeviceProgressDialog *>(note)) {
-//  QObject::disconnect(
+static_cast<HbDeviceProgressDialog *>(note)->close();
-//    note, SIGNAL(cancelled()),
-//  this, SLOT(ProgresNoteCanceled()));
-static_cast<HbDeviceProgressDialog *>(note)->cancel();
 } else if (qobject_cast<HbDeviceMessageBox *>(note)) {
 static_cast<HbDeviceMessageBox *>(note)->close();
 } else {
 DPRINT << ", UNKNOWN NOTE";
 Q_ASSERT(false);
 void CpPhoneNotes::showCallDivertDetails(
 const PSCallDivertingStatus &divertStatus)
 {
 DPRINT << ": IN";
-HbMessageBox *divertInfo =
+QScopedPointer<HbMessageBox> divertInfoScopedPointer(
-new HbMessageBox(HbMessageBox::MessageTypeInformation);
+new HbMessageBox(HbMessageBox::MessageTypeInformation));
-divertInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+divertInfoScopedPointer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 // TODO: Orbit layout support is insufficient currently and all text
 // is not shown.
 QString content = "";
 content.append(hbTrId("txt_phone_info_number"));
 if (0 < divertStatus.iTimeout) {
 content.append(hbTrId("txt_phone_setlabel_delay"));
 content.append(QString::number(divertStatus.iTimeout));
 content.append(hbTrId(" seconds"));
 }
-divertInfo->setText(content);
+divertInfoScopedPointer->setText(content);
-HbAction *backAction = new HbAction(hbTrId("txt_common_button_back"), divertInfo);
+HbAction *backAction = new HbAction(
-divertInfo->setPrimaryAction(backAction);
+hbTrId("txt_common_button_back"),
-divertInfo->exec();
+divertInfoScopedPointer.data());
-delete divertInfo;
+divertInfoScopedPointer->setPrimaryAction(backAction);
+HbMessageBox *divertInfo = divertInfoScopedPointer.take();
+QObject::connect(
+divertInfo, SIGNAL(finished(HbAction*)),
+divertInfo, SLOT(deleteLater()));
+divertInfo->show();
 DPRINT << ": OUT";
 }
 /*!
 CpPhoneNotes::showPasswordQueryDialog.
 */
 void CpPhoneNotes::showPasswordQueryDialog(
 const QString &title,
 const QValidator &validator,
-int maxPasswordLength,
+int maxPasswordLength)
-QString &password,
-bool &ok)
 {
 DPRINT << ": IN";
 QScopedPointer<HbInputDialog> passwordDialog(new HbInputDialog());
 passwordDialog->setEchoMode(HbLineEdit::Password);
 passwordDialog->setInputMethodHints(Qt::ImhDigitsOnly);
 HbLineEdit *hbLineEdit = passwordDialog->lineEdit();
 hbLineEdit->setMaxLength(maxPasswordLength);
 HbEditorInterface editorInterface(hbLineEdit);
-editorInterface.setInputMode(HbInputModeNumeric);
-editorInterface.setConstraints(HbEditorConstraintFixedInputMode);
+editorInterface.setMode(HbInputModeNumeric);
+editorInterface.setInputConstraints(HbEditorConstraintFixedInputMode);
 editorInterface.setFilter(HbDigitsOnlyFilter::instance());
-m_passwordDialog = passwordDialog.data();
 m_passwordValidator = &validator;
 passwordDialog->primaryAction()->setEnabled(false);
 connect(
 hbLineEdit, SIGNAL(contentsChanged()),
 this, SLOT(passwordTextChanged()));
-HbAction* action = passwordDialog->exec();
+passwordDialog->open(this, SLOT(finishedPasswordQueryDialog(HbAction*)));
-if (action == passwordDialog->secondaryAction()) {
+	if(m_passwordDialog) {
-ok = false;
+		m_passwordDialog->deleteLater();
-} else {
+		m_passwordDialog = NULL;
-ok = true;
+	}
-password = passwordDialog->value().toString();
+m_passwordDialog = passwordDialog.take();
-}
+DPRINT << ": OUT";
-m_passwordDialog = NULL;
+}
-m_passwordValidator = NULL;
-disconnect(
+/*!
-hbLineEdit, SIGNAL(contentsChanged()),
+CpPhoneNotes::finishedPasswordQueryDialog.
-this, SLOT(passwordTextChanged()));
+*/
+void CpPhoneNotes::finishedPasswordQueryDialog(HbAction* action)
-DPRINT << ": OUT";
+{
+bool ok;
+QString password;
+if(m_passwordDialog) {
+if (action == m_passwordDialog->secondaryAction()) {
+ok = false;
+} else {
+ok = true;
+password = m_passwordDialog->value().toString();
+}
+disconnect(
+m_passwordDialog->lineEdit(), SIGNAL(contentsChanged()),
+this, SLOT(passwordTextChanged()));
+m_passwordDialog->deleteLater();
+m_passwordDialog = NULL;
+m_passwordValidator = NULL;
+emit passwordQueryCompleted(password, ok);
+}
 }
 /*!
 CpPhoneNotes::formatPhoneNumber.
 Formats phone number according to locale specific rules.
 if (qobject_cast<HbDeviceProgressDialog *>(note)) {
 DPRINT << ", show HbDeviceProgressDialog";
 static_cast<HbDeviceProgressDialog *>(note)->show();
 } else if (qobject_cast<HbDeviceMessageBox *>(note)) {
 DPRINT << ", show HbDeviceMessageBox";
-static_cast<HbDeviceMessageBox *>(note)->exec();
+static_cast<HbDeviceMessageBox *>(note)->show();
 } else {
 DPRINT << ", UNKNOWN NOTE";
 Q_ASSERT(false);
 }
 } else {
 }
 if(note) {
 launchNextNoteIfReady();
 note->disconnect(this);
 DPRINT << ", delete note: " << reinterpret_cast<int>(note);
+HbDeviceProgressDialog *pNote =
+qobject_cast<HbDeviceProgressDialog *>(note);
+if(pNote){
+delete pNote->action();
+}
 note->deleteLater();
 }
 }
 DPRINT << ": OUT";

changeset 30	ebdbd102c78a
parent 27	2f8f8080a020
child 51	f39ed5e045e0