FCL/sf/app/phone: comparison phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.cpp

equal deleted inserted replaced

-:bab96b7ed1a4
+:f39ed5e045e0
 QScopedPointer<HbDataFormModel> model(new HbDataFormModel);
 QScopedPointer<CpSettingsWrapper> cpSettingsWrapperGuard(new CpSettingsWrapper);
 // #1 Read Network mode value from Cenrep
 model->appendDataFormItem(createNetworkModeItem());
-// #2 Use phone settings for operator selection
+if(m_psetNetworkWrapper->isManualNetworkSelectionSupported()) {
-model->appendDataFormItem(createOperatorSelectionItem());
+// #2 Use phone settings for operator selection
+model->appendDataFormItem(createOperatorSelectionItem());
+}
 // Home network cellular data usage
 model->appendDataFormItem(createHomeDataUsageItem());
 // Cellular network data usage when roaming
 model->appendDataFormItem(createRoamDataUsageItem());
 setModel(model.take());
 m_pSetWrapper = pSetWrapperGuard.take();
 m_cpSettingsWrapper = cpSettingsWrapperGuard.take();
-if(!isPhoneOnLine()) {
-DPRINT << "offline, set dimmed";
-m_NetworkOperatorSelectionItemData->setEnabled(false);
-}
 DPRINT << ": OUT";
 }
 /*!
 CpNetworkPluginForm::~CpNetworkPluginForm
 */
 CpNetworkPluginForm::~CpNetworkPluginForm()
 {
-DPRINT << ": IN";
+DPRINT;
 delete m_pSetWrapper;
 delete m_cpSettingsWrapper;
-DPRINT << ": OUT";
 }
 /*!
 CpNetworkPluginForm::createNetworkModeItem
 HbDataFormModelItem::ComboBoxItem,
 hbTrId("txt_cp_setlabel_network_mode"),
 NULL );
 QScopedPointer<CpSettingFormItemData> settingFormItemGuard(
 m_NetworkModeOptionsItemData);
+m_NetworkModeOptionsItemData->setObjectName("networkModeItem");
 mNetworkModeOptions << hbTrId("txt_cp_setlabel_network_mode_val_dual_mode")
 << hbTrId("txt_cp_setlabel_network_mode_val_umts")
 << hbTrId("txt_cp_setlabel_network_mode_val_gsm");
 m_NetworkModeOptionsItemData->setContentWidgetData(
 HbDataFormModelItem::ToggleValueItem,
 hbTrId("txt_cp_setlabel_operator_selection"),
 NULL);
 QScopedPointer<CpSettingFormItemData> settingFormItemGuard(
 m_NetworkOperatorSelectionItemData);
+m_NetworkOperatorSelectionItemData->setObjectName("operatorSelectionItem");
 PSetNetworkWrapper::NetworkSelectionMode mode;
 PSetNetworkWrapper::ErrorCode err =
 m_psetNetworkWrapper->getNetworkSelectionMode(mode);
 if(err == PSetNetworkWrapper::ErrNoError) {
 break;
 default:
 break;
 }
 }
-addConnection(
+	addConnection(
-m_NetworkOperatorSelectionItemData, SIGNAL(clicked(bool) ),
+m_NetworkOperatorSelectionItemData, SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
-this, SLOT(operatorSelectionStateChanged(bool)));
+this, SLOT(operatorSelectionStateChanged()));
 settingFormItemGuard.take();
 DPRINT << ": OUT";
 return m_NetworkOperatorSelectionItemData;
 }
 HbDataFormModelItem::ComboBoxItem,
 hbTrId("txt_cp_setlabel_data_usage_in_home_network"),
 NULL);
 QScopedPointer<CpSettingFormItemData> settingFormItemGuard(
 mCellularUseHomeSelectionItemData);
+mCellularUseHomeSelectionItemData->setObjectName("homeDataUsageItem");
 // Populate the dropdown with selection items
 mCellularUseHomeOptions
 << hbTrId("txt_cp_setlabel_data_usage_in_val_automatic")
 << hbTrId("txt_cp_setlabel_data_usage_in_val_confirm")
 << hbTrId("txt_cp_setlabel_data_usage_in_val_disabled");
 CpNetworkPluginForm::cellularDataUseHomeStateChanged
 */
 void CpNetworkPluginForm::cellularDataUseHomeStateChanged(int index)
 {
 DPRINT << ": IN : index: " << index;
 mCellularSettings->setDataUseHome(index);
 DPRINT << ": OUT";
 }
 /*!
 CpNetworkPluginForm::createRoamDataUsageItem
 HbDataFormModelItem::ComboBoxItem,
 hbTrId("txt_cp_setlabel_data_usage_when_roaming"),
 NULL);
 QScopedPointer<CpSettingFormItemData> settingFormItemGuard(
 mCellularUseRoamSelectionItemData);
+mCellularUseRoamSelectionItemData->setObjectName("roamDataUsageItem");
 // Populate the dropdown with selection items
 mCellularUseRoamOptions
 << hbTrId("txt_cp_setlabel_data_usage_when_val_automatic")
 << hbTrId("txt_cp_setlabel_data_usage_when_val_confirm")
 << hbTrId("txt_cp_setlabel_data_usage_when_val_disabled");
 void CpNetworkPluginForm::networkModeStateChanged(int index)
 {
 // #1C network mode changed
 DPRINT << ": IN : index: " << index;
-if(isPhoneOnLine()) {
+if(m_cpSettingsWrapper->isPhoneOffline()) {
+// offline mode.
+m_psetNetworkWrapper->getNetworkAccessMode();
+emit showGlobalNote(
+m_activeNoteId,
+emit hbTrId("Off-line, not allowed"),
+HbMessageBox::MessageTypeInformation);
+} else if(m_cpSettingsWrapper->isOngoingCall()) {
+// ongoing call.
+m_psetNetworkWrapper->getNetworkAccessMode();
+emit showGlobalNote(
+m_activeNoteId,
+emit hbTrId("txt_cp_info_active_calls_must_be_disconnected_befo"),
+HbMessageBox::MessageTypeInformation);
+} else {
+// ok case
 if(index == 0) {
 dualModeSelection();
 } else if(index == 1) {
 umtsSelection();
 } else if(index == 2) {
 gsmSelection();
 }
-} else {
+}
-// offline mode.
+DPRINT << ": OUT";
+}
+/*!
+CpNetworkPluginForm::operatorSelectionStateChanged
+*/
+void CpNetworkPluginForm::operatorSelectionStateChanged()
+{
+// #2C operator selection mode changed
+DPRINT << ": IN ";
+if (m_cpSettingsWrapper->isPhoneOffline()) {
+// off line
+restoreOperatorSelectionUi();
 emit showGlobalNote(
 m_activeNoteId,
-emit hbTrId("Operation not possible in Off-line mode"),
+emit hbTrId("txt_cp_info_operator_selection_is_not_possible_in"),
 HbMessageBox::MessageTypeInformation);
-}
+} else if(m_cpSettingsWrapper->isOngoingCall()) {
+// ongoing call.
-DPRINT << ": OUT";
+restoreOperatorSelectionUi();
-}
+emit showGlobalNote(
+m_activeNoteId,
+emit hbTrId("txt_cp_info_active_calls_must_be_disconnected_befo"),
-/*!
+HbMessageBox::MessageTypeInformation);
-CpNetworkPluginForm::operatorSelectionStateChanged
+} else {
-*/
+// ok case
-void CpNetworkPluginForm::operatorSelectionStateChanged(bool)
-{
-// #2C operator selection mode changed
-DPRINT << ": IN ";
-if (isPhoneOnLine()) {
 PSetNetworkWrapper::NetworkSelectionMode mode;
-m_psetNetworkWrapper->getNetworkSelectionMode(mode);
+PSetNetworkWrapper::ErrorCode err =
+m_psetNetworkWrapper->getNetworkSelectionMode(mode);
+if(err == PSetNetworkWrapper::ErrNoError) {
 switch (mode) {
 case PSetNetworkWrapper::SelectionModeAutomatic:
 manualOperatorSelection();
 m_NetworkOperatorSelectionItemData->setContentWidgetData(
 "text", QVariant(hbTrId("txt_cp_setlabel_operator_selection_val_manual")));
 "text", QVariant(hbTrId("txt_cp_setlabel_operator_selection_val_automatic")));
 break;
 default:
 break;
 }
 } else {
-// offline mode.
+DWARNING << ": err: " << err;
-emit showGlobalNote(
+}
-m_activeNoteId,
+}
-emit hbTrId("Operation not possible in Off-line mode"),
-HbMessageBox::MessageTypeInformation);
-}
 DPRINT << ": OUT";
 }
 /*!
 */
 void CpNetworkPluginForm::networkAccessModeGot(
 int mode)
 {
 DPRINT << ": IN";
+removeConnection(
+m_NetworkModeOptionsItemData,
+SIGNAL(currentIndexChanged(int)),
+this,
+SLOT(networkModeStateChanged(int)));
 switch (mode) {
 case PSetNetworkWrapper::AccessModeDual:
 m_NetworkModeOptionsItemData->setContentWidgetData(
 "currentIndex", 0);
 break;
 "currentIndex", 2);
 break;
 default:
 break;
 }
