# HG changeset patch
# User hgs
# Date 1277701691 -19800
# Node ID aa22d2c19e576334cf41f88396f53d8f9518f339
# Parent  446dc0e90e84b19fff9f60d4133841929d46533d
201025

diff -r 446dc0e90e84 -r aa22d2c19e57 ftuapplication/ftuapplication.pro
--- a/ftuapplication/ftuapplication.pro	Fri Jun 11 13:29:51 2010 +0300
+++ b/ftuapplication/ftuapplication.pro	Mon Jun 28 10:38:11 2010 +0530
@@ -36,7 +36,7 @@
 
 CONFIG += hb    
 CONFIG += console
-
+#DEFINES += LOGGING
 nft:DEFINES += NFT
 
 DEPENDPATH += . \
diff -r 446dc0e90e84 -r aa22d2c19e57 ftuapplication/inc/ftufirsttimeuse.h
--- a/ftuapplication/inc/ftufirsttimeuse.h	Fri Jun 11 13:29:51 2010 +0300
+++ b/ftuapplication/inc/ftufirsttimeuse.h	Mon Jun 28 10:38:11 2010 +0530
@@ -23,6 +23,12 @@
 
 #include <QObject>
 
+#ifdef LOGGING
+#define QDEBUG(a)   qDebug() <<a
+#else
+#define QDEBUG(a)  
+#endif //LOGGING
+
 FTU_TEST_CLASS(FtuFirstTimeUseTest)
 
 class QStateMachine;
diff -r 446dc0e90e84 -r aa22d2c19e57 ftuapplication/src/ftufirsttimeuse.cpp
--- a/ftuapplication/src/ftufirsttimeuse.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/ftuapplication/src/ftufirsttimeuse.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -43,7 +43,7 @@
     QObject(aParent),
     mRuntime(NULL)
 {  
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::FtuFirstTimeUse");
+    QDEBUG("FTU::FtuFirstTimeUse::FtuFirstTimeUse");
     
     registerServicePlugins();
 
@@ -52,8 +52,8 @@
     QList<QServiceInterfaceDescriptor> interfaces = manager.findInterfaces(
                                                                     filter);
     
-    qDebug() << "ftu: found " << interfaces.count() 
-             << " instances of runtime";
+    QDEBUG("ftu: found " << interfaces.count() 
+             << " instances of runtime";)
     
     if(interfaces.count() > 0){
         mRuntime = (QStateMachine*)(manager.loadInterface(
@@ -69,7 +69,7 @@
         connect(mRuntime, SIGNAL(faulted()), SLOT(handleRuntimeFaulted()));    
     }
     
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::FtuFirstTimeUse");
+    QDEBUG("FTU::FtuFirstTimeUse::FtuFirstTimeUse");
      
 }
 
@@ -95,7 +95,7 @@
 //
 void FtuFirstTimeUse::start()
 {
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::start");
+    QDEBUG("FTU::FtuFirstTimeUse::start");
     
     if(mRuntime) {
         mRuntime->start();
@@ -103,7 +103,7 @@
         emit exit();
     }
     
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::start");
+    QDEBUG("FTU::FtuFirstTimeUse::start");
 }
 
 // ---------------------------------------------------------------------------
@@ -112,7 +112,7 @@
 //
 void FtuFirstTimeUse::stop()
 {
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::stop");
+    QDEBUG("FTU::FtuFirstTimeUse::stop");
     
     
     if (mRuntime && mRuntime->isRunning()) {
@@ -120,7 +120,7 @@
         }
 
     
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::stop");
+    QDEBUG("FTU::FtuFirstTimeUse::stop");
 }
 
 // ---------------------------------------------------------------------------
@@ -154,7 +154,7 @@
 //
 void FtuFirstTimeUse::registerServicePlugins()
 {
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::registerServicePlugins()");
+    QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins()");
     QStringList pluginPaths;
 
     pluginPaths << "fturesources/plugins";
@@ -176,7 +176,7 @@
             registerServicePlugins(pluginPath);
         }
     }
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::registerServicePlugins()");
+    QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins()");
 }
 
 // ---------------------------------------------------------------------------
@@ -185,8 +185,8 @@
 //
 void FtuFirstTimeUse::registerServicePlugins(const QString &root)
 {
-    FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::registerServicePlugins(const QString &)");
-    qDebug() << "FTU: root: " << root;
+    QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins(const QString &)");
+    QDEBUG("FTU: root: " << root;)
     QDir dir = QDir(root);
     QFileInfoList fileInfos = dir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot);
 
@@ -199,13 +199,13 @@
     if (!fileInfos.isEmpty()) {
         //Plugin dll and xml are in the same directory
         QApplication::addLibraryPath(root);
-        qDebug() << QString("FTU::FtuFirstTimeUse::registerServicePlugins - Directory added to application's library paths: ")
-                 << root;
+        QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins - Directory added to application's library paths: "
+                 << root;)
         QServiceManager manager;
         foreach(QFileInfo fileInfo, fileInfos) {
             manager.addService(fileInfo.absoluteFilePath());
-            qDebug() << QString("FTU::FtuFirstTimeUse::registerServicePlugins - Plugin registered: ") + fileInfo.fileName();
+            QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins - Plugin registered: " << fileInfo.fileName();)
         }
     }
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::registerServicePlugins(const QString &)");
+    QDEBUG("FTU::FtuFirstTimeUse::registerServicePlugins(const QString &)");
 }
diff -r 446dc0e90e84 -r aa22d2c19e57 ftuapplication/src/main.cpp
--- a/ftuapplication/src/main.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/ftuapplication/src/main.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -23,6 +23,8 @@
 #include <hbapplication.h>
 #include <QTranslator>
 #include <QLocale>
+#include <QTime>
+#include <QDebug>
 
 // ---------------------------------------------------------------------------
 // main
