# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1278416062 -10800
# Node ID 3341fe7c643a90f43a7f64d77b21d9f1ad066c0c
# Parent  9aa586a731eb7bd16c7a1ef6bb95609d607c6911
Revision: 201025
Kit: 2010127

diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/controlpanel_plat/inc/cpbasepath.h
--- a/controlpanel/controlpanel_plat/inc/cpbasepath.h	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/controlpanel_plat/inc/cpbasepath.h	Tue Jul 06 14:34:22 2010 +0300
@@ -33,22 +33,6 @@
     #endif
 #endif 
 
-#ifdef Q_OS_SYMBIAN
-    #ifdef __WINS__
-        #define CP_RESOURCE_PATH QLatin1String("C:/resource/controlpanel")
-    #else
-        #define CP_RESOURCE_PATH QLatin1String("Z:/resource/controlpanel")
-    #endif
-#else 
-    #ifdef _DEBUG
-        #define CP_RESOURCE_PATH QLatin1String("C:/controlpanel/debug/resource")
-    #else
-        #define CP_RESOURCE_PATH QLatin1String("C:/controlpanel/release/resource")
-    #endif
-#endif 
-
-#define WIDGETML_SUB_PATH QLatin1String("widgetml")
-#define ICON_SUB_PATH     QLatin1String("icon")
 
 #endif  //CPBASEPATH_H
 
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/controlpanel_plat/inc/cplogger.h
--- a/controlpanel/controlpanel_plat/inc/cplogger.h	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/controlpanel_plat/inc/cplogger.h	Tue Jul 06 14:34:22 2010 +0300
@@ -19,8 +19,7 @@
 
 
 /* 
-    Windows: C:/ControlPanel/debug/bin/controlpanellog.conf
-    Symbian: C:/data/.config/controlpanellog.conf
+    config file path :/logconf/controlpanellog.conf
 
     Format:
 
@@ -43,20 +42,33 @@
 #include <QLatin1String>
 #include <logger.h>
 
+/*
+ make CPFW_LOG work
+*/
+
+//#define ENABLE_CPFW_LOG
+
+/*
+ make CPPERF_LOG work
+*/
+
+//#define ENABLE_CPPERF_LOG
+
 #define CPFW_LOGGER_NAME       QLatin1String("CpFramework")
 #define CPPERF_LOGGER_NAME     QLatin1String("CpPerformance")
 
-#if defined (Q_OS_SYMBIAN)
-    #define CP_LOGGER_CONFIG_PATH QLatin1String("C:/data/.config/controlpanellog.conf")
-#elif defined (Q_WS_WIN)
-    #ifdef _DEBUG
-        #define CP_LOGGER_CONFIG_PATH QLatin1String("C:/controlpanel/debug/bin/controlpanellog.conf")
-    #else 
-        #define CP_LOGGER_CONFIG_PATH QLatin1String("C:/controlpanel/release/bin/controlpanellog.conf")
-    #endif
+#define CP_LOGGER_CONFIG_PATH QLatin1String(":/logconf/controlpanellog.conf")
+
+#ifdef ENABLE_CPFW_LOG
+    #define CPFW_LOG(str)   Logger::instance(CPFW_LOGGER_NAME)->log(str);
+#else
+    #define CPFW_LOG(str)
 #endif
 
-#define CPFW_LOG(str)   Logger::instance(CPFW_LOGGER_NAME)->log(str);
-#define CPPERF_LOG(str) Logger::instance(CPPERF_LOGGER_NAME)->log(str);
+#ifdef ENABLE_CPPERF_LOG
+    #define CPPERF_LOG(str) Logger::instance(CPPERF_LOGGER_NAME)->log(str);
+#else
+    #define CPPERF_LOG(str)
+#endif
 
 #endif /* CPLOGGER_H */
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/rom/controlpanel.iby
--- a/controlpanel/rom/controlpanel.iby	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/rom/controlpanel.iby	Tue Jul 06 14:34:22 2010 +0300
@@ -25,9 +25,4 @@
 
 file=ABI_DIR\BUILD_DIR\cpframework.dll			  	 SHARED_LIB_DIR\cpframework.dll
 
