# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1273842467 -10800
# Node ID 7e4c5a2ff1a221881ec1799c71c2c6a54aecdd40
# Parent  851e19007849cb8184133d8507c7e83da874a662
Revision: 201017
Kit: 201019

diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/controlpanel_plat/inc/cpbasesettingview.h
--- a/controlpanel/controlpanel_plat/inc/cpbasesettingview.h	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/controlpanel_plat/inc/cpbasesettingview.h	Fri May 14 16:07:47 2010 +0300
@@ -20,6 +20,7 @@
 #include "cpglobal.h"
 #include <hbview.h>
 
+class QVariant;
 class QModelIndex;
 class HbDataForm;
 class CpBaseSettingViewPrivate;
@@ -30,17 +31,29 @@
     Q_OBJECT
 public:
 	explicit CpBaseSettingView(QGraphicsWidget *widget = 0, QGraphicsItem *parent = 0);
-    virtual ~CpBaseSettingView();
-    void setSettingForm(HbDataForm *settingForm);
-    HbDataForm *settingForm() const;
+    virtual ~CpBaseSettingView();    
+    
+    //Deprecated! please use HbView::setWidget
+    void setSettingForm(HbDataForm *settingForm)
+    {
+    }
+    //Deprecated! please use HbView::widget
+    HbDataForm *settingForm() const
+    {
+        return 0;
+    }
 signals:
+    void returnValueDelivered(const QVariant &returnValue);
     void aboutToClose();
+protected:
+    virtual void close();
 private:
     Q_DISABLE_COPY(CpBaseSettingView)
     Q_DECLARE_PRIVATE_D(d_ptr, CpBaseSettingView)
     Q_PRIVATE_SLOT(d_func(), void _q_softkeyClicked())
 private:
     CpBaseSettingViewPrivate *d_ptr;
+    friend class CpBaseSettingViewPrivate;
 };
 
 #endif /* CPBASESETTINGVIEW_H */
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/controlpanel_plat/inc/cppluginlauncher.h
--- a/controlpanel/controlpanel_plat/inc/cppluginlauncher.h	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/controlpanel_plat/inc/cppluginlauncher.h	Fri May 14 16:07:47 2010 +0300
@@ -25,16 +25,16 @@
 #include <QVariant>
 
 class QString;