+addConnection(
+m_NetworkModeOptionsItemData,
+SIGNAL(currentIndexChanged(int)),
+this,
+SLOT(networkModeStateChanged(int)));
 DPRINT << ": OUT";
 }
 /*!
 /*!
 CpNetworkPluginForm::createDialog
 */
 void CpNetworkPluginForm::addItemToListWidget(HbListWidget* w,
-const QString& item, const int& data) const
+const QString& item, const int& data,
+const HbIcon& primaryIcon) const
 {
 DPRINT << ": IN";
 Q_ASSERT(w != 0);
 HbListWidgetItem* o = new HbListWidgetItem();
 o->setText(item);
 o->setData(data);
+if(!primaryIcon.isNull())
+o->setIcon(primaryIcon);
 w->addItem(o);
 DPRINT << ": OUT";
 }
 showManualSelectiondialog();
 }
 else if(type == PSetNetworkWrapper::RequestSetNetwork ||
 type == PSetNetworkWrapper::RequestSetNetworkAutomatic ||
 type == PSetNetworkWrapper::RequestGetNetworkInfo) {
-restoreUiSelection();
+restoreOperatorSelectionUi();
 }
 DPRINT << ": OUT";
 }
 void CpNetworkPluginForm::userCancel()
 {
 DPRINT << ": IN";
 m_psetNetworkWrapper->cancelRequest();
-restoreUiSelection();
+restoreOperatorSelectionUi();
 DPRINT << ": OUT";
 }
 if (ongoing) {
 QObject::connect(
 CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()),
 this, SLOT(userCancel()));
