FCL/sf/app/search: comparison searchui/stateproviders/searchstateprovider/src/searchprogressivestate.cpp

equal deleted inserted replaced

-:773be20e0a25
+:993ab30e92fc
 #include <hbview.h>
 #include <hblabel.h>
 #include <hbicon.h>
 #include <hbmenu.h>
 #include <hbinstance.h>
-#include <hblistview.h>
 #include <hbdocumentloader.h>
 #include <hbsearchpanel.h>
 #include <hbaction.h>
-#include <qstandarditemmodel.h>
 #include <hbframebackground.h>
-#include <hbabstractviewitem.h>
-#include <hbframebackground.h>
-#include <hblistviewitem.h>
 #include <hbapplication.h>
 #include <qsortfilterproxymodel.h>
 #include <AknsUtils.h>
 #include <bitdev.h>
 #include <bitstd.h>
 #include <apgcli.h>
 #include <AknTaskList.h>
 #include <apacmdln.h>
 #include <xqconversions.h>
 #include <apparc.h>
+#include <qdesktopservices.h>
+#include <hblistwidget.h>
+#include <hblistwidgetitem.h>
+#include <hbabstractviewitem.h>
+#include <hblistviewitem.h>
 #define hbApp qobject_cast<HbApplication*>(qApp)
 const char *SEARCHSTATEPROVIDER_DOCML = ":/xml/searchstateprovider.docml";
 const char *TOC_VIEW = "tocView";
 const char *TUT_SEARCHPANEL_WIDGET = "searchPanel";
 const char *TUT_LIST_VIEW = "listView";
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::SearchProgressiveState
 // ---------------------------------------------------------------------------
 SearchProgressiveState::SearchProgressiveState(QState *parent) :
 QState(parent), mMainWindow(NULL), mView(NULL), mListView(NULL),