-class CpPluginPlatInterface;
+class CpBaseSettingView;
 
 class CP_EXPORT CpPluginLauncher
 {
 public:
-	/*  OLD Inteface - Deprecated! */
+	/*  OLD Interface - Deprecated! */
     static bool launchCpPluginView(const QString &pluginFile,int index = 0);
     
-    /* New interface */
-	static bool launchSettingView(const QString &pluginFile,const QVariant &hint = QVariant());
+    /*  */
+	static CpBaseSettingView* launchSettingView(const QString &pluginFile,const QVariant &hint = QVariant());
 };
 
 #endif /* CPPLUGINLAUNCHER_H */
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/controlpanel_plat/inc/cppluginloader.h
--- a/controlpanel/controlpanel_plat/inc/cppluginloader.h	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/controlpanel_plat/inc/cppluginloader.h	Fri May 14 16:07:47 2010 +0300
@@ -28,11 +28,17 @@
 
 class CP_EXPORT CpPluginLoader
 {
-public:
+public:    
     /* OLD INTERFACES* DPRECATED!!! */
-    static CpPluginInterface     *loadCpPlugin(const QString &pluginFile);
+    static CpPluginInterface     *loadCpPlugin(const QString &pluginFile)
+    {
+        return 0;
+    }
     /* OLD INTERFACES* DPRECATED!!! */
-    static CpPluginPlatInterface *loadPlatCpPlugin(const QString &pluginFile);
+    static CpPluginPlatInterface *loadPlatCpPlugin(const QString &pluginFile)
+    {
+        return 0;
+    }
     
     /*NEW INTERFACES*/
     static CpPluginInterface     *loadCpPluginInterface(const QString &pluginFile);
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/controlpanel_plat/inc/cppluginplatinterface.h
--- a/controlpanel/controlpanel_plat/inc/cppluginplatinterface.h	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/controlpanel_plat/inc/cppluginplatinterface.h	Fri May 14 16:07:47 2010 +0300
@@ -22,7 +22,7 @@
 
 /*!
     \class CpPluginPlatInterface
-    \brief The class CpPluginPlatInterface is an interface for plugins which can be displayed in control panel application. 
+    \brief The class is Deprecated! please use CpPluginInterface instead.
  */
 
 class CpSettingFormItemData;
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/bwins/cpframeworku.def
--- a/controlpanel/src/bwins/cpframeworku.def	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/bwins/cpframeworku.def	Fri May 14 16:07:47 2010 +0300
@@ -26,110 +26,112 @@
 	?d_func@CpBaseSettingView@@ABEPBVCpBaseSettingViewPrivate@@XZ @ 25 NONAME ; class CpBaseSettingViewPrivate const * CpBaseSettingView::d_func(void) const
 	?launchCpPluginView@CpPluginLauncher@@SA_NABVQString@@H@Z @ 26 NONAME ; bool CpPluginLauncher::launchCpPluginView(class QString const &, int)
 	?aboutToClose@CpBaseSettingView@@IAEXXZ @ 27 NONAME ; void CpBaseSettingView::aboutToClose(void)
-	?modelItemFromModelIndex@CpItemDataHelper@@QAEPAVHbDataFormModelItem@@ABVQModelIndex@@@Z @ 28 NONAME ; class HbDataFormModelItem * CpItemDataHelper::modelItemFromModelIndex(class QModelIndex const &)
-	?instance@Logger@@SAPAV1@ABVQString@@@Z @ 29 NONAME ; class Logger * Logger::instance(class QString const &)
-	?trUtf8@CpSettingFormEntryItemData@@SA?AVQString@@PBD0H@Z @ 30 NONAME ; class QString CpSettingFormEntryItemData::trUtf8(char const *, char const *, int)
-	?removeConnection@CpItemDataHelper@@QAEXPAVHbDataFormModelItem@@PBDPAVQObject@@1@Z @ 31 NONAME ; void CpItemDataHelper::removeConnection(class HbDataFormModelItem *, char const *, class QObject *, char const *)
-	?setDateTimeFormat@Logger@@QAEXABVQString@@@Z @ 32 NONAME ; void Logger::setDateTimeFormat(class QString const &)
-	?settingForm@CpBaseSettingView@@QBEPAVHbDataForm@@XZ @ 33 NONAME ; class HbDataForm * CpBaseSettingView::settingForm(void) const
-	??1Logger@@UAE@XZ @ 34 NONAME ; Logger::~Logger(void)
-	?description@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 35 NONAME ; class QString CpSettingFormEntryItemData::description(void) const
-	?log@Logger@@QAEXABVQString@@@Z @ 36 NONAME ; void Logger::log(class QString const &)
-	??_ELogger@@UAE@I@Z @ 37 NONAME ; Logger::~Logger(unsigned int)
-	?tr@CpItemDataHelper@@SA?AVQString@@PBD0H@Z @ 38 NONAME ; class QString CpItemDataHelper::tr(char const *, char const *, int)
-	?setName@LogOutput@@QAEXABVQString@@@Z @ 39 NONAME ; void LogOutput::setName(class QString const &)
-	?qt_metacall@CpBaseSettingView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 40 NONAME ; int CpBaseSettingView::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@CpBaseSettingView@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString CpBaseSettingView::trUtf8(char const *, char const *, int)
-	?getStaticMetaObject@CpSettingFormEntryItemData@@SAABUQMetaObject@@XZ @ 42 NONAME ; struct QMetaObject const & CpSettingFormEntryItemData::getStaticMetaObject(void)
-	?name@Logger@@QBE?AVQString@@XZ @ 43 NONAME ; class QString Logger::name(void) const
-	?load@LogOutput@@QAE_NAAVQSettings@@@Z @ 44 NONAME ; bool LogOutput::load(class QSettings &)
-	??0CpSettingFormEntryItemData@@QAE@AAVCpItemDataHelper@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 45 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class CpItemDataHelper &, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
-	?setText@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 46 NONAME ; void CpSettingFormEntryItemData::setText(class QString const &)
-	?close@Logger@@SAXABVQString@@@Z @ 47 NONAME ; void Logger::close(class QString const &)
-	?disconnectFromForm@CpItemDataHelper@@QAEXPBDPAVQObject@@0@Z @ 48 NONAME ; void CpItemDataHelper::disconnectFromForm(char const *, class QObject *, char const *)
-	?metaObject@CpItemDataHelper@@UBEPBUQMetaObject@@XZ @ 49 NONAME ; struct QMetaObject const * CpItemDataHelper::metaObject(void) const
-	??_ECpItemDataHelper@@UAE@I@Z @ 50 NONAME ; CpItemDataHelper::~CpItemDataHelper(unsigned int)
-	??1CpSettingFormEntryItemData@@UAE@XZ @ 51 NONAME ; CpSettingFormEntryItemData::~CpSettingFormEntryItemData(void)
-	?iconName@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 52 NONAME ; class QString CpSettingFormEntryItemData::iconName(void) const
-	?staticMetaObject@CpSettingFormItemData@@2UQMetaObject@@B @ 53 NONAME ; struct QMetaObject const CpSettingFormItemData::staticMetaObject
-	?createLogOutput@LogOutputFactory@@SAPAVLogOutput@@ABVQString@@@Z @ 54 NONAME ; class LogOutput * LogOutputFactory::createLogOutput(class QString const &)
-	?setEntryItemIcon@CpSettingFormEntryItemData@@QAEXABVHbIcon@@@Z @ 55 NONAME ; void CpSettingFormEntryItemData::setEntryItemIcon(class HbIcon const &)
-	?entryItemIcon@CpSettingFormEntryItemData@@QBE?AVHbIcon@@XZ @ 56 NONAME ; class HbIcon CpSettingFormEntryItemData::entryItemIcon(void) const
-	?qt_metacall@CpSettingFormEntryItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 57 NONAME ; int CpSettingFormEntryItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?onLaunchView@CpSettingFormEntryItemData@@UAEXXZ @ 58 NONAME ; void CpSettingFormEntryItemData::onLaunchView(void)
-	?setLogDateTime@Logger@@QAEX_N@Z @ 59 NONAME ; void Logger::setLogDateTime(bool)
-	?configure@Logger@@QAEXABVQString@@W4Format@QSettings@@@Z @ 60 NONAME ; void Logger::configure(class QString const &, enum QSettings::Format)
-	?tr@Logger@@SA?AVQString@@PBD0@Z @ 61 NONAME ; class QString Logger::tr(char const *, char const *)
-	?trUtf8@CpItemDataHelper@@SA?AVQString@@PBD0H@Z @ 62 NONAME ; class QString CpItemDataHelper::trUtf8(char const *, char const *, int)
-	?metaObject@LogOutput@@UBEPBUQMetaObject@@XZ @ 63 NONAME ; struct QMetaObject const * LogOutput::metaObject(void) const
-	?trUtf8@CpItemDataHelper@@SA?AVQString@@PBD0@Z @ 64 NONAME ; class QString CpItemDataHelper::trUtf8(char const *, char const *)
-	??0CpSettingFormEntryItemData@@QAE@PBVHbDataFormModelItem@@@Z @ 65 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class HbDataFormModelItem const *)
-	?logDateTime@Logger@@QBE_NXZ @ 66 NONAME ; bool Logger::logDateTime(void) const
-	??0CpSettingFormEntryItemData@@QAE@PAVHbDataForm@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 67 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class HbDataForm *, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
-	?d_func@CpBaseSettingView@@AAEPAVCpBaseSettingViewPrivate@@XZ @ 68 NONAME ; class CpBaseSettingViewPrivate * CpBaseSettingView::d_func(void)
-	??0CpSettingFormItemData@@QAE@W4DataItemType@HbDataFormModelItem@@ABVQString@@PBV2@@Z @ 69 NONAME ; CpSettingFormItemData::CpSettingFormItemData(enum HbDataFormModelItem::DataItemType, class QString const &, class HbDataFormModelItem const *)
-	?connectToForm@CpItemDataHelper@@QAEXPBDPAVQObject@@0@Z @ 70 NONAME ; void CpItemDataHelper::connectToForm(char const *, class QObject *, char const *)
-	?tr@LogOutput@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString LogOutput::tr(char const *, char const *)
-	?setIconName@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 72 NONAME ; void CpSettingFormEntryItemData::setIconName(class QString const &)
-	?qt_metacast@CpItemDataHelper@@UAEPAXPBD@Z @ 73 NONAME ; void * CpItemDataHelper::qt_metacast(char const *)
-	?metaObject@Logger@@UBEPBUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const * Logger::metaObject(void) const
-	?tr@CpSettingFormEntryItemData@@SA?AVQString@@PBD0@Z @ 75 NONAME ; class QString CpSettingFormEntryItemData::tr(char const *, char const *)
-	??0Logger@@AAE@ABVQString@@PAVQObject@@@Z @ 76 NONAME ; Logger::Logger(class QString const &, class QObject *)
-	?addConnection@CpItemDataHelper@@QAEXPAVHbDataFormModelItem@@PBDPAVQObject@@1@Z @ 77 NONAME ; void CpItemDataHelper::addConnection(class HbDataFormModelItem *, char const *, class QObject *, char const *)
-	?d_func@CpSettingFormEntryItemData@@AAEPAVCpSettingFormEntryItemDataPrivate@@XZ @ 78 NONAME ; class CpSettingFormEntryItemDataPrivate * CpSettingFormEntryItemData::d_func(void)
-	?dateTimeFormat@Logger@@QBE?AVQString@@XZ @ 79 NONAME ; class QString Logger::dateTimeFormat(void) const
-	??0CpSettingFormItemData@@QAE@PBVHbDataFormModelItem@@@Z @ 80 NONAME ; CpSettingFormItemData::CpSettingFormItemData(class HbDataFormModelItem const *)
-	?clearAllLogOutput@Logger@@QAEXXZ @ 81 NONAME ; void Logger::clearAllLogOutput(void)
-	?qt_metacall@LogOutput@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 82 NONAME ; int LogOutput::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setDescription@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 83 NONAME ; void CpSettingFormEntryItemData::setDescription(class QString const &)
-	?tr@CpSettingFormEntryItemData@@SA?AVQString@@PBD0H@Z @ 84 NONAME ; class QString CpSettingFormEntryItemData::tr(char const *, char const *, int)
-	?getStaticMetaObject@CpSettingFormItemData@@SAABUQMetaObject@@XZ @ 85 NONAME ; struct QMetaObject const & CpSettingFormItemData::getStaticMetaObject(void)
-	?staticMetaObject@CpSettingFormEntryItemData@@2UQMetaObject@@B @ 86 NONAME ; struct QMetaObject const CpSettingFormEntryItemData::staticMetaObject
-	?setParentLogger@LogOutput@@QAEXPAVLogger@@@Z @ 87 NONAME ; void LogOutput::setParentLogger(class Logger *)
-	?parentLogger@LogOutput@@QAEPAVLogger@@XZ @ 88 NONAME ; class Logger * LogOutput::parentLogger(void)
-	?qt_metacall@CpSettingFormItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 89 NONAME ; int CpSettingFormItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?tr@Logger@@SA?AVQString@@PBD0H@Z @ 90 NONAME ; class QString Logger::tr(char const *, char const *, int)
-	??_ECpBaseSettingView@@UAE@I@Z @ 91 NONAME ; CpBaseSettingView::~CpBaseSettingView(unsigned int)
-	?bindToForm@CpItemDataHelper@@QAEXPAVHbDataForm@@@Z @ 92 NONAME ; void CpItemDataHelper::bindToForm(class HbDataForm *)
-	??_ECpSettingFormItemData@@UAE@I@Z @ 93 NONAME ; CpSettingFormItemData::~CpSettingFormItemData(unsigned int)
-	?getStaticMetaObject@Logger@@SAABUQMetaObject@@XZ @ 94 NONAME ; struct QMetaObject const & Logger::getStaticMetaObject(void)
-	?trUtf8@CpSettingFormItemData@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString CpSettingFormItemData::trUtf8(char const *, char const *, int)
-	?staticMetaObject@CpBaseSettingView@@2UQMetaObject@@B @ 96 NONAME ; struct QMetaObject const CpBaseSettingView::staticMetaObject
-	?tr@CpBaseSettingView@@SA?AVQString@@PBD0H@Z @ 97 NONAME ; class QString CpBaseSettingView::tr(char const *, char const *, int)
-	?tr@CpBaseSettingView@@SA?AVQString@@PBD0@Z @ 98 NONAME ; class QString CpBaseSettingView::tr(char const *, char const *)
-	?setLogLoggerName@Logger@@QAEX_N@Z @ 99 NONAME ; void Logger::setLogLoggerName(bool)
-	?tr@CpSettingFormItemData@@SA?AVQString@@PBD0@Z @ 100 NONAME ; class QString CpSettingFormItemData::tr(char const *, char const *)
-	?closeAll@Logger@@SAXXZ @ 101 NONAME ; void Logger::closeAll(void)
-	?setSettingForm@CpBaseSettingView@@QAEXPAVHbDataForm@@@Z @ 102 NONAME ; void CpBaseSettingView::setSettingForm(class HbDataForm *)
-	?tr@CpSettingFormItemData@@SA?AVQString@@PBD0H@Z @ 103 NONAME ; class QString CpSettingFormItemData::tr(char const *, char const *, int)
-	?trUtf8@LogOutput@@SA?AVQString@@PBD0H@Z @ 104 NONAME ; class QString LogOutput::trUtf8(char const *, char const *, int)
-	?removeLogOutput@Logger@@QAEXPAVLogOutput@@@Z @ 105 NONAME ; void Logger::removeLogOutput(class LogOutput *)
-	?trUtf8@CpSettingFormItemData@@SA?AVQString@@PBD0@Z @ 106 NONAME ; class QString CpSettingFormItemData::trUtf8(char const *, char const *)
-	??0CpBaseSettingView@@QAE@PAVQGraphicsWidget@@PAVQGraphicsItem@@@Z @ 107 NONAME ; CpBaseSettingView::CpBaseSettingView(class QGraphicsWidget *, class QGraphicsItem *)
-	?widgetFromModelIndex@CpItemDataHelper@@QAEPAVHbWidget@@ABVQModelIndex@@@Z @ 108 NONAME ; class HbWidget * CpItemDataHelper::widgetFromModelIndex(class QModelIndex const &)
-	??0LogOutput@@IAE@PAVLogger@@@Z @ 109 NONAME ; LogOutput::LogOutput(class Logger *)
-	?staticMetaObject@LogOutput@@2UQMetaObject@@B @ 110 NONAME ; struct QMetaObject const LogOutput::staticMetaObject
-	?trUtf8@CpSettingFormEntryItemData@@SA?AVQString@@PBD0@Z @ 111 NONAME ; class QString CpSettingFormEntryItemData::trUtf8(char const *, char const *)
-	?launchSettingView@CpPluginLauncher@@SA_NABVQString@@ABVQVariant@@@Z @ 112 NONAME ; bool CpPluginLauncher::launchSettingView(class QString const &, class QVariant const &)
-	?name@LogOutput@@QBE?AVQString@@XZ @ 113 NONAME ; class QString LogOutput::name(void) const
-	?tr@CpItemDataHelper@@SA?AVQString@@PBD0@Z @ 114 NONAME ; class QString CpItemDataHelper::tr(char const *, char const *)
-	?getStaticMetaObject@CpItemDataHelper@@SAABUQMetaObject@@XZ @ 115 NONAME ; struct QMetaObject const & CpItemDataHelper::getStaticMetaObject(void)
-	?qt_metacast@CpSettingFormEntryItemData@@UAEPAXPBD@Z @ 116 NONAME ; void * CpSettingFormEntryItemData::qt_metacast(char const *)
-	?logLoggerName@Logger@@QBE_NXZ @ 117 NONAME ; bool Logger::logLoggerName(void) const
-	?qt_metacall@CpItemDataHelper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 118 NONAME ; int CpItemDataHelper::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?metaObject@CpSettingFormEntryItemData@@UBEPBUQMetaObject@@XZ @ 119 NONAME ; struct QMetaObject const * CpSettingFormEntryItemData::metaObject(void) const
-	?qt_metacast@Logger@@UAEPAXPBD@Z @ 120 NONAME ; void * Logger::qt_metacast(char const *)
-	?addItemPrototype@CpItemDataHelper@@QAEXPAVHbAbstractViewItem@@@Z @ 121 NONAME ; void CpItemDataHelper::addItemPrototype(class HbAbstractViewItem *)
-	?trUtf8@CpBaseSettingView@@SA?AVQString@@PBD0@Z @ 122 NONAME ; class QString CpBaseSettingView::trUtf8(char const *, char const *)
-	?getStaticMetaObject@LogOutput@@SAABUQMetaObject@@XZ @ 123 NONAME ; struct QMetaObject const & LogOutput::getStaticMetaObject(void)
-	?createLogOutput@LogOutputFactory@@SAPAVLogOutput@@ABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 124 NONAME ; class LogOutput * LogOutputFactory::createLogOutput(class QString const &, class QHash<class QString, class QVariant> const &)
-	?addCreateLogOutputEntry@LogOutputFactory@@SAXABVQString@@P6APAVLogOutput@@XZ@Z @ 125 NONAME ; void LogOutputFactory::addCreateLogOutputEntry(class QString const &, class LogOutput * (*)(void))
-	?configure@Logger@@QAEXAAVQSettings@@@Z @ 126 NONAME ; void Logger::configure(class QSettings &)
-	?loadCpPlugin@CpPluginLoader@@SAPAVCpPluginInterface@@ABVQString@@@Z @ 127 NONAME ; class CpPluginInterface * CpPluginLoader::loadCpPlugin(class QString const &)
-	??1CpBaseSettingView@@UAE@XZ @ 128 NONAME ; CpBaseSettingView::~CpBaseSettingView(void)
-	??0CpSettingFormEntryItemData@@QAE@W4EntryItemType@0@AAVCpItemDataHelper@@ABVQString@@22PBVHbDataFormModelItem@@@Z @ 129 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(enum CpSettingFormEntryItemData::EntryItemType, class CpItemDataHelper &, class QString const &, class QString const &, class QString const &, class HbDataFormModelItem const *)
-	?metaObject@CpSettingFormItemData@@UBEPBUQMetaObject@@XZ @ 130 NONAME ; struct QMetaObject const * CpSettingFormItemData::metaObject(void) const
-	?tr@LogOutput@@SA?AVQString@@PBD0H@Z @ 131 NONAME ; class QString LogOutput::tr(char const *, char const *, int)
-	?trUtf8@Logger@@SA?AVQString@@PBD0H@Z @ 132 NONAME ; class QString Logger::trUtf8(char const *, char const *, int)
-	?trUtf8@Logger@@SA?AVQString@@PBD0@Z @ 133 NONAME ; class QString Logger::trUtf8(char const *, char const *)
+	?close@CpBaseSettingView@@MAEXXZ @ 28 NONAME ; void CpBaseSettingView::close(void)
+	?modelItemFromModelIndex@CpItemDataHelper@@QAEPAVHbDataFormModelItem@@ABVQModelIndex@@@Z @ 29 NONAME ; class HbDataFormModelItem * CpItemDataHelper::modelItemFromModelIndex(class QModelIndex const &)
+	?instance@Logger@@SAPAV1@ABVQString@@@Z @ 30 NONAME ; class Logger * Logger::instance(class QString const &)
+	?trUtf8@CpSettingFormEntryItemData@@SA?AVQString@@PBD0H@Z @ 31 NONAME ; class QString CpSettingFormEntryItemData::trUtf8(char const *, char const *, int)
+	?removeConnection@CpItemDataHelper@@QAEXPAVHbDataFormModelItem@@PBDPAVQObject@@1@Z @ 32 NONAME ; void CpItemDataHelper::removeConnection(class HbDataFormModelItem *, char const *, class QObject *, char const *)
+	?returnValueDelivered@CpBaseSettingView@@IAEXABVQVariant@@@Z @ 33 NONAME ; void CpBaseSettingView::returnValueDelivered(class QVariant const &)
+	?setDateTimeFormat@Logger@@QAEXABVQString@@@Z @ 34 NONAME ; void Logger::setDateTimeFormat(class QString const &)
+	?settingForm@CpBaseSettingView@@QBEPAVHbDataForm@@XZ @ 35 NONAME ; class HbDataForm * CpBaseSettingView::settingForm(void) const
+	??1Logger@@UAE@XZ @ 36 NONAME ; Logger::~Logger(void)
+	?description@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 37 NONAME ; class QString CpSettingFormEntryItemData::description(void) const
+	?log@Logger@@QAEXABVQString@@@Z @ 38 NONAME ; void Logger::log(class QString const &)
+	??_ELogger@@UAE@I@Z @ 39 NONAME ; Logger::~Logger(unsigned int)
+	?tr@CpItemDataHelper@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString CpItemDataHelper::tr(char const *, char const *, int)
+	?setName@LogOutput@@QAEXABVQString@@@Z @ 41 NONAME ; void LogOutput::setName(class QString const &)
+	?qt_metacall@CpBaseSettingView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 42 NONAME ; int CpBaseSettingView::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?trUtf8@CpBaseSettingView@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString CpBaseSettingView::trUtf8(char const *, char const *, int)
+	?getStaticMetaObject@CpSettingFormEntryItemData@@SAABUQMetaObject@@XZ @ 44 NONAME ; struct QMetaObject const & CpSettingFormEntryItemData::getStaticMetaObject(void)
+	?name@Logger@@QBE?AVQString@@XZ @ 45 NONAME ; class QString Logger::name(void) const
+	?load@LogOutput@@QAE_NAAVQSettings@@@Z @ 46 NONAME ; bool LogOutput::load(class QSettings &)
+	??0CpSettingFormEntryItemData@@QAE@AAVCpItemDataHelper@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 47 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class CpItemDataHelper &, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
+	?setText@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 48 NONAME ; void CpSettingFormEntryItemData::setText(class QString const &)
+	?close@Logger@@SAXABVQString@@@Z @ 49 NONAME ; void Logger::close(class QString const &)
+	?disconnectFromForm@CpItemDataHelper@@QAEXPBDPAVQObject@@0@Z @ 50 NONAME ; void CpItemDataHelper::disconnectFromForm(char const *, class QObject *, char const *)
+	?metaObject@CpItemDataHelper@@UBEPBUQMetaObject@@XZ @ 51 NONAME ; struct QMetaObject const * CpItemDataHelper::metaObject(void) const
+	??_ECpItemDataHelper@@UAE@I@Z @ 52 NONAME ; CpItemDataHelper::~CpItemDataHelper(unsigned int)
+	??1CpSettingFormEntryItemData@@UAE@XZ @ 53 NONAME ; CpSettingFormEntryItemData::~CpSettingFormEntryItemData(void)
+	?iconName@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 54 NONAME ; class QString CpSettingFormEntryItemData::iconName(void) const
+	?staticMetaObject@CpSettingFormItemData@@2UQMetaObject@@B @ 55 NONAME ; struct QMetaObject const CpSettingFormItemData::staticMetaObject
+	?createLogOutput@LogOutputFactory@@SAPAVLogOutput@@ABVQString@@@Z @ 56 NONAME ; class LogOutput * LogOutputFactory::createLogOutput(class QString const &)
+	?setEntryItemIcon@CpSettingFormEntryItemData@@QAEXABVHbIcon@@@Z @ 57 NONAME ; void CpSettingFormEntryItemData::setEntryItemIcon(class HbIcon const &)
+	?launchSettingView@CpPluginLauncher@@SAPAVCpBaseSettingView@@ABVQString@@ABVQVariant@@@Z @ 58 NONAME ; class CpBaseSettingView * CpPluginLauncher::launchSettingView(class QString const &, class QVariant const &)
+	?entryItemIcon@CpSettingFormEntryItemData@@QBE?AVHbIcon@@XZ @ 59 NONAME ; class HbIcon CpSettingFormEntryItemData::entryItemIcon(void) const
+	?qt_metacall@CpSettingFormEntryItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 60 NONAME ; int CpSettingFormEntryItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?onLaunchView@CpSettingFormEntryItemData@@UAEXXZ @ 61 NONAME ; void CpSettingFormEntryItemData::onLaunchView(void)
+	?setLogDateTime@Logger@@QAEX_N@Z @ 62 NONAME ; void Logger::setLogDateTime(bool)
+	?configure@Logger@@QAEXABVQString@@W4Format@QSettings@@@Z @ 63 NONAME ; void Logger::configure(class QString const &, enum QSettings::Format)
+	?tr@Logger@@SA?AVQString@@PBD0@Z @ 64 NONAME ; class QString Logger::tr(char const *, char const *)
+	?trUtf8@CpItemDataHelper@@SA?AVQString@@PBD0H@Z @ 65 NONAME ; class QString CpItemDataHelper::trUtf8(char const *, char const *, int)
+	?metaObject@LogOutput@@UBEPBUQMetaObject@@XZ @ 66 NONAME ; struct QMetaObject const * LogOutput::metaObject(void) const
+	?trUtf8@CpItemDataHelper@@SA?AVQString@@PBD0@Z @ 67 NONAME ; class QString CpItemDataHelper::trUtf8(char const *, char const *)
+	??0CpSettingFormEntryItemData@@QAE@PBVHbDataFormModelItem@@@Z @ 68 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class HbDataFormModelItem const *)
+	?logDateTime@Logger@@QBE_NXZ @ 69 NONAME ; bool Logger::logDateTime(void) const
+	??0CpSettingFormEntryItemData@@QAE@PAVHbDataForm@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 70 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class HbDataForm *, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
+	?d_func@CpBaseSettingView@@AAEPAVCpBaseSettingViewPrivate@@XZ @ 71 NONAME ; class CpBaseSettingViewPrivate * CpBaseSettingView::d_func(void)
+	??0CpSettingFormItemData@@QAE@W4DataItemType@HbDataFormModelItem@@ABVQString@@PBV2@@Z @ 72 NONAME ; CpSettingFormItemData::CpSettingFormItemData(enum HbDataFormModelItem::DataItemType, class QString const &, class HbDataFormModelItem const *)
+	?connectToForm@CpItemDataHelper@@QAEXPBDPAVQObject@@0@Z @ 73 NONAME ; void CpItemDataHelper::connectToForm(char const *, class QObject *, char const *)
+	?tr@LogOutput@@SA?AVQString@@PBD0@Z @ 74 NONAME ; class QString LogOutput::tr(char const *, char const *)
+	?setIconName@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 75 NONAME ; void CpSettingFormEntryItemData::setIconName(class QString const &)
+	?qt_metacast@CpItemDataHelper@@UAEPAXPBD@Z @ 76 NONAME ; void * CpItemDataHelper::qt_metacast(char const *)
+	?metaObject@Logger@@UBEPBUQMetaObject@@XZ @ 77 NONAME ; struct QMetaObject const * Logger::metaObject(void) const
+	?tr@CpSettingFormEntryItemData@@SA?AVQString@@PBD0@Z @ 78 NONAME ; class QString CpSettingFormEntryItemData::tr(char const *, char const *)
+	??0Logger@@AAE@ABVQString@@PAVQObject@@@Z @ 79 NONAME ; Logger::Logger(class QString const &, class QObject *)
+	?addConnection@CpItemDataHelper@@QAEXPAVHbDataFormModelItem@@PBDPAVQObject@@1@Z @ 80 NONAME ; void CpItemDataHelper::addConnection(class HbDataFormModelItem *, char const *, class QObject *, char const *)
+	?d_func@CpSettingFormEntryItemData@@AAEPAVCpSettingFormEntryItemDataPrivate@@XZ @ 81 NONAME ; class CpSettingFormEntryItemDataPrivate * CpSettingFormEntryItemData::d_func(void)
+	?dateTimeFormat@Logger@@QBE?AVQString@@XZ @ 82 NONAME ; class QString Logger::dateTimeFormat(void) const
+	??0CpSettingFormItemData@@QAE@PBVHbDataFormModelItem@@@Z @ 83 NONAME ; CpSettingFormItemData::CpSettingFormItemData(class HbDataFormModelItem const *)
+	?clearAllLogOutput@Logger@@QAEXXZ @ 84 NONAME ; void Logger::clearAllLogOutput(void)
+	?qt_metacall@LogOutput@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 85 NONAME ; int LogOutput::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setDescription@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 86 NONAME ; void CpSettingFormEntryItemData::setDescription(class QString const &)
+	?tr@CpSettingFormEntryItemData@@SA?AVQString@@PBD0H@Z @ 87 NONAME ; class QString CpSettingFormEntryItemData::tr(char const *, char const *, int)
+	?getStaticMetaObject@CpSettingFormItemData@@SAABUQMetaObject@@XZ @ 88 NONAME ; struct QMetaObject const & CpSettingFormItemData::getStaticMetaObject(void)
+	?staticMetaObject@CpSettingFormEntryItemData@@2UQMetaObject@@B @ 89 NONAME ; struct QMetaObject const CpSettingFormEntryItemData::staticMetaObject
+	?setParentLogger@LogOutput@@QAEXPAVLogger@@@Z @ 90 NONAME ; void LogOutput::setParentLogger(class Logger *)
+	?parentLogger@LogOutput@@QAEPAVLogger@@XZ @ 91 NONAME ; class Logger * LogOutput::parentLogger(void)
+	?qt_metacall@CpSettingFormItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 92 NONAME ; int CpSettingFormItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@Logger@@SA?AVQString@@PBD0H@Z @ 93 NONAME ; class QString Logger::tr(char const *, char const *, int)
+	??_ECpBaseSettingView@@UAE@I@Z @ 94 NONAME ; CpBaseSettingView::~CpBaseSettingView(unsigned int)
+	?bindToForm@CpItemDataHelper@@QAEXPAVHbDataForm@@@Z @ 95 NONAME ; void CpItemDataHelper::bindToForm(class HbDataForm *)
+	??_ECpSettingFormItemData@@UAE@I@Z @ 96 NONAME ; CpSettingFormItemData::~CpSettingFormItemData(unsigned int)
+	?getStaticMetaObject@Logger@@SAABUQMetaObject@@XZ @ 97 NONAME ; struct QMetaObject const & Logger::getStaticMetaObject(void)
+	?trUtf8@CpSettingFormItemData@@SA?AVQString@@PBD0H@Z @ 98 NONAME ; class QString CpSettingFormItemData::trUtf8(char const *, char const *, int)
+	?staticMetaObject@CpBaseSettingView@@2UQMetaObject@@B @ 99 NONAME ; struct QMetaObject const CpBaseSettingView::staticMetaObject
+	?tr@CpBaseSettingView@@SA?AVQString@@PBD0H@Z @ 100 NONAME ; class QString CpBaseSettingView::tr(char const *, char const *, int)
+	?tr@CpBaseSettingView@@SA?AVQString@@PBD0@Z @ 101 NONAME ; class QString CpBaseSettingView::tr(char const *, char const *)
+	?setLogLoggerName@Logger@@QAEX_N@Z @ 102 NONAME ; void Logger::setLogLoggerName(bool)
+	?tr@CpSettingFormItemData@@SA?AVQString@@PBD0@Z @ 103 NONAME ; class QString CpSettingFormItemData::tr(char const *, char const *)
+	?closeAll@Logger@@SAXXZ @ 104 NONAME ; void Logger::closeAll(void)
+	?setSettingForm@CpBaseSettingView@@QAEXPAVHbDataForm@@@Z @ 105 NONAME ; void CpBaseSettingView::setSettingForm(class HbDataForm *)
+	?tr@CpSettingFormItemData@@SA?AVQString@@PBD0H@Z @ 106 NONAME ; class QString CpSettingFormItemData::tr(char const *, char const *, int)
+	?trUtf8@LogOutput@@SA?AVQString@@PBD0H@Z @ 107 NONAME ; class QString LogOutput::trUtf8(char const *, char const *, int)
+	?trUtf8@CpSettingFormItemData@@SA?AVQString@@PBD0@Z @ 108 NONAME ; class QString CpSettingFormItemData::trUtf8(char const *, char const *)
+	?removeLogOutput@Logger@@QAEXPAVLogOutput@@@Z @ 109 NONAME ; void Logger::removeLogOutput(class LogOutput *)
+	??0CpBaseSettingView@@QAE@PAVQGraphicsWidget@@PAVQGraphicsItem@@@Z @ 110 NONAME ; CpBaseSettingView::CpBaseSettingView(class QGraphicsWidget *, class QGraphicsItem *)
+	?widgetFromModelIndex@CpItemDataHelper@@QAEPAVHbWidget@@ABVQModelIndex@@@Z @ 111 NONAME ; class HbWidget * CpItemDataHelper::widgetFromModelIndex(class QModelIndex const &)
+	??0LogOutput@@IAE@PAVLogger@@@Z @ 112 NONAME ; LogOutput::LogOutput(class Logger *)
+	?staticMetaObject@LogOutput@@2UQMetaObject@@B @ 113 NONAME ; struct QMetaObject const LogOutput::staticMetaObject
+	?trUtf8@CpSettingFormEntryItemData@@SA?AVQString@@PBD0@Z @ 114 NONAME ; class QString CpSettingFormEntryItemData::trUtf8(char const *, char const *)
+	?name@LogOutput@@QBE?AVQString@@XZ @ 115 NONAME ; class QString LogOutput::name(void) const
+	?tr@CpItemDataHelper@@SA?AVQString@@PBD0@Z @ 116 NONAME ; class QString CpItemDataHelper::tr(char const *, char const *)
+	?getStaticMetaObject@CpItemDataHelper@@SAABUQMetaObject@@XZ @ 117 NONAME ; struct QMetaObject const & CpItemDataHelper::getStaticMetaObject(void)
+	?qt_metacast@CpSettingFormEntryItemData@@UAEPAXPBD@Z @ 118 NONAME ; void * CpSettingFormEntryItemData::qt_metacast(char const *)
+	?logLoggerName@Logger@@QBE_NXZ @ 119 NONAME ; bool Logger::logLoggerName(void) const
+	?qt_metacall@CpItemDataHelper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 120 NONAME ; int CpItemDataHelper::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?metaObject@CpSettingFormEntryItemData@@UBEPBUQMetaObject@@XZ @ 121 NONAME ; struct QMetaObject const * CpSettingFormEntryItemData::metaObject(void) const
+	?qt_metacast@Logger@@UAEPAXPBD@Z @ 122 NONAME ; void * Logger::qt_metacast(char const *)
+	?addItemPrototype@CpItemDataHelper@@QAEXPAVHbAbstractViewItem@@@Z @ 123 NONAME ; void CpItemDataHelper::addItemPrototype(class HbAbstractViewItem *)
+	?trUtf8@CpBaseSettingView@@SA?AVQString@@PBD0@Z @ 124 NONAME ; class QString CpBaseSettingView::trUtf8(char const *, char const *)
+	?getStaticMetaObject@LogOutput@@SAABUQMetaObject@@XZ @ 125 NONAME ; struct QMetaObject const & LogOutput::getStaticMetaObject(void)
+	?createLogOutput@LogOutputFactory@@SAPAVLogOutput@@ABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 126 NONAME ; class LogOutput * LogOutputFactory::createLogOutput(class QString const &, class QHash<class QString, class QVariant> const &)
+	?addCreateLogOutputEntry@LogOutputFactory@@SAXABVQString@@P6APAVLogOutput@@XZ@Z @ 127 NONAME ; void LogOutputFactory::addCreateLogOutputEntry(class QString const &, class LogOutput * (*)(void))
+	?configure@Logger@@QAEXAAVQSettings@@@Z @ 128 NONAME ; void Logger::configure(class QSettings &)
+	?loadCpPlugin@CpPluginLoader@@SAPAVCpPluginInterface@@ABVQString@@@Z @ 129 NONAME ; class CpPluginInterface * CpPluginLoader::loadCpPlugin(class QString const &)
+	??1CpBaseSettingView@@UAE@XZ @ 130 NONAME ; CpBaseSettingView::~CpBaseSettingView(void)
+	??0CpSettingFormEntryItemData@@QAE@W4EntryItemType@0@AAVCpItemDataHelper@@ABVQString@@22PBVHbDataFormModelItem@@@Z @ 131 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(enum CpSettingFormEntryItemData::EntryItemType, class CpItemDataHelper &, class QString const &, class QString const &, class QString const &, class HbDataFormModelItem const *)
+	?metaObject@CpSettingFormItemData@@UBEPBUQMetaObject@@XZ @ 132 NONAME ; struct QMetaObject const * CpSettingFormItemData::metaObject(void) const
+	?tr@LogOutput@@SA?AVQString@@PBD0H@Z @ 133 NONAME ; class QString LogOutput::tr(char const *, char const *, int)
+	?trUtf8@Logger@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString Logger::trUtf8(char const *, char const *, int)
+	?trUtf8@Logger@@SA?AVQString@@PBD0@Z @ 135 NONAME ; class QString Logger::trUtf8(char const *, char const *)
 
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cpbasesettingview.cpp
--- a/controlpanel/src/cpframework/src/cpbasesettingview.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpbasesettingview.cpp	Fri May 14 16:07:47 2010 +0300
@@ -44,24 +44,14 @@
     delete d_ptr;
 }
 