-data= \epoc32\data\c\resource\controlpanel\widgetml\cpdataformlistentryviewitem.css             resource\controlpanel\widgetml\cpdataformlistentryviewitem.css
-data= \epoc32\data\c\resource\controlpanel\widgetml\cpdataformlistentryviewitem_color.css       resource\controlpanel\widgetml\cpdataformlistentryviewitem_color.css
-data= \epoc32\data\c\resource\controlpanel\widgetml\cpdataformlistentryviewitem.widgetml        resource\controlpanel\widgetml\cpdataformlistentryviewitem.widgetml
-data= \epoc32\data\c\resource\controlpanel\icon\qgn_prop_set_default_sub.svg                    resource\controlpanel\icon\qgn_prop_set_default_sub.svg
-
 #endif
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/bwins/cpframeworku.def
--- a/controlpanel/src/bwins/cpframeworku.def	Wed Jun 23 18:30:54 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-EXPORTS
-	?addLogOutput@Logger@@QAE_NPAVLogOutput@@@Z @ 1 NONAME ; bool Logger::addLogOutput(class LogOutput *)
-	??0CpItemDataHelper@@QAE@PAVHbDataForm@@@Z @ 2 NONAME ; CpItemDataHelper::CpItemDataHelper(class HbDataForm *)
-	?trUtf8@LogOutput@@SA?AVQString@@PBD0@Z @ 3 NONAME ; class QString LogOutput::trUtf8(char const *, char const *)
-	??1CpItemDataHelper@@UAE@XZ @ 4 NONAME ; CpItemDataHelper::~CpItemDataHelper(void)
-	??_ECpSettingFormEntryItemData@@UAE@I@Z @ 5 NONAME ; CpSettingFormEntryItemData::~CpSettingFormEntryItemData(unsigned int)
-	?staticMetaObject@CpItemDataHelper@@2UQMetaObject@@B @ 6 NONAME ; struct QMetaObject const CpItemDataHelper::staticMetaObject
-	?metaObject@CpBaseSettingView@@UBEPBUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const * CpBaseSettingView::metaObject(void) const
-	?text@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 8 NONAME ; class QString CpSettingFormEntryItemData::text(void) const
-	?qt_metacast@CpSettingFormItemData@@UAEPAXPBD@Z @ 9 NONAME ; void * CpSettingFormItemData::qt_metacast(char const *)
-	??1LogOutput@@UAE@XZ @ 10 NONAME ; LogOutput::~LogOutput(void)
-	?qt_metacall@Logger@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 11 NONAME ; int Logger::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?loadCpLauncherInterface@CpPluginLoader@@SAPAVCpLauncherInterface@@ABVQString@@@Z @ 12 NONAME ; class CpLauncherInterface * CpPluginLoader::loadCpLauncherInterface(class QString const &)
-	?loadCpPluginInterface@CpPluginLoader@@SAPAVCpPluginInterface@@ABVQString@@@Z @ 13 NONAME ; class CpPluginInterface * CpPluginLoader::loadCpPluginInterface(class QString const &)
-	?staticMetaObject@Logger@@2UQMetaObject@@B @ 14 NONAME ; struct QMetaObject const Logger::staticMetaObject
-	?loadPlatCpPlugin@CpPluginLoader@@SAPAVCpPluginPlatInterface@@ABVQString@@@Z @ 15 NONAME ; class CpPluginPlatInterface * CpPluginLoader::loadPlatCpPlugin(class QString const &)
-	?logOutput@Logger@@QAEPAVLogOutput@@ABVQString@@@Z @ 16 NONAME ; class LogOutput * Logger::logOutput(class QString const &)
-	??_ELogOutput@@UAE@I@Z @ 17 NONAME ; LogOutput::~LogOutput(unsigned int)
-	?addCpItemPrototype@CpPluginUtility@@SAXPAVHbDataForm@@@Z @ 18 NONAME ; void CpPluginUtility::addCpItemPrototype(class HbDataForm *)
-	?qt_metacast@LogOutput@@UAEPAXPBD@Z @ 19 NONAME ; void * LogOutput::qt_metacast(char const *)
-	?qt_metacast@CpBaseSettingView@@UAEPAXPBD@Z @ 20 NONAME ; void * CpBaseSettingView::qt_metacast(char const *)
-	?getStaticMetaObject@CpBaseSettingView@@SAABUQMetaObject@@XZ @ 21 NONAME ; struct QMetaObject const & CpBaseSettingView::getStaticMetaObject(void)
-	??1CpSettingFormItemData@@UAE@XZ @ 22 NONAME ; CpSettingFormItemData::~CpSettingFormItemData(void)
-	??0CpSettingFormEntryItemData@@QAE@W4EntryItemType@0@PAVHbDataForm@@ABVQString@@22PBVHbDataFormModelItem@@@Z @ 23 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(enum CpSettingFormEntryItemData::EntryItemType, class HbDataForm *, class QString const &, class QString const &, class QString const &, class HbDataFormModelItem const *)
-	?d_func@CpSettingFormEntryItemData@@ABEPBVCpSettingFormEntryItemDataPrivate@@XZ @ 24 NONAME ; class CpSettingFormEntryItemDataPrivate const * CpSettingFormEntryItemData::d_func(void) const
-	?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)
-	?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 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/bwins/cpframeworku.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/cpframework/bwins/cpframeworku.def	Tue Jul 06 14:34:22 2010 +0300
@@ -0,0 +1,137 @@
+EXPORTS
+	?addLogOutput@Logger@@QAE_NPAVLogOutput@@@Z @ 1 NONAME ; bool Logger::addLogOutput(class LogOutput *)
+	??0CpItemDataHelper@@QAE@PAVHbDataForm@@@Z @ 2 NONAME ; CpItemDataHelper::CpItemDataHelper(class HbDataForm *)
+	?trUtf8@LogOutput@@SA?AVQString@@PBD0@Z @ 3 NONAME ; class QString LogOutput::trUtf8(char const *, char const *)
+	??1CpItemDataHelper@@UAE@XZ @ 4 NONAME ; CpItemDataHelper::~CpItemDataHelper(void)
+	??_ECpSettingFormEntryItemData@@UAE@I@Z @ 5 NONAME ; CpSettingFormEntryItemData::~CpSettingFormEntryItemData(unsigned int)
+	?staticMetaObject@CpItemDataHelper@@2UQMetaObject@@B @ 6 NONAME ; struct QMetaObject const CpItemDataHelper::staticMetaObject
+	?metaObject@CpBaseSettingView@@UBEPBUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const * CpBaseSettingView::metaObject(void) const
+	?text@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 8 NONAME ; class QString CpSettingFormEntryItemData::text(void) const
+	?qt_metacast@CpSettingFormItemData@@UAEPAXPBD@Z @ 9 NONAME ; void * CpSettingFormItemData::qt_metacast(char const *)
+	??1LogOutput@@UAE@XZ @ 10 NONAME ; LogOutput::~LogOutput(void)
+	?qt_metacall@Logger@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 11 NONAME ; int Logger::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?loadCpLauncherInterface@CpPluginLoader@@SAPAVCpLauncherInterface@@ABVQString@@@Z @ 12 NONAME ; class CpLauncherInterface * CpPluginLoader::loadCpLauncherInterface(class QString const &)
+	?loadCpPluginInterface@CpPluginLoader@@SAPAVCpPluginInterface@@ABVQString@@@Z @ 13 NONAME ; class CpPluginInterface * CpPluginLoader::loadCpPluginInterface(class QString const &)
+	?staticMetaObject@Logger@@2UQMetaObject@@B @ 14 NONAME ; struct QMetaObject const Logger::staticMetaObject
+	?loadPlatCpPlugin@CpPluginLoader@@SAPAVCpPluginPlatInterface@@ABVQString@@@Z @ 15 NONAME ; class CpPluginPlatInterface * CpPluginLoader::loadPlatCpPlugin(class QString const &)
+	?logOutput@Logger@@QAEPAVLogOutput@@ABVQString@@@Z @ 16 NONAME ; class LogOutput * Logger::logOutput(class QString const &)
+	??_ELogOutput@@UAE@I@Z @ 17 NONAME ; LogOutput::~LogOutput(unsigned int)
+	?addCpItemPrototype@CpPluginUtility@@SAXPAVHbDataForm@@@Z @ 18 NONAME ; void CpPluginUtility::addCpItemPrototype(class HbDataForm *)
+	?qt_metacast@LogOutput@@UAEPAXPBD@Z @ 19 NONAME ; void * LogOutput::qt_metacast(char const *)
+	?qt_metacast@CpBaseSettingView@@UAEPAXPBD@Z @ 20 NONAME ; void * CpBaseSettingView::qt_metacast(char const *)
+	?getStaticMetaObject@CpBaseSettingView@@SAABUQMetaObject@@XZ @ 21 NONAME ; struct QMetaObject const & CpBaseSettingView::getStaticMetaObject(void)
+	??1CpSettingFormItemData@@UAE@XZ @ 22 NONAME ; CpSettingFormItemData::~CpSettingFormItemData(void)
+	??0CpSettingFormEntryItemData@@QAE@W4EntryItemType@0@PAVHbDataForm@@ABVQString@@22PBVHbDataFormModelItem@@@Z @ 23 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(enum CpSettingFormEntryItemData::EntryItemType, class HbDataForm *, class QString const &, class QString const &, class QString const &, class HbDataFormModelItem const *)
+	?d_func@CpSettingFormEntryItemData@@ABEPBVCpSettingFormEntryItemDataPrivate@@XZ @ 24 NONAME ; class CpSettingFormEntryItemDataPrivate const * CpSettingFormEntryItemData::d_func(void) const
+	?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)
+	?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 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/cpframework.pro
--- a/controlpanel/src/cpframework/cpframework.pro	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/src/cpframework/cpframework.pro	Tue Jul 06 14:34:22 2010 +0300
@@ -50,20 +50,6 @@
     
     headers.sources = $$EXPORT_PLATFORM_HEADERS
     for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$MW_LAYER_PLATFORM_EXPORT_PATH($$basename(header))"
