FCL/sf/app/commonemail: comparison emailuis/nmailui/src/nmmessagesearchlistview.cpp

equal deleted inserted replaced

-:139d4b7b2938
+:99bcbff212ad
 static const char *NMUI_MESSAGE_SEARCH_LIST_VIEW_XML = ":/docml/nmmessagesearchlistview.docml";
 static const char *NMUI_MESSAGE_SEARCH_LIST_VIEW = "NmMessageListView";
 static const char *NMUI_MESSAGE_SEARCH_LIST_TREE_LIST = "MessageTreeList";
 static const char *NMUI_MESSAGE_SEARCH_LIST_NO_MESSAGES = "MessageListNoMessages";
-static const char *NMUI_MESSAGE_SEARCH_LIST_INFO_LABEL = "InfoLabel";
+static const char *NMUI_MESSAGE_SEARCH_LIST_INFO_LABEL = "LabelGroupBox";
 static const char *NMUI_MESSAGE_SEARCH_LIST_LINE_EDIT = "LineEdit";
 static const char *NMUI_MESSAGE_SEARCH_LIST_PUSH_BUTTON = "PushButton";
 #include "nmuiheaders.h"
 mPushButton(NULL),
 mLongPressedItem(NULL),
 mViewReady(false),
 mSearchInProgress(false)
 {
+NM_FUNCTION;
 loadViewLayout();
 initTreeView();
 }
 /*!
 Class destructor.
 */
 NmMessageSearchListView::~NmMessageSearchListView()
 {
+NM_FUNCTION;
 delete mDocumentLoader;
 mWidgetList.clear();
 if (mItemContextMenu){
 \return The view ID.
 */
 NmUiViewId NmMessageSearchListView::nmailViewId() const
 {
+NM_FUNCTION;
 return NmUiViewMessageSearchList;
 }
 /*!
 Does the lazy loading after the view layout has been loaded.
 */
 void NmMessageSearchListView::viewReady()
 {
+NM_FUNCTION;
 if (!mViewReady){
 // Set the mailbox name to the title pane.
 setViewTitle();
 // Refresh the list.
 \param actionResponse The command details.
 */
 void NmMessageSearchListView::handleActionCommand(NmActionResponse &actionResponse)
 {
+NM_FUNCTION;
 // Handle options menu commands here.
 if (actionResponse.menuType() == NmActionOptionsMenu) {
 switch (actionResponse.responseCommand()) {
 case NmActionResponseCommandUpdateMailboxName: {
 setViewTitle();
 }
 // Handle context menu commands here.
 if (actionResponse.menuType() == NmActionContextMenu) {
 if (mLongPressedItem){
 NmUiStartParam *startParam = new NmUiStartParam(NmUiViewMessageViewer,
-mStartParam->mailboxId(), mStartParam->folderId(),
+mStartParam->mailboxId(), mLongPressedItem->envelope().folderId(),
 mLongPressedItem->envelope().messageId());
 mApplication.enterNmUiView(startParam);
 mLongPressedItem = NULL;
 }
 Loads the view layout from the XML file.
 */
 void NmMessageSearchListView::loadViewLayout()
 {
+NM_FUNCTION;
 // Use the document loader to load the view layout.
 bool ok(false);
 setObjectName(QString(NMUI_MESSAGE_SEARCH_LIST_VIEW));
 QObjectList objectList;
 objectList.append(this);
 // Get the message list widget.
 mMessageListWidget = qobject_cast<HbTreeView *>(
 mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_LIST_TREE_LIST));
 if (mMessageListWidget) {
-NMLOG("NmMessageSearchListView: Message list widget loaded.");
+NM_COMMENT("NmMessageSearchListView: message list widget loaded");
 // Set the item prototype.
 mMessageListWidget->setItemPrototype(new NmMessageListViewItem());
+// Set the list widget properties.
 mMessageListWidget->setItemRecycling(true);
 mMessageListWidget->contentWidget()->setProperty("indentation", 0);
 mMessageListWidget->setScrollDirections(Qt::Vertical);
 mMessageListWidget->setClampingStyle(HbScrollArea::BounceBackClamping);
 mMessageListWidget->setFrictionEnabled(true);
+// We want the search results to appear one by one.
+mMessageListWidget->setEnabledAnimations(HbAbstractItemView::Appear &
+HbAbstractItemView::Expand);
 }
 // Load the info label.
-mInfoLabel = qobject_cast<HbLabel *>(
+mInfoLabel = qobject_cast<HbGroupBox *>(
 mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_LIST_INFO_LABEL));
 if (mInfoLabel) {
-NMLOG("NmMessageSearchListView: Info label loaded.");
+NM_COMMENT("NmMessageSearchListView: info label loaded");
-mInfoLabel->setPlainText(hbTrId("txt_mail_subhead_inbox"));
 mInfoLabel->hide();
 }
 // Load the no messages label.
 mNoMessagesLabel = qobject_cast<HbLabel *>(
 connect(mPushButton, SIGNAL(clicked()), this, SLOT(toggleSearch()));
 mPushButton->setIcon(HbIcon("qtg_mono_search"));
 }
 }
 else {
-NMLOG("NmMessageSearchListView: Failed to load widgets from XML!");
+NM_ERROR(1, "NmMessageSearchListView: failed to load widgets from XML");
 }
 }
 /*!
 Initializes the tree view.
 */
 void NmMessageSearchListView::initTreeView()
 {
+NM_FUNCTION;
 // Get the mailbox widget pointer and set the parameters.
 if (mMessageListWidget) {
 connect(mMessageListWidget, SIGNAL(activated(const QModelIndex &)),
 this, SLOT(itemActivated(const QModelIndex &)));
 /*!
 Sets the title according to the name of the current mailbox.
 */
 void NmMessageSearchListView::setViewTitle()
 {
+NM_FUNCTION;
 if (mStartParam){
 NmMailboxMetaData *meta = mUiEngine.mailboxById(mStartParam->mailboxId());
 if (meta){
 setTitle(meta->name());
 \param visible If true, will display the "no messages" label. If false,
 will display the message list widget.
 */
 void NmMessageSearchListView::noMessagesLabelVisibility(bool visible)
 {
+NM_FUNCTION;
 if (visible) {
 // Hide the message list widget and display the "no messages" label.
 if (mMessageListWidget) {
 mMessageListWidget->hide();
 }
 }
 }
 /*!
+Updates the search result count information. If the message list does not
+contain any items, a "no messages" label is displayed. Otherwise the result
+count in the information label is updated according to the number of
+messages in the list.
+*/
+void NmMessageSearchListView::updateSearchResultCountInfo()
+{
+NM_FUNCTION;
+const int resultCount = mMsgListModel.rowCount();
+if (resultCount) {
+if (mInfoLabel) {
+// Display the result count on the info label.
+QString resultsString(hbTrId("txt_mail_list_search_results").arg(resultCount));
+mInfoLabel->setHeading(resultsString);
+if (!mInfoLabel->isVisible()) {
+mInfoLabel->show();
+}
+}
+}
+else {
+// No search results!
+if (mInfoLabel && mInfoLabel->isVisible()) {
+mInfoLabel->hide();
+}
+// Display the "no messages" label and highlight the search term.
+noMessagesLabelVisibility(true);
+}
+}
+/*!
 Sets the mode for the search input.
 \param mode The mode to set.
 */
 void NmMessageSearchListView::setSearchInputMode(NmSearchInputMode mode)
 {
+NM_FUNCTION;
 if (!mLineEdit) {
 // No line edit widget!
 return;
 }
 typically used when the view is already open and an external view activation
 occurs for this same view.
 */
 void NmMessageSearchListView::reloadViewContents(NmUiStartParam *startParam)
 {
-// Check the start parameter's validity; message view cannot be updated if
+NM_FUNCTION;
-// the given parameter is zero.
-if (startParam&&startParam->viewId() == NmUiViewMessageSearchList &&
+if (startParam && startParam->viewId() == NmUiViewMessageSearchList) {
-startParam->folderId() != 0) {
 // Delete the existing start parameter data.
 delete mStartParam;
 mStartParam = NULL;
 // Store the new start parameter data.
 setViewTitle();
 }
 else {
 // Invalid start parameter data! Unused start parameter needs to be
 // deleted.
-NMLOG("NmMessageSearchListView: Invalid message list start parameter!");
+NM_ERROR(1, "NmMessageSearchListView: invalid message list start parameter");
 delete startParam;
 }
 }
 \param text The text in the field after the modification.
 */
 void NmMessageSearchListView::criteriaChanged(QString text)
 {
-NMLOG(QString("NmMessageSearchListView::criteriaChanged %1").arg(text));
+NM_FUNCTION;
+NM_COMMENT(QString("NmMessageSearchListView::criteriaChanged %1").arg(text));
 // Check if the button should be disabled/enabled.
 bool enabled = mPushButton->isEnabled();
 if (!enabled && !text.isEmpty()) {
 list is long pressed.
 */
 void NmMessageSearchListView::showItemContextMenu(
 HbAbstractViewItem *listViewItem, const QPointF &coords)
 {
+NM_FUNCTION;
 // Store long press item for later use with response.
 mLongPressedItem =
 mMsgListModel.data(listViewItem->modelIndex(),
 Qt::DisplayRole).value<NmMessageListModelItem*>();
 // Fetch the menu actions based on the selected item.
 NmMessageEnvelope *envelope = mLongPressedItem->envelopePtr();
 if (envelope){
 NmActionRequest request(this, NmActionContextMenu,
-NmActionContextViewMessageList, NmActionContextDataMessage,
+NmActionContextViewMessageSearchList, NmActionContextDataMessage,
-mStartParam->mailboxId(), mStartParam->folderId(),
+mStartParam->mailboxId(), envelope->folderId(),
-envelope->messageId(),QVariant::fromValue(envelope));
+envelope->messageId(), QVariant::fromValue(envelope));
-extMngr.getActions(request, list);
-}
-else{
-NmActionRequest request(this, NmActionContextMenu,
-NmActionContextViewMessageList, NmActionContextDataMessage,
-mStartParam->mailboxId(), mStartParam->folderId(),
-envelope->messageId());
 extMngr.getActions(request, list);
 }
 for (int i(0); i < list.count(); ++i) {
 \param index The index of the activated item.
 */
 void NmMessageSearchListView::itemActivated(const QModelIndex &index)
 {
+NM_FUNCTION;
 mActivatedIndex = index;
 QMetaObject::invokeMethod(this, "handleSelection", Qt::QueuedConnection);
 }
 /*!
 If the selected item is a message, will open the message.
 */
 void NmMessageSearchListView::handleSelection()
 {
+NM_FUNCTION;
 // Do expand/collapse for title divider items
 NmMessageListModelItem* modelItem = mMsgListModel.data(
 mActivatedIndex, Qt::DisplayRole).value<NmMessageListModelItem*>();
 if (modelItem &&
 toggleSearch();
 }
 // Open the message.
 NmUiStartParam *startParam = new NmUiStartParam(NmUiViewMessageViewer,
-mStartParam->mailboxId(), mStartParam->folderId(),
+mStartParam->mailboxId(), modelItem->envelope().folderId(),
 modelItem->envelope().messageId());
 mApplication.enterNmUiView(startParam);
 }
 }
 Displays the message list widtet if not visible and scrolls to the
 appropriate point on the list.
 */
 void NmMessageSearchListView::itemsAdded(const QModelIndex &parent, int start, int end)
 {
-NMLOG("nmailui: NmMessageSearchListView::itemsAdded()");
+NM_FUNCTION;
 Q_UNUSED(parent);
 Q_UNUSED(end);
-// Display the message list widget if not visible.
+// The search is an asynchronous operation. If a user stops the search, it
-noMessagesLabelVisibility(false);
+// might take a short while before the search is actually stopped and during
+// this time it is possible that messages matching the search are added.
+// Therefore, update the result count info if items are added after the
+// search has been stopped by the user.
+if (!mSearchInProgress) {
+updateSearchResultCountInfo();
+}
 if (!start && mMessageListWidget) {
 QList<HbAbstractViewItem*> items = mMessageListWidget->visibleItems();
 if (items.count()) {
 QModelIndex index = items.at(0)->modelIndex();
-if (1 == index.row()) {
+while (index.row() > 0) {
-QModelIndex previous = mMessageListWidget->modelIterator()->previousIndex(index);
+QModelIndex previous =
+mMessageListWidget->modelIterator()->previousIndex(index);
 if (previous.isValid()) {
 mMessageListWidget->scrollTo(previous);
 }
+index = previous;
 }
 }
 }
 }
 /*!
-This method gets called when an item is removed from the list. If the list
+This method gets called when an item is removed from the list. If the
-contains no items, the info label (if visible) is hidden and the "no
+search has completed (or stopped), the search result count information is
-messages" label is displayed. Otherwise, only the result count in the info
+updated according to the number of messages in the list.
-label is updated.
 */
 void NmMessageSearchListView::itemsRemoved()
 {
-const int itemCount = mMsgListModel.rowCount();
+NM_FUNCTION;
-if (itemCount == 0) {
+if (!mSearchInProgress) {
-if (mInfoLabel && mInfoLabel->isVisible()) {
+updateSearchResultCountInfo();
-// Hide the info label.
-mInfoLabel->hide();
-}
-// Display the "no messages" label.
-noMessagesLabelVisibility(true);
-}
-else if (mInfoLabel && mInfoLabel->isVisible()) {
-// Update the search result count in the info label.
-QString resultsString(hbTrId("txt_mail_list_search_results"));
-resultsString.arg(itemCount);
-mInfoLabel->setPlainText(resultsString);
 }
 }
 /*!
 Refreshes the search list.
 */
 void NmMessageSearchListView::refreshList()
 {
+NM_FUNCTION;
 if (mMessageListWidget) {
 // Set the model.
 mMessageListWidget->setModel(
 static_cast<QStandardItemModel*>(&mMsgListModel));
 Stops search: Sets the number of search results into the info label.
 */
 void NmMessageSearchListView::toggleSearch()
 {
+NM_FUNCTION;
 if (mSearchInProgress) {
 // Search is in progress - do cancel.
 mUiEngine.cancelSearch(mStartParam->mailboxId());
 handleSearchComplete();
 }
 noMessagesLabelVisibility(false);
 setSearchInputMode(NmDimmedMode);
 // Display the info label.
 if (mInfoLabel) {
-mInfoLabel->setPlainText(hbTrId("txt_mail_list_searching"));
+mInfoLabel->setHeading(hbTrId("txt_mail_list_searching"));
 mInfoLabel->show();
 }
 // Change the push button text.
 if (mPushButton) {
 info label. If no messages were found, the method displays the "no messages"
 label. In either case, the search panel is updated.
 */
 void NmMessageSearchListView::handleSearchComplete()
 {
-NMLOG("NmMessageSearchListView::handleSearchComplete()");
+NM_FUNCTION;
 mSearchInProgress = false;
 // Change the push button text.
 if (mPushButton) {
 mPushButton->setIcon(HbIcon("qtg_mono_search"));
 }
+// Display the search result count.
+updateSearchResultCountInfo();
 const int resultCount = mMsgListModel.rowCount();
 if (resultCount) {
-if (mInfoLabel) {
-// Display the result count on the info label.
-QString resultsString(hbTrId("txt_mail_list_search_results"));
-resultsString.arg(resultCount);
-mInfoLabel->setPlainText(resultsString);
-if (!mInfoLabel->isVisible()) {
-mInfoLabel->show();
-}
-}
 // Undim the search input.
 setSearchInputMode(NmNormalMode);
 }
 else {
-// No search results!
+// Highlight the search field.
-if (mInfoLabel && mInfoLabel->isVisible()) {
-mInfoLabel->hide();
-}
-// Display the "no messags" label and highlight the search term.
 noMessagesLabelVisibility(true);
 setSearchInputMode(NmHighlightedMode);
 }
 }

changeset 43	99bcbff212ad
parent 40	2c62ef3caffd
child 48	10eaf342f539
child 54	997a02608b3a