-/*!
-	\deprecated  void CpBaseSettingView::setSettingForm(HbDataForm *settingForm) will be deprecated, please
-	use setWidget(QGraphicsWidget* widget) to instead.
-    Set the data form for the setting view.
- */
-void CpBaseSettingView::setSettingForm(HbDataForm *settingForm)
-{
-    d_ptr->setSettingForm(settingForm);
-}
 
 /*!
-	\deprecated  HbDataForm *CpBaseSettingView::settingForm() const will be deprecated, please
-	use widget() const to instead.
-    Get the data form for the setting view.
+    Give derived class a chance to do some cleaning work before exiting view.
+    Return : true:  ok to exit
  */
-HbDataForm *CpBaseSettingView::settingForm() const
+void CpBaseSettingView::close()
 {
-    return qobject_cast<HbDataForm*>(widget());
+    emit aboutToClose();
 }
 
-//
+// End of File
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cpbasesettingview_p.cpp
--- a/controlpanel/src/cpframework/src/cpbasesettingview_p.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpbasesettingview_p.cpp	Fri May 14 16:07:47 2010 +0300
@@ -56,7 +56,7 @@
     
     mBaseSettingView->setTitle("Control Panel");	//give a default title, sub classes need set it correctly
 
-    mSoftKeyBackAction = new HbAction(Hb::BackAction, mBaseSettingView);
+    mSoftKeyBackAction = new HbAction(Hb::BackNaviAction , mBaseSettingView);
     QObject::connect(mSoftKeyBackAction, 
             SIGNAL(triggered()), 
             mBaseSettingView, 
@@ -65,15 +65,9 @@
     mBaseSettingView->setNavigationAction (mSoftKeyBackAction);
 }
 