-    
-    
-	# export widgetml files	
-    widgetmls.path = C:/resource/controlpanel/widgetml
-    widgetmls.sources += widgetml/cpdataformlistentryviewitem.css \
-                         widgetml/cpdataformlistentryviewitem.widgetml \
-                         widgetml/cpdataformlistentryviewitem_color.css 
-    for(widgetmlfile, widgetmls.sources):BLD_INF_RULES.prj_exports += "./$$widgetmlfile  $$widgetmls.path/$$basename(widgetmlfile)" 
-    
-    # export icon files	
-    icons.path = C:/resource/controlpanel/icon
-    icons.sources += icon/qgn_prop_set_default_sub.svg
-    for(iconfile, icons.sources):BLD_INF_RULES.prj_exports += "./$$iconfile  $$icons.path/$$basename(iconfile)" 
-    
 }
 include (../logger/logger_export.pri)
     
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/cpframework.qrc
--- a/controlpanel/src/cpframework/cpframework.qrc	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/src/cpframework/cpframework.qrc	Tue Jul 06 14:34:22 2010 +0300
@@ -1,7 +1,10 @@
 <!DOCTYPE RCC><RCC version="1.0">
-    <qresource prefix="/">   
-        <file>widgetml/cpdataformlistentryviewitem.widgetml</file>      
-        <file>widgetml/cpdataformlistentryviewitem.css</file>  
-        <file>icon/qgn_prop_set_default_sub.svg</file>
+    <qresource prefix="/widgetml">   
+        <file alias = "cpdataformlistentryviewitem.widgetml">resources/widgetml/cpdataformlistentryviewitem.widgetml</file>      
+        <file alias = "cpdataformlistentryviewitem.css">resources/widgetml/cpdataformlistentryviewitem.css</file>  
+        <file alias = "cpdataformlistentryviewitem_color.css">resources/widgetml/cpdataformlistentryviewitem_color.css</file>
     </qresource>    
+    <qresource prefix="/icon">   
+        <file alias = "qgn_prop_set_default_sub.svg">resources/icon/qgn_prop_set_default_sub.svg</file>
+    </qresource>   
 </RCC>
