diff -r a5692c68d772 -r 593f946f4fec controlpanelui/src/cpplugins/volumeplugin/src/cpvolumecontroller.cpp --- a/controlpanelui/src/cpplugins/volumeplugin/src/cpvolumecontroller.cpp Fri Jun 25 17:12:20 2010 +0800 +++ b/controlpanelui/src/cpplugins/volumeplugin/src/cpvolumecontroller.cpp Wed Sep 29 10:09:58 2010 +0800 @@ -93,8 +93,8 @@ void CpVolumeController::masterVolumeChange(int value) { -#ifdef Q_OS_SYMBIAN - mProfileModel->setMasterVolume( volumeLevelToInt( (CpVolumeController::VolumeLevel)value ) ); +#ifdef Q_OS_SYMBIAN + mProfileModel->setMasterVolume(value); HbDataFormModelItem *masterVolume = mItemList.at(CpVolumeGroupItemData::EVolumeMasterVolumeItem); masterVolume->setContentWidgetData("value",value); #endif @@ -118,22 +118,10 @@ HbDataFormModelItem *masterVolume = mItemList.at(CpVolumeGroupItemData::EVolumeMasterVolumeItem); if (masterVolume) { CPFW_LOG("::updateMasterVolumeValue(), Start using profile model."); - QMap iconMaps; - if (isSilenceMode) { - CPFW_LOG("::updateMasterVolumeValue(), Got silent state."); - iconMaps.insert(QString("DecreaseElement"), QVariant(":/icon/hb_vol_slider_decrement.svg")); - iconMaps.insert(QString("IncreaseElement"), QVariant(":/icon/hb_vol_slider_increment.svg")); - iconMaps.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_muted.svg")); - } - else { - iconMaps.insert(QString("DecreaseElement"), QVariant(":/icon/hb_vol_slider_decrement.svg")); - iconMaps.insert(QString("IncreaseElement"), QVariant(":/icon/hb_vol_slider_increment.svg")); - iconMaps.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_unmuted.svg")); - } - masterVolume->setContentWidgetData("elementIcons", iconMaps); + setSilderSpeakerIcon(isSilenceMode); masterVolume->setEnabled(!isSilenceMode); //masterVolume->setContentWidgetData("enabled",!isSilenceMode); - masterVolume->setContentWidgetData("value",intToVolumeLevel(mProfileModel->masterVolume())); + masterVolume->setContentWidgetData("value",mProfileModel->masterVolume()); } HbDataFormModelItem *masterVibra = mItemList.at(CpVolumeGroupItemData::EVolumeMasterVibraItem); if (masterVibra) { @@ -143,47 +131,12 @@ #endif } -int CpVolumeController::volumeLevelToInt( CpVolumeController::VolumeLevel volumeLevel ) -{ - switch( volumeLevel ){ - case VolumenLevelSoft: - return EProfileMasterVolumeSoft; - case VolumeLevelMed: - return EProfileMasterVolumeMed; - case VolumeLevelLoud: - return EProfileMasterVolumeLoud; - default: - return 1; - } -} -CpVolumeController::VolumeLevel CpVolumeController::intToVolumeLevel( int value ) -{ - if( value < 4 ) { - return VolumenLevelSoft; - } else if( value < 8 ) - return VolumeLevelMed; - else{ - return VolumeLevelLoud; - } -} - void CpVolumeController::settingValueChanged(const XQSettingsKey &key, const QVariant &value) { if (key.uid() == KCRUidProfileEngine.iUid && key.key() == KProEngSilenceMode) { HbDataFormModelItem *masterVolume = mItemList.at(CpVolumeGroupItemData::EVolumeMasterVolumeItem); if (masterVolume) { - QMap iconMaps; - if (value.toBool()) { - iconMaps.insert(QString("DecreaseElement"), QVariant(":/icon/hb_vol_slider_decrement.svg")); - iconMaps.insert(QString("IncreaseElement"), QVariant(":/icon/hb_vol_slider_increment.svg")); - iconMaps.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_muted.svg")); - } - else { - iconMaps.insert(QString("DecreaseElement"), QVariant(":/icon/hb_vol_slider_decrement.svg")); - iconMaps.insert(QString("IncreaseElement"), QVariant(":/icon/hb_vol_slider_increment.svg")); - iconMaps.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_unmuted.svg")); - } - masterVolume->setContentWidgetData("elementIcons", iconMaps); + setSilderSpeakerIcon(value.toBool()); masterVolume->setEnabled(!value.toBool()); } HbDataFormModelItem *silenceMode = mItemList.at(CpVolumeGroupItemData::EVolumeSilenceItem); @@ -194,7 +147,7 @@ else if (key.uid() == KCRUidProfileEngine.iUid && key.key() == KProEngMasterVolume) { HbDataFormModelItem *masterVolume = mItemList.at(CpVolumeGroupItemData::EVolumeMasterVolumeItem); if (masterVolume) { - masterVolume->setContentWidgetData("value",intToVolumeLevel(value.toInt())); + masterVolume->setContentWidgetData("value",value.toInt()); } } else if (key.uid() == KCRUidProfileEngine.iUid && key.key() == KProEngMasterVibra) { @@ -204,5 +157,23 @@ } } } +/** + * set speaker icon for volume silder + */ +void CpVolumeController::setSilderSpeakerIcon(bool isSpeakerOff) +{ + HbDataFormModelItem *masterVolume = mItemList.at(CpVolumeGroupItemData::EVolumeMasterVolumeItem); + if (masterVolume != 0) { + QMap iconMaps; + iconMaps = masterVolume->contentWidgetData("elementIcons").toMap(); + if (isSpeakerOff) { + iconMaps.insert("IconElement", QVariant("qtg_mono_speaker_off")); + } + else { + iconMaps.insert("IconElement", QVariant("qtg_mono_speaker")); + } + masterVolume->setContentWidgetData("elementIcons", QVariant(iconMaps)); + } +} //End of File