# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1278414390 -10800 # Node ID 624e91e1e0299d38d45f0363132faf021bae82a3 # Parent 96bf8c13fa724d20ffedc4365f0e55dd0e5bd35d Revision: 201025 Kit: 2010127 diff -r 96bf8c13fa72 -r 624e91e1e029 ftuapplication/ftuapplication.pro --- a/ftuapplication/ftuapplication.pro Wed Jun 23 18:03:13 2010 +0300 +++ b/ftuapplication/ftuapplication.pro Tue Jul 06 14:06:30 2010 +0300 @@ -36,7 +36,7 @@ CONFIG += hb CONFIG += console - +#DEFINES += LOGGING nft:DEFINES += NFT DEPENDPATH += . \ diff -r 96bf8c13fa72 -r 624e91e1e029 ftuapplication/inc/ftufirsttimeuse.h --- a/ftuapplication/inc/ftufirsttimeuse.h Wed Jun 23 18:03:13 2010 +0300 +++ b/ftuapplication/inc/ftufirsttimeuse.h Tue Jul 06 14:06:30 2010 +0300 @@ -23,6 +23,12 @@ #include +#ifdef LOGGING +#define QDEBUG(a) qDebug() < 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 96bf8c13fa72 -r 624e91e1e029 ftuapplication/src/main.cpp --- a/ftuapplication/src/main.cpp Wed Jun 23 18:03:13 2010 +0300 +++ b/ftuapplication/src/main.cpp Tue Jul 06 14:06:30 2010 +0300 @@ -23,6 +23,8 @@ #include #include #include +#include +#include // --------------------------------------------------------------------------- // main @@ -30,6 +32,7 @@ // int main(int argc, char *argv[]) { + QDEBUG(__FILE__<<__FUNCTION__<<"~~~~~~~"< #include diff -r 96bf8c13fa72 -r 624e91e1e029 runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp --- a/runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp Wed Jun 23 18:03:13 2010 +0300 +++ b/runtimeproviders/ftudefaultruntimeprovider/src/ftudefaultruntime.cpp Tue Jul 06 14:06:30 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include - +#include #include @@ -98,7 +98,9 @@ void FtuDefaultRuntime::createGuiServiceParts() { mWindow = new HbMainWindow(); + QDEBUG("FtuDefaultRuntime Window created"<<__FUNCTION__<<"~~~~~~~"<show(); + QDEBUG("FtuDefaultRuntime Window Shown"<<__FUNCTION__<<"~~~~~~~"<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 96bf8c13fa72 -r 624e91e1e029 stateproviders/ftustateprovider/ftustateprovider.pro --- a/stateproviders/ftustateprovider/ftustateprovider.pro Wed Jun 23 18:03:13 2010 +0300 +++ b/stateproviders/ftustateprovider/ftustateprovider.pro Tue Jul 06 14:06:30 2010 +0300 @@ -17,7 +17,7 @@ TEMPLATE = lib DEFINES += FTUSTATEPROVIDER_LIB - +#DEFINES += LOGGING symbian { CONFIG(debug, debug|release) { diff -r 96bf8c13fa72 -r 624e91e1e029 stateproviders/ftustateprovider/inc/ftustateprovider_global.h --- a/stateproviders/ftustateprovider/inc/ftustateprovider_global.h Wed Jun 23 18:03:13 2010 +0300 +++ b/stateproviders/ftustateprovider/inc/ftustateprovider_global.h Tue Jul 06 14:06:30 2010 +0300 @@ -32,4 +32,11 @@ #endif #endif +#ifdef LOGGING +#define QDEBUG(a) qDebug() < #include @@ -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 96bf8c13fa72 -r 624e91e1e029 stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp --- a/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp Wed Jun 23 18:03:13 2010 +0300 +++ b/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp Tue Jul 06 14:06:30 2010 +0300 @@ -19,6 +19,7 @@ #include "ftuwizardactivatedstate.h" #include "fturuntimeservices_global.h" #include "ftucontentservice.h" +#include "ftustateprovider_global.h" #include #include @@ -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 wizards = content()->wizards(); diff -r 96bf8c13fa72 -r 624e91e1e029 stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp --- a/stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp Wed Jun 23 18:03:13 2010 +0300 +++ b/stateproviders/ftustateprovider/src/ftuwizardloaderstate.cpp Tue Jul 06 14:06:30 2010 +0300 @@ -24,7 +24,7 @@ #include "ftutest_global.h" #include "ftustatecenrephandler.h" #include - +#include // --------------------------------------------------------------------------- // 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__<<"~~~~~~~"< - +#include "ftustateprovider_global.h" #include #include #include @@ -30,7 +30,7 @@ #include #include - +#include #include #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 <load(FTUSTATEPROVIDER_DOCML, &ok); QGraphicsWidget *widget = mDocumentLoader->findWidget(TOC_VIEW); Q_ASSERT_X(ok && (widget != 0), "ftustateprovider", "invalid DocML file"); mTocView = qobject_cast(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) @@ -172,7 +167,7 @@ void FtuWizardMenuState::addWizardToListModel(int aIndex) { - WMS_LOG << "::addWizardToListModel idx : " << aIndex; + QDEBUG("FtuWizardMenuState::addWizardToListModel idx : " << aIndex;) FtuContentService* ftuContentService = content(); FtuWizard* addedWizard = ftuContentService->wizard(aIndex); @@ -185,7 +180,7 @@ const FtuWizardSetting& settings = addedWizard->wizardSettings(); QStandardItem* newItem = new QStandardItem(); QList iconList; - HbIcon icon (settings.mTocDefaultIcon.absoluteFilePath()); + HbIcon icon (settings.mTocDefaultIcon.filePath() ); iconList.append(icon); HbIcon rightIcon(QString(qtTrId("qtg_small_tick"))); @@ -198,6 +193,7 @@ } else { + //Plugin has already completed, Append tick mark on right side iconList.append(rightIcon); data << updatedAsString(date); } @@ -225,6 +221,7 @@ SLOT(activateWizard(const QModelIndex))); mListView->setModel(mModel); + QDEBUG("FtuWizardMenuState.cpp Model is set"<<__FUNCTION__<<"~~~~~~~"<(mDocumentLoader->findWidget(TOC_INFOTEXT_LABEL)); - mInfoText->setPlainText(qtTrId("txt_ftu_subtitle_toc")); + mInfoText->setPlainText(qtTrId("txt_ftu_subhead_select_setting_you_want_to_edit")); } // --------------------------------------------------------------------------- @@ -270,7 +267,7 @@ { if(caller == wizards[i]) { - WMS_LOG << "::updateProgress wizard found at: " << i; + QDEBUG("::updateProgress wizard found at: " << i;) index = i; } } @@ -279,7 +276,7 @@ QStringList data; data << wizards[index]->wizardSettings().mTocLabel; QList iconList; - HbIcon icon (wizards[index]->wizardSettings().mTocDefaultIcon.absoluteFilePath()); + HbIcon icon (wizards[index]->wizardSettings().mTocDefaultIcon.filePath()); iconList.append(icon); HbIcon rightIcon(QString(qtTrId("qtg_small_tick"))); @@ -296,6 +293,7 @@ QDate date = wizards[index]->wizardCompletedDate(); data << updatedAsString(date); + //Plugin has completed 100%, Append tick mark on right side iconList.append(rightIcon); XQSettingsManager settingsManager; diff -r 96bf8c13fa72 -r 624e91e1e029 translations/FTU_textmap_10_1.xls Binary file translations/FTU_textmap_10_1.xls has changed diff -r 96bf8c13fa72 -r 624e91e1e029 translations/FTU_textmap_10_1_v4_edit.xls Binary file translations/FTU_textmap_10_1_v4_edit.xls has changed diff -r 96bf8c13fa72 -r 624e91e1e029 translations/ftu_en.ts --- a/translations/ftu_en.ts Wed Jun 23 18:03:13 2010 +0300 +++ b/translations/ftu_en.ts Tue Jul 06 14:06:30 2010 +0300 @@ -1,315 +1,485 @@ - + + + Secondary value for double list 10, and appears if the user has not done any import for old phone from this application before + via bluetooth + + qtl_list_pri_large_graphic_add + FTU_15 + dblist_10_val + FTU + False + + + Inprogress indication shown in the sencond row of the db 11, which say the the sim contacts are being imported and not finshed yet + Importing + + qtl_list_sec_large_graphic + FTU_15 + dblist_11_val + FTU + False + + + Secondary Row text for Setup Item"Setup Nokia account". The secondary is only descriptive of what the Setup Item will provide + And Enjoy Ovi services + + + FTU_13 + dblist_7_val + FTU + False + + + TOC item, setting in sync with control panel´s settings + Time, date and location + + + ftu_09 + dblist + ftu + False + + + Subheading as a status of current status of import + Import from OVI + + qtl_groupbox_simple_sec + FTU_23 + subhead + FTU + False + + + menustrip item + Import data + + + ftu_10 + grid + ftu + False + + + It’s a list with a check box + Synchronize my data automatically in future + + qtl_checkbox_sec + FTU_25 + List + FTU + False + + + + no + + + ftu_08 + button + ftu + False + + + Subheading for one of the module of FTU + Select what you want to do + + qtl_groupbox_simple_sec + FTU_13 + subhead + FTU + False + + + First row of the Double list, with large Icon and can have a seondary ICon + Nokia Account Setup + + + FTU_13 + dblist_7 + FTU + False + + + Where %1 the user name for OVI or the BT name of the phone where the data is being imported + Importing from %1 + + qtl_list_sec_large_graphic + FTU_15 + dblist_10_val + FTU + False + + + The Secondary text 'imported on %2'. Wherer %2 is the date (formatted as system date): ex Imported on 23.09.10 + Imported on %2 + + qtl_list_sec_large_graphic + FTU_15 + dblist_11_val + FTU + False + + + menustrip item + Instant messaging + + + ftu_10 + grid + ftu + False + + + 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 + From Ovi + + qtl_list_pri_large_graphic_add + FTU_15 + dblist_9 + FTU + False + + + subhead : instuctional text asking the source for importing data from + Import contacts & personal data + + qtl_groupbox_simple_sec + FTU_15 + subhead + FTU + False + + + placeholder, correct text from services later + <terms of use> + + + ftu_07 + info + ftu + False + + + The Secondary text ', 'imported at %1', . Wherer %1 is the time (formatted as system time) when data was imported.example: imported at 12:00 + Imported at %1 + + qtl_list_sec_large_graphic + FTU_15 + dblist_11_val + FTU + False + + + menustrip item + Style of phone + + + ftu_10 + grid + ftu + False + + + menustrip item + Social media + + + ftu_10 + grid + ftu + False + + + Title shown in all FTU views, excluding videos& pin code query + Setup + + + ftu + title + ftu + False + + + TOC item, second row, tells last time user has edited plugin/module, where U is the date + updated %1 + + + ftu_09 + dblist_val + ftu + False + + + Seconday list value, displayes the contents that start importing from OVI once the user chooses this list pootion + Contacts caledars & Notes + + qtl_list_sec_large_graphic + FTU_15 + dblist_9_val + FTU + False + + + text hints what user can do with the the Table Of Concents (TOC) items + Select setting you want to edit + + + ftu_09 + subhead + ftu + False + + + 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 + From old phone + + qtl_list_pri_large_graphic_add + FTU_15 + dblist_10 + FTU + False + markable setting item: marked or unmarked , shown only in some marketing areas Sign up for tips & tricks - Sign up for tips & tricks + ftu_07 setlabel - ft - False - - - TOC item, data sync - Import data - Import data - - ftu_09 - list item - ft + ftu False related to terms of use below Accept - Accept + ftu_07 button - ft + ftu + False + + + TOC item, data sync + Import data + + + ftu_09 + list item + ftu + False + + + 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 + From SIM card + + qtl_list_pri_large_graphic_add + FTU_15 + dblist_11 + FTU + False + + + Parent Custom Layout Parent.Primary text for Ftu widget (list) on home screen + Setup your device + + txt_long_caption_FTU_widget + FTUwidget_14 + list + FTUwidget False menustrip item Email accounts - Email accounts + ftu_10 grid - ft - False - - - TOC item, setting in sync with control panel´s settings - Time, date and location - Time, date and location - - ftu_09 - dblist - ft - False - - - menustrip item - Import data - Import data - - ftu_10 - grid - ft + ftu False TOC item, email account creation Email accounts - Email accounts + ftu_09 dblist - ft + ftu False TOC item, IM account creation Instant messaging - Instant messaging + ftu_09 dblist - ft - False - - - - no - no - - ftu_08 - button - ft + ftu False menustrip item time, date& location - time, date& location + ftu_10 grid - ft + ftu False info text that user can find settings later, dialog view You can find later link to setup from your home screen. - You can find later link to setup from your home screen. + ftu_08 info - ft + ftu False subtitle hints to the view Please read terms of use and accept to continue - Please read terms of use and accept to continue + ftu_07 subhead - ft + ftu + False + + + info text for user choices, related to buttons below, dialog view + Do you want to do start up settings now (recommended)? + + + ftu_08 + info + ftu False TOC item, second row, tells last time user has edited plugin/module, shown only if the update has been today updated today - updated today + ftu_09 dblist_val - ft - False - - - info text for user choices, related to buttons below, dialog view - Do you want to do start up settings now (recommended)? - Do you want to do start up settings now (recommended)? - - ftu_08 - info - ft - False - - - TOC item, sync with the Phonebook mycard - My contact card - My contact card - - ftu_09 - list item - ft + ftu False yes - yes + ftu_08 button - ft + ftu + False + + + TOC item, sync with the Phonebook mycard + My contact card + + + ftu_09 + list item + ftu False menustrip item Importing… - Importing… + ftu_10 grid - ft - False - - - menustrip item - Instant messaging - Instant messaging - - ftu_10 - grid - ft + ftu False 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) Import data from %1 - Import data from %1 + ftu_09 list item - ft - False - - - placeholder, correct text from services later - <terms of use> - <terms of use> - - ftu_07 - info - ft - False - - - menustrip item - Style of phone - Style of phone - - ftu_10 - grid - ft - False - - - menustrip item - Social media - Social media - - ftu_10 - grid - ft + ftu False menustrip item, these items open same stuff as TOC items My contact card - My contact card + ftu_10 grid - ft - False - - - Title shown in all FTU views, excluding videos& pin code query - Setup - Setup - - ftu - title - ft - False - - - TOC item, second row, tells the status of the user initiated progress (data sync from source x) - %1% done… - %1% done… - - ftu_09 - dblist_val - ft - False - - - TOC item, second row, tells last time user has edited plugin/module, where U is the date - updated %1 - updated %1 - - ftu_09 - dblist_val - ft + ftu False info text for language selection, uses main view Set your phone language: - Set your phone language: + ftu_06 setlabel - ft + ftu + False + + + TOC item, second row, tells the status of the user initiated progress (data sync from source x) + %1% done… + + + ftu_09 + dblist_val + ftu + False + + + Name in task switcher + Setup your device + + qtl_grid_taskswitcher_tiny_setup + tsw_01 + caption + tsw False TOC item, main phone style settings (ringing tone, wallpaper, theme) Style of phone - Style of phone + ftu_09 dblist - ft + ftu False - - text hints what user can do with the the Table Of Concents (TOC) items - Select setting you want to edit - Select setting you want to edit + + TOC item, SM account creation (facebook etc) + Social media + ftu_09 - subhead - ft + dblist + ftu False info text to user´s choices, uses main view Select language you want to use - Select language you want to use + ftu_06 subhead - ft - False - - - TOC item, SM account creation (facebook etc) - Social media - Social media - - ftu_09 - dblist - ft + ftu False diff -r 96bf8c13fa72 -r 624e91e1e029 translations/ftu_en_GB.qm Binary file translations/ftu_en_GB.qm has changed diff -r 96bf8c13fa72 -r 624e91e1e029 translations/ftu_en_US.qm Binary file translations/ftu_en_US.qm has changed diff -r 96bf8c13fa72 -r 624e91e1e029 wizardproviders/ftuwizardprovider/ftuwizardprovider.pro --- a/wizardproviders/ftuwizardprovider/ftuwizardprovider.pro Wed Jun 23 18:03:13 2010 +0300 +++ b/wizardproviders/ftuwizardprovider/ftuwizardprovider.pro Tue Jul 06 14:06:30 2010 +0300 @@ -22,6 +22,7 @@ DEFINES += FTUWIZARDPROVIDER_LIB +#DEFINES += LOGGING win32 { CONFIG(debug, debug|release) { diff -r 96bf8c13fa72 -r 624e91e1e029 wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h --- a/wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h Wed Jun 23 18:03:13 2010 +0300 +++ b/wizardproviders/ftuwizardprovider/inc/ftuwizardprovider_global.h Tue Jul 06 14:06:30 2010 +0300 @@ -32,5 +32,11 @@ #endif #endif +#ifdef LOGGING +#define QDEBUG(a) qDebug() < #include #include - +#include "ftuwizardprovider_global.h" #ifdef Q_OS_SYMBIAN #include // 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 96bf8c13fa72 -r 624e91e1e029 wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp --- a/wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp Wed Jun 23 18:03:13 2010 +0300 +++ b/wizardproviders/ftuwizardprovider/src/ftuwizardprovider.cpp Tue Jul 06 14:06:30 2010 +0300 @@ -18,7 +18,7 @@ #include "ftuwizardprovider.h" #include "ftumanifestparser.h" - +#include "ftuwizardprovider_global.h" #include #include @@ -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 (instance); if(factory) { - qDebug() << "ftu: appending factory to list"; + QDEBUG("ftu: appending factory to list";) plugins.append(factory); } }