\ No newline at end of file
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/eabi/cpframeworku.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/cpframework/eabi/cpframeworku.def	Tue Jul 06 14:34:22 2010 +0300
@@ -0,0 +1,136 @@
+EXPORTS
+	_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 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/icon/qgn_prop_set_default_sub.svg
--- a/controlpanel/src/cpframework/icon/qgn_prop_set_default_sub.svg	Wed Jun 23 18:30:54 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="84" height="58" viewBox="0 0 84 58">
-<linearGradient id="_7" gradientUnits="userSpaceOnUse" x1="49.2" y1="27.45" x2="59.91" y2="48.56">
-<stop stop-color="#A2C2DD" offset="0.1"/>
-<stop stop-color="#6C83BB" offset="0.71"/>
-<stop stop-color="#003D6D" offset="0.99"/>
-</linearGradient>
-<path fill="url(#_7)" d="M23.988,14.567l3.031,29.666l24.507,8.426l17.605-12.168l1.831-30.629L42.207,4.307L23.988,14.567 z"/>
-<linearGradient id="_8" gradientUnits="userSpaceOnUse" x1="50.58" y1="5.67" x2="36.58" y2="36.67">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_8)" points="51.495,52.249 27.345,43.975 24.529,14.76 52.366,21.846 "/>
-<linearGradient id="_9" gradientUnits="userSpaceOnUse" x1="69.46" y1="9.14" x2="59.13" y2="33.47">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_9)" points="51.495,52.249 68.793,40.3 70.596,10.147 51.495,21.846 "/>
-<linearGradient id="_10" gradientUnits="userSpaceOnUse" x1="52.6" y1="23.4" x2="32.93" y2="-18.27">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_10)" points="24.359,14.76 51.495,21.846 70.508,10.147 42.267,4.675 "/>
-<linearGradient id="_11" gradientUnits="userSpaceOnUse" x1="31.28" y1="50.6" x2="54.94" y2="39.6">
-<stop stop-color="#FFFFFF" offset="0.05"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_11)" points="51.333,35.382 51.473,52.271 27.351,43.998 43.792,33.719 "/>
-<path fill="#FFFFFF" d="M12.458,34.78c-2.914,0-6.904,0.692-7.916,6.672l-0.151,0.899c0,0,6.712,0,7.508,0 c0.24,0.433,0.599,1.078,0.826,1.492c-0.228,0.414-0.586,1.06-0.826,1.49c-0.798,0-7.508,0-7.508,0l0.151,0.902 c1.012,5.977,5.002,6.669,7.916,6.669c2.297,0,4.346-1.927,5.988-3.478c0.891-0.839,1.729-1.626,2.174-1.626h20.56l0.229-0.253 c0.44-0.485,1.466-1.814,1.489-3.673v-0.067c-0.023-1.861-1.051-3.188-1.489-3.675l-0.229-0.252H20.62 c-0.442,0-1.283-0.788-2.172-1.622C16.804,36.709,14.755,34.78,12.458,34.78z"/>
-<linearGradient id="_12" gradientUnits="userSpaceOnUse" x1="11.1" y1="29.9" x2="33.27" y2="56.57">
-<stop stop-color="#E6EEF4" offset="0"/>
-<stop stop-color="#9646AC" offset="0.44"/>
-<stop stop-color="#3D013F" offset="0.94"/>
-</linearGradient>
-<path fill="url(#_12)" d="M42.174,43.828c0-0.008,0.002-0.016,0.002-0.022h-0.004c-0.019-1.62-0.946-2.79-1.288-3.164 c-0.435,0-20.217,0-20.217,0c-0.753,0-1.568-0.771-2.703-1.835c-1.544-1.456-3.467-3.268-5.459-3.268 c-3.234,0-6.294,0.95-7.152,6.025c1.216,0,7.05,0,7.05,0l1.253,2.264l-1.253,2.264c0,0-5.834,0-7.05,0 c0.858,5.076,3.918,6.025,7.152,6.025c1.992,0,3.916-1.813,5.459-3.267c1.135-1.065,1.95-1.836,2.703-1.836 c0,0,19.782,0,20.217,0c0.341-0.372,1.27-1.543,1.288-3.163h0.004C42.176,43.844,42.174,43.837,42.174,43.828z"/>
-</svg>
\ No newline at end of file
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/resources/icon/qgn_prop_set_default_sub.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/cpframework/resources/icon/qgn_prop_set_default_sub.svg	Tue Jul 06 14:34:22 2010 +0300
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg width="84" height="58" viewBox="0 0 84 58">
+<linearGradient id="_7" gradientUnits="userSpaceOnUse" x1="49.2" y1="27.45" x2="59.91" y2="48.56">
+<stop stop-color="#A2C2DD" offset="0.1"/>
+<stop stop-color="#6C83BB" offset="0.71"/>
+<stop stop-color="#003D6D" offset="0.99"/>
+</linearGradient>
+<path fill="url(#_7)" d="M23.988,14.567l3.031,29.666l24.507,8.426l17.605-12.168l1.831-30.629L42.207,4.307L23.988,14.567 z"/>
+<linearGradient id="_8" gradientUnits="userSpaceOnUse" x1="50.58" y1="5.67" x2="36.58" y2="36.67">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</linearGradient>
+<polygon fill="url(#_8)" points="51.495,52.249 27.345,43.975 24.529,14.76 52.366,21.846 "/>
+<linearGradient id="_9" gradientUnits="userSpaceOnUse" x1="69.46" y1="9.14" x2="59.13" y2="33.47">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</linearGradient>
+<polygon fill="url(#_9)" points="51.495,52.249 68.793,40.3 70.596,10.147 51.495,21.846 "/>
+<linearGradient id="_10" gradientUnits="userSpaceOnUse" x1="52.6" y1="23.4" x2="32.93" y2="-18.27">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</linearGradient>
+<polygon fill="url(#_10)" points="24.359,14.76 51.495,21.846 70.508,10.147 42.267,4.675 "/>
+<linearGradient id="_11" gradientUnits="userSpaceOnUse" x1="31.28" y1="50.6" x2="54.94" y2="39.6">
+<stop stop-color="#FFFFFF" offset="0.05"/>
+<stop stop-color="#A2C2DD" offset="1"/>
+</linearGradient>
+<polygon fill="url(#_11)" points="51.333,35.382 51.473,52.271 27.351,43.998 43.792,33.719 "/>
+<path fill="#FFFFFF" d="M12.458,34.78c-2.914,0-6.904,0.692-7.916,6.672l-0.151,0.899c0,0,6.712,0,7.508,0 c0.24,0.433,0.599,1.078,0.826,1.492c-0.228,0.414-0.586,1.06-0.826,1.49c-0.798,0-7.508,0-7.508,0l0.151,0.902 c1.012,5.977,5.002,6.669,7.916,6.669c2.297,0,4.346-1.927,5.988-3.478c0.891-0.839,1.729-1.626,2.174-1.626h20.56l0.229-0.253 c0.44-0.485,1.466-1.814,1.489-3.673v-0.067c-0.023-1.861-1.051-3.188-1.489-3.675l-0.229-0.252H20.62 c-0.442,0-1.283-0.788-2.172-1.622C16.804,36.709,14.755,34.78,12.458,34.78z"/>
+<linearGradient id="_12" gradientUnits="userSpaceOnUse" x1="11.1" y1="29.9" x2="33.27" y2="56.57">
+<stop stop-color="#E6EEF4" offset="0"/>
+<stop stop-color="#9646AC" offset="0.44"/>
+<stop stop-color="#3D013F" offset="0.94"/>
+</linearGradient>
+<path fill="url(#_12)" d="M42.174,43.828c0-0.008,0.002-0.016,0.002-0.022h-0.004c-0.019-1.62-0.946-2.79-1.288-3.164 c-0.435,0-20.217,0-20.217,0c-0.753,0-1.568-0.771-2.703-1.835c-1.544-1.456-3.467-3.268-5.459-3.268 c-3.234,0-6.294,0.95-7.152,6.025c1.216,0,7.05,0,7.05,0l1.253,2.264l-1.253,2.264c0,0-5.834,0-7.05,0 c0.858,5.076,3.918,6.025,7.152,6.025c1.992,0,3.916-1.813,5.459-3.267c1.135-1.065,1.95-1.836,2.703-1.836 c0,0,19.782,0,20.217,0c0.341-0.372,1.27-1.543,1.288-3.163h0.004C42.176,43.844,42.174,43.837,42.174,43.828z"/>
+</svg>
\ No newline at end of file
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/resources/widgetml/cpdataformlistentryviewitem.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/cpframework/resources/widgetml/cpdataformlistentryviewitem.css	Tue Jul 06 14:34:22 2010 +0300
@@ -0,0 +1,76 @@
+
+/*
+    Layout selection
+*/
+
+CpDataFormListEntryViewItem {
+    layout:default;
+}
+
+CpDataFormListEntryViewItem::dataItem_Background
+{
+}
+
+CpDataFormListEntryViewItem::dataItem_Icon
+{
+    fixed-height: var(hb-param-graphic-size-primary-large);
+    fixed-width:  var(hb-param-graphic-size-primary-large);
+}
+
+CpDataFormListEntryViewItem::dataItem_Label
+{
+    text-height: var(hb-param-text-height-primary);
+    size-policy-horizontal: preferred;  
+    font-variant: primary;
+    text-align:   left;
+    text-line-count-max:1;
+}
+
+CpDataFormListEntryViewItem::dataItem_Description
+{
+   text-height: var(hb-param-text-height-secondary);
+   size-policy-horizontal: preferred;
+   font-variant: secondary;
+   text-align:   left;
+}
+
+CpDataFormListEntryViewItem::dataItem_Icon
+{
+    left:-var(hb-param-margin-gene-left);
+}
+
+
+CpDataFormListEntryViewItem::dataItem_Label[!hasIcon]
+{
+    left:-var(hb-param-margin-gene-left);
+    right:var(hb-param-margin-form-label-right);
+    top:-var(hb-param-margin-gene-top);
+}
+
+CpDataFormListEntryViewItem::dataItem_Label[hasIcon]
+{
+    left:-var(hb-param-margin-gene-middle-horizontal);
+    top:-var(hb-param-margin-gene-top);
+    right:var(hb-param-margin-form-label-right);
+}
+
+
+
+CpDataFormListEntryViewItem::dataItem_Description[!hasIcon]
+{
+    left:-var(hb-param-margin-gene-left);
+    right:var(hb-param-margin-gene-right);
+}
+
+CpDataFormListEntryViewItem::dataItem_Description[hasIcon]
+{
+    left:-var(hb-param-margin-gene-middle-horizontal);
+    right:var(hb-param-margin-gene-right);
+}
+
+
+CpDataFormListEntryViewItem::dataItem_Description
+{
+	bottom:var(hb-param-margin-gene-bottom);
+}
+
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/resources/widgetml/cpdataformlistentryviewitem.widgetml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/cpframework/resources/widgetml/cpdataformlistentryviewitem.widgetml	Tue Jul 06 14:34:22 2010 +0300
@@ -0,0 +1,25 @@
+<hbwidget version="0.1" type="CpDataFormListEntryViewItem">
+
+  <layout name="default" type="mesh">
+  
+    <meshitem src="dataItem_Background" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="dataItem_Background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="dataItem_Background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="dataItem_Background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+    <meshitem src="dataItem_Icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="dataItem_Icon" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
+
+    <meshitem src="dataItem_Label" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="dataItem_Label" srcEdge="LEFT" dst="dataItem_Icon" dstEdge="RIGHT" />
+    <meshitem src="dataItem_Label" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="dataItem_Label" srcEdge="BOTTOM" dst="dataItem_Description" dstEdge="TOP" />
+
+    <meshitem src="dataItem_Description" srcEdge="TOP" dst="dataItem_Label" dstEdge="BOTTOM" />
+    <meshitem src="dataItem_Description" srcEdge="LEFT" dst="dataItem_Icon" dstEdge="RIGHT" />
+    <meshitem src="dataItem_Description" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="dataItem_Description" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    
+  </layout> 
+  
+</hbwidget>
\ No newline at end of file
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/resources/widgetml/cpdataformlistentryviewitem_color.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/cpframework/resources/widgetml/cpdataformlistentryviewitem_color.css	Tue Jul 06 14:34:22 2010 +0300
@@ -0,0 +1,41 @@
+
+/*
+    CpDataFormListEntryViewItem default color definitions.
+*/
+
+CpDataFormListEntryViewItem::dataItem_Icon {
+    color: var(qtc_list_item_title_normal);
+}
+
+CpDataFormListEntryViewItem::dataItem_Icon[state="pressed"]{
+    color: var(qtc_list_item_pressed);
+}
+
+CpDataFormListEntryViewItem::dataItem_Icon[state="disabled"] {
+    color: var(qtc_list_item_disabled);
+}
+
+CpDataFormListEntryViewItem::dataItem_Label {
+    color: var(qtc_list_item_title_normal);
+}
+
+CpDataFormListEntryViewItem::dataItem_Label[state="pressed"] {
+    color: var(qtc_list_item_pressed);
+}
+
+CpDataFormListEntryViewItem::dataItem_Label[state="disabled"] {
+    color: var(qtc_list_item_disabled);
+}
+
+CpDataFormListEntryViewItem::dataItem_Description {
+    color: var(qtc_list_item_title_normal);
+}
+
+CpDataFormListEntryViewItem::dataItem_Description[state="pressed"] {
+    color: var(qtc_list_item_pressed);
+}
+
+CpDataFormListEntryViewItem::dataItem_Description[state="disabled"] {
+    color: var(qtc_list_item_disabled);
+}
+
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/src/cpdataformlistentryviewitem.cpp
--- a/controlpanel/src/cpframework/src/cpdataformlistentryviewitem.cpp	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpdataformlistentryviewitem.cpp	Tue Jul 06 14:34:22 2010 +0300
@@ -16,14 +16,30 @@
 */
 
 #include "cpdataformlistentryviewitem.h"
