FCL/sf/app/firsttimeuse: comparison stateproviders/ftustateprovider/src/ftuwizardmenustate.cpp

equal deleted inserted replaced

-:446dc0e90e84
+:aa22d2c19e57
 #include "ftuwizardmenustate.h"
 #include "ftucontentservice.h"
 #include <ftuwizard.h>
+#include "ftustateprovider_global.h"
 #include <hbmainwindow.h>
 #include <hbview.h>
 #include <hblabel.h>
 #include <hbicon.h>
 #include <hbinstance.h>
 #include <hblistview.h>
 #include <hbdocumentloader.h>
 #include <QStandardItemModel>
 #include <QDate>
+#include <QTime>
 #include <xqsettingsmanager.h>
 #include "ftustatecenrephandler.h"
 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";
 const char *TOC_LIST_VIEW = "tocListView";
 mModel(NULL)
 {
 mMainWindow = hbInstance->allMainWindows().at(0);
 mModel = new QStandardItemModel(this);
-//TODO Read number of wizards supported and init the following list
+mDocumentLoader = new HbDocumentLoader();
-//mCompletedWizardList << false << false << false << false << false <<false;
-	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.
 mMainWindow->setCurrentView(mTocView);
 mCenrepHandler = new FtuStateCenrepHandler(NULL);
 // FtuWizardMenuState::onEntry
 // ---------------------------------------------------------------------------
 //
 void FtuWizardMenuState::onEntry(QEvent *event)
 {
-WMS_LOG << "::onEntry";
+QDEBUG("FtuWizardMenuState::onEntry";)
 QState::onEntry(event);
 if(!mInfoText)
 {
 createInfoText();
 // FtuWizardMenuState::addWizardToListModel
 // ---------------------------------------------------------------------------
 //
 void FtuWizardMenuState::addWizardToListModel(int aIndex)
 {
-WMS_LOG << "::addWizardToListModel idx : " << aIndex;
+QDEBUG("FtuWizardMenuState::addWizardToListModel idx : " << aIndex;)
 FtuContentService* ftuContentService = content();
 FtuWizard* addedWizard = ftuContentService->wizard(aIndex);
 if(addedWizard)
 {
 // Connect for progress updates.
 connect(addedWizard, SIGNAL(progressUpdated(FtuWizard *, bool, int)),
 this, SLOT(updateProgress(FtuWizard *, bool, int)));
-	const FtuWizardSetting& settings = addedWizard->wizardSettings();
+const FtuWizardSetting& settings = addedWizard->wizardSettings();
-	    QStandardItem* newItem = new QStandardItem();
+QStandardItem* newItem = new QStandardItem();
-	    HbIcon icon (settings.mTocDefaultIcon.absoluteFilePath());
+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();
 if(date.isNull())
 {
 data << emptyLine;
 }
 else
 {
+//Plugin has already completed, Append tick mark on right side
+iconList.append(rightIcon);
 data << updatedAsString(date);
 }
-//newItem->setBackground(QBrush(Qt::lightGray));
+newItem->setData(iconList, Qt::DecorationRole);
-newItem->setData(icon, Qt::DecorationRole);
 newItem->setData(QVariant(data), Qt::DisplayRole);
 mModel->appendRow(newItem);
 }
 }
 SIGNAL(activated(const QModelIndex)),
 this,
 SLOT(activateWizard(const QModelIndex)));
 mListView->setModel(mModel);
+QDEBUG("FtuWizardMenuState.cpp Model is set"<<__FUNCTION__<<"~~~~~~~"<<QTime::currentTime().toString("hh:mm:ss.zzz");)
 }
 }
 // ---------------------------------------------------------------------------
 // FtWizardMenuState::createInfoText
 // ---------------------------------------------------------------------------
 //
 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"));
 }
 // ---------------------------------------------------------------------------
 // FtuWizardMenuState::activateWizard
 // ---------------------------------------------------------------------------
 // Get the index of the wizard
 for(int i = 0 ; i < wizards.size() ; ++i)
 {
 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;
+QList<QVariant> iconList;
+HbIcon icon (wizards[index]->wizardSettings().mTocDefaultIcon.filePath());
+iconList.append(icon);
+HbIcon rightIcon(QString(qtTrId("qtg_small_tick")));
 if(progress < progressCompelete)
 {
 QString progressStr;
 QString progressNumber;
 data << progressStr;
 }
 else
 {
 QDate date = wizards[index]->wizardCompletedDate();
 data << updatedAsString(date);
+//Plugin has completed 100%, Append tick mark on right side
+iconList.append(rightIcon);
 XQSettingsManager settingsManager;
 if(false == mCompletedWizardList[index])
 {
 mCenrepHandler->updatePluginInfo(index);
 }
 }
 mModel->item(index)->setData(QVariant(data), Qt::DisplayRole);
-}
+mModel->item(index)->setData(iconList, Qt::DecorationRole);
 }
+}

changeset 9	aa22d2c19e57
parent 5	1c5fe9af5d39