equal
deleted
inserted
replaced
414 if (item->iItemType == CAspListItemData::ETypeListYesNo) |
414 if (item->iItemType == CAspListItemData::ETypeListYesNo) |
415 { |
415 { |
416 // open editor for Yes/No setting |
416 // open editor for Yes/No setting |
417 if (EditSettingItemListL(*item)) |
417 if (EditSettingItemListL(*item)) |
418 { |
418 { |
419 SetVisibility(); |
419 SetVisibilityL(); |
420 UpdateListBoxL(ListBox(), iSettingList); |
420 UpdateListBoxL(ListBox(), iSettingList); |
421 } |
421 } |
422 } |
422 } |
423 else |
423 else |
424 { |
424 { |
857 return; |
857 return; |
858 } |
858 } |
859 |
859 |
860 if (EditSettingItemL(*item)) |
860 if (EditSettingItemL(*item)) |
861 { |
861 { |
862 SetVisibility(); |
862 SetVisibilityL(); |
863 UpdateListBoxL(ListBox(), iSettingList); |
863 UpdateListBoxL(ListBox(), iSettingList); |
864 } |
864 } |
865 } |
865 } |
866 |
866 |
867 |
867 |
908 for (TInt i=0; i<count; i++) |
908 for (TInt i=0; i<count; i++) |
909 { |
909 { |
910 InitSettingItemL((*iSettingList)[i]); |
910 InitSettingItemL((*iSettingList)[i]); |
911 } |
911 } |
912 |
912 |
913 SetVisibility(); // find out what setting appear on UI |
913 SetVisibilityL(); // find out what setting appear on UI |
914 |
914 |
915 CleanupStack::PopAndDestroy(arr); |
915 CleanupStack::PopAndDestroy(arr); |
916 } |
916 } |
917 |
917 |
918 |
918 |
961 TInt appId = TUtil::AppIdFromProviderId(providerItem.iDataProviderId); |
961 TInt appId = TUtil::AppIdFromProviderId(providerItem.iDataProviderId); |
962 if (iApplicationId != EApplicationIdSync && iApplicationId != appId) |
962 if (iApplicationId != EApplicationIdSync && iApplicationId != appId) |
963 { |
963 { |
964 continue; |
964 continue; |
965 } |
965 } |
966 |
966 |
|
967 // In Phonebooks syncronization settings, remove another provider from |
|
968 // end of settings item list |
|
969 if (appId == EApplicationIdContact) |
|
970 { |
|
971 TInt operatorUid = CAspProfile::OperatorAdapterUidL(); |
|
972 //if current profile is operator profile, don't display s60 contacts adapter |
|
973 if (CAspProfile::IsOperatorProfileL(iProfile)) |
|
974 { |
|
975 if (operatorUid != providerItem.iDataProviderId) |
|
976 { |
|
977 continue; |
|
978 } |
|
979 } |
|
980 //if current profile is not operator profile, don't display operator adapter |
|
981 else if (operatorUid == providerItem.iDataProviderId) |
|
982 { |
|
983 continue; |
|
984 } |
|
985 } |
|
986 |
967 HBufC* firstLine = CAspResHandler::GetContentSettingLC( |
987 HBufC* firstLine = CAspResHandler::GetContentSettingLC( |
968 providerItem.iDataProviderId, |
988 providerItem.iDataProviderId, |
969 providerItem.iDisplayName); |
989 providerItem.iDisplayName); |
970 |
990 |
971 CAspListItemData* item = CAspListItemData::NewLC(); |
991 CAspListItemData* item = CAspListItemData::NewLC(); |
1040 ListBox()->HandleItemAdditionL(); |
1060 ListBox()->HandleItemAdditionL(); |
1041 } |
1061 } |
1042 |
1062 |
1043 |
1063 |
1044 // ----------------------------------------------------------------------------- |
1064 // ----------------------------------------------------------------------------- |
1045 // CAspProfileDialog::SetVisibility |
1065 // CAspProfileDialog::SetVisibilityL |
1046 // |
1066 // |
1047 // ----------------------------------------------------------------------------- |
1067 // ----------------------------------------------------------------------------- |
1048 // |
1068 // |
1049 void CAspProfileDialog::SetVisibility() |
1069 void CAspProfileDialog::SetVisibilityL() |
1050 { |
1070 { |
1051 TBool isPCSuite = CAspProfile::IsPCSuiteProfile(iProfile); |
1071 TBool isPCSuite = CAspProfile::IsPCSuiteProfile(iProfile); |
1052 |
1072 |
1053 TBool readOnly = iProfile->DeleteAllowed(); |
1073 TBool readOnly = iProfile->DeleteAllowed(); |
1054 |
1074 |
1121 #ifdef __SYNCML_DS_ALERT |
1141 #ifdef __SYNCML_DS_ALERT |
1122 Item(EAspServerAlert)->iHidden = EVisibilityNormal; |
1142 Item(EAspServerAlert)->iHidden = EVisibilityNormal; |
1123 #endif |
1143 #endif |
1124 |
1144 |
1125 if (iEditMode == EDialogModeReadOnly || |
1145 if (iEditMode == EDialogModeReadOnly || |
1126 iEditMode == EDialogModeSettingEnforcement) |
1146 iEditMode == EDialogModeSettingEnforcement || |
|
1147 iProfile->IsReadOnlyOperatorProfileL() ) |
1127 { |
1148 { |
1128 SetAllReadOnly(); |
1149 SetAllReadOnly(); |
1129 } |
1150 } |
1130 } |
1151 } |
1131 |
1152 |