--- a/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsform.cpp	Tue Jul 06 14:26:20 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsform.cpp	Wed Aug 18 09:58:19 2010 +0300
@@ -25,18 +25,19 @@
 #include <rfsHandler.h>
 
 CpRfsSettingsForm::CpRfsSettingsForm(QGraphicsItem *parent) :
-    HbDataForm(parent)
+    HbDataForm(parent),mTrans("control_panel")
     {
-    this->setHeading(tr("Restore Factory Settings"));
+    this->setHeading(hbTrId("txt_cp_subhead_reset"));
 
     //initialize the form model
     initRfsSettingModel();
 
-    connect(this, SIGNAL(activated(QModelIndex)),this, SLOT(onItemActivated(QModelIndex)));
+    connect(this, SIGNAL(itemShown(QModelIndex)),this, SLOT(onItemActivated(QModelIndex)));
     }
 
 CpRfsSettingsForm::~CpRfsSettingsForm()
     {
+    
     }
 
 void CpRfsSettingsForm::initRfsSettingModel()
@@ -44,16 +45,16 @@
     HbDataFormModel *model = new HbDataFormModel(0);
 
 		// Create the custom items because HbPushButton cannot be added to the HbDataFormModelItem
-    HbDataFormModelItem::DataItemType customItem = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 1);
-                    
-    mNormalRfs = model->appendDataFormItem(customItem, QString(), model->invisibleRootItem());
-    mNormalRfs->setData(HbDataFormModelItem::KeyRole, tr("Restore"));
-
     HbDataFormModelItem::DataItemType customItem1 = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 1);
-                    
-    mDeepRfs = model->appendDataFormItem(customItem1, QString(), model->invisibleRootItem());
-    mDeepRfs->setData(HbDataFormModelItem::KeyRole,tr("Delete Data and Restore"));
-
+    
+    mNormalRfs = model->appendDataFormItem(customItem1, QString(), model->invisibleRootItem());
+    mNormalRfs->setLabel(hbTrId("txt_cp_setlabel_settings_reset"));
+    mNormalRfs->setDescription(hbTrId("txt_cp_info_original_settings_will_be_restored_no"));
+    HbDataFormModelItem::DataItemType customItem2 = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 2);
+               
+    mDeepRfs = model->appendDataFormItem(customItem2, QString(), model->invisibleRootItem());
+    mDeepRfs->setLabel(hbTrId("txt_cp_setlabel_device_reset"));
+    mDeepRfs->setDescription(hbTrId("txt_cp_info_all_data_will_be_deleted_and_factory_s")); 
     this->setModel(model);
     }
 
@@ -65,8 +66,8 @@
     if (itemData->type() > HbDataFormModelItem::GroupPageItem)
         {
         //get the widget of setting item
-        HbWidget* widget = this->dataFormViewItem(index)->dataItemContentWidget();
-
+        HbAbstractViewItem* viewitem  = static_cast<HbAbstractItemView*>(this)->itemByIndex(index);
+        HbWidget* widget =static_cast<HbDataFormViewItem*>(viewitem)->dataItemContentWidget(); 
 		if (itemData == mNormalRfs)
             {
             activateNormalRfs(widget);