-mDocumentLoader(NULL), mModel(NULL), mSearchHandler(NULL),
+mDocumentLoader(NULL), mSearchHandler(NULL), mNotesEditor(0),
-mNotesEditor(0), mAiwMgr(0), mRequest(0)
+mAiwMgr(0), mRequest(0)
 {
 mMainWindow = hbInstance->allMainWindows().at(0);
-mModel = new QStandardItemModel(this);
 mAiwMgr = new XQApplicationManager;
 mDocumentLoader = new HbDocumentLoader();
 bool ok = false;
 if (mView)
 {
 mView->setTitle(hbTrId("txt_search_title_search"));
 }
-mListView = qobject_cast<HbListView *> (mDocumentLoader->findWidget(
+mListView = qobject_cast<HbListWidget *> (mDocumentLoader->findWidget(
 TUT_LIST_VIEW));
 Q_ASSERT_X(ok && (mListView != 0), "TUT_LIST_VIEW", "invalid viewocML file");
 if (mListView)
 {
 frame.setFrameType(HbFrameDrawer::NinePieces);
 prototype->setDefaultFrame(frame);
 HbListViewItem *prototypeListView = qobject_cast<HbListViewItem *> (
 prototype);
+prototypeListView->setGraphicsSize(HbListViewItem::LargeIcon);
 if (prototypeListView)
 {
 HbStyle style;
 qreal x;
 style.parameter("hb-param-graphic-size-primary-large", x);
 QSizeF size(x, x);
 mListViewIconSize = size.toSize();
 prototypeListView->setTextFormat(Qt::RichText);
 }
-mListView->setModel(mModel, prototype);
 HbAbstractItemView::ItemAnimations noCreationAndRemovalAnimations =
 HbAbstractItemView::All;
 noCreationAndRemovalAnimations ^= HbAbstractItemView::Appear;
 noCreationAndRemovalAnimations ^= HbAbstractItemView::Disappear;
 mSearchPanel = qobject_cast<HbSearchPanel *> (
 mDocumentLoader->findWidget(TUT_SEARCHPANEL_WIDGET));
 if (mSearchPanel)
 {
 mSearchPanel->setSearchOptionsEnabled(true);
-mSearchPanel->setPlaceholderText(hbTrId("txt_search_dialog_search_device"));
+mSearchPanel->setPlaceholderText(hbTrId(
+"txt_search_dialog_search_device"));
 mSearchPanel->setCancelEnabled(false);
+mSearchPanel->setFocus();
 }
 constructHandlers();
 if (mView && mMainWindow)
 QObject *plugin = qobject_cast<QObject*> (
 mNotespluginLoader->instance());
 mNotesEditor = qobject_cast<NotesEditorInterface*> (plugin);
 }
+mOnlineQueryAvailable = false;
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::~SearchProgressiveState
 // ---------------------------------------------------------------------------
 SearchProgressiveState::~SearchProgressiveState()
 {
 if (mAiwMgr)
 {
 delete mAiwMgr;
-}
-if (mModel)
-{
-delete mModel;
 }
 if (mDocumentLoader)
 {
 delete mDocumentLoader;
 }
 handler->setCategory("msg");
 break;
 }
 case 4:
 {
-handler->setCategory("email");
+handler->setCategory("msg email");
 break;
 }
 case 5:
 {
 handler->setCategory("calendar");
 }
 mMainWindow->show();
 }
 if (loadSettings)
 {
-emit settingsState();
+emit switchProToSettingsState();
 loadSettings = false;
 }
 setSelectedCategories();
+if (mOnlineQueryAvailable)
+{
+mSearchPanel->setCriteria(mOriginalString);
+mOnlineQueryAvailable = false;
+}
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::onExit
 // ---------------------------------------------------------------------------
 void SearchProgressiveState::onExit(QEvent *event)
 SIGNAL(handleDocument(int,QCPixDocument*)), this,
 SLOT(onGetDocumentComplete(int,QCPixDocument*)));
 }
 if (mListView)
 {
-connect(mListView, SIGNAL(activated(const QModelIndex)), this,
+connect(mListView, SIGNAL(activated(HbListWidgetItem *)), this,
-SLOT(openResultitem(const QModelIndex)));
+SLOT(openResultitem(HbListWidgetItem *)));
 }
 if (mSearchPanel)
 {
 connect(mSearchPanel, SIGNAL(criteriaChanged(QString)), this,
 SLOT(startNewSearch(QString)));
 SIGNAL(handleDocument(int,QCPixDocument*)), this,
 SLOT(onGetDocumentComplete(int,QCPixDocument*)));
 }
 if (mListView)
 {
-disconnect(mListView, SIGNAL(activated(const QModelIndex)), this,
+disconnect(mListView, SIGNAL(activated(HbListWidgetItem *)), this,
-SLOT(openResultitem(const QModelIndex)));
+SLOT(openResultitem(HbListWidgetItem *)));
 }
 if (mSearchPanel)
 {
 disconnect(mSearchPanel, SIGNAL(criteriaChanged(QString)), this,
 SLOT(startNewSearch(QString)));
 if (aDoc == NULL || aError != 0)
 return;
 QStringList liststr;
 QString secondrow = aDoc->excerpt();
 QString firstrow;
-QStandardItem* listitem = new QStandardItem();
+HbListWidgetItem* listitem = new HbListWidgetItem();
 if (aDoc->baseAppClass().contains("contact"))
 {
 QStringList docsList = filterDoc(aDoc, "GivenName", "FamilyName");
 if (docsList.value(0, "").length())
 listitem->setData(audioList.at(1), Qt::UserRole + 2);
 }
 }
 else if (aDoc->baseAppClass().contains("video"))
 {
-QStringList videoList = filterDoc(aDoc, "Title", "MediaId","Name");
+QStringList videoList = filterDoc(aDoc, "Title", "MediaId", "Name");
 if (videoList.value(0, "").length())
 {
 firstrow.append(videoList.at(0));
 }
 if (firstrow.length() == 0 && videoList.value(2, "").length())
 if (imageList.value(1, "").length())
 {
 listitem->setData(imageList.at(1), Qt::UserRole + 2);
 }
 }
