FCL/sf/app/phone: comparison phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp

equal deleted inserted replaced

-:bab96b7ed1a4
+:f39ed5e045e0
 DPRINT << ": IN";
 CpSettingFormItemData* formItem =
 static_cast<CpSettingFormItemData*>(
 qobject_cast<const HbDataFormModel*>(item.model())->itemFromIndex(item));
-if (!formItem->property("barringType").isValid()) {
+if (!formItem->contentWidgetData("barringType").isValid()) {
 // Shown item does not belong to the barring settings group.
 return;
 }
 m_model = const_cast<HbDataFormModel*>(qobject_cast<const HbDataFormModel*>(item.model()));
 barringItem->setContentWidgetData("text", QVariant(widgetTextData));
 barringItem->setEnabled(false);
 QVariant value;
 value.setValue(barringType);
-barringItem->setProperty("barringType", value);
+barringItem->setContentWidgetData("barringType", value);
 appendChild(barringItem.data());
 DPRINT << ": OUT";
 return barringItem.take();
 }
 m_phoneNotes->cancelNote(m_activeNoteId);
 m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
 m_barringRequestQueue.clear();
 return;
 }
-CpSettingFormItemData *itemForCompletedRequest =
+if (!m_barringRequestQueue.isEmpty()) {
-m_barringRequestQueue.dequeue();
+CpSettingFormItemData *itemForCompletedRequest =
+m_barringRequestQueue.dequeue();
-if (!itemForCompletedRequest->isEnabled()) {
-// After enabling setting item here status query will not be started
+if (!itemForCompletedRequest->isEnabled()) {
-// again for the item when user collapses and expands the barring
+// After enabling setting item here status query will not be started
-// settings group again.
+// again for the item when user collapses and expands the barring
-itemForCompletedRequest->setEnabled(true);
+// settings group again.
-// start to observe user initiated state changes
+itemForCompletedRequest->setEnabled(true);
-m_helper.addConnection(
+// start to observe user initiated state changes
-itemForCompletedRequest, SIGNAL(stateChanged(int)),
+m_helper.addConnection(
-this, SLOT(changeBarringStateRequested(int)));
+itemForCompletedRequest, SIGNAL(stateChanged(int)),
-}
+this, SLOT(changeBarringStateRequested(int)));
+}
-Qt::CheckState checkState =
-(PSetCallBarringWrapper::BarringStatusActive == status)
+Qt::CheckState checkState =
-? Qt::Checked
+(PSetCallBarringWrapper::BarringStatusActive == status)
-: Qt::Unchecked;
+? Qt::Checked
-updateCheckStateOfItem(*itemForCompletedRequest, checkState);
+: Qt::Unchecked;
+updateCheckStateOfItem(*itemForCompletedRequest, checkState);
+}
 if (m_barringRequestQueue.isEmpty()) {
 m_phoneNotes->cancelNote(m_activeNoteId);
 if (m_delayedBarringActivationNote) {
 m_delayedBarringActivationNote = false;
-m_phoneNotes->showGlobalNote(
+m_phoneNotes->showNotificationDialog(hbTrId("txt_phone_info_barring_activated"));
-m_activeNoteId,
-hbTrId("txt_phone_info_barring_activated"),
-HbMessageBox::MessageTypeInformation);
 }
 // Password editing is enabled only after all barring statuses are
 // queried. Otherwise user may be able to issue two requests
 // simultaneously by hiding status query progress note and clicking
 // edit password.
 if (!m_editBarringPasswordItem->isEnabled()) {
 m_editBarringPasswordItem->setEnabled(true);
 m_helper.addConnection(
-m_editBarringPasswordItem, SIGNAL(clicked(bool)),
+m_editBarringPasswordItem, SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
-this, SLOT(changeBarringPasswordRequested(bool)));
+this, SLOT(changeBarringPasswordRequested()));
 }
 } else {
 processBarringStatusRequestQueue();
 }
 << "barringStatus:" << barringStatus << "plural:" << plural;
 Q_UNUSED(barringType)
 Q_UNUSED(barringStatus)
 Q_UNUSED(plural)
-CpSettingFormItemData *barringItem = m_barringRequestQueue.dequeue();
+if (!m_barringRequestQueue.isEmpty()) {
-if (PSetCallBarringWrapper::BarringErrorNone == result) {
+CpSettingFormItemData *barringItem = m_barringRequestQueue.dequeue();
-if (updateDependentBarringProgramStatuses(*barringItem)) {
+if (PSetCallBarringWrapper::BarringErrorNone == result) {
-// Indicate barring activation completion only when dependent
+if (updateDependentBarringProgramStatuses(*barringItem)) {
-// barring items are also updated.
+// Indicate barring activation completion only when dependent
-m_delayedBarringActivationNote = true;
+// barring items are also updated.
+m_delayedBarringActivationNote = true;
+} else {
+m_phoneNotes->cancelNote(m_activeNoteId);
+m_phoneNotes->showNotificationDialog(hbTrId("txt_phone_info_barring_activated"));
+}
 } else {
+revertCheckStateOfItem(barringItem);
 m_phoneNotes->cancelNote(m_activeNoteId);
-m_phoneNotes->showGlobalNote(
+m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
-m_activeNoteId,
+}
-hbTrId("txt_phone_info_barring_activated"),
-HbMessageBox::MessageTypeInformation);
-}
-} else {
-revertCheckStateOfItem(barringItem);
-m_phoneNotes->cancelNote(m_activeNoteId);
-m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
 }
 DPRINT << ": OUT";
 }
 Q_UNUSED(barringStatus)
 Q_UNUSED(plural)
 m_phoneNotes->cancelNote(m_activeNoteId);
