--- a/controlpanel/controlpanel_plat/inc/controlpanel_plat.pri Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/controlpanel_plat.pri Thu Apr 01 03:23:37 2010 +0800
@@ -15,12 +15,20 @@
#
PLATFORM_HEADERS += $$PWD/cpglobal.h \
+ $$PWD/cpplugininterface.h \
$$PWD/cppluginplatinterface.h \
$$PWD/cpsettingformitemdata.h \
$$PWD/cppluginlauncher.h \
$$PWD/cpbasesettingview.h \
$$PWD/cpitemdatahelper.h \
$$PWD/cpsettingformentryitemdata.h \
- $$PWD/cpsettingformentryitemdataimpl.h
+ $$PWD/cpsettingformentryitemdataimpl.h \
+ $$PWD/cppluginloader.h \
+ $$PWD/logger.h \
+ $$PWD/loggerglobal.h \
+ $$PWD/logoutput.h \
+ $$PWD/logoutputfactory.h \
+ $$PWD/cplogger.h \
+ $$PWD/cppluginutility.h
HEADERS += $$PLATFORM_HEADERS
\ No newline at end of file
--- a/controlpanel/controlpanel_plat/inc/cpbasesettingview.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cpbasesettingview.h Thu Apr 01 03:23:37 2010 +0800
@@ -29,15 +29,13 @@
{
Q_OBJECT
public:
- explicit CpBaseSettingView(HbDataForm *settingForm = 0,QGraphicsItem *parent = 0);
+ explicit CpBaseSettingView(QGraphicsWidget *widget = 0, QGraphicsItem *parent = 0);
virtual ~CpBaseSettingView();
void setSettingForm(HbDataForm *settingForm);
HbDataForm *settingForm() const;
signals:
void aboutToClose();
private:
- void setWidget(QGraphicsWidget *widget);
-private:
Q_DISABLE_COPY(CpBaseSettingView)
Q_DECLARE_PRIVATE_D(d_ptr, CpBaseSettingView)
Q_PRIVATE_SLOT(d_func(), void _q_softkeyClicked())
--- a/controlpanel/controlpanel_plat/inc/cpglobal.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cpglobal.h Thu Apr 01 03:23:37 2010 +0800
@@ -18,7 +18,7 @@
#ifndef CP_GLOBAL_H
#define CP_GLOBAL_H
-#include <qtglobal>
+#include <QtGlobal>
#ifdef BUILD_CP_FRAMEWORK
#define CP_EXPORT Q_DECL_EXPORT
--- a/controlpanel/controlpanel_plat/inc/cpitemdatahelper.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cpitemdatahelper.h Thu Apr 01 03:23:37 2010 +0800
@@ -17,10 +17,12 @@
#ifndef CP_ITEM_DATA_HELPER_H
#define CP_ITEM_DATA_HELPER_H
-#include <qobject>
+#include <QObject>
#include <cpglobal.h>
class QObject;
+class HbWidget;
+class QModelIndex;
class HbDataForm;
class HbAbstractViewItem;
class HbDataFormModelItem;
@@ -30,33 +32,33 @@
{
Q_OBJECT
public:
- CpItemDataHelper();
- ~CpItemDataHelper();
+ explicit CpItemDataHelper(HbDataForm *form = 0);
+ virtual ~CpItemDataHelper();
- void addConnection(HbDataFormModelItem *item,
- const QString &signal,
- QObject *receiver,
- const QString &method);
-
- void removeConnection(HbDataFormModelItem *item,
- const QString &signal,
- QObject *receiver,
- const QString &method);
+ void bindToForm(HbDataForm *form);
void addItemPrototype(HbAbstractViewItem *prototype);
- void bindToForm(HbDataForm *form) const;
+ void addConnection(HbDataFormModelItem *item,
+ const char *signal,
+ QObject *receiver,
+ const char *method);
+
+ void removeConnection(HbDataFormModelItem *item,
+ const char *signal,
+ QObject *receiver,
+ const char *method);
-signals:
- void connectionAdded(HbDataFormModelItem *item,
- const QString &signal,
- QObject *receiver,
- const QString &method);
- void connectionRemoved(HbDataFormModelItem *item,
- const QString &signal,
- QObject *receiver,
- const QString &method);
- void prototypeAdded(HbAbstractViewItem *prototype);
+ void connectToForm(const char *signal,
+ QObject *receiver,
+ const char *method);
+
+ void disconnectFromForm(const char *signal,
+ QObject *receiver,
+ const char *method);
+
+ HbWidget *widgetFromModelIndex(const QModelIndex &index);
+
private:
CpItemDataHelperPrivate *d;
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/controlpanel_plat/inc/cplogger.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,52 @@
+/*
+* 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:
+*
+*/
+#ifndef CPLOGGER_H
+#define CPLOGGER_H
+
+
+/*
+ Windows: C:/ControlPanel/debug/bin/controlpanellog.conf
+ Symbian: C:/data/.config/controlpanellog.conf
+
+ Format:
+
+ [ControlPanel]
+ logdatetime = 1
+ logloggername = 1
+ output = debugoutput fileoutput
+ fileoutput/logfile = C:/data/logs/controlpanel.log
+ fileoutput/truncate = 0
+*/
+
+#include <QLatin1String>
+#include <logger.h>
+
+#define CPFW_LOGGER_NAME QLatin1String("CpFramework")
+
+#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
+#endif
+
+#define CPFW_LOG(str) Logger::instance(CPFW_LOGGER_NAME)->log(str);
+
+#endif /* CPLOGGER_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/controlpanel_plat/inc/cpplugininterface.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,50 @@
+/*
+* 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:
+*
+*/
+
+#ifndef CPPLUGININTERFACE_H
+#define CPPLUGININTERFACE_H
+
+#include <QtPlugin>
+#include <QList>
+
+/*!
+ \class CpPluginInterface
+ \brief The class CpPluginInterface is an interface for plugins which can be displayed in control panel application.
+ */
+
+class CpSettingFormItemData;
+class CpItemDataHelper;
+
+class CpPluginInterface
+{
+public:
+ /*!
+ Destructor of CpPluginInterface.
+ */
+ virtual ~CpPluginInterface()
+ {
+ }
+
+ /*!
+ Create a data form mode item, by which the control panel framework can build a data form model.
+ */
+ virtual QList<CpSettingFormItemData*> createSettingFormItemData(CpItemDataHelper &itemDataHelper) const = 0;
+};
+
+Q_DECLARE_INTERFACE(CpPluginInterface, "com.nokia.controlpanel.plugin.interface/1.0");
+
+#endif /* CPPLUGININTERFACE_H */
--- a/controlpanel/controlpanel_plat/inc/cppluginlauncher.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cppluginlauncher.h Thu Apr 01 03:23:37 2010 +0800
@@ -29,17 +29,7 @@
class CP_EXPORT CpPluginLauncher
{
public:
- /*
- launch a view from plugin by plugin file.
- 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
- */
- static bool launchCpPluginView(const QString &pluginFile);
+ static bool launchCpPluginView(const QString &pluginFile,int index = 0);
};
#endif /* CPPLUGINLAUNCHER_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/controlpanel_plat/inc/cppluginloader.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,35 @@
+/*
+* 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:
+*
+*/
+
+#ifndef CPPLUGINLOADER_H
+#define CPPLUGINLOADER_H
+
+#include <cpglobal.h>
+#include <QList>
+
+class QString;
+class CpPluginInterface;
+class CpPluginPlatInterface;
+
+class CP_EXPORT CpPluginLoader
+{
+public:
+ static CpPluginInterface *loadCpPlugin(const QString &pluginFile);
+ static CpPluginPlatInterface *loadPlatCpPlugin(const QString &pluginFile);
+};
+
+#endif /* CPPLUGINLOADER_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/controlpanel_plat/inc/cppluginutility.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,34 @@
+/*
+* 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:
+*
+*/
+
+#ifndef CP_PLUGINUTILITY_H
+#define CP_PLUGINUTILITY_H
+
+#include <cpglobal.h>
+class HbDataForm;
+
+class CP_EXPORT CpPluginUtility
+{
+/*!
+ This function can add the proto type of setting items (like entry item)
+ which is supplied by control panel into your dataform's instance
+ */
+public:
+ static void addCpItemPrototype(HbDataForm *settingForm);
+};
+
+#endif
--- a/controlpanel/controlpanel_plat/inc/cpsettingformentryitemdata.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cpsettingformentryitemdata.h Thu Apr 01 03:23:37 2010 +0800
@@ -19,7 +19,7 @@
#define CP_SETTINGFORM_ENTRY_ITEM_DATA_H
#include <cpglobal.h>
-#include <qobject>
+#include <QObject>
#include <cpsettingformitemdata.h>
#include <hbicon.h>
--- a/controlpanel/controlpanel_plat/inc/cpsettingformitemdata.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cpsettingformitemdata.h Thu Apr 01 03:23:37 2010 +0800
@@ -21,8 +21,8 @@
#include <cpglobal.h>
#include <hbdataformmodelitem.h>
-#include <qobject>
-#include <qvariant>
+#include <QObject>
+#include <QVariant>
class QString;
class CpItemDataHelper;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/controlpanel_plat/inc/logger.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,90 @@
+/*
+* 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:
+*
+*/
+
+#ifndef LOGGER_H
+#define LOGGER_H
+
+#include <QObject>
+#include <QSettings>
+#include <loggerglobal.h>
+
+class LogOutput;
+class QSettings;
+class LoggerPrivate;
+
+/*
+
+configuration format:
+
+ [myapplog]
+ logDateTime = 1
+ logLoggerName = 1
+ output = debugoutput consoleoutput fileoutput
+ fileoutput/logfile = C:/data/log/myapp.log
+ fileoutput/truncate = 1
+
+code examples:
+
+ QSettings settings("myapp.ini",QSettings::IniFormat);
+ Logger::instance("myapplog")->configure(settings);
+ Logger::instance("myapplog")->log("Hello world!");
+
+*/
+
+class LOGGER_EXPORT Logger : public QObject
+{
+ Q_OBJECT
+ Q_PROPERTY(bool logDateTime READ logDateTime WRITE setLogDateTime)
+ Q_PROPERTY(bool logLoggerName READ logLoggerName WRITE setLogLoggerName)
+ Q_PROPERTY(QString dateTimeFormat READ dateTimeFormat WRITE setDateTimeFormat)
+public:
+ static Logger *instance(const QString &name);
+ static void close(const QString &name);
+ static void closeAll();
+public:
+ virtual ~Logger();
+
+ void log(const QString &log);
+
+ void configure(const QString &configFile,QSettings::Format format = QSettings::NativeFormat);
+
+ void configure(QSettings &settings);
+
+ bool addLogOutput(LogOutput *output);
+
+ void removeLogOutput(LogOutput *output);
+
+ LogOutput *logOutput(const QString &name);
+
+ void clearAllLogOutput();
+
+ QString name() const;
+
+ bool logDateTime() const;
+ void setLogDateTime(bool on);
+
+ bool logLoggerName() const;
+ void setLogLoggerName(bool on);
+
+ QString dateTimeFormat() const;
+ void setDateTimeFormat(const QString &format);
+private:
+ explicit Logger(const QString &name = QString(),QObject *parent = 0);
+ LoggerPrivate *d_ptr;
+};
+
+#endif //LOGGER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/controlpanel_plat/inc/loggerglobal.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,45 @@
+/*
+* 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:
+*
+*/
+#ifndef LOGGERGLOBAL_H
+#define LOGGERGLOBAL_H
+
+#include <QtGlobal>
+
+#ifdef BUILD_LOGGER_DLL
+ #define LOGGER_EXPORT Q_DECL_EXPORT
+#else
+ #define LOGGER_EXPORT Q_DECL_IMPORT
+#endif
+
+#define LINE_SEPERATOR QLatin1String("\r\n");
+
+#define SETTINGS_SECTION_SEPERATOR QLatin1String("/")
+
+//following strings can be used in configuration file to specify logger's properties
+//refer to logger.h
+#define LOGGER_LOGDATETIME QLatin1String("logdatetime")
+#define LOGGER_LOGLOGGERNAME QLatin1String("logloggername")
+#define LOGGER_DATETIMEFORMAT QLatin1String("datetimeformat")
+#define LOGGER_OUTPUT QLatin1String("output")
+
+#define DEBUGOUTPUT_NAME QLatin1String("debugoutput")
+#define CONSOLEOUTPUT_NAME QLatin1String("consoleoutput")
+#define FILEOUTPUT_NAME QLatin1String("fileoutput")
+ #define FILEOUTPUT_LOGFILE QLatin1String("logfile")
+ #define FILEOUTPUT_TRUNCATE QLatin1String("truncate")
+
+#endif //LOGGERGLOBAL_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/controlpanel_plat/inc/logoutput.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,51 @@
+/*
+* 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:
+*
+*/
+#ifndef LOGOUTPUT_H
+#define LOGOUTPUT_H
+
+#include <loggerglobal.h>
+#include <QObject>
+
+class QString;
+class QSettings;
+class Logger;
+
+class LogOutputPrivate;
+class LOGGER_EXPORT LogOutput : public QObject
+{
+ Q_OBJECT
+ Q_PROPERTY(QString name READ name WRITE setName)
+public:
+ virtual ~LogOutput();
+ virtual void output(const QString &log) = 0;
+ virtual bool init() = 0;
+ bool load(QSettings &settings);
+
+ Logger *parentLogger();
+ void setParentLogger(Logger *parentLogger);
+
+ QString name() const;
+ void setName(const QString &name);
+private:
+ virtual bool doLoad(QSettings &settings) = 0;
+protected:
+ LogOutput(Logger *parentLogger = 0);
+private:
+ LogOutputPrivate *d_ptr;
+};
+
+#endif //LOGOUTPUT_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/controlpanel_plat/inc/logoutputfactory.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,52 @@
+/*
+* 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:
+*
+*/
+#ifndef LOGOUTPUTFACTORY_H
+#define LOGOUTPUTFACTORY_H
+
+class LogOutput;
+class QVariant;
+class QString;
+
+#include <QHash>
+#include <loggerglobal.h>
+
+class LOGGER_EXPORT LogOutputFactory
+{
+public:
+ typedef LogOutput* (*CREATE_ENTRY)();
+ static LogOutput *createLogOutput(const QString &name);
+ static LogOutput *createLogOutput(const QString &name,const QHash<QString,QVariant> &properties);
+ static void addCreateLogOutputEntry(const QString &name,CREATE_ENTRY entry);
+};
+
+class LogOutputCreateEntryRegister
+{
+public:
+ LogOutputCreateEntryRegister(const QString &name,LogOutputFactory::CREATE_ENTRY entry) {
+ LogOutputFactory::addCreateLogOutputEntry(name,entry);
+ }
+};
+
+#define REGISTER_OUTPUT_LOG(name,Class) \
+ static LogOutput *create##Class() { \
+ LogOutput *output = new Class(); \
+ output->setName(name); \
+ return output; \
+ } \
+ LogOutputCreateEntryRegister the##Class##EntryRegister(name,create##Class);
+
+#endif //LOGOUTPUTFACTORY_H
--- a/controlpanel/cpcfg_win.pl Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-
-sub listdir {
- my @arr, $j = 0;
- for ($i=0;$i<=$#_;$i++) {
- if (-d $_[$i]) {
- if (opendir($handle, $_[$i])) {
- while ($entry = readdir($handle)) {
- if (!($entry =~ m/^\.$/) and !($entry =~ m/^(\.\.)$/)) {
- if (-d $_[$i]."\\$entry") { # is a directory, push to @arr
- $arr[$j++] = $_[$i]."\\$entry";
- }
- else { # is a file
- if ($entry =~ /$.cpcfg$/) { # is a .cpcfg file, copy it
- $cmd = "copy ";
- $cmd .= $_[$i]."\\$entry ";
- $cmd .= "C:\\ControlPanel\\debug\\bin\\config"."\\$entry";
- print ("$cmd\n");
- system($cmd);
- }
- }
- }
- }
- closedir($handle);
- }
- }
- }
- if ($j>0) {
- listdir (@arr);
- }
-}
-
-# create target directory if it doesn't exist
-print ("Creating direcotry... C:\\ControlPanel\\debug\\bin\\config \n");
-mkdir ("C:\\ControlPanel");
-mkdir ("C:\\ControlPanel\\debug");
-mkdir ("C:\\ControlPanel\\debug\\bin");
-mkdir ("C:\\ControlPanel\\debug\\bin\\config");
-
-# go through source directories recrusively
-listdir (".\\src\\cpapplication");
-listdir (".\\src\\cpplugins");
\ No newline at end of file
--- a/controlpanel/examples/groupplugin/src/cpgroupplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/examples/groupplugin/src/cpgroupplugin.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -25,9 +25,9 @@
{
}
-CpSettingFormItemData *CpGroupPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
+QList<CpSettingFormItemData*> CpGroupPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
{
- return new CpSampleGroup(itemDataHelper);
+ return QList<CpSettingFormItemData*>() << new CpSampleGroup(itemDataHelper);
}
Q_EXPORT_PLUGIN2(CpGroupPlugin, CpGroupPlugin);
--- a/controlpanel/examples/groupplugin/src/cpgroupplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/examples/groupplugin/src/cpgroupplugin.h Thu Apr 01 03:23:37 2010 +0800
@@ -18,15 +18,15 @@
#define CPGROUPPLUGIN_H
#include <qobject.h>
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
-class CpGroupPlugin : public QObject, public CpPluginPlatInterface
+class CpGroupPlugin : public QObject, public CpPluginInterface
{
Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
+ Q_INTERFACES(CpPluginInterface)
public:
CpGroupPlugin();
- ~CpGroupPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+ virtual ~CpGroupPlugin();
+ virtual QList<CpSettingFormItemData*> createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
};
#endif // CPGROUPPLUGIN_H
--- a/controlpanel/examples/themeplugin/src/cpthemeplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/examples/themeplugin/src/cpthemeplugin.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -25,11 +25,11 @@
{
}
-CpSettingFormItemData *CpThemePlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
+QList<CpSettingFormItemData*> CpThemePlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
{
CpSettingFormEntryItemData *entryItem = new CpThemePluginEntryItemData(
itemDataHelper,tr("Theme"),tr("Name of the Theme"),HbIcon(":/image/qgn_menu_note.svg"));
- return entryItem;
+ return QList<CpSettingFormItemData*>() << entryItem;
}
Q_EXPORT_PLUGIN2(cpthemeplugin, CpThemePlugin);
--- a/controlpanel/examples/themeplugin/src/cpthemeplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/examples/themeplugin/src/cpthemeplugin.h Thu Apr 01 03:23:37 2010 +0800
@@ -19,16 +19,16 @@
#define CPTHEMEPLUGIN_H
#include <qobject.h>
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
-class CpThemePlugin : public QObject, public CpPluginPlatInterface
+class CpThemePlugin : public QObject, public CpPluginInterface
{
Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
+ Q_INTERFACES(CpPluginInterface)
public:
CpThemePlugin();
virtual ~CpThemePlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+ virtual QList<CpSettingFormItemData*> createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
};
#endif //CPTHEMEPLUGIN_H
--- a/controlpanel/examples/themeplugin/src/cpthemepluginentryitemdata.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/examples/themeplugin/src/cpthemepluginentryitemdata.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,7 +19,7 @@
#include <cpitemdatahelper.h>
#include <hbfiledialog.h>
#include <hbaction.h>
-#include <QFileInfo.h>
+#include <QFileInfo>
CpThemePluginEntryItemData::CpThemePluginEntryItemData(CpItemDataHelper &itemDataHelper,
const QString &text /*= QString()*/,
--- a/controlpanel/examples/viewplugin/src/cpsampleview.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/examples/viewplugin/src/cpsampleview.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -17,7 +17,7 @@
#include "cpsampleview.h"
#include <hbdataform.h>
#include <qstringlist>
-#include <qdebug>
+#include <QDebug>
#include <hbdataformmodel.h>
#include <cpsettingformitemdata.h>
#include <hbmessagebox.h>
--- a/controlpanel/examples/viewplugin/src/cpviewplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/examples/viewplugin/src/cpviewplugin.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -25,12 +25,13 @@
CpViewPlugin::~CpViewPlugin()
{
}
-CpSettingFormItemData *CpViewPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
+QList<CpSettingFormItemData*> CpViewPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
{
- return new CpSettingFormEntryItemDataImpl<CpSampleView>(
- itemDataHelper,
- tr("Entry item from sample view plugin"),
- tr("view plugin descriptions"));
+ return QList<CpSettingFormItemData*>()
+ << new CpSettingFormEntryItemDataImpl<CpSampleView>(
+ itemDataHelper,
+ tr("Entry item from sample view plugin"),
+ tr("view plugin descriptions"));
}
Q_EXPORT_PLUGIN2(cpviewplugin, CpViewPlugin);
--- a/controlpanel/examples/viewplugin/src/cpviewplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/examples/viewplugin/src/cpviewplugin.h Thu Apr 01 03:23:37 2010 +0800
@@ -18,16 +18,16 @@
#define CPVIEWPLUGIN_H
#include <qobject.h>
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
-class CpViewPlugin : public QObject, public CpPluginPlatInterface
+class CpViewPlugin : public QObject, public CpPluginInterface
{
-Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
+ Q_OBJECT
+ Q_INTERFACES(CpPluginInterface)
public:
CpViewPlugin();
- ~CpViewPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+ virtual ~CpViewPlugin();
+ virtual QList<CpSettingFormItemData*> createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
};
#endif //CPVIEWPLUGIN_H
--- a/controlpanel/rom/controlpanel.iby Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/rom/controlpanel.iby Thu Apr 01 03:23:37 2010 +0800
@@ -23,48 +23,6 @@
#define CP_UPGRADABLE_APP_REG_RSC(NAME) data=DATAZ_\PRIVATE\10003A3F\IMPORT\APPS\ ## NAME ## _reg.rsc Private\10003a3f\import\apps\ ## NAME ## _reg.rsc
-file=ABI_DIR\BUILD_DIR\controlpanel.exe SHARED_LIB_DIR\controlpanel.exe
-CP_UPGRADABLE_APP_REG_RSC(controlpanel)
-S60_APP_RESOURCE(controlpanel)
-
file=ABI_DIR\BUILD_DIR\cpframework.dll SHARED_LIB_DIR\cpframework.dll
-file=ABI_DIR\BUILD_DIR\cpprofilewrapper.dll SHARED_LIB_DIR\cpprofilewrapper.dll
-file=ABI_DIR\BUILD_DIR\cpapplicationsettingsplugin.dll SHARED_LIB_DIR\cpapplicationsettingsplugin.dll
-file=ABI_DIR\BUILD_DIR\cppersonalizationplugin.dll SHARED_LIB_DIR\cppersonalizationplugin.dll
-file=ABI_DIR\BUILD_DIR\cpcommunicationplugin.dll SHARED_LIB_DIR\cpcommunicationplugin.dll
-file=ABI_DIR\BUILD_DIR\cpdeviceplugin.dll SHARED_LIB_DIR\cpdeviceplugin.dll
-file=ABI_DIR\BUILD_DIR\cpplaceholderplugin.dll SHARED_LIB_DIR\cpplaceholderplugin.dll
-file=ABI_DIR\BUILD_DIR\cpprivacyplugin.dll SHARED_LIB_DIR\cpprivacyplugin.dll
-file=ABI_DIR\BUILD_DIR\cpplaceholdernoiconplugin.dll SHARED_LIB_DIR\cpplaceholdernoiconplugin.dll
-file=ABI_DIR\BUILD_DIR\cplookfeelplugin.dll SHARED_LIB_DIR\cplookfeelplugin.dll
-file=ABI_DIR\BUILD_DIR\cpthemeplugin.dll SHARED_LIB_DIR\cpthemeplugin.dll
-file=ABI_DIR\BUILD_DIR\cpkeytouchfdbkplugin.dll SHARED_LIB_DIR\cpkeytouchfdbkplugin.dll
-file=ABI_DIR\BUILD_DIR\cpaccountsplugin.dll SHARED_LIB_DIR\cpaccountsplugin.dll
-file=ABI_DIR\BUILD_DIR\cppincodeplugin.dll SHARED_LIB_DIR\cppincodeplugin.dll
-file=ABI_DIR\BUILD_DIR\cpdevicelockplugin.dll SHARED_LIB_DIR\cpdevicelockplugin.dll
-file=ABI_DIR\BUILD_DIR\seccodeui.dll SHARED_LIB_DIR\seccodeui.dll
-
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\config\mainview.cpcfg resource\qt\plugins\controlpanel\config\mainview.cpcfg
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\config\cpapplicationsettingsplugin.cpcfg resource\qt\plugins\controlpanel\config\cpapplicationsettingsplugin.cpcfg
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\config\cppersonalizationplugin.cpcfg resource\qt\plugins\controlpanel\config\cppersonalizationplugin.cpcfg
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\config\cpcommunicationplugin.cpcfg resource\qt\plugins\controlpanel\config\cpcommunicationplugin.cpcfg
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\config\cpdeviceplugin.cpcfg resource\qt\plugins\controlpanel\config\cpdeviceplugin.cpcfg
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\config\cpprivacyplugin.cpcfg resource\qt\plugins\controlpanel\config\cpprivacyplugin.cpcfg
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\config\cplookfeelplugin.cpcfg resource\qt\plugins\controlpanel\config\cplookfeelplugin.cpcfg
-
-
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cppersonalizationplugin.qtplugin resource\qt\plugins\controlpanel\cppersonalizationplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpapplicationsettingsplugin.qtplugin resource\qt\plugins\controlpanel\cpapplicationsettingsplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpcommunicationplugin.qtplugin resource\qt\plugins\controlpanel\cpcommunicationplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpdeviceplugin.qtplugin resource\qt\plugins\controlpanel\cpdeviceplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpplaceholderplugin.qtplugin resource\qt\plugins\controlpanel\cpplaceholderplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpprivacyplugin.qtplugin resource\qt\plugins\controlpanel\cpprivacyplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpplaceholdernoiconplugin.qtplugin resource\qt\plugins\controlpanel\cpplaceholdernoiconplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cplookfeelplugin.qtplugin resource\qt\plugins\controlpanel\cplookfeelplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpthemeplugin.qtplugin resource\qt\plugins\controlpanel\cpthemeplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpkeytouchfdbkplugin.qtplugin resource\qt\plugins\controlpanel\cpkeytouchfdbkplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpaccountsplugin.qtplugin resource\qt\plugins\controlpanel\cpaccountsplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cppincodeplugin.qtplugin resource\qt\plugins\controlpanel\cppincodeplugin.qtplugin
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpdevicelockplugin.qtplugin resource\qt\plugins\controlpanel\cpdevicelockplugin.qtplugin
#endif
--- a/controlpanel/src/bwins/cpframeworku.def Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/bwins/cpframeworku.def Thu Apr 01 03:23:37 2010 +0800
@@ -1,103 +1,143 @@
EXPORTS
- ?trUtf8@CpItemDataHelper@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString CpItemDataHelper::trUtf8(char const *, char const *, int)
- ?onLaunchView@CpSettingFormEntryItemData@@AAEXXZ @ 2 NONAME ; void CpSettingFormEntryItemData::onLaunchView(void)
- ??1CpCategorySettingFormModel@@UAE@XZ @ 3 NONAME ; CpCategorySettingFormModel::~CpCategorySettingFormModel(void)
- ?beforeLoadingConfigPlugins@CpCategorySettingFormItemData@@EAEXAAVCpItemDataHelper@@@Z @ 4 NONAME ; void CpCategorySettingFormItemData::beforeLoadingConfigPlugins(class CpItemDataHelper &)
- ?trUtf8@CpItemDataHelper@@SA?AVQString@@PBD0@Z @ 5 NONAME ; class QString CpItemDataHelper::trUtf8(char const *, char const *)
- ??1CpItemDataHelper@@UAE@XZ @ 6 NONAME ; CpItemDataHelper::~CpItemDataHelper(void)
- ?trUtf8@CpCategorySettingFormModel@@SA?AVQString@@PBD0H@Z @ 7 NONAME ; class QString CpCategorySettingFormModel::trUtf8(char const *, char const *, int)
- ??0CpCategorySettingFormModel@@QAE@ABVQString@@@Z @ 8 NONAME ; CpCategorySettingFormModel::CpCategorySettingFormModel(class QString const &)
- ?setWidget@CpBaseSettingView@@AAEXPAVQGraphicsWidget@@@Z @ 9 NONAME ; void CpBaseSettingView::setWidget(class QGraphicsWidget *)
- ??_ECpSettingFormEntryItemData@@UAE@I@Z @ 10 NONAME ; CpSettingFormEntryItemData::~CpSettingFormEntryItemData(unsigned int)
- ?staticMetaObject@CpItemDataHelper@@2UQMetaObject@@B @ 11 NONAME ; struct QMetaObject const CpItemDataHelper::staticMetaObject
- ?metaObject@CpBaseSettingView@@UBEPBUQMetaObject@@XZ @ 12 NONAME ; struct QMetaObject const * CpBaseSettingView::metaObject(void) const
- ?tr@CpCategorySettingFormItemData@@SA?AVQString@@PBD0@Z @ 13 NONAME ; class QString CpCategorySettingFormItemData::tr(char const *, char const *)
- ?getStaticMetaObject@CpCategorySettingFormModel@@SAABUQMetaObject@@XZ @ 14 NONAME ; struct QMetaObject const & CpCategorySettingFormModel::getStaticMetaObject(void)
- ?d_func@CpBaseSettingView@@AAEPAVCpBaseSettingViewPrivate@@XZ @ 15 NONAME ; class CpBaseSettingViewPrivate * CpBaseSettingView::d_func(void)
- ?text@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 16 NONAME ; class QString CpSettingFormEntryItemData::text(void) const
- ?qt_metacast@CpSettingFormItemData@@UAEPAXPBD@Z @ 17 NONAME ; void * CpSettingFormItemData::qt_metacast(char const *)
- ?initialize@CpCategorySettingFormModel@@UAEXAAVCpItemDataHelper@@@Z @ 18 NONAME ; void CpCategorySettingFormModel::initialize(class CpItemDataHelper &)
- ?bindToForm@CpItemDataHelper@@QBEXPAVHbDataForm@@@Z @ 19 NONAME ; void CpItemDataHelper::bindToForm(class HbDataForm *) const
- ??0CpSettingFormItemData@@QAE@W4DataItemType@HbDataFormModelItem@@ABVQString@@PBV2@@Z @ 20 NONAME ; CpSettingFormItemData::CpSettingFormItemData(enum HbDataFormModelItem::DataItemType, class QString const &, class HbDataFormModelItem const *)
- ?beforeLoadingConfigPlugins@CpCategorySettingFormModel@@EAEXAAVCpItemDataHelper@@@Z @ 21 NONAME ; void CpCategorySettingFormModel::beforeLoadingConfigPlugins(class CpItemDataHelper &)
- ??1CpCategorySettingFormItemData@@UAE@XZ @ 22 NONAME ; CpCategorySettingFormItemData::~CpCategorySettingFormItemData(void)
- ?qt_metacast@CpItemDataHelper@@UAEPAXPBD@Z @ 23 NONAME ; void * CpItemDataHelper::qt_metacast(char const *)
- ?trUtf8@CpCategorySettingFormModel@@SA?AVQString@@PBD0@Z @ 24 NONAME ; class QString CpCategorySettingFormModel::trUtf8(char const *, char const *)
- ?staticMetaObject@CpCategorySettingFormModel@@2UQMetaObject@@B @ 25 NONAME ; struct QMetaObject const CpCategorySettingFormModel::staticMetaObject
- ?tr@CpSettingFormEntryItemData@@SA?AVQString@@PBD0@Z @ 26 NONAME ; class QString CpSettingFormEntryItemData::tr(char const *, char const *)
- ??0CpSettingFormItemData@@QAE@PBVHbDataFormModelItem@@@Z @ 27 NONAME ; CpSettingFormItemData::CpSettingFormItemData(class HbDataFormModelItem const *)
- ?qt_metacall@CpCategorySettingFormModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 28 NONAME ; int CpCategorySettingFormModel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?qt_metacast@CpBaseSettingView@@UAEPAXPBD@Z @ 29 NONAME ; void * CpBaseSettingView::qt_metacast(char const *)
- ?launchCpPluginView@CpPluginLauncher@@SA_NABVQString@@@Z @ 30 NONAME ; bool CpPluginLauncher::launchCpPluginView(class QString const &)
- ?getStaticMetaObject@CpBaseSettingView@@SAABUQMetaObject@@XZ @ 31 NONAME ; struct QMetaObject const & CpBaseSettingView::getStaticMetaObject(void)
- ?afterLoadingConfigPlugins@CpCategorySettingFormModel@@EAEXAAVCpItemDataHelper@@@Z @ 32 NONAME ; void CpCategorySettingFormModel::afterLoadingConfigPlugins(class CpItemDataHelper &)
- ?removeConnection@CpItemDataHelper@@QAEXPAVHbDataFormModelItem@@ABVQString@@PAVQObject@@1@Z @ 33 NONAME ; void CpItemDataHelper::removeConnection(class HbDataFormModelItem *, class QString const &, class QObject *, class QString const &)
- ??1CpSettingFormItemData@@UAE@XZ @ 34 NONAME ; CpSettingFormItemData::~CpSettingFormItemData(void)
- ?setDescription@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 35 NONAME ; void CpSettingFormEntryItemData::setDescription(class QString const &)
- ?d_func@CpBaseSettingView@@ABEPBVCpBaseSettingViewPrivate@@XZ @ 36 NONAME ; class CpBaseSettingViewPrivate const * CpBaseSettingView::d_func(void) const
- ?tr@CpSettingFormEntryItemData@@SA?AVQString@@PBD0H@Z @ 37 NONAME ; class QString CpSettingFormEntryItemData::tr(char const *, char const *, int)
- ?getStaticMetaObject@CpSettingFormItemData@@SAABUQMetaObject@@XZ @ 38 NONAME ; struct QMetaObject const & CpSettingFormItemData::getStaticMetaObject(void)
- ?aboutToClose@CpBaseSettingView@@IAEXXZ @ 39 NONAME ; void CpBaseSettingView::aboutToClose(void)
- ?staticMetaObject@CpSettingFormEntryItemData@@2UQMetaObject@@B @ 40 NONAME ; struct QMetaObject const CpSettingFormEntryItemData::staticMetaObject
- ??0CpCategorySettingFormItemData@@QAE@W4DataItemType@HbDataFormModelItem@@ABVQString@@1PBV2@@Z @ 41 NONAME ; CpCategorySettingFormItemData::CpCategorySettingFormItemData(enum HbDataFormModelItem::DataItemType, class QString const &, class QString const &, class HbDataFormModelItem const *)
- ?qt_metacall@CpSettingFormItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 42 NONAME ; int CpSettingFormItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?metaObject@CpCategorySettingFormModel@@UBEPBUQMetaObject@@XZ @ 43 NONAME ; struct QMetaObject const * CpCategorySettingFormModel::metaObject(void) const
- ?afterLoadingConfigPlugins@CpCategorySettingFormItemData@@EAEXAAVCpItemDataHelper@@@Z @ 44 NONAME ; void CpCategorySettingFormItemData::afterLoadingConfigPlugins(class CpItemDataHelper &)
- ?staticMetaObject@CpCategorySettingFormItemData@@2UQMetaObject@@B @ 45 NONAME ; struct QMetaObject const CpCategorySettingFormItemData::staticMetaObject
- ?metaObject@CpCategorySettingFormItemData@@UBEPBUQMetaObject@@XZ @ 46 NONAME ; struct QMetaObject const * CpCategorySettingFormItemData::metaObject(void) const
- ??_ECpBaseSettingView@@UAE@I@Z @ 47 NONAME ; CpBaseSettingView::~CpBaseSettingView(unsigned int)
- ??_ECpSettingFormItemData@@UAE@I@Z @ 48 NONAME ; CpSettingFormItemData::~CpSettingFormItemData(unsigned int)
- ??_ECpCategorySettingFormModel@@UAE@I@Z @ 49 NONAME ; CpCategorySettingFormModel::~CpCategorySettingFormModel(unsigned int)
- ?trUtf8@CpSettingFormEntryItemData@@SA?AVQString@@PBD0H@Z @ 50 NONAME ; class QString CpSettingFormEntryItemData::trUtf8(char const *, char const *, int)
- ?trUtf8@CpSettingFormItemData@@SA?AVQString@@PBD0H@Z @ 51 NONAME ; class QString CpSettingFormItemData::trUtf8(char const *, char const *, int)
- ?tr@CpBaseSettingView@@SA?AVQString@@PBD0H@Z @ 52 NONAME ; class QString CpBaseSettingView::tr(char const *, char const *, int)
- ?staticMetaObject@CpBaseSettingView@@2UQMetaObject@@B @ 53 NONAME ; struct QMetaObject const CpBaseSettingView::staticMetaObject
- ?tr@CpBaseSettingView@@SA?AVQString@@PBD0@Z @ 54 NONAME ; class QString CpBaseSettingView::tr(char const *, char const *)
- ?settingForm@CpBaseSettingView@@QBEPAVHbDataForm@@XZ @ 55 NONAME ; class HbDataForm * CpBaseSettingView::settingForm(void) const
- ?description@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 56 NONAME ; class QString CpSettingFormEntryItemData::description(void) const
- ?trUtf8@CpCategorySettingFormItemData@@SA?AVQString@@PBD0@Z @ 57 NONAME ; class QString CpCategorySettingFormItemData::trUtf8(char const *, char const *)
- ?tr@CpCategorySettingFormModel@@SA?AVQString@@PBD0@Z @ 58 NONAME ; class QString CpCategorySettingFormModel::tr(char const *, char const *)
- ?initialize@CpCategorySettingFormItemData@@QAEXAAVCpItemDataHelper@@@Z @ 59 NONAME ; void CpCategorySettingFormItemData::initialize(class CpItemDataHelper &)
- ?tr@CpSettingFormItemData@@SA?AVQString@@PBD0@Z @ 60 NONAME ; class QString CpSettingFormItemData::tr(char const *, char const *)
- ??0CpBaseSettingView@@QAE@PAVHbDataForm@@PAVQGraphicsItem@@@Z @ 61 NONAME ; CpBaseSettingView::CpBaseSettingView(class HbDataForm *, class QGraphicsItem *)
- ?tr@CpCategorySettingFormItemData@@SA?AVQString@@PBD0H@Z @ 62 NONAME ; class QString CpCategorySettingFormItemData::tr(char const *, char const *, int)
- ?connectionAdded@CpItemDataHelper@@IAEXPAVHbDataFormModelItem@@ABVQString@@PAVQObject@@1@Z @ 63 NONAME ; void CpItemDataHelper::connectionAdded(class HbDataFormModelItem *, class QString const &, class QObject *, class QString const &)
- ?connectionRemoved@CpItemDataHelper@@IAEXPAVHbDataFormModelItem@@ABVQString@@PAVQObject@@1@Z @ 64 NONAME ; void CpItemDataHelper::connectionRemoved(class HbDataFormModelItem *, class QString const &, class QObject *, class QString const &)
- ?setSettingForm@CpBaseSettingView@@QAEXPAVHbDataForm@@@Z @ 65 NONAME ; void CpBaseSettingView::setSettingForm(class HbDataForm *)
- ?tr@CpSettingFormItemData@@SA?AVQString@@PBD0H@Z @ 66 NONAME ; class QString CpSettingFormItemData::tr(char const *, char const *, int)
- ?tr@CpItemDataHelper@@SA?AVQString@@PBD0H@Z @ 67 NONAME ; class QString CpItemDataHelper::tr(char const *, char const *, int)
- ??0CpItemDataHelper@@QAE@XZ @ 68 NONAME ; CpItemDataHelper::CpItemDataHelper(void)
- ?trUtf8@CpSettingFormItemData@@SA?AVQString@@PBD0@Z @ 69 NONAME ; class QString CpSettingFormItemData::trUtf8(char const *, char const *)
- ?qt_metacall@CpBaseSettingView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 70 NONAME ; int CpBaseSettingView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?trUtf8@CpBaseSettingView@@SA?AVQString@@PBD0H@Z @ 71 NONAME ; class QString CpBaseSettingView::trUtf8(char const *, char const *, int)
- ?getStaticMetaObject@CpSettingFormEntryItemData@@SAABUQMetaObject@@XZ @ 72 NONAME ; struct QMetaObject const & CpSettingFormEntryItemData::getStaticMetaObject(void)
- ??0CpCategorySettingFormItemData@@QAE@ABVQString@@PBVHbDataFormModelItem@@@Z @ 73 NONAME ; CpCategorySettingFormItemData::CpCategorySettingFormItemData(class QString const &, class HbDataFormModelItem const *)
- ??0CpSettingFormEntryItemData@@QAE@AAVCpItemDataHelper@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 74 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class CpItemDataHelper &, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
- ?setText@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 75 NONAME ; void CpSettingFormEntryItemData::setText(class QString const &)
- ?prototypeAdded@CpItemDataHelper@@IAEXPAVHbAbstractViewItem@@@Z @ 76 NONAME ; void CpItemDataHelper::prototypeAdded(class HbAbstractViewItem *)
- ?qt_metacast@CpCategorySettingFormItemData@@UAEPAXPBD@Z @ 77 NONAME ; void * CpCategorySettingFormItemData::qt_metacast(char const *)
- ?trUtf8@CpSettingFormEntryItemData@@SA?AVQString@@PBD0@Z @ 78 NONAME ; class QString CpSettingFormEntryItemData::trUtf8(char const *, char const *)
- ?tr@CpItemDataHelper@@SA?AVQString@@PBD0@Z @ 79 NONAME ; class QString CpItemDataHelper::tr(char const *, char const *)
- ?getStaticMetaObject@CpItemDataHelper@@SAABUQMetaObject@@XZ @ 80 NONAME ; struct QMetaObject const & CpItemDataHelper::getStaticMetaObject(void)
- ?metaObject@CpItemDataHelper@@UBEPBUQMetaObject@@XZ @ 81 NONAME ; struct QMetaObject const * CpItemDataHelper::metaObject(void) const
- ?qt_metacall@CpCategorySettingFormItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 82 NONAME ; int CpCategorySettingFormItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?qt_metacast@CpCategorySettingFormModel@@UAEPAXPBD@Z @ 83 NONAME ; void * CpCategorySettingFormModel::qt_metacast(char const *)
- ?qt_metacast@CpSettingFormEntryItemData@@UAEPAXPBD@Z @ 84 NONAME ; void * CpSettingFormEntryItemData::qt_metacast(char const *)
- ??_ECpItemDataHelper@@UAE@I@Z @ 85 NONAME ; CpItemDataHelper::~CpItemDataHelper(unsigned int)
- ??1CpSettingFormEntryItemData@@UAE@XZ @ 86 NONAME ; CpSettingFormEntryItemData::~CpSettingFormEntryItemData(void)
- ?qt_metacall@CpItemDataHelper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 87 NONAME ; int CpItemDataHelper::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?getStaticMetaObject@CpCategorySettingFormItemData@@SAABUQMetaObject@@XZ @ 88 NONAME ; struct QMetaObject const & CpCategorySettingFormItemData::getStaticMetaObject(void)
- ?metaObject@CpSettingFormEntryItemData@@UBEPBUQMetaObject@@XZ @ 89 NONAME ; struct QMetaObject const * CpSettingFormEntryItemData::metaObject(void) const
- ?addItemPrototype@CpItemDataHelper@@QAEXPAVHbAbstractViewItem@@@Z @ 90 NONAME ; void CpItemDataHelper::addItemPrototype(class HbAbstractViewItem *)
- ?staticMetaObject@CpSettingFormItemData@@2UQMetaObject@@B @ 91 NONAME ; struct QMetaObject const CpSettingFormItemData::staticMetaObject
- ?trUtf8@CpBaseSettingView@@SA?AVQString@@PBD0@Z @ 92 NONAME ; class QString CpBaseSettingView::trUtf8(char const *, char const *)
- ?addConnection@CpItemDataHelper@@QAEXPAVHbDataFormModelItem@@ABVQString@@PAVQObject@@1@Z @ 93 NONAME ; void CpItemDataHelper::addConnection(class HbDataFormModelItem *, class QString const &, class QObject *, class QString const &)
- ?setEntryItemIcon@CpSettingFormEntryItemData@@QAEXABVHbIcon@@@Z @ 94 NONAME ; void CpSettingFormEntryItemData::setEntryItemIcon(class HbIcon const &)
- ?trUtf8@CpCategorySettingFormItemData@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString CpCategorySettingFormItemData::trUtf8(char const *, char const *, int)
- ?tr@CpCategorySettingFormModel@@SA?AVQString@@PBD0H@Z @ 96 NONAME ; class QString CpCategorySettingFormModel::tr(char const *, char const *, int)
- ?entryItemIcon@CpSettingFormEntryItemData@@QBE?AVHbIcon@@XZ @ 97 NONAME ; class HbIcon CpSettingFormEntryItemData::entryItemIcon(void) const
- ??1CpBaseSettingView@@UAE@XZ @ 98 NONAME ; CpBaseSettingView::~CpBaseSettingView(void)
- ??_ECpCategorySettingFormItemData@@UAE@I@Z @ 99 NONAME ; CpCategorySettingFormItemData::~CpCategorySettingFormItemData(unsigned int)
- ?metaObject@CpSettingFormItemData@@UBEPBUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const * CpSettingFormItemData::metaObject(void) const
- ?qt_metacall@CpSettingFormEntryItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 101 NONAME ; int CpSettingFormEntryItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?trUtf8@CpItemDataHelper@@SA?AVQString@@PBD0@Z @ 1 NONAME ; class QString CpItemDataHelper::trUtf8(char const *, char const *)
+ ?log@Logger@@QAEXABVQString@@@Z @ 2 NONAME ; void Logger::log(class QString const &)
+ ?tr@CpDataFormViewItem@@SA?AVQString@@PBD0@Z @ 3 NONAME ; class QString CpDataFormViewItem::tr(char const *, char const *)
+ ?disconnectFromForm@CpItemDataHelper@@QAEXPBDPAVQObject@@0@Z @ 4 NONAME ; void CpItemDataHelper::disconnectFromForm(char const *, class QObject *, char const *)
+ ??1CpSettingFormItemData@@UAE@XZ @ 5 NONAME ; CpSettingFormItemData::~CpSettingFormItemData(void)
+ ?removeConnection@CpItemDataHelper@@QAEXPAVHbDataFormModelItem@@PBDPAVQObject@@1@Z @ 6 NONAME ; void CpItemDataHelper::removeConnection(class HbDataFormModelItem *, char const *, class QObject *, char const *)
+ ?staticMetaObject@LogOutput@@2UQMetaObject@@B @ 7 NONAME ; struct QMetaObject const LogOutput::staticMetaObject
+ ?metaObject@Logger@@UBEPBUQMetaObject@@XZ @ 8 NONAME ; struct QMetaObject const * Logger::metaObject(void) const
+ ??4CpDataFormViewItem@@IAEAAV0@ABV0@@Z @ 9 NONAME ; class CpDataFormViewItem & CpDataFormViewItem::operator=(class CpDataFormViewItem const &)
+ ?load@CpDataFormViewItem@@UAEXXZ @ 10 NONAME ; void CpDataFormViewItem::load(void)
+ ??_ECpDataFormViewItem@@UAE@I@Z @ 11 NONAME ; CpDataFormViewItem::~CpDataFormViewItem(unsigned int)
+ ??0CpSettingFormEntryItemData@@QAE@AAVCpItemDataHelper@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 12 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class CpItemDataHelper &, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
+ ?name@Logger@@QBE?AVQString@@XZ @ 13 NONAME ; class QString Logger::name(void) const
+ ?tr@Logger@@SA?AVQString@@PBD0@Z @ 14 NONAME ; class QString Logger::tr(char const *, char const *)
+ ??1LogOutput@@UAE@XZ @ 15 NONAME ; LogOutput::~LogOutput(void)
+ ?bindToForm@CpItemDataHelper@@QAEXPAVHbDataForm@@@Z @ 16 NONAME ; void CpItemDataHelper::bindToForm(class HbDataForm *)
+ ??_ELogger@@UAE@I@Z @ 17 NONAME ; Logger::~Logger(unsigned int)
+ ?trUtf8@Logger@@SA?AVQString@@PBD0@Z @ 18 NONAME ; class QString Logger::trUtf8(char const *, char const *)
+ ?tr@CpSettingFormEntryItemData@@SA?AVQString@@PBD0H@Z @ 19 NONAME ; class QString CpSettingFormEntryItemData::tr(char const *, char const *, int)
+ ?setName@LogOutput@@QAEXABVQString@@@Z @ 20 NONAME ; void LogOutput::setName(class QString const &)
+ ?staticMetaObject@CpDataFormViewItem@@2UQMetaObject@@B @ 21 NONAME ; struct QMetaObject const CpDataFormViewItem::staticMetaObject
+ ?getStaticMetaObject@CpSettingFormItemData@@SAABUQMetaObject@@XZ @ 22 NONAME ; struct QMetaObject const & CpSettingFormItemData::getStaticMetaObject(void)
+ ?setLogDateTime@Logger@@QAEX_N@Z @ 23 NONAME ; void Logger::setLogDateTime(bool)
+ ?staticMetaObject@CpBaseSettingView@@2UQMetaObject@@B @ 24 NONAME ; struct QMetaObject const CpBaseSettingView::staticMetaObject
+ ?metaObject@CpSettingFormEntryItemData@@UBEPBUQMetaObject@@XZ @ 25 NONAME ; struct QMetaObject const * CpSettingFormEntryItemData::metaObject(void) const
+ ?tr@CpDataFormViewItem@@SA?AVQString@@PBD0H@Z @ 26 NONAME ; class QString CpDataFormViewItem::tr(char const *, char const *, int)
+ ?trUtf8@CpSettingFormItemData@@SA?AVQString@@PBD0H@Z @ 27 NONAME ; class QString CpSettingFormItemData::trUtf8(char const *, char const *, int)
+ ??0CpSettingFormEntryItemData@@QAE@PAVHbDataForm@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 28 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class HbDataForm *, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
+ ?trUtf8@CpSettingFormEntryItemData@@SA?AVQString@@PBD0H@Z @ 29 NONAME ; class QString CpSettingFormEntryItemData::trUtf8(char const *, char const *, int)
+ ?qt_metacast@CpSettingFormEntryItemData@@UAEPAXPBD@Z @ 30 NONAME ; void * CpSettingFormEntryItemData::qt_metacast(char const *)
+ ??0Logger@@AAE@ABVQString@@PAVQObject@@@Z @ 31 NONAME ; Logger::Logger(class QString const &, class QObject *)
+ ??0CpBaseSettingView@@QAE@PAVQGraphicsWidget@@PAVQGraphicsItem@@@Z @ 32 NONAME ; CpBaseSettingView::CpBaseSettingView(class QGraphicsWidget *, class QGraphicsItem *)
+ ??1CpBaseSettingView@@UAE@XZ @ 33 NONAME ; CpBaseSettingView::~CpBaseSettingView(void)
+ ?qt_metacall@LogOutput@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 34 NONAME ; int LogOutput::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?onLaunchView@CpSettingFormEntryItemData@@AAEXXZ @ 35 NONAME ; void CpSettingFormEntryItemData::onLaunchView(void)
+ ?addCreateLogOutputEntry@LogOutputFactory@@SAXABVQString@@P6APAVLogOutput@@XZ@Z @ 36 NONAME ; void LogOutputFactory::addCreateLogOutputEntry(class QString const &, class LogOutput * (*)(void))
+ ?removeLogOutput@Logger@@QAEXPAVLogOutput@@@Z @ 37 NONAME ; void Logger::removeLogOutput(class LogOutput *)
+ ?aboutToClose@CpBaseSettingView@@IAEXXZ @ 38 NONAME ; void CpBaseSettingView::aboutToClose(void)
+ ?connectToForm@CpItemDataHelper@@QAEXPBDPAVQObject@@0@Z @ 39 NONAME ; void CpItemDataHelper::connectToForm(char const *, class QObject *, char const *)
+ ?d_func@CpBaseSettingView@@ABEPBVCpBaseSettingViewPrivate@@XZ @ 40 NONAME ; class CpBaseSettingViewPrivate const * CpBaseSettingView::d_func(void) const
+ ?setParentLogger@LogOutput@@QAEXPAVLogger@@@Z @ 41 NONAME ; void LogOutput::setParentLogger(class Logger *)
+ ?tr@LogOutput@@SA?AVQString@@PBD0@Z @ 42 NONAME ; class QString LogOutput::tr(char const *, char const *)
+ ?getStaticMetaObject@CpItemDataHelper@@SAABUQMetaObject@@XZ @ 43 NONAME ; struct QMetaObject const & CpItemDataHelper::getStaticMetaObject(void)
+ ?tr@CpItemDataHelper@@SA?AVQString@@PBD0@Z @ 44 NONAME ; class QString CpItemDataHelper::tr(char const *, char const *)
+ ?tr@CpBaseSettingView@@SA?AVQString@@PBD0@Z @ 45 NONAME ; class QString CpBaseSettingView::tr(char const *, char const *)
+ ?addItemPrototype@CpItemDataHelper@@QAEXPAVHbAbstractViewItem@@@Z @ 46 NONAME ; void CpItemDataHelper::addItemPrototype(class HbAbstractViewItem *)
+ ?tr@LogOutput@@SA?AVQString@@PBD0H@Z @ 47 NONAME ; class QString LogOutput::tr(char const *, char const *, int)
+ ??_ELogOutput@@UAE@I@Z @ 48 NONAME ; LogOutput::~LogOutput(unsigned int)
+ ?text@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 49 NONAME ; class QString CpSettingFormEntryItemData::text(void) const
+ ?setDescription@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 50 NONAME ; void CpSettingFormEntryItemData::setDescription(class QString const &)
+ ?metaObject@CpBaseSettingView@@UBEPBUQMetaObject@@XZ @ 51 NONAME ; struct QMetaObject const * CpBaseSettingView::metaObject(void) const
+ ?qt_metacast@LogOutput@@UAEPAXPBD@Z @ 52 NONAME ; void * LogOutput::qt_metacast(char const *)
+ ?logLoggerName@Logger@@QBE_NXZ @ 53 NONAME ; bool Logger::logLoggerName(void) const
+ ?description@CpSettingFormEntryItemData@@QBE?AVQString@@XZ @ 54 NONAME ; class QString CpSettingFormEntryItemData::description(void) const
+ ??1CpItemDataHelper@@UAE@XZ @ 55 NONAME ; CpItemDataHelper::~CpItemDataHelper(void)
+ ?metaObject@CpDataFormViewItem@@UBEPBUQMetaObject@@XZ @ 56 NONAME ; struct QMetaObject const * CpDataFormViewItem::metaObject(void) const
+ ?metaObject@CpItemDataHelper@@UBEPBUQMetaObject@@XZ @ 57 NONAME ; struct QMetaObject const * CpItemDataHelper::metaObject(void) const
+ ??0CpSettingFormItemData@@QAE@W4DataItemType@HbDataFormModelItem@@ABVQString@@PBV2@@Z @ 58 NONAME ; CpSettingFormItemData::CpSettingFormItemData(enum HbDataFormModelItem::DataItemType, class QString const &, class HbDataFormModelItem const *)
+ ?staticMetaObject@CpItemDataHelper@@2UQMetaObject@@B @ 59 NONAME ; struct QMetaObject const CpItemDataHelper::staticMetaObject
+ ?trUtf8@Logger@@SA?AVQString@@PBD0H@Z @ 60 NONAME ; class QString Logger::trUtf8(char const *, char const *, int)
+ ?dateTimeFormat@Logger@@QBE?AVQString@@XZ @ 61 NONAME ; class QString Logger::dateTimeFormat(void) const
+ ??1CpDataFormViewItem@@UAE@XZ @ 62 NONAME ; CpDataFormViewItem::~CpDataFormViewItem(void)
+ ?addLogOutput@Logger@@QAE_NPAVLogOutput@@@Z @ 63 NONAME ; bool Logger::addLogOutput(class LogOutput *)
+ ?trUtf8@CpItemDataHelper@@SA?AVQString@@PBD0H@Z @ 64 NONAME ; class QString CpItemDataHelper::trUtf8(char const *, char const *, int)
+ ?parentLogger@LogOutput@@QAEPAVLogger@@XZ @ 65 NONAME ; class Logger * LogOutput::parentLogger(void)
+ ?trUtf8@CpBaseSettingView@@SA?AVQString@@PBD0H@Z @ 66 NONAME ; class QString CpBaseSettingView::trUtf8(char const *, char const *, int)
+ ?logOutput@Logger@@QAEPAVLogOutput@@ABVQString@@@Z @ 67 NONAME ; class LogOutput * Logger::logOutput(class QString const &)
+ ?getStaticMetaObject@LogOutput@@SAABUQMetaObject@@XZ @ 68 NONAME ; struct QMetaObject const & LogOutput::getStaticMetaObject(void)
+ ?qt_metacast@CpBaseSettingView@@UAEPAXPBD@Z @ 69 NONAME ; void * CpBaseSettingView::qt_metacast(char const *)
+ ?settingForm@CpBaseSettingView@@QBEPAVHbDataForm@@XZ @ 70 NONAME ; class HbDataForm * CpBaseSettingView::settingForm(void) const
+ ?qt_metacall@CpBaseSettingView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 71 NONAME ; int CpBaseSettingView::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?metaObject@CpSettingFormItemData@@UBEPBUQMetaObject@@XZ @ 72 NONAME ; struct QMetaObject const * CpSettingFormItemData::metaObject(void) const
+ ?createItem@CpDataFormViewItem@@UAEPAVHbAbstractViewItem@@XZ @ 73 NONAME ; class HbAbstractViewItem * CpDataFormViewItem::createItem(void)
+ ?qt_metacall@CpSettingFormEntryItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 74 NONAME ; int CpSettingFormEntryItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??_ECpSettingFormItemData@@UAE@I@Z @ 75 NONAME ; CpSettingFormItemData::~CpSettingFormItemData(unsigned int)
+ ?tr@CpItemDataHelper@@SA?AVQString@@PBD0H@Z @ 76 NONAME ; class QString CpItemDataHelper::tr(char const *, char const *, int)
+ ??_ECpItemDataHelper@@UAE@I@Z @ 77 NONAME ; CpItemDataHelper::~CpItemDataHelper(unsigned int)
+ ?setDateTimeFormat@Logger@@QAEXABVQString@@@Z @ 78 NONAME ; void Logger::setDateTimeFormat(class QString const &)
+ ??0CpItemDataHelper@@QAE@PAVHbDataForm@@@Z @ 79 NONAME ; CpItemDataHelper::CpItemDataHelper(class HbDataForm *)
+ ?createCustomWidget@CpDataFormViewItem@@MAEPAVHbWidget@@XZ @ 80 NONAME ; class HbWidget * CpDataFormViewItem::createCustomWidget(void)
+ ?loadPlatCpPlugin@CpPluginLoader@@SAPAVCpPluginPlatInterface@@ABVQString@@@Z @ 81 NONAME ; class CpPluginPlatInterface * CpPluginLoader::loadPlatCpPlugin(class QString const &)
+ ?setEntryItemIcon@CpSettingFormEntryItemData@@QAEXABVHbIcon@@@Z @ 82 NONAME ; void CpSettingFormEntryItemData::setEntryItemIcon(class HbIcon const &)
+ ?trUtf8@CpSettingFormItemData@@SA?AVQString@@PBD0@Z @ 83 NONAME ; class QString CpSettingFormItemData::trUtf8(char const *, char const *)
+ ?qt_metacast@CpDataFormViewItem@@UAEPAXPBD@Z @ 84 NONAME ; void * CpDataFormViewItem::qt_metacast(char const *)
+ ?qt_metacall@CpDataFormViewItem@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 85 NONAME ; int CpDataFormViewItem::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?trUtf8@CpDataFormViewItem@@SA?AVQString@@PBD0H@Z @ 86 NONAME ; class QString CpDataFormViewItem::trUtf8(char const *, char const *, int)
+ ??0CpSettingFormItemData@@QAE@PBVHbDataFormModelItem@@@Z @ 87 NONAME ; CpSettingFormItemData::CpSettingFormItemData(class HbDataFormModelItem const *)
+ ?qt_metacall@Logger@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 88 NONAME ; int Logger::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?configure@Logger@@QAEXABVQString@@W4Format@QSettings@@@Z @ 89 NONAME ; void Logger::configure(class QString const &, enum QSettings::Format)
+ ?tr@CpSettingFormItemData@@SA?AVQString@@PBD0@Z @ 90 NONAME ; class QString CpSettingFormItemData::tr(char const *, char const *)
+ ?trUtf8@LogOutput@@SA?AVQString@@PBD0@Z @ 91 NONAME ; class QString LogOutput::trUtf8(char const *, char const *)
+ ?staticMetaObject@CpSettingFormEntryItemData@@2UQMetaObject@@B @ 92 NONAME ; struct QMetaObject const CpSettingFormEntryItemData::staticMetaObject
+ ?trUtf8@CpBaseSettingView@@SA?AVQString@@PBD0@Z @ 93 NONAME ; class QString CpBaseSettingView::trUtf8(char const *, char const *)
+ ?addConnection@CpItemDataHelper@@QAEXPAVHbDataFormModelItem@@PBDPAVQObject@@1@Z @ 94 NONAME ; void CpItemDataHelper::addConnection(class HbDataFormModelItem *, char const *, class QObject *, char const *)
+ ?staticMetaObject@Logger@@2UQMetaObject@@B @ 95 NONAME ; struct QMetaObject const Logger::staticMetaObject
+ ?setText@CpSettingFormEntryItemData@@QAEXABVQString@@@Z @ 96 NONAME ; void CpSettingFormEntryItemData::setText(class QString const &)
+ ?qt_metacall@CpItemDataHelper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 97 NONAME ; int CpItemDataHelper::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?instance@Logger@@SAPAV1@ABVQString@@@Z @ 98 NONAME ; class Logger * Logger::instance(class QString const &)
+ ?name@LogOutput@@QBE?AVQString@@XZ @ 99 NONAME ; class QString LogOutput::name(void) const
+ ?trUtf8@CpDataFormViewItem@@SA?AVQString@@PBD0@Z @ 100 NONAME ; class QString CpDataFormViewItem::trUtf8(char const *, char const *)
+ ?getStaticMetaObject@Logger@@SAABUQMetaObject@@XZ @ 101 NONAME ; struct QMetaObject const & Logger::getStaticMetaObject(void)
+ ?tr@CpSettingFormEntryItemData@@SA?AVQString@@PBD0@Z @ 102 NONAME ; class QString CpSettingFormEntryItemData::tr(char const *, char const *)
+ ??1Logger@@UAE@XZ @ 103 NONAME ; Logger::~Logger(void)
+ ?qt_metacast@CpSettingFormItemData@@UAEPAXPBD@Z @ 104 NONAME ; void * CpSettingFormItemData::qt_metacast(char const *)
+ ??0CpSettingFormEntryItemData@@QAE@PBVHbDataFormModelItem@@@Z @ 105 NONAME ; CpSettingFormEntryItemData::CpSettingFormEntryItemData(class HbDataFormModelItem const *)
+ ?canSetModelIndex@CpDataFormViewItem@@UBE_NABVQModelIndex@@@Z @ 106 NONAME ; bool CpDataFormViewItem::canSetModelIndex(class QModelIndex const &) const
+ ?closeAll@Logger@@SAXXZ @ 107 NONAME ; void Logger::closeAll(void)
+ ?clearAllLogOutput@Logger@@QAEXXZ @ 108 NONAME ; void Logger::clearAllLogOutput(void)
+ ?setSettingForm@CpBaseSettingView@@QAEXPAVHbDataForm@@@Z @ 109 NONAME ; void CpBaseSettingView::setSettingForm(class HbDataForm *)
+ ??0CpDataFormViewItem@@IAE@ABV0@@Z @ 110 NONAME ; CpDataFormViewItem::CpDataFormViewItem(class CpDataFormViewItem const &)
+ ?createLogOutput@LogOutputFactory@@SAPAVLogOutput@@ABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 111 NONAME ; class LogOutput * LogOutputFactory::createLogOutput(class QString const &, class QHash<class QString, class QVariant> const &)
+ ?trUtf8@CpSettingFormEntryItemData@@SA?AVQString@@PBD0@Z @ 112 NONAME ; class QString CpSettingFormEntryItemData::trUtf8(char const *, char const *)
+ ?addCpItemPrototype@CpPluginUtility@@SAXPAVHbDataForm@@@Z @ 113 NONAME ; void CpPluginUtility::addCpItemPrototype(class HbDataForm *)
+ ?staticMetaObject@CpSettingFormItemData@@2UQMetaObject@@B @ 114 NONAME ; struct QMetaObject const CpSettingFormItemData::staticMetaObject
+ ?tr@CpBaseSettingView@@SA?AVQString@@PBD0H@Z @ 115 NONAME ; class QString CpBaseSettingView::tr(char const *, char const *, int)
+ ??1CpSettingFormEntryItemData@@UAE@XZ @ 116 NONAME ; CpSettingFormEntryItemData::~CpSettingFormEntryItemData(void)
+ ??0CpDataFormViewItem@@QAE@PAVQGraphicsItem@@@Z @ 117 NONAME ; CpDataFormViewItem::CpDataFormViewItem(class QGraphicsItem *)
+ ?setLogLoggerName@Logger@@QAEX_N@Z @ 118 NONAME ; void Logger::setLogLoggerName(bool)
+ ?launchCpPluginView@CpPluginLauncher@@SA_NABVQString@@H@Z @ 119 NONAME ; bool CpPluginLauncher::launchCpPluginView(class QString const &, int)
+ ?qt_metacast@CpItemDataHelper@@UAEPAXPBD@Z @ 120 NONAME ; void * CpItemDataHelper::qt_metacast(char const *)
+ ?createLogOutput@LogOutputFactory@@SAPAVLogOutput@@ABVQString@@@Z @ 121 NONAME ; class LogOutput * LogOutputFactory::createLogOutput(class QString const &)
+ ?loadCpPlugin@CpPluginLoader@@SAPAVCpPluginInterface@@ABVQString@@@Z @ 122 NONAME ; class CpPluginInterface * CpPluginLoader::loadCpPlugin(class QString const &)
+ ??0LogOutput@@IAE@PAVLogger@@@Z @ 123 NONAME ; LogOutput::LogOutput(class Logger *)
+ ?tr@Logger@@SA?AVQString@@PBD0H@Z @ 124 NONAME ; class QString Logger::tr(char const *, char const *, int)
+ ??_ECpBaseSettingView@@UAE@I@Z @ 125 NONAME ; CpBaseSettingView::~CpBaseSettingView(unsigned int)
+ ?close@Logger@@SAXABVQString@@@Z @ 126 NONAME ; void Logger::close(class QString const &)
+ ?getStaticMetaObject@CpDataFormViewItem@@SAABUQMetaObject@@XZ @ 127 NONAME ; struct QMetaObject const & CpDataFormViewItem::getStaticMetaObject(void)
+ ?metaObject@LogOutput@@UBEPBUQMetaObject@@XZ @ 128 NONAME ; struct QMetaObject const * LogOutput::metaObject(void) const
+ ?tr@CpSettingFormItemData@@SA?AVQString@@PBD0H@Z @ 129 NONAME ; class QString CpSettingFormItemData::tr(char const *, char const *, int)
+ ?trUtf8@LogOutput@@SA?AVQString@@PBD0H@Z @ 130 NONAME ; class QString LogOutput::trUtf8(char const *, char const *, int)
+ ?getStaticMetaObject@CpSettingFormEntryItemData@@SAABUQMetaObject@@XZ @ 131 NONAME ; struct QMetaObject const & CpSettingFormEntryItemData::getStaticMetaObject(void)
+ ?qt_metacast@Logger@@UAEPAXPBD@Z @ 132 NONAME ; void * Logger::qt_metacast(char const *)
+ ?configure@Logger@@QAEXAAVQSettings@@@Z @ 133 NONAME ; void Logger::configure(class QSettings &)
+ ?logDateTime@Logger@@QBE_NXZ @ 134 NONAME ; bool Logger::logDateTime(void) const
+ ?d_func@CpBaseSettingView@@AAEPAVCpBaseSettingViewPrivate@@XZ @ 135 NONAME ; class CpBaseSettingViewPrivate * CpBaseSettingView::d_func(void)
+ ?getStaticMetaObject@CpBaseSettingView@@SAABUQMetaObject@@XZ @ 136 NONAME ; struct QMetaObject const & CpBaseSettingView::getStaticMetaObject(void)
+ ?entryItemIcon@CpSettingFormEntryItemData@@QBE?AVHbIcon@@XZ @ 137 NONAME ; class HbIcon CpSettingFormEntryItemData::entryItemIcon(void) const
+ ?qt_metacall@CpSettingFormItemData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 138 NONAME ; int CpSettingFormItemData::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??_ECpSettingFormEntryItemData@@UAE@I@Z @ 139 NONAME ; CpSettingFormEntryItemData::~CpSettingFormEntryItemData(unsigned int)
+ ?widgetFromModelIndex@CpItemDataHelper@@QAEPAVHbWidget@@ABVQModelIndex@@@Z @ 140 NONAME ; class HbWidget * CpItemDataHelper::widgetFromModelIndex(class QModelIndex const &)
+ ?load@LogOutput@@QAE_NAAVQSettings@@@Z @ 141 NONAME ; bool LogOutput::load(class QSettings &)
--- a/controlpanel/src/bwins/cpprofilewrapperu.def Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-EXPORTS
- ?ringVolume@CpProfileModel@@QAEHXZ @ 1 NONAME ; int CpProfileModel::ringVolume(void)
- ??1CpProfileModel@@QAE@XZ @ 2 NONAME ; CpProfileModel::~CpProfileModel(void)
- ?setScreenVibra@CpProfileModel@@QAEXH@Z @ 3 NONAME ; void CpProfileModel::setScreenVibra(int)
- ?setScreenVolume@CpProfileModel@@QAEXH@Z @ 4 NONAME ; void CpProfileModel::setScreenVolume(int)
- ?screenVolume@CpProfileModel@@QAEHXZ @ 5 NONAME ; int CpProfileModel::screenVolume(void)
- ?keyVolume@CpProfileModel@@QAEHXZ @ 6 NONAME ; int CpProfileModel::keyVolume(void)
- ?setVibraStatus@CpProfileModel@@QAEX_N@Z @ 7 NONAME ; void CpProfileModel::setVibraStatus(bool)
- ?setRingTone@CpProfileModel@@QAEXABVQString@@@Z @ 8 NONAME ; void CpProfileModel::setRingTone(class QString const &)
- ?vibraStatus@CpProfileModel@@QAE_NXZ @ 9 NONAME ; bool CpProfileModel::vibraStatus(void)
- ?setKeyVolume@CpProfileModel@@QAEXH@Z @ 10 NONAME ; void CpProfileModel::setKeyVolume(int)
- ?activateSilent@CpProfileModel@@QAEXXZ @ 11 NONAME ; void CpProfileModel::activateSilent(void)
- ?ringTone@CpProfileModel@@QAE?AVQString@@XZ @ 12 NONAME ; class QString CpProfileModel::ringTone(void)
- ?activateBeep@CpProfileModel@@QAEXXZ @ 13 NONAME ; void CpProfileModel::activateBeep(void)
- ?setRingVolume@CpProfileModel@@QAEXH@Z @ 14 NONAME ; void CpProfileModel::setRingVolume(int)
- ?initiationFlag@CpProfileModel@@QAEHXZ @ 15 NONAME ; int CpProfileModel::initiationFlag(void)
- ?isBeep@CpProfileModel@@QAE_NXZ @ 16 NONAME ; bool CpProfileModel::isBeep(void)
- ??0CpProfileModel@@QAE@XZ @ 17 NONAME ; CpProfileModel::CpProfileModel(void)
- ?screenVibra@CpProfileModel@@QAEHXZ @ 18 NONAME ; int CpProfileModel::screenVibra(void)
- ?isSilent@CpProfileModel@@QAE_NXZ @ 19 NONAME ; bool CpProfileModel::isSilent(void)
-
--- a/controlpanel/src/bwins/seccodeuiu.def Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-EXPORTS
- ?qt_metacall@SecCodeSettings@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1 NONAME ; int SecCodeSettings::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?canSetModelIndex@SecCodeEditDataFormViewItem@@UBE_NABVQModelIndex@@@Z @ 2 NONAME ; bool SecCodeEditDataFormViewItem::canSetModelIndex(class QModelIndex const &) const
- ?qt_metacast@SecCodeEditDataFormViewItem@@UAEPAXPBD@Z @ 3 NONAME ; void * SecCodeEditDataFormViewItem::qt_metacast(char const *)
- ?staticMetaObject@SecCodeEditDataFormViewItem@@2UQMetaObject@@B @ 4 NONAME ; struct QMetaObject const SecCodeEditDataFormViewItem::staticMetaObject
- ??0SecCodeSettings@@QAE@PAVQObject@@@Z @ 5 NONAME ; SecCodeSettings::SecCodeSettings(class QObject *)
- ?tr@SecCodeEditDataFormViewItem@@SA?AVQString@@PBD0H@Z @ 6 NONAME ; class QString SecCodeEditDataFormViewItem::tr(char const *, char const *, int)
- ??_ESecCodeEditDataFormViewItem@@UAE@I@Z @ 7 NONAME ; SecCodeEditDataFormViewItem::~SecCodeEditDataFormViewItem(unsigned int)
- ?pinCodeRequest@SecCodeSettings@@QBE_NXZ @ 8 NONAME ; bool SecCodeSettings::pinCodeRequest(void) const
- ?metaObject@SecCodeSettings@@UBEPBUQMetaObject@@XZ @ 9 NONAME ; struct QMetaObject const * SecCodeSettings::metaObject(void) const
- ?createItem@SecCodeEditDataFormViewItem@@UAEPAVHbAbstractViewItem@@XZ @ 10 NONAME ; class HbAbstractViewItem * SecCodeEditDataFormViewItem::createItem(void)
- ?trUtf8@SecCodeEditDataFormViewItem@@SA?AVQString@@PBD0@Z @ 11 NONAME ; class QString SecCodeEditDataFormViewItem::trUtf8(char const *, char const *)
- ??_ESecCodeSettings@@UAE@I@Z @ 12 NONAME ; SecCodeSettings::~SecCodeSettings(unsigned int)
- ?qt_metacall@SecCodeEditDataFormViewItem@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13 NONAME ; int SecCodeEditDataFormViewItem::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?changePin2Code@SecCodeSettings@@QAEXXZ @ 14 NONAME ; void SecCodeSettings::changePin2Code(void)
- ?trUtf8@SecCodeSettings@@SA?AVQString@@PBD0@Z @ 15 NONAME ; class QString SecCodeSettings::trUtf8(char const *, char const *)
- ?tr@SecCodeSettings@@SA?AVQString@@PBD0H@Z @ 16 NONAME ; class QString SecCodeSettings::tr(char const *, char const *, int)
- ?staticMetaObject@SecCodeSettings@@2UQMetaObject@@B @ 17 NONAME ; struct QMetaObject const SecCodeSettings::staticMetaObject
- ?setPinCodeRequest@SecCodeSettings@@QAEX_N@Z @ 18 NONAME ; void SecCodeSettings::setPinCodeRequest(bool)
- ?qt_metacast@SecCodeSettings@@UAEPAXPBD@Z @ 19 NONAME ; void * SecCodeSettings::qt_metacast(char const *)
- ?tr@SecCodeSettings@@SA?AVQString@@PBD0@Z @ 20 NONAME ; class QString SecCodeSettings::tr(char const *, char const *)
- ??1SecCodeSettings@@UAE@XZ @ 21 NONAME ; SecCodeSettings::~SecCodeSettings(void)
- ?getStaticMetaObject@SecCodeSettings@@SAABUQMetaObject@@XZ @ 22 NONAME ; struct QMetaObject const & SecCodeSettings::getStaticMetaObject(void)
- ?createCustomWidget@SecCodeEditDataFormViewItem@@MAEPAVHbWidget@@XZ @ 23 NONAME ; class HbWidget * SecCodeEditDataFormViewItem::createCustomWidget(void)
- ?trUtf8@SecCodeSettings@@SA?AVQString@@PBD0H@Z @ 24 NONAME ; class QString SecCodeSettings::trUtf8(char const *, char const *, int)
- ?changePinCode@SecCodeSettings@@QAEXXZ @ 25 NONAME ; void SecCodeSettings::changePinCode(void)
- ?tr@SecCodeEditDataFormViewItem@@SA?AVQString@@PBD0@Z @ 26 NONAME ; class QString SecCodeEditDataFormViewItem::tr(char const *, char const *)
- ?getStaticMetaObject@SecCodeEditDataFormViewItem@@SAABUQMetaObject@@XZ @ 27 NONAME ; struct QMetaObject const & SecCodeEditDataFormViewItem::getStaticMetaObject(void)
- ??1SecCodeEditDataFormViewItem@@UAE@XZ @ 28 NONAME ; SecCodeEditDataFormViewItem::~SecCodeEditDataFormViewItem(void)
- ?metaObject@SecCodeEditDataFormViewItem@@UBEPBUQMetaObject@@XZ @ 29 NONAME ; struct QMetaObject const * SecCodeEditDataFormViewItem::metaObject(void) const
- ?trUtf8@SecCodeEditDataFormViewItem@@SA?AVQString@@PBD0H@Z @ 30 NONAME ; class QString SecCodeEditDataFormViewItem::trUtf8(char const *, char const *, int)
- ??0SecCodeEditDataFormViewItem@@QAE@PAVQGraphicsItem@@@Z @ 31 NONAME ; SecCodeEditDataFormViewItem::SecCodeEditDataFormViewItem(class QGraphicsItem *)
-
--- a/controlpanel/src/common.pri Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/common.pri Thu Apr 01 03:23:37 2010 +0800
@@ -49,12 +49,11 @@
#For some reason the default include path doesn't include MOC_DIR on symbian
symbian {
INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+ INCLUDEPATH += $$MW_LAYER_PLATFORM_EXPORT_PATH(cplogger)
INCLUDEPATH += $$MOC_DIR
TARGET.CAPABILITY = ALL -TCB
TARGET.EPOCALLOWDLLDATA = 1
}
-
-INCLUDEPATH += $$PWD/inc
win32 {
# add platfrom API for windows
INCLUDEPATH += $$PWD/../controlpanel_plat/inc
--- a/controlpanel/src/cpapplication/controlpanel.ts Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="3.0" sourcelanguage="en_GB">
-<context>
-<message id="txt_cp_title_control_panel">
- <comment>This is the view title, shown in all Control Panel views.</comment>
- <source>Control Panel</source>
- <translation type="unfinished"></translation>
- <extra-loc-layout_id></extra-loc-layout_id>
- <extra-loc-viewid>CP_01</extra-loc-viewid>
- <extra-loc-positionid>title</extra-loc-positionid>
- <extra-loc-feature>CP</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-</context>
-</TS>
--- a/controlpanel/src/cpapplication/cpapplication.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# 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: cpapplication source files
-#
-
-HEADERS += src/cpmainview.h \
- src/cpmainmodel.h
-
-SOURCES += src/main.cpp \
- src/cpmainview.cpp \
- src/cpmainmodel.cpp
\ No newline at end of file
--- a/controlpanel/src/cpapplication/cpapplication.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = app
-TARGET = ControlPanel
-
-include ( ../common.pri )
-include ( cpapplication.pri )
-
-CONFIG += hb
-
-LIBS += -lcpframework
-
-TRANSLATIONS = controlpanel.ts
-
-symbian: {
- TARGET.UID3 = 0x20025FD9
- TARGET.EPOCHEAPSIZE = 0x020000 0x1000000
-
- deploy.path = C:
- headers.sources += data/mainview.cpcfg
- headers.path = /resource/qt/plugins/controlpanel/config
- DEPLOYMENT += exportheaders
-
- for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$deploy.path$$headers.path/$$basename(header)"
-}
\ No newline at end of file
--- a/controlpanel/src/cpapplication/data/mainview.cpcfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-
-<childplugins>
-
- <plugin displayname = "Personalization" id = "0X20025FE5" dll = "cppersonalizationplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Look & feel" id = "0X20025FE0" dll = "cplookfeelplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Communication" id = "0X20025FDF" dll = "cpcommunicationplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Accounts" id = "0x2feed8de" dll = "cpaccountsplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Application settings" id = "0x20025FDC" dll = "cpapplicationsettingsplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Privacy" id = "0x20025FE1" dll = "cpprivacyplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Device" id = "0X20025FE7" dll = "cpdeviceplugin.dll">
- <desc></desc>
- </plugin>
-
-
-
-
-</childplugins>
\ No newline at end of file
--- a/controlpanel/src/cpapplication/src/cpmainmodel.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "cpmainmodel.h"
-#include <cpitemdatahelper.h>
-
-CpMainModel::CpMainModel() :
- CpCategorySettingFormModel(QString("mainview.cpcfg")),
- mItemDataHelper (new CpItemDataHelper())
-
-{
- initialize(*mItemDataHelper);
-}
-
-CpMainModel::~CpMainModel()
-{
- delete mItemDataHelper;
-}
-
-const CpItemDataHelper *CpMainModel::itemDataHelper() const
-{
- return mItemDataHelper;
-}
-
-//End of file
--- a/controlpanel/src/cpapplication/src/cpmainmodel.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* 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:
-*
-*/
-#ifndef CP_MAIN_MODEL_H
-#define CP_MAIN_MODEL_H
-
-#include <cpcategorysettingformmodel.h>
-
-
-class CpItemDataHelper;
-
-class CpMainModel : public CpCategorySettingFormModel
-{
- Q_OBJECT
-public:
- CpMainModel();
- virtual ~CpMainModel();
- const CpItemDataHelper *itemDataHelper() const;
-private:
- CpItemDataHelper *mItemDataHelper;
-};
-
-#endif
--- a/controlpanel/src/cpapplication/src/cpmainview.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "cpmainview.h"
-#include "cpmainmodel.h"
-#include <qlist>
-#include <hbdataform.h>
-#include <cpitemdatahelper.h>
-
-CpMainView::CpMainView(QGraphicsItem *parent /*= 0*/)
-: CpBaseSettingView(0,parent), mMainModel(0)
-{
- if (HbDataForm *form = settingForm()) {
- mMainModel = new CpMainModel;
- form->setModel(mMainModel);
-
- mMainModel->itemDataHelper()->bindToForm(form);
-
- connect(mMainModel->itemDataHelper(),
- SIGNAL(connectionAdded(HbDataFormModelItem*,QString,QObject *,QString)),
- this,
- SLOT(onConnectionAdded(HbDataFormModelItem*,QString,QObject *,QString)));
-
- connect(mMainModel->itemDataHelper(),
- SIGNAL(connectionRemoved(HbDataFormModelItem*,QString,QObject *,QString)),
- this,
- SLOT(onConnectionRemoved(HbDataFormModelItem*,QString,QObject *,QString)));
-
- connect(mMainModel->itemDataHelper(),
- SIGNAL(prototypeAdded(HbAbstractViewItem *)),
- this,
- SLOT(onPrototypeAdded(HbAbstractViewItem *)));
- }
- setTitle( QObject::tr("Control Panel") ); //should use qtTrId("txt_cp_title_control_panel")
-}
-
-CpMainView::~CpMainView()
-{
- delete mMainModel;
-}
-
-void CpMainView::onConnectionAdded(HbDataFormModelItem *item,
- const QString &signal,
- QObject *receiver,
- const QString &method)
-{
- if (HbDataForm *form = settingForm()) {
- form->addConnection(item,signal.toAscii(),receiver,method.toAscii());
- }
-}
-
-void CpMainView::onConnectionRemoved(HbDataFormModelItem *item,
- const QString &signal,
- QObject *receiver,
- const QString &method)
-{
- if (HbDataForm *form = settingForm()) {
- form->removeConnection(item,signal.toAscii(),receiver,method.toAscii());
- }
-}
-
-void CpMainView::onPrototypeAdded(HbAbstractViewItem *prototype)
-{
- if (HbDataForm *form = settingForm()) {
- QList<HbAbstractViewItem *> prototypes = form->itemPrototypes();
- prototypes.append(prototype);
- form->setItemPrototypes(prototypes);
- }
-}
-
-//
--- a/controlpanel/src/cpapplication/src/cpmainview.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* 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:
-*
-*/
-#ifndef CPMAINVIEW_H
-#define CPMAINVIEW_H
-
-#include <cpbasesettingview.h>
-
-class CpMainModel;
-class HbAbstractViewItem;
-class HbDataFormModelItem;
-
-class CpMainView : public CpBaseSettingView
-{
- Q_OBJECT
-public:
- explicit CpMainView(QGraphicsItem *parent = 0);
- virtual ~CpMainView();
-private slots:
- void onConnectionAdded(HbDataFormModelItem *item,\
- const QString &signal,
- QObject *receiver,
- const QString &method);
-
- void onConnectionRemoved(HbDataFormModelItem *item,
- const QString &signal,
- QObject *receiver,
- const QString &method);
-
- void onPrototypeAdded(HbAbstractViewItem *prototype);
-private:
- Q_DISABLE_COPY(CpMainView)
-private:
- CpMainModel *mMainModel;
-};
-
-#endif
-//End of file
-
--- a/controlpanel/src/cpapplication/src/main.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include <hbapplication.h>
-#include <hbmainwindow.h>
-#include <QTranslator>
-#include "cpmainview.h"
-
-int main(int argc, char **argv)
-{
- HbApplication app(argc, argv);
-
- //used by QSettings
- QCoreApplication::setOrganizationName("nokia");
- QCoreApplication::setOrganizationDomain("Orbit");
- QCoreApplication::setApplicationName("ControlPanel");
-
- QTranslator translator;
- if (translator.load("controlpanel_" + QLocale::system().name()))
- {
- qApp->installTranslator(&translator);
- }
-
- HbMainWindow mainWindow;
- CpMainView *mainView = new CpMainView();
-#ifdef WIN32
- mainWindow.setOrientation(Qt::Vertical);
-#endif
- QObject::connect(mainView,SIGNAL(aboutToClose()),&app, SLOT(quit()));
- mainWindow.addView(mainView);
- mainWindow.show();
-
- return app.exec();
-}
-
-//
--- a/controlpanel/src/cpframework/cpframework.pri Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/cpframework.pri Thu Apr 01 03:23:37 2010 +0800
@@ -16,28 +16,21 @@
#
HEADERS += src/cpbasepath.h \
- src/cputility.h \
src/cpviewlauncher.h \
- src/cppluginloader.h \
- src/cppluginconfig.h \
- src/cppluginconfigreader.h \
src/cpbasesettingview_p.h \
src/cpwatchdog.h \
+ src/cputility.h \
src/cpdataformviewitem.h
- #src/cpitemdatahelper.h
-SOURCES += src/cputility.cpp \
- src/cppluginlauncher.cpp \
+SOURCES += src/cppluginlauncher.cpp \
src/cpviewlauncher.cpp \
src/cppluginloader.cpp \
- src/cppluginconfig.cpp \
- src/cppluginconfigreader.cpp \
src/cpsettingformentryitemdata.cpp \
src/cpsettingformitemdata.cpp \
- src/cpcategorysettingformmodel.cpp \
- src/cpcategorysettingformitemdata.cpp \
src/cpbasesettingview.cpp \
src/cpbasesettingview_p.cpp \
src/cpwatchdog.cpp \
src/cpdataformviewitem.cpp \
- src/cpitemdatahelper.cpp
+ src/cpitemdatahelper.cpp \
+ src/cputility.cpp \
+ src/cppluginutility.cpp
--- a/controlpanel/src/cpframework/cpframework.pro Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/cpframework.pro Thu Apr 01 03:23:37 2010 +0800
@@ -18,7 +18,7 @@
TARGET = cpframework
include ( ../common.pri )
-include ( ../inc/inc.pri )
+include ( ../logger/logger.pri)
include ( ./cpframework.pri )
include ( ../../controlpanel_plat/inc/controlpanel_plat.pri )
@@ -27,21 +27,25 @@
}
CONFIG += Hb xml
-DEFINES += BUILD_CP_FRAMEWORK
+DEFINES += BUILD_CP_FRAMEWORK BUILD_LOGGER_DLL
symbian: {
# export headers to mw
EXPORT_PLATFORM_HEADERS += \
../../controlpanel_plat/inc/cpglobal.h \
+ ../../controlpanel_plat/inc/cpplugininterface.h \
../../controlpanel_plat/inc/cppluginplatinterface.h \
+ ../../controlpanel_plat/inc/cppluginloader.h \
../../controlpanel_plat/inc/cppluginlauncher.h \
../../controlpanel_plat/inc/cpbasesettingview.h \
../../controlpanel_plat/inc/cpitemdatahelper.h \
../../controlpanel_plat/inc/cpsettingformitemdata.h \
../../controlpanel_plat/inc/cpsettingformentryitemdata.h \
- ../../controlpanel_plat/inc/cpsettingformentryitemdataimpl.h
+ ../../controlpanel_plat/inc/cpsettingformentryitemdataimpl.h \
+ ../../controlpanel_plat/inc/cppluginutility.h
headers.sources = $$EXPORT_PLATFORM_HEADERS
for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$MW_LAYER_PLATFORM_EXPORT_PATH($$basename(header))"
}
+include (../logger/logger_export.pri)
--- a/controlpanel/src/cpframework/src/cpbasesettingview.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpbasesettingview.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -30,10 +30,10 @@
/*!
Constructor of CpBaseSettingView.
*/
-CpBaseSettingView::CpBaseSettingView(HbDataForm *settingForm /*= 0*/,QGraphicsItem *parent /*= 0*/) :
+CpBaseSettingView::CpBaseSettingView(QGraphicsWidget *widget /*= 0*/,QGraphicsItem *parent /*= 0*/) :
HbView(parent),d_ptr(new CpBaseSettingViewPrivate())
{
- d_ptr->init(settingForm,this);
+ d_ptr->init(widget,this);
}
/*!
@@ -45,6 +45,8 @@
}
/*!
+ \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)
@@ -53,6 +55,8 @@
}
/*!
+ \deprecated HbDataForm *CpBaseSettingView::settingForm() const will be deprecated, please
+ use widget() const to instead.
Get the data form for the setting view.
*/
HbDataForm *CpBaseSettingView::settingForm() const
@@ -60,10 +64,4 @@
return qobject_cast<HbDataForm*>(widget());
}
-void CpBaseSettingView::setWidget(QGraphicsWidget *widget)
-{
- HbView::setWidget(widget);
-}
-
-
//
--- a/controlpanel/src/cpframework/src/cpbasesettingview_p.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpbasesettingview_p.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -22,10 +22,11 @@
#include <hbmainwindow.h>
#include <hbdataform.h>
#include <hbdataformmodel.h>
-#include <qgraphicslayout>
+#include <QGraphicsLayout>
#include "cpitemdatahelper.h"
#include "cpdataformviewitem.h"
#include "cpsettingformentryitemdata.h"
+#include "cppluginutility.h"
static HbMainWindow *mainWindow()
{
@@ -40,7 +41,7 @@
CpBaseSettingViewPrivate::CpBaseSettingViewPrivate() :
mBaseSettingView(0),
mSoftKeyBackAction(0),
- mSettingForm(0),
+ //mSettingForm(0),
mIsActiveView(false)
{
}
@@ -53,20 +54,17 @@
mSoftKeyBackAction = 0;
}
-void CpBaseSettingViewPrivate::init(HbDataForm *settingForm,CpBaseSettingView *baseSettingView)
+void CpBaseSettingViewPrivate::init(QGraphicsWidget *widget,CpBaseSettingView *baseSettingView)
{
mBaseSettingView = baseSettingView;
- if (!settingForm) {
- settingForm = new HbDataForm();
-
- QList<HbAbstractViewItem *> protoTypeList = settingForm->itemPrototypes();
- protoTypeList.append(new CpDataFormViewItem(CpSettingFormEntryItemData::EntryItem,
- mSettingForm));
- settingForm->setItemPrototypes(protoTypeList);
+ if (!widget) {
+ widget = new HbDataForm();
+ CpPluginUtility::addCpItemPrototype(qobject_cast<HbDataForm *>(widget));
}
- setSettingForm(settingForm);
+ //setSettingForm(settingForm);
+ mBaseSettingView->setWidget(widget);
mBaseSettingView->setTitle("Control Panel"); //give a default title, sub classes need set it correctly
@@ -88,14 +86,8 @@
void CpBaseSettingViewPrivate::setSettingForm(HbDataForm *settingForm)
{
- mSettingForm = settingForm;
- mBaseSettingView->setWidget(mSettingForm);
-
- QList<HbAbstractViewItem *> protoTypeList = settingForm->itemPrototypes();
- // add the control panel custom proto type to data form
- protoTypeList.append(new CpDataFormViewItem(CpSettingFormEntryItemData::EntryItem,
- mSettingForm));
- settingForm->setItemPrototypes(protoTypeList);
+ mBaseSettingView->setWidget(settingForm);
+ CpPluginUtility::addCpItemPrototype(settingForm);
}
void CpBaseSettingViewPrivate::setSoftkey()
--- a/controlpanel/src/cpframework/src/cpbasesettingview_p.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpbasesettingview_p.h Thu Apr 01 03:23:37 2010 +0800
@@ -28,6 +28,7 @@
class HbAbstractViewItem;
class CpItemDataHelper;
class CpItemDataHelper;
+class QGraphicsWidget;
class CpBaseSettingViewPrivate
{
@@ -37,7 +38,7 @@
/*
initialize
*/
- void init(HbDataForm *settingForm,CpBaseSettingView *baseSettingView);
+ void init(QGraphicsWidget *widget,CpBaseSettingView *baseSettingView);
void setSettingForm(HbDataForm *settingForm);
/*
--- a/controlpanel/src/cpframework/src/cpcategorysettingformitemdata.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* 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:
-*
-*/
-#include "cpcategorysettingformitemdata.h"
-#include <qstring>
-#include "cputility.h"
-
-class CpCategorySettingFormItemDataPrivate
-{
-public:
- CpCategorySettingFormItemDataPrivate(const QString &configFile) :
- mInitialized(false),
- mConfigFile(configFile)
- {
- }
-
- ~CpCategorySettingFormItemDataPrivate()
- {
- }
-
-public:
- bool mInitialized;
- QString mConfigFile;
-};
-
-
-CpCategorySettingFormItemData::CpCategorySettingFormItemData(
- HbDataFormModelItem::DataItemType type,
- const QString &label,
- const QString &configFile,
- const HbDataFormModelItem *parent /*= 0*/) :
- CpSettingFormItemData(type,label,parent),
- d(new CpCategorySettingFormItemDataPrivate(configFile))
-{
-}
-
-CpCategorySettingFormItemData::CpCategorySettingFormItemData(
- const QString &configFile /*= QString()*/,
- const HbDataFormModelItem *parent /*= 0*/) :
- CpSettingFormItemData(parent),
- d(new CpCategorySettingFormItemDataPrivate(configFile))
-{
-}
-
-CpCategorySettingFormItemData::~CpCategorySettingFormItemData()
-{
- delete d;
-}
-
-void CpCategorySettingFormItemData::initialize(CpItemDataHelper &itemDataHelper)
-{
- //avoid to be called twice
- if (!d->mInitialized) {
- //give derived class a change do their special things before loading config plugins
- beforeLoadingConfigPlugins(itemDataHelper);
- //load plugins which are configured
- CpUtility::buildConfigPluginItems(this,d->mConfigFile,itemDataHelper);
- //give derived class a change do their special things after loading config plugins
- afterLoadingConfigPlugins(itemDataHelper);
-
- d->mInitialized = true;
- }
-}
-
-
-void CpCategorySettingFormItemData::beforeLoadingConfigPlugins(CpItemDataHelper &/*itemDataHelper*/)
-{
-}
-
-void CpCategorySettingFormItemData::afterLoadingConfigPlugins(CpItemDataHelper &/*itemDataHelper*/)
-{
-}
-
--- a/controlpanel/src/cpframework/src/cpcategorysettingformmodel.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "cpcategorysettingformmodel.h"
-#include <qstring>
-
-#include "cputility.h"
-#include "cpitemDatahelper.h"
-
-class CpCategorySettingFormModelPrivate
-{
-public:
- CpCategorySettingFormModelPrivate(const QString &configFile) :
- mInitialized(false),
- mConfigFile(configFile)
- {
- }
-
- ~CpCategorySettingFormModelPrivate()
- {
- }
-
-public:
- bool mInitialized;
- QString mConfigFile;
-};
-
-CpCategorySettingFormModel::CpCategorySettingFormModel(const QString &configFile) :
- d (new CpCategorySettingFormModelPrivate(configFile))
-{
-}
-
-CpCategorySettingFormModel::~CpCategorySettingFormModel()
-{
- delete d;
-}
-
-void CpCategorySettingFormModel::initialize(CpItemDataHelper &itemDataHelper)
-{
- //avoid to be called twice
- if (!d->mInitialized) {
- //give derived class a change do their special things before loading config plugins
- beforeLoadingConfigPlugins(itemDataHelper);
- //load plugins which are configured
- CpUtility::buildConfigPluginItems(invisibleRootItem(),d->mConfigFile,itemDataHelper);
- //give derived class a change do their special things after loading config plugins
- afterLoadingConfigPlugins(itemDataHelper);
-
- d->mInitialized = true;
- }
-}
-
-
-void CpCategorySettingFormModel::beforeLoadingConfigPlugins(CpItemDataHelper&/*itemDataHelper*/)
-{
-}
-
-void CpCategorySettingFormModel::afterLoadingConfigPlugins(CpItemDataHelper &/*itemDataHelper*/)
-{
-}
--- a/controlpanel/src/cpframework/src/cpdataformviewitem.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpdataformviewitem.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,49 +19,69 @@
#include <hbpushbutton.h>
#include <hbdataformmodel.h>
#include <hbabstractitemview.h>
-#include <qmetaproperty>
-
+#include <QMetaProperty>
+/*!
+ \class CpDataFormViewItem
+ \brief The CpDataFormViewItem is a item proto type of HbDataForm which is supplied by control panel.
+ When you want use setting items which are come from control panel, you should append this class to the proto type list of your data form's instance.
+ Code example:
+ \code
+ HbDataForm *form = new HbDataForm();
+ QList<HbAbstractViewItem *> protoType = form->itemProtoTypetypes();
+ protoType.append(CpDataFormViewItem::createCpItemProtoType());
+ form->setItemPrototypes();
+ \endcode
+*/
class CpDataFormViewItemPrivate
{
public:
- CpDataFormViewItemPrivate() : mCustomId(0), mWidget(0)
+ CpDataFormViewItemPrivate() : mWidget(0)
{
}
~CpDataFormViewItemPrivate()
{
}
- void init(int customId)
- {
- mCustomId = customId;
- }
private:
- int mCustomId;
HbWidget *mWidget;
friend class CpDataFormViewItem;
};
-CpDataFormViewItem::CpDataFormViewItem(int customId, QGraphicsItem *parent)
+/*!
+ Constructor
+ */
+CpDataFormViewItem::CpDataFormViewItem(QGraphicsItem *parent)
: HbDataFormViewItem(parent),d_ptr(new CpDataFormViewItemPrivate())
{
- d_ptr->init(customId);
}
+/*!
+ Destructor of CpDataFormViewItem
+ */
CpDataFormViewItem::~CpDataFormViewItem()
{
delete d_ptr;
}
-HbAbstractViewItem* CpDataFormViewItem::createItem()
+/*!
+ Creates CpDataFormViewItem. This function is called form HbAbstractItemContainer when model is getting parsed for creating items.
+ */
+HbAbstractViewItem *CpDataFormViewItem::createItem()
{
return new CpDataFormViewItem(*this);
}
+/*!
+ Copy constructor of CpDataFormViewItem
+ */
CpDataFormViewItem::CpDataFormViewItem(const CpDataFormViewItem &other)
: HbDataFormViewItem(other), d_ptr(new CpDataFormViewItemPrivate(*other.d_ptr))
{
}
+/*!
+ Assignment operator
+ */
CpDataFormViewItem &CpDataFormViewItem::operator=(const CpDataFormViewItem &other)
{
if (&other == this) {
@@ -71,31 +91,39 @@
*d_ptr = *(other.d_ptr);
return *this;
}
-
+/*!
+ Inherit from HbAbstractViewItem, return true if the model item can be supported by CpDataFormViewItem.
+ */
bool CpDataFormViewItem::canSetModelIndex(const QModelIndex &index) const
{
int itemTypeId = index.data(HbDataFormModelItem::ItemTypeRole).toInt();
- // currently one proto type only can set one widget
- return (itemTypeId == d_ptr->mCustomId);
+ return (itemTypeId == HbDataFormModelItem::CustomItemBase+1);
}
-
-HbWidget* CpDataFormViewItem::createCustomWidget()
+/*!
+ Inherit from HbDataFormViewItem, return the setting item's widget of control panel
+ */
+HbWidget *CpDataFormViewItem::createCustomWidget()
{
HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
- if (itemType == d_ptr->mCustomId) {
+ if (itemType == HbDataFormModelItem::CustomItemBase+1) {
HbPushButton *button = new HbPushButton(QString("Push button"));
d_ptr->mWidget = button;
button->setMinimumHeight(50);
button->setMaximumHeight(60);
button->setOrientation(Qt::Horizontal);
+ button->setTextAlignment( Qt::AlignLeft );
return button;
}
return 0;
}
-
+/*!
+ 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.
+ */
void CpDataFormViewItem::load()
{
HbDataFormViewItem::load();
@@ -104,7 +132,7 @@
HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
- if(itemType == d_ptr->mCustomId) {
+ if(itemType == HbDataFormModelItem::CustomItemBase+1) {
QModelIndex itemIndex = modelIndex();
HbDataFormModel *model = static_cast<HbDataFormModel*>(itemView()->model());;
--- a/controlpanel/src/cpframework/src/cpdataformviewitem.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpdataformviewitem.h Thu Apr 01 03:23:37 2010 +0800
@@ -18,22 +18,22 @@
#define CP_DATAFORMVIEWITEM_H
#include <hbdataformviewitem.h>
-
+#include <cpglobal.h>
class CpDataFormViewItemPrivate;
-class CpDataFormViewItem : public HbDataFormViewItem
+class CP_EXPORT CpDataFormViewItem : public HbDataFormViewItem
{
Q_OBJECT
public:
- explicit CpDataFormViewItem(int customId, QGraphicsItem *parent = 0);
+ explicit CpDataFormViewItem(QGraphicsItem *parent = 0);
~CpDataFormViewItem();
- virtual HbAbstractViewItem* createItem();
+ virtual HbAbstractViewItem *createItem();
virtual bool canSetModelIndex(const QModelIndex &index) const;
public slots:
virtual void load();
protected:
CpDataFormViewItem(const CpDataFormViewItem &ohter);
CpDataFormViewItem &operator=(const CpDataFormViewItem &ohter);
- virtual HbWidget* createCustomWidget();
+ virtual HbWidget *createCustomWidget();
private:
CpDataFormViewItemPrivate *d_ptr;
friend class CpDataFormViewItemPrivate;
--- a/controlpanel/src/cpframework/src/cpitemdatahelper.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpitemdatahelper.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -15,34 +15,64 @@
*
*/
#include "cpitemdatahelper.h"
-#include <qvector>
-#include <qlist>
+#include <QList>
#include <hbdataform.h>
#include <hbdataformmodelitem.h>
+#include <hbdataformviewitem.h>
+
class CpItemDataHelperPrivate
{
public:
- class ItemConnection
- {
- public:
- ItemConnection() : item(0),receiver(0)
- {
- }
+ class ItemConnection
+ {
+ public:
+ ItemConnection(HbDataFormModelItem *item,
+ const char *signal,
+ QObject *receiver,
+ const char *method) :
+ mItem(item),mSignal(signal),
+ mReceiver(receiver),mMethod(method)
+ {
+ }
+
+ bool operator == (const ItemConnection &other)
+ {
+ return mItem == other.mItem &&
+ mSignal == other.mSignal &&
+ mReceiver == other.mReceiver &&
+ mMethod == other.mMethod;
+ }
- bool operator == (const ItemConnection &other)
- {
- return item == other.item && signal == other.signal
- && receiver == other.receiver && method == other.method;
- }
+ HbDataFormModelItem *mItem;
+ QString mSignal;
+ QObject *mReceiver;
+ QString mMethod;
+ };
- HbDataFormModelItem *item;
- QString signal;
- QObject *receiver;
- QString method;
- };
+ class FormConnection
+ {
+ public:
+ FormConnection(const char *signal,
+ QObject *receiver,
+ const char *method) :
+ mSignal(signal),mReceiver(receiver),mMethod(method)
+ {
+ }
- CpItemDataHelperPrivate()
+ bool operator == (const FormConnection &other)
+ {
+ return mSignal == other.mSignal &&
+ mReceiver == other.mReceiver &&
+ mMethod == other.mMethod;
+ }
+ QString mSignal;
+ QObject *mReceiver;
+ QString mMethod;
+ };
+
+ CpItemDataHelperPrivate(HbDataForm *form /*= 0*/)
+ : mDataForm(form)
{
}
@@ -51,53 +81,109 @@
}
void addConnection(HbDataFormModelItem *item,
- const QString &signal,
+ const char *signal,
QObject *receiver,
- const QString &method)
+ const char *method)
{
- ItemConnection connection;
- connection.item = item;
- connection.signal = signal;
- connection.receiver = receiver;
- connection.method = method;
- mConnections.append(connection);
+ if (mDataForm) {
+ mDataForm->addConnection(item,signal,receiver,method);
+ }
+ else {
+ mItemConnections.append(ItemConnection(item,signal,receiver,method));
+ }
}
void removeConnection(HbDataFormModelItem *item,
- const QString &signal,
+ const char *signal,
QObject *receiver,
- const QString &method)
+ const char *method)
{
- ItemConnection connection;
- connection.item = item;
- connection.signal = signal;
- connection.receiver = receiver;
- connection.method = method;
- int index = mConnections.indexOf(connection);
- if (index >= 0) {
- mConnections.remove(index);
- }
+ if (mDataForm) {
+ mDataForm->removeConnection(item,signal,receiver,method);
+ }
+ else {
+ mItemConnections.removeAll(ItemConnection(item,signal,receiver,method));
+ }
}
- void addItemPrototype(HbAbstractViewItem *prototype)
+ void connectToForm(const char *signal,
+ QObject *receiver,
+ const char *method)
+ {
+ if (mDataForm) {
+ QObject::connect(mDataForm,signal,receiver,method);
+ }
+ else {
+ mFormConnections.append(FormConnection(signal,receiver,method));
+ }
+ }
+
+ void disconnectFromForm(const char *signal,
+ QObject *receiver,
+ const char *method)
+ {
+ if (mDataForm) {
+ QObject::disconnect(mDataForm,signal,receiver,method);
+ }
+ else {
+ mFormConnections.removeAll(FormConnection(signal,receiver,method));
+ }
+ }
+
+ void addItemPrototype(HbAbstractViewItem *prototype)
+ {
+ if (prototype) {
+ if (mDataForm) {
+ QList<HbAbstractViewItem *> protoTypeList = mDataForm->itemPrototypes();
+ protoTypeList.append(prototype);
+ mDataForm->setItemPrototypes(protoTypeList);
+ }
+ else {
+ mItemPrototypes.append(prototype);
+ }
+ }
+ }
+
+ void bindToForm(HbDataForm *form)
{
- mItemPrototypes.append(prototype);
+ mDataForm = form;
+
+ if (mDataForm) {
+ foreach(const ItemConnection &connection,mItemConnections) {
+ mDataForm->addConnection(connection.mItem,connection.mSignal.toAscii(),
+ connection.mReceiver,connection.mMethod.toAscii());
+ }
+ mItemConnections.clear();
+
+ foreach(const FormConnection &connection,mFormConnections) {
+ QObject::connect(mDataForm,connection.mSignal.toAscii(),
+ connection.mReceiver,connection.mMethod.toAscii());
+ }
+ mFormConnections.clear();
+
+ if (!mItemPrototypes.isEmpty()) {
+ QList<HbAbstractViewItem *> protoTypeList = mDataForm->itemPrototypes();
+ protoTypeList.append(mItemPrototypes);
+ mDataForm->setItemPrototypes(protoTypeList);
+ }
+ mItemPrototypes.clear();
+ }
}
- void bindToForm(HbDataForm *form) const
- {
- foreach(const ItemConnection &connection,mConnections) {
- form->addConnection(connection.item,connection.signal.toAscii(),
- connection.receiver,connection.method.toAscii());
- }
- QList<HbAbstractViewItem *> protoTypeList = form->itemPrototypes();
- protoTypeList.append(mItemPrototypes);
- form->setItemPrototypes(protoTypeList);
- }
+ HbWidget *widgetFromModelIndex(const QModelIndex &index)
+ {
+ if (mDataForm) {
+ HbDataFormViewItem *viewItem = mDataForm->dataFormViewItem(index);
+ return viewItem->dataItemContentWidget();
+ }
+ return 0;
+ }
public:
- QVector<ItemConnection> mConnections;
- QList<HbAbstractViewItem *> mItemPrototypes;
+ HbDataForm *mDataForm;
+ QList<ItemConnection> mItemConnections;
+ QList<FormConnection> mFormConnections;
+ QList<HbAbstractViewItem*> mItemPrototypes;
};
@@ -111,8 +197,8 @@
/*!
Constructor of CpItemDataHelper.
*/
-CpItemDataHelper::CpItemDataHelper()
-: d(new CpItemDataHelperPrivate())
+CpItemDataHelper::CpItemDataHelper(HbDataForm *form/* = 0*/)
+: d(new CpItemDataHelperPrivate(form))
{
}
@@ -129,41 +215,66 @@
Connect a slot to inner widget's signal of setting item.
*/
void CpItemDataHelper::addConnection(HbDataFormModelItem *item,
- const QString &signal,
+ const char *signal,
QObject *receiver,
- const QString &method)
+ const char *method)
{
d->addConnection(item,signal,receiver,method);
- emit connectionAdded(item,signal,receiver,method);
}
/*!
Disconnect a slot to inner widget's signal of setting item.
*/
void CpItemDataHelper::removeConnection(HbDataFormModelItem *item,
- const QString &signal,
+ const char *signal,
QObject *receiver,
- const QString &method)
+ const char *method)
{
d->removeConnection(item,signal,receiver,method);
- emit connectionRemoved(item,signal,receiver,method);
+}
+
+/*!
+ Connect slot to data form.
+*/
+void CpItemDataHelper::connectToForm(const char *signal,
+ QObject *receiver,
+ const char *method)
+{
+ d->connectToForm(signal,receiver,method);
}
/*!
+ Disconnect slot from data form.
+*/
+void CpItemDataHelper::disconnectFromForm(const char *signal,
+ QObject *receiver,
+ const char *method)
+{
+ d->disconnectFromForm(signal,receiver,method);
+}
+
+
+/*!
Add a prototype to data form, to create custom widget for a custom setting item.
*/
void CpItemDataHelper::addItemPrototype(HbAbstractViewItem *prototype)
{
d->addItemPrototype(prototype);
- emit prototypeAdded(prototype);
}
/*!
Bind the connections and prototypes to a data form.
*/
-void CpItemDataHelper::bindToForm(HbDataForm *form) const
+void CpItemDataHelper::bindToForm(HbDataForm *form)
{
d->bindToForm(form);
}
+/*
+ Get the HbWidget instance from data form.
+*/
+HbWidget *CpItemDataHelper::widgetFromModelIndex(const QModelIndex &index)
+{
+ return d->widgetFromModelIndex(index);
+}
--- a/controlpanel/src/cpframework/src/cppluginconfig.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "cppluginconfig.h"
-#include "cplogger.h"
-
-CpPluginConfig::CpPluginConfig() :
- mUid(0),
- mDisplayName(QString()),
- mPluginFile(QString()),
- mDescription(QString())
-{
-
-}
-
-void CpPluginConfig::dump()
-{
- CpLogger logger;
-
- logger << "id = " << QString("0x%1").arg(mUid,0,16) << "\r\n";
- logger << "diplayname = " << mDisplayName << "\r\n";
- logger << "dll = " << mPluginFile << "\r\n";
- logger << "desc = " << mDescription << "\r\n";
- logger << "\r\n";
-}
--- a/controlpanel/src/cpframework/src/cppluginconfig.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef CPPLUGINCONFIG_H
-#define CPPLUGINCONFIG_H
-
-#include <qstring.h>
-
-class CpPluginConfig
-{
-public:
- CpPluginConfig();
- void dump();
-public:
- int mUid;
- QString mDisplayName;
- QString mPluginFile;
- QString mDescription;
-};
-
-#endif /* CPPLUGINCONFIG_H */
--- a/controlpanel/src/cpframework/src/cppluginconfigreader.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "cppluginconfigreader.h"
-#include <qfile.h>
-#include <qxmlstreamreader>
-#include <cplogger.h>
-
-const QString CHILD_PLUGINS_TAG = "childplugins";
-const QString PLUGIN_TAG = "plugin";
-const QString PLUGIN_ID_ATTR = "id";
-const QString PLUGIN_DLL_ATTR = "dll";
-const QString PLUGIN_DISPALYNAME_ATTR = "displayname";
-const QString DESC_TAG = "desc";
-
-CpPluginConfigReader::CpPluginConfigReader(const QString &configPath)
-: mConfigPath (configPath)
-{
-}
-
-CpPluginConfigReader::~CpPluginConfigReader()
-{
-}
-
-QList<CpPluginConfig> CpPluginConfigReader::readCpPluginConfigs()
-{
- CpLogger logger;
-
- logger << "reading cpcfg file:" << mConfigPath << "\r\n";
-
- if (mConfigPath.isNull() || mConfigPath.isEmpty()) {
- logger << "CpPluginConfigReader::readCpPluginConfigs() mConfigPath is empty.\r\n";
- return QList<CpPluginConfig> ();
- }
-
- QFile file(mConfigPath);
-
- if (!file.exists()) {
- logger << mConfigPath << " does not exist.\r\n";
- return QList<CpPluginConfig> ();
- }
-
- if (!file.open(QFile::ReadOnly | QFile::Text)) {
- logger << "CpPluginConfigReader::readCpPluginConfigs() open file failed. Error:"
- << static_cast<int>(file.error()) << "\r\n";
- return QList<CpPluginConfig> ();
- }
-
- QXmlStreamReader reader(&file);
-
- QList<CpPluginConfig> cpPluginConfigList;
-
- readCpPluginConfigs(reader, cpPluginConfigList);
-
- file.close();
-
- return cpPluginConfigList;
-}
-
-void CpPluginConfigReader::readCpPluginConfigs(QXmlStreamReader &xmlReader,QList<CpPluginConfig> &cpPluginConfigList)
-{
- xmlReader.readNext();
-
- while (!xmlReader.atEnd()) {
-
- if (xmlReader.isStartElement()) {
- if (xmlReader.name() == CHILD_PLUGINS_TAG) {
- readChildPluginsElement(xmlReader, cpPluginConfigList);
- }
- else {
- xmlReader.raiseError("Not a valid file with the right format.");
- }
- }
-
- else {
- xmlReader.readNext();
- }
- }
-}
-
-void CpPluginConfigReader::readChildPluginsElement(QXmlStreamReader &xmlReader,QList<CpPluginConfig> &cpPluginConfigList)
-{
- xmlReader.readNext();
-
- while (!xmlReader.atEnd()) {
-
- if (xmlReader.isEndElement()) {
- xmlReader.readNext();
- break;
- }
-
- if (xmlReader.isStartElement()) {
- if (xmlReader.name() == PLUGIN_TAG) {
- readPluginElement(xmlReader, cpPluginConfigList);
- }
- else {
- skipUnknownElement(xmlReader);
- }
- }
-
- else {
- xmlReader.readNext();
- }
- }
-}
-
-void CpPluginConfigReader::readPluginElement(QXmlStreamReader &xmlReader,QList<CpPluginConfig> &cpPluginConfigList)
-{
- CpPluginConfig cpPluginConfig;
-
- QXmlStreamAttributes xmlAttributes = xmlReader.attributes();
-
- if (xmlAttributes.hasAttribute(PLUGIN_ID_ATTR)) {
- cpPluginConfig.mUid
- = (xmlAttributes.value(PLUGIN_ID_ATTR)).toString().toUInt(0,16);
- }
-
- if (xmlAttributes.hasAttribute(PLUGIN_DLL_ATTR)) {
- cpPluginConfig.mPluginFile
- = (xmlAttributes.value(PLUGIN_DLL_ATTR)).toString();
- }
-
- if (xmlAttributes.hasAttribute(PLUGIN_DISPALYNAME_ATTR)) {
- cpPluginConfig.mDisplayName
- = (xmlAttributes.value(PLUGIN_DISPALYNAME_ATTR)).toString();
- }
-
- readDescElement(xmlReader,cpPluginConfig);
-
- cpPluginConfig.dump();
-
- cpPluginConfigList.append(cpPluginConfig);
-}
-
-void CpPluginConfigReader::readDescElement(QXmlStreamReader &xmlReader,CpPluginConfig &cpPluginConfig)
-{
- xmlReader.readNext();
-
- while (!xmlReader.atEnd()) {
-
- if (xmlReader.isEndElement()) {
- xmlReader.readNext();
- break;
- }
-
- if (xmlReader.isStartElement()) {
- if (xmlReader.name() == DESC_TAG) {
- cpPluginConfig.mDescription = xmlReader.readElementText();
- if (xmlReader.isEndElement()) {
- xmlReader.readNext();
- }
- }
- }
-
- else {
- xmlReader.readNext();
- }
- }
-}
-
-void CpPluginConfigReader::skipUnknownElement(QXmlStreamReader &xmlReader)
-{
- xmlReader.readNext();
-
- while (!xmlReader.atEnd()) {
-
- if (xmlReader.isEndElement()) {
- xmlReader.readNext();
- break;
- }
-
- if (xmlReader.isStartElement()) {
- skipUnknownElement(xmlReader);
- }
- else {
- xmlReader.readNext();
- }
- }
-}
--- a/controlpanel/src/cpframework/src/cppluginconfigreader.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* 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:
-*
-*/
-
-/* configuration format:
-
- <childplugins>
- <plugin displayname = "Personalization" id = "0xE195181a" dll = "cppersonaliztionplugin.dll" icon = "Personalization.svg" advanced = "0">
- <desc>This is Personalization</desc>
- </plugin>
- <plugin displayname = "Communication" id = "0xE195181b" dll = "cpcommunicationplugin.dll" icon = "Communication.svg" advanced = "0">
- <desc>This is Communication</desc>
- </plugin>
- <plugin displayname = "Application settings" id = "0xE195181c" dll = "cpapplicationsettingsplugin.dll" icon = "Application settings.svg" advanced = "">
- <desc>This is Application settings</desc>
- </plugin>
- <plugin displayname = "Device" id = "0xE195181d" dll = "cpdeviceplugin.dll" icon = "Device.svg" advanced = "1">
- <desc>This is Device</desc>
- </plugin>
- </childplugins>
-*/
-
-/* Usage:
-
- const QString file("\\resource\\qt\\plugins\\controlpanel\\config\\applicationsettingsplugin.cpcfg");
-
- CpPluginConfigReader cfgReader(file);
- QList<CpPluginConfig> cfgList = cfgReader.readCpPluginConfigs();
-
- foreach (CpPluginConfig cfg, cfgList)
- {
- cfg.dump();
- }
-*/
-
-#ifndef CPPLUGINCONFIGREADER_H
-#define CPPLUGINCONFIGREADER_H
-
-#include <qstring>
-#include <qlist>
-#include "cppluginconfig.h"
-
-class QXmlStreamReader;
-
-class CpPluginConfigReader
-{
-public:
- explicit CpPluginConfigReader(const QString &configPath);
- ~CpPluginConfigReader();
-
- QList<CpPluginConfig> readCpPluginConfigs();
-
-private:
- void readCpPluginConfigs(QXmlStreamReader &xmlReader,
- QList<CpPluginConfig> &cpPluginConfigList);
- void readChildPluginsElement(QXmlStreamReader &xmlReader,
- QList<CpPluginConfig> &cpPluginConfigList);
- void readPluginElement(QXmlStreamReader &xmlReader,
- QList<CpPluginConfig> &cpPluginConfigList);
- void readDescElement(QXmlStreamReader &xmlReader,
- CpPluginConfig &cpPluginConfig);
- void skipUnknownElement(QXmlStreamReader &xmlReader);
-private:
- QString mConfigPath;
-};
-
-#endif /* CPPLUGINCONFIGREADER_H */
--- a/controlpanel/src/cpframework/src/cppluginlauncher.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cppluginlauncher.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -16,36 +16,83 @@
*/
#include <cppluginlauncher.h>
+#include <cpplugininterface.h>
#include <cppluginplatinterface.h>
#include <cpsettingformentryitemdata.h>
-#include <qsharedpointer>
-#include "cppluginloader.h"
+#include <QSharedPointer>
+#include <cppluginloader.h>
#include "cpitemdatahelper.h"
-static CpSettingFormEntryItemData *createEntrySettingItem(const QString &pluginFile)
+/*!
+ \class CpPluginLauncher
+ \brief The CpPluginLauncher class loads a controlpanel plugin at run-time.And display the specify plugin view in client process.
+ */
+
+static CpSettingFormEntryItemData *createEntrySettingItem(const QString &pluginFile,int index = 0)
{
- CpPluginPlatInterface *plugin = CpPluginLoader().loadCpPlugin(pluginFile);
- if (plugin) {
- CpItemDataHelper dummy;
- CpSettingFormItemData *itemData = plugin->createSettingFormItemData(dummy);
- return qobject_cast<CpSettingFormEntryItemData*>(itemData);
- }
+ {
+ CpPluginInterface *plugin = CpPluginLoader().loadCpPlugin(pluginFile);
+ if (plugin) {
+ CpItemDataHelper dummy(0);
+ QList<CpSettingFormItemData*> allItemData = plugin->createSettingFormItemData(dummy);
+
+ CpSettingFormItemData *found = 0;
+
+ int size = allItemData.size();
+ for (int i = 0; i < size; ++i) {
+ if (i == index) {
+ found = allItemData.value(i);
+ }
+ else {
+ delete allItemData.value(i);
+ }
+ }
+
+ if (found) {
+ CpSettingFormEntryItemData *entryItemData = qobject_cast<CpSettingFormEntryItemData*>(found);
+ if (entryItemData) {
+ return entryItemData;
+ }
+ else {
+ delete found;
+ }
+ }
+ }
+ }
+
+
+ //CpPluginPlatInterface : deprecated!
+ {
+ CpPluginPlatInterface *plugin = CpPluginLoader().loadPlatCpPlugin(pluginFile);
+ if (plugin) {
+ CpItemDataHelper dummy(0);
+ CpSettingFormItemData *itemData = plugin->createSettingFormItemData(dummy);
+ CpSettingFormEntryItemData *entryItemData = qobject_cast<CpSettingFormEntryItemData*>(itemData);
+ if (entryItemData) {
+ return entryItemData;
+ }
+ else {
+ delete itemData;
+ }
+ }
+ }
return 0;
}
/*!
- Load and display a plugin with the plugin's related file.
- 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
+ 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)
+bool CpPluginLauncher::launchCpPluginView(const QString &pluginFile,int index /*= 0*/)
{
- QSharedPointer<CpSettingFormEntryItemData> entryItemData(createEntrySettingItem(pluginFile));
+ QSharedPointer<CpSettingFormEntryItemData> entryItemData(createEntrySettingItem(pluginFile,index));
if (!entryItemData.isNull()) {
entryItemData->onLaunchView();
return true;
--- a/controlpanel/src/cpframework/src/cppluginloader.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cppluginloader.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -14,28 +14,32 @@
* Description:
*
*/
-#include "cppluginloader.h"
-#include <qstring>
-#include <qdebug>
-#include <qfileinfo>
-#include <qpluginloader>
+#include <cppluginloader.h>
+#include <QString>
+#include <QDir>
+#include <QFileInfo>
+#include <QPluginLoader>
+#include <cpplugininterface.h>
#include <cppluginplatinterface.h>
#include "cpbasepath.h"
-#include "cplogger.h"
#include "cputility.h"
+#include <cplogger.h>
+/*!
+ \class CpPluginLoader
+ \brief The CpPluginLoader class loads a controlpanel plugin at run-time.
+ */
+
#ifdef WIN32
#define PLUGINFILE_SUFFIX "dll"
#else
#define PLUGINFILE_SUFFIX "qtplugin"
#endif
-CpPluginPlatInterface *CpPluginLoader::loadCpPlugin(const QString &pluginFile)
+template <typename PLUGIN>
+static PLUGIN* loadPlugin(const QString &pluginFile)
{
- CpLogger logger;
- logger << "loading plugin:" << pluginFile << "\r\n";
-
QFileInfo fileInfo(pluginFile);
if (!fileInfo.isAbsolute()) {
@@ -44,7 +48,7 @@
fileName = fileInfo.baseName() + '.' + PLUGINFILE_SUFFIX;
}
- QStringList pluginDirs = CpUtility::pluginDirs();
+ QStringList pluginDirs = CpUtility::pluginDirectories();
foreach(const QString &pluginDir,pluginDirs) {
fileInfo.setFile(pluginDir + fileName);
if (fileInfo.exists() && QLibrary::isLibrary(fileInfo.absoluteFilePath())) {
@@ -54,12 +58,39 @@
}
QPluginLoader loader(fileInfo.absoluteFilePath());
- CpPluginPlatInterface *plugin = qobject_cast<CpPluginPlatInterface*> (loader.instance());
+ PLUGIN *plugin = qobject_cast<PLUGIN*> (loader.instance());
if (!plugin) {
loader.unload();
}
-
- logger << (plugin ? "load plugin succeed." : "load plugin failed.") << "\r\n";
return plugin;
}
+
+/*!
+ load a controlpanel plugin 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
+ */
+
+CpPluginInterface *CpPluginLoader::loadCpPlugin(const QString &pluginFile)
+{
+ return loadPlugin<CpPluginInterface>(pluginFile);
+}
+
+
+/*!
+ \deprecated CpPluginPlatInterface *CpPluginLoader::loadPlatCpPlugin(const QString &) is deprecated.
+ please use CpPluginInterface to implement controlpanel plugin and use CpPluginLoader::loadCpPlugin(const QString &) to load the plugin.
+ */
+
+CpPluginPlatInterface *CpPluginLoader::loadPlatCpPlugin(const QString &pluginFile)
+{
+ return loadPlugin<CpPluginPlatInterface>(pluginFile);
+}
+
+
--- a/controlpanel/src/cpframework/src/cppluginloader.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef CPPLUGINLOADER_H
-#define CPPLUGINLOADER_H
-
-class QString;
-class CpPluginPlatInterface;
-
-class CpPluginLoader
-{
-public:
-
- /*
- load a cp plugin by plugin file.
- 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
- */
- static CpPluginPlatInterface *loadCpPlugin(const QString &pluginFile);
-
-};
-
-#endif /* CPPLUGINLOADER_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/cpframework/src/cppluginutility.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,35 @@
+/*
+* 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:
+*
+*/
+
+#include "cppluginutility.h"
+#include "cpdataformviewitem.h"
+
+#include <hbdataform.h>
+/*! \class CpPluginUtility
+ \brief This class supply the utility function for the plugin, currently there is only one function.
+ */
+/*!
+ This class will add the control panel's proto type of setting items( only entry item currently) to the settingForm.
+ */
+void CpPluginUtility::addCpItemPrototype(HbDataForm *settingForm)
+{
+ if (settingForm != NULL) {
+ QList<HbAbstractViewItem *>prototypeList = settingForm->itemPrototypes();
+ prototypeList.append(new CpDataFormViewItem());
+ settingForm->setItemPrototypes(prototypeList);
+ }
+}
--- a/controlpanel/src/cpframework/src/cputility.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cputility.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -15,68 +15,16 @@
*
*/
#include "cputility.h"
-#include <qstring>
-#include <qdir>
-#include <qfileinfo>
+#include <QString>
+#include <QDir>
+#include <QFileInfo>
#include "cpbasepath.h"
-#include "cppluginloader.h"
+#include <cppluginloader.h>
+#include <cpplugininterface.h>
#include <cppluginplatinterface.h>
+#include <cplogger.h>
#include <cpsettingformentryitemdata.h>
-#include "cpcategorysettingformitemdata.h"
-#include "cppluginconfigreader.h"
-
-void CpUtility::buildConfigPluginItems(HbDataFormModelItem *parent,
- const QString &configFile,
- CpItemDataHelper &itemDataHelper)
-{
- if (!parent) {
- return;
- }
- QString configPath(configFile);
- QFileInfo fi(configFile);
- if (!fi.isAbsolute()) {
- QStringList dirs = CpUtility::cpcfgDirs();
- foreach(const QString &dir,dirs) {
- configPath = dir + fi.fileName();
- if (QFileInfo(configPath).exists()) {
- break;
- }
- }
- }
-
- QList<CpPluginConfig> cpPluginConfigs = CpPluginConfigReader(configPath).readCpPluginConfigs();
-
- foreach(const CpPluginConfig &cpPluginConfig, cpPluginConfigs) {
- CpPluginPlatInterface *plugin = CpPluginLoader().loadCpPlugin(cpPluginConfig.mPluginFile);
-
- if (plugin) {
- CpSettingFormItemData *itemData = plugin->createSettingFormItemData(itemDataHelper);
- if (itemData) {
- //append the new created setting form item to its parent item.
- parent->appendChild(itemData);
-
- if (CpCategorySettingFormItemData *categoryItemData
- = qobject_cast<CpCategorySettingFormItemData*>(itemData)) {
- categoryItemData->initialize(itemDataHelper);
- }
-
- //set the description from config if it is empty.
- if (CpSettingFormEntryItemData *cpEntryItemData
- = qobject_cast<CpSettingFormEntryItemData*>(itemData)) {
- if (cpEntryItemData->text().isEmpty()) {
- cpEntryItemData->setText(cpPluginConfig.mDisplayName);
- }
- if (cpEntryItemData->description().isEmpty()) {
- cpEntryItemData->setDescription(cpPluginConfig.mDescription);
- }
- }
-
- }
- }
-
- } //end foreach
-}
QStringList CpUtility::drives()
@@ -84,8 +32,10 @@
static QStringList drives;
if (drives.empty()) {
+ CPFW_LOG("device drives:");
#ifdef WIN32
drives.append("C:");
+ CPFW_LOG("C:");
#else
QFileInfoList fileInfoList = QDir::drives();
foreach(const QFileInfo &fileInfo,fileInfoList) {
@@ -94,14 +44,15 @@
str = str.left(2);
}
drives.append(str);
+ CPFW_LOG(str);
}
-#endif
+#endif
}
return drives;
}
-static QStringList listDirs(const QString &baseDir)
+static QStringList directoriesFromAllDrives(const QString &baseDir)
{
QStringList dirs;
@@ -110,26 +61,40 @@
QString dir = drive + baseDir + QDir::separator();
if (QFileInfo(dir).exists()) {
dirs.append(dir);
+ CPFW_LOG(dir);
}
}
return dirs;
}
-QStringList CpUtility::pluginDirs()
+QStringList CpUtility::pluginDirectories()
{
static QStringList dirs;
if (dirs.empty()) {
- dirs = listDirs(CP_PLUGIN_PATH);
+ CPFW_LOG("ControlPanel plugin derectories:")
+ dirs = directoriesFromAllDrives(CP_PLUGIN_PATH);
}
return dirs;
}
-QStringList CpUtility::cpcfgDirs()
+QStringList CpUtility::applicationPluginDirectories()
{
static QStringList dirs;
if (dirs.empty()) {
- dirs = listDirs(CP_PLUGIN_CONFIG_PATH);
+ CPFW_LOG("ControlPanel application plugin derectories:");
+// dirs = directoriesFromAllDrives(CP_APPLICATION_PLUGIN_PATH);
+ }
+ return dirs;
+}
+
+
+QStringList CpUtility::configFileDirectories()
+{
+ static QStringList dirs;
+ if (dirs.empty()) {
+ CPFW_LOG("ControlPanel configuration file derectories:");
+ dirs = directoriesFromAllDrives(CP_PLUGIN_CONFIG_PATH);
}
return dirs;
}
--- a/controlpanel/src/cpframework/src/cputility.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cputility.h Thu Apr 01 03:23:37 2010 +0800
@@ -25,20 +25,28 @@
class CpUtility
{
public:
+
+
/*
+ get all physical drives of the devices
*/
- static void buildConfigPluginItems(HbDataFormModelItem *parent,
- const QString &configFile,
- CpItemDataHelper &itemDataHelper);
+ static QStringList drives();
/*
+ get all controlpanel plugin directories of the device
*/
- static QStringList drives();
- static QStringList pluginDirs();
- static QStringList cpcfgDirs();
+ static QStringList pluginDirectories();
-private:
- CpUtility();
+ /*
+ get all application plugin directories of the device
+ */
+ static QStringList applicationPluginDirectories();
+
+ /*
+ get all config directories of the device
+ */
+ static QStringList configFileDirectories();
+
};
#endif
--- a/controlpanel/src/cpframework/src/cpviewlauncher.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpviewlauncher.h Thu Apr 01 03:23:37 2010 +0800
@@ -18,7 +18,7 @@
#ifndef CPVIEWLAUNCHER_H
#define CPVIEWLAUNCHER_H
-#include <qobject>
+#include <QObject>
class HbView;
class CpViewLauncher : public QObject
--- a/controlpanel/src/cpframework/src/cpwatchdog.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpwatchdog.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -14,10 +14,10 @@
* Description:
*
*/
-#include "CpWatchDog.h"
-#include <qcoreapplication>
-#include <qsettings>
-#include <qdebug>
+#include "cpwatchdog.h"
+#include <QCoreApplication>
+#include <QSettings>
+#include <QDebug>
#include "cplogger.h"
//const value definition
@@ -140,7 +140,7 @@
}
if (found) {
- CpLogger() << "Plugin " << QString("0x%1").arg(uid,0,16) << "is in black list." << "\r\n";
+ CPFW_LOG( QLatin1String("Plugin ") + QString("0x%1").arg(uid,0,16) + QLatin1String(" is in black list."));
}
return found;
--- a/controlpanel/src/cpframework/src/cpwatchdog.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpwatchdog.h Thu Apr 01 03:23:37 2010 +0800
@@ -18,8 +18,8 @@
#ifndef CPWATCHDOG_H
#define CPWATCHDOG_H
-#include <qobject>
-#include <qvector>
+#include <QObject>
+#include <QVector>
#define gWatchDog CpWatchDog::instance()
--- a/controlpanel/src/cpplugins/accountsplugin/accountsplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#
-# 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: controlpanel project - common qmake settings
-#
-
-HEADERS += src/cpaccountsgroup.h \
- src/cpaccountsplugin.h
-SOURCES += src/cpaccountsgroup.cpp \
- src/cpaccountsplugin.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/accountsplugin/accountsplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpaccountsplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( accountsplugin.pri )
-
-symbian {
- TARGET.UID3 = 0x2feed8de
-}
--- a/controlpanel/src/cpplugins/accountsplugin/src/cpaccountsgroup.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpaccountsgroup.h"
-#include <cpsettingformitemdata.h>
-#include <cpitemdatahelper.h>
-
-CpAccountsGroup::CpAccountsGroup(CpItemDataHelper &itemDataHelper) :
- CpSettingFormItemData(HbDataFormModelItem::GroupItem,QString("Accounts"))
-{
- Q_UNUSED(itemDataHelper);
- // Initializing the data form item of accounts group here
- // You can use CpItemDataHelper for adding connection or adding new proto type
- // For more detail information, please refer to controlpanel's wiki
-}
-CpAccountsGroup::~CpAccountsGroup()
-{
- // release resource when necessary
-}
--- a/controlpanel/src/cpplugins/accountsplugin/src/cpaccountsgroup.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPACCOUNTSGROUP_H
-#define CPACCOUNTSGROUP_H
-
-#include <cpsettingformitemdata.h>
-
-class CpSettingFormItemData;
-class CpItemDataHelper;
-
-class CpAccountsGroup : public CpSettingFormItemData
-{
- Q_OBJECT
-public:
- explicit CpAccountsGroup(CpItemDataHelper &itemDataHelper);
- ~CpAccountsGroup();
-};
-
-#endif // CPACCOUNTSGROUP_H
--- a/controlpanel/src/cpplugins/accountsplugin/src/cpaccountsplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpaccountsplugin.h"
-#include "cpaccountsgroup.h"
-
-CpAccountsPlugin::CpAccountsPlugin()
-{
-}
-
-CpAccountsPlugin::~CpAccountsPlugin()
-{
-}
-
-CpSettingFormItemData *CpAccountsPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
-{
- return new CpAccountsGroup(itemDataHelper);
-}
-
-Q_EXPORT_PLUGIN2(cpaccountsplugin, CpAccountsPlugin);
--- a/controlpanel/src/cpplugins/accountsplugin/src/cpaccountsplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPACCOUNTSPLUGIN_H
-#define CPACCOUNTSPLUGIN_H
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpAccountsPlugin : public QObject, public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpAccountsPlugin();
- ~CpAccountsPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-#endif // CPACCOUNTSPLUGIN_H
--- a/controlpanel/src/cpplugins/applicationsettingsplugin/applicationsettingsplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-
-#
-# 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: cpapplicationsettingsplugin source files
-#
-
-# Input
-HEADERS += src/cpapplicationsettingsplugin.h
-SOURCES += src/cpapplicationsettingsplugin.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/applicationsettingsplugin/applicationsettingsplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# 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:
-#
-
-
-TEMPLATE = lib
-TARGET = cpapplicationsettingsplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( applicationsettingsplugin.pri )
-
-symbian {
- TARGET.UID3 = 0x20025FDC
-}
-
-symbian {
- deploy.path = C:
- headers.sources = data/cpapplicationsettingsplugin.cpcfg
- headers.path = /resource/qt/plugins/controlpanel/config
- DEPLOYMENT += exportheaders
-
- # This is for new exporting system coming in garden
- for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$deploy.path$$headers.path/$$basename(header)"
-}
\ No newline at end of file
--- a/controlpanel/src/cpplugins/applicationsettingsplugin/data/cpapplicationsettingsplugin.cpcfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-
-<childplugins>
- <plugin displayname = "Messaging" id = "0x2001FE74" dll = "msgsettingsplugin.dll">
- <desc>Message settings</desc>
- </plugin>
- <plugin displayname = "Calendar" id = "0x2002B338" dll = "calensettingsplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "Application 1" id = "0X20025FE8" dll = "cpplaceholderplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Application 2" id = "0X20025FE8" dll = "cpplaceholderplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "3rd party application settings" id = "0xEef7e3ec" dll = "cp3rdpartyappsettingsplugin.dll">
- <desc></desc>
- </plugin>
-
-</childplugins>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/applicationsettingsplugin/src/cpapplicationsettingsplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cpapplicationsettingsplugin.h"
-#include <cpcategorysettingformitemdata.h>
-#include <cpitemdatahelper.h>
-
-CpApplicationSettingsPlugin::CpApplicationSettingsPlugin()
-{
-}
-
-CpApplicationSettingsPlugin::~CpApplicationSettingsPlugin()
-{
-}
-
-
-CpSettingFormItemData *CpApplicationSettingsPlugin::createSettingFormItemData(CpItemDataHelper &/*itemDataHelper*/) const
-{
- CpCategorySettingFormItemData *itemData =
- new CpCategorySettingFormItemData(
- HbDataFormModelItem::GroupItem,
- QString("Application Settings"),
- QString("cpapplicationsettingsplugin.cpcfg") );
- return itemData;
-}
-
-Q_EXPORT_PLUGIN2(cpapplicationsettingsplugin, CpApplicationSettingsPlugin);
--- a/controlpanel/src/cpplugins/applicationsettingsplugin/src/cpapplicationsettingsplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPAPPLICATIONSETTINGSPLUGIN_H
-#define CPAPPLICATIONSETTINGSPLUGIN_H
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpApplicationSettingsPlugin
- : public QObject, public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpApplicationSettingsPlugin();
- virtual ~CpApplicationSettingsPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif /* CPAPPLICATIONSETTINGSPLUGIN_H */
--- a/controlpanel/src/cpplugins/communicationplugin/communicationplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# 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: cpcommunicationplugin source files
-#
-
-# Input
-HEADERS += src/cpcommunicationplugin.h \
- src/cpcommunicationgroupitemdata.h
-
-SOURCES += src/cpcommunicationplugin.cpp \
- src/cpcommunicationgroupitemdata.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/communicationplugin/communicationplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpcommunicationplugin
-
-CONFIG += hb plugin
-
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( communicationplugin.pri )
-
-symbian {
- TARGET.UID3 = 0x20025FDF
-}
-
-symbian {
- deploy.path = C:
- headers.sources = data/cpcommunicationplugin.cpcfg
- headers.path = /resource/qt/plugins/controlpanel/config
- DEPLOYMENT += exportheaders
-
- # This is for new exporting system coming in garden
- for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$deploy.path$$headers.path/$$basename(header)"
-}
--- a/controlpanel/src/cpplugins/communicationplugin/data/cpcommunicationplugin.cpcfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-
-
-<childplugins>
- <plugin displayname = "WLAN" id = "0X20025FE8" dll = "cpplaceholderplugin.dll">
- <desc>WLAN status</desc>
- </plugin>
- <plugin displayname = "Bluetooth" id = "0X20025FE8" dll = "cpplaceholderplugin.dll">
- <desc>Status text</desc>
- </plugin>
- <plugin displayname = "Telephony" id = "0X20029F23" dll = "cptelephonyplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "Network settings" id = "0X2002BC8F" dll = "cpnetworkplugin.dll">
- <desc></desc>
- </plugin>
-</childplugins>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/communicationplugin/src/cpcommunicationgroupitemdata.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpcommunicationgroupitemdata.h"
-#include <QStringList>
-
-CpCommunicationGroupItemData::CpCommunicationGroupItemData(const QString &configFile,
- const HbDataFormModelItem *parent):
-CpCategorySettingFormItemData(configFile,parent)
-{
-
-}
-
-CpCommunicationGroupItemData::CpCommunicationGroupItemData(HbDataFormModelItem::DataItemType type,
- const QString &label,
- const QString &configFile,
- const HbDataFormModelItem *parent):
-CpCategorySettingFormItemData(type, label, configFile, parent)
-{
-
-}
-CpCommunicationGroupItemData::~CpCommunicationGroupItemData()
-{
-
-}
-void CpCommunicationGroupItemData::beforeLoadingConfigPlugins(CpItemDataHelper &/*itemDataHelper*/)
-{
- HbDataFormModelItem *airPlaneMode = new HbDataFormModelItem(HbDataFormModelItem::ToggleValueItem,
- QString("Airplane Mode"));
- QStringList airModeList;
- airModeList << QObject::tr("On") << QObject::tr("Off");
-
- airPlaneMode->setContentWidgetData("text",airModeList.at(1));
- airPlaneMode->setContentWidgetData("additionalText",airModeList.at(0));
-
- this->appendChild(airPlaneMode);
-
-}
--- a/controlpanel/src/cpplugins/communicationplugin/src/cpcommunicationgroupitemdata.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPCOMMUNICATIONGROUPITEMDATA_H
-#define CPCOMMUNICATIONGROUPITEMDATA_H
-
-#include <cpcategorysettingformitemdata.h>
-class CpItemDataHelper;
-class CpCommunicationGroupItemData: public CpCategorySettingFormItemData
-{
-public:
- explicit CpCommunicationGroupItemData(const QString &configFile = QString(),
- const HbDataFormModelItem *parent = 0);
-
- CpCommunicationGroupItemData(HbDataFormModelItem::DataItemType type,
- const QString &label,
- const QString &configFile = QString(),
- const HbDataFormModelItem *parent = 0);
-
- ~CpCommunicationGroupItemData();
-private:
- virtual void beforeLoadingConfigPlugins(CpItemDataHelper &itemDataHelper);
-};
-#endif /* CPCOMMUNICATIONGROUPITEMDATA_H */
--- a/controlpanel/src/cpplugins/communicationplugin/src/cpcommunicationplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cpcommunicationplugin.h"
-#include "cpcommunicationgroupitemdata.h"
-#include <cpitemdatahelper.h>
-
-CpCommunicationPlugin::CpCommunicationPlugin()
-{
-}
-
-CpCommunicationPlugin::~CpCommunicationPlugin()
-{
-}
-
-CpSettingFormItemData *CpCommunicationPlugin::createSettingFormItemData(CpItemDataHelper &/*itemDataHelper*/) const
-{
- CpCategorySettingFormItemData *itemData =
- new CpCommunicationGroupItemData(
- HbDataFormModelItem::GroupItem,
- QString("Connectivity"),
- QString("cpcommunicationplugin.cpcfg") );
- return itemData;
-}
-
-Q_EXPORT_PLUGIN2(cpcommunicationplugin, CpCommunicationPlugin);
--- a/controlpanel/src/cpplugins/communicationplugin/src/cpcommunicationplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPCOMMUNICATIONPLUGIN_H
-#define CPCOMMUNICATIONPLUGIN_H
-
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpCommunicationPlugin
- : public QObject, public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpCommunicationPlugin();
- virtual ~CpCommunicationPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-
-#endif /* CPCOMMUNICATIONPLUGIN_H */
--- a/controlpanel/src/cpplugins/cpplugincommon.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#
-# 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: controlpanel plugin project qmake common settings
-#
-include (../common.pri)
-
-symbian: plugin { # copy qtstub and manifest
-
- PLUGIN_STUB_PATH = /resource/qt/plugins/controlpanel
-
- deploy.path = C:
- pluginstub.sources = $${TARGET}.dll
- pluginstub.path = $$PLUGIN_STUB_PATH
- DEPLOYMENT += pluginstub
-
- qtplugins.path = $$PLUGIN_STUB_PATH
- qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-
- for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
-}
--- a/controlpanel/src/cpplugins/cpplugins.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = subdirs
-SUBDIRS = communicationplugin \
- placeholderplugin \
- deviceplugin \
- privacyplugin \
- personalizationplugin \
- applicationsettingsplugin \
- lookfeelplugin \
- themeplugin \
- placeholdernoiconplugin \
- keytouchfdbkplugin \
- pincodeplugin \
- devicelockplugin \
- accountsplugin
-# 3rdpartyappsettingsplugin
-# profileenginewapper
-# profileplugin
-# syncplugin
-
-CONFIG += ordered
\ No newline at end of file
--- a/controlpanel/src/cpplugins/devicelockplugin/devicelockplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#
-# 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: cpdevicelockplugin source files
-#
-
-# Input
-HEADERS += src/*.h
-SOURCES += src/*.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/devicelockplugin/devicelockplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpdevicelockplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( devicelockplugin.pri )
-
-symbian {
- TARGET.UID3 = 0X20028732
-}
\ No newline at end of file
--- a/controlpanel/src/cpplugins/devicelockplugin/src/cpdevicelockplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpdevicelockplugin.h"
-#include "cpdevicelockpluginview.h"
-#include <cpsettingformentryitemdataimpl.h>
-
-CpDeviceLockPlugin::CpDeviceLockPlugin()
-{
-}
-
-CpDeviceLockPlugin::~CpDeviceLockPlugin()
-{
-}
-
-CpSettingFormItemData *CpDeviceLockPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
-{
- return new CpSettingFormEntryItemDataImpl<CpDeviceLockPluginView>(
- itemDataHelper,tr("Device lock"), QString());
-}
-
-Q_EXPORT_PLUGIN2(cpdevicelockplugin, CpDeviceLockPlugin);
--- a/controlpanel/src/cpplugins/devicelockplugin/src/cpdevicelockplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPDEVICELOCKPLUGIN_H
-#define CPDEVICELOCKPLUGIN_H
-
-#include <QObject.h>
-#include <cppluginplatinterface.h>
-
-class CpDeviceLockPlugin : public QObject, public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpDeviceLockPlugin();
- virtual ~CpDeviceLockPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif //CPDEVICELOCKPLUGIN_H
--- a/controlpanel/src/cpplugins/devicelockplugin/src/cpdevicelockpluginview.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cpdevicelockpluginview.h"
-#include <QStringList>
-#include <hblineedit.h>
-#include <hbdataform.h>
-#include <hbdataformmodel.h>
-#include <hbdataformmodelitem.h>
-#include "cpremotelockdataformviewitem.h"
-
-CpDeviceLockPluginView::CpDeviceLockPluginView(QGraphicsItem *parent /*= 0*/)
-: CpBaseSettingView(0,parent)
-{
- if (HbDataForm *form = settingForm()) {
-
- QList<HbAbstractViewItem *> protoTypeList = form->itemPrototypes();
- protoTypeList.append(new CpRemoteLockDataFormViewItem());
- form->setItemPrototypes(protoTypeList);
-
- HbDataFormModel *formModel = new HbDataFormModel();
-
- form->setHeading(tr("Device lock"));
-
- HbDataFormModelItem *deviceLockItem = new HbDataFormModelItem(
- HbDataFormModelItem::ToggleValueItem,tr("Device lock"));
-
- deviceLockItem->setContentWidgetData("text",tr("On"));
- deviceLockItem->setContentWidgetData("additionalText",tr("Off"));
-
- formModel->appendDataFormItem(deviceLockItem);
-
- HbDataFormModelItem *lockCodeItem = new HbDataFormModelItem(
- HbDataFormModelItem::TextItem,tr("Lock code"));
- lockCodeItem->setContentWidgetData("echoMode",HbLineEdit::Password);
- lockCodeItem->setContentWidgetData("text","1111");
- lockCodeItem->setContentWidgetData("readOnly",true);
-
- formModel->appendDataFormItem(lockCodeItem);
-
- HbDataFormModelItem *deviceLockAfterItem = new HbDataFormModelItem(
- HbDataFormModelItem::RadioButtonListItem,tr("Device will be locked automatically after:"));
-
- QStringList items;
- items << tr("15 minutes") << tr("30 minutes") << tr("1 hour") << tr("4 hours") ;
- deviceLockAfterItem->setContentWidgetData("items",items);
- deviceLockAfterItem->setContentWidgetData("selected",0);
-
- formModel->appendDataFormItem(deviceLockAfterItem);
-
- HbDataFormModelItem *remoteLockItem = new HbDataFormModelItem(
- static_cast<HbDataFormModelItem::DataItemType>(CpRemoteLockDataFormViewItem::CpRemoteLockItem),
- tr("Remote locking"));
- remoteLockItem->setContentWidgetData("plainText",
- tr("Device can be locked remotely by sending lock code to the device as SMS."));
- remoteLockItem->setContentWidgetData("TextWrapping",Hb::TextWordWrap);
-
- formModel->appendDataFormItem(remoteLockItem);
-
- form->setModel(formModel);
- }
-}
-
-CpDeviceLockPluginView::~CpDeviceLockPluginView()
-{
-}
-
-
--- a/controlpanel/src/cpplugins/devicelockplugin/src/cpdevicelockpluginview.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPDEVICELOCKPLUGINVIEW_H
-#define CPDEVICELOCKPLUGINVIEW_H
-
-#include <cpbasesettingview.h>
-
-class CpDeviceLockPluginView : public CpBaseSettingView
-{
- Q_OBJECT
-public:
- explicit CpDeviceLockPluginView(QGraphicsItem *parent = 0);
- virtual ~CpDeviceLockPluginView();
-};
-
-
-#endif
--- a/controlpanel/src/cpplugins/devicelockplugin/src/cpremotelockdataformviewitem.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpremotelockdataformviewitem.h"
-#include <hblabel.h>
-
-CpRemoteLockDataFormViewItem::CpRemoteLockDataFormViewItem(QGraphicsItem *parent )
-: HbDataFormViewItem(parent)
-{
-}
-
-CpRemoteLockDataFormViewItem::~CpRemoteLockDataFormViewItem()
-{
-}
-
-HbAbstractViewItem* CpRemoteLockDataFormViewItem::createItem()
-{
- return new CpRemoteLockDataFormViewItem(*this);
-}
-
-bool CpRemoteLockDataFormViewItem::canSetModelIndex(const QModelIndex &index) const
-{
- int type = index.data(HbDataFormModelItem::ItemTypeRole).toInt();
- return type == CpRemoteLockItem;
-}
-
-HbWidget *CpRemoteLockDataFormViewItem::createCustomWidget()
-{
- int type = modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt();
-
- if (type == CpRemoteLockItem) {
- HbLabel *label = new HbLabel("Device can be locked remotely by sending lock code to the device as SMS.");
- label->setElideMode (Qt::ElideNone );
- label->setTextWrapping(Hb::TextWordWrap);
- return label;
- }
-
- return 0;
-}
-
--- a/controlpanel/src/cpplugins/devicelockplugin/src/cpremotelockdataformviewitem.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * 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:
- *
- */
-
-
-#ifndef CPREMOTELOCKDATAFORMVIEWITEM_H
-#define CPREMOTELOCKDATAFORMVIEWITEM_H
-
-#include <hbdataformviewitem.h>
-#include <hbdataformmodelitem.h>
-
-class CpRemoteLockDataFormViewItem : public HbDataFormViewItem
-{
- Q_OBJECT
-public:
- enum { CpRemoteLockItem = HbDataFormModelItem::CustomItemBase + 10 };
-
- explicit CpRemoteLockDataFormViewItem(QGraphicsItem *parent = 0);
- virtual ~CpRemoteLockDataFormViewItem();
- virtual HbAbstractViewItem* createItem();
- virtual bool canSetModelIndex(const QModelIndex &index) const;
-protected:
- virtual HbWidget* createCustomWidget();
-};
-
-#endif //CPREMOTELOCKDATAFORMVIEWITEM_H
-
--- a/controlpanel/src/cpplugins/deviceplugin/data/cpdeviceplugin.cpcfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-
-<childplugins>
- <plugin displayname = "Time & data" id = "0X102818E9" dll = "datetimesettingsplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "Language" id = "0X20025FDD" dll = "cpplaceholdernoiconplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "Text and keyboard" id = "0X20025FDD" dll = "cpplaceholdernoiconplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "Voice commands" id = "0X20025FDD" dll = "cpplaceholdernoiconplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "Device updates" id = "0X20025FDD" dll = "cpplaceholdernoiconplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "Reset" id = "0X20025FDD" dll = "cpplaceholdernoiconplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "About" id = "0X20025FDD" dll = "cpplaceholdernoiconplugin.dll">
- <desc></desc>
- </plugin>
-</childplugins>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/deviceplugin/deviceplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#
-# 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: cpdeviceplugin source files
-#
-
-
-# Input
-HEADERS += src/cpdeviceplugin.h
-SOURCES += src/cpdeviceplugin.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/deviceplugin/deviceplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpdeviceplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( deviceplugin.pri )
-
-symbian {
- TARGET.UID3 = 0X20025FE7
-}
-
-symbian {
- deploy.path = C:
- headers.sources = data/cpdeviceplugin.cpcfg
- headers.path = /resource/qt/plugins/controlpanel/config
- DEPLOYMENT += exportheaders
-
- # This is for new exporting system coming in garden
- for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$deploy.path$$headers.path/$$basename(header)"
-}
\ No newline at end of file
--- a/controlpanel/src/cpplugins/deviceplugin/src/cpdeviceplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cpdeviceplugin.h"
-#include "cpcategorysettingformitemdata.h"
-#include <cpitemdatahelper.h>
-
-CpDevicePlugin::CpDevicePlugin()
-{
-}
-
-CpDevicePlugin::~CpDevicePlugin()
-{
-}
-
-CpSettingFormItemData *CpDevicePlugin::createSettingFormItemData(CpItemDataHelper &/*itemDataHelper*/) const
-{
- CpCategorySettingFormItemData *itemData =
- new CpCategorySettingFormItemData(
- HbDataFormModelItem::GroupItem,
- tr("Device"),
- QString("cpdeviceplugin.cpcfg") );
- return itemData;
-}
-
-Q_EXPORT_PLUGIN2(cpdeviceplugin, CpDevicePlugin);
--- a/controlpanel/src/cpplugins/deviceplugin/src/cpdeviceplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPDEVICEPLUGIN_H
-#define CPDEVICEPLUGIN_H
-
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpDevicePlugin : public QObject,
- public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpDevicePlugin();
- virtual ~CpDevicePlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-
-#endif /* CPDEVICEPLUGIN_H */
--- a/controlpanel/src/cpplugins/keytouchfdbkplugin/keytouchfdbkplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#
-# 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: keytouchfeedback plugin source files
-#
-
-# Input
-HEADERS += src/*.h
-SOURCES += src/*.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/keytouchfdbkplugin/keytouchfdbkplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpkeytouchfdbkplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework \
- -lcpprofilewrapper
-
-include ( ../cpplugincommon.pri )
-include ( keytouchfdbkplugin.pri )
-
-symbian {
- TARGET.UID3 = 0X20025FDE
-}
--- a/controlpanel/src/cpplugins/keytouchfdbkplugin/src/cpkeytouchfdbkplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpkeytouchfdbkplugin.h"
-#include "cpktfdbkview.h"
-#include <cpsettingformentryitemdataimpl.h>
-
-CpKeytouchfdbkPlugin::CpKeytouchfdbkPlugin()
-{
-}
-
-CpKeytouchfdbkPlugin::~CpKeytouchfdbkPlugin()
-{
-}
-CpSettingFormItemData *CpKeytouchfdbkPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
-{
- return new CpSettingFormEntryItemDataImpl<CpKtfdbkView>(
- itemDataHelper,
- tr("Key&touch screen feedback "),
- "");
-}
-
-Q_EXPORT_PLUGIN2(cpkeytouchfdbkplugin, CpKeytouchfdbkPlugin);
--- a/controlpanel/src/cpplugins/keytouchfdbkplugin/src/cpkeytouchfdbkplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPKEYTOUCHFDBKPLUGIN_H
-#define CPKEYTOUCHFDBKPLUGIN_H
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpKeytouchfdbkPlugin : public QObject, public CpPluginPlatInterface
-{
-Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpKeytouchfdbkPlugin();
- ~CpKeytouchfdbkPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif //CPKEYTOUCHFDBKPLUGIN
--- a/controlpanel/src/cpplugins/keytouchfdbkplugin/src/cpktfdbkview.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpktfdbkview.h"
-#include <hbdataform.h>
-#include <qstringlist>
-#include <qdebug>
-#include <hbdataformmodel.h>
-#include <cpsettingformitemdata.h>
-#include <hbmessagebox.h>
-#include <cpprofilemodel.h>
-
-
-CpKtfdbkView::CpKtfdbkView(QGraphicsItem *parent) :
- CpBaseSettingView(0,parent),
- mKTSliderItem(0),
- mSTSliderItem(0),
- mSVSliderItem(0),
- mModel(0)
-
-{
- HbDataForm *form = settingForm();
- if (form) {
- mModel = new CpProfileModel();
- HbDataFormModel *model = new HbDataFormModel;
-
- form->setHeading(tr("Key & touch screen feedback"));
-// Key tones slider
- mKTSliderItem = new CpSettingFormItemData(HbDataFormModelItem::SliderItem,
- QString("Key tones"));
- form->addConnection(mKTSliderItem,SIGNAL(valueChanged(int)),this,SLOT(KTsliderValueChanged(int)));
-
- model->appendDataFormItem(mKTSliderItem, model->invisibleRootItem());
-//Screen tones
- mSTSliderItem = new CpSettingFormItemData(HbDataFormModelItem::SliderItem,
- QString("Screen tones"));
- form->addConnection(mSTSliderItem,SIGNAL(valueChanged(int)),this,SLOT(STsliderValueChanged(int)));
-
- model->appendDataFormItem(mSTSliderItem, model->invisibleRootItem());
-//Screen vibra
- mSVSliderItem = new CpSettingFormItemData(HbDataFormModelItem::SliderItem,
- QString("Screen vibra"));
- form->addConnection(mSVSliderItem,SIGNAL(valueChanged(int)),this,SLOT(SVsliderValueChanged(int)));
-
- model->appendDataFormItem(mSVSliderItem, model->invisibleRootItem());
-//initialize sliders
- mKTSliderItem->setContentWidgetData( QString("value"), mModel->keyVolume() );
- mKTSliderItem->setContentWidgetData( QString("minimum"), 0 );
- mKTSliderItem->setContentWidgetData( QString("maximum"), 3 );
-
- mSTSliderItem->setContentWidgetData( QString("value"), mModel->screenVolume() );
- mSTSliderItem->setContentWidgetData( QString("minimum"), 0 );
- mSTSliderItem->setContentWidgetData( QString("maximum"), 3 );
-
- mSVSliderItem->setContentWidgetData( QString("value"), mModel->screenVibra() );
- mSVSliderItem->setContentWidgetData( QString("minimum"), 0 );
- mSVSliderItem->setContentWidgetData( QString("maximum"), 3 );
-//
- form->setModel(model);
-//
- }
-
-
-}
-CpKtfdbkView::~CpKtfdbkView()
-{
- if(mModel) delete mModel;
- mModel = 0;
-}
-
-void CpKtfdbkView::KTsliderValueChanged(int value)
-{
- if(mModel) mModel->setKeyVolume( value );
-}
-
-void CpKtfdbkView::STsliderValueChanged(int value)
-{
- if(mModel) mModel->setScreenVolume( value );
-}
-
-void CpKtfdbkView::SVsliderValueChanged(int value)
-{
- if(mModel) mModel->setScreenVibra( value );
-}
-
-
--- a/controlpanel/src/cpplugins/keytouchfdbkplugin/src/cpktfdbkview.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPKTFDBKVIEW_H
-#define CPKTFDBKVIEW_H
-
-#include <cpbasesettingview.h>
-
-class HbDataFormModelItem;
-class CpSettingFormItemData;
-class CpProfileModel;
-class CpKtfdbkView : public CpBaseSettingView
-{
- Q_OBJECT
-public:
- explicit CpKtfdbkView(QGraphicsItem *parent = 0);
- virtual ~CpKtfdbkView();
-private slots:
- //need handling your member's value change
- void KTsliderValueChanged(int value);
- void STsliderValueChanged(int value);
- void SVsliderValueChanged(int value);
-private:
- CpProfileModel *mModel;
- CpSettingFormItemData *mKTSliderItem;
- CpSettingFormItemData *mSTSliderItem;
- CpSettingFormItemData *mSVSliderItem;
-};
-#endif// CPKTFDBKVIEW_H
--- a/controlpanel/src/cpplugins/lookfeelplugin/data/cplookfeelplugin.cpcfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-
-<childplugins>
- <plugin displayname = "" id = "0X20025FDB" dll = "cpthemeplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "WallPaper" id = "0X20025FE8" dll = "cpplaceholderplugin.dll">
- <desc>Name of the WallPaper</desc>
- </plugin>
- <plugin displayname = "Call image" id = "0X20025FE8" dll = "cpplaceholderplugin.dll">
- <desc>Name of the call image</desc>
- </plugin>
- <plugin displayname = "Display" id = "0X20025FDD" dll = "cpplaceholdernoiconplugin.dll">
- <desc></desc>
- </plugin>
- <plugin displayname = "Key & touch screen feedback" id = "0X20025FDE" dll = "cpkeytouchfdbkplugin.dll">
- <desc></desc>
- </plugin>
-</childplugins>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/lookfeelplugin/lookfeelplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#
-# 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: cpdeviceplugin source files
-#
-
-
-# Input
-HEADERS += src/cplookfeelplugin.h
-SOURCES += src/cplookfeelplugin.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/lookfeelplugin/lookfeelplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cplookfeelplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( lookfeelplugin.pri )
-
-symbian {
- TARGET.UID3 = 0X20025FE0
-}
-
-symbian {
- deploy.path = C:
- headers.sources = data/cplookfeelplugin.cpcfg
- headers.path = /resource/qt/plugins/controlpanel/config
- DEPLOYMENT += exportheaders
-
- # This is for new exporting system coming in garden
- for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$deploy.path$$headers.path/$$basename(header)"
-}
\ No newline at end of file
--- a/controlpanel/src/cpplugins/lookfeelplugin/src/cplookfeelplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cplookfeelplugin.h"
-#include "cpcategorysettingformitemdata.h"
-
-CpLookFeelPlugin::CpLookFeelPlugin()
-{
-}
-
-CpLookFeelPlugin::~CpLookFeelPlugin()
-{
-}
-
-CpSettingFormItemData *CpLookFeelPlugin::createSettingFormItemData(CpItemDataHelper &/*itemDataHelper*/) const
-{
- CpCategorySettingFormItemData *itemData =
- new CpCategorySettingFormItemData(
- HbDataFormModelItem::GroupItem,
- tr("Look&Feel"),
- QString("cplookfeelplugin.cpcfg") );
- return itemData;
-}
-
-Q_EXPORT_PLUGIN2(cplookfeelplugin, CpLookFeelPlugin);
--- a/controlpanel/src/cpplugins/lookfeelplugin/src/cplookfeelplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPLOOKFEELPLUGIN_H
-#define CPLOOKFEELPLUGIN_H
-
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpLookFeelPlugin : public QObject,
- public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpLookFeelPlugin();
- virtual ~CpLookFeelPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-
-#endif /* CPLOOKFEELPLUGIN_H */
--- a/controlpanel/src/cpplugins/personalizationplugin/data/cppersonalizationplugin.cpcfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<childplugins>
-</childplugins>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/personalizationplugin/icon/hb_vol_slider_decrement.svg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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 baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="33.999,26 10,26 10,17.998 33.999,17.998 "/>
-<rect fill="#FFFFFF" height="4" width="20" x="12" y="20"/>
-</svg>
--- a/controlpanel/src/cpplugins/personalizationplugin/icon/hb_vol_slider_decrement_pressed.svg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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 baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="33.999,26 10,26 10,17.998 33.999,17.998 "/>
-<rect fill="#00FF00" height="4" width="20" x="12" y="20"/>
-</svg>
--- a/controlpanel/src/cpplugins/personalizationplugin/icon/hb_vol_slider_increment.svg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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 baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="26.001,33.999 18,33.999 18,26.001 10,26.001 10,18 18,18 18,9.999 26.001,9.999 26.001,18 33.999,18 33.999,26.001 26.001,26.001 "/>
-<polygon fill="#FFFFFF" points="31.999,20 23.999,20 23.999,12 20,12 20,20 12,20 12,23.999 20,23.999 20,31.999 23.999,31.999 23.999,23.999 31.999,23.999 "/>
-</svg>
--- a/controlpanel/src/cpplugins/personalizationplugin/icon/hb_vol_slider_increment_pressed.svg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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 baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<polygon points="26.001,33.999 18,33.999 18,26.001 10,26.001 10,18 18,18 18,9.999 26.001,9.999 26.001,18 33.999,18 33.999,26.001 26.001,26.001 "/>
-<polygon fill="#00FF00" points="31.999,20 23.999,20 23.999,12 20,12 20,20 12,20 12,23.999 20,23.999 20,31.999 23.999,31.999 23.999,23.999 31.999,23.999 "/>
-</svg>
--- a/controlpanel/src/cpplugins/personalizationplugin/icon/hb_vol_slider_muted.svg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +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 baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M25.824,21.015V8.411h-9.979l-1.025,1.6L8.354,3.545L3.651,8.242l6.797,6.795H4.931v15.818h6.671l4.24,6.625h9.982v-7.067 l7.902,7.905l4.697-4.703L25.824,21.015z M19.179,30.336L15.26,24.21h-3.682v-2.524h3.682l0.715-1.121l3.204,3.203V30.336z"/>
-<rect fill="#FFFFFF" height="2.648" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 21.1169 50.6082)" width="38.533" x="1.773" y="19.607"/>
-<polygon fill="#FFFFFF" points="21.179,32.835 18.403,32.835 14.166,26.209 9.578,26.209 9.578,19.685 14.166,19.685 14.463,19.219 12.279,17.037 6.931,17.037 6.931,28.855 12.695,28.855 16.937,35.48 23.824,35.48 23.824,28.579 21.179,25.936 "/>
-<polygon fill="#FFFFFF" points="18.403,13.06 21.179,13.06 21.179,16.202 23.824,18.847 23.824,10.412 16.937,10.412 16.332,11.355 18.259,13.284 "/>
-</svg>
--- a/controlpanel/src/cpplugins/personalizationplugin/icon/hb_vol_slider_unmuted.svg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +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 baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M34.951,38.12l-5.054-4.302l1.282-1.521c0.877-1.04,8.324-10.39,0.111-18.605l-1.414-1.413l4.697-4.701l1.413,1.415 c12.695,12.699,0.386,27.46,0.259,27.606L34.951,38.12L34.951,38.12z"/>
-<path d="M30.761,14.545l-1.414-1.412l-3.521,3.521V8.411h-9.981l-4.24,6.624H4.93v15.82h6.674l4.24,6.625h9.981v-8.201l3.855,3.287 l1.298-1.521C33.574,28.005,36.864,20.643,30.761,14.545z M19.18,30.335l-3.921-6.128h-3.682v-2.522h3.682l3.921-6.128V30.335z M25.918,26.742l-0.094,0.109v-7.844l0.237,0.236C29.324,22.505,26.277,26.318,25.918,26.742z"/>
-<path d="M27.476,17.83c4.622,4.622,0.158,9.979-0.031,10.203l2.014,1.714c2.181-2.554,4.957-8.725-0.11-13.788 L27.476,17.83z" fill="#FFFFFF"/>
-<path d="M34.576,10.406l-1.873,1.871c9.664,9.663,0.404,20.838,0.006,21.309l2.017,1.717 C34.838,35.17,45.974,21.811,34.576,10.406z" fill="#FFFFFF"/>
-<path d="M16.937,10.411l-4.242,6.625H6.931v11.819h5.764l4.242,6.625h6.887V10.411H16.937z M21.179,32.834h-2.776 l-4.237-6.626H9.578v-6.524h4.588l4.237-6.625h2.776V32.834z" fill="#FFFFFF"/>
-</svg>
--- a/controlpanel/src/cpplugins/personalizationplugin/personalizationplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#
-# 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: cppersonalizationplugin source files
-#
-
-# Input
-HEADERS += src/cppersonalizationplugin.h \
- src/cppersonalizationgroupitemdata.h \
- src/cpmastervolumeslider.h \
- src/cppersonalizationcustomviewitem.h \
- src/cpmastervolumevaluecontroller.h
-SOURCES += src/cppersonalizationplugin.cpp \
- src/cppersonalizationgroupitemdata.cpp \
- src/cpmastervolumeslider.cpp \
- src/cppersonalizationcustomviewitem.cpp \
- src/cpmastervolumevaluecontroller.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/personalizationplugin/personalizationplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cppersonalizationplugin
-
-CONFIG += hb plugin
-RESOURCES += personalizationplugin.qrc
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( personalizationplugin.pri )
-
-symbian: {
- TARGET.UID3 = 0X20025FE5
- LIBS += -lcpprofilewrapper
-}
-
-symbian: {
- deploy.path = C:
- headers.sources = data/cppersonalizationplugin.cpcfg
- headers.path = /resource/qt/plugins/controlpanel/config
- DEPLOYMENT += exportheaders
-
- # This is for new exporting system coming in garden
- for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$deploy.path$$headers.path/$$basename(header)"
-}
\ No newline at end of file
--- a/controlpanel/src/cpplugins/personalizationplugin/personalizationplugin.qrc Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>icon/hb_vol_slider_decrement.svg</file>
- <file>icon/hb_vol_slider_decrement_pressed.svg</file>
- <file>icon/hb_vol_slider_increment.svg</file>
- <file>icon/hb_vol_slider_increment_pressed.svg</file>
- <file>icon/hb_vol_slider_muted.svg</file>
- <file>icon/hb_vol_slider_unmuted.svg</file>
- </qresource>
-</RCC>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cpmastervolumeslider.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpmastervolumeslider.h"
-
-CpMasterVolumeSlider::CpMasterVolumeSlider(QGraphicsItem *parent /* =0 */)
- :HbSlider(parent),
- mPreviousValue(0)
-{
- QList<HbSlider::SliderElement> elements;
- elements << HbSlider::IncreaseElement
- << HbSlider::TrackElement
- << HbSlider::DecreaseElement
- << HbSlider::IconElement
- << HbSlider::TextElement;
-
- setElements( elements );
- setOrientation(Qt::Horizontal);
- setMaximum(11);
- setMinimum(0);
-
- setIcon(HbSlider::DecreaseElement, HbIcon(":/icon/hb_vol_slider_decrement.svg"));
- setIcon(HbSlider::IncreaseElement, HbIcon(":/icon/hb_vol_slider_increment.svg"));
- setIcon(HbSlider::IconElement, HbIcon(":/icon/hb_vol_slider_muted.svg"));
-
- setIconCheckable(true);
-
- // set tick and beep label
-
- setMajorTickInterval(1);
- setTickPosition(Hb::SliderTicksBothSides);
- QStringList labelList;
- labelList<< tr("")
- << tr("Beep");
-
- this->setMajorTickLabels(labelList);
-
- connect(this, SIGNAL(iconToggled(bool)),
- this, SLOT(onMuteIconToggled(bool)));
- connect(this, SIGNAL(valueChanged(int)),
- this, SLOT(onValueChanged(int)));
-// onValueChanged(value());
-}
-
-CpMasterVolumeSlider::~CpMasterVolumeSlider()
-{
-}
-
-bool CpMasterVolumeSlider::isBeepMode()
-{
- if (value() == minimum()+1) {
- return true;
- }
- else {
- return false;
- }
-}
-
-void CpMasterVolumeSlider::setBeepMode(bool isBeepMode)
-{
- if (isBeepMode == true) {
- setValue(minimum()+1);
- }
- else {
- setValue(mPreviousValue);
- }
-}
-
-bool CpMasterVolumeSlider::isSilentMode()
-{
- if (value() == minimum()) {
- return true;
- }
- else {
- return false;
- }
-}
-
-void CpMasterVolumeSlider::setSilentMode(bool isSilentMode)
-{
- if (isSilentMode == true) {
- setValue(minimum());
- }
- else {
- setValue(mPreviousValue);
- }
-}
-
-int CpMasterVolumeSlider::normalValue()
-{
- return (value()-1);
-}
-
-void CpMasterVolumeSlider::setNormalValue(int normalValue)
-{
- setValue(normalValue+1);
-}
-
-void CpMasterVolumeSlider::onValueChanged(int value)
-{
- if (this->minimum( ) == value) {
- // volume is mute
- this->setIconChecked( true );
- emit silentActivated();
- }
- else {
- // unmute volume
- this->setIconEnabled( true );
- this->setIconCheckable(false);
- this->setIconChecked( false );
- this->setIcon(HbSlider::IconElement, HbIcon(":/icon/hb_vol_slider_unmuted.svg"));
- this->setIconCheckable(true);
-
-
- if (value == 1) {
- emit beepActivated();
- }
- else {
- int valueMap = value - 1;
- emit normalValueChanged(valueMap);
- }
- }
-}
-
-void CpMasterVolumeSlider::onIncreaseIconClicked()
-{
-}
-
-void CpMasterVolumeSlider::onDecreaseIconClicked()
-{
-}
-
-void CpMasterVolumeSlider::onMuteIconToggled(bool isToggled)
-{
- if (isToggled) {
- mPreviousValue = value();
- this->setIcon(HbSlider::IconElement, HbIcon(":/icon/hb_vol_slider_muted.svg"));
- setValue(minimum());
- }
- else {
- this->setIcon(HbSlider::IconElement, HbIcon(":/icon/hb_vol_slider_unmuted.svg"));
- if (mPreviousValue == minimum()||mPreviousValue == minimum()+1) {
- setValue(minimum()+1);
- }
- else {
- setValue(mPreviousValue);
- }
- mPreviousValue = 0;
- }
-}
-
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cpmastervolumeslider.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CP_MASTERVOLUMESLIDER_H
-#define CP_MASTERVOLUMESLIDER_H
-
-#include <hbslider.h>
-#include <hbmessagebox.h>
-class CpMasterVolumeSlider: public HbSlider
-{
- Q_OBJECT
- Q_PROPERTY(bool beepMode READ isBeepMode WRITE setBeepMode)
- Q_PROPERTY(bool silentMode READ isSilentMode WRITE setSilentMode)
- Q_PROPERTY(int normalValue READ normalValue WRITE setNormalValue)
-
-public:
- explicit CpMasterVolumeSlider(QGraphicsItem *parent = 0);
- ~CpMasterVolumeSlider();
-
-public:
- bool isBeepMode();
- void setBeepMode(bool isBeepMode);
- bool isSilentMode();
- void setSilentMode(bool isSilentMode);
- int normalValue();
- void setNormalValue(int normalValue);
-
-signals:
- void beepActivated();
- void silentActivated();
- void normalValueChanged(int value);
-private slots:
- void onValueChanged(int value);
- void onIncreaseIconClicked();
- void onDecreaseIconClicked();
- void onMuteIconToggled(bool isToggled);
-private:
- int mPreviousValue;
-};
-
-#endif
-
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cpmastervolumevaluecontroller.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-
-/*
- * 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:
- *
- */
-
-#include "cpmastervolumevaluecontroller.h"
-#include <cpitemdatahelper.h>
-#include <hbdataformmodelitem.h>
-
-#ifdef Q_OS_SYMBIAN
- #include <cpprofilemodel.h>
-#endif
-
-CpMasterVolumeValueController::CpMasterVolumeValueController(CpProfileModel *profileModel,
- HbDataFormModelItem *masterVolumeItem,
- CpItemDataHelper &itemDataHelper)
- : mProfileModle(profileModel),
- mMasterVolumeItem(masterVolumeItem)
-{
- itemDataHelper.addConnection(mMasterVolumeItem,SIGNAL(beepActivated()),this,SLOT(onBeepActivated()));
- itemDataHelper.addConnection(mMasterVolumeItem,SIGNAL(silentActivated()),this,SLOT(onSilentActivated()));
- itemDataHelper.addConnection(mMasterVolumeItem,SIGNAL(normalValueChanged(int)),this,SLOT(onNormalValueChanged(int)));
- updateMasterVolumeValue();
-}
-
-CpMasterVolumeValueController::~CpMasterVolumeValueController()
-{
-
-}
-
-void CpMasterVolumeValueController::onBeepActivated()
-{
-#ifdef Q_OS_SYMBIAN
- mProfileModle->activateBeep();
-#endif
-}
-
-void CpMasterVolumeValueController::onSilentActivated()
-{
-#ifdef Q_OS_SYMBIAN
- mProfileModle->activateSilent();
-#endif
-}
-
-void CpMasterVolumeValueController::onNormalValueChanged(int value)
-{
-#ifdef Q_OS_SYMBIAN
- mProfileModle->setRingVolume(value);
-#endif
-}
-
-void CpMasterVolumeValueController::updateMasterVolumeValue()
-{
-#ifdef Q_OS_SYMBIAN
- if (mProfileModle->isBeep()) {
- mMasterVolumeItem->setContentWidgetData(QString("beepMode"),QVariant(true));
- }
- else if (mProfileModle->isSilent()) {
- mMasterVolumeItem->setContentWidgetData(QString("silentMode"),QVariant(true));
- }
- else {
- mMasterVolumeItem->setContentWidgetData(QString("normalValue"),QVariant(mProfileModle->ringVolume()));
- }
-#endif
-}
-
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cpmastervolumevaluecontroller.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPMASTERVOLUMEVALUECONTROLLER_H
-#define CPMASTERVOLUMEVALUECONTROLLER_H
-
-#include <qobject>
-
-class CpProfileModel;
-class HbDataFormModelItem;
-class CpItemDataHelper;
-
-class CpMasterVolumeValueController : public QObject
-{
- Q_OBJECT
-public:
- CpMasterVolumeValueController(CpProfileModel *profileModel,
- HbDataFormModelItem *masterVolumeItem,
- CpItemDataHelper &itemDataHelper);
- virtual ~CpMasterVolumeValueController();
-private slots:
- void onBeepActivated();
- void onSilentActivated();
- void onNormalValueChanged(int value);
-private:
- void updateMasterVolumeValue();
-private:
- CpProfileModel *mProfileModle;
- HbDataFormModelItem *mMasterVolumeItem;
-};
-
-#endif
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cppersonalizationcustomviewitem.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cppersonalizationcustomviewitem.h"
-#include "cpmastervolumeslider.h"
-#include <hbdataformmodelitem.h>
-#include <hbdataformmodel.h>
-#include <hbabstractitemview.h>
-
-CpPersonalizationCustomViewItem::CpPersonalizationCustomViewItem(QGraphicsItem *parent )
- : HbDataFormViewItem(parent)
-{
-}
-CpPersonalizationCustomViewItem::~CpPersonalizationCustomViewItem()
-{
-}
-HbAbstractViewItem* CpPersonalizationCustomViewItem::createItem()
-{
- return new CpPersonalizationCustomViewItem(*this);
-}
-bool CpPersonalizationCustomViewItem::canSetModelIndex(const QModelIndex &index) const
-{
- int type = index.data(HbDataFormModelItem::ItemTypeRole).toInt();
- if (type == MasterVolumeSliderItem) {
- return true;
- }
- else {
- return false;
- }
-}
-
-HbWidget *CpPersonalizationCustomViewItem::createCustomWidget()
-{
- int type = modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt();
- if (type == MasterVolumeSliderItem) {
- CpMasterVolumeSlider *masterVolumeSlider = new CpMasterVolumeSlider();
- connect(masterVolumeSlider, SIGNAL(valueChanged(int)), this, SLOT(onValueChanged(int)));
- return masterVolumeSlider;
- }
- else {
- return 0;
- }
-}
-void CpPersonalizationCustomViewItem::onValueChanged(int value)
-{
- HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
- modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
-
- if(itemType == MasterVolumeSliderItem) {
-
- QModelIndex itemIndex = modelIndex();
- HbDataFormModel *model = static_cast<HbDataFormModel*>(itemView()->model());;
- HbDataFormModelItem *modelItem = static_cast<HbDataFormModelItem*>(
- model->itemFromIndex(itemIndex));
- modelItem->setContentWidgetData("value",value);
- }
-}
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cppersonalizationcustomviewitem.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CP_PERSONALIZATION_CUSTOMVIEWITEM_H
-#define CP_PERSONALIZATION_CUSTOMVIEWITEM_H
-
-#include <hbdataformviewitem.h>
-#include <hbdataformmodelitem.h>
-
-const int MasterVolumeSliderItem = HbDataFormModelItem::CustomItemBase+21;
-
-class CpPersonalizationCustomViewItem: public HbDataFormViewItem
-{
- Q_OBJECT
-public:
- explicit CpPersonalizationCustomViewItem(QGraphicsItem *parent = 0);
- ~CpPersonalizationCustomViewItem();
- virtual HbAbstractViewItem* createItem();
- virtual bool canSetModelIndex(const QModelIndex &index) const;
-private slots:
- void onValueChanged(int value);
-protected:
- virtual HbWidget* createCustomWidget();
-};
-#endif
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cppersonalizationgroupitemdata.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cppersonalizationgroupitemdata.h"
-#include <hbdataformmodelitem.h>
-#include <cpsettingformentryitemdataimpl.h>
-#include <cpbasesettingview.h>
-#include <cpitemdatahelper.h>
-#include <hbmessagebox.h>
-#include "cppersonalizationcustomviewitem.h"
-#include "cpmastervolumevaluecontroller.h"
-
-#ifdef Q_OS_SYMBIAN
-#include <cpprofilemodel.h>
-#endif
-
-
-CpPersonalizationGroupItemData::CpPersonalizationGroupItemData(HbDataFormModelItem::DataItemType type,
- const QString &label,
- const QString &configFile,
- const HbDataFormModelItem *parent):
- CpCategorySettingFormItemData(type, label, configFile, parent),
- mMasterVolume(0),
- mMasterVibra(0),
- mRingTone(0),
- mMessageTone(0),
- mEmailTone(0),
- mReminderTone(0),
- mClockTone(0),
- mProfileModel(0),
- mMasterVolumeValueController(0)
-{
-#ifdef Q_OS_SYMBIAN
- mProfileModel = new CpProfileModel();
-#endif
-}
-
-CpPersonalizationGroupItemData::~CpPersonalizationGroupItemData()
-{
-#ifdef Q_OS_SYMBIAN
- delete mProfileModel;
-#endif
- delete mMasterVolumeValueController;
-}
-
-void CpPersonalizationGroupItemData::beforeLoadingConfigPlugins(CpItemDataHelper &itemDataHelper)
-{
- itemDataHelper.addItemPrototype(new CpPersonalizationCustomViewItem);
-
- mMasterVolume = new HbDataFormModelItem(static_cast<HbDataFormModelItem::DataItemType>(MasterVolumeSliderItem));
- mMasterVolumeValueController = new CpMasterVolumeValueController(mProfileModel,mMasterVolume,itemDataHelper);
-
- //mMasterVolume->setContentWidgetData("maxmum",10);
- //mMasterVolume->setContentWidgetData("minmum",1);
- //itemDataHelper.addConnection(mMasterVolume,SIGNAL(valueChanged (int)),this,SLOT(masterVolumeValueChanged(int)) );
- this->appendChild(mMasterVolume);
- mMasterVibra = new HbDataFormModelItem(HbDataFormModelItem::CheckBoxItem,
- QString());
- mMasterVibra->setContentWidgetData("text",QObject::tr("Vibrating alerts"));
- itemDataHelper.addConnection(mMasterVibra,SIGNAL(stateChanged(int)),this,SLOT(onVibraValueChange(int)));
-#ifdef Q_OS_SYMBIAN
- if (mProfileModel->vibraStatus()) {
- mMasterVibra->setContentWidgetData("checkState", Qt::Checked);
- }
- else {
- mMasterVibra->setContentWidgetData("checkState", Qt::Unchecked);
- }
-#endif
- this->appendChild(mMasterVibra);
-
-
-
- mRingTone = new CpSettingFormEntryItemDataImpl<CpBaseSettingView>(itemDataHelper,
- tr("Ring tone"),
- tr("Nokia tone"));
- this->appendChild(mRingTone);
- mMessageTone = new CpSettingFormEntryItemDataImpl<CpBaseSettingView>(itemDataHelper,
- tr("Message tone"),
- tr("Nokia message tone"));
- this->appendChild(mMessageTone);
- mEmailTone = new CpSettingFormEntryItemDataImpl<CpBaseSettingView>(itemDataHelper,
- tr("E-mail tone"),
- tr("Nokia e-mail tone"));
- this->appendChild(mEmailTone);
- mReminderTone = new CpSettingFormEntryItemDataImpl<CpBaseSettingView>(itemDataHelper,
- tr("Reminder tone"),
- tr("Nokia calendar tone"));
- this->appendChild(mReminderTone);
- mClockTone = new CpSettingFormEntryItemDataImpl<CpBaseSettingView>(itemDataHelper,
- tr("Clock tone"),
- tr("Nokia clock tone"));
- this->appendChild(mClockTone);
-
-
-}
-
-void CpPersonalizationGroupItemData::masterVolumeValueChanged(int value)
-{
- Q_UNUSED(value);
- HbMessageBox::launchInformationMessageBox(QString("volume changed to:%1").arg(value));
-}
-void CpPersonalizationGroupItemData::onVibraValueChange(int isVibra)
-{
- //Q_UNUSED(isVibra);
-#ifdef Q_OS_SYMBIAN
- if (isVibra) {
- mProfileModel->setVibraStatus(true);
- }
- else {
- mProfileModel->setVibraStatus(false);
- }
-#endif
-}
-
-
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cppersonalizationgroupitemdata.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPPERSONALIZATIONGROUPITEMDATA_H
-#define CPPERSONALIZATIONGROUPITEMDATA_H
-
-#include <qobject>
-#include <cpcategorysettingformitemdata.h>
-
-class CpProfileModel;
-class CpItemDataHelper;
-class CpSettingFormEntryItemData;
-class CpMasterVolumeValueController;
-
-class CpPersonalizationGroupItemData: public CpCategorySettingFormItemData
-{
- Q_OBJECT
-public:
- CpPersonalizationGroupItemData(HbDataFormModelItem::DataItemType type,
- const QString &label,
- const QString &configFile = QString(),
- const HbDataFormModelItem *parent = 0);
-
- ~CpPersonalizationGroupItemData();
-private slots:
- void masterVolumeValueChanged(int value);
- void onVibraValueChange(int isVibra);
-private:
- virtual void beforeLoadingConfigPlugins(CpItemDataHelper &itemDataHelper);
-private:
- HbDataFormModelItem *mMasterVolume;
- HbDataFormModelItem *mMasterVibra;
- CpSettingFormEntryItemData *mRingTone;
- CpSettingFormEntryItemData *mMessageTone;
- CpSettingFormEntryItemData *mEmailTone;
- CpSettingFormEntryItemData *mReminderTone;
- CpSettingFormEntryItemData *mClockTone;
- CpProfileModel *mProfileModel;
- CpMasterVolumeValueController *mMasterVolumeValueController;
-};
-
-#endif /* CPPERSONALIZATIONGROUPITEMDATA_H */
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cppersonalizationplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cppersonalizationplugin.h"
-#include "cppersonalizationgroupitemdata.h"
-#include <cpcategorysettingformitemdata.h>
-#include <cpitemdatahelper.h>
-
-CpPersonalizationPlugin::CpPersonalizationPlugin()
-{
-}
-
-CpPersonalizationPlugin::~CpPersonalizationPlugin()
-{
-}
-
-CpSettingFormItemData *CpPersonalizationPlugin::createSettingFormItemData(CpItemDataHelper &/*itemDataHelper*/) const
-{
- CpPersonalizationGroupItemData *itemData =
- new CpPersonalizationGroupItemData(
- HbDataFormModelItem::GroupItem,
- QString("Tones"),
- QString("cppersonalizationplugin.cpcfg") );
- return itemData;
-}
-
-Q_EXPORT_PLUGIN2(cppersonalizationplugin, CpPersonalizationPlugin);
-
-
--- a/controlpanel/src/cpplugins/personalizationplugin/src/cppersonalizationplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPPERSONALIZATIONPLUGIN_H
-#define CPPERSONALIZATIONPLUGIN_H
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpPersonalizationPlugin
- : public QObject,
- public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpPersonalizationPlugin();
- virtual ~CpPersonalizationPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif /* CPPERSONALIZATIONPLUGIN_H */
-
-
--- a/controlpanel/src/cpplugins/pincodeplugin/pincodeplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#
-# 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: cppincodeplugin source files
-#
-
-# Input
-HEADERS += src/*.h
-SOURCES += src/*.cpp
-
-INCLUDEPATH += ../../seccodeui/src
\ No newline at end of file
--- a/controlpanel/src/cpplugins/pincodeplugin/pincodeplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cppincodeplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework -lseccodeui
-
-include ( ../cpplugincommon.pri )
-include ( pincodeplugin.pri )
-
-symbian {
- TARGET.UID3 = 0X20028731
-}
\ No newline at end of file
--- a/controlpanel/src/cpplugins/pincodeplugin/src/cppincodeplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cppincodeplugin.h"
-#include "cppincodepluginview.h"
-#include <cpsettingformentryitemdataimpl.h>
-
-CpPinCodePlugin::CpPinCodePlugin()
-{
-}
-
-CpPinCodePlugin::~CpPinCodePlugin()
-{
-}
-
-CpSettingFormItemData *CpPinCodePlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
-{
- return new CpSettingFormEntryItemDataImpl<CpPinCodePluginView>(
- itemDataHelper,tr("PIN code"),QString());
-}
-
-Q_EXPORT_PLUGIN2(cppincodeplugin, CpPinCodePlugin);
--- a/controlpanel/src/cpplugins/pincodeplugin/src/cppincodeplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPPINCODEPLUGIN_H
-#define CPPINCODEPLUGIN_H
-
-#include <QObject.h>
-#include <cppluginplatinterface.h>
-
-class CpPinCodePlugin : public QObject, public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpPinCodePlugin();
- virtual ~CpPinCodePlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif //CPPINCODEPLUGIN_H
--- a/controlpanel/src/cpplugins/pincodeplugin/src/cppincodepluginview.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cppincodepluginview.h"
-#include <hbdataform.h>
-#include <hbdataformmodel.h>
-#include <hbdataformmodelitem.h>
-#include <hblineedit.h>
-#include <seccodeeditdataformviewitem.h>
-#include <seccodesettings.h>
-
-CpPinCodePluginView::CpPinCodePluginView(QGraphicsItem *parent /*= 0*/)
-: CpBaseSettingView(0,parent), mSecCodeSettings(new SecCodeSettings())
-{
- if (HbDataForm *form = settingForm()) {
-
- QList<HbAbstractViewItem *> protoTypeList = form->itemPrototypes();
- protoTypeList.append(new SecCodeEditDataFormViewItem());
- form->setItemPrototypes(protoTypeList);
-
- form->setHeading(tr("PIN code"));
-
- HbDataFormModel *formModel = new HbDataFormModel();
-
- HbDataFormModelItem *pinCodeRequestItem = new HbDataFormModelItem(
- HbDataFormModelItem::ToggleValueItem,tr("PIN code requests"));
-
- pinCodeRequestItem->setContentWidgetData("text",tr("On"));
- pinCodeRequestItem->setContentWidgetData("additionalText",tr("Off"));
-
- formModel->appendDataFormItem(pinCodeRequestItem);
-
- HbDataFormModelItem *pinCodeItem = new HbDataFormModelItem(
- static_cast<HbDataFormModelItem::DataItemType>(SecCodeEditDataFormViewItem::SecCodeEditItem),
- tr("PIN code"));
- pinCodeItem->setContentWidgetData("echoMode",HbLineEdit::Password);
- pinCodeItem->setContentWidgetData("text","1111");
- pinCodeItem->setContentWidgetData("readOnly",true);
- form->addConnection(pinCodeItem,SIGNAL(clicked()),this,SLOT(onPinCodeClicked()));
-
- formModel->appendDataFormItem(pinCodeItem);
-
- HbDataFormModelItem *pin2CodeItem = new HbDataFormModelItem(
- static_cast<HbDataFormModelItem::DataItemType>(SecCodeEditDataFormViewItem::SecCodeEditItem),
- tr("PIN2 code"));
- pin2CodeItem->setContentWidgetData("echoMode",HbLineEdit::Password);
- pin2CodeItem->setContentWidgetData("text","1111");
- pin2CodeItem->setContentWidgetData("readOnly",true);
- form->addConnection(pin2CodeItem,SIGNAL(clicked()),this,SLOT(onPin2CodeClicked()));
-
- formModel->appendDataFormItem(pin2CodeItem);
-
- form->setModel(formModel);
- }
-}
-
-CpPinCodePluginView::~CpPinCodePluginView()
-{
- delete mSecCodeSettings;
-}
-
-void CpPinCodePluginView::onPinCodeClicked()
-{
- mSecCodeSettings->changePinCode();
-}
-
-void CpPinCodePluginView::onPin2CodeClicked()
-{
- mSecCodeSettings->changePin2Code();
-}
--- a/controlpanel/src/cpplugins/pincodeplugin/src/cppincodepluginview.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPPINCODEPLUGINVIEW_H
-#define CPPINCODEPLUGINVIEW_H
-
-#include <cpbasesettingview.h>
-
-class SecCodeSettings;
-class CpPinCodePluginView : public CpBaseSettingView
-{
- Q_OBJECT
-public:
- explicit CpPinCodePluginView(QGraphicsItem *parent = 0);
- virtual ~CpPinCodePluginView();
-private slots:
- void onPinCodeClicked();
- void onPin2CodeClicked();
-private:
- SecCodeSettings *mSecCodeSettings;
-};
-
-#endif //CPPINCODEPLUGINVIEW_H
--- a/controlpanel/src/cpplugins/placeholdernoiconplugin/placeholdernoiconplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# 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: cpplaceholderplugin source files
-#
-
-# Input
-HEADERS += src/cpplaceholderplugin.h \
- src/cpplaceholderentryitemdata.h
-
-SOURCES += src/cpplaceholderplugin.cpp \
- src/cpplaceholderentryitemdata.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/placeholdernoiconplugin/placeholdernoiconplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpplaceholdernoiconplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( placeholdernoiconplugin.pri )
-
-symbian: {
- TARGET.UID3 = 0X20025FDD
-}
--- a/controlpanel/src/cpplugins/placeholdernoiconplugin/src/cpplaceholderentryitemdata.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:
-*
-*/
-#include "cpplaceholderentryitemdata.h"
-#include <cpbasesettingview.h>
-#include <hblabel.h>
-#include <cpitemdatahelper.h>
-#include <hbdataform.h>
-
-CpPlaceholderEntryItemData::CpPlaceholderEntryItemData(CpItemDataHelper &itemDataHelper)
-: CpSettingFormEntryItemData(itemDataHelper)
-{
-
-}
-
-CpPlaceholderEntryItemData::~CpPlaceholderEntryItemData()
-{
-}
-
-CpBaseSettingView *CpPlaceholderEntryItemData::createSettingView() const
-{
- HbDataForm *dataform = new HbDataForm();
- dataform->setHeading(text());
- CpBaseSettingView *view = new CpBaseSettingView(dataform);
- return view;
-}
--- a/controlpanel/src/cpplugins/placeholdernoiconplugin/src/cpplaceholderentryitemdata.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef CPPLACEHOLDERENTRYITEMDATA_H
-#define CPPLACEHOLDERENTRYITEMDATA_H
-
-#include <cpsettingformentryitemdata.h>
-
-class CpItemDataHelper;
-class CpPlaceholderEntryItemData : public CpSettingFormEntryItemData
-{
-public:
- explicit CpPlaceholderEntryItemData(CpItemDataHelper &itemDataHelper);
- virtual ~CpPlaceholderEntryItemData();
-private:
- virtual CpBaseSettingView *createSettingView() const;
-};
-
-#endif /* CPPLACEHOLDERENTRYITEMDATA_H */
--- a/controlpanel/src/cpplugins/placeholdernoiconplugin/src/cpplaceholderplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpplaceholderplugin.h"
-#include "cpplaceholderentryitemdata.h"
-
-CpPlaceholderPlugin::CpPlaceholderPlugin()
-{
-}
-
-CpPlaceholderPlugin::~CpPlaceholderPlugin()
-{
-}
-
-CpSettingFormItemData *CpPlaceholderPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
-{
- return new CpPlaceholderEntryItemData(itemDataHelper);
-}
-
-Q_EXPORT_PLUGIN2(cpplaceholderplugin, CpPlaceholderPlugin);
--- a/controlpanel/src/cpplugins/placeholdernoiconplugin/src/cpplaceholderplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPPLACEHOLDERPLUGIN_H
-#define CPPLACEHOLDERPLUGIN_H
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpPlaceholderPlugin : public QObject, public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpPlaceholderPlugin();
- virtual ~CpPlaceholderPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif //CPPLACEHOLDERPLUGIN_H
--- a/controlpanel/src/cpplugins/placeholderplugin/image/qgn_menu_note.svg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +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="100%" height="100%" viewBox="0 0 88 88">
-<linearGradient id="_20" gradientUnits="userSpaceOnUse" x1="46.99" y1="48.62" x2="57.59" y2="67.17">
-<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(#_20)" d="M37.755,14.563c-0.625-0.15-3.215-0.771-3.215-0.771l-6.344,9.318 C14.325,41.71,3.561,47.928,2.801,48.401l6.468,2.128l-1.694,2.4l1.111,3.48l41.153,18.198l14.238-26.409l16.804-2.157l2.899-4.356 l-1.079-7.683l-3.737-4.507l-5.312,0.944l0.463-0.857l0.251-6.262c0,0-4.423-1.069-4.374-1.063 c-0.755-3.548-4.226-3.896-6.26-1.475c-0.013-0.005-2.825-0.708-2.818-0.712c-0.742-3.492-4.2-3.939-6.269-1.469 c-0.004-0.012-2.582-0.668-2.595-0.661c-0.749-3.501-4.18-3.806-6.163-1.437c-0.027,0.008-2.09-0.508-2.088-0.523 C43.063,12.593,39.706,12.258,37.755,14.563z"/>
-<polygon fill="#FFFFFF" points="35.11,15.12 8.336,53.049 48.798,69.047 72.646,28.459 73.573,25.04 "/>
-<linearGradient id="_21" gradientUnits="userSpaceOnUse" x1="30.63" y1="59.56" x2="27.89" y2="65.83">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#496DA2" offset="0.71"/>
-<stop stop-color="#235487" offset="0.99"/>
-</linearGradient>
-<polygon fill="url(#_21)" points="8.45,52.959 48.528,68.704 49.52,73.706 9.246,55.897 "/>
-<linearGradient id="_22" gradientUnits="userSpaceOnUse" x1="56.86" y1="45.11" x2="69.16" y2="54.68">
-<stop stop-color="#DEE9F3" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_22)" points="48.528,68.704 73.633,23.86 73.411,29.393 49.52,73.706 "/>
-<linearGradient id="_23" gradientUnits="userSpaceOnUse" x1="4.44" y1="38.62" x2="45.79" y2="38.62">
-<stop stop-color="#CADCEC" offset="0"/>
-<stop stop-color="#87A8CB" offset="1"/>
-</linearGradient>
-<path fill="url(#_23)" d="M34.894,14.715C18.737,39.471,4.443,48.209,4.443,48.209 c7.75,2.391,41.35,14.314,41.35,14.314L34.894,14.715z"/>
-<linearGradient id="_24" gradientUnits="userSpaceOnUse" x1="15.64" y1="58.6" x2="44.93" y2="34.82">
-<stop stop-color="#FFFFFF" offset="0.15"/>
-<stop stop-color="#A2C2DD" offset="1"/>
-</linearGradient>
-<path fill="url(#_24)" d="M10.557,50.247c11.41,4.494,35.236,12.277,35.236,12.277 c15.358-11.682,27.74-38.658,27.74-38.658l-38.697-9.279L10.557,50.247z"/>
-<linearGradient id="_25" gradientUnits="userSpaceOnUse" x1="68.03" y1="52.73" x2="41.63" y2="18.62">
-<stop stop-color="#FFFFFF" offset="0"/>
-<stop stop-color="#496DA2" offset="0.71"/>
-<stop stop-color="#235487" offset="0.99"/>
-</linearGradient>
-<polygon fill="url(#_25)" points="33.619,23.77 33.263,24.6 64.586,33.327 64.445,31.303 "/>
-<polygon fill="url(#_25)" points="30.349,28.944 29.959,29.764 60.965,39.577 60.895,37.549 "/>
-<polygon fill="url(#_25)" points="26.981,34.229 26.567,35.036 57.195,45.958 57.195,43.926 "/>
-<polyline fill="url(#_25)" points="37.03,44.815 23.809,40.569 23.396,41.375 34.393,45.297 37.03,44.815 "/>
-<path fill="#3F5AA6" d="M37.265,17.37c-1.227,0.744-1.05,2.494,0.11,3.184c1.821,1.088,4.019-0.83,2.968-2.572 c0.449-1.01,1.511-1.695,1.794-1.643l1.055,0.223C42.339,13.018,37.265,17.37,37.265,17.37z"/>
-<linearGradient id="_29" gradientUnits="userSpaceOnUse" x1="39.83" y1="18.64" x2="40.83" y2="14.3">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#CADCEC" offset="0.5"/>
-<stop stop-color="#87A8CB" offset="1"/>
-</linearGradient>
-<path fill="url(#_29)" d="M38.914,19.569c-0.589,0.107-1.317-0.102-1.613-0.867c-0.736-5.027,5.301-6.996,5.913-2.141 C42.121,14.176,39.059,15.401,38.914,19.569z"/>
-<path fill="#3F5AA6" d="M45.395,19.34c-1.25,0.758-1.071,2.543,0.112,3.248c1.859,1.107,4.099-0.848,3.027-2.625 c0.458-1.031,1.542-1.729,1.83-1.676l1.076,0.227C50.57,14.901,45.395,19.34,45.395,19.34z"/>
-<path fill="url(#_29)" d="M47.076,21.584c-0.601,0.107-1.342-0.105-1.645-0.887c-0.75-5.129,5.407-7.137,6.031-2.184 C50.348,16.081,47.225,17.331,47.076,21.584z"/>
-<path fill="#3F5AA6" d="M54.135,21.483c-1.274,0.775-1.092,2.594,0.114,3.314c1.897,1.129,4.181-0.863,3.088-2.678 c0.468-1.051,1.574-1.762,1.867-1.709l1.099,0.232C59.414,16.956,54.135,21.483,54.135,21.483z"/>
-<path fill="url(#_29)" d="M55.85,23.772c-0.611,0.111-1.367-0.107-1.676-0.902c-0.767-5.232,5.515-7.281,6.151-2.227 C59.188,18.161,56.002,19.436,55.85,23.772z"/>
-<path fill="#3F5AA6" d="M63.214,23.67c-1.275,0.775-1.093,2.596,0.114,3.314c1.897,1.131,4.181-0.863,3.088-2.678 c0.467-1.051,1.573-1.762,1.867-1.709l1.098,0.23C68.493,19.143,63.214,23.67,63.214,23.67z"/>
-<path fill="url(#_29)" d="M64.929,25.959c-0.612,0.111-1.368-0.105-1.677-0.902c-0.766-5.23,5.515-7.279,6.151-2.229 C68.267,20.348,65.081,21.624,64.929,25.959z"/>
-<linearGradient id="_33" gradientUnits="userSpaceOnUse" x1="39.98" y1="48.02" x2="38.35" y2="40.21">
-<stop stop-color="#81C7C8" offset="0"/>
-<stop stop-color="#BFDAE1" offset="0.01"/>
-<stop stop-color="#FFFFFF" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_33)" points="44.766,36.286 32.146,45.174 47.337,49.641 "/>
-<linearGradient id="_34" gradientUnits="userSpaceOnUse" x1="76.2" y1="30.96" x2="76.09" y2="43.23">
-<stop stop-color="#D6E6EC" offset="0"/>
-<stop stop-color="#298595" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_34)" points="78.675,30.256 82.024,34.297 83.039,41.52 80.464,45.389 69.202,39.09 "/>
-<linearGradient id="_35" gradientUnits="userSpaceOnUse" x1="32.44" y1="33.5" x2="65.81" y2="41.63">
-<stop stop-color="#D6E6EC" offset="0"/>
-<stop stop-color="#298595" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_35)" points="76.59,34.737 77.632,41.426 45.104,46.104 44.105,39.893 "/>
-<linearGradient id="_36" gradientUnits="userSpaceOnUse" x1="30.73" y1="46.42" x2="88.73" y2="44.8">
-<stop stop-color="#E6EEF4" offset="0"/>
-<stop stop-color="#2F8E9A" offset="0.44"/>
-<stop stop-color="#003D6D" offset="0.94"/>
-</linearGradient>
-<polygon fill="url(#_36)" points="77.632,41.426 80.464,45.389 47.337,49.641 45.104,46.104 "/>
-<linearGradient id="_37" gradientUnits="userSpaceOnUse" x1="45.63" y1="37.46" x2="101.75" y2="28.96">
-<stop stop-color="#D6E6EC" offset="0"/>
-<stop stop-color="#298595" offset="1"/>
-</linearGradient>
-<polygon fill="url(#_37)" points="76.59,34.737 78.675,30.256 44.766,36.286 44.105,39.893 "/>
-<linearGradient id="_38" gradientUnits="userSpaceOnUse" x1="35.44" y1="45.89" x2="34.76" y2="40.93">
-<stop stop-color="#235487" offset="0"/>
-<stop stop-color="#496DA2" offset="0.5"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_38)" d="M38.261,40.885l-6.462,4.201l7.347,2.1C38.319,46.098,37.854,42.79,38.261,40.885z"/>
-<rect fill="none" height="88" width="88"/>
-</svg>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/placeholderplugin/placeholderplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# 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: cpplaceholderplugin source files
-#
-
-# Input
-HEADERS += src/cpplaceholderplugin.h \
- src/cpplaceholderentryitemdata.h
-
-SOURCES += src/cpplaceholderplugin.cpp \
- src/cpplaceholderentryitemdata.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/placeholderplugin/placeholderplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpplaceholderplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-RESOURCES += placeholderplugin.qrc
-
-include ( ../cpplugincommon.pri )
-include ( placeholderplugin.pri )
-
-symbian: {
- TARGET.UID3 = 0X20025FE8
-}
--- a/controlpanel/src/cpplugins/placeholderplugin/placeholderplugin.qrc Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>image/qgn_menu_note.svg</file>
- </qresource>
-</RCC>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/placeholderplugin/src/cpplaceholderentryitemdata.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:
-*
-*/
-#include "cpplaceholderentryitemdata.h"
-#include <cpbasesettingview.h>
-#include <hblabel.h>
-#include <cpitemdatahelper.h>
-#include <hbdataform.h>
-
-CpPlaceholderEntryItemData::CpPlaceholderEntryItemData(CpItemDataHelper &itemDataHelper)
-: CpSettingFormEntryItemData(itemDataHelper)
-{
- this->setEntryItemIcon(HbIcon(":/image/qgn_menu_note.svg"));
-}
-
-CpPlaceholderEntryItemData::~CpPlaceholderEntryItemData()
-{
-}
-
-CpBaseSettingView *CpPlaceholderEntryItemData::createSettingView() const
-{
- HbDataForm *dataform = new HbDataForm();
- dataform->setHeading(text());
- CpBaseSettingView *view = new CpBaseSettingView(dataform);
- return view;
-}
--- a/controlpanel/src/cpplugins/placeholderplugin/src/cpplaceholderentryitemdata.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef CPPLACEHOLDERENTRYITEMDATA_H
-#define CPPLACEHOLDERENTRYITEMDATA_H
-
-#include <cpsettingformentryitemdata.h>
-
-class CpItemDataHelper;
-class CpPlaceholderEntryItemData : public CpSettingFormEntryItemData
-{
-public:
- explicit CpPlaceholderEntryItemData(CpItemDataHelper &itemDataHelper);
- virtual ~CpPlaceholderEntryItemData();
-private:
- virtual CpBaseSettingView *createSettingView() const;
-};
-
-#endif /* CPPLACEHOLDERENTRYITEMDATA_H */
--- a/controlpanel/src/cpplugins/placeholderplugin/src/cpplaceholderplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpplaceholderplugin.h"
-#include "cpplaceholderentryitemdata.h"
-
-CpPlaceholderPlugin::CpPlaceholderPlugin()
-{
-}
-
-CpPlaceholderPlugin::~CpPlaceholderPlugin()
-{
-}
-
-CpSettingFormItemData *CpPlaceholderPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
-{
- return new CpPlaceholderEntryItemData(itemDataHelper);
-}
-
-Q_EXPORT_PLUGIN2(cpplaceholderplugin, CpPlaceholderPlugin);
--- a/controlpanel/src/cpplugins/placeholderplugin/src/cpplaceholderplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * 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:
- *
- */
-#ifndef CPPLACEHOLDERPLUGIN_H
-#define CPPLACEHOLDERPLUGIN_H
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpPlaceholderPlugin : public QObject, public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpPlaceholderPlugin();
- virtual ~CpPlaceholderPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif //CPPLACEHOLDERPLUGIN_H
--- a/controlpanel/src/cpplugins/privacyplugin/data/cpprivacyplugin.cpcfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<childplugins>
- <plugin displayname = "Pin code" id = "0X20028731" dll = "cppincodeplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Device lock" id = "0X20028732" dll = "cpdevicelockplugin.dll">
- <desc></desc>
- </plugin>
-
- <plugin displayname = "Advanced security" id = "0X20025FDD" dll = "cpplaceholdernoiconplugin.dll">
- <desc></desc>
- </plugin>
-
-</childplugins>
\ No newline at end of file
--- a/controlpanel/src/cpplugins/privacyplugin/privacyplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#
-# 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: cpprivacyplugin source files
-#
-
-# Input
-HEADERS += src/cpprivacyplugin.h
-SOURCES += src/cpprivacyplugin.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/privacyplugin/privacyplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# 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:
-#
-
-
-TEMPLATE = lib
-TARGET = cpprivacyplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( privacyplugin.pri )
-
-symbian: {
- TARGET.UID3 = 0x20025FE1
-}
-
-symbian {
- deploy.path = C:
- headers.sources = data/cpprivacyplugin.cpcfg
- headers.path = /resource/qt/plugins/controlpanel/config
- DEPLOYMENT += exportheaders
-
- # This is for new exporting system coming in garden
- for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$deploy.path$$headers.path/$$basename(header)"
-}
\ No newline at end of file
--- a/controlpanel/src/cpplugins/privacyplugin/src/cpprivacyplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cpprivacyplugin.h"
-#include <cpcategorysettingformitemdata.h>
-#include <cpitemdatahelper.h>
-
-CpPrivacyPlugin::CpPrivacyPlugin()
-{
-
-}
-
-CpPrivacyPlugin::~CpPrivacyPlugin()
-{
-
-}
-
-CpSettingFormItemData *CpPrivacyPlugin::createSettingFormItemData(CpItemDataHelper &/*itemDataHelper*/) const
-{
- CpCategorySettingFormItemData *itemData =
- new CpCategorySettingFormItemData(
- HbDataFormModelItem::GroupItem,
- tr("Security"),
- QString("cpprivacyplugin.cpcfg") );
- return itemData;
-}
-
-Q_EXPORT_PLUGIN2(cpprivacyplugin, CpPrivacyPlugin);
--- a/controlpanel/src/cpplugins/privacyplugin/src/cpprivacyplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPPRIVACYPLUGIN_H
-#define CPPRIVACYPLUGIN_H
-
-#include <cppluginplatinterface.h>
-#include <qobject.h>
-
-class CpPrivacyPlugin: public QObject,public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpPrivacyPlugin();
- virtual ~CpPrivacyPlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif /* CPPRIVACYPLUGIN_H */
--- a/controlpanel/src/cpplugins/themeplugin/src/cpthemeplugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * 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:
- *
- */
-#include "cpthemeplugin.h"
-#include "cpthemepluginentryitemdata.h"
-
-CpThemePlugin::CpThemePlugin()
-{
-}
-
-CpThemePlugin::~CpThemePlugin()
-{
-}
-
-CpSettingFormItemData *CpThemePlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
-{
- CpSettingFormEntryItemData *entryItem = new CpThemePluginEntryItemData(
- itemDataHelper,tr("Theme"),tr("Name of the Theme"),HbIcon(":/image/qgn_menu_note.svg"));
- return entryItem;
-}
-
-Q_EXPORT_PLUGIN2(cpthemeplugin, CpThemePlugin);
--- a/controlpanel/src/cpplugins/themeplugin/src/cpthemeplugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPTHEMEPLUGIN_H
-#define CPTHEMEPLUGIN_H
-
-#include <qobject.h>
-#include <cppluginplatinterface.h>
-
-class CpThemePlugin : public QObject, public CpPluginPlatInterface
-{
- Q_OBJECT
- Q_INTERFACES(CpPluginPlatInterface)
-public:
- CpThemePlugin();
- virtual ~CpThemePlugin();
- virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif //CPTHEMEPLUGIN_H
--- a/controlpanel/src/cpplugins/themeplugin/src/cpthemepluginentryitemdata.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * 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:
- *
- */
-
-#include "cpthemepluginentryitemdata.h"
-#include <cpitemdatahelper.h>
-#include <hbfiledialog.h>
-#include <hbaction.h>
-#include <QFileInfo.h>
-
-CpThemePluginEntryItemData::CpThemePluginEntryItemData(CpItemDataHelper &itemDataHelper,
- const QString &text /*= QString()*/,
- const QString &description /*= QString()*/,
- const HbIcon &icon /*= HbIcon()*/,
- const HbDataFormModelItem *parent /*= 0*/)
- : CpSettingFormEntryItemData(itemDataHelper,
- text,
- description,
- icon,
- parent)
-{
-}
-
-CpThemePluginEntryItemData::~CpThemePluginEntryItemData()
-{
-}
-
-void CpThemePluginEntryItemData::onLaunchView()
-{
- HbFileDialog *dlg = new HbFileDialog();
- dlg->setDirectory(QString("C:/ControlPanel/resource"));
- dlg->setTitle("Select file:");
- dlg->setPrimaryActionText(QString("Done"));
- dlg->setSecondaryActionText(QString("Close"));
- QString filePath = dlg->getFileName();
- if (!filePath.isEmpty()) {
- setDescription(QFileInfo(filePath).baseName());
- setEntryItemIcon(HbIcon(filePath));
- }
- delete dlg;
-}
-
-CpBaseSettingView *CpThemePluginEntryItemData::createSettingView() const
-{
- return 0;
-}
--- a/controlpanel/src/cpplugins/themeplugin/src/cpthemepluginentryitemdata.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef CPTHEMEPLUGINENTRYITEMDATA_H
-#define CPTHEMEPLUGINENTRYITEMDATA_H
-
-#include <cpsettingformentryitemdata.h>
-
-class CpThemePluginEntryItemData : public CpSettingFormEntryItemData
-{
- Q_OBJECT
-public:
- explicit CpThemePluginEntryItemData(CpItemDataHelper &itemDataHelper,
- const QString &text = QString(),
- const QString &description = QString(),
- const HbIcon &icon = HbIcon(),
- const HbDataFormModelItem *parent = 0);
- virtual ~CpThemePluginEntryItemData();
-private slots:
- void onLaunchView();
-private:
- virtual CpBaseSettingView *createSettingView() const;
-};
-
-#endif //CPTHEMEPLUGINENTRYITEMDATA_H
--- a/controlpanel/src/cpplugins/themeplugin/themeplugin.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#
-# 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: cpthemeplugin source files
-#
-
-# Input
-HEADERS += src/*.h
-SOURCES += src/*.cpp
\ No newline at end of file
--- a/controlpanel/src/cpplugins/themeplugin/themeplugin.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpthemeplugin
-
-CONFIG += hb plugin
-
-LIBS += -lcpframework
-
-include ( ../cpplugincommon.pri )
-include ( themeplugin.pri )
-
-symbian {
- TARGET.UID3 = 0X20025FDB
-}
--- a/controlpanel/src/cpprofilewrapper/cpprofilewrapper.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = cpprofilewrapper
-
-CONFIG += debug_and_release
-
-win32|mac {
- !contains(QT_CONFIG,debug)|!contains(QT_CONFIG,release) {
- CONFIG -= debug_and_release debug release
- contains(QT_CONFIG,debug): CONFIG+=debug
- contains(QT_CONFIG,release):CONFIG+=release
- }
-}
-
-CONFIG(debug, debug|release) {
- SUBDIRPART = debug
-} else {
- SUBDIRPART = release
-}
-
-win32 {
- DESTDIR = C:/ControlPanel/$$SUBDIRPART/bin
- OBJECTS_DIR = $$PWD/../$$SUBDIRPART/tmp/$$TARGET
-}
-
-# Add the output dirs to the link path too
-LIBS += -L$$DESTDIR
-
-MOC_DIR = moc
-OBJECT_DIR = obj
-RCC_DIR = rcc
-
-DEFINES += PROFILEWRAPPER_FREEZE
-
-
-HEADERS += ../inc/cpprofilemodel.h \
- ../inc/cpprofilewrappermacro.h \
- src/cpprofilemodel_p.h
-SOURCES += src/cpprofilemodel.cpp
-
-win32 {
- INCLUDEPATH += $$PWD/src
- INCLUDEPATH += ../inc
- SOURCES += src/cpprofilemodel_win_p.cpp
-}
-
-symbian {
- INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
- $$MOC_DIR
-
- SOURCES += src/cpprofilemodel_p.cpp
-
- LIBS += -lprofileeng \
- -lcentralrepository \
- -lcharconv
- TARGET.CAPABILITY = All -TCB
- TARGET.EPOCALLOWDLLDATA = 1
- TARGET.UID3 = 0x20025FE6
-}
-
-
--- a/controlpanel/src/cpprofilewrapper/src/cpprofilemodel.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "cpprofilemodel.h"
-#include "cpprofilemodel_p.h"
-
-CpProfileModel::CpProfileModel()
-{
- dptr = new CpProfileModelPrivate();
-}
-
-CpProfileModel::~CpProfileModel()
-{
- delete dptr;
-}
-
-/*
- * Get the result of the initiation
- */
-int CpProfileModel::initiationFlag()
-{
- return dptr->initiationFlag();
-}
-
-/*
- * Get path and file name of ring tone file
- */
-QString CpProfileModel::ringTone()
-{
- return dptr->ringTone();
-}
-
-/*
- * Set path and file to ring tone
- */
-void CpProfileModel::setRingTone(const QString& filePath)
-{
- dptr->setRingTone(filePath);
-}
-
-/*
- * Get path and file name of message tone file
- */
-QString CpProfileModel::messageTone()
-{
- return dptr->messageTone();
-}
-
-/*
- * Set path and file to message tone
- */
-void CpProfileModel::setMessageTone(const QString& filePath)
-{
- dptr->setMessageTone(filePath);
-}
-
-/*
- * Get path and file name of email tone file
- */
-QString CpProfileModel::emailTone()
-{
- return dptr->emailTone();
-}
-
-/*
- * Set path and file to email tone
- */
-void CpProfileModel::setEmailTone(const QString& filePath)
-{
- dptr->setEmailTone(filePath);
-}
-
-/*
- * Get path and file name of calendar event tone file
- */
-QString CpProfileModel::calendarTone()
-{
- return dptr->calendarTone();
-}
-
-/*
- * Set path and file to calendar event tone
- */
-void CpProfileModel::setCalendarTone(const QString& filePath)
-{
- dptr->setCalendarTone(filePath);
-}
-
-/*
- * Get path and file name of clock alarm tone file
- */
-QString CpProfileModel::alarmTone()
-{
- return dptr->alarmTone();
-}
-
-/*
- * Set path and file to clock alarm tone
- */
-void CpProfileModel::setAlarmTone(const QString& filePath)
-{
- dptr->setAlarmTone(filePath);
-}
-
-/*
- * Get the value of master volume
- */
-int CpProfileModel::ringVolume()
-{
- return dptr->ringVolume();
-}
-
-/*
- * Set master volume, the value should be between 1-10
- */
-void CpProfileModel::setRingVolume(int volume)
-{
- dptr->setRingVolume(volume);
-}
-
-/*
- * Activate master volume to beep
- */
-void CpProfileModel::activateBeep()
-{
- dptr->activateBeep();
-}
-
-/*
- * Get beep status in master volume
- */
-bool CpProfileModel::isBeep()
-{
- return dptr->isBeep();
-}
-
-/*
- * Activate master volume to silent
- */
-void CpProfileModel::activateSilent()
-{
- dptr->activateSilent();
-}
-
-/*
- * Get silent status in master volume
- */
-bool CpProfileModel::isSilent()
-{
- return dptr->isSilent();
-}
-
-/*
- * Get master vibra's status
- */
-bool CpProfileModel::vibraStatus()
-{
- return dptr->vibraStatus();
-}
-
-/*
- * Set master vibra's status
- */
-void CpProfileModel::setVibraStatus(bool status)
-{
- dptr->setVibraStatus(status);
-}
-
-/*
- * Get keypad' volume
- */
-int CpProfileModel::keyVolume()
-{
- return dptr->keyVolume();
-}
-
-/*
- * Set keypad's volume,
- * the value of the volume should be between 0-3
- */
-void CpProfileModel::setKeyVolume(int volume)
-{
- dptr->setKeyVolume(volume);
-}
-
-/*
- * Get screen tone's volume
- */
-int CpProfileModel::screenVolume()
-{
- return dptr->screenVolume();
-}
-
-/*
- * Set screen tone's volume,
- * the value of the volume should be between 0-3
- */
-void CpProfileModel::setScreenVolume(int volume)
-{
- dptr->setScreenVolume(volume);
-}
-
-/*
- * Get screen vibra's level
- */
-int CpProfileModel::screenVibra()
-{
- return dptr->screenVibra();
-}
-
-/*
- * Set screen vibra's level,
- * the value of the level should be between 0-3
- */
-void CpProfileModel::setScreenVibra(int volume)
-{
- dptr->setScreenVibra(volume);
-}
-
-// End of file
-
--- a/controlpanel/src/cpprofilewrapper/src/cpprofilemodel_p.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,322 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "cpprofilemodel_p.h"
-#include <e32base.h>
-#include <QString>
-#include <MProfileEngineExtended.h>
-#include <MProfileExtended.h>
-#include <MProfileTones.h>
-#include <MProfileSetTones.h>
-#include <MProfileExtraTones.h>
-#include <MProfileSetExtraTones.h>
-#include <MProfileExtraSettings.h>
-#include <MProfileSetExtraSettings.h>
-#include <MProfileFeedbackSettings.h>
-#include <MProfileSetFeedbackSettings.h>
-
-#include <TProfileToneSettings.h>
-#include <hwrmvibrasdkcrkeys.h>
-#include <centralrepository.h>
-
-
-QString stringFromDescriptor(const TDesC& dsp)
-{
- return QString::fromUtf16(dsp.Ptr(), dsp.Length());
-}
-
-HBufC* descriptorFromString(const QString& str)
-{
- TPtrC ptr(reinterpret_cast<const TUint16*>(str.utf16()));
- return ptr.Alloc();
-}
-
-CpProfileModelPrivate::CpProfileModelPrivate()
-{
- TRAPD( mInitErrFlag, initModel() );
-}
-
-void CpProfileModelPrivate::initModel()
-{
- mEngine = CreateProfileEngineExtendedL();
- mProfileExt = mEngine->ProfileL( mEngine->ActiveProfileId() );
-
- // General tones
- TProfileToneSettings& toneSettings = mProfileExt->ProfileSetTones().SetToneSettings();
- mToneSettings = &toneSettings;
- mVibraCenRep = CRepository::NewL( KCRUidVibraCtrl );
-
- // Feedback settings, used to get screen tone
- const MProfileFeedbackSettings& feedback =
- mProfileExt->ProfileExtraSettings().ProfileFeedbackSettings();
- mFeedbackSettings = &feedback;
-
- // Feedback settings, used to set screen tone
- MProfileSetFeedbackSettings& setFeedback =
- mProfileExt->ProfileSetExtraSettings().ProfileSetFeedbackSettings();
- mSetFeedbackSettings = &setFeedback;
-}
-
-CpProfileModelPrivate::~CpProfileModelPrivate()
-{
- delete mVibraCenRep;
- mVibraCenRep = NULL;
-}
-
-/*
- * Get the result of the initiation
- */
-int CpProfileModelPrivate::initiationFlag()
-{
- return mInitErrFlag;
-}
-
-/*
- * Get path and file name of ring tone file
- */
-QString CpProfileModelPrivate::ringTone()
-{
- return stringFromDescriptor( mProfileExt->ProfileTones().RingingTone1() );
-}
-
-/*
- * Set path and file to ring tone
- */
-void CpProfileModelPrivate::setRingTone(const QString& filePath)
-{
- mProfileExt->ProfileSetTones().SetRingingTone1L( *descriptorFromString(filePath) );
- commitChange();
-}
-
-/*
- * Get path and file name of message tone file
- */
-QString CpProfileModelPrivate::messageTone()
-{
- return stringFromDescriptor( mProfileExt->ProfileTones().MessageAlertTone() );
-}
-
-/*
- * Set path and file to message tone
- */
-void CpProfileModelPrivate::setMessageTone(const QString& filePath)
-{
- mProfileExt->ProfileSetTones().SetMessageAlertToneL( *descriptorFromString(filePath) );
- commitChange();
-}
-
-/*
- * Get path and file name of email tone file
- */
-QString CpProfileModelPrivate::emailTone()
-{
- return stringFromDescriptor( mProfileExt->ProfileExtraTones().EmailAlertTone() );
-}
-
-/*
- * Set path and file to email tone
- */
-void CpProfileModelPrivate::setEmailTone(const QString& filePath)
-{
- mProfileExt->ProfileSetExtraTones().SetEmailAlertToneL( *descriptorFromString(filePath) );
- commitChange();
-}
-
-/*
- * Get path and file name of calendar event tone file
- */
-QString CpProfileModelPrivate::calendarTone()
-{
- return "";
-}
-
-/*
- * Set path and file to calendar event tone
- */
-void CpProfileModelPrivate::setCalendarTone(const QString& filePath)
-{
- Q_UNUSED(filePath);
-}
-
-/*
- * Get path and file name of clock alarm tone file
- */
-QString CpProfileModelPrivate::alarmTone()
-{
- return "";
-}
-
-/*
- * Set path and file to clock alarm tone
- */
-void CpProfileModelPrivate::setAlarmTone(const QString& filePath)
-{
- Q_UNUSED(filePath);
-}
-
-/*
- * Get the value of master volume
- */
-int CpProfileModelPrivate::ringVolume()
-{
- return mToneSettings->iRingingVolume;
-}
-
-/*
- * Set master volume, the value should be between 1-10
- */
-void CpProfileModelPrivate::setRingVolume(int volume)
-{
- if (volume < 0 || volume >10)
- {
- return;
- }
-
- mToneSettings->iRingingType = EProfileRingingTypeRinging;
- mToneSettings->iRingingVolume = volume;
- commitChange();
-}
-
-/*
- * Activate master volume to beep
- */
-void CpProfileModelPrivate::activateBeep()
-{
- mToneSettings->iRingingType = EProfileRingingTypeBeepOnce;
- commitChange();
-}
-
-/*
- * Get beep status in master volume
- */
-bool CpProfileModelPrivate::isBeep()
-{
- return (EProfileRingingTypeBeepOnce == mToneSettings->iRingingType) ? true : false;
-}
-
-/*
- * Activate master volume to silent
- */
-void CpProfileModelPrivate::activateSilent()
-{
- mToneSettings->iRingingType = EProfileRingingTypeSilent;
- commitChange();
-}
-
-/*
- * Get silent status in master volume
- */
-bool CpProfileModelPrivate::isSilent()
-{
- return (EProfileRingingTypeSilent == mToneSettings->iRingingType) ? true : false;
-}
-
-/*
- * Get master vibra's status
- */
-bool CpProfileModelPrivate::vibraStatus()
-{
- return mToneSettings->iVibratingAlert;
-}
-
-/*
- * Set master vibra's status
- */
-void CpProfileModelPrivate::setVibraStatus(bool status)
-{
- mVibraCenRep->Set(KVibraCtrlProfileVibraEnabled, status );
- mToneSettings->iVibratingAlert = status;
- commitChange();
-}
-
-/*
- * Get keypad' volume
- */
-int CpProfileModelPrivate::keyVolume()
-{
- return mToneSettings->iKeypadVolume;
-}
-
-/*
- * Set keypad's volume,
- * the value of the volume should be between 0-3
- */
-void CpProfileModelPrivate::setKeyVolume(int volume)
-{
- if (volume < 0 || volume > 3)
- {
- return;
- }
-
- mToneSettings->iKeypadVolume = (TProfileKeypadVolume)volume;
- commitChange();
-}
-
-/*
- * Get screen tone's volume
- */
-int CpProfileModelPrivate::screenVolume()
-{
- return mFeedbackSettings->AudioFeedback();
-}
-
-/*
- * Set screen tone's volume,
- * the value of the volume should be between 0-3
- */
-void CpProfileModelPrivate::setScreenVolume(int volume)
-{
- if (volume < 0 || volume > 3)
- {
- return;
- }
-
- mSetFeedbackSettings->SetAudioFeedback( (TProfileAudioFeedback)volume );
- commitChange();
-}
-
-/*
- * Get screen vibra's level
- */
-int CpProfileModelPrivate::screenVibra()
-{
- return mFeedbackSettings->TactileFeedback();
-}
-
-/*
- * Set screen vibra's level,
- * the value of the level should be between 0-3
- */
-void CpProfileModelPrivate::setScreenVibra(int volume)
-{
- if (volume < 0 || volume > 3)
- {
- return;
- }
-
- mSetFeedbackSettings->SetTactileFeedback( (TProfileTactileFeedback)volume );
- commitChange();
-}
-
-int CpProfileModelPrivate::commitChange()
-{
- TRAPD( err, mEngine->CommitChangeL(*mProfileExt) );
- return err;
-}
-
-// End of file
-
--- a/controlpanel/src/cpprofilewrapper/src/cpprofilemodel_p.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef CPPROFILEMODEL_P_H
-#define CPPROFILEMODEL_P_H
-
-#include <qglobal.h>
-
-class MProfileEngineExtended;
-class MProfileExtended;
-class MProfileFeedbackSettings;
-class MProfileSetFeedbackSettings;
-class CRepository;
-struct TProfileToneSettings;
-
-
-class CpProfileModelPrivate
- {
-public:
- CpProfileModelPrivate();
- ~CpProfileModelPrivate();
-
-public:
- int initiationFlag();
- QString ringTone();
- void setRingTone(const QString& filePath);
- QString messageTone();
- void setMessageTone(const QString& filePath);
- QString emailTone();
- void setEmailTone(const QString& filePath);
- QString calendarTone();
- void setCalendarTone(const QString& filePath);
- QString alarmTone();
- void setAlarmTone(const QString& filePath);
- int ringVolume();
- void setRingVolume(int volume);
- void activateBeep();
- bool isBeep();
- void activateSilent();
- bool isSilent();
- bool vibraStatus();
- void setVibraStatus(bool status);
- int keyVolume();
- void setKeyVolume(int volume);
- int screenVolume();
- void setScreenVolume(int volume);
- int screenVibra();
- void setScreenVibra(int volume);
-
-#ifdef Q_OS_SYMBIAN
-private:
- void initModel();
- int commitChange();
-
-private:
- MProfileEngineExtended* mEngine;
- MProfileExtended* mProfileExt;
- TProfileToneSettings* mToneSettings;
- const MProfileFeedbackSettings* mFeedbackSettings;
- MProfileSetFeedbackSettings* mSetFeedbackSettings;
- CRepository* mVibraCenRep;
- bool mInitErrFlag;
-#endif // Q_OS_SYMBIAN
- };
-
-#endif
--- a/controlpanel/src/cpprofilewrapper/src/cpprofilemodel_win_p.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-/*
-* 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:
-*
-*/
-
-
-#include "cpprofilemodel_p.h"
-#include <QString>
-
-CpProfileModelPrivate::CpProfileModelPrivate()
-{
-}
-
-CpProfileModelPrivate::~CpProfileModelPrivate()
-{
-}
-
-/*
- * Get the result of the initiation
- */
-int CpProfileModelPrivate::initiationFlag()
-{
- return -1;
-}
-
-/*
- * Get path and file name of ring tone file
- */
-QString CpProfileModelPrivate::ringTone()
-{
- return "";
-}
-
-/*
- * Set path and file to ring tone
- */
-void CpProfileModelPrivate::setRingTone(const QString& filePath)
-{
- Q_UNUSED(filePath);
-}
-
-/*
- * Get path and file name of message tone file
- */
-QString CpProfileModelPrivate::messageTone()
-{
- return "";
-}
-
-/*
- * Set path and file to message tone
- */
-void CpProfileModelPrivate::setMessageTone(const QString& filePath)
-{
- Q_UNUSED(filePath);
-}
-
-/*
- * Get path and file name of email tone file
- */
-QString CpProfileModelPrivate::emailTone()
-{
- return "";
-}
-
-/*
- * Set path and file to email tone
- */
-void CpProfileModelPrivate::setEmailTone(const QString& filePath)
-{
- Q_UNUSED(filePath);
-}
-
-/*
- * Get path and file name of calendar event tone file
- */
-QString CpProfileModelPrivate::calendarTone()
-{
- return "";
-}
-
-/*
- * Set path and file to calendar event tone
- */
-void CpProfileModelPrivate::setCalendarTone(const QString& filePath)
-{
- Q_UNUSED(filePath);
-}
-
-/*
- * Get path and file name of clock alarm tone file
- */
-QString CpProfileModelPrivate::alarmTone()
-{
- return "";
-}
-
-/*
- * Set path and file to clock alarm tone
- */
-void CpProfileModelPrivate::setAlarmTone(const QString& filePath)
-{
- Q_UNUSED(filePath);
-}
-
-/*
- * Get the value of master volume
- */
-int CpProfileModelPrivate::ringVolume()
-{
- return -1;
-}
-
-/*
- * Set master volume, the value should be between 1-10
- */
-void CpProfileModelPrivate::setRingVolume(int volume)
-{
- Q_UNUSED(volume);
-}
-
-/*
- * Activate master volume to beep
- */
-void CpProfileModelPrivate::activateBeep()
-{;
-}
-
-/*
- * Get beep status in master volume
- */
-bool CpProfileModelPrivate::isBeep()
-{
- return false;
-}
-
-/*
- * Activate master volume to silent
- */
-void CpProfileModelPrivate::activateSilent()
-{
-}
-
-/*
- * Get silent status in master volume
- */
-bool CpProfileModelPrivate::isSilent()
-{
- return false;
-}
-
-/*
- * Get master vibra's status
- */
-bool CpProfileModelPrivate::vibraStatus()
-{
- return false;
-}
-
-/*
- * Set master vibra's status
- */
-void CpProfileModelPrivate::setVibraStatus(bool status)
-{
- Q_UNUSED(status);
-}
-
-/*
- * Get keypad' volume
- */
-int CpProfileModelPrivate::keyVolume()
-{
- return -1;
-}
-
-/*
- * Set keypad's volume,
- * the value of the volume should be between 0-3
- */
-void CpProfileModelPrivate::setKeyVolume(int volume)
-{
- Q_UNUSED(volume);
-}
-
-/*
- * Get screen tone's volume
- */
-int CpProfileModelPrivate::screenVolume()
-{
- return -1;
-}
-
-/*
- * Set screen tone's volume,
- * the value of the volume should be between 0-3
- */
-void CpProfileModelPrivate::setScreenVolume(int volume)
-{
- Q_UNUSED(volume);
-}
-
-/*
- * Get screen vibra's level
- */
-int CpProfileModelPrivate::screenVibra()
-{
- return -1;
-}
-
-/*
- * Set screen vibra's level,
- * the value of the level should be between 0-3
- */
-void CpProfileModelPrivate::setScreenVibra(int volume)
-{
- Q_UNUSED(volume);
-}
-
-
-// End of file
--- a/controlpanel/src/eabi/cpframeworku.def Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/eabi/cpframeworku.def Thu Apr 01 03:23:37 2010 +0800
@@ -1,112 +1,153 @@
EXPORTS
- _ZN16CpItemDataHelper11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
- _ZN16CpItemDataHelper11qt_metacastEPKc @ 2 NONAME
- _ZN16CpItemDataHelper13addConnectionEP19HbDataFormModelItemRK7QStringP7QObjectS4_ @ 3 NONAME
- _ZN16CpItemDataHelper14prototypeAddedEP18HbAbstractViewItem @ 4 NONAME
- _ZN16CpItemDataHelper15connectionAddedEP19HbDataFormModelItemRK7QStringP7QObjectS4_ @ 5 NONAME
- _ZN16CpItemDataHelper16addItemPrototypeEP18HbAbstractViewItem @ 6 NONAME
- _ZN16CpItemDataHelper16removeConnectionEP19HbDataFormModelItemRK7QStringP7QObjectS4_ @ 7 NONAME
- _ZN16CpItemDataHelper16staticMetaObjectE @ 8 NONAME DATA 16
- _ZN16CpItemDataHelper17connectionRemovedEP19HbDataFormModelItemRK7QStringP7QObjectS4_ @ 9 NONAME
- _ZN16CpItemDataHelper19getStaticMetaObjectEv @ 10 NONAME
- _ZN16CpItemDataHelperC1Ev @ 11 NONAME
- _ZN16CpItemDataHelperC2Ev @ 12 NONAME
- _ZN16CpItemDataHelperD0Ev @ 13 NONAME
- _ZN16CpItemDataHelperD1Ev @ 14 NONAME
- _ZN16CpItemDataHelperD2Ev @ 15 NONAME
- _ZN16CpPluginLauncher18launchCpPluginViewERK7QString @ 16 NONAME
- _ZN17CpBaseSettingView11qt_metacallEN11QMetaObject4CallEiPPv @ 17 NONAME
- _ZN17CpBaseSettingView11qt_metacastEPKc @ 18 NONAME
- _ZN17CpBaseSettingView12aboutToCloseEv @ 19 NONAME
- _ZN17CpBaseSettingView14setSettingFormEP10HbDataForm @ 20 NONAME
- _ZN17CpBaseSettingView16staticMetaObjectE @ 21 NONAME DATA 16
- _ZN17CpBaseSettingView19getStaticMetaObjectEv @ 22 NONAME
- _ZN17CpBaseSettingView9setWidgetEP15QGraphicsWidget @ 23 NONAME
- _ZN17CpBaseSettingViewC1EP10HbDataFormP13QGraphicsItem @ 24 NONAME
- _ZN17CpBaseSettingViewC2EP10HbDataFormP13QGraphicsItem @ 25 NONAME
- _ZN17CpBaseSettingViewD0Ev @ 26 NONAME
- _ZN17CpBaseSettingViewD1Ev @ 27 NONAME
- _ZN17CpBaseSettingViewD2Ev @ 28 NONAME
- _ZN21CpSettingFormItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 29 NONAME
- _ZN21CpSettingFormItemData11qt_metacastEPKc @ 30 NONAME
- _ZN21CpSettingFormItemData16staticMetaObjectE @ 31 NONAME DATA 16
- _ZN21CpSettingFormItemData19getStaticMetaObjectEv @ 32 NONAME
- _ZN21CpSettingFormItemDataC1EN19HbDataFormModelItem12DataItemTypeERK7QStringPKS0_ @ 33 NONAME
- _ZN21CpSettingFormItemDataC1EPK19HbDataFormModelItem @ 34 NONAME
- _ZN21CpSettingFormItemDataC2EN19HbDataFormModelItem12DataItemTypeERK7QStringPKS0_ @ 35 NONAME
- _ZN21CpSettingFormItemDataC2EPK19HbDataFormModelItem @ 36 NONAME
- _ZN21CpSettingFormItemDataD0Ev @ 37 NONAME
- _ZN21CpSettingFormItemDataD1Ev @ 38 NONAME
- _ZN21CpSettingFormItemDataD2Ev @ 39 NONAME
- _ZN26CpCategorySettingFormModel10initializeER16CpItemDataHelper @ 40 NONAME
- _ZN26CpCategorySettingFormModel11qt_metacallEN11QMetaObject4CallEiPPv @ 41 NONAME
- _ZN26CpCategorySettingFormModel11qt_metacastEPKc @ 42 NONAME
- _ZN26CpCategorySettingFormModel16staticMetaObjectE @ 43 NONAME DATA 16
- _ZN26CpCategorySettingFormModel19getStaticMetaObjectEv @ 44 NONAME
- _ZN26CpCategorySettingFormModel25afterLoadingConfigPluginsER16CpItemDataHelper @ 45 NONAME
- _ZN26CpCategorySettingFormModel26beforeLoadingConfigPluginsER16CpItemDataHelper @ 46 NONAME
- _ZN26CpCategorySettingFormModelC1ERK7QString @ 47 NONAME
- _ZN26CpCategorySettingFormModelC2ERK7QString @ 48 NONAME
- _ZN26CpCategorySettingFormModelD0Ev @ 49 NONAME
- _ZN26CpCategorySettingFormModelD1Ev @ 50 NONAME
- _ZN26CpCategorySettingFormModelD2Ev @ 51 NONAME
- _ZN26CpSettingFormEntryItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 52 NONAME
- _ZN26CpSettingFormEntryItemData11qt_metacastEPKc @ 53 NONAME
- _ZN26CpSettingFormEntryItemData12onLaunchViewEv @ 54 NONAME
- _ZN26CpSettingFormEntryItemData14setDescriptionERK7QString @ 55 NONAME
- _ZN26CpSettingFormEntryItemData16setEntryItemIconERK6HbIcon @ 56 NONAME
- _ZN26CpSettingFormEntryItemData16staticMetaObjectE @ 57 NONAME DATA 16
- _ZN26CpSettingFormEntryItemData19getStaticMetaObjectEv @ 58 NONAME
- _ZN26CpSettingFormEntryItemData7setTextERK7QString @ 59 NONAME
- _ZN26CpSettingFormEntryItemDataC2ER16CpItemDataHelperRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 60 NONAME
- _ZN26CpSettingFormEntryItemDataD0Ev @ 61 NONAME
- _ZN26CpSettingFormEntryItemDataD1Ev @ 62 NONAME
- _ZN26CpSettingFormEntryItemDataD2Ev @ 63 NONAME
- _ZN29CpCategorySettingFormItemData10initializeER16CpItemDataHelper @ 64 NONAME
- _ZN29CpCategorySettingFormItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 65 NONAME
- _ZN29CpCategorySettingFormItemData11qt_metacastEPKc @ 66 NONAME
- _ZN29CpCategorySettingFormItemData16staticMetaObjectE @ 67 NONAME DATA 16
- _ZN29CpCategorySettingFormItemData19getStaticMetaObjectEv @ 68 NONAME
- _ZN29CpCategorySettingFormItemData25afterLoadingConfigPluginsER16CpItemDataHelper @ 69 NONAME
- _ZN29CpCategorySettingFormItemData26beforeLoadingConfigPluginsER16CpItemDataHelper @ 70 NONAME
- _ZN29CpCategorySettingFormItemDataC1EN19HbDataFormModelItem12DataItemTypeERK7QStringS4_PKS0_ @ 71 NONAME
- _ZN29CpCategorySettingFormItemDataC1ERK7QStringPK19HbDataFormModelItem @ 72 NONAME
- _ZN29CpCategorySettingFormItemDataC2EN19HbDataFormModelItem12DataItemTypeERK7QStringS4_PKS0_ @ 73 NONAME
- _ZN29CpCategorySettingFormItemDataC2ERK7QStringPK19HbDataFormModelItem @ 74 NONAME
- _ZN29CpCategorySettingFormItemDataD0Ev @ 75 NONAME
- _ZN29CpCategorySettingFormItemDataD1Ev @ 76 NONAME
- _ZN29CpCategorySettingFormItemDataD2Ev @ 77 NONAME
- _ZNK16CpItemDataHelper10bindToFormEP10HbDataForm @ 78 NONAME
- _ZNK16CpItemDataHelper10metaObjectEv @ 79 NONAME
- _ZNK17CpBaseSettingView10metaObjectEv @ 80 NONAME
- _ZNK17CpBaseSettingView11settingFormEv @ 81 NONAME
- _ZNK21CpSettingFormItemData10metaObjectEv @ 82 NONAME
- _ZNK26CpCategorySettingFormModel10metaObjectEv @ 83 NONAME
- _ZNK26CpSettingFormEntryItemData10metaObjectEv @ 84 NONAME
- _ZNK26CpSettingFormEntryItemData11descriptionEv @ 85 NONAME
- _ZNK26CpSettingFormEntryItemData13entryItemIconEv @ 86 NONAME
- _ZNK26CpSettingFormEntryItemData4textEv @ 87 NONAME
- _ZNK29CpCategorySettingFormItemData10metaObjectEv @ 88 NONAME
- _ZTI16CpItemDataHelper @ 89 NONAME
- _ZTI17CpBaseSettingView @ 90 NONAME
- _ZTI21CpSettingFormItemData @ 91 NONAME
- _ZTI26CpCategorySettingFormModel @ 92 NONAME
- _ZTI26CpSettingFormEntryItemData @ 93 NONAME
- _ZTI29CpCategorySettingFormItemData @ 94 NONAME
- _ZTV16CpItemDataHelper @ 95 NONAME
- _ZTV17CpBaseSettingView @ 96 NONAME
- _ZTV21CpSettingFormItemData @ 97 NONAME
- _ZTV26CpCategorySettingFormModel @ 98 NONAME
- _ZTV26CpSettingFormEntryItemData @ 99 NONAME
- _ZTV29CpCategorySettingFormItemData @ 100 NONAME
- _ZThn16_N17CpBaseSettingViewD0Ev @ 101 NONAME
- _ZThn16_N17CpBaseSettingViewD1Ev @ 102 NONAME
- _ZThn8_N17CpBaseSettingViewD0Ev @ 103 NONAME
- _ZThn8_N17CpBaseSettingViewD1Ev @ 104 NONAME
- _ZThn8_N21CpSettingFormItemDataD0Ev @ 105 NONAME
- _ZThn8_N21CpSettingFormItemDataD1Ev @ 106 NONAME
- _ZThn8_N26CpSettingFormEntryItemDataD0Ev @ 107 NONAME
- _ZThn8_N26CpSettingFormEntryItemDataD1Ev @ 108 NONAME
- _ZThn8_N29CpCategorySettingFormItemDataD0Ev @ 109 NONAME
- _ZThn8_N29CpCategorySettingFormItemDataD1Ev @ 110 NONAME
+ _ZN14CpPluginLoader12loadCpPluginERK7QString @ 1 NONAME
+ _ZN14CpPluginLoader16loadPlatCpPluginERK7QString @ 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
+ _ZN16CpItemDataHelperC1EP10HbDataForm @ 15 NONAME
+ _ZN16CpItemDataHelperC2EP10HbDataForm @ 16 NONAME
+ _ZN16CpItemDataHelperD0Ev @ 17 NONAME
+ _ZN16CpItemDataHelperD1Ev @ 18 NONAME
+ _ZN16CpItemDataHelperD2Ev @ 19 NONAME
+ _ZN16CpPluginLauncher18launchCpPluginViewERK7QStringi @ 20 NONAME
+ _ZN16LogOutputFactory15createLogOutputERK7QString @ 21 NONAME
+ _ZN16LogOutputFactory15createLogOutputERK7QStringRK5QHashIS0_8QVariantE @ 22 NONAME
+ _ZN16LogOutputFactory23addCreateLogOutputEntryERK7QStringPFP9LogOutputvE @ 23 NONAME
+ _ZN17CpBaseSettingView11qt_metacallEN11QMetaObject4CallEiPPv @ 24 NONAME
+ _ZN17CpBaseSettingView11qt_metacastEPKc @ 25 NONAME
+ _ZN17CpBaseSettingView12aboutToCloseEv @ 26 NONAME
+ _ZN17CpBaseSettingView14setSettingFormEP10HbDataForm @ 27 NONAME
+ _ZN17CpBaseSettingView16staticMetaObjectE @ 28 NONAME DATA 16
+ _ZN17CpBaseSettingView19getStaticMetaObjectEv @ 29 NONAME
+ _ZN17CpBaseSettingViewC1EP15QGraphicsWidgetP13QGraphicsItem @ 30 NONAME
+ _ZN17CpBaseSettingViewC2EP15QGraphicsWidgetP13QGraphicsItem @ 31 NONAME
+ _ZN17CpBaseSettingViewD0Ev @ 32 NONAME
+ _ZN17CpBaseSettingViewD1Ev @ 33 NONAME
+ _ZN17CpBaseSettingViewD2Ev @ 34 NONAME
+ _ZN18CpDataFormViewItem10createItemEv @ 35 NONAME
+ _ZN18CpDataFormViewItem11qt_metacallEN11QMetaObject4CallEiPPv @ 36 NONAME
+ _ZN18CpDataFormViewItem11qt_metacastEPKc @ 37 NONAME
+ _ZN18CpDataFormViewItem16staticMetaObjectE @ 38 NONAME DATA 16
+ _ZN18CpDataFormViewItem18createCustomWidgetEv @ 39 NONAME
+ _ZN18CpDataFormViewItem19getStaticMetaObjectEv @ 40 NONAME
+ _ZN18CpDataFormViewItem4loadEv @ 41 NONAME
+ _ZN18CpDataFormViewItemC1EP13QGraphicsItem @ 42 NONAME
+ _ZN18CpDataFormViewItemC1ERKS_ @ 43 NONAME
+ _ZN18CpDataFormViewItemC2EP13QGraphicsItem @ 44 NONAME
+ _ZN18CpDataFormViewItemC2ERKS_ @ 45 NONAME
+ _ZN18CpDataFormViewItemD0Ev @ 46 NONAME
+ _ZN18CpDataFormViewItemD1Ev @ 47 NONAME
+ _ZN18CpDataFormViewItemD2Ev @ 48 NONAME
+ _ZN18CpDataFormViewItemaSERKS_ @ 49 NONAME
+ _ZN21CpSettingFormItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 50 NONAME
+ _ZN21CpSettingFormItemData11qt_metacastEPKc @ 51 NONAME
+ _ZN21CpSettingFormItemData16staticMetaObjectE @ 52 NONAME DATA 16
+ _ZN21CpSettingFormItemData19getStaticMetaObjectEv @ 53 NONAME
+ _ZN21CpSettingFormItemDataC1EN19HbDataFormModelItem12DataItemTypeERK7QStringPKS0_ @ 54 NONAME
+ _ZN21CpSettingFormItemDataC1EPK19HbDataFormModelItem @ 55 NONAME
+ _ZN21CpSettingFormItemDataC2EN19HbDataFormModelItem12DataItemTypeERK7QStringPKS0_ @ 56 NONAME
+ _ZN21CpSettingFormItemDataC2EPK19HbDataFormModelItem @ 57 NONAME
+ _ZN21CpSettingFormItemDataD0Ev @ 58 NONAME
+ _ZN21CpSettingFormItemDataD1Ev @ 59 NONAME
+ _ZN21CpSettingFormItemDataD2Ev @ 60 NONAME
+ _ZN26CpSettingFormEntryItemData11qt_metacallEN11QMetaObject4CallEiPPv @ 61 NONAME
+ _ZN26CpSettingFormEntryItemData11qt_metacastEPKc @ 62 NONAME
+ _ZN26CpSettingFormEntryItemData12onLaunchViewEv @ 63 NONAME
+ _ZN26CpSettingFormEntryItemData14setDescriptionERK7QString @ 64 NONAME
+ _ZN26CpSettingFormEntryItemData16setEntryItemIconERK6HbIcon @ 65 NONAME
+ _ZN26CpSettingFormEntryItemData16staticMetaObjectE @ 66 NONAME DATA 16
+ _ZN26CpSettingFormEntryItemData19getStaticMetaObjectEv @ 67 NONAME
+ _ZN26CpSettingFormEntryItemData7setTextERK7QString @ 68 NONAME
+ _ZN26CpSettingFormEntryItemDataC2EP10HbDataFormRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 69 NONAME
+ _ZN26CpSettingFormEntryItemDataC2EPK19HbDataFormModelItem @ 70 NONAME
+ _ZN26CpSettingFormEntryItemDataC2ER16CpItemDataHelperRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 71 NONAME
+ _ZN26CpSettingFormEntryItemDataD0Ev @ 72 NONAME
+ _ZN26CpSettingFormEntryItemDataD1Ev @ 73 NONAME
+ _ZN26CpSettingFormEntryItemDataD2Ev @ 74 NONAME
+ _ZN6Logger11qt_metacallEN11QMetaObject4CallEiPPv @ 75 NONAME
+ _ZN6Logger11qt_metacastEPKc @ 76 NONAME
+ _ZN6Logger12addLogOutputEP9LogOutput @ 77 NONAME
+ _ZN6Logger14setLogDateTimeEb @ 78 NONAME
+ _ZN6Logger15removeLogOutputEP9LogOutput @ 79 NONAME
+ _ZN6Logger16setLogLoggerNameEb @ 80 NONAME
+ _ZN6Logger16staticMetaObjectE @ 81 NONAME DATA 16
+ _ZN6Logger17clearAllLogOutputEv @ 82 NONAME
+ _ZN6Logger17setDateTimeFormatERK7QString @ 83 NONAME
+ _ZN6Logger19getStaticMetaObjectEv @ 84 NONAME
+ _ZN6Logger3logERK7QString @ 85 NONAME
+ _ZN6Logger5closeERK7QString @ 86 NONAME
+ _ZN6Logger8closeAllEv @ 87 NONAME
+ _ZN6Logger8instanceERK7QString @ 88 NONAME
+ _ZN6Logger9configureER9QSettings @ 89 NONAME
+ _ZN6Logger9configureERK7QStringN9QSettings6FormatE @ 90 NONAME
+ _ZN6Logger9logOutputERK7QString @ 91 NONAME
+ _ZN6LoggerC1ERK7QStringP7QObject @ 92 NONAME
+ _ZN6LoggerC2ERK7QStringP7QObject @ 93 NONAME
+ _ZN6LoggerD0Ev @ 94 NONAME
+ _ZN6LoggerD1Ev @ 95 NONAME
+ _ZN6LoggerD2Ev @ 96 NONAME
+ _ZN9LogOutput11qt_metacallEN11QMetaObject4CallEiPPv @ 97 NONAME
+ _ZN9LogOutput11qt_metacastEPKc @ 98 NONAME
+ _ZN9LogOutput12parentLoggerEv @ 99 NONAME
+ _ZN9LogOutput15setParentLoggerEP6Logger @ 100 NONAME
+ _ZN9LogOutput16staticMetaObjectE @ 101 NONAME DATA 16
+ _ZN9LogOutput19getStaticMetaObjectEv @ 102 NONAME
+ _ZN9LogOutput4loadER9QSettings @ 103 NONAME
+ _ZN9LogOutput7setNameERK7QString @ 104 NONAME
+ _ZN9LogOutputC2EP6Logger @ 105 NONAME
+ _ZN9LogOutputD0Ev @ 106 NONAME
+ _ZN9LogOutputD1Ev @ 107 NONAME
+ _ZN9LogOutputD2Ev @ 108 NONAME
+ _ZNK16CpItemDataHelper10metaObjectEv @ 109 NONAME
+ _ZNK17CpBaseSettingView10metaObjectEv @ 110 NONAME
+ _ZNK17CpBaseSettingView11settingFormEv @ 111 NONAME
+ _ZNK18CpDataFormViewItem10metaObjectEv @ 112 NONAME
+ _ZNK18CpDataFormViewItem16canSetModelIndexERK11QModelIndex @ 113 NONAME
+ _ZNK21CpSettingFormItemData10metaObjectEv @ 114 NONAME
+ _ZNK26CpSettingFormEntryItemData10metaObjectEv @ 115 NONAME
+ _ZNK26CpSettingFormEntryItemData11descriptionEv @ 116 NONAME
+ _ZNK26CpSettingFormEntryItemData13entryItemIconEv @ 117 NONAME
+ _ZNK26CpSettingFormEntryItemData4textEv @ 118 NONAME
+ _ZNK6Logger10metaObjectEv @ 119 NONAME
+ _ZNK6Logger11logDateTimeEv @ 120 NONAME
+ _ZNK6Logger13logLoggerNameEv @ 121 NONAME
+ _ZNK6Logger14dateTimeFormatEv @ 122 NONAME
+ _ZNK6Logger4nameEv @ 123 NONAME
+ _ZNK9LogOutput10metaObjectEv @ 124 NONAME
+ _ZNK9LogOutput4nameEv @ 125 NONAME
+ _ZTI16CpItemDataHelper @ 126 NONAME
+ _ZTI17CpBaseSettingView @ 127 NONAME
+ _ZTI18CpDataFormViewItem @ 128 NONAME
+ _ZTI21CpSettingFormItemData @ 129 NONAME
+ _ZTI26CpSettingFormEntryItemData @ 130 NONAME
+ _ZTI6Logger @ 131 NONAME
+ _ZTI9LogOutput @ 132 NONAME
+ _ZTV16CpItemDataHelper @ 133 NONAME
+ _ZTV17CpBaseSettingView @ 134 NONAME
+ _ZTV18CpDataFormViewItem @ 135 NONAME
+ _ZTV21CpSettingFormItemData @ 136 NONAME
+ _ZTV26CpSettingFormEntryItemData @ 137 NONAME
+ _ZTV6Logger @ 138 NONAME
+ _ZTV9LogOutput @ 139 NONAME
+ _ZThn16_N17CpBaseSettingViewD0Ev @ 140 NONAME
+ _ZThn16_N17CpBaseSettingViewD1Ev @ 141 NONAME
+ _ZThn16_N18CpDataFormViewItemD0Ev @ 142 NONAME
+ _ZThn16_N18CpDataFormViewItemD1Ev @ 143 NONAME
+ _ZThn8_N17CpBaseSettingViewD0Ev @ 144 NONAME
+ _ZThn8_N17CpBaseSettingViewD1Ev @ 145 NONAME
+ _ZThn8_N18CpDataFormViewItemD0Ev @ 146 NONAME
+ _ZThn8_N18CpDataFormViewItemD1Ev @ 147 NONAME
+ _ZThn8_N21CpSettingFormItemDataD0Ev @ 148 NONAME
+ _ZThn8_N21CpSettingFormItemDataD1Ev @ 149 NONAME
+ _ZThn8_N26CpSettingFormEntryItemDataD0Ev @ 150 NONAME
+ _ZThn8_N26CpSettingFormEntryItemDataD1Ev @ 151 NONAME
--- a/controlpanel/src/eabi/cpprofilewrapperu.def Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-EXPORTS
- _ZN14CpProfileModel10ringVolumeEv @ 1 NONAME
- _ZN14CpProfileModel11screenVibraEv @ 2 NONAME
- _ZN14CpProfileModel11setRingToneERK7QString @ 3 NONAME
- _ZN14CpProfileModel11vibraStatusEv @ 4 NONAME
- _ZN14CpProfileModel12activateBeepEv @ 5 NONAME
- _ZN14CpProfileModel12screenVolumeEv @ 6 NONAME
- _ZN14CpProfileModel12setKeyVolumeEi @ 7 NONAME
- _ZN14CpProfileModel13setRingVolumeEi @ 8 NONAME
- _ZN14CpProfileModel14activateSilentEv @ 9 NONAME
- _ZN14CpProfileModel14initiationFlagEv @ 10 NONAME
- _ZN14CpProfileModel14setScreenVibraEi @ 11 NONAME
- _ZN14CpProfileModel14setVibraStatusEb @ 12 NONAME
- _ZN14CpProfileModel15setScreenVolumeEi @ 13 NONAME
- _ZN14CpProfileModel6isBeepEv @ 14 NONAME
- _ZN14CpProfileModel8isSilentEv @ 15 NONAME
- _ZN14CpProfileModel8ringToneEv @ 16 NONAME
- _ZN14CpProfileModel9keyVolumeEv @ 17 NONAME
- _ZN14CpProfileModelC1Ev @ 18 NONAME
- _ZN14CpProfileModelC2Ev @ 19 NONAME
- _ZN14CpProfileModelD1Ev @ 20 NONAME
- _ZN14CpProfileModelD2Ev @ 21 NONAME
-
--- a/controlpanel/src/eabi/seccodeuiu.def Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-EXPORTS
- _ZN15SecCodeSettings11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
- _ZN15SecCodeSettings11qt_metacastEPKc @ 2 NONAME
- _ZN15SecCodeSettings13changePinCodeEv @ 3 NONAME
- _ZN15SecCodeSettings14changePin2CodeEv @ 4 NONAME
- _ZN15SecCodeSettings16staticMetaObjectE @ 5 NONAME DATA 16
- _ZN15SecCodeSettings17setPinCodeRequestEb @ 6 NONAME
- _ZN15SecCodeSettings19getStaticMetaObjectEv @ 7 NONAME
- _ZN15SecCodeSettingsC1EP7QObject @ 8 NONAME
- _ZN15SecCodeSettingsC2EP7QObject @ 9 NONAME
- _ZN15SecCodeSettingsD0Ev @ 10 NONAME
- _ZN15SecCodeSettingsD1Ev @ 11 NONAME
- _ZN15SecCodeSettingsD2Ev @ 12 NONAME
- _ZN27SecCodeEditDataFormViewItem10createItemEv @ 13 NONAME
- _ZN27SecCodeEditDataFormViewItem11qt_metacallEN11QMetaObject4CallEiPPv @ 14 NONAME
- _ZN27SecCodeEditDataFormViewItem11qt_metacastEPKc @ 15 NONAME
- _ZN27SecCodeEditDataFormViewItem16staticMetaObjectE @ 16 NONAME DATA 16
- _ZN27SecCodeEditDataFormViewItem18createCustomWidgetEv @ 17 NONAME
- _ZN27SecCodeEditDataFormViewItem19getStaticMetaObjectEv @ 18 NONAME
- _ZN27SecCodeEditDataFormViewItemC1EP13QGraphicsItem @ 19 NONAME
- _ZN27SecCodeEditDataFormViewItemC2EP13QGraphicsItem @ 20 NONAME
- _ZN27SecCodeEditDataFormViewItemD0Ev @ 21 NONAME
- _ZN27SecCodeEditDataFormViewItemD1Ev @ 22 NONAME
- _ZN27SecCodeEditDataFormViewItemD2Ev @ 23 NONAME
- _ZNK15SecCodeSettings10metaObjectEv @ 24 NONAME
- _ZNK15SecCodeSettings14pinCodeRequestEv @ 25 NONAME
- _ZNK27SecCodeEditDataFormViewItem10metaObjectEv @ 26 NONAME
- _ZNK27SecCodeEditDataFormViewItem16canSetModelIndexERK11QModelIndex @ 27 NONAME
- _ZTI15SecCodeSettings @ 28 NONAME
- _ZTI27SecCodeEditDataFormViewItem @ 29 NONAME
- _ZTV15SecCodeSettings @ 30 NONAME
- _ZTV27SecCodeEditDataFormViewItem @ 31 NONAME
- _ZThn16_N27SecCodeEditDataFormViewItemD0Ev @ 32 NONAME
- _ZThn16_N27SecCodeEditDataFormViewItemD1Ev @ 33 NONAME
- _ZThn8_N27SecCodeEditDataFormViewItemD0Ev @ 34 NONAME
- _ZThn8_N27SecCodeEditDataFormViewItemD1Ev @ 35 NONAME
-
--- a/controlpanel/src/inc/cpcategorysettingformitemdata.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* 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:
-*
-*/
-#ifndef CPCATEGORYSETTINGFORMITEMDATA_H
-#define CPCATEGORYSETTINGFORMITEMDATA_H
-
-#include <cpglobal.h>
-#include <cpsettingformitemdata.h>
-
-class CpCategorySettingFormItemDataPrivate;
-class CP_EXPORT CpCategorySettingFormItemData : public CpSettingFormItemData
-{
- Q_OBJECT
-public:
- CpCategorySettingFormItemData(HbDataFormModelItem::DataItemType type,
- const QString &label,
- const QString &configFile,
- const HbDataFormModelItem *parent = 0);
-
- explicit CpCategorySettingFormItemData(const QString &configFile = QString(),
- const HbDataFormModelItem *parent = 0);
-
- virtual ~CpCategorySettingFormItemData();
-
- void initialize(CpItemDataHelper &itemDataHelper);
-private:
- virtual void beforeLoadingConfigPlugins(CpItemDataHelper &itemDataHelper);
- virtual void afterLoadingConfigPlugins(CpItemDataHelper &itemDataHelper);
-private:
- CpCategorySettingFormItemDataPrivate *d;
-};
-
-#endif
--- a/controlpanel/src/inc/cpcategorysettingformmodel.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* 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:
-*
-*/
-#ifndef CPCATEGORYSETTINGFORMMODEL_H
-#define CPCATEGORYSETTINGFORMMODEL_H
-
-#include <cpglobal.h>
-#include <hbdataformmodel.h>
-
-class CpItemDataHelper;
-class CpCategorySettingFormModelPrivate;
-
-class CP_EXPORT CpCategorySettingFormModel : public HbDataFormModel
-{
- Q_OBJECT
-public:
- explicit CpCategorySettingFormModel(const QString &configFile);
- virtual ~CpCategorySettingFormModel();
- virtual void initialize(CpItemDataHelper &itemDataHelper);
-private:
- virtual void beforeLoadingConfigPlugins(CpItemDataHelper &itemDataHelper);
- virtual void afterLoadingConfigPlugins(CpItemDataHelper &itemDataHelper);
-private:
- CpCategorySettingFormModelPrivate *d;
-};
-
-
-#endif
--- a/controlpanel/src/inc/cplogger.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* 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:
-*
-*/
-#ifndef CPLOGGER_H
-#define CPLOGGER_H
-
-#include <qdebug>
-#include <qfile>
-#include <qsettings>
-class QFile;
-
-class CpLogger
-{
- enum { NoLog = 0, StdTraces, LogToFile };
-public:
- CpLogger() : mDebug(0), mLogFile(0)
- {
- QSettings settings;
- int logMethod = settings.value("Log/logmethod",NoLog).toInt();
- switch (logMethod)
- {
- default:
- case NoLog:
- break;
- case StdTraces:
- mDebug = new QDebug(QtDebugMsg);
- break;
- case LogToFile:
- //TBD: hardcode path will be replaced by some other form
- mLogFile = new QFile("C:\\data\\logs\\controlpanel.log");
- mLogFile->open(QFile::WriteOnly | QFile::Append);
- mDebug = new QDebug(mLogFile);
- break;
- }
- }
-
- ~CpLogger()
- {
- delete mDebug;
- delete mLogFile;
- }
-
- template<typename T>
- inline CpLogger &operator << (const T &log)
- {
- if (mDebug)
- {
- (*mDebug) << log;
- }
- return *this;
- }
-
-private:
- Q_DISABLE_COPY(CpLogger)
- QDebug *mDebug;
- QFile *mLogFile;
-};
-
-#endif /* CPLOGGER_H */
--- a/controlpanel/src/inc/cpprofilemodel.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef CPPROFILEMODEL_H
-#define CPPROFILEMODEL_H
-
-#include "cpprofilewrappermacro.h"
-#include <QtCore/qglobal.h>
-#include <QString>
-
-class CpProfileModelPrivate;
-
-
-class PROFILE_WRAPPER_EXPORT CpProfileModel
- {
-public:
- CpProfileModel();
- ~CpProfileModel();
-
-public:
- int initiationFlag();
- QString ringTone();
- void setRingTone(const QString& filePath);
- QString messageTone();
- void setMessageTone(const QString& filePath);
- QString emailTone();
- void setEmailTone(const QString& filePath);
- QString calendarTone();
- void setCalendarTone(const QString& filePath);
- QString alarmTone();
- void setAlarmTone(const QString& filePath);
- int ringVolume();
- void setRingVolume(int volume);
- void activateBeep();
- bool isBeep();
- void activateSilent();
- bool isSilent();
- bool vibraStatus();
- void setVibraStatus(bool status);
- int keyVolume();
- void setKeyVolume(int volume);
- int screenVolume();
- void setScreenVolume(int volume);
- int screenVibra();
- void setScreenVibra(int volume);
-
-private:
- Q_DISABLE_COPY(CpProfileModel)
-
-private:
- CpProfileModelPrivate* dptr;
- };
-
-#endif
--- a/controlpanel/src/inc/cpprofilewrappermacro.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef CP_PROFILEWRAPPER_MACRO_H
-#define CP_PROFILEWRAPPER_MACRO_H
-
-#include <qtglobal>
-
-#ifdef PROFILEWRAPPER_FREEZE
- #define PROFILE_WRAPPER_EXPORT Q_DECL_EXPORT
-#else
- #define PROFILE_WRAPPER_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif
--- a/controlpanel/src/inc/cpuids.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* 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:
-* Contains all QT comtrol pannel related formal uids
-*
-*/
-#ifndef QCPUIDS_H
-#define QCPUIDS_H
-
-#define QUID_CONTROLPANNEL_UI 0X20025FD9
-#define QUID_CPFRAMEWORK_DLL 0X20025FDA
-#define QUID_CPPLUGIN_APPSETTINGS 0X20025FDC
-#define QUID_CPPLUGIN_PLACEHOLDER_NOICON 0X20025FDD
-#define QUID_CPPLUGIN_KEYTOUCH 0X20025FDE
-#define QUID_CPPLUGIN_COMMUNICATION 0X20025FDF
-#define QUID_CPPPLUGIN_LOOKFEEL 0X20025FE0
-#define QUID_CPPLUGIN_SAMPLEVIEW 0X20025FE2
-#define QUID_CPPLUGIN_SAMPLEGROUP 0X20025FE3
-#define QUID_CPPLUGIN_PRIVACY 0X20025FE1
-#define QUID_CPPLUGIN_THEME 0X20025FDB
-#define QUID_CPPLUGIN_TONES 0X20025FE4
-#define QUID_CPPLUGIN_PERSONALIZATION 0X20025FE5
-#define QUID_CPPROFILEENGWRAPPER 0X20025FE6
-#define QUID_CPPLUGIN_DEVICE 0X20025FE7
-#define QUID_CPPLUGIN_PLACEHOLDER 0X20025FE8
-
-#define QUID_CPPLUGIN_PINCODE 0X20028731
-#define QUID_CPPLUGIN_DEVICELOCK 0X20028732
-#define QUID_SECCODEUI 0X20028733
-#define QUID_LOGGER 0X20028734
-
-#define QUID_RESERVED2 0X20028735
-#define QUID_RESERVED3 0X20028736
-#define QUID_RESERVED4 0X20028737
-#define QUID_RESERVED5 0X20028738
-#define QUID_RESERVED6 0X20028739
-#define QUID_RESERVED7 0X2002873A
-#define QUID_RESERVED8 0X2002873B
-#define QUID_RESERVED9 0X2002873C
-#define QUID_RESERVED10 0X2002873D
-#define QUID_RESERVED11 0X2002873E
-#define QUID_RESERVED12 0X2002873F
-#define QUID_DE_GSPLUGIN 0X20028740 //reserved by 9.2
-
-#endif //QCPUIDS_H
--- a/controlpanel/src/inc/inc.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#
-# 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:
-#
-
-INTERNAL_HEADERS += $$PWD/cpcategorysettingformmodel.h \
- $$PWD/cpcategorysettingformitemdata.h \
- $$PWD/cplogger.h
-
-HEADERS += $$INTERNAL_HEADERS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/logger/logger.pri Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,18 @@
+#
+# 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: controlpanel project - common qmake settings
+#
+
+HEADERS += $$PWD/src/*.h
+SOURCES += $$PWD/src/*.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/logger/logger_export.pri Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,28 @@
+#
+# 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: controlpanel project - common qmake settings
+#
+
+symbian: {
+ # export headers to mw
+ EXPORT_PLATFORM_CPLOGGER_HEADERS += \
+ ../../controlpanel_plat/inc/logger.h \
+ ../../controlpanel_plat/inc/logoutput.h \
+ ../../controlpanel_plat/inc/loggerglobal.h \
+ ../../controlpanel_plat/inc/logoutputfactory.h \
+ ../../controlpanel_plat/inc/cplogger.h
+
+ loggers.sources = $$EXPORT_PLATFORM_CPLOGGER_HEADERS
+ for(logger, loggers.sources):BLD_INF_RULES.prj_exports += "./$$logger $$MW_LAYER_PLATFORM_EXPORT_PATH(cplogger/$$basename(logger))"
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/logger/src/logger.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,255 @@
+/*
+* 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:
+*
+*/
+#include <logger.h>
+#include "logoutput.h"
+#include "logoutputimpl.h"
+#include <QtAlgorithms>
+#include <QHash>
+#include <QString>
+#include <QStringList>
+#include <QDateTime>
+#include <QSettings>
+#include <QFileInfo>
+#include "loglogger.h"
+#include "logoutputfactory.h"
+
+typedef QHash<QString,Logger*> LoggerContainer;
+
+Q_GLOBAL_STATIC(LoggerContainer,theLoggerList)
+
+class InitLogLogger
+{
+public:
+ InitLogLogger() {
+ LogOutput *output = new DebugLogOutput();
+ output->init();
+ Logger::instance(LOGLOGGER_NAME)->addLogOutput(output);
+ }
+} dummy_instance;
+
+class LoggerPrivate
+{
+public:
+ LoggerPrivate(const QString &name = QString())
+ : mName(name),
+ mDateTimeFormat("hh:mm:ss:zzz"),
+ mLogDateTime(true),
+ mLogLoggerName(true)
+ {
+ }
+
+ ~LoggerPrivate()
+ {
+ clearAllLogOutput();
+ }
+
+ void clearAllLogOutput()
+ {
+ qDeleteAll(mLogOutputs.begin(),mLogOutputs.end());
+ mLogOutputs.clear();
+ }
+
+ QString mName;
+ QString mDateTimeFormat;
+ QList<LogOutput*> mLogOutputs;
+ bool mLogDateTime;
+ bool mLogLoggerName;
+};
+
+Logger *Logger::instance(const QString &name)
+{
+ if (name.isEmpty()) {
+ LOGGER_LOG("Logger::instance() >> name is empty.");
+ return 0;
+ }
+
+ QString nameLower(name);
+ nameLower.toLower();
+
+ Logger *logger = theLoggerList()->value(nameLower);
+ if (!logger) {
+ logger = new Logger(nameLower);
+ theLoggerList()->insert(nameLower,logger);
+ }
+
+ return logger;
+}
+
+void Logger::closeAll()
+{
+ qDeleteAll(theLoggerList()->begin(),theLoggerList()->end());
+ theLoggerList()->clear();
+}
+
+void Logger::close(const QString &name)
+{
+ QString nameLower(name);
+ nameLower.toLower();
+ delete theLoggerList()->take(nameLower);
+}
+
+Logger::Logger(const QString &name /*= QString()*/,QObject *parent /*= 0*/) : QObject(parent),
+ d_ptr(new LoggerPrivate(name))
+{
+
+}
+
+Logger::~Logger()
+{
+ delete d_ptr;
+}
+
+void Logger::log(const QString &log)
+{
+ if (d_ptr->mLogOutputs.isEmpty()) {
+ return;
+ }
+
+ QString logStr;
+
+ if (d_ptr->mLogDateTime) {
+ logStr += QDateTime::currentDateTime().toString(d_ptr->mDateTimeFormat) + " ";
+ }
+
+ if (d_ptr->mLogLoggerName) {
+ logStr += '[';
+ logStr += name();
+ logStr += "]:";
+ }
+
+ logStr += log;
+ logStr += LINE_SEPERATOR;
+
+ foreach(LogOutput *logOutput, d_ptr->mLogOutputs) {
+ logOutput->output(logStr);
+ }
+}
+
+void Logger::configure(const QString &configFile,QSettings::Format format /*= QSettings::NativeFormat*/)
+{
+ if (QFileInfo(configFile).exists()) {
+ QSettings settings(configFile,format);
+ configure(settings);
+ }
+}
+
+void Logger::configure(QSettings &settings)
+{
+ clearAllLogOutput();
+
+ settings.beginGroup(name());
+ QString strOutput = settings.value(LOGGER_OUTPUT).toString();
+ d_ptr->mLogDateTime = settings.value(LOGGER_LOGDATETIME,true).toBool();
+ d_ptr->mLogLoggerName = settings.value(LOGGER_LOGLOGGERNAME,true).toBool();
+ QString strDateTimeFormat = settings.value(LOGGER_DATETIMEFORMAT).toString();
+ if (!strDateTimeFormat.isEmpty()) {
+ d_ptr->mDateTimeFormat = strDateTimeFormat;
+ }
+ settings.endGroup();
+
+ QStringList outputNameList = strOutput.split(' ',QString::SkipEmptyParts);
+ foreach(const QString &outputName,outputNameList) {
+ LogOutput *output = LogOutputFactory::createLogOutput(outputName);
+ if (output) {
+ output->setParentLogger(this);
+ if (output->load(settings)) {
+ addLogOutput(output);
+ }
+ else {
+ delete output;
+ }
+ }
+ }
+}
+
+bool Logger::addLogOutput(LogOutput *output)
+{
+ if (!output) {
+ LOGGER_LOG("Logger::addLogOutput >> output is NULL.");
+ return false;
+ }
+
+ if ( d_ptr->mLogOutputs.indexOf(output) >= 0) {
+ LOGGER_LOG("Logger::addLogOutput >> output is already in list.");
+ return false;
+ }
+
+ if (logOutput(output->name())) {
+ LOGGER_LOG( QString("Logger::addLogOutput >> output with the name <") + output->name() + "> is already in list.");
+ }
+
+ output->setParentLogger(this);
+ d_ptr->mLogOutputs.append(output);
+
+ return true;
+}
+
+void Logger::removeLogOutput(LogOutput *output)
+{
+ d_ptr->mLogOutputs.removeAll(output);
+}
+
+LogOutput *Logger::logOutput(const QString &name)
+{
+ foreach(LogOutput *output,d_ptr->mLogOutputs) {
+ if (output->name().compare(name,Qt::CaseInsensitive) == 0) {
+ return output;
+ }
+ }
+
+ return 0;
+}
+
+void Logger::clearAllLogOutput()
+{
+ d_ptr->clearAllLogOutput();
+}
+
+QString Logger::name() const
+{
+ return d_ptr->mName;
+}
+
+bool Logger::logDateTime() const
+{
+ return d_ptr->mLogDateTime;
+}
+
+void Logger::setLogDateTime(bool on)
+{
+ d_ptr->mLogDateTime = on;
+}
+
+bool Logger::logLoggerName() const
+{
+ return d_ptr->mLogLoggerName;
+}
+
+void Logger::setLogLoggerName(bool on)
+{
+ d_ptr->mLogLoggerName = on;
+}
+
+QString Logger::dateTimeFormat() const
+{
+ return d_ptr->mDateTimeFormat;
+}
+
+void Logger::setDateTimeFormat(const QString &format)
+{
+ d_ptr->mDateTimeFormat = format;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/logger/src/loglogger.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,30 @@
+/*
+* 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:
+*
+*/
+#ifndef LOGLOGGER_H
+#define LOGLOGGER_H
+
+#include "logger.h"
+
+#define LOGLOGGER_NAME QLatin1String("##loglogger##")
+
+#ifdef _DEBUG
+ #define LOGGER_LOG(str) Logger::instance(LOGLOGGER_NAME)->log(str);
+#else
+ #define LOGGER_LOG(str)
+#endif
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/logger/src/logoutput.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,69 @@
+/*
+* 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:
+*
+*/
+#include <logoutput.h>
+#include <QString>
+
+class LogOutputPrivate
+{
+public:
+ LogOutputPrivate(Logger *parentLogger = 0) : mParentLogger(parentLogger)
+ {
+ }
+ Logger *mParentLogger;
+ QString mName;
+};
+
+
+//LogOutput
+LogOutput::LogOutput(Logger *parentLogger /*= 0*/)
+: d_ptr(new LogOutputPrivate(parentLogger))
+{
+}
+
+LogOutput::~LogOutput()
+{
+ delete d_ptr;
+}
+
+bool LogOutput::load(QSettings &settings)
+{
+ if (!doLoad(settings)) {
+ return false;
+ }
+ return init();
+}
+
+Logger *LogOutput::parentLogger()
+{
+ return d_ptr->mParentLogger;
+}
+
+void LogOutput::setParentLogger(Logger *parentLogger)
+{
+ d_ptr->mParentLogger = parentLogger;
+}
+
+QString LogOutput::name() const
+{
+ return d_ptr->mName;
+}
+
+void LogOutput::setName(const QString &name)
+{
+ d_ptr->mName = name;
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/logger/src/logoutputfactory.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,80 @@
+/*
+* 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:
+*
+*/
+#include <logoutputfactory.h>
+#include <QHash>
+#include <QMetaObject>
+#include <QMetaProperty>
+#include "logoutput.h"
+#include "loglogger.h"
+
+typedef QHash<QString,LogOutputFactory::CREATE_ENTRY> CreateEntryContainer;
+
+Q_GLOBAL_STATIC(CreateEntryContainer, theCreateEntryList)
+
+static QString formalizeName(const QString &name)
+{
+ QString formalName = name;
+ formalName.toLower();
+ formalName = formalName.trimmed();
+ return formalName;
+}
+
+LogOutput *LogOutputFactory::createLogOutput(const QString &name)
+{
+ return createLogOutput(name,QHash<QString,QVariant>());
+}
+
+LogOutput *LogOutputFactory::createLogOutput(const QString &name,
+ const QHash<QString,QVariant> &properties /*= QHash<QString,QVariant>()*/)
+{
+ LogOutputFactory::CREATE_ENTRY entry = theCreateEntryList()->value(formalizeName(name));
+
+ LogOutput *output = entry ? (*entry)() : 0;
+
+ if (output && !properties.isEmpty()) {
+ const QMetaObject *metaObj = output->metaObject();
+ int count = metaObj->propertyCount();
+ for (int i = 0; i < count; i++) {
+ QMetaProperty metaProperty = metaObj->property(i);
+ if (metaProperty.isValid() && metaProperty.isWritable()) {
+ QVariant var = properties.value(metaProperty.name());
+ if (var.isValid()) {
+ metaProperty.write(output,var);
+ }
+ }
+ }
+ }
+
+ return output;
+}
+
+void LogOutputFactory::addCreateLogOutputEntry(const QString &name,CREATE_ENTRY entry)
+{
+ if (!entry) {
+ return;
+ }
+
+ QString formalName = formalizeName(name);
+
+ if (theCreateEntryList()->value(formalName)) {
+ LOGGER_LOG(QString("LogOutputFactory::addCreateLogOutputEntry << ")
+ + QString("create entry with the name:") + formalName + QString("already exists."));
+ return;
+ }
+
+ theCreateEntryList()->insert(formalName,entry);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/logger/src/logoutputimpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,195 @@
+/*
+* 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:
+*
+*/
+#include "logoutputimpl.h"
+#include <QFile>
+#include <QDir>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QSettings>
+#include "logger.h"
+#include "loglogger.h"
+#include "logoutputfactory.h"
+
+#ifdef Q_WS_WIN
+ #include <Windows.h>
+#endif
+
+//DebugLogOutput
+REGISTER_OUTPUT_LOG(DEBUGOUTPUT_NAME,DebugLogOutput)
+
+DebugLogOutput::DebugLogOutput()
+{
+}
+
+DebugLogOutput::~DebugLogOutput()
+{
+}
+
+void DebugLogOutput::output(const QString &log)
+{
+#ifdef Q_WS_WIN
+ QT_WA({
+ OutputDebugStringW(reinterpret_cast<const WCHAR*>(log.utf16()));
+ }, {
+ OutputDebugStringA(log.toLocal8Bit().data());
+ });
+#else
+ fprintf(stderr, log.toLocal8Bit().data());
+ fflush(stderr);
+#endif
+}
+
+bool DebugLogOutput::init()
+{
+ return true;
+}
+
+
+bool DebugLogOutput::doLoad(QSettings &settings)
+{
+ Q_UNUSED(settings);
+ return true;
+}
+
+
+//ConsoleLogOutput
+
+REGISTER_OUTPUT_LOG(CONSOLEOUTPUT_NAME,ConsoleLogOutput)
+
+ConsoleLogOutput::ConsoleLogOutput()
+{
+}
+
+ConsoleLogOutput::~ConsoleLogOutput()
+{
+}
+
+void ConsoleLogOutput::output(const QString &log)
+{
+ printf(log.toLocal8Bit().data());
+}
+
+bool ConsoleLogOutput::init()
+{
+ return true;
+}
+
+
+bool ConsoleLogOutput::doLoad(QSettings &settings)
+{
+ Q_UNUSED(settings);
+ return true;
+}
+
+//FileLogOutput
+
+REGISTER_OUTPUT_LOG(FILEOUTPUT_NAME,FileLogOutput)
+
+FileLogOutput::FileLogOutput(const QString &logFilePath /*= QString()*/) :
+ mLogFile(0),mTextStream(0),mLogFilePath(logFilePath),mTruncateFile(false)
+{
+}
+
+FileLogOutput::~FileLogOutput()
+{
+ delete mTextStream;
+ delete mLogFile;
+}
+
+void FileLogOutput::output(const QString &log)
+{
+ *mTextStream << log;
+ mTextStream->flush();
+}
+
+bool FileLogOutput::init()
+{
+ if (mTextStream) {
+ delete mTextStream;
+ mTextStream = 0;
+ }
+
+ if (mLogFile) {
+ delete mLogFile;
+ mLogFile = 0;
+ }
+
+ QFileInfo fileInfo(mLogFilePath);
+ QDir parentDir = fileInfo.dir();
+ if (!parentDir.exists())
+ {
+ QString path = parentDir.absolutePath();
+ parentDir.cdUp();
+ parentDir.mkpath(path);
+ }
+
+ mLogFile = new QFile(mLogFilePath);
+ QFile::OpenMode mode = QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append;
+
+ if (mTruncateFile) {
+ mode |= QIODevice::Truncate;
+ }
+
+ if (!mLogFile->open(mode))
+ {
+ LOGGER_LOG(QString("FileLogOutput::init << Open open file failed: ") + mLogFilePath);
+ return false;
+ }
+ mTextStream = new QTextStream(mLogFile);
+ return true;
+}
+
+bool FileLogOutput::doLoad(QSettings &settings)
+{
+ if (!parentLogger()) {
+ return false;
+ }
+
+ settings.beginGroup(parentLogger()->name());
+ mLogFilePath = settings.value(
+ FILEOUTPUT_NAME + SETTINGS_SECTION_SEPERATOR + FILEOUTPUT_LOGFILE).toString();
+ mTruncateFile = settings.value(
+ FILEOUTPUT_NAME + SETTINGS_SECTION_SEPERATOR + FILEOUTPUT_TRUNCATE,QVariant(false)).toBool();
+ settings.endGroup();
+
+ if (mLogFilePath.isEmpty()) {
+ return false;
+ }
+
+ return true;
+}
+
+bool FileLogOutput::truncate() const
+{
+ return mTruncateFile;
+}
+
+void FileLogOutput::setTruncate(bool truncate)
+{
+ mTruncateFile = truncate;
+}
+
+QString FileLogOutput::logFile() const
+{
+ return mLogFilePath;
+}
+
+void FileLogOutput::setLogFile(const QString &logFile)
+{
+ mLogFilePath = logFile;
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/logger/src/logoutputimpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,81 @@
+/*
+* 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:
+*
+*/
+#ifndef LOGOUTPUTIMPL_H
+#define LOGOUTPUTIMPL_H
+
+#include <logoutput.h>
+#include <QString>
+
+// name: "debugoutput"
+class DebugLogOutput : public LogOutput
+{
+ Q_OBJECT
+public:
+ DebugLogOutput();
+ virtual ~DebugLogOutput();
+ virtual void output(const QString &log);
+ virtual bool init();
+private:
+ virtual bool doLoad(QSettings &settings);
+};
+
+// name: "consoleoutput"
+class ConsoleLogOutput : public LogOutput
+{
+ Q_OBJECT
+public:
+ ConsoleLogOutput();
+ virtual ~ConsoleLogOutput();
+ virtual void output(const QString &log);
+ virtual bool init();
+private:
+ virtual bool doLoad(QSettings &settings);
+};
+
+// name: "fileoutput"
+
+/* config format:
+ fileoutput/logfile = C:/data/logs/app.log
+ fileoutput/truncate = 0
+*/
+class QFile;
+class QTextStream;
+class FileLogOutput : public LogOutput
+{
+ Q_OBJECT
+ Q_PROPERTY(bool truncate READ truncate WRITE setTruncate)
+ Q_PROPERTY(QString logFile READ logFile WRITE setLogFile)
+public:
+ explicit FileLogOutput(const QString &logFilePath = QString());
+ virtual ~FileLogOutput();
+ virtual void output(const QString &log);
+ virtual bool init();
+
+ bool truncate() const;
+ void setTruncate(bool truncate);
+ QString logFile() const;
+ void setLogFile(const QString &logFile);
+private:
+ virtual bool doLoad(QSettings &settings);
+private:
+ QFile *mLogFile;
+ QTextStream *mTextStream;
+ QString mLogFilePath;
+ bool mTruncateFile;
+};
+
+#endif //LOGOUTPUTIMPL_H
--- a/controlpanel/src/seccodeui/seccodeui.pri Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# 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: seccodeui source files
-#
-
-# Input
-HEADERS += src/seccodesettings.h \
- src/seccodeuiutility.h \
- src/seccodeedit.h \
- src/seccodeeditdataformviewitem.h \
- src/seccodemodel.h \
- src/seccodemodel_p.h
-
-
-SOURCES += src/seccodesettings.cpp \
- src/seccodeuiutility.cpp \
- src/seccodeedit.cpp \
- src/seccodeeditdataformviewitem.cpp \
- src/seccodemodel.cpp
-
-symbian : {
- SOURCES += src/seccodemodel_symbian.cpp
-}
-
-win32 : {
- SOURCES += src/seccodemodel_win.cpp
-}
\ No newline at end of file
--- a/controlpanel/src/seccodeui/seccodeui.pro Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-# 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:
-#
-
-TEMPLATE = lib
-TARGET = seccodeui
-
-CONFIG += hb
-
-DEFINES += BUILD_SECCODEUI
-
-MOC_DIR = moc
-OBJECT_DIR = obj
-RCC_DIR = rcc
-
-include ( seccodeui.pri )
-
-CONFIG(debug, debug|release) {
- SUBDIRPART = debug
-} else {
- SUBDIRPART = release
-}
-
-win32: {
- DESTDIR = C:/ControlPanel/$$SUBDIRPART/bin
- OBJECTS_DIR = $$PWD/../$$SUBDIRPART/tmp/$$TARGET
-}
-
-# Add the output dirs to the link path too
-LIBS += -L$$DESTDIR
-
-symbian: {
- INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
- INCLUDEPATH += $$MOC_DIR
- TARGET.CAPABILITY = ALL -TCB
- TARGET.EPOCALLOWDLLDATA = 1
- TARGET.UID3 = 0x20028733
-}
-
--- a/controlpanel/src/seccodeui/src/seccodeedit.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "seccodeedit.h"
-#include <QGraphicsSceneMouseEvent>
-
-SecCodeEdit::SecCodeEdit(const QString &text, QGraphicsItem *parent /*= 0*/)
-: HbLineEdit(text,parent)
-{
-}
-
-SecCodeEdit::~SecCodeEdit()
-{
-}
-
-void SecCodeEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
- if (event->button() != Qt::LeftButton) {
- event->ignore();
- return;
- }
-
- if (rect().contains(event->pos())) {
- emit clicked();
- event->accept();
- }
- else {
- event->ignore();
- }
-}
--- a/controlpanel/src/seccodeui/src/seccodeedit.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef SECCODEEDIT_H
-#define SECCODEEDIT_H
-
-#include <hblineedit.h>
-
-class SecCodeEdit : public HbLineEdit
-{
- Q_OBJECT
-public:
- explicit SecCodeEdit(const QString &text, QGraphicsItem *parent = 0);
- virtual ~SecCodeEdit();
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
-signals:
- void clicked();
-};
-
-#endif //SECCODEEDIT_H
--- a/controlpanel/src/seccodeui/src/seccodeeditdataformviewitem.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* 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:
-*
-*/
-#include "seccodeeditdataformviewitem.h"
-#include "seccodeedit.h"
-
-SecCodeEditDataFormViewItem::SecCodeEditDataFormViewItem(QGraphicsItem *parent )
-: HbDataFormViewItem(parent)
-{
-}
-
-SecCodeEditDataFormViewItem::~SecCodeEditDataFormViewItem()
-{
-}
-
-HbAbstractViewItem* SecCodeEditDataFormViewItem::createItem()
-{
- return new SecCodeEditDataFormViewItem(*this);
-}
-
-bool SecCodeEditDataFormViewItem::canSetModelIndex(const QModelIndex &index) const
-{
- int type = index.data(HbDataFormModelItem::ItemTypeRole).toInt();
- return type == SecCodeEditItem;
-}
-
-HbWidget *SecCodeEditDataFormViewItem::createCustomWidget()
-{
- int type = modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt();
-
- if (type == SecCodeEditItem) {
- SecCodeEdit *edit = new SecCodeEdit("1234");
- edit->setEchoMode(HbLineEdit::Password );
- edit->setReadOnly(true);
- return edit;
- }
-
- return 0;
-}
--- a/controlpanel/src/seccodeui/src/seccodeeditdataformviewitem.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef SECCODEEDITDATAFORMVIEWITEM_H
-#define SECCODEEDITDATAFORMVIEWITEM_H
-
-#include "seccodeuiglobal.h"
-#include <hbdataformviewitem.h>
-#include <hbdataformmodelitem.h>
-
-class SECCODEUI_EXPORT SecCodeEditDataFormViewItem : public HbDataFormViewItem
-{
- Q_OBJECT
-public:
- enum { SecCodeEditItem = HbDataFormModelItem::CustomItemBase + 1 };
-
- explicit SecCodeEditDataFormViewItem(QGraphicsItem *parent = 0);
- virtual ~SecCodeEditDataFormViewItem();
- virtual HbAbstractViewItem* createItem();
- virtual bool canSetModelIndex(const QModelIndex &index) const;
-protected:
- virtual HbWidget* createCustomWidget();
-};
-
-#endif //SECCODEEDITDATAFORMVIEWITEM_H
--- a/controlpanel/src/seccodeui/src/seccodemodel.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "seccodemodel.h"
-#include "seccodemodel_p.h"
-
-SecCodeModel::SecCodeModel(QObject * parent /*= 0*/)
-: QObject(parent),d_ptr(new SecCodeModelPrivate())
-{
-}
-
-SecCodeModel::~SecCodeModel()
-{
- delete d_ptr;
-}
-
-bool SecCodeModel::simCardRemoved()
-{
-// return d_ptr->simCardRemoved();
- return false;
-}
-
-
-int SecCodeModel::pinRemainingAttempts()
-{
- // return d_ptr->pinRemainingAttempts();
- return 3;
-}
-
-int SecCodeModel::pin2RemainingAttempts()
-{
-// return d_ptr->pin2RemainingAttempts();
- return 3;
-}
-
-int SecCodeModel::changePinCode(const QString &oldCode,const QString &newCode,const QString &verifyCode)
-{
- Q_UNUSED(oldCode);
- Q_UNUSED(newCode);
- Q_UNUSED(verifyCode);
- return 0;
-}
-
-int SecCodeModel::changePin2Code(const QString &oldCode,const QString &newCode,const QString &verifyCode)
-{
- Q_UNUSED(oldCode);
- Q_UNUSED(newCode);
- Q_UNUSED(verifyCode);
-
- return 0;
-}
--- a/controlpanel/src/seccodeui/src/seccodemodel.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef SECCODEMODEL_H
-#define SECCODEMODEL_H
-
-#include <QObject>
-
-class SecCodeModelPrivate;
-class SecCodeModel : public QObject
-{
- Q_OBJECT
-public:
- SecCodeModel(QObject * parent = 0);
- virtual ~SecCodeModel();
-
- bool simCardRemoved();
-
- int pinRemainingAttempts();
-
- int changePinCode(const QString &oldCode,const QString &newCode,const QString &verifyCode);
-
- int pin2RemainingAttempts();
-
- int changePin2Code(const QString &oldCode,const QString &newCode,const QString &verifyCode);
-
-private:
- SecCodeModelPrivate *d_ptr;
-};
-
-
-#endif //SECCODEMODEL_H
-
--- a/controlpanel/src/seccodeui/src/seccodemodel_p.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef SECCODEMODEL_P_H
-#define SECCODEMODEL_P_H
-
-class SecCodeModelPrivate
-{
-public:
-
-};
-
-#endif //SECCODEMODEL_P_H
--- a/controlpanel/src/seccodeui/src/seccodemodel_symbian.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "seccodemodel_p.h"
-#include "seccodeuiglobal.h"
-#include <e32err.h>
-#include <exterror.h>
-
-static int symbianErrtoQtErr(int err)
-{
- switch (err) {
- case KErrNone:
- return SecCode::ErrNone;
- case KErrGsm0707IncorrectPassword:
- return SecCode::ErrGsm0707IncorrectPassword;
- case KErrAccessDenied:
- return SecCode::ErrAccessDenied;
- case KErrGsmSSPasswordAttemptsViolation:
- return SecCode::ErrGsmSSPasswordAttemptsViolation;
- case KErrLocked:
- return SecCode::ErrLocked;
- case KErrGsm0707OperationNotAllowed:
- return SecCode::ErrGsm0707OperationNotAllowed;
- case KErrGsm0707SIMPuk2Required:
- return SecCode::ErrGsm0707SIMPuk2Required;
- case KErrAbort:
- return SecCode::ErrAbort;
- default:
- break;
- }
-
- return err;
-}
-
--- a/controlpanel/src/seccodeui/src/seccodemodel_win.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "seccodemodel_p.h"
--- a/controlpanel/src/seccodeui/src/seccodesettings.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#include "seccodesettings.h"
-#include "seccodemodel.h"
-#include "seccodeuiutility.h"
-
-class SecCodeSettingsPrivate
-{
-public:
- SecCodeSettingsPrivate()
- {
- mSecCodeModel = new SecCodeModel();
- }
-
- ~SecCodeSettingsPrivate()
- {
- delete mSecCodeModel;
- }
-
- SecCodeModel *mSecCodeModel;
-};
-
-SecCodeSettings::SecCodeSettings(QObject * parent /*= 0*/)
-: QObject(parent), d_ptr(new SecCodeSettingsPrivate())
-{
-
-}
-
-SecCodeSettings::~SecCodeSettings()
-{
- delete d_ptr;
-}
-
-bool SecCodeSettings::pinCodeRequest() const
-{
-// return d_ptr->mSecCodeModel->pinCodeRequest();
- return true;
-}
-
-void SecCodeSettings::setPinCodeRequest(bool on)
-{
- Q_UNUSED(on);
-}
-
-void SecCodeSettings::changePinCode()
-{
- if (d_ptr->mSecCodeModel->simCardRemoved()) {
- SecCodeUiUtility::showErrorMessage(tr("SIM removed."));
- return;
- }
-
- if (!pinCodeRequest()) {
- SecCodeUiUtility::showErrorMessage(tr("Set PIN code request ON."));
- return;
- }
-
- QString title = SecCodeUiUtility::getPinRemainingAttemptsMessage(
- d_ptr->mSecCodeModel->pinRemainingAttempts());
-
- QString oldPassword = SecCodeUiUtility::getPassword(title);
- if (oldPassword.isEmpty()) {
- return;
- }
-
- QString newPassword;
- QString verifyPassword;
- bool firstTry (true);
-
- do {
- if (firstTry) {
- firstTry = false;
- }
- else {
- newPassword.clear();
- verifyPassword.clear();
- SecCodeUiUtility::showErrorMessage(tr("PIN does not match."));
- }
-
- newPassword = SecCodeUiUtility::getPassword(tr("New PIN:"));
- if (newPassword.isEmpty()) {
- return;
- }
-
- verifyPassword = SecCodeUiUtility::getPassword(tr("Verify PIN:"));;
- if (verifyPassword.isEmpty()) {
- return;
- }
- } while (verifyPassword != newPassword);
-
- int err = d_ptr->mSecCodeModel->changePinCode(oldPassword,newPassword,verifyPassword);
- switch (err) {
- case SecCode::ErrNone:
- SecCodeUiUtility::showInformationMessage(tr("Code changed."));
- break;
- default:
- break;
- }
-}
-
-
-void SecCodeSettings::changePin2Code()
-{
- if (d_ptr->mSecCodeModel->simCardRemoved()) {
- SecCodeUiUtility::showErrorMessage(tr("SIM removed."));
- return;
- }
-
- if (!pinCodeRequest()) {
- SecCodeUiUtility::showErrorMessage(tr("Set PIN code request ON."));
- return;
- }
-
- QString title = SecCodeUiUtility::getPin2RemainingAttemptsMessage(
- d_ptr->mSecCodeModel->pin2RemainingAttempts());
-
- QString oldPassword = SecCodeUiUtility::getPassword(title);
- if (oldPassword.isEmpty()) {
- return;
- }
-
- QString newPassword;
- QString verifyPassword;
- bool firstTry (true);
-
- do {
- if (firstTry) {
- firstTry = false;
- }
- else {
- newPassword.clear();
- verifyPassword.clear();
- SecCodeUiUtility::showErrorMessage(tr("PIN2 does not match."));
- }
-
- newPassword = SecCodeUiUtility::getPassword(tr("New PIN2:"));
- if (newPassword.isEmpty()) {
- return;
- }
-
- verifyPassword = SecCodeUiUtility::getPassword(tr("Verify PIN2:"));;
- if (verifyPassword.isEmpty()) {
- return;
- }
- } while (verifyPassword != newPassword);
-
- int err = d_ptr->mSecCodeModel->changePin2Code(oldPassword,newPassword,verifyPassword);
- switch (err) {
- case SecCode::ErrNone:
- SecCodeUiUtility::showInformationMessage(tr("Code changed."));
- break;
- default:
- break;
- }
-}
--- a/controlpanel/src/seccodeui/src/seccodesettings.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef SECCODESETTINGS_H
-#define SECCODESETTINGS_H
-
-#include <QObject>
-#include "seccodeuiglobal.h"
-
-class SecCodeSettingsPrivate;
-
-class SECCODEUI_EXPORT SecCodeSettings : public QObject
-{
- Q_OBJECT
-public:
- explicit SecCodeSettings(QObject *parent = 0);
- virtual ~SecCodeSettings();
-
- bool pinCodeRequest() const;
-
- void setPinCodeRequest(bool on);
-
- void changePinCode();
-
- void changePin2Code();
-
- bool deviceLock() const;
-
- void setDeviceLock(bool on);
-
- void changeLockCode();
-
- int autoLockPeriod() const;
-
- void setAutoLockPeriod(int period);
-
- bool remoteLock() const;
-
- void setRemoteLock(bool on,const QString &lockCode);
-
-private:
- SecCodeSettingsPrivate *d_ptr;
-};
-
-#endif //SECCODESETTINGS_H
--- a/controlpanel/src/seccodeui/src/seccodeuiglobal.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef SECCODEUIGLOBAL_H
-#define SECCODEUIGLOBAL_H
-
-#include <qtglobal>
-
-#ifdef BUILD_SECCODEUI
- #define SECCODEUI_EXPORT Q_DECL_EXPORT
-#else
- #define SECCODEUI_EXPORT Q_DECL_IMPORT
-#endif
-
-namespace SecCode
-{
- enum SecCodeErr
- {
- ErrNone = 0,
- ErrGsm0707IncorrectPassword,
- ErrAccessDenied,
- ErrGsmSSPasswordAttemptsViolation,
- ErrLocked,
- ErrGsm0707OperationNotAllowed,
- ErrGsm0707SIMPuk2Required,
- ErrAbort,
- };
-}
-
-#endif //SECCODEUIGLOBAL_H
--- a/controlpanel/src/seccodeui/src/seccodeuiutility.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* 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:
-*
-*/
-#include "seccodeuiutility.h"
-#include <QString>
-#include <hbinputdialog.h>
-#include <hbmessagebox.h>
-
-QString SecCodeUiUtility::getPassword(const QString &label,bool *ok /*= 0*/,QGraphicsItem *parent /*= 0*/)
-{
- HbInputDialog *dlg = new HbInputDialog(parent);
- dlg->setEchoMode(HbLineEdit::Password);
- QString result;
- dlg->setPromptText(label);
- dlg->setInputMode(HbInputDialog::TextInput);
- HbAction* action = dlg->exec();
- if(action == dlg->secondaryAction()) { //Cancel was pressed
- if(ok) {
- *ok = false;
- }
- } else { //OK was pressed
- if(ok) {
- *ok = true;
- }
- result = dlg->textValue().toString();
- }
- delete dlg;
- return result;
-}
-
-void SecCodeUiUtility::showInformationMessage(const QString &message,QGraphicsItem *parent /*= 0*/ )
-{
- HbMessageBox::launchInformationMessageBox(message,0,0,parent);
-}
-
-void SecCodeUiUtility::showWarningMessage(const QString &message,QGraphicsItem *parent /*= 0*/)
-{
- HbMessageBox::launchWarningMessageBox(message,0,0,parent);
-}
-
-void SecCodeUiUtility::showErrorMessage(const QString &message,QGraphicsItem *parent /*= 0*/)
-{
- HbMessageBox::launchInformationMessageBox(message,0,0,parent);
-}
-
-QString SecCodeUiUtility::getPinRemainingAttemptsMessage(int remainingAttempts)
-{
- Q_UNUSED(remainingAttempts);
-
- return QString("PIN code:");
-}
-
-QString SecCodeUiUtility::getPin2RemainingAttemptsMessage(int remainingAttempts)
-{
- Q_UNUSED(remainingAttempts);
-
- return QString("PIN2 code:");
-}
--- a/controlpanel/src/seccodeui/src/seccodeuiutility.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* 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:
-*
-*/
-
-#ifndef SECCODEUIUTILITY_H
-#define SECCODEUIUTILITY_H
-
-class QString;
-class QGraphicsItem;
-
-class SecCodeUiUtility
-{
-public:
- static QString getPassword(const QString &label,bool *ok = 0,QGraphicsItem *parent = 0);
- static QString getPinRemainingAttemptsMessage(int remainingAttempts);
- static QString getPin2RemainingAttemptsMessage(int remainingAttempts);
- static void showInformationMessage(const QString &message, QGraphicsItem *parent = 0);
- static void showWarningMessage(const QString &message, QGraphicsItem *parent = 0);
- static void showErrorMessage(const QString &message, QGraphicsItem *parent = 0);
-};
-
-#endif //SECCODEUIUTILITY_H
--- a/controlpanel/src/src.pro Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/src/src.pro Thu Apr 01 03:23:37 2010 +0800
@@ -15,5 +15,5 @@
#
TEMPLATE = subdirs
-SUBDIRS = cpframework cpprofilewrapper cpapplication cpplugins seccodeui
+SUBDIRS = cpframework
CONFIG += ordered
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/tsrc/unit/ut_cpapi/data/controlpanellog.conf Thu Apr 01 03:23:37 2010 +0800
@@ -0,0 +1,7 @@
+[cpframework]
+logdatetime = 1
+logloggername = 1
+datetimeformat = hh:mm:ss
+output = debugoutput consoleoutput fileoutput
+fileoutput/logfile = C:/data/logs/ut_cpapi/cpframwork.log
+fileoutput/truncate = 1
\ No newline at end of file
--- a/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -20,12 +20,14 @@
#include <QGraphicsWidget>
#include <qDebug>
#include <QtTest/QtTest>
+#include <QtAlgorithms>
#include <HbView.h>
#include <hbdataform.h>
#include <hbdataformmodel.h>
#include <hbdataformmodelitem.h>
#include <hbabstractviewitem.h>
#include <hbsettingformitem.h>
+#include <hbpushbutton.h>
//testing following classes
#include "cpbasesettingview.h"
@@ -33,6 +35,10 @@
#include "cpsettingformentryitemdataimpl.h"
#include <cpsettingformitemdata.h>
#include <cpitemdatahelper.h>
+#include <cppluginutility.h>
+#include <cppluginloader.h>
+#include <cpplugininterface.h>
+#include <cplogger.h>
void TestCpAPI::initTestCase()
{
@@ -48,11 +54,19 @@
void TestCpAPI::testCpBaseSettingView()
{
CpBaseSettingView * pview = new CpBaseSettingView(0);
- QVERIFY( pview !=0 );
+ QVERIFY( pview != 0 );
HbDataForm *pForm = new HbDataForm(0);
pview->setSettingForm(pForm);
QVERIFY( pview->settingForm() == pForm );
delete pview;
+ HbPushButton *widget = new HbPushButton();
+ QVERIFY(widget != 0);
+ CpBaseSettingView *pView1 = new CpBaseSettingView(widget);
+ QVERIFY(pView1!=0);
+ HbPushButton *button = qobject_cast<HbPushButton *>(pView1->widget());
+ QVERIFY(button != 0);
+ delete pView1;
+
}
void TestCpAPI::testCpSettingFormEntryItemDataImpl()
@@ -117,4 +131,49 @@
phelper->addItemPrototype(pitem);
delete phelper;
}
+void TestCpAPI::testCpPluginUtility()
+{
+ HbDataForm* form = new HbDataForm();
+ QList<HbAbstractViewItem *> oldList = form->itemPrototypes();
+ CpPluginUtility::addCpItemPrototype(form);
+ QList<HbAbstractViewItem *> newList = form->itemPrototypes();
+ QVERIFY( oldList.count() == newList.count()-1 );
+}
+
+void TestCpAPI::testCpPluginLoader()
+{
+ CpPluginInterface *plugin = CpPluginLoader::loadCpPlugin("non_existing_plugin.dll");
+ QVERIFY(plugin == 0);
+
+ plugin = CpPluginLoader::loadCpPlugin("cppincodeplugin");
+ QVERIFY(plugin != 0);
+
+ plugin = CpPluginLoader::loadCpPlugin("cppincodeplugin.dll");
+ QVERIFY(plugin != 0);
+
+ plugin = CpPluginLoader::loadCpPlugin("cppincodeplugin.qtplugin");
+ QVERIFY(plugin != 0);
+}
+
+void TestCpAPI::testCpPluginInterface()
+{
+ CpPluginInterface *plugin = CpPluginLoader::loadCpPlugin("cppersonalizationplugin.dll");
+ if (plugin) {
+ CpItemDataHelper helper;
+ QList<CpSettingFormItemData*> itemData = plugin->createSettingFormItemData(helper);
+ QVERIFY(itemData.size() > 0);
+ qDeleteAll(itemData.begin(),itemData.end());
+ itemData.clear();
+ }
+}
+
+void TestCpAPI::testCpLogger()
+{
+ const QString logConf = "C:/data/.config/ut_cpapi/controlpanellog.conf";
+ Logger::instance(CPFW_LOGGER_NAME)->configure(logConf,QSettings::IniFormat);
+ CPFW_LOG("Hello World!");
+ Logger::closeAll();
+}
+
+
QTEST_MAIN(TestCpAPI)
--- a/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.h Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/tsrc/unit/ut_cpapi/src/ut_cpapi.h Thu Apr 01 03:23:37 2010 +0800
@@ -30,6 +30,10 @@
void testCpSettingFormEntryItemDataImpl(); //test CpSettingFormEntryItemDataImpl functions
void testCpSettingFormItemData(); //test CpSettingFormItemData functions
void testItemDataHelper(); //testing item data helper class CpItemDataHelper
+ void testCpPluginUtility();
+ void testCpPluginLoader(); //test cppluginloader functions
+ void testCpPluginInterface(); //
+ void testCpLogger(); //test cplogger functions
void cleanupTestCase(); // Finalize test data
private:
HbMainWindow* mainWindow;
--- a/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro Thu Apr 01 03:23:37 2010 +0800
@@ -31,8 +31,6 @@
}
QMAKE_EXTRA_TARGETS += test autotest
-
-
DEPENDPATH += .
INCLUDEPATH += . \
@@ -45,3 +43,7 @@
# Input
HEADERS += src/ut_cpapi.h
SOURCES += src/ut_cpapi.cpp
+
+symbian {
+ BLD_INF_RULES.prj_exports += "data/controlpanellog.conf C:/data/.config/ut_cpapi/controlpanellog.conf"
+}
\ No newline at end of file
--- a/controlpanel/tsrc/unit/ut_profileengwrapper/src/ut_profileengwrapper.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/tsrc/unit/ut_profileengwrapper/src/ut_profileengwrapper.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -18,7 +18,7 @@
#include "cpprofileengine.h"
#include "cpprofile.h"
#include "cpprofiledef.h"
-#include <qdebug>
+#include <QDebug>
#include <qstringlist>
#include <qttest/qttest>
--- a/gsprofilesrv_plat/settings_backgroundimage_api/tsrc/group/bld.inf Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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:
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-../../../../gssettingsuis/Gs/tsrc/public/basic/group/T_GSBackgroundImage.mmp
-gnumakefile settings_backgroundimage_api.mk
-
-// End of file
--- a/gsprofilesrv_plat/settings_backgroundimage_api/tsrc/group/settings_backgroundimage_api.mk Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# 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:
-#
-
-do_nothing :
- @rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
- del \epoc32\RELEASE\winscw\udeb\Z\sys\bin\T_GSListBox.dll /f
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE : do_nothing
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES : do_nothing
-
-FINAL :
- echo COPYING
- copy \epoc32\RELEASE\winscw\udeb\T_GSListBox.dll \epoc32\RELEASE\winscw\udeb\Z\sys\bin /y
--- a/gsprofilesrv_plat/settings_framework_api/tsrc/group/bld.inf Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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:
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-../../../../gssettingsuis/Gs/tsrc/public/basic/group/MT_GSFramework.mmp
-gnumakefile settings_framework_api.mk
-
-// End of file
--- a/gsprofilesrv_plat/settings_framework_api/tsrc/group/settings_framework_api.mk Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# 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:
-#
-
-do_nothing :
- @rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
- del \epoc32\RELEASE\winscw\udeb\Z\sys\bin\MT_GSFramework.dll /f
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE : do_nothing
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES : do_nothing
-
-FINAL :
- echo COPYING
- copy \epoc32\RELEASE\winscw\udeb\MT_GSFramework.dll \epoc32\RELEASE\winscw\udeb\Z\sys\bin /y
--- a/gsprofilesrv_plat/settings_launch_api/tsrc/group/bld.inf Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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:
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-../../../../gssettingsuis/Gs/tsrc/public/basic/group/MT_CGSLauncher.mmp
-gnumakefile settings_launch_api.mk
-
-// End of file
--- a/gsprofilesrv_plat/settings_launch_api/tsrc/group/settings_launch_api.mk Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# 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:
-#
-
-do_nothing :
- @rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
- del \epoc32\RELEASE\winscw\udeb\Z\sys\bin\MT_CGSLauncher.dll /f
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE : do_nothing
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES : do_nothing
-
-FINAL :
- echo COPYING
- copy \epoc32\RELEASE\winscw\udeb\MT_CGSLauncher.dll \epoc32\RELEASE\winscw\udeb\Z\sys\bin /y
--- a/gsprofilesrv_plat/settings_listbox_api/tsrc/group/bld.inf Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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:
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-../../../../gssettingsuis/Gs/tsrc/public/basic/group/T_GSListBox.mmp
-gnumakefile settings_listbox_api.mk
-
-// End of file
--- a/gsprofilesrv_plat/settings_listbox_api/tsrc/group/settings_listbox_api.mk Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# 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:
-#
-
-do_nothing :
- @rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
- del \epoc32\RELEASE\winscw\udeb\Z\sys\bin\T_GSBackgroundImage.dll /f
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE : do_nothing
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES : do_nothing
-
-FINAL :
- echo COPYING
- copy \epoc32\RELEASE\winscw\udeb\T_GSBackgroundImage.dll \epoc32\RELEASE\winscw\udeb\Z\sys\bin /y
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/bwins/SettingsPluginApiTestu.def Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- ?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/conf/tcSettingsPluginApiTest.cfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#1
-[Test]
-title GetValue
-run testscripter c:\testframework\ui_SettingsPluginApiTest.cfg 1
-[Endtest]
-#2
-[Test]
-title MenuActivationItem
-run testscripter c:\testframework\ui_SettingsPluginApiTest.cfg 2
-[Endtest]
-#3
-[Test]
-title Visible
-run testscripter c:\testframework\ui_SettingsPluginApiTest.cfg 3
-[Endtest]
-#4
-[Test]
-title ResetSelectedItemIndex
-run testscripter c:\testframework\ui_SettingsPluginApiTest.cfg 4
-[Endtest]
-
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/conf/ui_SettingsPluginApiTest.cfg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#1
-[Test]
-title CallGetValueL
-create SettingsPluginApiTest foobar
-foobar CallGetValueL
-delete foobar
-[Endtest]
-#2
-[Test]
-title CallMenuActivationItemL
-create SettingsPluginApiTest foobar
-foobar CallMenuActivationItemL
-delete foobar
-[Endtest]
-#3
-[Test]
-title CallVisibleL
-create SettingsPluginApiTest foobar
-foobar CallVisibleL
-delete foobar
-[Endtest]
-#4
-[Test]
-title CallResetSelectedItemIndexL
-create SettingsPluginApiTest foobar
-foobar CallResetSelectedItemIndexL
-delete foobar
-[Endtest]
-
-
-
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/eabi/SettingsPluginApiTestu.def Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-EXPORTS
- _Z9LibEntryLR13CTestModuleIf @ 1 NONAME
- _ZTI13CTestGSPlugin @ 2 NONAME ; #<TI>#
- _ZTV13CTestGSPlugin @ 3 NONAME ; #<VT>#
-
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/group/SettingsPluginApiTest.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: Personalisation application localised resource IBY
-*
-*/
-
-
-/*
------------------------------------------------------------------------------
-
- DESCRIPTION
-
- stiftestframework_SettingsPluginApiTest.iby file specifies needed test components for
- ROM image
-
------------------------------------------------------------------------------
-*/
-
-#ifndef SETTINGSPLUGINAPITEST__IBY
-#define SETTINGSPLUGINAPITEST__IBY
-
-file=ABI_DIR\BUILD_DIR\SettingsPluginApiTest.DLL SHARED_LIB_DIR\SettingsPluginApiTest.DLL
-
-data=\epoc32\data\z\system\data\testframework_SettingsPluginApiTest.ini testframework\testframework_SettingsPluginApiTest.ini
-
-data=\epoc32\data\z\system\data\tcSettingsPluginApiTest.cfg testframework\tcSettingsPluginApiTest.cfg
-
-data=\epoc32\data\z\system\data\ui_SettingsPluginApiTest.cfg testframework\ui_SettingsPluginApiTest.cfg
-
-#endif // SETTINGSPLUGINAPITEST__IBY
\ No newline at end of file
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/group/SettingsPluginApiTest.mmp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2002 - 2007 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: Project specification file of DasClientApiTest
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET SettingsPluginApiTest.dll
-TARGETTYPE dll
-UID 0x1000008D 0x101FB3E3
-
-CAPABILITY ALL -TCB
-
-DEFFILE SettingsPluginApiTest.def
-
-
-#ifdef SBSV2
- USERINCLUDE ../inc
-
- APP_LAYER_SYSTEMINCLUDE
-
- SOURCEPATH ../src
-#else // SBSV2 not defined
-USERINCLUDE ..\inc
-
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH ..\src
-#endif // SBSV2
-
-SOURCE SettingsPluginApiTest.cpp
-SOURCE SettingsPluginApiTestblocks.cpp
-SOURCE TestGSPlugin.cpp
-
-LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
-LIBRARY stiftestengine.lib
-LIBRARY avkon.lib
-LIBRARY cone.lib
-LIBRARY eikcore.lib
-LIBRARY eiksrv.lib
-LIBRARY GSFramework.lib
-LIBRARY GSEcomPlugin.lib
-
-LANG SC
-
-// End of File
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/group/SettingsPluginApiTest.pkg Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-;
-; 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: Installation file for STIF
-;
-;
-;
-;
-; Installation file for STIF
-;
-
-; Languages
-&EN
-
-; Provide value for uid
-#{"STIF"},(0x00000000),1,1,0,TYPE=SA
-
-; Series60 product id for S60 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-; Logo
-; None
-
-; Package signature - Optional
-; None
-
-; Start of Package body
-
-; Condition blocks
-; None
-
-; Options list
-; None
-
-; Install files
-"\epoc32\release\armv5\udeb\SettingsPluginApiTest.dll" - "!:\Sys\Bin\SettingsPluginApiTest.dll"
-"\epoc32\winscw\c\SettingsPluginApiTest.bat"-"!:\SettingsPluginApiTest.bat"
-; Embedded SIS
-; None
-
-; End of Package body
-
-; PKG dependencies
-; None
-
-; PKG capabilities
-; None
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/group/bld.inf Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2002 - 2007 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: Build information file for project SettingsPluginApiTest
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-
-#ifdef SBSV2
- PRJ_TESTEXPORTS
- SettingsPluginApiTest.iby /epoc32/rom/include/SettingsPluginApiTest.iby
- ../init/SettingsPluginApiTest.bat /epoc32/winscw/c/SettingsPluginApiTest.bat
-
- ../init/testframework_SettingsPluginApiTest.ini /epoc32/data/z/system/data/testframework.ini
- ../init/testframework_SettingsPluginApiTest.ini /epoc32/winscw/c/TestFramework/testframework.ini
- ../init/testframework_SettingsPluginApiTest.ini /epoc32/wins/c/TestFramework/testframework.ini
-
- ../conf/ui_SettingsPluginApiTest.cfg /epoc32/winscw/c/TestFramework/ui_SettingsPluginApiTest.cfg
- ../conf/ui_SettingsPluginApiTest.cfg /epoc32/data/z/system/data/ui_SettingsPluginApiTest.cfg
- ../conf/ui_SettingsPluginApiTest.cfg /epoc32/wins/c/ui_SettingsPluginApiTest.cfg
-
- ../conf/tcSettingsPluginApiTest.cfg /epoc32/wins/c/TestFramework/tcSettingsPluginApiTest.cfg
- ../conf/tcSettingsPluginApiTest.cfg /epoc32/data/z/system/data/tcSettingsPluginApiTest.cfg
- ../conf/tcSettingsPluginApiTest.cfg /epoc32/winscw/c/TestFramework/tcSettingsPluginApiTest.cfg
-
-#else // SBSV2 not defined
- PRJ_TESTEXPORTS
-
- SettingsPluginApiTest.iby \epoc32\rom\include\SettingsPluginApiTest.iby
- ..\init\SettingsPluginApiTest.bat \epoc32\winscw\c\SettingsPluginApiTest.bat
-
- ..\init\testframework_SettingsPluginApiTest.ini \epoc32\data\z\system\data\testframework.ini
- ..\init\testframework_SettingsPluginApiTest.ini \epoc32\winscw\c\TestFramework\testframework.ini
- ..\init\testframework_SettingsPluginApiTest.ini \epoc32\wins\c\TestFramework\testframework.ini
-
- ..\conf\ui_SettingsPluginApiTest.cfg \epoc32\winscw\c\TestFramework\ui_SettingsPluginApiTest.cfg
- ..\conf\ui_SettingsPluginApiTest.cfg \epoc32\data\z\system\data\ui_SettingsPluginApiTest.cfg
- ..\conf\ui_SettingsPluginApiTest.cfg \epoc32\wins\c\ui_SettingsPluginApiTest.cfg
-
- ..\conf\tcSettingsPluginApiTest.cfg \epoc32\wins\c\TestFramework\tcSettingsPluginApiTest.cfg
- ..\conf\tcSettingsPluginApiTest.cfg \epoc32\data\z\system\data\tcSettingsPluginApiTest.cfg
- ..\conf\tcSettingsPluginApiTest.cfg \epoc32\winscw\c\TestFramework\tcSettingsPluginApiTest.cfg
-
-#endif // SBSV2
-
-PRJ_EXPORTS
-
-PRJ_TESTMMPFILES
-SettingsPluginApiTest.mmp
-
-PRJ_MMPFILES
-
-// End of File
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/inc/SettingsPluginApiTest.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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: Implementation of class CSettingsPluginApiTest
-*
-*/
-
-
-#ifndef C_SETTINGSPLUGINAPITEST_H
-#define C_SETTINGSPLUGINAPITEST_H
-
-// INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <TestclassAssert.h>
-#include <aknserverapp.h>
-#include <GSPluginInterface.h>
-
-#include "TestGSPlugin.h"
-
-// MACROS
-#define TEST_CLASS_VERSION_MAJOR 0
-#define TEST_CLASS_VERSION_MINOR 0
-#define TEST_CLASS_VERSION_BUILD 0
-// User MACROS
-#define KErrGeneral -2
-#define KFirstOption 1
-#define KSecondtOption 2
-
-//define client flags
-#define KFlagNoObserver 1
-#define KFlagReserved1 2
-#define KFlagReserved2 4
-// Logging path
-_LIT( KSettingsPluginApiTestLogPath, "\\logs\\testframework\\SettingsPluginApiTest\\" );
-// Log file
-_LIT( KSettingsPluginApiTestLogFile, "SettingsPluginApiTest.txt" );
-_LIT( KSettingsPluginApiTestLogFileWithTitle, "SettingsPluginApiTest_[%S].txt" );
-
-//
-/**
-* CSettingsPluginApiTest test class for STIF Test Framework TestScripter.
-* @since S60 5.0
-*/
-
-NONSHARABLE_CLASS(CSettingsPluginApiTest) : public CScriptBase/*,public MAknServerAppExitObserver*/
- {
-public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSettingsPluginApiTest* NewL( CTestModuleIf& aTestModuleIf );
-
- /**
- * Destructor.
- */
- virtual ~CSettingsPluginApiTest();
-
-/*private:
- //function from MAknServerAppExitObserver. is used to handle the exit of the server.
-
- void HandleServerAppExit(TInt aReason);*/
-
-public: // Functions from base classes
-
- /**
- * From CScriptBase Runs a script line.
- * @since S60 5.0
- * @param aItem Script line containing method name and parameters
- * @return Symbian OS error code
- */
- virtual TInt RunMethodL( CStifItemParser& aItem );
-
-private:
-
- /**
- * C++ default constructor.
- */
- CSettingsPluginApiTest( CTestModuleIf& aTestModuleIf );
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- /**
- * Frees all resources allocated from test methods.
- * @since S60 5.0
- */
- void Delete();
-
- /**
- * Test method.
- * @since S60 5.0
- * @param aItem Script line containing parameters.
- * @return Symbian OS error code.
- */
-
- TInt SetupCGSParentPluginL();
-
- virtual TInt CallGetValueL( CStifItemParser& aItem );
-
- virtual TInt CallMenuActivationItemL( CStifItemParser& aItem );
-
- virtual TInt CallVisibleL( CStifItemParser& aItem );
-
- virtual TInt CallResetSelectedItemIndexL( CStifItemParser& aItem );
-
- /**
- * Method used to log version of test class
- */
- void SendTestClassVersion();
-
- /**
- * Turn off ScreenSaver
- * @since S60 5.0
- * @return Symbian OS error code.
- */
- void TurnOffScreenSaver();
-
- /**
- * Restore ScreenSaver
- * @since S60 5.0
- * @return Symbian OS error code.
- */
- void RestoreScreenSaver();
-
-private: // Data
-
- /**
- * ScreenSaver Property
- */
- TInt iOldScreenSaverProperty;
-
- CTestGSPlugin* iTestGsPlugin;
-
- /**
- * description_of_pointer_member
- * Not own.
- */
- CGSPluginInterface* iGSPluginInterface;
-
- };
-
-#endif // C_SETTINGSPLUGINAPITEST_H
-
-// End of File
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/inc/TestGSPlugin.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* 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:
-*
-*/
-#ifndef TESTGSPLUGIN_H
-#define TESTGSPLUGIN_H
-
-// INCLUDES
-#include <GSParentPlugin.h>
-
-
-
-// CLASS DECLARATION
-
-class CTestGSPlugin : public CGSParentPlugin
- {
- public: // Constructors and destructors
-
- /**
- * Two phase construction
- */
- static CTestGSPlugin* NewL();
- static CTestGSPlugin* NewLC();
- /**
- * Destructor
- */
- ~CTestGSPlugin();
-
-
- public:
-
- void GetCaptionL( TDes& aCaption ) const;
-
- TUid Id() const;
-
- private: // Constructors and destructors
-
- CTestGSPlugin();
- void ConstructL();
-
- };
-
-#endif // TESTGSPLUGIN_H
-// End of File
\ No newline at end of file
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/init/SettingsPluginApiTest.bat Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-@rem
-@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-@rem All rights reserved.
-@rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
-@rem which accompanies this distribution, and is available
-@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-@rem
-@rem Initial Contributors:
-@rem Nokia Corporation - initial contribution.
-@rem
-@rem Contributors:
-@rem
-@rem Description:
-@rem
-
-md e:\bctest
-md e:\bctest\Results
-
-ATSINTERFACE.EXE -testmodule testcombiner -config C:\TestFramework\uiSettingsPluginApiTest.cfg
-copy c:\Logs\TestFramework\TestReport.txt e:\bctest\results\SETTINGS_TEST.txt
\ No newline at end of file
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/init/testframework_SettingsPluginApiTest.ini Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-#
-# This is STIFTestFramework initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-# - Set Test Reporting mode. TestReportMode's possible values are:
-# + 'Summary': Summary of the tested test cases.
-# + 'Environment': Hardware and software info.
-# + 'TestCases': Test case report.
-# + 'FullReport': Set of all above ones.
-# + Example 'TestReportMode= Summary TestCases'
-#
-# - CreateTestReport setting controls report creation mode
-# + YES, Test report will created.
-# + NO, No Test report.
-#
-# - File path indicates the base path of the test report.
-# - File name indicates the name of the test report.
-#
-# - File format indicates the type of the test report.
-# + TXT, Test report file will be txt type, for example 'TestReport.txt'.
-# + HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# - File output indicates output source of the test report.
-# + FILE, Test report logging to file.
-# + RDEBUG, Test report logging to using rdebug.
-#
-# - File Creation Mode indicates test report overwriting if file exist.
-# + OVERWRITE, Overwrites if the Test report file exist.
-# + APPEND, Continue logging after the old Test report information if
-# report exist.
-
-[Engine_Defaults]
-
-TestReportMode= FullReport # Possible values are:
- # 'Summary', 'Environment', 'TestCases' or 'FullReport'
-
-CreateTestReport= YES # Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT # Possible values: TXT or HTML
-TestReportOutput= FILE # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-UITestingSupport= Yes
-SeparateProcesses= YES
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= SettingsPluginApiTest
-# Modules might have initialisation file, specified as
-# IniFile= YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= NormalCases.txt
-# TestCaseFile= SmokeCases.txt
-# TestCaseFile= ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-[New_Module]
-ModuleName= testcombiner
-TestCaseFile= c:\testframework\tcSettingsPluginApiTest.cfg
-[End_Module]
-
-#[New_Module]
-#ModuleName= testscripter
-#TestCaseFile= c:\testframework\ui_SettingsPluginApiTest.cfg
-#[End_Module]
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-#Load testmoduleSettingsPluginApiTest, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleSettingsPluginApiTest used initialization file
-#IniFile= init.txt
-
-#TestModuleSettingsPluginApiTest used configuration file(s)
-#TestCaseFile= testcases1.cfg
-#TestCaseFile= testcases2.cfg
-#TestCaseFile= manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIFTestFramework logging overwrite parameters for Logger.
-# Hardware and emulator environment logging path and styles can
-# be configured from here to overwrite the Logger's implemented values.
-#
-# Settings description:
-# - Indicates option for creation log directory/directories. If log directory/directories
-# is/are not created by user they will make by software.
-# + YES, Create log directory/directories if not allready exist.
-# + NO, Log directory/directories not created. Only created one is used.
-#
-# - Overwrite emulator path setting.
-# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined
-# Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-# will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-# - Overwrite emulator's logging format.
-# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-# + HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-# - Overwrited emulator logging output source.
-# + FILE, Logging to file(s).
-# + RDEBUG, Logging to using rdebug(s).
-#
-# - Overwrite hardware path setting (Same description as above in emulator path).
-# - Overwrite hardware's logging format(Same description as above in emulator format).
-# - Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-# - File Creation Mode indicates file overwriting if file exist.
-# + OVERWRITE, Overwrites if file(s) exist.
-# + APPEND, Continue logging after the old logging information if file(s) exist.
-#
-# - Will thread id include to the log filename.
-# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-# + NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-# - Will time stamps include the to log file.
-# + YES, Time stamp added to each line in log file(s). Time stamp is
-# for example'12.Nov.2003 115958 LOGGING INFO'
-# + NO, No time stamp(s).
-#
-# - Will line breaks include to the log file.
-# + YES, Each logging event includes line break and next log event is in own line.
-# + NO, No line break(s).
-#
-# - Will event ranking include to the log file.
-# + YES, Event ranking number added to each line in log file(s). Ranking number
-# depends on environment's tics, for example(includes time stamp also)
-# '012 12.Nov.2003 115958 LOGGING INFO'
-# + NO, No event ranking.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-
-CreateLogDirectories= YES # Possible values: YES or NO
-
-EmulatorBasePath= C:\LOGS\TestFramework\
-EmulatorFormat= HTML # Possible values: TXT or HTML
-EmulatorOutput= FILE # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML # Possible values: TXT or HTML
-#HardwareOutput= FILE # Possible values: FILE or RDEBUG
-
-FileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES # Possible values: YES or NO
-#WithTimeStamp= YES # Possible values: YES or NO
-#WithLineBreak= YES # Possible values: YES or NO
-#WithEventRanking= YES # Possible values: YES or NO
-
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/src/SettingsPluginApiTest.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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: Implementation of class CSettingsPluginApiTest
-*
-*/
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include <SettingServerClient.h>
-#include <ScreensaverInternalPSKeys.h>
-#include <e32property.h>
-
-#include "SettingsPluginApiTest.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSettingsPluginApiTest::CSettingsPluginApiTest
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSettingsPluginApiTest::CSettingsPluginApiTest( CTestModuleIf& aTestModuleIf ):
- CScriptBase( aTestModuleIf )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSettingsPluginApiTest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSettingsPluginApiTest::ConstructL()
- {
- //Read logger settings to check whether test case name is to be
- //appended to log file name.
- RSettingServer settingServer;
- TInt ret = settingServer.Connect();
- if(ret != KErrNone)
- {
- User::Leave(ret);
- }
- // Struct to StifLogger settigs.
- TLoggerSettings loggerSettings;
- // Parse StifLogger defaults from STIF initialization file.
- ret = settingServer.GetLoggerSettings(loggerSettings);
- if(ret != KErrNone)
- {
- User::Leave(ret);
- }
- // Close Setting server session
- settingServer.Close();
-
- TFileName logFileName;
-
- if(loggerSettings.iAddTestCaseTitle)
- {
- TName title;
- TestModuleIf().GetTestCaseTitleL(title);
- logFileName.Format(KSettingsPluginApiTestLogFileWithTitle, &title);
- }
- else
- {
- logFileName.Copy(KSettingsPluginApiTestLogFile);
- }
-
- iLog = CStifLogger::NewL( KSettingsPluginApiTestLogPath,
- logFileName,
- CStifLogger::ETxt,
- CStifLogger::EFile,
- EFalse );
-
- SendTestClassVersion();
-
- TurnOffScreenSaver();
- }
-
-// -----------------------------------------------------------------------------
-// CSettingsPluginApiTest::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSettingsPluginApiTest* CSettingsPluginApiTest::NewL( CTestModuleIf& aTestModuleIf )
- {
- CSettingsPluginApiTest* self = new( ELeave ) CSettingsPluginApiTest( aTestModuleIf );
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
-
- return self;
-
- }
-
-// Destructor
-CSettingsPluginApiTest::~CSettingsPluginApiTest()
- {
-
- // Delete resources allocated from test methods
- Delete();
-
- // Delete logger
- delete iLog;
-
- }
-
-//-----------------------------------------------------------------------------
-// CSettingsPluginApiTest::SendTestClassVersion
-// Method used to send version of test class
-//-----------------------------------------------------------------------------
-//
-void CSettingsPluginApiTest::SendTestClassVersion()
- {
- TVersion moduleVersion;
- moduleVersion.iMajor = TEST_CLASS_VERSION_MAJOR;
- moduleVersion.iMinor = TEST_CLASS_VERSION_MINOR;
- moduleVersion.iBuild = TEST_CLASS_VERSION_BUILD;
-
- TFileName moduleName;
- moduleName = _L( "SettingsPluginApiTest.dll" );
-
- TBool newVersionOfMethod = ETrue;
- TestModuleIf().SendTestModuleVersion( moduleVersion, moduleName,
- newVersionOfMethod );
- }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL(
- CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
- {
- return ( CScriptBase* ) CSettingsPluginApiTest::NewL( aTestModuleIf );
- }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CSettingsPluginApiTest::TurnOffScreenSaver()
- {
- //TInt Get(TUid aCategory, TUint aKey, TInt &aValue);
- TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- iOldScreenSaverProperty );
- TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- KScreenSaverAllowScreenSaver );
- RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n",
- iOldScreenSaverProperty, err1, err2 );
- }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CSettingsPluginApiTest::RestoreScreenSaver()
- {
- RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver,
- iOldScreenSaverProperty );
- User::ResetInactivityTime();
- }
-
-
-// End of File
-
-
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/src/SettingsPluginApiTestblocks.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-/*
-* Copyright (c) 2002 - 2007 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: This cpp file has the functions to test SettingsPluginApi.
-*
-*/
-
-
-// [INCLUDE FILES]
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "SettingsPluginApiTest.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSettingsPluginApiTest::Delete
-// Delete here all resources allocated and opened from test methods.
-// Called from destructor.
-// -----------------------------------------------------------------------------
-//
-void CSettingsPluginApiTest::Delete()
- {
- if ( iGSPluginInterface )
- {
- delete iGSPluginInterface;
- iGSPluginInterface = NULL;
- }
-
- }
-
-// -----------------------------------------------------------------------------
-// CSettingsPluginApiTest::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CSettingsPluginApiTest::RunMethodL(
- CStifItemParser& aItem )
- {
-
- static TStifFunctionInfo const KFunctions[] =
- {
- // First string is the function name used in TestScripter script file.
- // Second is the actual implementation member function.
- ENTRY( "CallGetValueL", CSettingsPluginApiTest::CallGetValueL ),
- ENTRY( "CallMenuActivationItemL", CSettingsPluginApiTest::CallMenuActivationItemL ),
- ENTRY( "CallVisibleL", CSettingsPluginApiTest::CallVisibleL ),
- ENTRY( "CallResetSelectedItemIndexL", CSettingsPluginApiTest::CallResetSelectedItemIndexL ),
- // [test cases entries]
- };
-
- const TInt count = sizeof( KFunctions ) / sizeof( TStifFunctionInfo );
-
- return RunInternalL( KFunctions, count, aItem );
-
- }
-
-// -----------------------------------------------------------------------------
-// CSettingsPluginApiTest::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CSettingsPluginApiTest::SetupCGSParentPluginL()
- {
- TRAPD( error, iTestGsPlugin = CTestGSPlugin::NewL() );
-
- if ( KErrNone == error )
- {
- iGSPluginInterface = static_cast<CGSPluginInterface*> ( iTestGsPlugin );
- }
-
- return error;
- }
-
-// -----------------------------------------------------------------------------
-// CServicesDbApiTest::CallGetValueL
-// Is used to test CGSPluginInterface::GetValue
-// -----------------------------------------------------------------------------
-TInt CSettingsPluginApiTest::CallGetValueL( CStifItemParser& /*aItem*/ )
- {
- //
- TInt result = 0;
- TRAPD( error, result = SetupCGSParentPluginL() );
- if( KErrNone != error )
- {
- iLog->Log( _L( "Initial GSPluginInterface failed,the failed code is %d" ), error );
- return error;
- }
- else
- {
- if( KErrNone != result )
- {
- return result;
- }
- };
- TBuf<256> value;
- TRAPD( errorCall, iGSPluginInterface->GetValue( EGSPluginKeySettingsItemValueString, value ) );
- if( errorCall != KErrNone )
- {
- iLog->Log( _L( "Function GetValue is called failed. The failed code is %d" ), errorCall );
- return errorCall;
- }
- else
- {
- iLog->Log( _L( "Function GetValue called successfully." ) );
- }
-
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// CServicesDbApiTest::CallMenuActivationItemL
-// Is used to test CGSPluginInterface::MenuActivationItem
-// -----------------------------------------------------------------------------
-TInt CSettingsPluginApiTest::CallMenuActivationItemL( CStifItemParser& /*aItem*/ )
- {
- //
- TInt result = 0;
- TRAPD( error, result = SetupCGSParentPluginL() );
- if(KErrNone != error)
- {
- iLog->Log( _L( "Initial GSPluginInterface failed,the failed code is %d" ), error );
- return error;
- }
- else
- {
- if( KErrNone != result )
- {
- return result;
- }
- };
- TGSMenuActivationItems GsMenuActivationItems;
- TRAPD( errorCall, GsMenuActivationItems = iGSPluginInterface->MenuActivationItem() );
- if( errorCall != KErrNone )
- {
- iLog->Log( _L( "Function MenuActivationItem is called failed. The failed code is %d" ), errorCall );
- return errorCall;
- }
- else
- {
- iLog->Log( _L( "Function MenuActivationItem is called successfully." ) );
- }
-
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// CServicesDbApiTest::CallVisibleL
-// Is used to test CGSPluginInterface::Visible
-// -----------------------------------------------------------------------------
-TInt CSettingsPluginApiTest::CallVisibleL( CStifItemParser& /*aItem*/ )
- {
- //
- TInt result = 0;
- TRAPD( error, result = SetupCGSParentPluginL() );
- if(KErrNone != error)
- {
- iLog->Log( _L( "Initial GSPluginInterface failed,the failed code is %d" ), error );
- return error;
- }
- else
- {
- if( KErrNone != result )
- {
- return result;
- }
- };
- TBool IsVisible;
- TRAPD( errorCall, IsVisible = iGSPluginInterface->Visible() );
- if( errorCall != KErrNone )
- {
- iLog->Log( _L( "Function Visible is called failed. The failed code is %d" ), errorCall );
- return errorCall;
- }
- else
- {
- iLog->Log( _L( "Function Visible is called successfully." ) );
- }
-
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// CServicesDbApiTest::CallResetSelectedItemIndexL
-// Is used to test CGSPluginInterface::ResetSelectedItemIndex
-// -----------------------------------------------------------------------------
-TInt CSettingsPluginApiTest::CallResetSelectedItemIndexL( CStifItemParser& /*aItem*/ )
- {
- //
- TInt result = 0 ;
- TRAPD( error, result = SetupCGSParentPluginL() );
- if(KErrNone != error)
- {
- iLog->Log( _L( "Initial GSPluginInterface failed,the failed code is %d" ), error );
- return error;
- }
- else
- {
- if( KErrNone != result )
- {
- return result;
- }
- };
- TRAPD( errorCall, iGSPluginInterface->ResetSelectedItemIndex() );
- if( errorCall != KErrNone )
- {
- iLog->Log( _L( "Function ResetSelectedItemIndex is called failed. The failed code is %d" ), errorCall );
- return errorCall;
- }
- else
- {
- iLog->Log( _L( "Function ResetSelectedItemIndex is called successfully." ) );
- }
-
- return KErrNone;
- }
-
-//
-// [End of File]
--- a/gsprofilesrv_plat/settings_plugin_api/tsrc/SettingsPluginApiTest/src/TestGSPlugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* 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:
-*
-*/
-#include "TestGSPlugin.h"
-
-
-
-// CONSTRUCTION
-CTestGSPlugin* CTestGSPlugin::NewL()
- {
- CTestGSPlugin* self = CTestGSPlugin::NewLC();
- CleanupStack::Pop();
-
- return self;
- }
-
-CTestGSPlugin* CTestGSPlugin::NewLC()
- {
- CTestGSPlugin* self = new( ELeave ) CTestGSPlugin();
- CleanupStack::PushL( self );
-
- self->ConstructL();
-
- return self;
- }
-
-// Destructor
-CTestGSPlugin::~CTestGSPlugin()
- {
- }
-
-// Default constructor
-CTestGSPlugin::CTestGSPlugin()
- {
- }
-
-// Second phase construct
-void CTestGSPlugin::ConstructL()
- {
- }
-
-
-void CTestGSPlugin::GetCaptionL( TDes& /*aCaption*/ ) const
- {
-
- }
-
-TUid CTestGSPlugin::Id() const
- {
- return KNullUid;
- }
-
-// END OF FILE
--- a/gsprofilesrv_plat/settings_uis_cenrep_collection_api/inc/SettingsInternalCRKeys.h Thu Apr 01 03:17:51 2010 +0800
+++ b/gsprofilesrv_plat/settings_uis_cenrep_collection_api/inc/SettingsInternalCRKeys.h Thu Apr 01 03:23:37 2010 +0800
@@ -675,6 +675,370 @@
*/
const TUint32 KSettingsPowerSavingQuery = 0x00000001;
+/**
+* Slide Settings CR UID.
+*/
+const TUid KCRUidSlideSettings = {0x20015159};
+
+enum TSlideSetting
+ {
+ ESlideSettingOff = 0,
+ ESlideSettingOn
+ };
+
+/**********************************************************
+ * User settings for slide handling
+ *
+ */
+
+/**
+ * Used to control which behavior is chosen when closing the cover.
+ * Possible values are 0=Off, 1=On
+ */
+const TUint32 KSlideCloseCover = 0x00000001;
+
+const TUint32 KSlideOpenCoverUri = 0x00000002;
+
+const TUint32 KSlideOpenCoverCaption = 0x00000003;
+
+/**
+ * This setting defines whether keyguard is activated by closing the cover
+ *
+ * Possible values:
+ * 0: Closing cover does not activate keyguard.
+ * 1: Closing the cover activates keyguard.
+ * 2: User is asked "Do you want to activate keyguard?".
+ * 3: Automatic - keyguard returns to the state before opening the cover.
+ */
+const TUint32 KSlideKeyguard = 0x00000004;
+enum TSlideSettingKeyguard
+ {
+ ESlideSettingsKeyguardActivatingOff = 0,
+ ESlideSettingsKeyguardActivatingOn,
+ ESlideSettingsKeyguardActivatingAskMe,
+ ESlideSettingsKeyguardActivatingAutomatic
+ };
+
+/**
+ * Used to control if audio is routed when opening the slide.
+ * Possible values are 0=routing not changed, 1=routing changed
+ */
+const TUint32 KSlideAudioRouting = 0x00000005;
+
+/**
+ * User setting for Intelligent Slide
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KSlideAutomaticAction = 0x00000010;
+
+/**********************************************************
+ * Configurability settings
+ * This group of settings is used to specify which slide behavior is enabled
+ * Different slide types need different items
+ * For example ITU-T slide need call handling with slide
+ * And full-Qwerty slide does not use call handling but requires audio routing with slide
+ */
+
+/**
+ * Defines which localisation to use for slide settings
+ * Possible values
+ * 0: Slide
+ * 1: Cover
+ * 2: Flip
+ * 3: Fold
+ * 4: Swivel
+ * 5: reserved
+ */
+const TUint32 KSlideTerminology = 0x00000101;
+
+/**
+ * Slide Events to react to
+ * Depending on this value, different P/S keys in KPSUidHWRM are used for monitoring the slide state
+ * Possible values are
+ * 0: Grip
+ * 1: Flip
+ * 2: Twist
+ */
+const TUint32 KSlideShowEventType = 0x00000102;
+
+/**
+ * Perform call handling with slide
+ * Possible values
+ * 0: Disabled
+ * 1: Enabled
+ */
+const TUint32 KSlideShowCallHandling = 0x00000110;
+
+/**
+ * Perform audio routing with slide
+ * Possible values
+ * 0: Disabled
+ * 1: Enabled
+ */
+const TUint32 KSlideShowAudioRouting = 0x00000111;
+
+/**
+ * Perform keypad lock handling with slide
+ * Possible values
+ * 0: Disabled
+ * 1: Enabled
+ */
+const TUint32 KSlideShowKeypadlock = 0x00000112;
+
+/**
+ * Application launch when slide open in idle
+ * Possible values
+ * 0: Disabled
+ * 1: Enabled
+ */
+const TUint32 KSlideShowAppLaunch = 0x00000113;
+
+/**
+ * Go to idle with slide close
+ * Possible values
+ * 0: Disabled
+ * 1: Enabled
+ */
+const TUint32 KSlideShowGoToIdle = 0x00000114;
+
+/**
+ * Device lock with slide
+ * Possible values
+ * 0: Disabled
+ * 1: Enabled
+ */
+const TUint32 KSlideShowDeviceLock = 0x00000115;
+
+/**********************************************************
+ * Intelligent Slide configurability settings
+ * The following items describe in which applications/views
+ * Intelligent slide feature is enabled
+ *
+ */
+
+/**
+ * Messaging Main View
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KMessagingMainView = 0x00001001;
+
+/**
+ * Messaging Message List View
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KMessagingMessageListView = 0x00001002;
+
+/**
+ * Messaging One Row Message List View
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KMessagingOneRowMessageListView = 0x00001003;
+
+/**
+ * Messaging Text Message Viewer
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KMessagingTextMessageViewer = 0x00001004;
+
+/**
+ * Messaging Multimedia Message Viewer
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KMessagingMultimediaMessageViewer = 0x00001005;
+
+/**
+ * Messaging Uni Editor
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KMessagingUniEditor = 0x00001006;
+
+/**
+ * Email Viewer
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KEmailViewer = 0x00001010;
+
+/**
+ * Email Editor
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KEmailEditor = 0x00001011;
+
+/**
+ * Browser Content view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KBrowserContentView = 0x00001020;
+
+/**
+ * Browser Bookmarks view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KBrowserBookmarksView = 0x00001021;
+
+/**
+ * Clock Main view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KClockMainView = 0x00001030;
+
+/**
+ * Clock Alarm editor
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KClockAlarmEditor = 0x00001031;
+
+/**
+ * Clock MultiAlarm view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KClockMultiAlarmView = 0x00001032;
+
+/**
+ * Clock World clock view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KClockWorldClockView = 0x00001033;
+
+/**
+ * Clock World clock view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KClockCountDownView = 0x00001034;
+
+
+/**
+ * Notepad Editor
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KNotepadEditor = 0x00001040;
+
+/**
+ * Notepad List view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KNotepadListView = 0x00001041;
+
+/**
+ * Phone Incoming call
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KPhoneIncomingCall = 0x00001050;
+
+/**
+ * File Manager Folder view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KFileManagerFolderView = 0x00001060;
+
+/**
+ * Calendar Main(Month/Week/Day/To-Do) view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KCalendarMainView = 0x00001070;
+
+/**
+ * Calendar Event(Meeting/Memo/Anniversary/To-Do note) view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KCalendarEventView = 0x00001071;
+
+/**
+ * Calendar Event(Meeting/Memo/Anniversary/To-Do note) editor
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KCalendarEventEditor = 0x00001072;
+
+/**
+ * Contacts Group view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KContactsGroupView = 0x00001080;
+
+/**
+ * Contacts Details view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KContactsDetailsView = 0x00001081;
+
+/**
+ * Contacts Editor
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KContactsEditor = 0x00001082;
+
+/**
+ * Contacts Communication Launcher view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KContactsCommunicationLauncherView = 0x00001083;
+
+
+/**
+ * Logs view
+ * Possible values are listed in TSlideSetting
+ */
+const TUint32 KLogsView = 0x00001090;
+
+
+/**
+ * Modifier keys used for global shortcuts
+ * Possible values of scan codes are listed in e32keys.h
+ * For example EStdKeyLeftShift=0x12, EStdKeyLeftCtrl=0x16
+ */
+const TUint32 KGlobalShortcutModifier1 = 0x00002001;
+const TUint32 KGlobalShortcutModifier2 = 0x00002002;
+
+/**
+ * Action key scancode
+ * Possible values of scan codes are listed in e32keys.h
+ */
+const TUint32 KGlobalShortcutKey00 = 0x00002100;
+const TUint32 KGlobalShortcutKey01 = 0x00002101;
+const TUint32 KGlobalShortcutKey02 = 0x00002102;
+const TUint32 KGlobalShortcutKey03 = 0x00002103;
+const TUint32 KGlobalShortcutKey04 = 0x00002104;
+const TUint32 KGlobalShortcutKey05 = 0x00002105;
+const TUint32 KGlobalShortcutKey06 = 0x00002106;
+const TUint32 KGlobalShortcutKey07 = 0x00002107;
+const TUint32 KGlobalShortcutKey08 = 0x00002108;
+const TUint32 KGlobalShortcutKey09 = 0x00002109;
+const TUint32 KGlobalShortcutKey10 = 0x00002110;
+const TUint32 KGlobalShortcutKey11 = 0x00002111;
+const TUint32 KGlobalShortcutKey12 = 0x00002112;
+const TUint32 KGlobalShortcutKey13 = 0x00002113;
+const TUint32 KGlobalShortcutKey14 = 0x00002114;
+const TUint32 KGlobalShortcutKey15 = 0x00002115;
+const TUint32 KGlobalShortcutKey16 = 0x00002116;
+const TUint32 KGlobalShortcutKey17 = 0x00002117;
+const TUint32 KGlobalShortcutKey18 = 0x00002118;
+const TUint32 KGlobalShortcutKey19 = 0x00002119;
+
+/**
+ * Application UID that should be brought to foreground/background
+ * when corresponding action key is pressed
+ */
+const TUint32 KGlobalShortcutApp00 = 0x00002200;
+const TUint32 KGlobalShortcutApp01 = 0x00002201;
+const TUint32 KGlobalShortcutApp02 = 0x00002202;
+const TUint32 KGlobalShortcutApp03 = 0x00002203;
+const TUint32 KGlobalShortcutApp04 = 0x00002204;
+const TUint32 KGlobalShortcutApp05 = 0x00002205;
+const TUint32 KGlobalShortcutApp06 = 0x00002206;
+const TUint32 KGlobalShortcutApp07 = 0x00002207;
+const TUint32 KGlobalShortcutApp08 = 0x00002208;
+const TUint32 KGlobalShortcutApp09 = 0x00002209;
+const TUint32 KGlobalShortcutApp10 = 0x00002210;
+const TUint32 KGlobalShortcutApp11 = 0x00002211;
+const TUint32 KGlobalShortcutApp12 = 0x00002212;
+const TUint32 KGlobalShortcutApp13 = 0x00002213;
+const TUint32 KGlobalShortcutApp14 = 0x00002214;
+const TUint32 KGlobalShortcutApp15 = 0x00002215;
+const TUint32 KGlobalShortcutApp16 = 0x00002216;
+const TUint32 KGlobalShortcutApp17 = 0x00002217;
+const TUint32 KGlobalShortcutApp18 = 0x00002218;
+const TUint32 KGlobalShortcutApp19 = 0x00002219;
+
#endif // SETTINGSINTERNALCRKEYS_H
// End of file
\ No newline at end of file
--- a/gssettingsuis/Gs/GSApplication/Data/GSApp_reg.rss Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2005 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:
-*
-*/
-
-
-#include <appinfo.rh>
-#include <GSApp.rsg>
-#include <data_caging_paths_strings.hrh>
-
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x100058EC
-
-RESOURCE APP_REGISTRATION_INFO
- {
- app_file = "GSApp";
- localisable_resource_file = APP_RESOURCE_DIR"\\GSApp";
- localisable_resource_id = R_GSAPP_LOCALISABLE_APP_INFO;
- }
-
-// End of File
--- a/gssettingsuis/Gs/GSFramework/GSFramework.mmp Thu Apr 01 03:17:51 2010 +0800
+++ b/gssettingsuis/Gs/GSFramework/GSFramework.mmp Thu Apr 01 03:23:37 2010 +0800
@@ -91,7 +91,6 @@
LIBRARY featmgr.lib // feature manager
LIBRARY flogger.lib // logging
LIBRARY gsecomplugin.lib
-LIBRARY hlplch.lib // for "Help" options menu
LIBRARY ws32.lib
LIBRARY estor.lib
LIBRARY centralrepository.lib // GSWatchDog
--- a/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -35,7 +35,6 @@
#include <bautils.h>
#include <eikmenup.h>
#include <eikbtgpc.h>
-#include <hlplch.h>
#include <StringLoader.h>
// Middle Softkey control ID.
@@ -376,11 +375,6 @@
break;
case EAknCmdHelp:
{
- if( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
- {
- HlpLauncher::LaunchHelpApplicationL(
- iEikonEnv->WsSession(), iAppUi->AppHelpContextL() );
- }
break;
}
default:
--- a/gssettingsuis/Gs/rom/GSActiveIdlePlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSActiveIdlePlugin ROM resources.
-*
-*/
-
-#ifndef GSACTIVEIDLEPLUGIN_IBY
-#define GSACTIVEIDLEPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
- #ifndef RD_BOOT_CUSTOMIZABLE_AI
- ECOM_PLUGIN( GSActiveIdlePlugin.dll, 102750C3.rsc )
- //data=DATAZ_\BITMAP_DIR\GSActiveIdlePlugin.mif BITMAP_DIR\GSActiveIdlePlugin.mif
- #endif //RD_BOOT_CUSTOMIZABLE_AI
- #endif // RD_GS_RENOVATION
-
-#endif // GSACTIVEIDLEPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSActiveIdlePluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSActiveIdlePlugin ROM resources.
-*
-*/
-
-#ifndef GSACTIVEIDLEPLUGINRESOURCES_IBY
-#define GSACTIVEIDLEPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
- #ifndef RD_BOOT_CUSTOMIZABLE_AI
- data=DATAZ_\RESOURCE_FILES_DIR\GSActiveIdlePluginRsc.rsc RESOURCE_FILES_DIR\GSActiveIdlePluginRsc.rsc
- #endif //RD_BOOT_CUSTOMIZABLE_AI
- #endif // RD_GS_RENOVATION
-
-#endif // GSACTIVEIDLEPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSAdminPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSAdminPlugin ROM files.
-*
-*/
-
-#ifndef GSADMINPLUGIN_IBY
-#define GSADMINPLUGIN_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- ECOM_PLUGIN( GSAdminPlugin.dll, 10283340.rsc )
- data=DATAZ_\BITMAP_DIR\GSAdminPlugin.mif BITMAP_DIR\GSAdminPlugin.mif
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSADMINPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSAdminPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSAdminPlugin ROM resources.
-*
-*/
-
-#ifndef GSADMINPLUGINRESOURCES_IBY
-#define GSADMINPLUGINRESOURCES_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSAdminPluginRsc.rsc RESOURCE_FILES_DIR\GSAdminPluginRsc.rsc
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSADMINPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSApp.iby Thu Apr 01 03:17:51 2010 +0800
+++ b/gssettingsuis/Gs/rom/GSApp.iby Thu Apr 01 03:23:37 2010 +0800
@@ -20,9 +20,6 @@
#ifdef RD_GS_RENOVATION
- // GS Application:
- file=ABI_DIR\BUILD_DIR\GSApp.exe PROGRAMS_DIR\GSApp.exe
-
// AIF icons/files:
#ifdef __SCALABLE_ICONS
data=DATAZ_\APP_BITMAP_DIR\GSApp_aif.MIF APP_BITMAP_DIR\GSApp_aif.mif
@@ -30,8 +27,6 @@
AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\GSApp_aif.MBM APP_BITMAP_DIR\GSApp_aif.mbm
#endif //__SCALABLE_ICONS
- // Non-localisable resource file, can be defined in application IBY
- data=ZSYSTEM\..\PRIVATE\10003A3F\APPS\GSApp_reg.RSC Private\10003a3f\apps\GSApp_reg.rsc
// GS Framework:
file=ABI_DIR\BUILD_DIR\GSFramework.dll SHARED_LIB_DIR\GSFramework.dll
--- a/gssettingsuis/Gs/rom/GSAppsPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSAppsPlugin ROM files.
-*
-*/
-
-#ifndef GSAPPSPLUGIN_IBY
-#define GSAPPSPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSAppsPlugin.dll,1020723A.rsc )
- data=DATAZ_\BITMAP_DIR\GSAppsPlugin.mif BITMAP_DIR\GSAppsPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSAPPSPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSAppsPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSAppsPluginResources ROM files.
-*
-*/
-
-#ifndef GSAPPSPLUGINRESOURCES_IBY
-#define GSAPPSPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSAppsPluginRsc.rsc RESOURCE_FILES_DIR\GSAppsPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSAPPSPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSAutoKeyguardPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2008 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: GSAutoKeyguardPlugin ROM files.
-*
-*/
-
-#ifndef GSAUTOKEYGUARDPLUGIN_IBY
-#define GSAUTOKEYGUARDPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSAutoKeyguardPlugin.dll, 200110f0.rsc )
- data=DATAZ_\BITMAP_DIR\gsautokeyguardplugin.mif BITMAP_DIR\gsautokeyguardplugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSAUTOKEYGUARDPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSAutoKeyguardPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2008 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: GSAutoKeyguardPlugin ROM resources.
-*
-*/
-
-#ifndef GSAUTOKEYGUARDPLUGINRESOURCES_IBY
-#define GSAUTOKEYGUARDPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSAutoKeyguardPluginRsc.rsc RESOURCE_FILES_DIR\GSAutoKeyguardPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSAUTOKEYGUARDPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSCallDivertPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2006 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: GSCallDivertPlugin ROM files.
-*
-*/
-
-#ifndef GSCALLDIVERTPLUGIN_IBY
-#define GSCALLDIVERTPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSCallDivertPlugin.dll,102824A3.rsc )
- data=DATAZ_\BITMAP_DIR\GSCallDivertplugin.mif BITMAP_DIR\GSCallDivertplugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSCALLDIVERTPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSCallDivertPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2006 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: GSCallDivertPluginResources ROM resources.
-*
-*/
-
-#ifndef GSCALLDIVERTPLUGINRESOURCES_IBY
-#define GSCALLDIVERTPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSCallDivertPluginRsc.rsc RESOURCE_FILES_DIR\GSCallDivertPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSCALLDIVERTPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSCallPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2006 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: GSCallPlugin ROM files.
-*
-*/
-
-#ifndef GSCALLPLUGIN_IBY
-#define GSCALLPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSCallPlugin.dll,102824A1.rsc )
- data=DATAZ_\BITMAP_DIR\GSCallplugin.mif BITMAP_DIR\GSCallplugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSCALLPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSCallPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2006 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: GSCallPluginResources ROM resources.
-*
-*/
-
-#ifndef GSCALLPLUGINRESOURCES_IBY
-#define GSCALLPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSCallPluginRsc.rsc RESOURCE_FILES_DIR\GSCallPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSCALLPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSConPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSConPlugin ROM files.
-*
-*/
-
-#ifndef GSCONPLUGIN_IBY
-#define GSCONPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSConPlugin.dll, 10207251.rsc )
- data=DATAZ_\BITMAP_DIR\GSConPlugin.mif BITMAP_DIR\GSConPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSCONPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSConPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSConPluginResources ROM files.
-*
-*/
-
-#ifndef GSCONPLUGINRESOURCES_IBY
-#define GSCONPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSConPluginRsc.rsc RESOURCE_FILES_DIR\GSConPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSCONPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSDataCallPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSDataCallPlugin ROM file.
-*
-*/
-
-#ifndef GSDATACALLPLUGIN_IBY
-#define GSDATACALLPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSDataCallPlugin.dll, 10207437.rsc )
- data=DATAZ_\BITMAP_DIR\GSDataCallPlugin.mif BITMAP_DIR\GSDataCallPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSDATACALLPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSDataCallPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSDataCallPlugin ROM resources
-*
-*/
-
-#ifndef GSDATACALLPLUGINRESOURCES_IBY
-#define GSDATACALLPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSDataCallPluginRsc.rsc RESOURCE_FILES_DIR\GSDataCallPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSDATACALLPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSDeviceManagementPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSDeviceManagementPlugin ROM resources.
-*
-*/
-
-#ifndef GSDEVICEMANAGEMENTPLUGIN_IBY
-#define GSDEVICEMANAGEMENTPLUGIN_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- ECOM_PLUGIN( GSDeviceManagementPlugin.dll, 10207238.rsc )
- data=DATAZ_\BITMAP_DIR\GSDeviceManagementPlugin.mif BITMAP_DIR\GSDeviceManagementPlugin.mif
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSDEVICEMANAGEMENTPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSDeviceManagementPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSDeviceManagementPlugin ROM resources.
-*
-*/
-
-#ifndef GSDEVICEMANAGEMENTPLUGINRESOURCES_IBY
-#define GSDEVICEMANAGEMENTPLUGINRESOURCES_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSDeviceManagementPluginRsc.rsc RESOURCE_FILES_DIR\GSDeviceManagementPluginRsc.rsc
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSDEVICEMANAGEMENTPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSDisplayPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSDisplayPlugin ROM file
-*
-*/
-
-#ifndef GSDISPLAYPLUGIN_IBY
-#define GSDISPLAYPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSDisplayPlugin.dll, 10207440.rsc )
- data=DATAZ_\BITMAP_DIR\GSDisplayplugin.mif BITMAP_DIR\GSDisplayplugin.mif
-
-#ifdef FF_POWER_SAVE
- data=ZPRIVATE\2000B187\2000B591.xml private\2000B187\2000B591.xml
-#endif // FF_POWER_SAVE
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSDISPLAYPLUGIN_IBY
-// End of File
-
--- a/gssettingsuis/Gs/rom/GSDisplayPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSDisplayPlugin ROM resources.
-*
-*/
-
-#ifndef GSDISPLAYPLUGINRESOURCES_IBY
-#define GSDISPLAYPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSDisplayPluginRsc.rsc RESOURCE_FILES_DIR\GSDisplayPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSDISPLAYPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSGenPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSGenPlugin ROM resources.
-*
-*/
-
-#ifndef GSGENPLUGIN_IBY
-#define GSGENPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSGenPlugin.dll, 10207238.rsc )
- data=DATAZ_\BITMAP_DIR\GSGenPlugin.mif BITMAP_DIR\GSGenPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSGENPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSGenPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSGenPlugin ROM resources.
-*
-*/
-
-#ifndef GSGENPLUGINRESOURCES_IBY
-#define GSGENPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSGenPluginRsc.rsc RESOURCE_FILES_DIR\GSGenPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSGENPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSInstallationsPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSInstallationsPlugin ROM resources.
-*
-*/
-
-#ifndef GSINSTALLATIONSPLUGIN_IBY
-#define GSINSTALLATIONSPLUGIN_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- ECOM_PLUGIN( GSInstallationsPlugin.dll, 10207238.rsc )
- data=DATAZ_\BITMAP_DIR\GSInstallationsPlugin.mif BITMAP_DIR\GSInstallationsPlugin.mif
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSINSTALLATIONSPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSInstallationsPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSInstallationsPlugin ROM resources.
-*
-*/
-
-#ifndef GSINSTALLATIONSPLUGINRESOURCES_IBY
-#define GSINSTALLATIONSPLUGINRESOURCES_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSInstallationsPluginRsc.rsc RESOURCE_FILES_DIR\GSInstallationsPluginRsc.rsc
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSINSTALLATIONSPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSInteractionPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSInteractionPlugin ROM files.
-*
-*/
-
-#ifndef GSINTERACTIONPLUGIN_IBY
-#define GSINTERACTIONPLUGIN_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- ECOM_PLUGIN( GSInteractionPlugin.dll, 10283340.rsc )
- data=DATAZ_\BITMAP_DIR\gsinteractionplugin.mif BITMAP_DIR\GSInteractionPlugin.mif
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSINTERACTIONPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSInteractionPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSInteractionPlugin ROM resources.
-*
-*/
-
-#ifndef GSINTERACTIONPLUGINRESOURCES_IBY
-#define GSINTERACTIONPLUGINRESOURCES_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSInteractionPluginRsc.rsc RESOURCE_FILES_DIR\GSInteractionPluginRsc.rsc
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSINTERACTIONPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSNetworkPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2006 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: GSNetworkPlugin ROM files.
-*
-*/
-
-#ifndef GSNETWORKPLUGIN_IBY
-#define GSNETWORKPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSNetworkPlugin.dll,102824A7.rsc )
- data=DATAZ_\BITMAP_DIR\GSNetworkplugin.mif BITMAP_DIR\GSNetworkplugin.mif
-
- #ifdef FF_POWER_SAVE
- data=ZPRIVATE\2000B187\2000B593.xml private\2000B187\2000B593.xml
- #endif // FF_POWER_SAVE
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSNETWORKPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSNetworkPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2006 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: GSNetworkPluginResources ROM resources.
-*
-*/
-
-#ifndef GSNETWORKPLUGINRESOURCES_IBY
-#define GSNETWORKPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSNetworkPluginRsc.rsc RESOURCE_FILES_DIR\GSNetworkPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSNETWORKPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSOpticalJoystickPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSOpticalJoystickPlugin ROM file.
-*
-*/
-
-#ifndef GSOPTICALJOYSTICKPLUGIN_IBY
-#define GSOPTICALJOYSTICKPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSOpticalJoystickPlugin.dll, 1028331A.rsc )
- data=DATAZ_\BITMAP_DIR\GSOpticalJoystickPlugin.mif BITMAP_DIR\GSOpticalJoystickPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSOPTICALJOYSTICKPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSOpticalJoystickPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSOpticalJoystickPlugin ROM resources
-*
-*/
-
-#ifndef GSOPTICALJOYSTICKPLUGINRESOURCES_IBY
-#define GSOPTICALJOYSTICKPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSOpticalJoystickPluginRsc.rsc RESOURCE_FILES_DIR\GSOpticalJoystickPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSOPTICALJOYSTICKPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPDataAccessPointPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSPDataAccessPointPlugin ROM files.
-*
-*/
-
-#ifndef GSPDATAACCESSPOINTPLUGIN_IBY
-#define GSPDATAACCESSPOINTPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
- ECOM_PLUGIN( GSPDataAccessPointPlugin.dll,10282DC5.rsc )
- #endif // RD_GS_RENOVATION
-
-#endif // GSCALLDIVERTPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPDataAccessPointPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSPDataAccessPointPluginResources ROM resources.
-*
-*/
-
-#ifndef GSPDATAACCESSPOINTPLUGINRESOURCES_IBY
-#define GSPDATAACCESSPOINTPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSPDataAccessPointPluginRsc.rsc RESOURCE_FILES_DIR\GSPDataAccessPointPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSPDATAACCESSPOINTPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPDataConnectionPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSPDataConnectionPlugin ROM files.
-*
-*/
-
-#ifndef GSPDATACONNECTIONPLUGIN_IBY
-#define GSPDATACONNECTIONPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
- ECOM_PLUGIN( GSPDataConnectionPlugin.dll,10282DC3.rsc )
- #endif // RD_GS_RENOVATION
-
-#endif // GSCALLPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPDataConnectionPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSPDataConnectionPluginResources ROM resources.
-*
-*/
-
-#ifndef GSPDATACONNECTIONPLUGINRESOURCES_IBY
-#define GSPDATACONNECTIONPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
- data=DATAZ_\RESOURCE_FILES_DIR\GSPDataConnectionPluginRsc.rsc RESOURCE_FILES_DIR\GSPDataConnectionPluginRsc.rsc
- #endif // RD_GS_RENOVATION
-
-#endif // GSPDATACONNECTIONPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPDataHSDPAPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSPDataHSDPAPlugin ROM files.
-*
-*/
-
-#ifndef GSPDATAHSDPAPLUGIN_IBY
-#define GSPDATAHSDPAPLUGIN_IBY
-
- #ifdef __HSXPA_SUPPORT
- ECOM_PLUGIN( GSPDataHSDPAPlugin.dll,10282DC7.rsc )
- #endif // __HSXPA_SUPPORT
-
-#endif // GSNETWORKPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPDataHSDPAPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSPDataHSDPAPluginResources ROM resources.
-*
-*/
-
-#ifndef GSPDATAHSDPAPLUGINRESOURCES_IBY
-#define GSPDATAHSDPAPLUGINRESOURCES_IBY
-
- #ifdef __HSXPA_SUPPORT
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSPDataHSDPAPluginRsc.rsc RESOURCE_FILES_DIR\GSPDataHSDPAPluginRsc.rsc
-
- #endif // __HSXPA_SUPPORT
-
-#endif // GSPDATAHSDPAPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPDataPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSPDataPlugin ROM files.
-*
-*/
-
-#ifndef GSPDATAPLUGIN_IBY
-#define GSPDATAPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSPDataPlugin.dll,1020724F.rsc )
- data=DATAZ_\BITMAP_DIR\GSPDataPlugin.mif BITMAP_DIR\GSPDataPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSPDATAPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPDataPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSPDataPlugin ROM resources.
-*
-*/
-
-#ifndef GSPDATAPLUGINRESOURCES_IBY
-#define GSPDATAPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSPDataPluginRsc.rsc RESOURCE_FILES_DIR\GSPDataPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSPDATAPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPowerSavingQueryPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* 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: GSPowerSavingQueryPlugin ROM file.
-*
-*/
-
-#ifndef GSPOWERSAVINGQUERYPLUGIN_IBY
-#define GSPOWERSAVINGQUERYPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSPowerSavingQueryPlugin.dll, 2002120C.rsc )
- data=DATAZ_\BITMAP_DIR\GSPowerSavingQueryPlugin.mif BITMAP_DIR\GSPowerSavingQueryPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSPOWERSAVINGQUERYPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPowerSavingQueryPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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: GSPowerSavingQueryPlugin ROM resources
-*
-*/
-
-#ifndef GSPOWERSAVINGQUERYPLUGINRESOURCE_IBY
-#define GSPOWERSAVINGQUERYPLUGINRESOURCE_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSPowerSavingQueryPluginRsc.rsc RESOURCE_FILES_DIR\GSPowerSavingQueryPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSPOWERSAVINGQUERYPLUGINRESOURCE_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPrslnPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSPrslnPlugin ROM files.
-*
-*/
-
-#ifndef GSPRSLNPLUGIN_IBY
-#define GSPRSLNPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSPrslnPlugin.dll, 10207253.rsc )
- data=DATAZ_\BITMAP_DIR\GSPrslnPlugin.mif BITMAP_DIR\GSPrslnPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSPRSLNPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSPrslnPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSPrslnPlugin ROM resources.
-*
-*/
-
-#ifndef GSPRSLNPLUGINRESOURCES_IBY
-#define GSPRSLNPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSPrslnPluginRsc.rsc RESOURCE_FILES_DIR\GSPrslnPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSPRSLNPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSSecurityPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSAccsPlugin ROM files.
-*
-*/
-
-#ifndef GSSECURITYPLUGIN_IBY
-#define GSSECURITYPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSSecurityPlugin.dll, 1020743A.rsc )
- data=DATAZ_\BITMAP_DIR\GSSecPlugin.mif BITMAP_DIR\GSSecPlugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSSECURITYPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSSecurityPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSSecurityPlugin ROM resources.
-*
-*/
-
-#ifndef GSSECURITYPLUGINRESOURCES_IBY
-#define GSSECURITYPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSSecurityPluginRsc.rsc RESOURCE_FILES_DIR\GSSecurityPluginRsc.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSSECURITYPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSSynchronisationPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSSynchronisationPlugin ROM resources.
-*
-*/
-
-#ifndef GSSYNCHRONISATIONPLUGIN_IBY
-#define GSSYNCHRONISATIONPLUGIN_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- ECOM_PLUGIN( GSSynchronisationPlugin.dll, 10207238.rsc )
- data=DATAZ_\BITMAP_DIR\GSSynchronisationPlugin.mif BITMAP_DIR\GSSynchronisationPlugin.mif
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSSYNCHRONISATIONPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSSynchronisationPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2007 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: GSSynchronisationPlugin ROM resources.
-*
-*/
-
-#ifndef GSSYNCHRONISATIONPLUGINRESOURCES_IBY
-#define GSSYNCHRONISATIONPLUGINRESOURCES_IBY
-
- #ifdef RD_CONTROL_PANEL
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSSynchronisationPluginRsc.rsc RESOURCE_FILES_DIR\GSSynchronisationPluginRsc.rsc
-
- #endif // RD_CONTROL_PANEL
-
-#endif // GSSYNCHRONISATIONPLUGINRESOURCES_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSTelPlugin.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSTelPlugin ROM files.
-*
-*/
-
-#ifndef GSTELPLUGIN_IBY
-#define GSTELPLUGIN_IBY
-
- #ifdef RD_GS_RENOVATION
-
- ECOM_PLUGIN( GSTelPlugin.dll,1020723E.rsc )
- data=DATAZ_\BITMAP_DIR\GSTelplugin.mif BITMAP_DIR\GSTelplugin.mif
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSTELPLUGIN_IBY
-// End of File
--- a/gssettingsuis/Gs/rom/GSTelPluginResources.iby Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005 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: GSTelPluginResources ROM resources.
-*
-*/
-
-#ifndef GSTELPLUGINRESOURCES_IBY
-#define GSTELPLUGINRESOURCES_IBY
-
- #ifdef RD_GS_RENOVATION
-
- data=DATAZ_\RESOURCE_FILES_DIR\GSTelPluginRsc.rsc RESOURCE_FILES_DIR\GSTelPluginRsc.rsc
- data=DATAZ_\RESOURCE_FILES_DIR\SoftReject.rsc RESOURCE_FILES_DIR\SoftReject.rsc
-
- #endif // RD_GS_RENOVATION
-
-#endif // GSTELPLUGINRESOURCES_IBY
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileEngineExtended.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-/*
-* Copyright (c) 2002 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: Extended profile engine interface.
-*
-*/
-
-
-
-#ifndef __MPROFILEENGINEEXTENDED_H__
-#define __MPROFILEENGINEEXTENDED_H__
-
-// INCLUDES
-#include <MProfileEngine.h>
-
-// DATA TYPES
-enum TProfileUtilityObjectType
- {
- EProfileUtilityObjectPresenceTool = 0
- };
-
-// FUNCTION PROTOTYPES
-class MProfileEngineExtended;
-class MProfilesLocalFeatures;
-
-/**
-* Create extended profile engine, ownership transfered.
-*
-* @lib ProfileEng.lib
-* @since 2.0
-*/
-IMPORT_C MProfileEngineExtended* CreateProfileEngineExtendedL();
-
-/**
-* Create extended profile engine, ownership transfered.
-*
-* @param aFs An open file server session, ownership is NOT transferred.
-* aFs must remain connected for the lifetime of the returned object.
-* @lib ProfileEng.lib
-* @since 3.0
-*/
-IMPORT_C MProfileEngineExtended* CreateProfileEngineExtendedL( RFs* aFs );
-
-// FORWARD DECLARATIONS
-class MProfileExtended;
-class MProfilePresence;
-
-// CLASS DECLARATION
-
-/**
-* Extended profile engine interface.
-* This interface extend MProfileEngine interface and
-* offers methods to get profile settings and store profile settings.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileEngineExtended : public MProfileEngine
- {
- protected: // Destructor
-
- virtual ~MProfileEngineExtended() {};
-
- public: // New functions
-
- /**
- * Create extended profile, ownership transfered.
- * @since 2.0
- * @param aId Profile ID
- * @return Instance of the MProfileExtended
- */
- virtual MProfileExtended* ProfileLC( TInt aId ) = 0;
-
- /**
- * Create extended profile, ownership transfered.
- * @since 2.0
- * @param aId Profile ID
- * @return Instance of the MProfileExtended
- */
- virtual MProfileExtended* ProfileL( TInt aId ) = 0;
-
- /**
- * Store profile settings. Leaves with KErrAccessDenied if one or more
- * of the settings of the target profile is/are read-only.
- * @since 2.0
- * @param aProfile Profile
- */
- virtual void CommitChangeL( MProfileExtended& aProfile ) = 0;
-
- /**
- * Send presence settings.
- * @since 2.1
- * @param aProfile Profile
- */
- virtual void SendPresenceSettingsL(
- const MProfilePresence& aPresence ) = 0;
-
- /**
- * Delete profile.
- * @since 2.1
- * @param aId Profile ID
- * @return Error code
- */
- virtual TInt DeleteProfileL( TInt aId ) = 0;
-
- /**
- * Create new profile, ownership transfered.
- * @since 2.1
- * @return Instance of the MProfileExtended
- */
- virtual MProfileExtended* CreateProfileL() = 0;
-
- /**
- * Returns is profile default profile.
- * @since 2.0
- * @param aId Profile ID
- * @return Is profile default profile
- */
- virtual TBool IsDefaultProfile( TInt aId ) = 0;
-
- /**
- * Returns locally variated features of Profiles.
- * @since 2.6
- */
- virtual MProfilesLocalFeatures& LocalFeatures() = 0;
-
- /**
- * Returns an utility object needed for a specific task. The returned
- * object can be generally of any class and the caller must know what
- * it wants and cast the returned object to the correct class.
- * The ownership is not transferred.
- * @param aType the type of the utility object to be returned.
- * @param aImpl the utility object needed by the client on return, NULL
- * if there isn't any of the given type
- */
- virtual void GetProfileUtilityObject(
- TProfileUtilityObjectType aType, TAny*& aImpl ) = 0;
-
- /**
- * Set timed active profile. When the time expires the profile which was
- * active before calling this method will be reactivated.
- * If ID is incorrect then leave with KErrNotFound.
- * @since 3.2
- * @param aId Profile ID
- * @param aTime time when the profile activation expires
- */
- virtual void SetActiveProfileTimedL( TInt aId, TTime aTime ) = 0;
-
- };
-
-#endif // __MPROFILEENGINEEXTENDED_H__
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileExtended.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-/*
-* Copyright (c) 2002 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: Extended profile interface.
-*
-*/
-
-
-
-#ifndef __MPROFILEEXTENDED_H__
-#define __MPROFILEEXTENDED_H__
-
-// INCLUDES
-#include <MProfile.h>
-
-// DATA TYPES
-enum TProfileFlags
- {
- EProfileFlagRingingTone = 0x0001,
- EProfileFlagRingingType = 0x0002,
- EProfileFlagRingingVolume = 0x0004,
- EProfileFlagMessageAlertTone = 0x0008,
- EProfileFlagInstantMessageAlertTone = 0x0010,
- EProfileFlagVibratingAlert = 0x0020,
- EProfileFlagKeypadVolume = 0x0040,
- EProfileFlagWarningTones = 0x0080,
- EProfileFlagAlertFor = 0x0100,
- EProfileFlagAvailabilityAttribute = 0x0200,
- EProfileFlagStatusMessage = 0x0400,
- EProfileFlagProfileName = 0x0800,
- EProfileFlagEmailAlertTone = 0x1000,
- EProfileFlagVideoCallRingingTone = 0x2000,
- EProfileFlagMediaVolume = 0x4000,
- EProfileFlagTextToSpeechTone = 0x8000,
-// Free slot = 0x10000,
- EProfileFlagPttTone = 0x20000,
- EProfileFlagPttStatus = 0x40000,
- EProfileFlag3DEffect = 0x80000,
- EProfileFlag3DEcho = 0x100000,
- EProfileFlagTactileFeedback = 0x200000,
- EProfileFlagAudioFeedback = 0x400000,
- EProfileFlagAll = 0xFFFF
- };
-
-// FORWARD DECLARATIONS
-class MProfileSetName;
-class MProfileSetTones;
-class MProfilePresence;
-class MProfileSetPresence;
-class MProfileSetExtraTones;
-class MProfileSetExtraSettings;
-class CRepository;
-
-// CLASS DECLARATION
-
-/**
-* Extended profile interface.
-* This interface extend MProfile interface.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileExtended : public MProfile
- {
- protected: // Destructor
-
- virtual ~MProfileExtended() {};
-
- public: // New functions
-
- /**
- * This method set alert for items to the profile.
- * @since 2.0
- * @param aAlertFor Alert for item array.
- */
- virtual void SetAlertForL(
- const TArray<TContactItemId>& aAlertFor ) = 0;
-
- /**
- * Returns set profile name interface.
- * @since 2.0
- * @return Returns set profile name interface.
- */
- virtual MProfileSetName& ProfileSetName() const = 0;
-
- /**
- * Returns set profile tones interface.
- * @since 2.0
- * @return Returns set profile tones interface.
- */
- virtual MProfileSetTones& ProfileSetTones() const = 0;
-
- /**
- * Returns profile presence interface.
- * @since 2.0
- * @return Returns profile presence interface.
- */
- virtual const MProfilePresence& ProfilePresence() const = 0;
-
- /**
- * Returns set profile presence interface.
- * @since 2.0
- * @return Returns set profile presence interface.
- */
- virtual MProfileSetPresence& ProfileSetPresence() const = 0;
-
- /**
- * Returns set profile extra tones interface.
- * @since 2.0
- * @return Returns set profile extra tones interface.
- */
- virtual MProfileSetExtraTones& ProfileSetExtraTones() const = 0;
-
- /**
- * Returns profile modifiable flags. See TProfileFlags.
- * @since 2.0
- * @return Returns profile modifiable flags.
- */
- virtual TUint32 ModifiableFlags() const = 0;
-
- /**
- * Returns profile visible flags. See TProfileFlags.
- * @since 2.0
- * @return Returns profile visible flags.
- */
- virtual TUint32 VisibleFlags() const = 0;
-
- /**
- * Externalize data to Central Repository.
- * @since 2.8
- * @param aCenRep Central Repository object to write the settings
- */
- virtual void ExternalizeL( CRepository& aCenRep ) = 0;
-
- /**
- * Returns set profile extra settings interface.
- * @since 3.0
- * @return set profile extra settings interface.
- */
- virtual MProfileSetExtraSettings& ProfileSetExtraSettings() const = 0;
-
- };
-
-#endif // __MPROFILEEXTENDED_H__
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfilePresence.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profile presence interface.
-*
-*/
-
-
-
-#ifndef __MPROFILEPRESENCE_H
-#define __MPROFILEPRESENCE_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Profile presence interface.
-* This interface offers methods to get status message and
-* availability attribute.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfilePresence
- {
- protected: // Destructor
-
- virtual ~MProfilePresence() {};
-
- public: // New functions
-
- /**
- * Return status message of the profile.
- * @since 2.1
- * @return Status message of the profile.
- */
- virtual const TDesC& StatusMessage() const = 0;
-
- /**
- * Return availability attribute of the profile.
- * @since 2.1
- * @return Return availability attribute of the profile.
- */
- virtual TUint32 AvailabilityAttribute() const = 0;
-
- };
-
-#endif // __MPROFILEPRESENCE_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileSet3DToneSettings.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profile set 3D tone settings interface.
-*
-*/
-
-
-
-#ifndef MPROFILESET3DTONESETTINGS_H
-#define MPROFILESET3DTONESETTINGS_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-* Profile set 3D tone settings interface.
-* @since 3.1
-*/
-class MProfileSet3DToneSettings
- {
- protected: // Destructor
-
- virtual ~MProfileSet3DToneSettings() {};
-
- public: // New functions
-
- /**
- * Set 3D tone effect of the profile.
- * @since 3.1
- */
- virtual void SetEffect( TProfile3DToneEffect aEffect ) = 0;
-
- /**
- * Set 3D tone echo of the profile.
- * @since 3.1
- */
- virtual void SetEcho( TProfile3DToneEcho aEcho ) = 0;
-
- };
-
-#endif // MPROFILESET3DTONESETTINGS_H
-
-// End of File
-
-
-
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetExtraSettings.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profile settings interface.
-*
-*/
-
-
-
-#ifndef MPROFILESETEXTRASETTINGS_H
-#define MPROFILESETEXTRASETTINGS_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-class MProfileSetPttSettings;
-class MProfileSetFeedbackSettings;
-class MProfileSet3DToneSettings;
-
-// CLASS DECLARATION
-
-/**
-* Interface for modifying Profiles extra settings.
-* @since 3.1
-*/
-class MProfileSetExtraSettings
- {
- protected: // Destructor
-
- virtual ~MProfileSetExtraSettings() {};
-
- public: // New functions
-
- /**
- * Returns set profile ptt settings interface.
- * @return set profile ptt settings interface.
- * @since 3.1
- */
- virtual MProfileSetPttSettings& ProfileSetPttSettings() const = 0;
-
- /**
- * Returns set profile feedback settings interface.
- * @return set profile feedback settings interface.
- * @since 5.0
- */
- virtual MProfileSetFeedbackSettings& ProfileSetFeedbackSettings() const = 0;
-
- /**
- * Returns set profile 3D tone settings interface.
- * @return set profile 3D tone settings interface.
- * @since 3.1
- */
- virtual MProfileSet3DToneSettings& ProfileSet3DToneSettings() const = 0;
-
- };
-
-#endif // MPROFILESETEXTRASETTINGS_H
-
-// End of File
-
-
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetExtraTones.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2002 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: Set profile extra tones interface.
-*
-*/
-
-
-
-#ifndef __MPROFILESETEXTRATONES_H
-#define __MPROFILESETEXTRATONES_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Set profile extra tones interface.
-* This interface offers methods to set IM message alert tone file name.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileSetExtraTones
- {
- protected: // Destructor
-
- virtual ~MProfileSetExtraTones() {};
-
- public: // New functions
-
- /**
- * Set IM message alert tone file name.
- * @since 2.0
- * @param aIMMessageAlertTone IM message alert tone.
- */
- virtual void SetIMMessageAlertToneL(
- const TDesC& aIMMessageAlertTone ) = 0;
-
- /**
- * Set Email alert tone file name.
- * @since 2.0
- * @param aEmailAlertTone Email alert tone.
- */
- virtual void SetEmailAlertToneL(
- const TDesC& aEmailAlertTone ) = 0;
-
- /**
- * Set Video call ringing tone file name.
- * @since 2.6
- * @param aRingingTone Video call ringing tone file name.
- */
- virtual void SetVideoCallRingingToneL(
- const TDesC& aRingingTone ) = 0;
-
- };
-
-
-#endif // __MPROFILESETEXTRATONES_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetFeedbackSettings.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2007 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: Profile set feedback settings interface.
-*
-*/
-
-
-
-#ifndef MPROFILESETFEEDBACKSETTINGS_H
-#define MPROFILESETFEEDBACKSETTINGS_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-* Profile set feedback settings interface.
-* @since 5.0
-*/
-class MProfileSetFeedbackSettings
- {
- protected: // Destructor
-
- virtual ~MProfileSetFeedbackSettings() {};
-
- public: // New functions
-
- /**
- * Set tactile feedback of the profile.
- * @since 5.0
- */
- virtual void SetTactileFeedback( TProfileTactileFeedback aTactileFeedback ) = 0;
-
- /**
- * Set audio feedback of the profile.
- * @since 5.0
- */
- virtual void SetAudioFeedback( TProfileAudioFeedback aAudioFeedback ) = 0;
-
- };
-
-#endif // MPROFILESETFEEDBACKSETTINGS_H
-
-// End of File
-
-
-
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetName.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2002 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: Set profile name interface.
-*
-*/
-
-
-
-#ifndef __MPROFILESETNAME_H
-#define __MPROFILESETNAME_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Set profile name interface.
-* This interface offers method to set profile name.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileSetName
- {
- protected: // Destructor
-
- virtual ~MProfileSetName() {};
-
- public: // New functions
-
- /**
- * Set name of the profile.
- * @since 2.0
- * @param aName Name of the profile.
- */
- virtual void SetNameL( const TDesC& aName ) = 0;
-
- };
-
-#endif // __MPROFILESETNAME_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetPresence.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2002 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: Set profile presence settings interface.
-*
-*/
-
-
-
-#ifndef __MPROFILESETPRESENCE_H
-#define __MPROFILESETPRESENCE_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Set profile presence settings interface.
-* This interface offers methods to set profile status message and
-* availability attribute.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileSetPresence
- {
- protected: // Destructor
-
- virtual ~MProfileSetPresence() {};
-
- public: // New functions
-
- /**
- * Set status message of the profile.
- * @since 2.0
- * @param aStatusMessage status message of the profile.
- */
- virtual void SetStatusMessageL( const TDesC& aStatusMessage ) = 0;
-
- /**
- * Set availability attribute of the profile.
- * @since 2.0
- * @param aAvailabilityAttribute Availability attribute of the profile.
- */
- virtual void SetAvailabilityAttribute(
- const TUint32 aAvailabilityAttribute ) = 0;
- };
-
-#endif // __MPROFILESETPRESENCE_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetPttSettings.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profile set PTT settings interface.
-*
-*/
-
-
-
-#ifndef MPROFILESETPTTSETTINGS_H
-#define MPROFILESETPTTSETTINGS_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-* Profile set PTT settings interface.
-* @since 3.1
-*/
-class MProfileSetPttSettings
- {
- protected: // Destructor
-
- virtual ~MProfileSetPttSettings() {};
-
- public: // New functions
-
- /**
- * Set PTT ringing tone file name.
- * @since 3.1
- */
- virtual void SetPttRingingToneL( const TDesC& aPttRingingTone ) = 0;
-
- /**
- * Set PTT status of the profile.
- * @since 3.1
- */
- virtual void SetPttStatus( TProfilePttStatus aPttStatus ) = 0;
-
- };
-
-#endif // MPROFILESETPTTSETTINGS_H
-
-// End of File
-
-
--- a/profilesservices/ProfileEngine/EngInc/MProfileSetTones.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* Copyright (c) 2002 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: Set tone settings interface.
-*
-*/
-
-
-
-#ifndef __MPROFILESETTONES_H
-#define __MPROFILESETTONES_H
-
-// INCLUDES
-#include <e32std.h>
-
-// FORWARD DECLARATIONS
-struct TProfileToneSettings;
-
-// CLASS DECLARATION
-
-/**
-* Set tone settings interface.
-* This interface offers methods to set line 1 and 2 ringing tone,
-* message alert tone and tone settings.
-*
-* @lib N/A
-* @since 2.0
-*/
-class MProfileSetTones
- {
- protected: // Destructor
-
- virtual ~MProfileSetTones() {};
-
- public: // New functions
-
- /**
- * Set line 1 ringing tone.
- * @since 2.0
- * @param aRingingTone File name of the ringing tone.
- */
- virtual void SetRingingTone1L( const TDesC& aRingingTone ) = 0;
-
- /**
- * Set line 2 ringing tone.
- * @since 2.0
- * @param aRingingTone File name of the ringing tone.
- */
- virtual void SetRingingTone2L( const TDesC& aRingingTone ) = 0;
-
- /**
- * Set message alert tone.
- * @since 2.0
- * @param aMessageAlertTone File name of the message alert tone.
- */
- virtual void SetMessageAlertToneL(
- const TDesC& aMessageAlertTone ) = 0;
-
- /**
- * Set tone settings of the profile.
- * @since 2.0
- * @return Tone settings structure.
- */
- virtual TProfileToneSettings& SetToneSettings() = 0;
-
- };
-
-#endif // __MPROFILESETTONES_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/MProfileUtilitySingleton.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profile Utility interface.
-*
-*/
-
-
-
-#ifndef __MPROFILEUTILITYSINGLETON_H__
-#define __MPROFILEUTILITYSINGLETON_H__
-
-// INCLUDES
-
-// FORWARD DECLARATIONS
-class MProfileUtilitySingleton;
-class MProfilesLocalFeatures;
-
-// FUNCTION PROTOTYPES
-/**
-* Return reference to MProfileUtilitySingleton instance. Create it if
-* necessary. For each succesful InstanceL() call there must be a corres-
-* ponding Release() call, so that the internal reference counting works.
-* @since 3.2
-* @return Reference to the only MProfileUtilitySingleton instance.
-*/
-IMPORT_C MProfileUtilitySingleton& ProfileUtilityInstanceL();
-
-/**
-* Release the resources of MProfileUtilitySingleton (when there are no
-* references to it anymore). For each succesful InstanceL() call there
-* must be a corresponding Release() call, so that the internal
-* reference counting works.
-* @since 3.2
-*/
-IMPORT_C void ReleaseProfileUtility();
-
-
-// CLASS DECLARATION
-/**
-* Profile utility class.
-*
-* @lib profileeng.lib
-* @since 3.2
-*/
-class MProfileUtilitySingleton
- {
- protected: // Destructor
-
- virtual ~MProfileUtilitySingleton() {};
-
- public: // New functions
-
- /**
- * Returns a reference to MProfilesLocalFeatures instance owned by
- * this MProfileUtility instance.
- * @since 3.2
- */
- virtual MProfilesLocalFeatures& ProfilesLocalFeatures() = 0;
-
- };
-
-#endif // __MPROFILEUTILITYSINGLETON_H__
-
-// End of File
-
--- a/profilesservices/ProfileEngine/EngInc/MProfilesLocalFeatures.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 2002 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: Interface for locally variated features of Profiles.
-*
-*/
-
-
-
-#ifndef __MPROFILESLOCALFEATURES_H__
-#define __MPROFILESLOCALFEATURES_H__
-
-// CLASS DECLARATION
-
-/**
-* Profiles local feature variation interface.
-* MProfilesLocalFeatures offers simple interface to get locally variated
-* features of Profiles.
-* How to use:
-* Get local features object with MProfileEngineExtended::LocalFeaturesL().
-* MProfilesLocalFeatures& features = iProfileEngine->LocalFeatures();
-* Check whether a feature is supported (use the ID:s defined in
-* ProfilesVariant.hrh):
-* if( features.IsFeatureSupported( KFeatureIdSomeFeature ) )
-* {
-* // do stuff
-* }
-*
-* @lib N/A
-* @since 2.6
-*/
-class MProfilesLocalFeatures
- {
- protected: // Destructor
-
- virtual ~MProfilesLocalFeatures() {};
-
- public: // New functions
-
- /**
- * Checks if the given feature is supported or not.
- * @since 2.6
- * @return ETrue if the feature is supported, EFalse otherwise.
- */
- virtual TBool IsFeatureSupported( TInt aFeatureId ) const = 0;
-
- /**
- * Checks if the given MIME-type is explicitly blocked from using as
- * an alert tone.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is blocked, EFalse otherwise.
- */
- virtual TBool IsBlockedType( const TDesC& aMimeType ) = 0;
-
- /**
- * Checks if the given MIME-type is explicitly blocked from using as
- * an alert tone if the alert tone file of the type is unprotected.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is blocked if the alert tone file is
- * unprotected, EFalse otherwise.
- */
- virtual TBool IsBlockedUnprotectedType( const TDesC& aMimeType ) = 0;
-
- /**
- * Checks if the given MIME-type is explicitly blocked from using as
- * an alert tone if the alert tone file of the type is protected.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is blocked if the alert tone file is
- * protected, EFalse otherwise.
- */
- virtual TBool IsBlockedProtectedType( const TDesC& aMimeType ) = 0;
-
- /**
- * Checks if the given MIME-type is explicitly blocked from demo
- * playing.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is blocked from demo-playing,
- * EFalse otherwise.
- */
- virtual TBool IsBlockedDemoPlayType( const TDesC& aMimeType ) = 0;
-
- /**
- * Checks if the given MIME-type is explicitly excluded from the tone
- * selection list. Also when tried to be set as alert tones through
- * other means, should behave as the tone would be in blocked type list.
- * @since 3.1
- * @param aMimeType the MIME-type to be checked.
- * @return ETrue if the MIME-type is excluded from the tone selection
- * list, EFalse otherwise.
- */
- virtual TBool IsExcludedType( const TDesC& aMimeType ) = 0;
- };
-
-#endif // __MPROFILESLOCALFEATURES_H__
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/ProfileEng.hrh Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profiles Engine enumeration TProfileSettingKeyType
-* and TProfileSettingId.
-*
-*/
-
-
-#ifndef __PROFILEENG_HRH__
-#define __PROFILEENG_HRH__
-
-#define PROFILES_ENGINE_RESOURCE_SIGNATURE 75
-#define PROFILES_MAX_NAME_LENGTH 64
-#define PROFILES_MAX_STATUS_MSG_LENGTH 40
-#define PROFILES_MAX_CALL_OBJECT_TEXT_LENGTH 1000
-
-// DATA TYPES
-enum TProfileSettingKeyType
- {
- EProfileSettingKeyTypeInt = 0,
- EProfileSettingKeyTypeString = 1,
- EProfileSettingKeyTypeBin = 2,
- EProfileSettingKeyTypeReal = 3
- };
-
-enum TProfileSettingId
- {
- EProfileSettingIdModifiableFlags = 0x00000000,
- EProfileSettingIdVisibleFlags = 0x00000001,
- EProfileSettingIdProfileName = 0x00000002,
- EProfileSettingIdAlertForGroups = 0x00000003,
- EProfileSettingIdRingingTone = 0x00000004,
- EProfileSettingIdRingingTone2 = 0x00000005,
- EProfileSettingIdMsgTone = 0x00000006,
- EProfileSettingIdRingingType = 0x00000007,
- EProfileSettingIdKeypadVolume = 0x00000008,
- EProfileSettingIdRingingVolume = 0x00000009,
- EProfileSettingIdVibra = 0x0000000A,
- EProfileSettingIdWarnAndGameTones = 0x0000000B,
- EProfileSettingIdImTone = 0x0000000C,
- EProfileSettingIdEmailTone = 0x0000000D,
- EProfileSettingIdVideoCallTone = 0x0000000E,
- EProfileSettingIdStatusMsg = 0x0000000F,
- EProfileSettingIdAvailAttribute = 0x00000010,
- EProfileSettingIdMediaVolume = 0x00000011,
- EProfileSettingIdTextToSpeechTone = 0x00000012,
- EProfileSettingIdNameChanged = 0x00000013,
- EProfileSettingIdCallObjectContent = 0x00000014,
- EProfileSettingIdPttTone = 0x00000015,
- EProfileSettingIdPttStatus = 0x00000016,
- EProfileSettingId3DEffect = 0x00000017,
- EProfileSettingId3DEcho = 0x00000018,
- EProfileSettingIdTactileFeedback = 0x00000019,
- EProfileSettingIdAudioFeedback = 0x0000001A
- };
-
-#endif // __PROFILEENG_HRH__
-
-// End of File
-
--- a/profilesservices/ProfileEngine/EngInc/ProfileEng.rh Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profiles Engine resource structures.
-*
-*/
-
-
-// STRUCTURE DEFINITIONS
-
-// -----------------------------------------------------------------------------
-// DEFAULT_PROFILES
-// Default profiles
-// -----------------------------------------------------------------------------
-//
-STRUCT DEFAULT_PROFILES
- {
- STRUCT items[];
- }
-
-// -----------------------------------------------------------------------------
-// PROFILE
-// profile default name and ID
-// -----------------------------------------------------------------------------
-//
-STRUCT PROFILE
- {
- LONG id = 0;
- LTEXT name = "";
- LTEXT shortname = "";
- LTEXT naviname = "";
- LTEXT titlename = "";
- }
-
-// -----------------------------------------------------------------------------
-// PROFILE_SETTINGS
-// Profile settings
-// -----------------------------------------------------------------------------
-//
-STRUCT PROFILE_SETTINGS
- {
- STRUCT items[];
- }
-
-// -----------------------------------------------------------------------------
-// PROFILE SETTING
-// profile setting for dynamic profiles
-// -----------------------------------------------------------------------------
-//
-STRUCT PROFILE_SETTING
- {
- LONG id = 0;
- LONG key_type = 0;
- }
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/ProfileEngineConstants.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profiles engine constants
-*
-*/
-
-
-
-#ifndef PROFILEENGINECONSTANTS_H
-#define PROFILEENGINECONSTANTS_H
-
-// INCLUDES
-#include <e32std.h>
-#include "ProfileEng.hrh"
-
-// CONSTANTS
-const TInt KProfileFileEstimationSize( 400 );
-const TInt KProfilesMaxNumberOfDynamicProfiles( 20 );
-const TInt KProfilesMaxTIntLength( 11 );
-const TInt KProfileMaxNameLength( PROFILES_MAX_NAME_LENGTH );
-const TInt KProfileMaxCallObjectTextLength( 1000 );
-const TInt KProfileBaseDynamicProfileId( 30 ); // first dynamic profile ID
-// Used for profile settings cenrep-keys - profile id is encoded in the MSB:
-const TInt KProfileIdShift( 24 );
-
-_LIT( KProfileDriveC, "c:" );
-_LIT( KProfileDriveZ, "z:" );
-_LIT( KProfileFilePrefix, "Profile" );
-_LIT( KProfileFileExtension, ".dat" );
-_LIT( KProfileFilePath, "\\System\\Data\\Profiles\\" );
-_LIT( KProfileEngineResourceDriveAndDir, "Z:ProfileEng.rsc" );
-_LIT( KProfileMutexName, "ProfileFileAccessMutexName" );
-
-#endif // PROFILEENGINECONSTANTS_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/ProfileEngineInternalCRKeys.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profiles engine internal Central Repository keys.
-*
-*/
-
-
-
-#ifndef PROFILEENGINEINTERNALCRKEYS_H
-#define PROFILEENGINEINTERNALCRKEYS_H
-
-// INCLUDES
-#include <e32std.h>
-#include <ProfileEngineDomainCRKeys.h>
-
-// CONSTANTS
-
-/**
- * Information about whether self recorded tones can be used as ringing tones
- * or not. Integer value.
- *
- * Possible values:
- *
- * 0 (disabled)
- * 1 (enabled)
- */
-const TUint32 KProEngRecordedRingingTones = 0x80000100;
-
-/**
- * If this is true, DRM protected MP4 tones are not allowed as ringing tones.
- *
- * Possible values:
- *
- * 0 (allowed, default)
- * 1 (not allowed)
- */
-const TUint32 KProEngNoDrmMP4RingingTones = 0x80000101;
-
-/**
- * If this is true, WMA tones are not allowed as ringing tones.
- *
- * Possible values:
- *
- * 0 (allowed, default)
- * 1 (not allowed)
- */
-const TUint32 KProEngNoWmaRingingTones = 0x80000102;
-
-/**
- * Tactile feedback setting for the currently active profile.
- * THIS COULD BE MOVED TO THE SDK HEADER LATER?
- *
- * Possible values:
- *
- * 0 (Off)
- * 1 (Level 1)
- * 2 (Level 2)
- * 3 (Level 3)
- */
-const TUint32 KProEngActiveTactileFeedback = 0x7E000019;
-
-/**
- * Audio feedback setting for the currently active profile.
- * THIS COULD BE MOVED TO THE SDK HEADER LATER?
- *
- * Possible values:
- *
- * 0 (Off)
- * 1 (Level 1)
- * 2 (Level 2)
- * 3 (Level 3)
- */
-const TUint32 KProEngActiveAudioFeedback = 0x7E00001A;
-
-
-#endif // PROFILEENGINEINTERNALCRKEYS_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngInc/ProfileEngineInternalPSKeys.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profiles engine internal Publish & Subscribe keys.
-*
-*/
-
-
-
-#ifndef PROFILEENGINEINTERNALPSKEYS_H
-#define PROFILEENGINEINTERNALPSKEYS_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CONSTANTS
-const TUid KPSUidProfileEngine = {0x101F879F};
-
-#endif // PROFILEENGINEINTERNALPSKEYS_H
-
-// End of File
-
--- a/profilesservices/ProfileEngine/EngInc/ProfileEnginePrivateCRKeys.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngInc/ProfileEnginePrivateCRKeys.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32std.h>
#include <ProfileEngineInternalCRKeys.h>
-#include "ProfileEng.hrh"
+#include <ProfileEng.hrh>
// CONSTANTS
/**
--- a/profilesservices/ProfileEngine/EngInc/ProfileEnginePrivatePSKeys.h Thu Apr 01 03:17:51 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2002 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: Profiles engine internal Publish & Subscribe keys.
-*
-*/
-
-
-
-#ifndef PROFILEENGINEPRIVATEPSKEYS_H
-#define PROFILEENGINEPRIVATEPSKEYS_H
-
-// INCLUDES
-#include <e32std.h>
-#include "ProfileEngineInternalPSKeys.h"
-
-// CONSTANTS
-
-/**
- * A setting in the current active profile was modified. This is used
- * internally by Profiles Engine notification mechanism.
- * Default value: 0.
- */
-const TUint32 KProEngActiveProfileModified = 0x7D000001;
-
-/**
- * The current active profile has changed (or the active profile has been
- * reactivated). This is used internally by Profiles Engine notification
- * mechanism.
- * Default value: 0.
- */
-const TUint32 KProEngActiveProfileChanged = 0x7D000002;
-
-/**
- * Power save mode has changed.
- * This is used internally by Profiles Engine.
- * Default value: 0.
- */
-const TUint32 KProEngPsmChanged = 0x7D000003;
-
-#endif // PROFILEENGINEPRIVATEPSKEYS_H
-
-// End of File
--- a/profilesservices/ProfileEngine/EngSrc/CProfile3DToneSettingsImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfile3DToneSettingsImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfile3DToneSettings.h>
-#include "MProfileSet3DToneSettings.h"
+#include <MProfileSet3DToneSettings.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileChangeNotifyHandler.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileChangeNotifyHandler.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -18,12 +18,12 @@
// INCLUDE FILES
-#include "CProfileChangeNotifyHandler.h"
-#include "MProfileChangeObserver.h"
#include "ProfileEngPanic.h"
-#include "ProfileEngineSDKCRKeys.h"
-#include "ProfileEnginePrivatePSKeys.h"
+#include <CProfileChangeNotifyHandler.h>
+#include <MProfileChangeObserver.h>
+#include <ProfileEngineSDKCRKeys.h>
#include <centralrepository.h>
+#include <ProfileEnginePrivatePSKeys.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,6 +19,14 @@
// INCLUDE FILES
#include "CProfileEngineImpl.h"
+#include "CProfilesNamesArrayImpl.h"
+#include "CProfileImpl.h"
+#include "CProfileNameImpl.h"
+#include "ProfileEngUtils.h"
+#include "ProfileEngPanic.h"
+#include "CProfileTiming.h"
+#include "ProfileEnginePrivateCRKeys.h"
+#include "ProfilesDebug.h"
#include <bautils.h> // BaflUtils
#include <barsc.h> // RResoureFile
#include <featmgr.h>
@@ -29,28 +37,20 @@
#include <ProfileEng.rsg>
#include <TProfileToneSettings.h>
#include <MProfileTones.h>
-#include "CProfilesNamesArrayImpl.h"
-#include "CProfileImpl.h"
-#include "CProfileNameImpl.h"
-#include "ProfileEngUtils.h"
-#include "MProfileSetName.h"
-#include "ProfileEng.hrh"
-#include "ProfileEngineConstants.h"
-#include "ProfileEngPanic.h"
-#include "MProfileSetTones.h"
-#include "MProfileSetExtraTones.h"
-#include "MProfileExtraSettings.h"
-#include "MProfileFeedbackSettings.h"
-#include "MProfilesLocalFeatures.h"
-#include "MProfileUtilitySingleton.h"
-#include "ProfilesVariant.hrh" // KProEngFeatureIdVTRingingTone
-#include "CProfileTiming.h"
+#include <MProfileSetName.h>
+#include <ProfileEng.hrh>
+#include <ProfileEngineConstants.h>
+#include <MProfileSetTones.h>
+#include <MProfileSetExtraTones.h>
+#include <MProfileExtraSettings.h>
+#include <MProfileFeedbackSettings.h>
+#include <MProfilesLocalFeatures.h>
+#include <MProfileUtilitySingleton.h>
+#include <ProfilesVariant.hrh> // KProEngFeatureIdVTRingingTone
#include <centralrepository.h>
-#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfileEnginePrivatePSKeys.h"
+#include <ProfileEnginePrivatePSKeys.h>
#include <hwrmvibrasdkcrkeys.h>
#include <data_caging_path_literals.hrh>
-#include "ProfilesDebug.h"
#include <psmsettings.h>
#include <psmsrvdomaincrkeys.h>
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -24,8 +24,8 @@
#include <e32property.h>
#include <f32file.h> // RFs
#include <Profile.hrh> // TProfileRingingVolume
-#include "MProfileEngineExtended.h" // MProfileEngineExtended
-#include "MProfileExtended.h" // MProfileExtended
+#include <MProfileEngineExtended.h> // MProfileEngineExtended
+#include <MProfileExtended.h> // MProfileExtended
// FORWARD DECLARATIONS
class CProfileNameImpl;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImplDynamicProfiles.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImplDynamicProfiles.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,6 +19,13 @@
// INCLUDE FILES
#include "CProfileEngineImpl.h"
+#include "CProfilesNamesArrayImpl.h"
+#include "CProfileImpl.h"
+#include "CProfileNameImpl.h"
+#include "ProfileEngUtils.h"
+#include "ProfileEng.hrh"
+#include "ProfileEngPanic.h"
+#include "ProfileEnginePrivateCRKeys.h"
#include <bautils.h>
#include <barsc.h>
#include <featmgr.h>
@@ -29,15 +36,8 @@
#include <ProfileEng.rsg>
#include <TProfileToneSettings.h>
#include <MProfileTones.h>
-#include "CProfilesNamesArrayImpl.h"
-#include "CProfileImpl.h"
-#include "CProfileNameImpl.h"
-#include "ProfileEngUtils.h"
-#include "MProfileSetName.h"
-#include "ProfileEng.hrh"
-#include "ProfileEngPanic.h"
-#include "ProfileEngineConstants.h"
-#include "ProfileEnginePrivateCRKeys.h"
+#include <MProfileSetName.h>
+#include <ProfileEngineConstants.h>
namespace
{
--- a/profilesservices/ProfileEngine/EngSrc/CProfileExtraSettingsImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileExtraSettingsImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfileExtraSettings.h>
-#include "MProfileSetExtraSettings.h"
+#include <MProfileSetExtraSettings.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileExtraTonesImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileExtraTonesImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,11 +19,11 @@
// INCLUDE FILES
#include "CProfileExtraTonesImpl.h"
-#include "ProfilesVariant.hrh"
+#include "ProfileEngUtils.h"
+#include "ProfileEnginePrivateCRKeys.h"
+#include <ProfilesVariant.hrh>
#include <s32strm.h>
#include <centralrepository.h>
-#include "ProfileEngUtils.h"
-#include "ProfileEnginePrivateCRKeys.h"
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/EngSrc/CProfileExtraTonesImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileExtraTonesImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfileExtraTones.h>
-#include "MProfileSetExtraTones.h"
+#include <MProfileSetExtraTones.h>
// FORWARD DECLARATIONS
class RWriteStream;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileFeedbackSettingsImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileFeedbackSettingsImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,10 +19,10 @@
// INCLUDE FILES
#include "CProfileFeedbackSettingsImpl.h"
-#include <centralrepository.h>
#include "ProfileEngUtils.h"
#include "ProfileEnginePrivateCRKeys.h"
#include "ProfilesDebug.h"
+#include <centralrepository.h>
#include <hwrmvibrasdkcrkeys.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/EngSrc/CProfileFeedbackSettingsImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileFeedbackSettingsImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfileFeedbackSettings.h>
-#include "MProfileSetFeedbackSettings.h"
+#include <MProfileSetFeedbackSettings.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,6 +19,13 @@
// INCLUDE FILES
#include "CProfileImpl.h"
+#include "CProfileNameImpl.h"
+#include "CProfileTonesImpl.h"
+#include "CProfileExtraTonesImpl.h"
+#include "CProfileExtraSettingsImpl.h"
+#include "CProfilePresenceImpl.h"
+#include "ProfileEngUtils.h"
+#include "ProfileEnginePrivateCRKeys.h"
#include <e32svr.h>
#include <cntitem.h>
#include <cntdb.h>
@@ -29,16 +36,9 @@
#include <bldvariant.hrh>
#include <RSSSettings.h>
#include <pathinfo.h>
-#include "CProfileNameImpl.h"
-#include "CProfileTonesImpl.h"
-#include "CProfileExtraTonesImpl.h"
-#include "CProfileExtraSettingsImpl.h"
-#include "CProfilePresenceImpl.h"
-#include "MProfilesLocalFeatures.h"
-#include "MProfileUtilitySingleton.h"
-#include "ProfilesVariant.hrh"
-#include "ProfileEngUtils.h"
-#include "ProfileEnginePrivateCRKeys.h"
+#include <MProfilesLocalFeatures.h>
+#include <MProfileUtilitySingleton.h>
+#include <ProfilesVariant.hrh>
#include <ProfileEngineDomainConstants.h>
// CONSTANTS
--- a/profilesservices/ProfileEngine/EngSrc/CProfileImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -22,7 +22,7 @@
// INCLUDES
#include <e32base.h>
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
#include <centralrepository.h> // NCentralRepositoryConstants::KMaxBinaryLength
// CONSTANTS
--- a/profilesservices/ProfileEngine/EngSrc/CProfileNameImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileNameImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,12 +19,12 @@
// INCLUDE FILES
#include "CProfileNameImpl.h"
+#include "ProfileEnginePrivateCRKeys.h"
+#include "ProfileEngUtils.h"
#include <s32strm.h>
#include <MProfilesNamesArray.h>
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
#include <centralrepository.h>
-#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfileEngUtils.h"
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/EngSrc/CProfileNameImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileNameImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <MProfileName.h>
#include <e32base.h>
-#include "MProfileSetName.h"
+#include <MProfileSetName.h>
// FORWARD DECLARATIONS
class RWriteStream;
--- a/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -20,14 +20,14 @@
// INCLUDE FILES
#include "CProfilePresenceImpl.h"
+#include "ProfileEnginePrivateCRKeys.h"
+#include "ProfileEngUtils.h"
#include <centralrepository.h>
#include <bautils.h>
#include <barsc.h>
#include <ProfileEng.rsg>
-#include "ProfileEng.hrh"
-#include "ProfileEngineConstants.h"
-#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfileEngUtils.h"
+#include <ProfileEng.hrh>
+#include <ProfileEngineConstants.h>
// EXTERNAL DATA STRUCTURES
// EXTERNAL FUNCTION PROTOTYPES
--- a/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilePresenceImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -22,8 +22,8 @@
// INCLUDES
#include <e32base.h>
-#include "MProfilePresence.h"
-#include "MProfileSetPresence.h"
+#include <MProfilePresence.h>
+#include <MProfileSetPresence.h>
// CONSTANTS
// MACROS
--- a/profilesservices/ProfileEngine/EngSrc/CProfilePttSettingsImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilePttSettingsImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,9 +19,9 @@
// INCLUDE FILES
#include "CProfilePttSettingsImpl.h"
-#include <centralrepository.h>
#include "ProfileEngUtils.h"
#include "ProfileEnginePrivateCRKeys.h"
+#include <centralrepository.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/EngSrc/CProfilePttSettingsImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilePttSettingsImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <MProfilePttSettings.h>
-#include "MProfileSetPttSettings.h"
+#include <MProfileSetPttSettings.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTiming.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTiming.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -18,14 +18,14 @@
// INCLUDE FILES
-#include "CProfileTiming.h"
+#include "CProfileTiming.h"
+#include "ProfileEnginePrivateCRKeys.h"
+#include "ProfilesDebug.h"
#include <ProfilesVariant.hrh>
#include <f32file.h> // TParse
#include <data_caging_path_literals.hrh>
-#include "MProfilesLocalFeatures.h"
-#include "ProfileEngineConstants.h"
-#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfilesDebug.h"
+#include <MProfilesLocalFeatures.h>
+#include <ProfileEngineConstants.h>
// LOCAL CONSTANTS AND MACROS
namespace
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,10 +19,11 @@
// INCLUDE FILES
#include "CProfileTonesImpl.h"
+#include "ProfileEngUtils.h"
+#include "ProfileEnginePrivateCRKeys.h"
+
#include <s32strm.h>
#include <centralrepository.h>
-#include "ProfileEngUtils.h"
-#include "ProfileEnginePrivateCRKeys.h"
#include <hwrmvibrasdkcrkeys.h>
#include <psmsettings.h>
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -24,7 +24,7 @@
#include <e32base.h>
#include <MProfileTones.h>
#include <TProfileToneSettings.h>
-#include "MProfileSetTones.h"
+#include <MProfileSetTones.h>
// FORWARD DECLARATIONS
class RWriteStream;
--- a/profilesservices/ProfileEngine/EngSrc/CProfileUtilitySingletonImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileUtilitySingletonImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,9 +19,9 @@
// INCLUDE FILES
#include "CProfileUtilitySingletonImpl.h"
-#include "MProfilesLocalFeatures.h"
#include "CProfilesLocalFeatures.h"
#include "ProfilesDebug.h"
+#include <MProfilesLocalFeatures.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/EngSrc/CProfileUtilitySingletonImpl.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileUtilitySingletonImpl.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
-#include "MProfileUtilitySingleton.h"
+#include <MProfileUtilitySingleton.h>
// FORWARD DECLARATIONS
class MProfilesLocalFeatures;
--- a/profilesservices/ProfileEngine/EngSrc/CProfilesLocalFeatures.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilesLocalFeatures.h Thu Apr 01 03:23:37 2010 +0800
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
-#include "MProfilesLocalFeatures.h"
+#include <MProfilesLocalFeatures.h>
// FORWARD DECLARATIONS
class CRepository;
--- a/profilesservices/ProfileEngine/EngSrc/CProfilesNamesArrayImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfilesNamesArrayImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,12 +19,12 @@
// INCLUDE FILES
#include "CProfilesNamesArrayImpl.h"
+#include "CProfileNameImpl.h"
+#include "ProfileEngPanic.h"
#include <collate.h>
#include <MProfilesNamesArray.h>
-#include "CProfileNameImpl.h"
-#include "ProfileEng.hrh"
-#include "ProfileEngPanic.h"
-#include "ProfileEngineConstants.h"
+#include <ProfileEng.hrh>
+#include <ProfileEngineConstants.h>
// LOCAL CONSTANTS AND MACROS
const TInt KProfileNamesGranularity( 5 );
--- a/profilesservices/ProfileEngine/EngSrc/ProfileEngUtils.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/ProfileEngUtils.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -20,7 +20,7 @@
// INCLUDE FILES
#include "ProfileEngUtils.h"
#include "CProfileEngineImpl.h"
-#include "ProfileEngineConstants.h"
+#include <ProfileEngineConstants.h>
#include <RSSSettings.h>
#include <centralrepository.h>
#include <bldvariant.hrh>
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,23 +19,16 @@
// INCLUDE FILES
#include "CProfileChangeEvent.h"
+#include "ProfileEnginePrivateCRKeys.h"
+#include "ProfilesDebug.h"
#include <e32svr.h>
#include <MProfileEngine.h>
-#include <AknGlobalNote.h>
#include <data_caging_path_literals.hrh>
#include <centralrepository.h>
-#include <barsc.h>
-#include <bautils.h>
-
-#include <SecondaryDisplay/SecondaryDisplayProfilesAPI.h>
-#include <aknSDData.h>
-#include <featmgr.h>
#include <ProfileScheduleEvent.rsg>
-#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfileEngineConstants.h"
-#include "ProfilesDebug.h"
+#include <ProfileEngineConstants.h>
// CONSTANTS
@@ -63,10 +56,6 @@
//
void CProfileChangeEvent::ConstructL()
{
- FeatureManager::InitializeLibL();
- iCoverDisplay = FeatureManager::FeatureSupported( KFeatureIdCoverDisplay );
-
-
User::LeaveIfError( iFs.Connect() );
// Open/Create mutex
TInt error( KErrNotFound );
@@ -81,7 +70,6 @@
}
User::LeaveIfError( error );
iProfileEngine = CreateProfileEngineL( &iFs );
- iGlobalNote = CAknGlobalNote::NewL();
ReadResourcesL();
}
@@ -117,16 +105,12 @@
// Destructor
CProfileChangeEvent::~CProfileChangeEvent()
{
- delete iNoteText;
- delete iGlobalNote;
if( iProfileEngine )
{
iProfileEngine->Release();
}
iFs.Close();
iMutex.Close();
-
- FeatureManager::UnInitializeLib();
}
@@ -202,15 +186,6 @@
//
void CProfileChangeEvent::ShowNoteL()
{
- PRODEBUG1( " CProfileChangeEvent:ShowNoteL(%S)", iNoteText );
- // Set secondary display data if cover ui is supported
- if ( iCoverDisplay )
- {
- CAknSDData* sd = CAknSDData::NewL(KCatProfiles,
- ECmdShowTimedProfileExpiryNote, KNullDesC8);
- iGlobalNote->SetSecondaryDisplayData( sd ); // ownership transferred
- }
- iGlobalNote->ShowNoteL( EAknGlobalConfirmationNote, *iNoteText );
}
// -----------------------------------------------------------------------------
@@ -220,35 +195,6 @@
//
void CProfileChangeEvent::ReadResourcesL()
{
- PRODEBUG( " CProfileChangeEvent:ReadResourcesL" );
- TParse* fp = new ( ELeave ) TParse();
- fp->Set( KProfileScheduleEventResourceDriveAndDir,
- &KDC_RESOURCE_FILES_DIR, NULL );
- iResourceFile.Copy( fp->FullName() );
- delete fp;
-
- PRODEBUG( " CProfileChangeEvent:ReadResourcesL 2" );
- BaflUtils::NearestLanguageFile( iFs, iResourceFile );
- PRODEBUG1( " CProfileChangeEvent:ReadResourcesL 3 iResourceFile=%S", &iResourceFile );
-
- RResourceFile resourceFile;
- resourceFile.OpenL( iFs, iResourceFile );
- CleanupClosePushL( resourceFile );
-
- PRODEBUG( " CProfileChangeEvent:ReadResourcesL 4" );
- resourceFile.ConfirmSignatureL();
- PRODEBUG( " CProfileChangeEvent:ReadResourcesL 5" );
-
- HBufC8* dataBuffer = resourceFile.AllocReadLC( R_PROFILES_CONFIRM_TIMED_EXPIRED );
-
- PRODEBUG( " CProfileChangeEvent:ReadResourcesL 6" );
- TResourceReader rsReader;
- rsReader.SetBuffer( dataBuffer );
- iNoteText = rsReader.ReadHBufCL();
- PRODEBUG( " CProfileChangeEvent:ReadResourcesL 7" );
-
- CleanupStack::PopAndDestroy( 2 ); // dataBuffer, resourceFile
- PRODEBUG( " CProfileChangeEvent:ReadResourcesL 8" );
}
// End of File
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.h Thu Apr 01 03:23:37 2010 +0800
@@ -27,7 +27,6 @@
// FORWARD DECLARATIONS
class MProfileEngine;
-class CAknGlobalNote;
// CLASS DECLARATION
@@ -111,26 +110,14 @@
// Own: Profiles Engine for profile activation
MProfileEngine* iProfileEngine;
- // Own: Global note to show the expiration conf. note to the user
- CAknGlobalNote* iGlobalNote;
-
- // Own: buffer for the confirmation note text
- HBufC* iNoteText;
-
// File server session needed for resource reading:
RFs iFs;
- // Used to store the resource file name
- TFileName iResourceFile;
-
// Mutex controlling access to profiles data
RMutex iMutex;
// The ID of the profile which should be reactivated
TInt iPreviousId;
-
- // Supported features
- TBool iCoverDisplay;
};
#endif // CPROFILECHANGEEVENT_H
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngActiveProfileDelegate.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngActiveProfileDelegate.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include "CProEngActiveProfileDelegate.h"
-#include "ProfileEnginePrivatePSKeys.h" // KProEngActiveProfileModified
+#include <ProfileEnginePrivatePSKeys.h> // KProEngActiveProfileModified
#include <MProEngActiveProfileObserver.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngAlertToneSeekerImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngAlertToneSeekerImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,6 +19,7 @@
// INCLUDE FILES
#include "CProEngAlertToneSeekerImpl.h"
+#include "CProEngPostFilter.h"
#include <MCLFItemListModel.h>
#include <MCLFContentListingEngine.h>
#include <MCLFItem.h>
@@ -26,7 +27,6 @@
#include <f32file.h> // RFs, TParse
#include <pathinfo.h>
#include <MProEngAlertToneSeekerObserver.h>
-#include "CProEngPostFilter.h"
namespace
{
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngCenRepObserverBase.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngCenRepObserverBase.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -20,8 +20,8 @@
// INCLUDE FILES
#include "CProEngCenRepObserverBase.h"
#include <centralrepository.h>
-#include "ProfileEnginePrivatePSKeys.h"
-#include "ProfileEngineSDKCRKeys.h"
+#include <ProfileEnginePrivatePSKeys.h>
+#include <ProfileEngineSDKCRKeys.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngEngineImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,14 +19,14 @@
// INCLUDE FILES
#include "CProEngEngineImpl.h"
+#include "CProEngProfileImpl.h"
+#include "CProEngToneHandler.h"
+#include "CProEngProfileNameArrayImpl.h"
#include <f32file.h>
#include <MProEngProfile.h>
#include <MProEngProfileNameArray.h>
-#include "MProfileEngineExtended.h"
-#include "ProfileEngineConstants.h"
-#include "CProEngProfileImpl.h"
-#include "CProEngToneHandler.h"
-#include "CProEngProfileNameArrayImpl.h"
+#include <MProfileEngineExtended.h>
+#include <ProfileEngineConstants.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngMediaVariation.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngMediaVariation.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,12 +19,12 @@
// INCLUDE FILES
#include "CProEngMediaVariation.h"
+#include "ProEngMmfInfoUtility.h"
#include <centralrepository.h>
#include <apgcli.h> // RApaLsSession
-#include "ProfileEngineInternalCRKeys.h"
-#include "ProEngMmfInfoUtility.h"
-#include "MProfileUtilitySingleton.h"
-#include "MProfilesLocalFeatures.h"
+#include <ProfileEngineInternalCRKeys.h>
+#include <MProfileUtilitySingleton.h>
+#include <MProfilesLocalFeatures.h>
namespace
{
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,17 +19,17 @@
// INCLUDE FILES
#include "CProEngNotifyHandlerImpl.h"
+#include "CProEngProfileActivationDelegate.h"
+#include "CProEngActiveProfileDelegate.h"
+#include "CProEngProfileNameArrayEventDelegate.h"
+#include "CProEngProfileEventDelegate.h"
+#include "ProfileEnginePrivateCRKeys.h"
#include <MProEngProfileActivationObserver.h>
#include <MProEngActiveProfileObserver.h>
#include <MProEngProfileObserver.h>
#include <MProEngProfileNameArrayObserver.h>
-#include "ProfileEngineConstants.h"
-#include "ProfileEnginePrivateCRKeys.h"
-#include "ProfileEnginePrivatePSKeys.h"
-#include "CProEngProfileActivationDelegate.h"
-#include "CProEngActiveProfileDelegate.h"
-#include "CProEngProfileNameArrayEventDelegate.h"
-#include "CProEngProfileEventDelegate.h"
+#include <ProfileEngineConstants.h>
+#include <ProfileEnginePrivatePSKeys.h>
// ============================= LOCAL FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileActivationDelegate.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileActivationDelegate.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -21,8 +21,8 @@
#include "CProEngProfileActivationDelegate.h"
#include <centralrepository.h>
#include <MProEngProfileActivationObserver.h>
-#include "ProfileEnginePrivatePSKeys.h" // KProEngActiveProfileChanged
-#include "ProfileEngineSDKCRKeys.h" // KCRUidProfileEngine etc.
+#include <ProfileEnginePrivatePSKeys.h> // KProEngActiveProfileChanged
+#include <ProfileEngineSDKCRKeys.h> // KCRUidProfileEngine etc.
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -23,10 +23,10 @@
#include "CProEngTonesImpl.h"
#include "CProEngToneSettingsImpl.h"
#include "CProEngEngineImpl.h"
-#include "MProfileExtended.h"
-#include "MProfileEngineExtended.h"
-#include "MProfileSetTones.h"
-#include "MProfileExtended.h"
+#include <MProfileExtended.h>
+#include <MProfileEngineExtended.h>
+#include <MProfileSetTones.h>
+#include <MProfileExtended.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileNameImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngProfileNameImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -21,7 +21,7 @@
#include "CProEngProfileNameImpl.h"
#include <MProfileName.h>
#include <MProEngProfileNameArray.h>
-#include "MProfileSetName.h"
+#include <MProfileSetName.h>
#include "CProEngEngineImpl.h"
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngPubSubObserverBase.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngPubSubObserverBase.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include "CProEngPubSubObserverBase.h"
-#include "ProfileEnginePrivatePSKeys.h"
+#include <ProfileEnginePrivatePSKeys.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,12 +19,11 @@
// INCLUDE FILES
#include "CProEngToneHandler.h"
+#include "CProEngMediaVariation.h"
#include <bautils.h> // BaflUtils
-#include <AknGlobalNote.h> // CAknGlobalNote
#include <barsread.h> // TResourceReader
#include <barsc.h> // RResourceFile
#include <e32const.h> // KKilo
-#include "CProEngMediaVariation.h"
#include <centralrepository.h>
#include <ProfileEngineDomainCRKeys.h> // KProEngRingingToneMaxSize
#include <ProfileEng.hrh>
@@ -210,29 +209,8 @@
// CProEngToneHandler::ShowErrorNoteL
// -----------------------------------------------------------------------------
//
-void CProEngToneHandler::ShowErrorNoteL( TInt aResourceId )
+void CProEngToneHandler::ShowErrorNoteL( TInt /*aResourceId*/ )
{
- TParse* fp = new(ELeave) TParse();
- fp->Set(KProEngResourceFileName, &KDC_RESOURCE_FILES_DIR, NULL);
- TFileName localizedFileName( fp->FullName() );
- delete fp;
-
- BaflUtils::NearestLanguageFile( iFs, localizedFileName );
-
- RResourceFile resourceFile;
- resourceFile.OpenL( iFs, localizedFileName );
- CleanupClosePushL( resourceFile );
- resourceFile.ConfirmSignatureL();
-
- HBufC8* resBuf = resourceFile.AllocReadLC( aResourceId );
- TResourceReader reader;
- reader.SetBuffer( resBuf );
- TPtrC errorText( reader.ReadTPtrC() );
-
- CAknGlobalNote* note = CAknGlobalNote::NewLC();
- note->ShowNoteL( EAknGlobalInformationNote, errorText );
-
- CleanupStack::PopAndDestroy( 3, &resourceFile );
}
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.h Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.h Thu Apr 01 03:23:37 2010 +0800
@@ -25,7 +25,7 @@
#include <f32file.h> // CBase, RFs
#include <apmstd.h> // KMaxDataTypeLength
#include <data_caging_path_literals.hrh>
-#include "ProfileEng.hrh" // TProfileSettingId
+#include <ProfileEng.hrh> // TProfileSettingId
// FORWARD DECLARATIONS
class DRMCommon;
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -21,9 +21,9 @@
#include "CProEngToneSettingsImpl.h"
#include <MProfileTones.h>
#include <MProfileExtraTones.h>
-#include "MProfileSetTones.h"
-#include "MProfileSetExtraTones.h"
-#include "MProfileExtended.h"
+#include <MProfileSetTones.h>
+#include <MProfileSetExtraTones.h>
+#include <MProfileExtended.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngTonesImpl.cpp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngTonesImpl.cpp Thu Apr 01 03:23:37 2010 +0800
@@ -19,13 +19,13 @@
// INCLUDE FILES
#include "CProEngTonesImpl.h"
+#include "CProEngToneHandler.h"
#include <MProfileTones.h>
#include <MProfileExtraTones.h>
-#include "MProfileSetTones.h"
-#include "MProfileSetExtraTones.h"
-#include "MProfileExtended.h"
-#include "CProEngToneHandler.h"
-#include "ProfileEng.hrh" // TProfileSettingId
+#include <MProfileSetTones.h>
+#include <MProfileSetExtraTones.h>
+#include <MProfileExtended.h>
+#include <ProfileEng.hrh> // TProfileSettingId
#include <pathinfo.h>
#include <ProfileEngineDomainConstants.h>
--- a/profilesservices/ProfileEngine/group/ProfileEngine.mmp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/group/ProfileEngine.mmp Thu Apr 01 03:23:37 2010 +0800
@@ -71,7 +71,6 @@
LIBRARY apgrfx.lib // RApaLSSession
LIBRARY apmime.lib // TDataType
LIBRARY efsrv.lib // RFs, TParse
-LIBRARY aknnotify.lib // CAknGlobalNote
LIBRARY PlatformEnv.lib // PathInfo
LIBRARY ContentListingFramework.lib
LIBRARY mmfcontrollerframework.lib
--- a/profilesservices/ProfileEngine/group/ProfileScheduleEvent.mmp Thu Apr 01 03:17:51 2010 +0800
+++ b/profilesservices/ProfileEngine/group/ProfileScheduleEvent.mmp Thu Apr 01 03:23:37 2010 +0800
@@ -48,8 +48,7 @@
LIBRARY profileeng.lib
LIBRARY bafl.lib
LIBRARY efsrv.lib
-LIBRARY aknnotify.lib // CAknGlobalNote
LIBRARY centralrepository.lib
-LIBRARY featmgr.lib
+LIBRARY featmgr.lib