+else if (aDoc->baseAppClass().contains("msg email"))
+{
+qDebug() << "searchui:on Get doc email";
+QStringList emailList = filterDoc(aDoc, "Sender", "MailBoxId",
+"FolderId");
+qDebug() << "searchui:recipients" << emailList.at(0) << emailList.at(
+1) << emailList.at(2);
+firstrow.append(emailList.at(0));
+listitem->setData(emailList.at(1), Qt::UserRole + 2);
+listitem->setData(emailList.at(2), Qt::UserRole + 3);
+liststr << firstrow << secondrow;
+listitem->setData(mIconArray.at(5), Qt::DecorationRole);
+}
 else if (aDoc->baseAppClass().contains("msg"))
 {
 QStringList msgList = filterDoc(aDoc, "Subject", "Body");
 if (msgList.value(0, "").length())
 {
 {
 firstrow = " ";// space if subject and body are missing
 }
 liststr << firstrow << secondrow;
 listitem->setData(mIconArray.at(4), Qt::DecorationRole);
 }
-else if (aDoc->baseAppClass().contains("email"))
-{
-firstrow.append(filterDoc(aDoc, "Subject"));
-liststr << firstrow << secondrow;
-listitem->setData(mIconArray.at(5), Qt::DecorationRole);
-}
 else if (aDoc->baseAppClass().contains("calendar"))
 {
 firstrow.append(filterDoc(aDoc, "Summary"));
 if (firstrow.length() == 0)
 {
 if (firstrow.length() == 0)
 {
 firstrow = "UnKnown";
 }
 liststr << firstrow << secondrow;
+listitem->setData(secondrow, Qt::UserRole + 2);
 listitem->setData(mIconArray.at(8), Qt::DecorationRole);
 }
 else if (aDoc->baseAppClass().contains("file"))
 {
 firstrow.append(filterDoc(aDoc, "Name"));
 if (firstrow.length() == 0)
 firstrow = aDoc->baseAppClass();
 liststr << firstrow << secondrow;
 listitem->setData(mIconArray.at(9), Qt::DecorationRole);
 }
-listitem->setData(liststr, Qt::DisplayRole);
+listitem->setText(firstrow);
+listitem->setSecondaryText(secondrow);
 listitem->setData(aDoc->docId(), Qt::UserRole);
 listitem->setData(aDoc->baseAppClass(), Qt::UserRole + 1);
-mModel->appendRow(listitem);
+mListView->addItem(listitem);
 mResultparser++;
 if (mResultparser < mResultcount)
 {
 PERF_CAT_GETDOC_TIME_RESTART
 mSelectedCategory.insert(item, avalue);
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::openResultitem
 // ---------------------------------------------------------------------------
-void SearchProgressiveState::openResultitem(QModelIndex index)
+void SearchProgressiveState::openResultitem(HbListWidgetItem * item)
 {
-QStandardItem* item = mModel->itemFromIndex(index);
 if (item == NULL)
 return;PERF_RESULT_ITEM_LAUNCH_TIME_RESTART
 QList<QVariant> args;
 bool t;
 mRequest = NULL;
 args << uid;
 }
 else if (item->data(Qt::UserRole + 1).toString().contains("bookmark"))
 {
 PERF_RESULT_ITEM_FOR_LAUNCHING("bookmark")
-PERF_RESULT_ITEM_LAUNCH_TIME_ENDLOG("")
+QDesktopServices::openUrl(item->data(Qt::UserRole + 2).toString());
+PERF_RESULT_ITEM_LAUNCH_TIME_ENDLOG        ("")
 }
 else if (item->data(Qt::UserRole + 1).toString().contains("calendar"))
 {
 QDir pluginDir = QDir(QString("z:/resource/qt/plugins/calendar"));
 QPluginLoader *calAgandaViewerPluginLoader = new QPluginLoader(
 pluginDir.absoluteFilePath(QString(
 "agendaeventviewerplugin.qtplugin")));
 calAgandaViewerPluginInstance = qobject_cast<
 EventViewerPluginInterface *> (
 calAgandaViewerPluginLoader->instance());
 connect(calAgandaViewerPluginInstance, SIGNAL(viewingCompleted()),
 this, SLOT(_viewingCompleted()));
 {
 mNotesEditor->edit(item->data(Qt::UserRole).toInt());
 }
 PERF_RESULT_ITEM_LAUNCH_TIME_ENDLOG("")
 }
+else if (item->data(Qt::UserRole + 1).toString().contains("msg email"))
+{
+mRequest = mAiwMgr->create("nmail",
+"com.nokia.symbian.IEmailMessageView",
+"viewMessage(QVariant,QVariant,QVariant)", false);
+args << item->data(Qt::UserRole + 2).toULongLong(&t) << item->data(
+Qt::UserRole + 3).toULongLong(&t) << item->data(Qt::UserRole).toULongLong(&t);
+}
 else if (item->data(Qt::UserRole + 1).toString().contains("msg"))
 {
 PERF_RESULT_ITEM_FOR_LAUNCHING("msg")
 mRequest = mAiwMgr->create("com.nokia.services.hbserviceprovider",
 "conversationview", "view(int)", false);
 int uid = (item->data(Qt::UserRole)).toInt(&t);
 args << uid;
+}
+else if(item->data(Qt::UserRole + 1).toString().contains("links"))
+{
+emit launchLink((item->data(Qt::UserRole)).toInt(&t),mOriginalString);
 }
 if (mRequest)
 {
 connect(mRequest, SIGNAL(requestOk(const QVariant&)), this,
 SLOT(handleOk(const QVariant&)));
 connect(mRequest, SIGNAL(requestError(int,const QString&)), this,
 SLOT(handleError(int,const QString&)));// Connect error handling signal or apply lastError function instead.
 mRequest->setArguments(args);
 if (!mRequest->send())// Make the request
 {
 qDebug() << "AIW-ERROR: Send failed" << mRequest->lastError();
 }
 disconnect(mRequest, SIGNAL(requestOk(const QVariant&)), this,
 SLOT(handleOk(const QVariant&)));
 Q_UNUSED(var);
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::createSuggestionLink
 // ---------------------------------------------------------------------------
-void SearchProgressiveState::createSuggestionLink(bool aFlag)
+void SearchProgressiveState::createSuggestionLink()
 {
-QStandardItem* listitem = new QStandardItem();
+QString linkString = QString(hbTrId("txt_search_list_search_for_1").arg(
-if (!aFlag)
+mOriginalString));
-{
+QMapIterator<int, HbIcon> i(mISprovidersIcon);
-QString linkString = QString(hbTrId("txt_search_list_search_for_1").arg(mOriginalString));
+while (i.hasNext())
-mLinkindex = mModel->rowCount();
+{
-listitem->setData(linkString, Qt::DisplayRole);
+i.next();
-mModel->appendRow(listitem);
+HbListWidgetItem* listitem = new HbListWidgetItem();
+listitem->setText(linkString);
+listitem->setData(i.key(), Qt::UserRole);
+listitem->setData(i.value(), Qt::DecorationRole);
+listitem->setData("links", Qt::UserRole + 1);
+mListView->addItem(listitem);
 }
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::noResultsFound
 // ---------------------------------------------------------------------------
 void SearchProgressiveState::noResultsFound(QString aKeyword)
 {
 if (aKeyword.length())
 {
-QStandardItem* listitem = new QStandardItem();
+HbListWidgetItem* listitem = new HbListWidgetItem();
 QString noResultMsg = QString("<align=\"center\">" + hbTrId(
 "txt_search_list_no_match_found"));
-listitem->setData(noResultMsg, Qt::DisplayRole);
+listitem->setText(noResultMsg);
-mModel->appendRow(listitem);
+mListView->addItem(listitem);
 }
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::clear
 // ---------------------------------------------------------------------------
 void SearchProgressiveState::clear()
 {
-if (mModel)
+mListView->clear();
-{
-mModel->clear();
-}
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::searchOnCategory
 // ---------------------------------------------------------------------------
 void SearchProgressiveState::searchOnCategory(const QString aKeyword)
 mDatabasecount++;
 if (mSearchHandler->isPrepared())
 {
 PERF_CAT_API_TIME_RESTART
 mSearchHandler->searchAsync(aKeyword, "_aggregate");
 }
 else
 {
 searchOnCategory(mSearchString);
 }
 }
 else if (mDatabasecount >= mTemplist.count())
 {
 PERF_TOTAL_UI_ENDLOG
-if (mModel->rowCount() == 0 && aKeyword.length() != 0)
+if (mListView->count() == 0 && aKeyword.length() != 0)
 {
 noResultsFound(mOriginalString);
-createSuggestionLink(0);
+createSuggestionLink();
 }
 return;
 }
 }
 // ---------------------------------------------------------------------------
 mOriginalString = aKeyword.trimmed();
 for (int i = 0; i < mSearchHandlerList.count(); i++)
 {
 mSearchHandlerList.at(i)->cancelLastSearch();
 }
-if (mModel->rowCount() != 0)
+if (mListView->count() != 0)
 {
 clear();
 }
 if (mOriginalString.length())
 {
 // SearchProgressiveState::setSettings
 // ---------------------------------------------------------------------------
 void SearchProgressiveState::setSettings()
 {
 mTempSelectedCategory = mSelectedCategory;
-emit settingsState();
+if (mOriginalString.length())
-}
+emit inDeviceSearchQuery(mOriginalString);
-// ---------------------------------------------------------------------------
+emit switchProToSettingsState();
-// SearchProgressiveState::_customizeGoButton
-// ---------------------------------------------------------------------------
-void SearchProgressiveState::_customizeGoButton(bool avalue)
-{
-if (mSearchPanel)
-{
-if (avalue)
-{
-mSearchPanel->setProgressive(false);
-}
-else
-{
-mSearchPanel->setProgressive(true);
-}
-}
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::settingsaction
 // ---------------------------------------------------------------------------
 void SearchProgressiveState::settingsaction(bool avalue)
 break;
 }
 case 3://Messages& emails
 {
 mTemplist.append("msg");
-//mTemplist.append("email");
+mTemplist.append("email");
 break;
 }
 case 4://Calender& notes
 {
 mTemplist.append("calendar");
 break;
 }
 }
 }
 }
-if (mTemplist.count() == 8)
+if (mTemplist.count() == 9)
 isrootsearch = true;
 if (isrootsearch)
 {
 mTemplist.clear();
 mTemplist.append("selectall");
 CleanupStack::Pop(fileNameFromApparc);
 }
 CleanupStack::PopAndDestroy(apaMaskedBitmap);
 }
 CleanupStack::PopAndDestroy(&apaLsSession);
 if (icon.isNull() || !(icon.size().isValid()))
 icon = HbIcon("qtg_large_application");
 return icon;
 }
 // ---------------------------------------------------------------------------
 // SearchProgressiveState::GetPixmapByFilenameL
 // ---------------------------------------------------------------------------
 if (searchKey.length() > 0)
 mSearchPanel->setCriteria(searchKey);
 }
 }PERF_APP_LAUNCH_END("SearchAppplication View is ready");
 }
+void SearchProgressiveState::slotOnlineQuery(QString str)
+{
+mOriginalString = str;
+mOnlineQueryAvailable = true;
+}
+void SearchProgressiveState::slotISProvidersIcon(int id, HbIcon icon)
+{
+mISprovidersIcon.insert(id, icon);
+}

changeset 12	993ab30e92fc
parent 11	773be20e0a25
child 17	7d8c8d8f5eab