@@ -30,6 +32,7 @@
 //
 int main(int argc, char *argv[])
 {
+    QDEBUG(__FILE__<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
     FTUTEST_FUNC_ENTRY("FTU::FtuFirstTimeUse::main");
     
     HbApplication app(argc, argv);    
@@ -64,12 +67,14 @@
     QDir::setCurrent("Z:/");    
 #else
     QDir::setCurrent("C:/");
-    FTUDEBUG("main() - FtuApplication's current dir set to C:/");
+    QDEBUG("main() - FtuApplication's current dir set to C:/");
 #endif //ROM
     QObject::connect(&app,SIGNAL(aboutToQuit()),&ftuFirstTimeUse,SLOT(stop()));
     QObject::connect(&ftuFirstTimeUse, SIGNAL(exit()), &app, SLOT(quit()),Qt::QueuedConnection);    
     ftuFirstTimeUse.start();
     int ret = app.exec();
-    FTUTEST_FUNC_EXIT("FTU::FtuFirstTimeUse::main");
+    QDEBUG("FTU::FtuFirstTimeUse::main");
+    //Work around to make sure that ftu exits
+    User::Exit(0);
     return ret;       
 }
diff -r 446dc0e90e84 -r aa22d2c19e57 layers.sysdef.xml
--- a/layers.sysdef.xml	Fri Jun 11 13:29:51 2010 +0300
+++ b/layers.sysdef.xml	Mon Jun 28 10:38:11 2010 +0530
@@ -7,7 +7,7 @@
   <systemModel>
     <layer name="app_layer">
       <module name="firsttimeuse">
-        <unit name="firsttimeuse" unitID="orgdo.firsttimeuse.pro" bldFile="&layer_real_source_path;" mrp="" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
+        <unit name="firsttimeuse" unitID="orgdo.firsttimeuse.pro" bldFile="&layer_real_source_path;/internal/ovi/firsttimeuse" mrp="" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
       </module>
     </layer>
 
diff -r 446dc0e90e84 -r aa22d2c19e57 runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro
--- a/runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro	Fri Jun 11 13:29:51 2010 +0300
+++ b/runtimeproviders/ftudefaultruntimeprovider/ftudefaultruntimeprovider.pro	Mon Jun 28 10:38:11 2010 +0530
@@ -16,7 +16,6 @@
 
 TEMPLATE = lib
 
-
 symbian {
     CONFIG(debug, debug|release) {
         DESTDIR = debug
@@ -48,6 +47,7 @@
 QT += xml sql
 
 DEFINES += FTUDEFAULTRUNTIMEPROVIDER_LIB
+#DEFINES += LOGGING
 
 coverage:DEFINES += COVERAGE_MEASUREMENT
 
diff -r 446dc0e90e84 -r aa22d2c19e57 runtimeproviders/ftudefaultruntimeprovider/inc/ftudefaultruntime.h
--- a/runtimeproviders/ftudefaultruntimeprovider/inc/ftudefaultruntime.h	Fri Jun 11 13:29:51 2010 +0300
+++ b/runtimeproviders/ftudefaultruntimeprovider/inc/ftudefaultruntime.h	Mon Jun 28 10:38:11 2010 +0530
@@ -19,6 +19,13 @@
 #ifndef FTU_RUNTIMES_DEFAULTRUNTIME_H
 #define FTU_RUNTIMES_DEFAULTRUNTIME_H
 
+#ifdef LOGGING
+#define QDEBUG(a)   qDebug() <<a
+#else
+#define QDEBUG(a)  
+#endif //LOGGING
+
+
 #include "ftutest_global.h"
 #include <QHash>
 #include <QStateMachine>
diff -r 446dc0e90e84 -r aa22d2c19e57 runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp
--- a/runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -26,7 +26,7 @@
 #include <QState>
 #include <QFinalState>
 #include <QDebug>
-
+#include <QTime>
 #include <hbmainwindow.h>
 
 
@@ -98,7 +98,9 @@
 void FtuDefaultRuntime::createGuiServiceParts()
 {
     mWindow = new HbMainWindow();
+    QDEBUG("FtuDefaultRuntime Window created"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
     mWindow->show();
+    QDEBUG("FtuDefaultRuntime Window Shown"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
 }
 
 // ---------------------------------------------------------------------------
@@ -188,14 +190,14 @@
         foreach (const QVariant& service, services)
         {           
             QString name = service.toString();
-            qDebug() << "Assign service:" << name << "\n to " << state->objectName();
+            QDEBUG("Assign service:" << name << "\n to " << state->objectName();)
             if (name == FTU_CONTENT_SERVICE_KEY) 
             {
                 state->setProperty(name.toAscii().data(), qVariantFromValue(mFtuContentService));
             }
             else 
             {
-                qWarning() << "WARNING: Service " << name << " is unknown";
+                QDEBUG("WARNING: Service " << name << " is unknown";)
             }
         }
     }
diff -r 446dc0e90e84 -r aa22d2c19e57 sis/rd-key.pem
--- a/sis/rd-key.pem	Fri Jun 11 13:29:51 2010 +0300
+++ b/sis/rd-key.pem	Mon Jun 28 10:38:11 2010 +0530
@@ -1,15 +1,15 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
-6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
-7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
-gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
-pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
-yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
-KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
-iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
-2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
-9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
-aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
-TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
-mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
------END RSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
+6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
+7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
+gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
+pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
+yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
+KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
+iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
+2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
+9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
+aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
+TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
+mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
+-----END RSA PRIVATE KEY-----
diff -r 446dc0e90e84 -r aa22d2c19e57 sis/rd.cer
--- a/sis/rd.cer	Fri Jun 11 13:29:51 2010 +0300
+++ b/sis/rd.cer	Mon Jun 28 10:38:11 2010 +0530
@@ -1,17 +1,17 @@
------BEGIN CERTIFICATE-----
-MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
-NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
-cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
-rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
-gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
-f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
-BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
-IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
-IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
-IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
-CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
-Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
-7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
+ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
+NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
+cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
+rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
+gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
+f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
+BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
+IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
+ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
+IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
+IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
+CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
+Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
+7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
+-----END CERTIFICATE-----
diff -r 446dc0e90e84 -r aa22d2c19e57 stateproviders/ftustateprovider/ftustateprovider.pro
--- a/stateproviders/ftustateprovider/ftustateprovider.pro	Fri Jun 11 13:29:51 2010 +0300
+++ b/stateproviders/ftustateprovider/ftustateprovider.pro	Mon Jun 28 10:38:11 2010 +0530
@@ -17,7 +17,7 @@
 TEMPLATE = lib
 
 DEFINES += FTUSTATEPROVIDER_LIB
-
+#DEFINES += LOGGING
 
 symbian {
     CONFIG(debug, debug|release) {
diff -r 446dc0e90e84 -r aa22d2c19e57 stateproviders/ftustateprovider/inc/ftustateprovider_global.h
--- a/stateproviders/ftustateprovider/inc/ftustateprovider_global.h	Fri Jun 11 13:29:51 2010 +0300
+++ b/stateproviders/ftustateprovider/inc/ftustateprovider_global.h	Mon Jun 28 10:38:11 2010 +0530
@@ -32,4 +32,11 @@
     #endif	
 #endif
 
+#ifdef LOGGING
+#define QDEBUG(a)   qDebug() <<a
+#else
+#define QDEBUG(a)  
+#endif //LOGGING
+
+
 #endif // FTUSTATEPROVIDER_GLOBAL_H
diff -r 446dc0e90e84 -r aa22d2c19e57 stateproviders/ftustateprovider/src/ftustateprovider.cpp
--- a/stateproviders/ftustateprovider/src/ftustateprovider.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/stateproviders/ftustateprovider/src/ftustateprovider.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -21,7 +21,7 @@
 #include "ftuwizardmenustate.h"
 #include "ftuwizardloaderstate.h"
 #include "ftuwizardactivatedstate.h"
-
+#include "ftustateprovider_global.h"
 #include <QState>
 #include <QDebug>
 
@@ -57,7 +57,7 @@
         return new FtuWizardActivatedState();
     }
     else {
-        qDebug() << "FTU: No state found for uri: " << uri;
+        QDEBUG("FTU: No state found for uri: " << uri;)
         return NULL;
     }
 }
diff -r 446dc0e90e84 -r aa22d2c19e57 stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp
--- a/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -19,6 +19,7 @@
 #include "ftuwizardactivatedstate.h"
 #include "fturuntimeservices_global.h"
 #include "ftucontentservice.h"
+#include "ftustateprovider_global.h"
 #include <ftuwizard.h>
 
 #include <hbmainwindow.h>
@@ -113,7 +114,7 @@
 //
 void FtuWizardActivatedState::onEntry(QEvent *event)
 {
-    qDebug() << "ftu:FtuWizardActivatedState::onEntry";
+    QDEBUG("ftu:FtuWizardActivatedState::onEntry";)
     QState::onEntry(event);    
 
     int activeIndex = content()->activeWizard();
@@ -258,7 +259,7 @@
             // set wizard's widget as current widget
             mWizardStackedWidget->setCurrentWidget(viewWidget);
             
-            qDebug() << "Ftu: switching view due plugin view change";
+            QDEBUG("Ftu: switching view due plugin view change";)
             mainWindow()->setCurrentView(mPluginView, true);
             
             QList<FtuWizard*> wizards = content()->wizards();
diff -r 446dc0e90e84 -r aa22d2c19e57 stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp
--- a/stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -24,7 +24,7 @@
 #include "ftutest_global.h"
 #include "ftustatecenrephandler.h"
 #include <QDebug>
-
+#include <QTime>
 // ---------------------------------------------------------------------------
 // FtuWizardLoaderState::FtuWizardLoaderState
 // ---------------------------------------------------------------------------
@@ -51,7 +51,7 @@
 void FtuWizardLoaderState::addWizard(FtuWizard* wizard, bool success)
 {
     if(NULL!=wizard) {
-        qDebug() << "Wizard " << wizard->objectName() << " initialized with " << success;
+        QDEBUG("Wizard " << wizard->objectName() << " initialized with " << success;)
      }
     else {
        qFatal("void FtuWizardLoaderState::addWizard(FtuWizard* wizard, bool success): Null pointer argument wizard");
@@ -65,6 +65,7 @@
         disconnect(wizard, SIGNAL(wizardInitialized(FtuWizard*, bool)),
                    this, SLOT(addWizard(FtuWizard*, bool)));
     }
+    QDEBUG("FtuWizardLoaderState.cpp"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
 }
 
 // ---------------------------------------------------------------------------
diff -r 446dc0e90e84 -r aa22d2c19e57 stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp
--- a/stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -19,7 +19,7 @@
 #include "ftuwizardmenustate.h"
 #include "ftucontentservice.h"
 #include <ftuwizard.h>
-
+#include "ftustateprovider_global.h"
 #include <hbmainwindow.h>
 #include <hbview.h>
 #include <hblabel.h>
@@ -30,7 +30,7 @@
 
 #include <QStandardItemModel>
 #include <QDate>
-
+#include <QTime>
 #include <xqsettingsmanager.h>
 
 #include "ftustatecenrephandler.h"
@@ -38,8 +38,6 @@
 const int progressCompelete = 100;
 const char* emptyLine = " ";
 
-#define WMS_LOG qDebug() << "ftu:FtuWizardMenuState"
-
 const char *FTUSTATEPROVIDER_DOCML = ":/xml/ftustateprovider.docml";
 const char *TOC_VIEW = "tocView";
 const char *TOC_INFOTEXT_LABEL = "tocInfoTextLabel";
@@ -62,17 +60,14 @@
     mMainWindow = hbInstance->allMainWindows().at(0);
     mModel = new QStandardItemModel(this);
     
-    //TODO Read number of wizards supported and init the following list
-    //mCompletedWizardList << false << false << false << false << false <<false;
-
-	mDocumentLoader = new HbDocumentLoader();
+    mDocumentLoader = new HbDocumentLoader();
 	bool ok = false;
 	mDocumentLoader->load(FTUSTATEPROVIDER_DOCML, &ok);
 	QGraphicsWidget *widget = mDocumentLoader->findWidget(TOC_VIEW);
 	Q_ASSERT_X(ok && (widget != 0), "ftustateprovider", "invalid DocML file");
 	mTocView = qobject_cast<HbView*>(widget);
 
-    mTocView->setTitle(qtTrId("txt_ftu_title_setup"));
+	mTocView->setTitle(qtTrId("txt_long_caption_FTU_widget"));
 
 	mMainWindow->addView(mTocView);
     // Set as initial view.
@@ -105,7 +100,7 @@
 //
 void FtuWizardMenuState::onEntry(QEvent *event)
 {    
-    WMS_LOG << "::onEntry";
+    QDEBUG("FtuWizardMenuState::onEntry";)
     QState::onEntry(event);
 
     if(!mInfoText)
@@ -171,7 +166,8 @@
 //
 void FtuWizardMenuState::addWizardToListModel(int aIndex)
 {    
-    WMS_LOG << "::addWizardToListModel idx : " << aIndex;
+
+    QDEBUG("FtuWizardMenuState::addWizardToListModel idx : " << aIndex;)
     FtuContentService* ftuContentService = content();
 
     FtuWizard* addedWizard = ftuContentService->wizard(aIndex);
@@ -181,9 +177,13 @@
         connect(addedWizard, SIGNAL(progressUpdated(FtuWizard *, bool, int)), 
                 this, SLOT(updateProgress(FtuWizard *, bool, int)));
 
-    	const FtuWizardSetting& settings = addedWizard->wizardSettings();
-	    QStandardItem* newItem = new QStandardItem();
-	    HbIcon icon (settings.mTocDefaultIcon.absoluteFilePath());
+        const FtuWizardSetting& settings = addedWizard->wizardSettings();
+        QStandardItem* newItem = new QStandardItem();
+        QList<QVariant> iconList;
+        HbIcon icon (settings.mTocDefaultIcon.filePath() );
+        iconList.append(icon);
+        HbIcon rightIcon(QString(qtTrId("qtg_small_tick")));
+        
         QStringList data;
         data << settings.mTocLabel;
         QDate date = addedWizard->wizardCompletedDate();
@@ -193,11 +193,12 @@
         }
         else
         {
+            //Plugin has already completed, Append tick mark on right side
+            iconList.append(rightIcon);
             data << updatedAsString(date);
         }
 
-        //newItem->setBackground(QBrush(Qt::lightGray));
-        newItem->setData(icon, Qt::DecorationRole);
+        newItem->setData(iconList, Qt::DecorationRole);
         newItem->setData(QVariant(data), Qt::DisplayRole);
 
         mModel->appendRow(newItem);        
@@ -220,6 +221,7 @@
                 SLOT(activateWizard(const QModelIndex)));
 
         mListView->setModel(mModel);
+        QDEBUG("FtuWizardMenuState.cpp Model is set"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
     }
 }
 
@@ -230,7 +232,7 @@
 void FtuWizardMenuState::createInfoText()
 {
     mInfoText = qobject_cast<HbLabel *>(mDocumentLoader->findWidget(TOC_INFOTEXT_LABEL));                               
-    mInfoText->setPlainText(qtTrId("txt_ftu_subtitle_toc"));
+    mInfoText->setPlainText(qtTrId("txt_ftu_subhead_select_setting_you_want_to_edit"));
 }
 
 // ---------------------------------------------------------------------------
@@ -265,14 +267,18 @@
     {
         if(caller == wizards[i])
         {
-            WMS_LOG << "::updateProgress wizard found at: " << i;
+            QDEBUG("::updateProgress wizard found at: " << i;)
             index = i;
         }
     }
     if(index != -1)
     {  
         QStringList data;
-        data << wizards[index]->wizardSettings().mTocLabel;           
+        data << wizards[index]->wizardSettings().mTocLabel;
+        QList<QVariant> iconList;
+        HbIcon icon (wizards[index]->wizardSettings().mTocDefaultIcon.filePath());
+        iconList.append(icon);
+        HbIcon rightIcon(QString(qtTrId("qtg_small_tick")));
         
         if(progress < progressCompelete)
         {
@@ -285,7 +291,10 @@
         else
         {         
             QDate date = wizards[index]->wizardCompletedDate();
-            data << updatedAsString(date);            
+            data << updatedAsString(date);
+
+            //Plugin has completed 100%, Append tick mark on right side
+            iconList.append(rightIcon);
 
             XQSettingsManager settingsManager;
             
@@ -297,5 +306,6 @@
 
         }
         mModel->item(index)->setData(QVariant(data), Qt::DisplayRole);
+        mModel->item(index)->setData(iconList, Qt::DecorationRole);
     }
 }
diff -r 446dc0e90e84 -r aa22d2c19e57 translations/FTU_textmap_10_1.xls
Binary file translations/FTU_textmap_10_1.xls has changed
diff -r 446dc0e90e84 -r aa22d2c19e57 translations/FTU_textmap_10_1_v4_edit.xls
Binary file translations/FTU_textmap_10_1_v4_edit.xls has changed
diff -r 446dc0e90e84 -r aa22d2c19e57 translations/ftu_en.ts
--- a/translations/ftu_en.ts	Fri Jun 11 13:29:51 2010 +0300
+++ b/translations/ftu_en.ts	Mon Jun 28 10:38:11 2010 +0530
@@ -1,315 +1,485 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="3.0" language="en_GB" sourcelanguage="en_GB">
+<TS version="3.0" sourcelanguage="en_GB">
 <context>
+<message numerus="no" id="txt_ftu_dblist_from_old_phone_val_via_bluetooth">
+    <comment>Secondary value for double list 10, and appears if the user has not done any import for old phone from this application before</comment>        
+    <source>via bluetooth</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic_add</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_sim_card_val_importing">
+    <comment>Inprogress indication shown in the sencond row of the db 11, which say the the sim contacts are being imported and not finshed yet</comment>        
+    <source>Importing</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_nokia_account_setup_val_and_enjoy_o">
+    <comment>Secondary Row text for Setup Item&quot;Setup Nokia account&quot;. The secondary is only descriptive of what the Setup Item will provide</comment>        
+    <source>And Enjoy Ovi services</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_13</extra-loc-viewid>
+    <extra-loc-positionid>dblist_7_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_time_date_location">
+    <comment>TOC item, setting in sync with control panel´s settings</comment>        
+    <source>Time, date and location</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_subhead_import_from_ovi">
+    <comment>Subheading as a status of current status of import</comment>        
+    <source>Import from OVI </source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_23</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_grid_import_data">
+    <comment>menustrip item</comment>        
+    <source>Import data</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_10</extra-loc-viewid>
+    <extra-loc-positionid>grid </extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_activate_sync_for_future_use">
+    <comment>It’s a list with a check box</comment>        
+    <source>Synchronize  my data  automatically in future</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_checkbox_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_25</extra-loc-viewid>
+    <extra-loc-positionid>List</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dialog_button_no">
+    <comment></comment>        
+    <source>no</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_08</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_subhead_select_setting_you_want_to_edit">
+    <comment>Subheading for one of the module of FTU</comment>        
+    <source>Select what you want to do </source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_13</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_nokia_account_setup">
+    <comment>First row of the Double list, with large Icon and can have a seondary ICon</comment>        
+    <source>Nokia Account Setup</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_13</extra-loc-viewid>
+    <extra-loc-positionid>dblist_7</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_old_phone_ovi_val_importing_from_1">
+    <comment>Where %1 the user name for OVI or the BT name of the phone where the data is being imported</comment>        
+    <source>Importing from %1</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_source_val_imported_on_2">
+    <comment>The Secondary text &apos;imported on %2&apos;. Wherer  %2 is the date  (formatted as system date): ex Imported on 23.09.10</comment>        
+    <source>Imported on %2</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_grid_im ">
+    <comment>menustrip item</comment>        
+    <source>Instant messaging</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_10</extra-loc-viewid>
+    <extra-loc-positionid>grid </extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_ovi">
+    <comment>Primary text in double row list that might /might not have a additional secondary Icon .List is predefined in the device, to import data form OVI</comment>        
+    <source>From Ovi</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic_add</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_9</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_subhead_import_contacts_personal_data">
+    <comment>subhead : instuctional text asking the source for importing data from</comment>        
+    <source>Import contacts &amp; personal data </source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_info_terms_of_use">
+    <comment>placeholder, correct text from services later</comment>        
+    <source>&lt;terms of use&gt;</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_07</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_source_val_imported_at_1">
+    <comment>The Secondary text &apos;, &apos;imported at %1&apos;, . Wherer %1 is the time (formatted as system time) when data was imported.example: imported at 12:00 </comment>        
+    <source>Imported at %1 </source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_grid_style">
+    <comment>menustrip item</comment>        
+    <source>Style of phone</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_10</extra-loc-viewid>
+    <extra-loc-positionid>grid </extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_grid_social_networks">
+    <comment>menustrip item</comment>        
+    <source>Social media</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_10</extra-loc-viewid>
+    <extra-loc-positionid>grid </extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_title_setup">
+    <comment>Title shown in all FTU views, excluding videos&amp; pin code query</comment>        
+    <source>Setup</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_update_date">
+    <comment>TOC item, second row, tells last time user has edited plugin/module, where U is the date</comment>        
+    <source>updated %1</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_ovi_val_contacts_caledars_no">
+    <comment>Seconday list value, displayes the contents that start importing from OVI once the user chooses this list pootion</comment>        
+    <source>Contacts caledars &amp; Notes</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_9_val</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_subtitle_toc">
+    <comment>text hints what user can do with the the Table Of Concents (TOC) items</comment>        
+    <source>Select setting you want to edit</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_old_phone">
+    <comment>Primary text in double row list that might /might not have a additional secondary Icon .Import from phone, triggers the process to import data from another Nokia Device</comment>        
+    <source>From old phone</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic_add</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_10</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_ftu_info_sign_to_tips">
     <comment>markable setting item: marked or unmarked , shown only in some marketing areas</comment>        
     <source>Sign up for tips &amp; tricks</source>
-    <translation variants="no">Sign up for tips &amp; tricks</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_07</extra-loc-viewid>
     <extra-loc-positionid>setlabel</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_import_Data">
-    <comment>TOC item, data sync </comment>        
-    <source>Import data</source>
-    <translation variants="no">Import data</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>list item</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_button_accept">
     <comment>related to terms of use below</comment>        
     <source>Accept</source>
-    <translation variants="no">Accept</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_07</extra-loc-viewid>
     <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_import_Data">
+    <comment>TOC item, data sync </comment>        
+    <source>Import data</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>list item</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dblist_from_sim_card">
+    <comment>Primary text in double row list that might /might not have a additional secondary Icon .Import from SIM triggers the process to import data from another Nokia SIM</comment>        
+    <source>From SIM card</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic_add</extra-loc-layout_id>    
+    <extra-loc-viewid>FTU_15</extra-loc-viewid>
+    <extra-loc-positionid>dblist_11</extra-loc-positionid>
+    <extra-loc-feature>FTU</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_long_caption_FTU_widget">
+    <comment>Parent Custom Layout Parent.Primary text for Ftu widget (list) on home screen </comment>        
+    <source>Setup your device</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_long_caption_FTU_widget</extra-loc-layout_id>    
+    <extra-loc-viewid>FTUwidget_14</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>FTUwidget</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_grid_email">
     <comment>menustrip item</comment>        
     <source>Email accounts</source>
-    <translation variants="no">Email accounts</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_10</extra-loc-viewid>
     <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_time_date_location">
-    <comment>TOC item, setting in sync with control panel´s settings</comment>        
-    <source>Time, date and location</source>
-    <translation variants="no">Time, date and location</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_grid_import_data">
-    <comment>menustrip item</comment>        
-    <source>Import data</source>
-    <translation variants="no">Import data</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_10</extra-loc-viewid>
-    <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_email">
     <comment>TOC item, email account creation</comment>        
     <source>Email accounts</source>
-    <translation variants="no">Email accounts</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_im ">
     <comment>TOC item, IM account creation</comment>        
     <source>Instant messaging</source>
-    <translation variants="no">Instant messaging</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_dialog_button_no">
-    <comment></comment>        
-    <source>no</source>
-    <translation variants="no">no</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_08</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_grid_time_data_location">
     <comment>menustrip item</comment>        
     <source>time, date&amp; location</source>
-    <translation variants="no">time, date&amp; location</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_10</extra-loc-viewid>
     <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_dialog_settings_found_later">
     <comment>info text that user can find settings later, dialog view</comment>        
     <source>You can find later link to setup from your home screen. </source>
-    <translation variants="no">You can find later link to setup from your home screen. </translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_08</extra-loc-viewid>
     <extra-loc-positionid>info</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_subtitle_terms_of_use">
     <comment>subtitle hints to the view</comment>        
     <source>Please read terms of use and accept to continue</source>
-    <translation variants="no">Please read terms of use and accept to continue</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_07</extra-loc-viewid>
     <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_dialog_settings_now_or_later">
+    <comment>info text for user choices, related to buttons below, dialog view</comment>        
+    <source>Do you want to do start up settings now (recommended)?</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_08</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_update_today">
     <comment>TOC item, second row, tells last time user has edited plugin/module, shown only if the update has been today</comment>        
     <source>updated today</source>
-    <translation variants="no">updated today</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>dblist_val</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_dialog_settings_now_or_later">
-    <comment>info text for user choices, related to buttons below, dialog view</comment>        
-    <source>Do you want to do start up settings now (recommended)?</source>
-    <translation variants="no">Do you want to do start up settings now (recommended)?</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_08</extra-loc-viewid>
-    <extra-loc-positionid>info</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_mycard">
-    <comment>TOC item, sync with the Phonebook mycard</comment>        
-    <source>My contact card</source>
-    <translation variants="no">My contact card</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>list item</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_dialog_button_yes">
     <comment></comment>        
     <source>yes</source>
-    <translation variants="no">yes</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_08</extra-loc-viewid>
     <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_mycard">
+    <comment>TOC item, sync with the Phonebook mycard</comment>        
+    <source>My contact card</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>list item</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_grid_importing ">
     <comment>menustrip item</comment>        
     <source>Importing…</source>
-    <translation variants="no">Importing…</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_10</extra-loc-viewid>
     <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_grid_im ">
-    <comment>menustrip item</comment>        
-    <source>Instant messaging</source>
-    <translation variants="no">Instant messaging</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_10</extra-loc-viewid>
-    <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_importing_data">
     <comment>TOC item, data sync list item, where U is the source where the data is imported in to the phone (e.g. name of the PC or phone)</comment>        
     <source>Import data from %1</source>
-    <translation variants="no">Import data from %1</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>list item</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_info_terms_of_use">
-    <comment>placeholder, correct text from services later</comment>        
-    <source>&lt;terms of use&gt;</source>
-    <translation variants="no">&lt;terms of use&gt;</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_07</extra-loc-viewid>
-    <extra-loc-positionid>info</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_grid_style">
-    <comment>menustrip item</comment>        
-    <source>Style of phone</source>
-    <translation variants="no">Style of phone</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_10</extra-loc-viewid>
-    <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_grid_social_networks">
-    <comment>menustrip item</comment>        
-    <source>Social media</source>
-    <translation variants="no">Social media</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_10</extra-loc-viewid>
-    <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_grid_mycard">
     <comment>menustrip item, these items open same stuff as TOC items </comment>        
     <source>My contact card</source>
-    <translation variants="no">My contact card</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_10</extra-loc-viewid>
     <extra-loc-positionid>grid </extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_title_setup">
-    <comment>Title shown in all FTU views, excluding videos&amp; pin code query</comment>        
-    <source>Setup</source>
-    <translation variants="no">Setup</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_progress_status">
-    <comment>TOC item, second row, tells the status of the user initiated progress (data sync from source x)</comment>        
-    <source>%1% done…</source>
-    <translation variants="no">%1% done…</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>dblist_val</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_update_date">
-    <comment>TOC item, second row, tells last time user has edited plugin/module, where U is the date</comment>        
-    <source>updated %1</source>
-    <translation variants="no">updated %1</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>dblist_val</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_info_set_language">
     <comment>info text for language selection, uses main view</comment>        
     <source>Set your phone language:</source>
-    <translation variants="no">Set your phone language:</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_06</extra-loc-viewid>
     <extra-loc-positionid>setlabel</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_ftu_list_progress_status">
+    <comment>TOC item, second row, tells the status of the user initiated progress (data sync from source x)</comment>        
+    <source>%1% done…</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>ftu_09</extra-loc-viewid>
+    <extra-loc-positionid>dblist_val</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_tsw_caption_setup_your_device">
+    <comment>Name in task switcher</comment>        
+    <source>Setup your device</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_grid_taskswitcher_tiny_setup</extra-loc-layout_id>    
+    <extra-loc-viewid>tsw_01</extra-loc-viewid>
+    <extra-loc-positionid>caption</extra-loc-positionid>
+    <extra-loc-feature>tsw</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_list_style">
     <comment>TOC item, main phone style settings (ringing tone, wallpaper, theme)</comment>        
     <source>Style of phone</source>
-    <translation variants="no">Style of phone</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
     <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_ftu_subtitle_toc">
-    <comment>text hints what user can do with the the Table Of Concents (TOC) items</comment>        
-    <source>Select setting you want to edit</source>
-    <translation variants="no">Select setting you want to edit</translation>
+<message numerus="no" id="txt_ftu_list_social_networks">
+    <comment>TOC item, SM account creation (facebook etc) </comment>        
+    <source>Social media</source>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-positionid>dblist</extra-loc-positionid>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_ftu_subtitle_change_language">
     <comment>info text to user´s choices, uses main view</comment>        
     <source>Select language you want to use</source>
-    <translation variants="no">Select language you want to use</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id></extra-loc-layout_id>    
     <extra-loc-viewid>ftu_06</extra-loc-viewid>
     <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_ftu_list_social_networks">
-    <comment>TOC item, SM account creation (facebook etc) </comment>        
-    <source>Social media</source>
-    <translation variants="no">Social media</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>ftu_09</extra-loc-viewid>
-    <extra-loc-positionid>dblist</extra-loc-positionid>
-    <extra-loc-feature>ft</extra-loc-feature>
+    <extra-loc-feature>ftu</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 </context>
diff -r 446dc0e90e84 -r aa22d2c19e57 translations/ftu_en_GB.qm
Binary file translations/ftu_en_GB.qm has changed
diff -r 446dc0e90e84 -r aa22d2c19e57 translations/ftu_en_US.qm
Binary file translations/ftu_en_US.qm has changed
diff -r 446dc0e90e84 -r aa22d2c19e57 wizardproviders/ftuwizardprovider/conf/ftuwizardprovider.confml
--- a/wizardproviders/ftuwizardprovider/conf/ftuwizardprovider.confml	Fri Jun 11 13:29:51 2010 +0300
+++ b/wizardproviders/ftuwizardprovider/conf/ftuwizardprovider.confml	Mon Jun 28 10:38:11 2010 +0530
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration xmlns="http://www.s60.com/xml/confml/1" name="FtuWizardConfiguration" version="1">
-  <feature ref="KCrUidFtuWizardProvider" name="First Time Use Wizard Plugins">
-    <desc>Defines which FTU Wizards are displayed when application is run.</desc>
-    <setting ref="KFtuNumberOfWizardPlugins" name="Number of Ftu Wizard Plugins" type="int">
-      <desc>Configures how many ftu plug-ins will be loaded. List plug-ins below. The value of a single key is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder1" name="Undefined 1" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder2" name="Undefined 2" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder3" name="Undefined 3" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder4" name="Undefined 4" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder5" name="Undefined 5" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder6" name="Undefined 6" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder7" name="Undefined 7" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder8" name="Undefined 8" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder9" name="Undefined 9" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder10" name="Undefined 10" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder11" name="Undefined 11" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder12" name="Undefined 12" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder13" name="Undefined 13" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder14" name="Undefined 14" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-    <setting ref="KFtuWizardPluginPlaceholder15" name="Undefined 15" type="string">
-      <desc>Value is the interface identifier in literal format.</desc>
-    </setting>
-  </feature>
-  <data>
-    <KCrUidFtuWizardProvider>
-      <KFtuNumberOfWizardPlugins>1</KFtuNumberOfWizardPlugins>
-      <KFtuWizardPluginPlaceholder1>dataimportftuwizard.manifest</KFtuWizardPluginPlaceholder1>
-      <KFtuWizardPluginPlaceholder2></KFtuWizardPluginPlaceholder2>
-      <KFtuWizardPluginPlaceholder3></KFtuWizardPluginPlaceholder3>
-      <KFtuWizardPluginPlaceholder4></KFtuWizardPluginPlaceholder4>
-      <KFtuWizardPluginPlaceholder5></KFtuWizardPluginPlaceholder5>
-      <KFtuWizardPluginPlaceholder6></KFtuWizardPluginPlaceholder6>
-      <KFtuWizardPluginPlaceholder7></KFtuWizardPluginPlaceholder7>
-      <KFtuWizardPluginPlaceholder8></KFtuWizardPluginPlaceholder8>
-      <KFtuWizardPluginPlaceholder9></KFtuWizardPluginPlaceholder9>
-      <KFtuWizardPluginPlaceholder10></KFtuWizardPluginPlaceholder10>
-      <KFtuWizardPluginPlaceholder11></KFtuWizardPluginPlaceholder11>
-      <KFtuWizardPluginPlaceholder12></KFtuWizardPluginPlaceholder12>
-      <KFtuWizardPluginPlaceholder13></KFtuWizardPluginPlaceholder13>
-      <KFtuWizardPluginPlaceholder14></KFtuWizardPluginPlaceholder14>
-      <KFtuWizardPluginPlaceholder15></KFtuWizardPluginPlaceholder15>
-    </KCrUidFtuWizardProvider>
-  </data>
-</configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="http://www.s60.com/xml/confml/1" name="FtuWizardConfiguration" version="1">
+  <feature ref="KCrUidFtuWizardProvider" name="First Time Use Wizard Plugins">
+    <desc>Defines which FTU Wizards are displayed when application is run.</desc>
+    <setting ref="KFtuNumberOfWizardPlugins" name="Number of Ftu Wizard Plugins" type="int">
+      <desc>Configures how many ftu plug-ins will be loaded. List plug-ins below. The value of a single key is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder1" name="Undefined 1" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder2" name="Undefined 2" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder3" name="Undefined 3" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder4" name="Undefined 4" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder5" name="Undefined 5" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder6" name="Undefined 6" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder7" name="Undefined 7" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder8" name="Undefined 8" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder9" name="Undefined 9" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder10" name="Undefined 10" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder11" name="Undefined 11" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder12" name="Undefined 12" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder13" name="Undefined 13" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder14" name="Undefined 14" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+    <setting ref="KFtuWizardPluginPlaceholder15" name="Undefined 15" type="string">
+      <desc>Value is the interface identifier in literal format.</desc>
+    </setting>
+  </feature>
+  <data>
+    <KCrUidFtuWizardProvider>
+      <KFtuNumberOfWizardPlugins>2</KFtuNumberOfWizardPlugins>
+      <KFtuWizardPluginPlaceholder1>dataimportftuwizard.manifest</KFtuWizardPluginPlaceholder1>
+      <KFtuWizardPluginPlaceholder2>ftuemailwizardplugin.manifest</KFtuWizardPluginPlaceholder2>
+      <KFtuWizardPluginPlaceholder3></KFtuWizardPluginPlaceholder3>
+      <KFtuWizardPluginPlaceholder4></KFtuWizardPluginPlaceholder4>
+      <KFtuWizardPluginPlaceholder5></KFtuWizardPluginPlaceholder5>
+      <KFtuWizardPluginPlaceholder6></KFtuWizardPluginPlaceholder6>
+      <KFtuWizardPluginPlaceholder7></KFtuWizardPluginPlaceholder7>
+      <KFtuWizardPluginPlaceholder8></KFtuWizardPluginPlaceholder8>
+      <KFtuWizardPluginPlaceholder9></KFtuWizardPluginPlaceholder9>
+      <KFtuWizardPluginPlaceholder10></KFtuWizardPluginPlaceholder10>
+      <KFtuWizardPluginPlaceholder11></KFtuWizardPluginPlaceholder11>
+      <KFtuWizardPluginPlaceholder12></KFtuWizardPluginPlaceholder12>
+      <KFtuWizardPluginPlaceholder13></KFtuWizardPluginPlaceholder13>
+      <KFtuWizardPluginPlaceholder14></KFtuWizardPluginPlaceholder14>
+      <KFtuWizardPluginPlaceholder15></KFtuWizardPluginPlaceholder15>
+    </KCrUidFtuWizardProvider>
+  </data>
+</configuration>
diff -r 446dc0e90e84 -r aa22d2c19e57 wizardproviders/ftuwizardprovider/ftuwizardprovider.pro
--- a/wizardproviders/ftuwizardprovider/ftuwizardprovider.pro	Fri Jun 11 13:29:51 2010 +0300
+++ b/wizardproviders/ftuwizardprovider/ftuwizardprovider.pro	Mon Jun 28 10:38:11 2010 +0530
@@ -22,6 +22,7 @@
 
 
 DEFINES += FTUWIZARDPROVIDER_LIB
+#DEFINES += LOGGING
 
 win32 {
     CONFIG(debug, debug|release) {
diff -r 446dc0e90e84 -r aa22d2c19e57 wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h
--- a/wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h	Fri Jun 11 13:29:51 2010 +0300
+++ b/wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h	Mon Jun 28 10:38:11 2010 +0530
@@ -32,5 +32,11 @@
     #endif	
 #endif
 
+#ifdef LOGGING
+#define QDEBUG(a)   qDebug() <<a
+#else
+#define QDEBUG(a)  
+#endif //LOGGING
+
 
 #endif // FTUWIZARDPROVIDER_GLOBAL
diff -r 446dc0e90e84 -r aa22d2c19e57 wizardproviders/ftuwizardprovider/src/ftumanifestparser.cpp
--- a/wizardproviders/ftuwizardprovider/src/ftumanifestparser.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/wizardproviders/ftuwizardprovider/src/ftumanifestparser.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -26,7 +26,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
-
+#include "ftuwizardprovider_global.h"
 #ifdef Q_OS_SYMBIAN
 
 #include <XQSettingsManager> // for reading cenrep keys
@@ -70,7 +70,7 @@
         QString path = driveLetter + manifestPath;
         if(QDir(path).exists())
         {
-            qDebug() << "ftu:: append to path list: " << path;
+            QDEBUG("ftu:: append to path list: " << path;)
             pathList << path;
         }
     }      
@@ -87,21 +87,21 @@
         dir.setNameFilters(filesToRead);
         QStringList entries = dir.entryList(filesToRead, QDir::Files);
     
-        qDebug() << "ftu: Configured manifest file count " 
+        QDEBUG("ftu: Configured manifest file count " 
                  << filesToRead.count()
-                 << " found manifest files from system " << entries.count();
+                 << " found manifest files from system " << entries.count();)
         
         // Go through the configured list and find the manifest files.
         for(int j=0; j < filesToRead.count() ; ++j)
         {
             int index = entries.indexOf(filesToRead[j]);
-            qDebug() << "ftu:reading manifest file from "<< index;
+            QDEBUG("ftu:reading manifest file from "<< index;)
             if(index > -1 && index <= entries.count())
             {
                 QString fileName = entries[index]; 
-                qDebug() << "ftu:: loading from manifest file: " << fileName;
+                QDEBUG("ftu:: loading from manifest file: " << fileName;)
                 QString path = loadFromXml(dir.absoluteFilePath(fileName));
-                qDebug() << "ftu:: path from manifest: " << path;
+                QDEBUG("ftu:: path from manifest: " << path;)
                 if(!path.isEmpty())
                 {
                     dllNameList << path;
@@ -132,13 +132,13 @@
     int numberOfPlugins = settingsManager->readItemValue(
                                               numberOfPluginsKey).toInt(&ok);
 
-    qDebug() << "Ftu:FtuManifestParser reading the nbr of plugins resulted: "
-             << ok;
+    QDEBUG("Ftu:FtuManifestParser reading the nbr of plugins resulted: "
+             << ok;)
     
     if(ok)
     {
-        qDebug() << "Ftu:reading config for " << numberOfPlugins 
-                 << " plugins";
+    QDEBUG("Ftu:reading config for " << numberOfPlugins 
+                 << " plugins";)
         
         
         for(int i=1; i <= numberOfPlugins ; ++i)
@@ -149,7 +149,7 @@
             
             QString file = settingsManager->readItemValue(fileKey, 
                                    XQSettingsManager::TypeString).toString();
-            qDebug() << "Ftu:Reading filename from conf :" << file;            
+            QDEBUG("Ftu:Reading filename from conf :" << file;)            
             filesFromConf << file;
         }
     }
@@ -172,12 +172,12 @@
 QString FtuManifestParser::loadFromXml(const QString& aFileName)
 {
 
-    qDebug() << "ftu:: ManifestParser::loadFromXml " << aFileName;
+    QDEBUG("ftu:: ManifestParser::loadFromXml " << aFileName;)
     QFile file(aFileName);
     
     if(!file.exists())
     {
-        qDebug() << "ftu: file does not exist";
+        QDEBUG("ftu: file does not exist";)
         return QString();
     }
 
@@ -190,7 +190,7 @@
     QDomElement element = document.documentElement();
     if(element.tagName() != "plugin")
     {
-        qDebug() << "ftu: Tag name plugin not found";
+        QDEBUG("ftu: Tag name plugin not found";)
         return QString();
     }
 
@@ -200,7 +200,7 @@
     {
         element = plugins.at(i).toElement();
         QString attr = parseAttribute(element, "library");
-        qDebug() << "ftu::parsed attr " << attr;
+        QDEBUG("ftu::parsed attr " << attr;)
         return attr;
     }
     return QString();
@@ -217,7 +217,7 @@
     QDomAttr attribute = element.attributeNode(attributeName);
     if(attribute.isNull() || attribute.value().isEmpty())
     {
-        qDebug() << "ftu: attribute not parsed [attr name]" << attributeName;
+        QDEBUG("ftu: attribute not parsed [attr name]" << attributeName;)
         return QString();
     }
 
diff -r 446dc0e90e84 -r aa22d2c19e57 wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp
--- a/wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp	Fri Jun 11 13:29:51 2010 +0300
+++ b/wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp	Mon Jun 28 10:38:11 2010 +0530
@@ -18,7 +18,7 @@
 
 #include "ftuwizardprovider.h"
 #include "ftumanifestparser.h"
-
+#include "ftuwizardprovider_global.h"
 #include <ftuwizardfactory.h>
 
 #include <QDebug>
@@ -109,8 +109,8 @@
     
     if(ok)
     {
-        qDebug() << "Ftu:reading config for " << numberOfPlugins 
-                 << " plugins";
+        QDEBUG("Ftu:reading config for " << numberOfPlugins 
+                 << " plugins";)
         
         
         for(int i=1; i <= numberOfPlugins ; ++i)
@@ -121,7 +121,7 @@
             
             QString interface = settingsManager.readItemValue(fileKey,
                                     XQSettingsManager::TypeString).toString();
-            qDebug() << "Ftu:Reading interface name from conf :" << interface;
+            QDEBUG("Ftu:Reading interface name from conf :" << interface;)
             QObject* obj = serviceManager->loadInterface(interface);
             if(obj)
             {
@@ -140,17 +140,17 @@
 #else
     foreach (QString filename, pluginList) 
     {
-        qDebug () << "Ftu: Loading instance from : "<< filename;
+        QDEBUG("Ftu: Loading instance from : "<< filename;)
         QPluginLoader loader(pluginsDir.absoluteFilePath(filename));
         QObject* instance = loader.instance();
         if(instance)
         {
-            qDebug() << "ftu: instance loaded";
+            QDEBUG("ftu: instance loaded";)
             FtuWizardFactory* factory = qobject_cast<FtuWizardFactory*>
                                                     (instance);
             if(factory)
             {
-                qDebug() << "ftu: appending factory to list";
+                QDEBUG("ftu: appending factory to list";)
                 plugins.append(factory);
             }
         }