-void CpBaseSettingViewPrivate::setSettingForm(HbDataForm *settingForm)
-{
-    mBaseSettingView->setWidget(settingForm); 
-    CpPluginUtility::addCpItemPrototype(settingForm);
-}
-
 void CpBaseSettingViewPrivate::_q_softkeyClicked()
 {
-    emit mBaseSettingView->aboutToClose();
+    mBaseSettingView->close();
 }
 
 #include "moc_cpbasesettingview.cpp"
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cpbasesettingview_p.h
--- a/controlpanel/src/cpframework/src/cpbasesettingview_p.h	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpbasesettingview_p.h	Fri May 14 16:07:47 2010 +0300
@@ -17,16 +17,11 @@
 #ifndef CPBASESETTINGVIEW_P_H
 #define CPBASESETTINGVIEW_P_H
 
-class QObject;
-class QString;
+#include <QVariant>
+
 class CpBaseSettingView;
 class HbAction;
-class HbView;
 class HbDataForm;
-class QModelIndex;
-class HbDataFormModelItem;
-class HbAbstractViewItem;
-class CpItemDataHelper;
 class CpItemDataHelper;
 class QGraphicsWidget;
 
@@ -38,17 +33,15 @@
     /*
      initialize 
      */
-    void init(QGraphicsWidget *widget,CpBaseSettingView *baseSettingView);
-    void setSettingForm(HbDataForm *settingForm);
+    void init(QGraphicsWidget *widget,CpBaseSettingView *baseSettingView);    
     
     //SLOTS
     void _q_softkeyClicked();
-private:
+public:
     //DATA
     CpBaseSettingView *mBaseSettingView;
     HbAction *mSoftKeyBackAction;
     HbDataForm *mSettingForm;