+
+#ifdef HB_EFFECTS
+    #include "hbeffect.h"
+#endif
+
+#ifdef HB_GESTURE_FW
+    #include <hbtapgesture.h>
+    #include <hbframeitem.h>
+#endif
+
 #include <hbdataformmodel.h>
 #include <hbdataformmodelitem.h>
 #include <hbabstractitemview.h>
 #include <cpsettingformentryitemdata.h>
 
+#define CP_DATAFORMLISTENTRYVIEWITEM QLatin1String("cpdataformlistentryviewitem")
+
 CpDataFormListEntryViewItem::CpDataFormListEntryViewItem(QGraphicsItem *parent) : 
     HbDataFormViewItem(parent)
 {
+#ifdef HB_EFFECTS       
+    HbEffect::add(CP_DATAFORMLISTENTRYVIEWITEM + "-focus", "listviewitem_press", "pressed");
+    HbEffect::add(CP_DATAFORMLISTENTRYVIEWITEM + "-focus", "listviewitem_release", "released");
+#endif
 }
 
 CpDataFormListEntryViewItem::~CpDataFormListEntryViewItem()
@@ -51,12 +67,10 @@
                     HbDataFormModelItem::ItemTypeRole).toInt());
     switch (itemType)
     {
-        case CpSettingFormEntryItemData::ListEntryItem:
-        {
+        case CpSettingFormEntryItemData::ListEntryItem: {
             break;
         }
-        default:
-        {
+        default: {
             break;
         }
     }
@@ -64,4 +78,71 @@
     return 0;
 }
 
+void CpDataFormListEntryViewItem::pressStateChanged(bool pressed, bool animate)
+{
+#ifdef HB_EFFECTS
+    QGraphicsItem *focusItem =  primitive("dataItem_Background");
+    bool doAnimate = animate;
+
+    if (pressed) {
+        if (doAnimate) {
+            HbEffect::cancel(this, "released");
+            HbEffect::cancel(focusItem, "released");
+
+            HbEffect::start(this, CP_DATAFORMLISTENTRYVIEWITEM, "pressed");
+            HbEffect::start(focusItem, CP_DATAFORMLISTENTRYVIEWITEM + QString("-focus"), "pressed");
+        }
+    } else {
+        if (doAnimate) {
+            HbEffect::cancel(this, "pressed");
+            HbEffect::cancel(focusItem, "pressed");
+
+            HbEffect::start(this, CP_DATAFORMLISTENTRYVIEWITEM, "released");
+            HbEffect::start(focusItem, CP_DATAFORMLISTENTRYVIEWITEM + QString("-focus"), "released");
+        } else {
+            HbEffect::cancel(this, "pressed");
+            HbEffect::start(this, CP_DATAFORMLISTENTRYVIEWITEM, "released");
+            if (focusItem) {
+                HbEffect::cancel(focusItem, "pressed");
+                HbEffect::start(focusItem, CP_DATAFORMLISTENTRYVIEWITEM + QString("-focus"), "released", this);
+            }
+        }
+    }
+#endif
+}
+
+#ifdef HB_GESTURE_FW
+void CpDataFormListEntryViewItem::gestureEvent(QGestureEvent *event)
+{
+    HbFrameItem *backgroundItem = static_cast<HbFrameItem*> ( primitive("dataItem_Background") );
+    HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+    
+    if(backgroundItem && tap) {
+        switch(tap->state()) {
+        case Qt::GestureStarted: {
+                backgroundItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_pressed"));
+            }
+            break;
+        case Qt::GestureUpdated: {
+            
+            }
+            break;
+        case Qt::GestureCanceled: {
+                backgroundItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_normal"));
+            }
+            break;
+        case Qt::GestureFinished: {
+                backgroundItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_normal"));
+            }
+            break;
+        default:
+            break;
+        }
+    }
+
+    HbDataFormViewItem::gestureEvent( event );
+}
+#endif
+
+
 //End of File
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/src/cpdataformlistentryviewitem.h
--- a/controlpanel/src/cpframework/src/cpdataformlistentryviewitem.h	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpdataformlistentryviewitem.h	Tue Jul 06 14:34:22 2010 +0300
@@ -31,6 +31,11 @@
     virtual bool canSetModelIndex(const QModelIndex &index) const;
 protected:
     virtual HbWidget* createCustomWidget();
+    virtual void pressStateChanged(bool pressed, bool animate);
+#ifdef HB_GESTURE_FW
+    //from HbWidgetBase
+    virtual void gestureEvent(QGestureEvent *event);
+#endif
 };
 
 #endif //CPDATAFORMLISTENTRYVIEWITEM_H
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/src/cppluginloader.cpp
--- a/controlpanel/src/cpframework/src/cppluginloader.cpp	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/src/cpframework/src/cppluginloader.cpp	Tue Jul 06 14:34:22 2010 +0300
@@ -21,7 +21,6 @@
 #include <QPluginLoader>
 #include <cpplugininterface.h>
 #include <cplauncherinterface.h>
