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

equal deleted inserted replaced

-:16ed8d08d0b1
+:478bc57ad291
 mMessageListWidget->setItemRecycling(true);
 mMessageListWidget->contentWidget()->setProperty("indentation", 0);
 mMessageListWidget->setScrollDirections(Qt::Vertical);
 mMessageListWidget->setClampingStyle(HbScrollArea::BounceBackClamping);
 mMessageListWidget->setFrictionEnabled(true);
+mMessageListWidget->setItemPixmapCacheEnabled(true);
 // Enable animations to display an email as soon as it is added to
 // the list.
 mMessageListWidget->setEnabledAnimations(HbAbstractItemView::Appear &
 HbAbstractItemView::Expand);
 }
 NM_FUNCTION;
 // Check start parameter validity, message view cannot
 // be updated if given parameter is zero.
 if (startParam&&startParam->viewId()==NmUiViewMessageList &&
-startParam->folderId()!=0) {
+startParam->mailboxId() != 0 ) {
 // Delete existing start parameter data
 delete mStartParam;
 mStartParam = NULL;
 // Store new start parameter data
 mStartParam = startParam;
 // Refresh the mailbox name
 setMailboxName();
 // Store active folder type
-mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());
+mCurrentFolderType=NmFolderInbox;
+if (startParam->folderId()!=0){
+mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());
+}
 // Update folder name
 setFolderName();
 // Set sync icon if needed
 updateSyncIcon();
+// Reconstruct the tool bar. This needed because, for example, the
+// search button needs the new mailbox ID.
+createToolBar();
 }
 else {
 NM_ERROR(1,"nmailui: invalid message list start parameter");
 // Unused start parameter needs to be deleted
 delete startParam;
 NM_FUNCTION;
 return NmUiViewMessageList;
 }
-/*!
-Refresh list
+/*!
+Refresh the message list.
 */
 void NmMessageListView::refreshList()
 {
 NM_FUNCTION;
 if (mMessageListModel) {
-NmId mailboxId = mMessageListModel->currentMailboxId();
+NmId mailboxId = mStartParam->mailboxId();
-// In each refresh, e.g. in folder change the UI signals
-// lower layer about the folder that has been opened.
+// In each refresh, e.g. in folder change the UI signals lower layer
+// about the folder that has been opened.
 if (mStartParam){
 mUiEngine.updateActiveFolder(mailboxId, mStartParam->folderId());
-NmFolderType folderType = mUiEngine.folderTypeById(mStartParam->mailboxId(),
+NmFolderType folderType(NmFolderInbox);
-mStartParam->folderId());
+if (mStartParam->folderId()!= 0){
-if (folderType == NmFolderInbox) { // If the new folder is an inbox, first automatic sync should be shown
+folderType = mUiEngine.folderTypeById(mStartParam->mailboxId(),
+mStartParam->folderId());
+}
+// If the new folder is an inbox, first automatic sync should be shown
+if (folderType == NmFolderInbox) {
 mIsFirstSyncInMessageList = true;
 }
 }
 // Set item model to message list widget
 if (mMessageListWidget) {
 mMessageListWidget->setModel(static_cast<QStandardItemModel*>(mMessageListModel));
 QObject::connect(mMessageListModel, SIGNAL(rowsInserted(const QModelIndex&,int,int)),
 this, SLOT(itemsAdded(const QModelIndex&,int,int)),Qt::UniqueConnection);
 QObject::connect(mMessageListModel, SIGNAL(rowsRemoved(const QModelIndex&,int,int)),
 this, SLOT(itemsRemoved()),Qt::UniqueConnection);
 QObject::connect(mMessageListModel, SIGNAL(setNewParam(NmUiStartParam*)),
 this, SLOT(reloadViewContents(NmUiStartParam*)),Qt::UniqueConnection);
 mPreviousModelCount=mMessageListModel->rowCount();
-if (mPreviousModelCount==0){
+if (mPreviousModelCount == 0) {
 showNoMessagesText();
 }
-else{
+else {
 hideNoMessagesText();
 }
 }
-}
-}
+// Notify the mail agent.
+NmUiEventsNotifier::notifyViewStateChanged(NmUiEventsNotifier::NmViewShownEvent,
+NmUiViewMessageList,
+mStartParam->mailboxId());
+}
+}
 /*!
 Sync state event handling
 */
 void NmMessageListView::handleSyncStateEvent(NmSyncState syncState, const NmId &mailboxId)
 mStartParam->setFolderId(folderId);
 }
 // Show sync icon only for the first automatic sync after opening message list.
 // Sync icon for manual sync is shown in NmUiEngine::refreshMailbox, not here.
 if (mIsFirstSyncInMessageList) {
-				mUiEngine.enableSyncIndicator(true);
+// Show the indicator only if the application is in the foreground
+if (mApplication.isForeground()) {
+mUiEngine.enableSyncIndicator(true);
+}
 mIsFirstSyncInMessageList = false;
 }
 }
 }
 }
 // Create start params
 NmUiStartParam* startParam = new NmUiStartParam(NmUiViewMessageList,
 mSelectedMailboxId,
 mSelectedFolderId);
 // Store active folder type
-mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());
+mCurrentFolderType=NmFolderInbox;
+if (startParam->folderId()!=0){
+mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());
+}
 // Reload view, ownership of the startparams is passed and old startparams
 // are deleted within reloadViewContents function
 reloadViewContents(startParam);
 // Set folder text to status bar
 setFolderName();

changeset 65	478bc57ad291
parent 59	16ed8d08d0b1
child 72	64e38f08e49c