-CpSettingFormItemData *barringItem = m_barringRequestQueue.dequeue();
 if (PSetCallBarringWrapper::BarringErrorNone == result) {
-m_phoneNotes->showGlobalNote(
+m_phoneNotes->showNotificationDialog(hbTrId("txt_phone_info_barring_deactivated"));
-m_activeNoteId,
-hbTrId("txt_phone_info_barring_deactivated"),
-HbMessageBox::MessageTypeInformation);
 } else {
-revertCheckStateOfItem(barringItem);
+if (!m_barringRequestQueue.isEmpty()) {
+CpSettingFormItemData *barringItem = m_barringRequestQueue.dequeue();
+revertCheckStateOfItem(barringItem);
+}
 m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
 }
 DPRINT << ": OUT";
 DPRINT << ": IN: result:" << result;
 m_phoneNotes->cancelNote(m_activeNoteId);
 if (PSetCallBarringWrapper::BarringErrorNone == result) {
-m_phoneNotes->showGlobalNote(
+m_phoneNotes->showNotificationDialog(hbTrId("txt_phone_info_password_changed"));
-m_activeNoteId,
-hbTrId("txt_phone_info_password_changed"),
-HbMessageBox::MessageTypeInformation);
 } else {
 m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
 }
 }
 (!m_barringRequestQueue.isEmpty())) {
 CpSettingFormItemData *item = m_barringRequestQueue.head();
 PSetCallBarringWrapper::BarringType barringType =
 qvariant_cast<PSetCallBarringWrapper::BarringType>(
-item->property("barringType"));
+item->contentWidgetData("barringType"));
 m_barringWrapper->barringStatus(ServiceGroupVoice, barringType);
 m_barringStatusRequestOngoing = true;
 if (!m_phoneNotes->noteShowing()) {
 // Launch progress note only once for status update.
 m_phoneNotes->showGlobalProgressNote(
-m_activeNoteId, hbTrId("txt_phone_info_requesting"));
+m_activeNoteId, hbTrId("txt_common_info_requesting"));
 }
 }
 DPRINT << ": OUT";
 }
 DPRINT << ": IN";
 	QObject::disconnect(
 m_phoneNotes, SIGNAL(passwordQueryCompleted(QString, bool)),
 this, SLOT(completeBarringStateChangeRequestHandling(QString, bool)));
-if (okPressed) {
+if (okPressed && m_clickedBarringItem) {
 QVariant checkState = m_clickedBarringItem->contentWidgetData("checkState");
 if (Qt::Checked == checkState.toInt()) {
 m_barringWrapper->enableBarring(
 ServiceGroupVoice,
 qvariant_cast<PSetCallBarringWrapper::BarringType>(
-m_clickedBarringItem->property("barringType")),
+m_clickedBarringItem->contentWidgetData("barringType")),
 barringPassword);
 } else {
 m_barringWrapper->disableBarring(
 ServiceGroupVoice,
 qvariant_cast<PSetCallBarringWrapper::BarringType>(
-m_clickedBarringItem->property("barringType")),
+m_clickedBarringItem->contentWidgetData("barringType")),
 barringPassword);
 }
 m_barringRequestQueue.enqueue(m_clickedBarringItem);
 m_phoneNotes->showGlobalProgressNote(
-m_activeNoteId, hbTrId("txt_phone_info_requesting"));
+m_activeNoteId, hbTrId("txt_common_info_requesting"));
-} else {
+} else if (m_clickedBarringItem) {
 revertCheckStateOfItem(m_clickedBarringItem);
 }
 m_clickedBarringItem = NULL;
 DPRINT << ": OUT";
 }
 /*!
 CpBarringPluginGroup::changeBarringPasswordRequested.
 */
-void CpBarringPluginGroup::changeBarringPasswordRequested(bool checked)
+void CpBarringPluginGroup::changeBarringPasswordRequested()
 {
 DPRINT << ": IN";
-Q_UNUSED(checked)
 m_changeBarringPasswordPhase = CurrentPasswordPhase;
 QString currentPasswordQueryDialogTitle(
 hbTrId("txt_phone_info_current_password"));
 QObject::connect(
 m_currentPassword,
 m_newPassword,
 m_newPasswordVerified);
 m_phoneNotes->showGlobalProgressNote(
 m_activeNoteId,
-hbTrId("txt_phone_info_requesting"));
+hbTrId("txt_common_info_requesting"));
 QObject::disconnect(
 m_phoneNotes, SIGNAL(passwordQueryCompleted(QString, bool)),
 this, SLOT(changeBarringPasswordPhasesHandling(QString, bool)));
 }
 break;
 DPRINT << ": IN";
 CpSettingFormItemData* barringItem = NULL;
 PSetCallBarringWrapper::BarringType barringType =
 qvariant_cast<PSetCallBarringWrapper::BarringType>(
-changedBarringItem.property("barringType"));
+changedBarringItem.contentWidgetData("barringType"));
 QList<CpSettingFormItemData*> itemCandidatesForUpdate;
 switch (barringType) {
 case PSetCallBarringWrapper::BarringTypeAllOutgoing:
 {
 barringItem = &barringItemByProgram(
 for (int childInd = 0; (childInd < numOfChilds) && (!item); childInd++) {
 CpSettingFormItemData *itemCandidate =
 static_cast<CpSettingFormItemData*>(childAt(childInd));
 PSetCallBarringWrapper::BarringType candidateBarringProgram =
 qvariant_cast<PSetCallBarringWrapper::BarringType>(
-itemCandidate->property("barringType"));
+itemCandidate->contentWidgetData("barringType"));
 if (candidateBarringProgram == barringProgram) {
 item = itemCandidate;
 }
 }

branch	GCC_SURGE
changeset 51	f39ed5e045e0
parent 30	ebdbd102c78a
parent 45	6b911d05207e