-emit showGlobalProgressNote(m_activeProgressNoteId, hbTrId("Requesting"));
+emit showGlobalProgressNote(m_activeProgressNoteId, hbTrId("txt_common_info_requesting"));
 } else {
 QObject::disconnect(
 CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()),
 this, SLOT(userCancel()));
 emit cancelNote(m_activeProgressNoteId);
 //then insert found networks
 int itemsCount = m_networkInfoList->count();
 for (int i = 0; i < itemsCount; i++) {
 PSetNetworkWrapper::NetworkInfo *info = m_networkInfoList->at(i);
 QString text = networkName(*info);
-addItemToListWidget(list, text, i);
+addItemToListWidget(list, text, i, HbIcon(primaryIconForNetwork(*info)));
 DPRINT << ":  " << info;
 }
 // Connect list item activation signal to close the popup
 connect(
 list, SIGNAL(activated(HbListWidgetItem*)),
 m_dialog = NULL;
 }
 m_dialog = dialog.take();
 DPRINT << ": OUT";
+}
+/*!
+CpNetworkPluginForm::primaryIconForNetwork
+*/
+QString CpNetworkPluginForm::primaryIconForNetwork(const PSetNetworkWrapper::NetworkInfo &info)
+{
+DPRINT << ": IN";
+QString iconName;
+bool isForbiddenIconSupported = m_cpSettingsWrapper->forbiddenIconSupported();
+if (isForbiddenIconSupported) {
+if (info.m_access == PSetNetworkWrapper::AccessTypeGsm) {
+if (info.m_status == PSetNetworkWrapper::StatusForbidden) {
+iconName.append("qtg_small_network_off");
+} else {
+iconName.append("qtg_small_network");
+}
+} else if (info.m_access == PSetNetworkWrapper::AccessTypeWcdma) {
+if (info.m_status == PSetNetworkWrapper::StatusForbidden) {
+iconName.append("qtg_small_wcdma_off");
+} else {
+iconName.append("qtg_small_wcdma");
+}
+}
+else if (info.m_access == PSetNetworkWrapper::AccessTypeGsmAndWcdma) {
+if (info.m_status == PSetNetworkWrapper::StatusForbidden) {
+iconName.append("qtg_small_pd_wcdma_off");
+} else {
+iconName.append("qtg_small_pd_wcdma");
+}
+}
+}
+DPRINT << ": OUT : " << iconName;
+return iconName;
 }
 /*!
 CpNetworkPluginForm::finishedManualSelectiondialog.
 m_psetNetworkWrapper->selectNetwork(param);
 }
 } else {
 DPRINT << ": Cancel";
 m_psetNetworkWrapper->cancelRequest();
-restoreUiSelection();
+restoreOperatorSelectionUi();
 }
 m_dialog->deleteLater();
 m_dialog = NULL;
 }
 DPRINT << ": OUT";
 }
 /*!
-CpNetworkPluginForm::restoreUiSelection
+CpNetworkPluginForm::restoreOperatorSelectionUi
 */
