--- 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);
}
}