-    friend class CpBaseSettingView;
 };
 
 #endif //CPBASESETTINGVIEW_P_H
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cpdataformbuttonentryviewitem.cpp
--- a/controlpanel/src/cpframework/src/cpdataformbuttonentryviewitem.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpdataformbuttonentryviewitem.cpp	Fri May 14 16:07:47 2010 +0300
@@ -121,13 +121,14 @@
 }
 
 /*!
+    Deprecated. Be instead of HbDataFormViewItem::restore()
 	Inherit from HbDataForm. This function is called by hbdataform's framework, 
 	for supporting to load entry item's text, icon and additional text dynamically.
-	It is not recommanded to call this function mannually.
+	It is not recommended to call this function manually.
  */
 void CpDataFormButtonEntryViewItem::load()
 {
-	HbDataFormViewItem::load();
+	//HbDataFormViewItem::load();
 
 	if (d_ptr->mWidget) {
 		HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
@@ -152,5 +153,37 @@
 		}
 	}
 }
+/*!
+    Inherit from HbDataForm. This function is called by hbdataform's framework, 
+    for supporting to load entry item's text, icon and additional text dynamically.
+    It is not recommended to call this function manually.
+ */
+void CpDataFormButtonEntryViewItem::restore()
+{
+    HbDataFormViewItem::restore();
+
+    if (d_ptr->mWidget) {
+        HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
+            modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
+
+        if(itemType == CpSettingFormEntryItemData::ButtonEntryItem) {
+
+            QModelIndex itemIndex = modelIndex();
+            HbDataFormModel *model = static_cast<HbDataFormModel*>(itemView()->model());;
+            HbDataFormModelItem *modelItem = static_cast<HbDataFormModelItem*>(
+                model->itemFromIndex(itemIndex));
+
+            const QMetaObject *metaObj = d_ptr->mWidget->metaObject();
+            int count = metaObj->propertyCount();
+            for (int i = 0; i < count; i++) {
+                QMetaProperty metaProperty = metaObj->property(i);
+                if (metaProperty.isValid() && metaProperty.isWritable()) {
+                    metaProperty.write(d_ptr->mWidget,modelItem->contentWidgetData(metaProperty.name()));
+                }
+
+            }
+        }
+    }
+}
 
 //End of File
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cpdataformbuttonentryviewitem.h
--- a/controlpanel/src/cpframework/src/cpdataformbuttonentryviewitem.h	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpdataformbuttonentryviewitem.h	Fri May 14 16:07:47 2010 +0300
@@ -32,6 +32,7 @@
 	virtual bool canSetModelIndex(const QModelIndex &index) const;
 public slots:
     virtual void load();