-void CpNetworkPluginForm::restoreUiSelection()
+void CpNetworkPluginForm::restoreOperatorSelectionUi()
 {
 DPRINT << ": IN";
 removeConnection(
-m_NetworkOperatorSelectionItemData, SIGNAL(currentIndexChanged(int)),
+m_NetworkOperatorSelectionItemData, SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
-this, SLOT(operatorSelectionStateChanged(int)));
+this, SLOT(operatorSelectionStateChanged()));
 PSetNetworkWrapper::NetworkSelectionMode mode;
 PSetNetworkWrapper::ErrorCode err =
 m_psetNetworkWrapper->getNetworkSelectionMode(mode);
 if(err == PSetNetworkWrapper::ErrNoError) {
 switch (mode) {
 default:
 break;
 }
 }
 addConnection(
-m_NetworkOperatorSelectionItemData, SIGNAL(currentIndexChanged(int)),
+m_NetworkOperatorSelectionItemData, SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
-this, SLOT(operatorSelectionStateChanged(int)));
+this, SLOT(operatorSelectionStateChanged()));
 DPRINT << ": OUT";
 }
 &notes,
 SLOT(cancelNote(int)));
 }
 /*!
-CpNetworkPluginForm::isPhoneOnLine
-*/
-bool CpNetworkPluginForm::isPhoneOnLine()
-{
-DPRINT << ": IN";
-bool onLine(true);
-if (m_cpSettingsWrapper->isPhoneOffline()) {
-onLine = false;
-}
-DPRINT << ": OUT : onLine : " << onLine;
-return onLine;
-}
-/*!
 CpNetworkPluginForm::searchAvailableNetworks
 */
 void CpNetworkPluginForm::searchAvailableNetworks()
 {
 DPRINT << ": IN";

branch	GCC_SURGE
changeset 51	f39ed5e045e0
parent 30	ebdbd102c78a
parent 46	bc5a64e5bc3c