diff -r b1ea1642412e -r ac7e4d1d9209 fep/aknfep/UiPlugins/AknFepUiInterface/AvkonImpl/src/AknFepPredictiveSettingList.cpp --- a/fep/aknfep/UiPlugins/AknFepUiInterface/AvkonImpl/src/AknFepPredictiveSettingList.cpp Thu Jul 15 19:01:13 2010 +0300 +++ b/fep/aknfep/UiPlugins/AknFepUiInterface/AvkonImpl/src/AknFepPredictiveSettingList.cpp Thu Aug 19 10:15:25 2010 +0300 @@ -36,12 +36,15 @@ #include #include #include -#include +#include +#include #include "AknFepPredictiveSettingList.h" #include "AknFepPredictiveSettingData.h" #include "AknFepPredictiveSettingDialog.h" +const TInt KFSQMode = 2; + CAknFepMultiSelectionSettingItem::CAknFepMultiSelectionSettingItem ( TInt aResourceId, CAknFepPredictiveSettingData &aData, CCoeEnv* aCoeEnv ) : CAknBigSettingItemBase(aResourceId), iData(aData), iCoeEnv(aCoeEnv) @@ -289,37 +292,56 @@ switch (aIdentifier) { case EAknFepCmdPredAutoComplSetting: + { settingItem = new (ELeave) CAknBinaryPopupSettingItem ( aIdentifier, iSettingsData.AutoWordCompl()); if(DeviceHasMultipleKeyboards()) { settingItem->SetHidden(ETrue); } + } break; case EAknFepCmdPredAutoComplMultiSetting: + { settingItem = new (ELeave) CAknFepMultiSelectionSettingItem ( aIdentifier, iSettingsData, iCoeEnv ); if(!DeviceHasMultipleKeyboards()) { settingItem->SetHidden(ETrue); } + } break; case EAknFepCmdPredNumberCandidateSetting: + { settingItem = new (ELeave) CAknBinaryPopupSettingItem ( aIdentifier, iSettingsData.NumberCandidates()); - if(keyboardLayout == EPtiKeyboard12Key || keyboardLayout == EPtiKeyboardHalfQwerty) + + TInt dialogState = 0; + RProperty::Get( KPSUidAknFep, KAknFepSettingDialogState, dialogState ); + //Remove Number Candidate item from setting dialog + if ( dialogState == KFSQMode || + keyboardLayout == EPtiKeyboard12Key || + keyboardLayout == EPtiKeyboardHalfQwerty) + { + // When dialog state is 2, it means that the setting dialog is opened + // for virtual qwerty keyboard settingItem->SetHidden(ETrue); + } + } break; case EAknFepCmdPredTypingCorrectionSetting: + { settingItem = new (ELeave) CAknEnumeratedTextPopupSettingItem ( aIdentifier, iSettingsData.TypingCorrection()); // Disabled for ITU-T if(keyboardLayout == EPtiKeyboard12Key || keyboardLayout == EPtiKeyboardHalfQwerty) settingItem->SetHidden(ETrue); + } break; case EAknFepCmdPredPrimaryCandidateSetting: + { settingItem = new (ELeave) CAknBinaryPopupSettingItem ( aIdentifier, iSettingsData.PrimaryCandidate()); @@ -327,6 +349,7 @@ if(keyboardLayout == EPtiKeyboardHalfQwerty || keyboardLayout == EPtiKeyboard12Key) settingItem->SetHidden(ETrue); + } break; default: break;