--- a/controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilesettingform.h	Fri Jun 25 17:12:20 2010 +0800
+++ b/controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilesettingform.h	Wed Sep 29 10:09:58 2010 +0800
@@ -20,6 +20,7 @@
 
 #include <hbdataform.h>
 #include <QHash>
+#include "cpprofilemodel.h"
 
 class HbDataFormModel;
 class HbDataFormModelItem;
@@ -47,19 +48,15 @@
     
     CpProfileSettingForm();
     virtual ~CpProfileSettingForm();
-    
+    QString currentPageProfileName();
+    void setCurrentPageProfileName(const QString &name);    
+    void updateModifiedProfileName(const QString &name);
 private slots:
     
     //general tones
     void on_general_notificationTones_stateChanged(int state);
     void on_general_keysAndScreenToneSlider_ValueChanged( int value );
-    
     //general vibra
-    void on_general_ringVibar_stateChanged( int state );
-    void on_general_messageVibra_stateChanged( int state );
-    void on_general_emailVibra_stateChanged( int state );
-    void on_general_reminderVibra_stateChanged( int state );
-    void on_general_notificationVibra_stateChanged( int state );
     void on_general_screenVibra_ValueChanged( int value );
 
     //meeting tones
@@ -67,14 +64,11 @@
     void on_meeting_keysAndScreenToneSlider_ValueChanged( int value );
     
     //meeting vibar
-    void on_meeting_ringVibar_stateChanged( int state );
-    void on_meeting_messageVibra_stateChanged( int state );
-    void on_meeting_emailVibra_stateChanged( int state );
-    void on_meeting_reminderVibra_stateChanged( int state );
-    void on_meeting_notificationVibra_stateChanged( int state );
     void on_meeting_screenVibra_ValueChanged( int value );
     
     void settingValueChanged(const XQSettingsKey &key, const QVariant &value);
+    
+    void onDataFormActivated(const QModelIndex &index);
 private:
     void initModel();
     void initGeneralTonesGroup();
@@ -82,6 +76,7 @@
     void initMeetingTonesGroup();
     //void initMeetingVibraGroup();
     bool checkBoxStateToBool( int state );
+    
  //   void initRingToneGroup(HbDataFormModelItem *parent);
  //   void initMessageToneGroup(HbDataFormModelItem *parent);
  //   void initAlertToneGroup(HbDataFormModelItem *parent);
@@ -98,9 +93,7 @@
     
     HbDataFormModelItem *mGeneralPage;
     HbDataFormModelItem *mMeetingPage;
-    
     HbDataFormModelItem *mCurrentPage;
-    
   //  HbDataFormModelItem *mGeneralKeysAndScreenToneSlider;
  //   HbDataFormModelItem *mGeneralSreenVibra;
  //   HbDataFormModelItem *mMeetingKeysAndScreenToneSlider;