-#include <cpbasepath.h>
 #include "cputility.h"
 #include <cplogger.h>
 
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.cpp
--- a/controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.cpp	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.cpp	Tue Jul 06 14:34:22 2010 +0300
@@ -102,8 +102,10 @@
     default: break;
     case CpSettingFormEntryItemData::ListEntryItem:
         mParent->setLabel(text);
+        break;
     case CpSettingFormEntryItemData::ButtonEntryItem:
         mParent->setContentWidgetData(QString("text"),QVariant(text));
+        break;
     }
 }
 
@@ -129,8 +131,10 @@
     default: break;
     case CpSettingFormEntryItemData::ListEntryItem:
         mParent->setData(HbDataFormModelItem::DescriptionRole , description);
+        break;
     case CpSettingFormEntryItemData::ButtonEntryItem:
         mParent->setContentWidgetData(QString("additionalText"),QVariant(description));
+        break;
     }
 }
 
@@ -156,8 +160,10 @@
     default: break;
     case CpSettingFormEntryItemData::ListEntryItem:
         mParent->setIcon(icon);
+        break;
     case CpSettingFormEntryItemData::ButtonEntryItem:
         mParent->setContentWidgetData(QString("icon"),HbIcon(icon));
+        break;
     }
 }
 
@@ -183,6 +189,7 @@
     default: break;
     case CpSettingFormEntryItemData::ListEntryItem:
         mParent->setIcon(icon.iconName());
