--- a/controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilesettingform.cpp	Fri Sep 17 08:29:50 2010 +0300
+++ b/controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilesettingform.cpp	Mon Oct 04 00:18:12 2010 +0300
@@ -36,12 +36,13 @@
 CpProfileSettingForm::CpProfileSettingForm()
     : mModel(0), mItemDataHelper(new CpItemDataHelper( this )),
     mProfileModel(new CpProfileModel()), mFileIconProvider(new QFileIconProvider),
-    mGeneralPage(0),mMeetingPage(0),mCurrentPage( 0 ), mSettingManager(0)
+    mGeneralPage(0),mMeetingPage(0), mSettingManager(0), mCurrentPage(0)
 {
     this->setHeading(hbTrId("txt_cp_button_advanced_settings"));
-    this->setDescription(hbTrId("txt_cp_info_select_tones_that_play_when_you_select"));
-    
+    this->setDescription(hbTrId("txt_cp_info_select_tones_that_play_when_you_select"));    
     initModel();
+    connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(onDataFormActivated(QModelIndex)));
+
 }
 
 CpProfileSettingForm::~CpProfileSettingForm()
@@ -52,6 +53,31 @@
     delete mSettingManager;
 }
 
+void CpProfileSettingForm::onDataFormActivated(const QModelIndex &index)
+{
+    HbDataFormModelItem *item = mModel->itemFromIndex(index);
+    mCurrentPage = item;
+}
+
+QString  CpProfileSettingForm::currentPageProfileName()
+{
+    return mCurrentPage->label();
+}
+
+void CpProfileSettingForm::setCurrentPageProfileName(const QString &name)
+{
+    mCurrentPage->setLabel(name);
+}
+
+void CpProfileSettingForm::updateModifiedProfileName(const QString &name)
+{
+    if (mCurrentPage == mGeneralPage) {
+        mProfileModel->setProfileName(EProfileWrapperGeneralId, name);
+    } else if (mCurrentPage == mMeetingPage) {
+        mProfileModel->setProfileName(EProfileWrapperMeetingId, name);
+    }    
+}
+
 void CpProfileSettingForm::initModel()
 {
     mModel = new HbDataFormModel();
@@ -77,7 +103,8 @@
     connect(mSettingManager, SIGNAL(valueChanged (XQSettingsKey, QVariant)),
             this, SLOT(settingValueChanged(XQSettingsKey, QVariant)));
     
-    mGeneralPage = mModel->appendDataFormPage( generalString );
+    mGeneralPage = mModel->appendDataFormPage( generalString );   
+    mCurrentPage = mGeneralPage;
     initProfileItems(EProfileWrapperGeneralId,mGeneralPage);
     
     //initGeneralTonesGroup();
@@ -165,13 +192,13 @@
     modelItem->setContentWidgetData( QString( "maximum" ), 5 );
     modelItem->setContentWidgetData( QString("value"), profileSettings.mKeyTouchScreenTone );
     QMap< QString, QVariant > elements;
-    elements.insert(QString("IncreaseElement") , QVariant(":/icon/hb_vol_slider_increment.svg"));
-    elements.insert(QString("DecreaseElement"), QVariant(":/icon/hb_vol_slider_decrement.svg") );
+    elements.insert(QString("IncreaseElement") , QVariant("qtg_mono_vol_up"));
+    elements.insert(QString("DecreaseElement"), QVariant("qtg_mono_vol_down") );
     if (profileSettings.mKeyTouchScreenTone != 0) {
-        elements.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_unmuted.svg") );
+        elements.insert(QString("IconElement"), QVariant("qtg_mono_speaker") );
     }
     else {
-        elements.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_muted.svg") );
+        elements.insert(QString("IconElement"), QVariant("qtg_mono_speaker_off") );
     }
     
     modelItem->setContentWidgetData( QString( "elementIcons" ), elements );
@@ -198,8 +225,8 @@
     modelItem->setContentWidgetData( QString( "maximum" ), 5 );
     modelItem->setContentWidgetData( QString("value"), profileSettings.mKeyTouchScreenVibra );
     QMap< QString, QVariant > iconElements;
-    iconElements.insert(QString("IncreaseElement") , QVariant(":/icon/hb_vol_slider_increment.svg"));
-    iconElements.insert(QString("DecreaseElement"), QVariant(":/icon/hb_vol_slider_decrement.svg") );
+    iconElements.insert(QString("IncreaseElement") , QVariant("qtg_mono_vol_up"));
+    iconElements.insert(QString("DecreaseElement"), QVariant("qtg_mono_vol_down") );
     modelItem->setContentWidgetData( QString( "elementIcons" ), iconElements );
     
     if (profileId == EProfileWrapperGeneralId) {
@@ -341,10 +368,10 @@
     QMap<QString, QVariant> elements = sliderItem->contentWidgetData("elementIcons").toMap();
     
     if (isMute) {        
-        elements.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_muted.svg"));
+        elements.insert(QString("IconElement"), QVariant("qtg_mono_speaker_off"));
     }
     else {
-        elements.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_unmuted.svg"));
+        elements.insert(QString("IconElement"), QVariant("qtg_mono_speaker"));
     }
     sliderItem->setContentWidgetData( QString( "elementIcons" ), elements ); 
 }