equal
deleted
inserted
replaced
52 QScopedPointer<PSetWrapper> pSetWrapperGuard(new PSetWrapper); |
52 QScopedPointer<PSetWrapper> pSetWrapperGuard(new PSetWrapper); |
53 m_psetNetworkWrapper = &pSetWrapperGuard->networkWrapper(); |
53 m_psetNetworkWrapper = &pSetWrapperGuard->networkWrapper(); |
54 mCellularSettings = QSharedPointer<CellularDataSettings>(new CellularDataSettings); |
54 mCellularSettings = QSharedPointer<CellularDataSettings>(new CellularDataSettings); |
55 |
55 |
56 QScopedPointer<HbDataFormModel> model(new HbDataFormModel); |
56 QScopedPointer<HbDataFormModel> model(new HbDataFormModel); |
57 QScopedPointer<CpSettingsWrapper> cpSettingsWrapperGuard(new CpSettingsWrapper); |
57 QScopedPointer<SettingsWrapper> cpSettingsWrapperGuard(new SettingsWrapper); |
58 |
58 |
59 // #1 Read Network mode value from Cenrep |
59 // #1 Read Network mode value from Cenrep |
60 model->appendDataFormItem(createNetworkModeItem()); |
60 model->appendDataFormItem(createNetworkModeItem()); |
61 if(m_psetNetworkWrapper->isManualNetworkSelectionSupported()) { |
61 if(m_psetNetworkWrapper->isManualNetworkSelectionSupported()) { |
62 // #2 Use phone settings for operator selection |
62 // #2 Use phone settings for operator selection |
951 DPRINT << ": IN : visible " << visible; |
951 DPRINT << ": IN : visible " << visible; |
952 |
952 |
953 HbDataFormModel* formModel = qobject_cast<HbDataFormModel*>(model()); |
953 HbDataFormModel* formModel = qobject_cast<HbDataFormModel*>(model()); |
954 if (formModel) { |
954 if (formModel) { |
955 if (visible && !m_NetworkOperatorSelectionItemData) { |
955 if (visible && !m_NetworkOperatorSelectionItemData) { |
956 formModel->appendDataFormItem(createOperatorSelectionItem()); |
956 const int KOperatorSelectionItemIndex = 1; |
|
957 formModel->insertDataFormItem( |
|
958 KOperatorSelectionItemIndex, createOperatorSelectionItem()); |
957 } else if (!visible && m_NetworkOperatorSelectionItemData) { |
959 } else if (!visible && m_NetworkOperatorSelectionItemData) { |
958 removeConnection( |
960 removeConnection( |
959 m_NetworkOperatorSelectionItemData, |
961 m_NetworkOperatorSelectionItemData, |
960 SIGNAL(valueChanged(QPersistentModelIndex, QVariant)), |
962 SIGNAL(valueChanged(QPersistentModelIndex, QVariant)), |
961 this, |
963 this, |