+        break;
     case CpSettingFormEntryItemData::ButtonEntryItem:
         mParent->setContentWidgetData(QString("icon"),icon);
         break;
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem.css
--- a/controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem.css	Wed Jun 23 18:30:54 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-
-/*
-    Layout selection
-*/
-
-CpDataFormListEntryViewItem {
-    layout:default;
-}
-
-CpDataFormListEntryViewItem::dataItem_Background
-{
-}
-
-CpDataFormListEntryViewItem::dataItem_Icon:portrait
-{
-    fixed-height: var(hb-param-graphic-size-image-portrait);
-    fixed-width:  var(hb-param-graphic-size-image-portrait);
-}
-
-CpDataFormListEntryViewItem::dataItem_Icon:landscape
-{
-    fixed-height: var(hb-param-graphic-size-image-landscape);
-    fixed-width:  var(hb-param-graphic-size-image-landscape);
-}
-
-CpDataFormListEntryViewItem::dataItem_Label
-{
-    size-policy-horizontal: preferred;  
-    font-variant: primary;
-    text-align:   left;
-}
-
-CpDataFormListEntryViewItem::dataItem_Description
-{
-   font-variant: secondary;
-   text-align:   left;
-}
-
-
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem.widgetml
--- a/controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem.widgetml	Wed Jun 23 18:30:54 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<hbwidget version="0.1" type="CpDataFormListEntryViewItem">
-
-  <layout name="default" type="mesh">
-  
-    <meshitem src="dataItem_Background" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="dataItem_Background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-    <meshitem src="dataItem_Background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dataItem_Background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
-    <meshitem src="dataItem_Icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="dataItem_Icon" srcEdge="TOP" dst="" dstEdge="TOP" />
-
-    <meshitem src="dataItem_Label" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="dataItem_Label" srcEdge="LEFT" dst="dataItem_Icon" dstEdge="RIGHT" />
-    <meshitem src="dataItem_Label" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="dataItem_Label" srcEdge="BOTTOM" dst="dataItem_Description" dstEdge="TOP" />
-
-    <meshitem src="dataItem_Description" srcEdge="TOP" dst="dataItem_Label" dstEdge="BOTTOM" />
-    <meshitem src="dataItem_Description" srcEdge="LEFT" dst="dataItem_Icon" dstEdge="RIGHT" />
-    <meshitem src="dataItem_Description" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="dataItem_Description" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-    
-  </layout> 
-  
-</hbwidget>
\ No newline at end of file
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem_color.css
--- a/controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem_color.css	Wed Jun 23 18:30:54 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-
-/*
-    CpDataFormListEntryViewItem default color definitions.
-*/
-
-CpDataFormListEntryViewItem::dataItem_Icon {
-    color: var(qtc_list_item_title_normal);
-}
-
-CpDataFormListEntryViewItem::dataItem_Icon[state="pressed"]{
-    color: var(qtc_list_item_pressed);
-}
-
-CpDataFormListEntryViewItem::dataItem_Icon[state="disabled"] {
-    color: var(qtc_list_item_disabled);
-}
-
-CpDataFormListEntryViewItem::dataItem_Label {
-    color: var(qtc_list_item_title_normal);
-}
-
-CpDataFormListEntryViewItem::dataItem_Label[state="pressed"] {
-    color: var(qtc_list_item_pressed);
-}
-
-CpDataFormListEntryViewItem::dataItem_Label[state="disabled"] {
-    color: var(qtc_list_item_disabled);
-}
-
-CpDataFormListEntryViewItem::dataItem_Description {
-    color: var(qtc_list_item_title_normal);
-}
-
-CpDataFormListEntryViewItem::dataItem_Description[state="pressed"] {
-    color: var(qtc_list_item_pressed);
-}
-
-CpDataFormListEntryViewItem::dataItem_Description[state="disabled"] {
-    color: var(qtc_list_item_disabled);
-}
-
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/src/eabi/cpframeworku.def
--- a/controlpanel/src/eabi/cpframeworku.def	Wed Jun 23 18:30:54 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-EXPORTS
-	_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 9aa586a731eb -r 3341fe7c643a controlpanel/tsrc/unit/ut_cpapi/src/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/tsrc/unit/ut_cpapi/src/main.cpp	Tue Jul 06 14:34:22 2010 +0300
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0""
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*       test application for qt control panel public apis.
+*/
+#include <hbapplication.h>
+#include <QTest>
+#include "ut_cpapi.h"
+int main(int argc, char *argv[])
+{
+    HbApplication app(argc, argv);
+    int res = 0;
+    //char *pass[3];
+    //pass[0] = argv[0];
+    //pass[1] = "-o";
+    
+    // log folder: \epoc32\winscw\c\data
+    
+    app.setApplicationName("TestCpAPI");
+    //pass[2] = "c:\\data\\u.txt";
+    TestCpAPI *tcUtilities = new TestCpAPI();
+    res |= QTest::qExec(tcUtilities);
+    delete tcUtilities;
+    tcUtilities = NULL;
+    return res;
+}
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.cpp
--- a/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.cpp	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.cpp	Tue Jul 06 14:34:22 2010 +0300
@@ -178,4 +178,3 @@
 }
 
 
