diff -r a5692c68d772 -r 593f946f4fec controlpanelui/src/cpplugins/volumeplugin/src/cpvolumegroupitemdata.cpp --- a/controlpanelui/src/cpplugins/volumeplugin/src/cpvolumegroupitemdata.cpp Fri Jun 25 17:12:20 2010 +0800 +++ b/controlpanelui/src/cpplugins/volumeplugin/src/cpvolumegroupitemdata.cpp Wed Sep 29 10:09:58 2010 +0800 @@ -26,6 +26,7 @@ #include "cpvolumecontroller.h" #include "cppersonalizationcustomviewitem.h" #include +#include CpVolumeGroupItemData::CpVolumeGroupItemData(CpItemDataHelper &itemDataHelper) : CpSettingFormItemData(HbDataFormModelItem::GroupItem,hbTrId("txt_cp_subhead_volume")),//mSilenceIndicator(0), @@ -35,6 +36,7 @@ mProfileModel(0) { initItems(itemDataHelper); + HbStyleLoader::registerFilePath(":/resources/hbslider_color.css"); } CpVolumeGroupItemData::~CpVolumeGroupItemData() @@ -54,6 +56,7 @@ HbDataFormModelItem *silenceIndicator = new HbDataFormModelItem(static_cast(SilenceIndicatorItem)); mItemList.insert(CpVolumeGroupItemData::EVolumeSilenceItem, silenceIndicator); silenceIndicator->setContentWidgetData("text",hbTrId("txt_cp_button_silence")); + silenceIndicator->setContentWidgetData("objectName", "silenceIndicatorButton"); this->appendChild(silenceIndicator); HbDataFormModelItem *masterVolume = new HbDataFormModelItem(HbDataFormModelItem::SliderItem, @@ -64,23 +67,17 @@ << QVariant(HbSlider::DecreaseElement) << QVariant(HbSlider::IconElement) << QVariant(HbSlider::TextElement); masterVolume->setContentWidgetData("sliderElements",elements); + masterVolume->setContentWidgetData("objectName","masterVolumeSlider"); QMap iconMaps; - 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")); + iconMaps.insert(QString("DecreaseElement"), QVariant("qtg_mono_vol_down")); + iconMaps.insert(QString("IncreaseElement"), QVariant("qtg_mono_vol_up")); masterVolume->setContentWidgetData("elementIcons", iconMaps); masterVolume->setContentWidgetData("minimum", 1); - masterVolume->setContentWidgetData("maximum", 3); + masterVolume->setContentWidgetData("maximum", 10); masterVolume->setContentWidgetData("majorTickInterval",1); masterVolume->setContentWidgetData("tickPosition",Hb::SliderTicksBelow); - - /*QStringList tickLabels; - tickLabels<setContentWidgetData("majorTickLabels",tickLabels);*/ masterVolume->setContentWidgetData("iconCheckable",false); this->appendChild(masterVolume); @@ -88,6 +85,7 @@ HbDataFormModelItem *masterVibra = new HbDataFormModelItem(HbDataFormModelItem::CheckBoxItem); mItemList.insert(CpVolumeGroupItemData::EVolumeMasterVibraItem, masterVibra); masterVibra->setContentWidgetData("text",hbTrId("txt_cp_list_vibrate")); + masterVibra->setContentWidgetData("objectName","masterVibraCheckBox"); this->appendChild(masterVibra);