+    virtual void restore();
 protected:
 	CpDataFormButtonEntryViewItem(const CpDataFormButtonEntryViewItem &ohter);
 	CpDataFormButtonEntryViewItem &operator = (const CpDataFormButtonEntryViewItem &ohter);
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cpitemdatahelper.cpp
--- a/controlpanel/src/cpframework/src/cpitemdatahelper.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpitemdatahelper.cpp	Fri May 14 16:07:47 2010 +0300
@@ -173,7 +173,8 @@
     HbWidget *widgetFromModelIndex(const QModelIndex &index)
     {
         if (mDataForm) {
-            HbDataFormViewItem *viewItem = mDataForm->dataFormViewItem(index);
+            HbDataFormViewItem *viewItem = qobject_cast<HbDataFormViewItem *>
+                                                    (mDataForm->itemByIndex(index));
             if (viewItem) {
                 return viewItem->dataItemContentWidget();
             }
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cppluginlauncher.cpp
--- a/controlpanel/src/cpframework/src/cppluginlauncher.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cppluginlauncher.cpp	Fri May 14 16:07:47 2010 +0300
@@ -18,7 +18,6 @@
 #include <cppluginlauncher.h>
 #include <cpplugininterface.h>
 #include <cplauncherinterface.h>
-#include <cppluginplatinterface.h>
 #include <QSharedPointer>
 #include <cppluginloader.h>
 #include <cpbasesettingview.h>
@@ -28,17 +27,6 @@
     \class CpPluginLauncher
     \brief The CpPluginLauncher class loads a controlpanel plugin at run-time.And display the specify plugin view in client process.
  */
-
-/*!
-    Load and display a plugin view in client process. The client must be a orbit based application.
-    The pluginFile can either absoulte file path or only file name. 
-    Acceptable format:
-        sampleplugin
-        sampleplugin.qtplugin
-        sampleplugin.dll
-        C:/resource/qt/plugins/controlpanel/sampleplugin.qtplugin
-        C:/resource/qt/plugins/controlpanel/sampleplugin.dll
-*/
 bool CpPluginLauncher::launchCpPluginView(const QString &pluginFile,int index /*= 0*/)
 {
     return false;
@@ -54,16 +42,18 @@
         C:/resource/qt/plugins/controlpanel/sampleplugin.qtplugin
         C:/resource/qt/plugins/controlpanel/sampleplugin.dll
 */
-bool CpPluginLauncher::launchSettingView(const QString &pluginFile,const QVariant &hint /*= QVariant()*/)
+CpBaseSettingView* CpPluginLauncher::launchSettingView(const QString &pluginFile,const QVariant &hint /*= QVariant()*/)
 {
     CpLauncherInterface *plugin = CpPluginLoader::loadCpLauncherInterface(pluginFile);
     if (plugin) {
         CpBaseSettingView *view = plugin->createSettingView(hint);
         if (view) {
             CpViewLauncher::launchView(view);
-            return true;
+            return view;
         }
     }
     
-    return false;
+    return 0;
 }
+
+//End of File
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cppluginloader.cpp
--- a/controlpanel/src/cpframework/src/cppluginloader.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cppluginloader.cpp	Fri May 14 16:07:47 2010 +0300
@@ -20,7 +20,6 @@
 #include <QFileInfo>
 #include <QPluginLoader>
 #include <cpplugininterface.h>
-#include <cppluginplatinterface.h>
 #include <cplauncherinterface.h>
 #include <cpbasepath.h>
 #include "cputility.h"
@@ -73,7 +72,7 @@
 }
 
 /*!
-    load a controlpanel plugin by plugin file.
+    load a CpPluginInterface by plugin file.
     the plugin file can either absoulte file path or only file name.
     acceptable format:
         sampleplugin
@@ -82,28 +81,21 @@
         C:/resource/qt/plugins/controlpanel/sampleplugin.qtplugin
         C:/resource/qt/plugins/controlpanel/sampleplugin.dll
  */
-
-CpPluginInterface *CpPluginLoader::loadCpPlugin(const QString &pluginFile)
-{
-	return ::loadPluginInterface<CpPluginInterface>(pluginFile);
-}
-
-
-/*!
-    \deprecated  CpPluginPlatInterface *CpPluginLoader::loadPlatCpPlugin(const QString &) is deprecated.
-    please use CpPluginInterface to implement controlpanel plugin and use CpPluginLoader::loadCpPluginInterface(const QString &) to load the plugin.
- */
-
-CpPluginPlatInterface *CpPluginLoader::loadPlatCpPlugin(const QString &pluginFile)
-{    
-	return ::loadPluginInterface<CpPluginPlatInterface>(pluginFile);
-}
-
 CpPluginInterface *CpPluginLoader::loadCpPluginInterface(const QString &pluginFile)
 {
     return ::loadPluginInterface<CpPluginInterface>(pluginFile);
 }
 
+/*!
+    load a CpLauncherInterface by plugin file.
+    the plugin file can either absoulte file path or only file name.
+    acceptable format:
+        sampleplugin
+        sampleplugin.qtplugin
+        sampleplugin.dll
+        C:/resource/qt/plugins/controlpanel/sampleplugin.qtplugin
+        C:/resource/qt/plugins/controlpanel/sampleplugin.dll
+ */
 CpLauncherInterface *CpPluginLoader::loadCpLauncherInterface(const QString &pluginFile)
 {
     return ::loadPluginInterface<CpLauncherInterface>(pluginFile);    
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cputility.cpp
--- a/controlpanel/src/cpframework/src/cputility.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cputility.cpp	Fri May 14 16:07:47 2010 +0300
@@ -21,7 +21,6 @@
 #include <cpbasepath.h>
 #include <cppluginloader.h>
 #include <cpplugininterface.h>
-#include <cppluginplatinterface.h>
 #include <cplogger.h>
 
 
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/cpframework/src/cpviewlauncher.cpp
--- a/controlpanel/src/cpframework/src/cpviewlauncher.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpviewlauncher.cpp	Fri May 14 16:07:47 2010 +0300
@@ -75,17 +75,22 @@
 }
 
 void CpViewLauncher::viewDone()
-{
+{    
     HbMainWindow *mainWnd = ::mainWindow();
-    if (mainWnd && mView) {
-        //restore previous status
-        mainWnd->removeView(mView);
     
-        mView->deleteLater();
-        mView = 0;
-
-		mainWnd->setCurrentView(mPreView);
+    if (mainWnd) {
+        if (mView) {               
+            //restore previous status
+            mainWnd->removeView(mView);
+        
+            mView->deleteLater();
+            mView = 0;
+    
+            mainWnd->setCurrentView(mPreView);
+        }
     }
 
     deleteLater();
 }
+
+//End of File
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/src/eabi/cpframeworku.def
--- a/controlpanel/src/eabi/cpframeworku.def	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/src/eabi/cpframeworku.def	Fri May 14 16:07:47 2010 +0300
@@ -1,138 +1,136 @@
 EXPORTS
-	_ZN14CpPluginLoader12loadCpPluginERK7QString @ 1 NONAME
-	_ZN14CpPluginLoader16loadPlatCpPluginERK7QString @ 2 NONAME
-	_ZN14CpPluginLoader21loadCpPluginInterfaceERK7QString @ 3 NONAME
-	_ZN14CpPluginLoader23loadCpLauncherInterfaceERK7QString @ 4 NONAME
-	_ZN15CpPluginUtility18addCpItemPrototypeEP10HbDataForm @ 5 NONAME
-	_ZN16CpItemDataHelper10bindToFormEP10HbDataForm @ 6 NONAME
-	_ZN16CpItemDataHelper11qt_metacallEN11QMetaObject4CallEiPPv @ 7 NONAME
-	_ZN16CpItemDataHelper11qt_metacastEPKc @ 8 NONAME
-	_ZN16CpItemDataHelper13addConnectionEP19HbDataFormModelItemPKcP7QObjectS3_ @ 9 NONAME
-	_ZN16CpItemDataHelper13connectToFormEPKcP7QObjectS1_ @ 10 NONAME
-	_ZN16CpItemDataHelper16addItemPrototypeEP18HbAbstractViewItem @ 11 NONAME
-	_ZN16CpItemDataHelper16removeConnectionEP19HbDataFormModelItemPKcP7QObjectS3_ @ 12 NONAME
-	_ZN16CpItemDataHelper16staticMetaObjectE @ 13 NONAME DATA 16
-	_ZN16CpItemDataHelper18disconnectFromFormEPKcP7QObjectS1_ @ 14 NONAME
-	_ZN16CpItemDataHelper19getStaticMetaObjectEv @ 15 NONAME
-	_ZN16CpItemDataHelper20widgetFromModelIndexERK11QModelIndex @ 16 NONAME
-	_ZN16CpItemDataHelper23modelItemFromModelIndexERK11QModelIndex @ 17 NONAME
-	_ZN16CpItemDataHelperC1EP10HbDataForm @ 18 NONAME
-	_ZN16CpItemDataHelperC2EP10HbDataForm @ 19 NONAME
-	_ZN16CpItemDataHelperD0Ev @ 20 NONAME
-	_ZN16CpItemDataHelperD1Ev @ 21 NONAME
-	_ZN16CpItemDataHelperD2Ev @ 22 NONAME
-	_ZN16CpPluginLauncher17launchSettingViewERK7QStringRK8QVariant @ 23 NONAME
-	_ZN16CpPluginLauncher18launchCpPluginViewERK7QStringi @ 24 NONAME
-	_ZN16LogOutputFactory15createLogOutputERK7QString @ 25 NONAME
-	_ZN16LogOutputFactory15createLogOutputERK7QStringRK5QHashIS0_8QVariantE @ 26 NONAME
-	_ZN16LogOutputFactory23addCreateLogOutputEntryERK7QStringPFP9LogOutputvE @ 27 NONAME
-	_ZN17CpBaseSettingView11qt_metacallEN11QMetaObject4CallEiPPv @ 28 NONAME
-	_ZN17CpBaseSettingView11qt_metacastEPKc @ 29 NONAME
-	_ZN17CpBaseSettingView12aboutToCloseEv @ 30 NONAME
-	_ZN17CpBaseSettingView14setSettingFormEP10HbDataForm @ 31 NONAME
-	_ZN17CpBaseSettingView16staticMetaObjectE @ 32 NONAME DATA 16
-	_ZN17CpBaseSettingView19getStaticMetaObjectEv @ 33 NONAME
-	_ZN17CpBaseSettingViewC1EP15QGraphicsWidgetP13QGraphicsItem @ 34 NONAME
-	_ZN17CpBaseSettingViewC2EP15QGraphicsWidgetP13QGraphicsItem @ 35 NONAME
-	_ZN17CpBaseSettingViewD0Ev @ 36 NONAME
-	_ZN17CpBaseSettingViewD1Ev @ 37 NONAME
-	_ZN17CpBaseSettingViewD2Ev @ 38 NONAME
-	_ZN21CpSettingFormItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 39 NONAME
-	_ZN21CpSettingFormItemData11qt_metacastEPKc @ 40 NONAME
-	_ZN21CpSettingFormItemData16staticMetaObjectE @ 41 NONAME DATA 16
-	_ZN21CpSettingFormItemData19getStaticMetaObjectEv @ 42 NONAME
-	_ZN21CpSettingFormItemDataC1EN19HbDataFormModelItem12DataItemTypeERK7QStringPKS0_ @ 43 NONAME
-	_ZN21CpSettingFormItemDataC1EPK19HbDataFormModelItem @ 44 NONAME
-	_ZN21CpSettingFormItemDataC2EN19HbDataFormModelItem12DataItemTypeERK7QStringPKS0_ @ 45 NONAME
-	_ZN21CpSettingFormItemDataC2EPK19HbDataFormModelItem @ 46 NONAME
-	_ZN21CpSettingFormItemDataD0Ev @ 47 NONAME
-	_ZN21CpSettingFormItemDataD1Ev @ 48 NONAME
-	_ZN21CpSettingFormItemDataD2Ev @ 49 NONAME
-	_ZN26CpSettingFormEntryItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 50 NONAME
-	_ZN26CpSettingFormEntryItemData11qt_metacastEPKc @ 51 NONAME
-	_ZN26CpSettingFormEntryItemData11setIconNameERK7QString @ 52 NONAME
-	_ZN26CpSettingFormEntryItemData12onLaunchViewEv @ 53 NONAME
-	_ZN26CpSettingFormEntryItemData14setDescriptionERK7QString @ 54 NONAME
-	_ZN26CpSettingFormEntryItemData16setEntryItemIconERK6HbIcon @ 55 NONAME
-	_ZN26CpSettingFormEntryItemData16staticMetaObjectE @ 56 NONAME DATA 16
-	_ZN26CpSettingFormEntryItemData19getStaticMetaObjectEv @ 57 NONAME
-	_ZN26CpSettingFormEntryItemData7setTextERK7QString @ 58 NONAME
-	_ZN26CpSettingFormEntryItemDataC2ENS_13EntryItemTypeEP10HbDataFormRK7QStringS5_S5_PK19HbDataFormModelItem @ 59 NONAME
-	_ZN26CpSettingFormEntryItemDataC2ENS_13EntryItemTypeER16CpItemDataHelperRK7QStringS5_S5_PK19HbDataFormModelItem @ 60 NONAME
-	_ZN26CpSettingFormEntryItemDataC2EP10HbDataFormRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 61 NONAME
-	_ZN26CpSettingFormEntryItemDataC2EPK19HbDataFormModelItem @ 62 NONAME
-	_ZN26CpSettingFormEntryItemDataC2ER16CpItemDataHelperRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 63 NONAME
-	_ZN26CpSettingFormEntryItemDataD0Ev @ 64 NONAME
-	_ZN26CpSettingFormEntryItemDataD1Ev @ 65 NONAME
-	_ZN26CpSettingFormEntryItemDataD2Ev @ 66 NONAME
-	_ZN6Logger11qt_metacallEN11QMetaObject4CallEiPPv @ 67 NONAME
-	_ZN6Logger11qt_metacastEPKc @ 68 NONAME
-	_ZN6Logger12addLogOutputEP9LogOutput @ 69 NONAME
-	_ZN6Logger14setLogDateTimeEb @ 70 NONAME
-	_ZN6Logger15removeLogOutputEP9LogOutput @ 71 NONAME
-	_ZN6Logger16setLogLoggerNameEb @ 72 NONAME
-	_ZN6Logger16staticMetaObjectE @ 73 NONAME DATA 16
-	_ZN6Logger17clearAllLogOutputEv @ 74 NONAME
-	_ZN6Logger17setDateTimeFormatERK7QString @ 75 NONAME
-	_ZN6Logger19getStaticMetaObjectEv @ 76 NONAME
-	_ZN6Logger3logERK7QString @ 77 NONAME
-	_ZN6Logger5closeERK7QString @ 78 NONAME
-	_ZN6Logger8closeAllEv @ 79 NONAME
-	_ZN6Logger8instanceERK7QString @ 80 NONAME
-	_ZN6Logger9configureER9QSettings @ 81 NONAME
-	_ZN6Logger9configureERK7QStringN9QSettings6FormatE @ 82 NONAME
-	_ZN6Logger9logOutputERK7QString @ 83 NONAME
-	_ZN6LoggerC1ERK7QStringP7QObject @ 84 NONAME
-	_ZN6LoggerC2ERK7QStringP7QObject @ 85 NONAME
-	_ZN6LoggerD0Ev @ 86 NONAME
-	_ZN6LoggerD1Ev @ 87 NONAME
-	_ZN6LoggerD2Ev @ 88 NONAME
-	_ZN9LogOutput11qt_metacallEN11QMetaObject4CallEiPPv @ 89 NONAME
-	_ZN9LogOutput11qt_metacastEPKc @ 90 NONAME
-	_ZN9LogOutput12parentLoggerEv @ 91 NONAME
-	_ZN9LogOutput15setParentLoggerEP6Logger @ 92 NONAME
-	_ZN9LogOutput16staticMetaObjectE @ 93 NONAME DATA 16
-	_ZN9LogOutput19getStaticMetaObjectEv @ 94 NONAME
-	_ZN9LogOutput4loadER9QSettings @ 95 NONAME
-	_ZN9LogOutput7setNameERK7QString @ 96 NONAME
-	_ZN9LogOutputC2EP6Logger @ 97 NONAME
-	_ZN9LogOutputD0Ev @ 98 NONAME
-	_ZN9LogOutputD1Ev @ 99 NONAME
-	_ZN9LogOutputD2Ev @ 100 NONAME
-	_ZNK16CpItemDataHelper10metaObjectEv @ 101 NONAME
-	_ZNK17CpBaseSettingView10metaObjectEv @ 102 NONAME
-	_ZNK17CpBaseSettingView11settingFormEv @ 103 NONAME
-	_ZNK21CpSettingFormItemData10metaObjectEv @ 104 NONAME
-	_ZNK26CpSettingFormEntryItemData10metaObjectEv @ 105 NONAME
-	_ZNK26CpSettingFormEntryItemData11descriptionEv @ 106 NONAME
-	_ZNK26CpSettingFormEntryItemData13entryItemIconEv @ 107 NONAME
-	_ZNK26CpSettingFormEntryItemData4textEv @ 108 NONAME
-	_ZNK26CpSettingFormEntryItemData8iconNameEv @ 109 NONAME
-	_ZNK6Logger10metaObjectEv @ 110 NONAME
-	_ZNK6Logger11logDateTimeEv @ 111 NONAME
-	_ZNK6Logger13logLoggerNameEv @ 112 NONAME
-	_ZNK6Logger14dateTimeFormatEv @ 113 NONAME
-	_ZNK6Logger4nameEv @ 114 NONAME
-	_ZNK9LogOutput10metaObjectEv @ 115 NONAME
-	_ZNK9LogOutput4nameEv @ 116 NONAME
-	_ZTI16CpItemDataHelper @ 117 NONAME
-	_ZTI17CpBaseSettingView @ 118 NONAME
-	_ZTI21CpSettingFormItemData @ 119 NONAME
-	_ZTI26CpSettingFormEntryItemData @ 120 NONAME
-	_ZTI6Logger @ 121 NONAME
-	_ZTI9LogOutput @ 122 NONAME
-	_ZTV16CpItemDataHelper @ 123 NONAME
-	_ZTV17CpBaseSettingView @ 124 NONAME
-	_ZTV21CpSettingFormItemData @ 125 NONAME
-	_ZTV26CpSettingFormEntryItemData @ 126 NONAME
-	_ZTV6Logger @ 127 NONAME
-	_ZTV9LogOutput @ 128 NONAME
-	_ZThn16_N17CpBaseSettingViewD0Ev @ 129 NONAME
-	_ZThn16_N17CpBaseSettingViewD1Ev @ 130 NONAME
-	_ZThn8_N17CpBaseSettingViewD0Ev @ 131 NONAME
-	_ZThn8_N17CpBaseSettingViewD1Ev @ 132 NONAME
-	_ZThn8_N21CpSettingFormItemDataD0Ev @ 133 NONAME
-	_ZThn8_N21CpSettingFormItemDataD1Ev @ 134 NONAME
-	_ZThn8_N26CpSettingFormEntryItemDataD0Ev @ 135 NONAME
-	_ZThn8_N26CpSettingFormEntryItemDataD1Ev @ 136 NONAME
+	_ZN14CpPluginLoader21loadCpPluginInterfaceERK7QString @ 1 NONAME
+	_ZN14CpPluginLoader23loadCpLauncherInterfaceERK7QString @ 2 NONAME
+	_ZN15CpPluginUtility18addCpItemPrototypeEP10HbDataForm @ 3 NONAME
+	_ZN16CpItemDataHelper10bindToFormEP10HbDataForm @ 4 NONAME
+	_ZN16CpItemDataHelper11qt_metacallEN11QMetaObject4CallEiPPv @ 5 NONAME
+	_ZN16CpItemDataHelper11qt_metacastEPKc @ 6 NONAME
+	_ZN16CpItemDataHelper13addConnectionEP19HbDataFormModelItemPKcP7QObjectS3_ @ 7 NONAME
+	_ZN16CpItemDataHelper13connectToFormEPKcP7QObjectS1_ @ 8 NONAME
+	_ZN16CpItemDataHelper16addItemPrototypeEP18HbAbstractViewItem @ 9 NONAME
+	_ZN16CpItemDataHelper16removeConnectionEP19HbDataFormModelItemPKcP7QObjectS3_ @ 10 NONAME
+	_ZN16CpItemDataHelper16staticMetaObjectE @ 11 NONAME DATA 16
+	_ZN16CpItemDataHelper18disconnectFromFormEPKcP7QObjectS1_ @ 12 NONAME
+	_ZN16CpItemDataHelper19getStaticMetaObjectEv @ 13 NONAME
+	_ZN16CpItemDataHelper20widgetFromModelIndexERK11QModelIndex @ 14 NONAME
+	_ZN16CpItemDataHelper23modelItemFromModelIndexERK11QModelIndex @ 15 NONAME
+	_ZN16CpItemDataHelperC1EP10HbDataForm @ 16 NONAME
+	_ZN16CpItemDataHelperC2EP10HbDataForm @ 17 NONAME
+	_ZN16CpItemDataHelperD0Ev @ 18 NONAME
+	_ZN16CpItemDataHelperD1Ev @ 19 NONAME
+	_ZN16CpItemDataHelperD2Ev @ 20 NONAME
+	_ZN16CpPluginLauncher17launchSettingViewERK7QStringRK8QVariant @ 21 NONAME
+	_ZN16CpPluginLauncher18launchCpPluginViewERK7QStringi @ 22 NONAME
+	_ZN16LogOutputFactory15createLogOutputERK7QString @ 23 NONAME
+	_ZN16LogOutputFactory15createLogOutputERK7QStringRK5QHashIS0_8QVariantE @ 24 NONAME
+	_ZN16LogOutputFactory23addCreateLogOutputEntryERK7QStringPFP9LogOutputvE @ 25 NONAME
+	_ZN17CpBaseSettingView11qt_metacallEN11QMetaObject4CallEiPPv @ 26 NONAME
+	_ZN17CpBaseSettingView11qt_metacastEPKc @ 27 NONAME
+	_ZN17CpBaseSettingView12aboutToCloseEv @ 28 NONAME
+	_ZN17CpBaseSettingView16staticMetaObjectE @ 29 NONAME DATA 16
+	_ZN17CpBaseSettingView19getStaticMetaObjectEv @ 30 NONAME
+	_ZN17CpBaseSettingView20returnValueDeliveredERK8QVariant @ 31 NONAME
+	_ZN17CpBaseSettingView5closeEv @ 32 NONAME
+	_ZN17CpBaseSettingViewC1EP15QGraphicsWidgetP13QGraphicsItem @ 33 NONAME
+	_ZN17CpBaseSettingViewC2EP15QGraphicsWidgetP13QGraphicsItem @ 34 NONAME
+	_ZN17CpBaseSettingViewD0Ev @ 35 NONAME
+	_ZN17CpBaseSettingViewD1Ev @ 36 NONAME
+	_ZN17CpBaseSettingViewD2Ev @ 37 NONAME
+	_ZN21CpSettingFormItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 38 NONAME
+	_ZN21CpSettingFormItemData11qt_metacastEPKc @ 39 NONAME
+	_ZN21CpSettingFormItemData16staticMetaObjectE @ 40 NONAME DATA 16
+	_ZN21CpSettingFormItemData19getStaticMetaObjectEv @ 41 NONAME
+	_ZN21CpSettingFormItemDataC1EN19HbDataFormModelItem12DataItemTypeERK7QStringPKS0_ @ 42 NONAME
+	_ZN21CpSettingFormItemDataC1EPK19HbDataFormModelItem @ 43 NONAME
+	_ZN21CpSettingFormItemDataC2EN19HbDataFormModelItem12DataItemTypeERK7QStringPKS0_ @ 44 NONAME
+	_ZN21CpSettingFormItemDataC2EPK19HbDataFormModelItem @ 45 NONAME
+	_ZN21CpSettingFormItemDataD0Ev @ 46 NONAME
+	_ZN21CpSettingFormItemDataD1Ev @ 47 NONAME
+	_ZN21CpSettingFormItemDataD2Ev @ 48 NONAME
+	_ZN26CpSettingFormEntryItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 49 NONAME
+	_ZN26CpSettingFormEntryItemData11qt_metacastEPKc @ 50 NONAME
+	_ZN26CpSettingFormEntryItemData11setIconNameERK7QString @ 51 NONAME
+	_ZN26CpSettingFormEntryItemData12onLaunchViewEv @ 52 NONAME
+	_ZN26CpSettingFormEntryItemData14setDescriptionERK7QString @ 53 NONAME
+	_ZN26CpSettingFormEntryItemData16setEntryItemIconERK6HbIcon @ 54 NONAME
+	_ZN26CpSettingFormEntryItemData16staticMetaObjectE @ 55 NONAME DATA 16
+	_ZN26CpSettingFormEntryItemData19getStaticMetaObjectEv @ 56 NONAME
+	_ZN26CpSettingFormEntryItemData7setTextERK7QString @ 57 NONAME
+	_ZN26CpSettingFormEntryItemDataC2ENS_13EntryItemTypeEP10HbDataFormRK7QStringS5_S5_PK19HbDataFormModelItem @ 58 NONAME
+	_ZN26CpSettingFormEntryItemDataC2ENS_13EntryItemTypeER16CpItemDataHelperRK7QStringS5_S5_PK19HbDataFormModelItem @ 59 NONAME
+	_ZN26CpSettingFormEntryItemDataC2EP10HbDataFormRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 60 NONAME
+	_ZN26CpSettingFormEntryItemDataC2EPK19HbDataFormModelItem @ 61 NONAME
+	_ZN26CpSettingFormEntryItemDataC2ER16CpItemDataHelperRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 62 NONAME
+	_ZN26CpSettingFormEntryItemDataD0Ev @ 63 NONAME
+	_ZN26CpSettingFormEntryItemDataD1Ev @ 64 NONAME
+	_ZN26CpSettingFormEntryItemDataD2Ev @ 65 NONAME
+	_ZN6Logger11qt_metacallEN11QMetaObject4CallEiPPv @ 66 NONAME
+	_ZN6Logger11qt_metacastEPKc @ 67 NONAME
+	_ZN6Logger12addLogOutputEP9LogOutput @ 68 NONAME
+	_ZN6Logger14setLogDateTimeEb @ 69 NONAME
+	_ZN6Logger15removeLogOutputEP9LogOutput @ 70 NONAME
+	_ZN6Logger16setLogLoggerNameEb @ 71 NONAME
+	_ZN6Logger16staticMetaObjectE @ 72 NONAME DATA 16
+	_ZN6Logger17clearAllLogOutputEv @ 73 NONAME
+	_ZN6Logger17setDateTimeFormatERK7QString @ 74 NONAME
+	_ZN6Logger19getStaticMetaObjectEv @ 75 NONAME
+	_ZN6Logger3logERK7QString @ 76 NONAME
+	_ZN6Logger5closeERK7QString @ 77 NONAME
+	_ZN6Logger8closeAllEv @ 78 NONAME
+	_ZN6Logger8instanceERK7QString @ 79 NONAME
+	_ZN6Logger9configureER9QSettings @ 80 NONAME
+	_ZN6Logger9configureERK7QStringN9QSettings6FormatE @ 81 NONAME
+	_ZN6Logger9logOutputERK7QString @ 82 NONAME
+	_ZN6LoggerC1ERK7QStringP7QObject @ 83 NONAME
+	_ZN6LoggerC2ERK7QStringP7QObject @ 84 NONAME
+	_ZN6LoggerD0Ev @ 85 NONAME
+	_ZN6LoggerD1Ev @ 86 NONAME
+	_ZN6LoggerD2Ev @ 87 NONAME
+	_ZN9LogOutput11qt_metacallEN11QMetaObject4CallEiPPv @ 88 NONAME
+	_ZN9LogOutput11qt_metacastEPKc @ 89 NONAME
+	_ZN9LogOutput12parentLoggerEv @ 90 NONAME
+	_ZN9LogOutput15setParentLoggerEP6Logger @ 91 NONAME
+	_ZN9LogOutput16staticMetaObjectE @ 92 NONAME DATA 16
+	_ZN9LogOutput19getStaticMetaObjectEv @ 93 NONAME
+	_ZN9LogOutput4loadER9QSettings @ 94 NONAME
+	_ZN9LogOutput7setNameERK7QString @ 95 NONAME
+	_ZN9LogOutputC2EP6Logger @ 96 NONAME
+	_ZN9LogOutputD0Ev @ 97 NONAME
+	_ZN9LogOutputD1Ev @ 98 NONAME
+	_ZN9LogOutputD2Ev @ 99 NONAME
+	_ZNK16CpItemDataHelper10metaObjectEv @ 100 NONAME
+	_ZNK17CpBaseSettingView10metaObjectEv @ 101 NONAME
+	_ZNK21CpSettingFormItemData10metaObjectEv @ 102 NONAME
+	_ZNK26CpSettingFormEntryItemData10metaObjectEv @ 103 NONAME
+	_ZNK26CpSettingFormEntryItemData11descriptionEv @ 104 NONAME
+	_ZNK26CpSettingFormEntryItemData13entryItemIconEv @ 105 NONAME
+	_ZNK26CpSettingFormEntryItemData4textEv @ 106 NONAME
+	_ZNK26CpSettingFormEntryItemData8iconNameEv @ 107 NONAME
+	_ZNK6Logger10metaObjectEv @ 108 NONAME
+	_ZNK6Logger11logDateTimeEv @ 109 NONAME
+	_ZNK6Logger13logLoggerNameEv @ 110 NONAME
+	_ZNK6Logger14dateTimeFormatEv @ 111 NONAME
+	_ZNK6Logger4nameEv @ 112 NONAME
+	_ZNK9LogOutput10metaObjectEv @ 113 NONAME
+	_ZNK9LogOutput4nameEv @ 114 NONAME
+	_ZTI16CpItemDataHelper @ 115 NONAME
+	_ZTI17CpBaseSettingView @ 116 NONAME
+	_ZTI21CpSettingFormItemData @ 117 NONAME
+	_ZTI26CpSettingFormEntryItemData @ 118 NONAME
+	_ZTI6Logger @ 119 NONAME
+	_ZTI9LogOutput @ 120 NONAME
+	_ZTV16CpItemDataHelper @ 121 NONAME
+	_ZTV17CpBaseSettingView @ 122 NONAME
+	_ZTV21CpSettingFormItemData @ 123 NONAME
+	_ZTV26CpSettingFormEntryItemData @ 124 NONAME
+	_ZTV6Logger @ 125 NONAME
+	_ZTV9LogOutput @ 126 NONAME
+	_ZThn16_N17CpBaseSettingViewD0Ev @ 127 NONAME
+	_ZThn16_N17CpBaseSettingViewD1Ev @ 128 NONAME
+	_ZThn8_N17CpBaseSettingViewD0Ev @ 129 NONAME
+	_ZThn8_N17CpBaseSettingViewD1Ev @ 130 NONAME
+	_ZThn8_N21CpSettingFormItemDataD0Ev @ 131 NONAME
+	_ZThn8_N21CpSettingFormItemDataD1Ev @ 132 NONAME
+	_ZThn8_N26CpSettingFormEntryItemDataD0Ev @ 133 NONAME
+	_ZThn8_N26CpSettingFormEntryItemDataD1Ev @ 134 NONAME
 
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.cpp
--- a/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.cpp	Fri May 14 16:07:47 2010 +0300
@@ -42,8 +42,8 @@
 
 void TestCpAPI::initTestCase()
 {    
-	mainWindow = new HbMainWindow;
-  mainWindow->show();
+	//mainWindow = new HbMainWindow;
+  //mainWindow->show();
 }
 
 void TestCpAPI::cleanupTestCase()
@@ -58,8 +58,8 @@
 	CpBaseSettingView * pview = new CpBaseSettingView(0);
 	QVERIFY( pview != 0 );
         HbDataForm *pForm = new HbDataForm(0);
-        pview->setSettingForm(pForm);
-        QVERIFY( pview->settingForm() == pForm );
+        pview->setWidget(pForm);
+        QVERIFY( qobject_cast<HbDataForm *>(pview->widget()) == pForm );
 	delete pview;
 	HbPushButton *widget = new HbPushButton();
 	QVERIFY(widget != 0);
@@ -144,22 +144,22 @@
 
 void TestCpAPI::testCpPluginLoader()
 {
-    CpPluginInterface *plugin = CpPluginLoader::loadCpPlugin("non_existing_plugin.dll");
+    CpPluginInterface *plugin = CpPluginLoader::loadCpPluginInterface("non_existing_plugin.dll");
     QVERIFY(plugin == 0);
 
-    plugin = CpPluginLoader::loadCpPlugin("cppincodeplugin");
+    plugin = CpPluginLoader::loadCpPluginInterface("cppersonalizationplugin");
     QVERIFY(plugin != 0);
 
-    plugin = CpPluginLoader::loadCpPlugin("cppincodeplugin.dll");
+    plugin = CpPluginLoader::loadCpPluginInterface("cppersonalizationplugin.dll");
     QVERIFY(plugin != 0);
 
-    plugin = CpPluginLoader::loadCpPlugin("cppincodeplugin.qtplugin");
+    plugin = CpPluginLoader::loadCpPluginInterface("cppersonalizationplugin.qtplugin");
     QVERIFY(plugin != 0);
 }
 
 void TestCpAPI::testCpPluginInterface()
 {
-    CpPluginInterface *plugin = CpPluginLoader::loadCpPlugin("cppersonalizationplugin.dll");
+    CpPluginInterface *plugin = CpPluginLoader::loadCpPluginInterface("cppersonalizationplugin.dll");
     if (plugin) {
         CpItemDataHelper helper;
         QList<CpSettingFormItemData*> itemData = plugin->createSettingFormItemData(helper);
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.h
--- a/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.h	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.h	Fri May 14 16:07:47 2010 +0300
@@ -14,8 +14,8 @@
 * Description:  
 *		test application for qt control panel public apis.
 */
-#ifndef	__UT_CPAPI_H__
-#define	__UT_CPAPI_H__
+#ifndef	UT_CPAPI_H
+#define	UT_CPAPI_H
 
 #include <QObject>
 
@@ -39,4 +39,4 @@
     HbMainWindow* mainWindow;
 };
 
-#endif	//__UT_CPAPI_H__
+#endif	//UT_CPAPI_H
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/tsrc/unit/ut_cpplugin/src/ut_cpplugin.cpp
--- a/controlpanel/tsrc/unit/ut_cpplugin/src/ut_cpplugin.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpplugin/src/ut_cpplugin.cpp	Fri May 14 16:07:47 2010 +0300
@@ -84,7 +84,7 @@
 
 
     int count = pluginDlls.size();
-    for( int i=0; i<pluginDlls.size(); i++ )
+    for( int i=0; i<pluginDlls.size(); ++i )
     {
         CpPluginPlatInterface* plugin = pLoader->loadCpPlugin( pluginDlls[i] );
         qDebug()<< "<DEBUGINFO>Loading plugin ["
@@ -107,7 +107,7 @@
 {
     CpItemDataHelper *pHelper = new CpItemDataHelper();
 
-    for( int i = 0; i< plist.count(); i++)
+    for( int i = 0; i< plist.count(); ++i)
     {
         CpPluginPlatInterface* plugin = plist[i];
         if(plugin)
@@ -127,14 +127,14 @@
     //clear all existing view firstly
     int vcount = mainWindow->viewCount();
     int i = 0;
-    for ( i=vcount-1; i>=0; i-- )
+    for ( i=vcount-1; i>=0; --i )
     {
         QGraphicsWidget * pwgt = mainWindow->removeView( i );
         delete pwgt;
     }
     //launch plugins list by name
     int count = pluginDlls.size();
-    for( i=0; i<pluginDlls.size(); i++ )
+    for( i=0; i<pluginDlls.size(); ++i )
     {
         bool bret = CpPluginLauncher::launchCpPluginView( pluginDlls[i] );
         if(!PluginHasView[i])   bret = !bret;
@@ -155,7 +155,7 @@
 
 void TestCpPlugin::cleanupTestCase()
 {
-    for (int i = 0; i < plist.count(); i++)
+    for (int i = 0; i < plist.count(); ++i)
     {
         CpPluginPlatInterface* plugin = plist[i];
         if (plugin)
diff -r 851e19007849 -r 7e4c5a2ff1a2 controlpanel/tsrc/unit/ut_cpplugin/src/ut_cpplugin.h
--- a/controlpanel/tsrc/unit/ut_cpplugin/src/ut_cpplugin.h	Mon May 03 12:46:45 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpplugin/src/ut_cpplugin.h	Fri May 14 16:07:47 2010 +0300
@@ -14,8 +14,8 @@
 * Description:  
 *
 */
-#ifndef	__UT_CPPLUGIN_H__
-#define	__UT_CPPLUGIN_H__
+#ifndef	UT_CPPLUGIN_H
+#define	UT_CPPLUGIN_H
 
 #include <QObject>
 #include <QVector>
@@ -49,4 +49,4 @@
 };
 
 
-#endif	//__UT_CPPLUGIN_H__
+#endif	//UT_CPPLUGIN_H
diff -r 851e19007849 -r 7e4c5a2ff1a2 ftuwizardmodel/inc/ftuwizard.h
--- a/ftuwizardmodel/inc/ftuwizard.h	Mon May 03 12:46:45 2010 +0300
+++ b/ftuwizardmodel/inc/ftuwizard.h	Fri May 14 16:07:47 2010 +0300
@@ -73,6 +73,13 @@
      * The text to be shown in table of contents UI component.
      */ 
     QString   mTocLabel;
+	 /**
+     * Informs Framework whether a plugin is having any ftu view or not.
+	 * It should be set to false by plugin if it has any FTU view to be shown 
+	 * when the plugin is activated. It should be set to true if plugin 
+	 * is invoking any service/wizard, when plugin is selected/activated.
+     */
+    bool mNoViews;
 } FtuWizardSetting; 
 
 /**
diff -r 851e19007849 -r 7e4c5a2ff1a2 gsprofilesrv_plat/ftuwizardmodel_api/inc/ftuwizard.h
--- a/gsprofilesrv_plat/ftuwizardmodel_api/inc/ftuwizard.h	Mon May 03 12:46:45 2010 +0300
+++ b/gsprofilesrv_plat/ftuwizardmodel_api/inc/ftuwizard.h	Fri May 14 16:07:47 2010 +0300
@@ -73,6 +73,13 @@
      * The text to be shown in table of contents UI component.
      */ 
     QString   mTocLabel;
+	 /**
+     * Informs Framework whether a plugin is having any ftu view or not.
+	 * It should be set to false by plugin if it has any FTU view to be shown 
+	 * when the plugin is activated. It should be set to true if plugin 
+	 * is invoking any service/wizard, when plugin is selected/activated. 
+     */
+    bool mNoViews;
 } FtuWizardSetting; 
 
 /**
diff -r 851e19007849 -r 7e4c5a2ff1a2 gsprofilesrv_plat/settings_framework_api/inc/GSBaseView.h
--- a/gsprofilesrv_plat/settings_framework_api/inc/GSBaseView.h	Mon May 03 12:46:45 2010 +0300
+++ b/gsprofilesrv_plat/settings_framework_api/inc/GSBaseView.h	Fri May 14 16:07:47 2010 +0300
@@ -159,7 +159,7 @@
         /**
         * See base class.
         */
-        void HandleListBoxEventL( CEikListBox* aListBox,
+        IMPORT_C void HandleListBoxEventL( CEikListBox* aListBox,
             TListBoxEvent aEventType );
 
     private: // New
diff -r 851e19007849 -r 7e4c5a2ff1a2 profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp	Fri May 14 16:07:47 2010 +0300
@@ -1241,6 +1241,10 @@
 void CProfileEngineImpl::SetSilenceModeL( TBool aSilenceMode )
     {
     User::LeaveIfError( iCenRep->Set( KProEngSilenceMode, aSilenceMode ? 1 : 0 ) );
+    
+    //Send event through P&S
+    CreatePubSubKeysIfNeededL();
+    PublishChangeL( KProEngActiveProfileModified );
     }
 
 //  End of File
diff -r 851e19007849 -r 7e4c5a2ff1a2 profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp
--- a/profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp	Fri May 14 16:07:47 2010 +0300
@@ -235,6 +235,16 @@
 //
 TBool CProfileImpl::IsSilent() const
     {
+	//Since 10.1, firstly check maste silence mode
+	TInt silenceMode( 0 );
+	CRepository* cenrep = CRepository::NewLC( KCRUidProfileEngine  );
+    cenrep->Get( KProEngSilenceMode , silenceMode );
+    CleanupStack::PopAndDestroy( cenrep );
+    if ( silenceMode ) 
+    	{
+		return ETrue;
+    	}
+	
     TProfileRingingType ringType( iProfileTones->ToneSettings().iRingingType );
     if ( ringType == EProfileRingingTypeSilent )
         {
diff -r 851e19007849 -r 7e4c5a2ff1a2 profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp	Mon May 03 12:46:45 2010 +0300
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp	Fri May 14 16:07:47 2010 +0300
@@ -141,6 +141,15 @@
             aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngRingingType,
             aProfileId ), value ) );
     iProfileToneSettings.iRingingType = TProfileRingingType( value );
+    
+    //Since 10.1, check if silence mode
+    User::LeaveIfError(
+            aCenRep.Get( KProEngSilenceMode , value) );
+    if ( value )
+    	{
+		iProfileToneSettings.iRingingType = EProfileRingingTypeSilent;
+    	}
+    
     User::LeaveIfError(
             aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngKeypadVolume,
             aProfileId ), value ) );
@@ -151,7 +160,7 @@
             aProfileId ), iProfileToneSettings.iRingingVolume ) );
      */
     
-    //Only master volume used.
+    //Since 10.1, Only master volume used.
     User::LeaveIfError(
             aCenRep.Get( KProEngMasterVolume , iProfileToneSettings.iRingingVolume ) );
     
@@ -162,7 +171,7 @@
             aProfileId ), iProfileToneSettings.iVibratingAlert ) );
     */
     
-    //Only master vibra used
+    //Since 10.1,Only master vibra used
     User::LeaveIfError(
             aCenRep.Get( KProEngMasterVibra, iProfileToneSettings.iVibratingAlert ) );