diff -r 5aa7c7ec6b8e -r 3487b2ea501a controlpanelui/src/cpplugins/volumeplugin/src/cpvolumecontroller.cpp --- a/controlpanelui/src/cpplugins/volumeplugin/src/cpvolumecontroller.cpp Fri Sep 17 08:29:50 2010 +0300 +++ b/controlpanelui/src/cpplugins/volumeplugin/src/cpvolumecontroller.cpp Mon Oct 04 00:18:12 2010 +0300 @@ -118,19 +118,7 @@ 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",mProfileModel->masterVolume()); @@ -148,18 +136,7 @@ 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); @@ -180,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