diff -r bab96b7ed1a4 -r f39ed5e045e0 phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp --- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Tue Jun 15 14:14:38 2010 +0100 +++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Thu Jul 22 16:33:21 2010 +0100 @@ -30,6 +30,9 @@ #include #include #include +#include +#include +#include #include "cptelephonyutilsdefs.h" #include "cpplugincommon.h" #include "cppluginlogging.h" @@ -79,7 +82,7 @@ errorText = hbTrId("txt_phone_info_not_allowed"); break; case KErrGsmSSIncompatibility: - errorText = hbTrId("Services in conflict"); + errorText = hbTrId("txt_phone_info_conflict_error"); break; case KErrGsmSSSystemFailure: errorText = hbTrId("txt_phone_info_result_unknown"); @@ -169,6 +172,18 @@ return writeCenrepValue(KCRUidLogs.iUid, KLogsShowCallDuration, cenrepValue ); } +int CpSettingsWrapper::readVtVideoSending() +{ + DPRINT << ": IN"; + return readCenrepValue(KCRUidTelephonySettings.iUid, KSettingsVTVideoSending).toInt(); +} + +int CpSettingsWrapper::writeVtVideoSending(int value) +{ + DPRINT << ": IN"; + return writeCenrepValue(KCRUidTelephonySettings.iUid, KSettingsVTVideoSending, value); +} + void CpSettingsWrapper::readSoftRejectText(QString &text, bool &userDefined ) { if (SoftRejectTextDefault == @@ -200,6 +215,12 @@ { return readCenrepValue(KCRUidNumberGrouping.iUid, KNumberGrouping).toBool(); } + + bool CpSettingsWrapper::forbiddenIconSupported() const + { + int keyValue = readCenrepValue(KCRUidTelVariation.iUid, KTelVariationFlags).toInt(); + return (KTelephonyLVFlagForbiddenIcon & keyValue); + } QVariant CpSettingsWrapper::readCenrepValue( const long int uid, const unsigned long int key) const @@ -210,6 +231,15 @@ return ret; } +QVariant CpSettingsWrapper::readPubSubValue( + const long int uid, const unsigned long int key) const +{ + XQSettingsKey settingsKey(XQSettingsKey::TargetPublishAndSubscribe, uid, key); + QVariant ret = m_Settings->readItemValue(settingsKey); + DPRINT << "PubSub ret: " << ret; + return ret; +} + QString CpSettingsWrapper::readCenrepString( const long int uid, const unsigned long int key) const { @@ -246,3 +276,14 @@ } return offLinesupport; } + +bool CpSettingsWrapper::isOngoingCall() const +{ + bool callOngoing(false); + if (EPSCTsyCallStateNone < + readPubSubValue(KPSUidCtsyCallInformation.iUid, KCTsyCallState).toInt()) { + callOngoing = true; + } + return callOngoing; +} +