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

equal deleted inserted replaced

-:997a02608b3a
+:16ed8d08d0b1
 static const char *NMUI_MESSAGE_LIST_NO_MESSAGES = "MessageListNoMessages";
 static const char *NMUI_MESSAGE_LIST_FOLDER_LABEL = "labelGroupBox";
 #include "nmuiheaders.h"
-const QString syncIndicatorName = "com.nokia.nmail.indicatorplugin.sync/1.0";
+/*!
-/*!
 	\class NmMessageListView
 	\brief Message list view
 */
 /*!
 this, SLOT(handleSyncStateEvent(NmSyncState, const NmId &)));
 // Menu needs one dummy item so that aboutToShow signal is emitted.
 NmAction *dummy = new NmAction(0);
 menu()->addAction(dummy);
+// Set sync icon if needed
+updateSyncIcon();
 }
 else {
 NM_ERROR(1,"nmailui: resource loading failed");
 }
 }
 /*!
 initTreeView
 */
 void NmMessageListView::initTreeView()
 {
 NM_FUNCTION;
 // Get mailbox widget pointer and set parameters
 if (mMessageListWidget){
 QObject::connect(mMessageListWidget,
 SIGNAL(activated(const QModelIndex &)), this,
 {
 NM_FUNCTION;
 // Check start parameter validity, message view cannot
 // be updated if given parameter is zero.
-if (startParam&&startParam->viewId()==NmUiViewMessageList&&
+if (startParam&&startParam->viewId()==NmUiViewMessageList &&
 startParam->folderId()!=0) {
 // Delete existing start parameter data
 delete mStartParam;
-mStartParam=NULL;
+mStartParam = NULL;
 // Store new start parameter data
-mStartParam=startParam;
+mStartParam = startParam;
-// Update the model with new parameters
+// Disconnect signals from previous model
+QObject::disconnect(mMessageListModel, SIGNAL(rowsInserted(const QModelIndex&,int,int)),
+this, SLOT(itemsAdded(const QModelIndex&,int,int)));
+QObject::disconnect(mMessageListModel, SIGNAL(rowsRemoved(const QModelIndex&,int,int)),
+this, SLOT(itemsRemoved()));
+QObject::disconnect(mMessageListModel, SIGNAL(setNewParam(NmUiStartParam*)),
+this, SLOT(reloadViewContents(NmUiStartParam*)));
+// Update model pointer and refresh mailbox with new model
 mMessageListModel = &mUiEngine.messageListModel(startParam->mailboxId(), startParam->folderId());
 refreshList();
-// Refresh the mailboxname
+// Refresh the mailbox name
 setMailboxName();
+// Store active folder type
+mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());
+// Update folder name
+setFolderName();
+// Set sync icon if needed
+updateSyncIcon();
 }
 else {
 NM_ERROR(1,"nmailui: invalid message list start parameter");
 // Unused start parameter needs to be deleted
 delete startParam;
 }
 }
 /*!
 Return view id
 */
 NmUiViewId NmMessageListView::nmailViewId() const
 {
 void NmMessageListView::refreshList()
 {
 NM_FUNCTION;
 if (mMessageListModel) {
 NmId mailboxId = mMessageListModel->currentMailboxId();
 // 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(),
 mStartParam->folderId());
 if (folderType == NmFolderInbox) { // If the new folder is an inbox, first automatic sync should be shown
 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)));
+this, SLOT(itemsAdded(const QModelIndex&,int,int)),Qt::UniqueConnection);
 QObject::connect(mMessageListModel, SIGNAL(rowsRemoved(const QModelIndex&,int,int)),
-this, SLOT(itemsRemoved()));
+this, SLOT(itemsRemoved()),Qt::UniqueConnection);
 QObject::connect(mMessageListModel, SIGNAL(setNewParam(NmUiStartParam*)),
-this, SLOT(reloadViewContents(NmUiStartParam*)));
+this, SLOT(reloadViewContents(NmUiStartParam*)),Qt::UniqueConnection);
 mPreviousModelCount=mMessageListModel->rowCount();
 if (mPreviousModelCount==0){
 showNoMessagesText();
 }
 else{
 hideNoMessagesText();
 }
 }
 }
 }
 /*!
 Sync state event handling
 */
-void NmMessageListView::handleSyncStateEvent(NmSyncState syncState, const NmId & mailboxId)
+void NmMessageListView::handleSyncStateEvent(NmSyncState syncState, const NmId &mailboxId)
 {
 NM_FUNCTION;
 if (mMessageListModel && mailboxId == mMessageListModel->currentMailboxId()) {
 if (syncState == Synchronizing) {
 // before first sync inbox id might be zero
 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) {
-HbIndicator indicator;
+				mUiEngine.enableSyncIndicator(true);
-indicator.activate(syncIndicatorName, QVariant());
 mIsFirstSyncInMessageList = false;
 }
 }
 }
 }
 /*!
 folder selection handling within current mailbox
 */
 void NmMessageListView::folderSelected()
 {
 NM_FUNCTION;
 // Store active folder type
 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
+// Set folder text to status bar
 setFolderName();
 }
 }
 /*!
 Long keypress handling
 */
 void NmMessageListView::showItemContextMenu(HbAbstractViewItem *listViewItem, const QPointF &coords)
 {
 NM_FUNCTION;
 if (listViewItem) {
 // Recreate item context menu each time it is called
 if (mItemContextMenu){
 mItemContextMenu->clearActions();
 delete mItemContextMenu;
 mItemContextMenu=NULL;
 }
 mItemContextMenu = new HbMenu();
 // Store long press item for later use with response
 mLongPressedItem = mMessageListModel->data(
 */
 void NmMessageListView::setFolderName()
 {
 NM_FUNCTION;
-if (mStartParam&&mFolderLabel){
+if (mStartParam && mFolderLabel){
 switch (mCurrentFolderType) {
 case NmFolderOutbox:
 {
 mFolderLabel->setHeading(hbTrId("txt_mail_subhead_outbox"));
 }
 /*!
 Handles the addition of a new item. Makes sure the message list widget is
 visible and keeps the scroll position on the top of the list.
 \param parent Not used.
 \param start
 \param end Not used.
 */
 void NmMessageListView::itemsAdded(const QModelIndex &parent, int start, int end)
 {
 NM_FUNCTION;
 }
 }
 }
 // Store model count
 if (mMessageListModel){
 mPreviousModelCount=mMessageListModel->rowCount();
 }
 }
 /*!
 void NmMessageListView::itemsRemoved()
 {
 NM_FUNCTION;
 // Store model count
 if (mMessageListModel){
 mPreviousModelCount=mMessageListModel->rowCount();
 }
 if (mPreviousModelCount == 0){
 showNoMessagesText();
 }
 }
 mNoMessagesLabel->hide();
 mMessageListWidget->show();
 }
 }
+/*!
+Updates sync icon based on sync status from the plugin.
+*/
+void NmMessageListView::updateSyncIcon()
+{
+if (mStartParam) {
+NmSyncState syncState = mUiEngine.syncState(mStartParam->mailboxId());
+if (syncState==Synchronizing) {
+mUiEngine.enableSyncIndicator(true);
+}
+else {
+mUiEngine.enableSyncIndicator(false);
+}
+}
+}

changeset 59	16ed8d08d0b1
parent 54	997a02608b3a
child 65	478bc57ad291