-QTEST_MAIN(TestCpAPI)
diff -r 9aa586a731eb -r 3341fe7c643a controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro
--- a/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro	Wed Jun 23 18:30:54 2010 +0300
+++ b/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro	Tue Jul 06 14:34:22 2010 +0300
@@ -43,7 +43,8 @@
 
 # Input
 HEADERS += src/ut_cpapi.h
-SOURCES += src/ut_cpapi.cpp
+SOURCES += src/ut_cpapi.cpp \ 
+            src/main.cpp
 
 symbian {
 	BLD_INF_RULES.prj_exports += "data/controlpanellog.conf C:/data/.config/ut_cpapi/controlpanellog.conf"
diff -r 9aa586a731eb -r 3341fe7c643a gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI.mmp
--- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI.mmp	Wed Jun 23 18:30:54 2010 +0300
+++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI.mmp	Tue Jul 06 14:34:22 2010 +0300
@@ -11,15 +11,13 @@
 *
 * Contributors:
 *
-* Description:  ?Description
+* Description:  BC test mmp for profile engine wrapper
 *
 */
 
 
-#if defined(__S60_)
-        // To get the OS_LAYER_SYSTEMINCLUDE-definition
-        #include <platform_paths.hrh>
-#endif
+// To get the OS_LAYER_SYSTEMINCLUDE-definition
+#include <platform_paths.hrh>
 
 TARGET          ProEngWrapAPI.dll
 TARGETTYPE      dll
@@ -29,28 +27,10 @@
 
 DEFFILE         ProEngWrapAPI.def
 
-#ifdef SBSV2
 USERINCLUDE     ../inc 
-
-	#if defined(__S60_)
-	    MW_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
-
-#else // SBSV2 not defined
-USERINCLUDE     ../inc 
-
-	#if defined(__S60_)
-	    MW_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
+MW_LAYER_SYSTEMINCLUDE
 
 SOURCEPATH      ../src
-#endif // SBSV2
 
 SOURCE          ProEngWrapAPI.cpp
 SOURCE          ProEngWrapAPIBlocks.cpp CSchedulerUtility.cpp