FCL/sf/app/commonemail: comparison emailuis/nmailuiengine/src/nmbaseclientplugin.cpp

equal deleted inserted replaced

-:139d4b7b2938
+:99bcbff212ad
 mUiEngine(NULL),
 mEditorToolBarRequest(NULL),
 mViewerToolBarRequest(NULL),
 mViewerViewRequest(NULL)
 {
-NMLOG("NmBaseClientPlugin::NmBaseClientPlugin()-->");
+NM_FUNCTION;
 mUiEngine = NmUiEngine::instance();
-NMLOG("<--NmBaseClientPlugin::NmBaseClientPlugin()");
 }
 /*!
 Destructor.
 */
 NmBaseClientPlugin::~NmBaseClientPlugin()
 {
-NMLOG("NmBaseClientPlugin::~NmBaseClientPlugin()-->");
+NM_FUNCTION;
 NmUiEngine::releaseInstance(mUiEngine);
 mUiEngine = NULL;
-NMLOG("<--NmBaseClientPlugin::~NmBaseClientPlugin()");
+}
-}
 /*!
-Provides list of supported NmActions.
+Provides a list of supported NmActions.
 Implementation of NmUiExtensionInterface.
 Parameter \a request controls list of request services.
 Parameter \a actionList is updated by supported NmActions.
 */
-void NmBaseClientPlugin::getActions(
+void NmBaseClientPlugin::getActions(const NmActionRequest &request,
-const NmActionRequest &request,
+QList<NmAction *> &actionList)
-QList<NmAction *> &actionList)
+{
-{
+NM_FUNCTION;
-NMLOG("NmBaseClientPlugin::getActions()-->");
 if (request.observer()) {
 switch (request.contextView()) {
 case NmActionContextViewMessageList:
+case NmActionContextViewMessageSearchList:
 {
 createMessageListCommands(request, actionList);
 break;
 }
 case NmActionContextViewViewer:
 createEditorViewCommands(request, actionList);
 break;
 }
 default:
 {
-NMLOG(QString("NmBaseClientPlugin::getActions(): Unknown contextView()=%1").arg(request.contextView()));
+NM_COMMENT(QString("NmBaseClientPlugin::getActions(): unknown contextView()=%1").arg(request.contextView()));
 break;
 }
 }
 }
-NMLOG("<--NmBaseClientPlugin::getActions()");
+}
-}
 /*!
 Public slot connected to options menu refresh NmAction.
 Refreshes mailbox using the NmUiEngine instance.
 */
 void NmBaseClientPlugin::refresh()
 {
-NMLOG("NmBaseClientPlugin::refresh()-->");
+NM_FUNCTION;
 int err = mUiEngine->refreshMailbox(mMenuRequest.mailboxId());
 if (NmNoError != err) {
 // Failed to refresh the mailbox!
-NMLOG(QString("NmBaseClientPlugin::refresh(): failed err=%1").arg(err));
+NM_ERROR(1,QString("NmBaseClientPlugin::refresh(): failed err=%1").arg(err));
 }
-NMLOG("<--NmBaseClientPlugin::refresh()");
 }
 /*!
 Public slot connected to triggered() signal of open message action instance.
 The method sends an open response command to the action observer.
 */
 void NmBaseClientPlugin::openMessage()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandOpen, mMenuRequest);
 }
 /*!
 Public slot connected to delete message. Method asks UI engine to delete messages
 */
 void NmBaseClientPlugin::deleteMessage()
 {
-NMLOG("NmBaseClientPlugin::deleteMessage()-->");
+NM_FUNCTION;
 QList<NmId> messageList;
 messageList.append(mMenuRequest.messageId());
 int err = mUiEngine->deleteMessages(mMenuRequest.mailboxId(),
 mMenuRequest.folderId(),
 messageList);
 if (NmNoError != err) {
 // Failed to delete the messages!
-NMLOG(QString("NmBaseClientPlugin::deleteMessage(): failed err=%1").arg(err));
+NM_ERROR(1,QString("NmBaseClientPlugin::deleteMessage(): failed err=%1").arg(err));
 }
 messageList.clear();
-NMLOG("<--NmBaseClientPlugin::deleteMessage()");
 }
 /*!
 Public slot connected to triggered() signal of delete action instance.
 The method sends a delete mail command to the action observer.
 */
 void NmBaseClientPlugin::deleteMessageFromViewerView()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandDeleteMail, mViewerViewRequest);
 }
 /*!
 Public slot connected to triggered() signal of create mail action instance.
 The method sends a new mail command to the action observer.
 */
 void NmBaseClientPlugin::createNewMailViewerToolBar()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandNewMail, mViewerToolBarRequest);
 }
 /*!
 Public slot for handling the event of menu request for creating a new email.
 The method sends a new mail command to the action observer of the menu request.
 */
 void NmBaseClientPlugin::createNewMail()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandNewMail, mMenuRequest);
 }
 /*!
 Public slot connected to options menu settings NmAction.
 Opens mailbox settings.
 */
 void NmBaseClientPlugin::settings()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandSettings, mMenuRequest);
 }
 /*!
 Public slot connected to triggered() signal of send mail action instance.
 Sends the send mail command to the action observer.
 */
 void NmBaseClientPlugin::sendMail()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandSendMail, mEditorToolBarRequest);
 }
 /*!
 Public slot connected to triggered() signal of reply action instance of the
 toolbar. Sends a reply mail command to the action observer.
 */
 void NmBaseClientPlugin::replyMail()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandReply, mViewerViewRequest);
 }
 /*!
 Public slot connected to triggered signal of reply all action instance of
 the toolbar. Sends a reply all mail command to the action observer.
 */
 void NmBaseClientPlugin::replyAllMail()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandReplyAll, mViewerViewRequest);
 }
 /*!
 Public slot connected to triggered() signal of forward action instance of
 the toolbar. Sends a forward mail command to the action observer.
 */
 void NmBaseClientPlugin::forwardMail()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandForward, mViewerViewRequest);
 }
 /*!
 Public slot connected to set high priority toolbar action.
 */
 void NmBaseClientPlugin::setPriorityHigh()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandPriorityHigh, mMenuRequest);
 }
 /*!
 Public slot connected to set normal priority toolbar action.
 */
 void NmBaseClientPlugin::setPriorityNormal()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandNone, mMenuRequest);
 }
 /*!
 Public slot connected to set low priority toolbar action.
 */
 void NmBaseClientPlugin::setPriorityLow()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandPriorityLow, mMenuRequest);
 }
 /*!
 Public slot connected to attach toolbar action.
 */
 void NmBaseClientPlugin::attach()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandAttach, mEditorToolBarRequest);
 }
 /*!
 Public slot connected to remove attachment context menu action
 */
 void NmBaseClientPlugin::removeAttachment()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandRemoveAttachment, mMenuRequest);
 }
 /*!
 Public slot connected to open attachment context menu action
 */
 void NmBaseClientPlugin::openAttachment()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandOpenAttachment, mMenuRequest);
 }
 /*!
 Requests the handling of the search action.
 This public slot gets called when the search button in a toolbar is clicked.
 */
 void NmBaseClientPlugin::search()
 {
+NM_FUNCTION;
 handleRequest(NmActionResponseCommandSearch, mViewerToolBarRequest);
 }
 /*!
 Private slot connected to settings view launcher.
 \param type type of change.
 */
 void NmBaseClientPlugin::mailboxListChanged(const NmId &mailboxId,
 NmSettings::MailboxEventType type)
 {
+NM_FUNCTION;
 Q_UNUSED(mailboxId)
 Q_UNUSED(type)
 handleRequest(NmActionResponseCommandMailboxDeleted, mMenuRequest);
 }
 \param value
 */
 void NmBaseClientPlugin::mailboxPropertyChanged(const NmId &mailboxId, QVariant property,
 QVariant value)
 {
+NM_FUNCTION;
 Q_UNUSED(property)
 Q_UNUSED(value)
 NmActionObserver *observer = mMenuRequest.observer();
 if (observer) {
 // Force model item to be updated, because framework adapter sends it too slowly.
-// Data changed signal is not emitted by this change, it is send when ever famework adapter
+mUiEngine->mailboxListModel().refreshModelItem(mailboxId);
-// calls data model's handleMailboxEvent method.
-mUiEngine->mailboxListModel().refreshModelItem(mailboxId, false);
 // Notify view of changes.
 NmActionResponse response(NmActionResponseCommandUpdateMailboxName, mMenuRequest);
 observer->handleActionCommand(response);
 }
 Private slot connected to settings view launcher.
 \param mailboxId Id of mailbox.
 */
 void NmBaseClientPlugin::goOnline(const NmId &mailboxId)
 {
+NM_FUNCTION;
 		(void) mUiEngine->refreshMailbox(mailboxId);
 }
 /*!
 Private slot connected to settings view launcher.
 \param mailboxId Id of mailbox.
 */
 void NmBaseClientPlugin::goOffline(const NmId &mailboxId)
 {
+NM_FUNCTION;
 mUiEngine->goOffline(mailboxId);
 }
 /*!
 Create messagelist command actions.
 */
 void NmBaseClientPlugin::createMessageListCommands(
 const NmActionRequest &request,
 QList<NmAction *> &actionList)
 {
-NMLOG("NmBaseClientPlugin::createMessageListCommands()-->");
+NM_FUNCTION;
 switch (request.menuType()) {
 case NmActionOptionsMenu:
 {
 mMenuRequest = request;
 folderType!=NmFolderDrafts ){
 NmMessageEnvelope *envelope =
 request.requestData().value<NmMessageEnvelope*>();
 if (envelope){
 if (envelope->isRead()){
-NMLOG("nmailui: envelope is read");
+NM_COMMENT("nmailui: envelope is read");
 NmAction* unreadAction = new NmAction(0);
 unreadAction->setObjectName("baseclientplugin_unreadaction");
 unreadAction->setText(hbTrId("txt_mail_menu_mark_as_unread"));
 connect(unreadAction,
 SLOT(markAsUnread()));
 actionList.append(unreadAction);
 }
 else {
-NMLOG("nmailui: envelope is unread");
+NM_COMMENT("nmailui: envelope is unread");
 NmAction* readAction = new NmAction(0);
 readAction->setObjectName("baseclientplugin_readaction");
 readAction->setText(hbTrId("txt_mail_menu_mark_as_read"));
 connect(readAction,
 }
 break;
 }
 default:
 {
-NMLOG(QString("NmBaseClientPlugin::createMessageListCommands(): Unknown menuType()=%1").arg(request.menuType()));
+NM_COMMENT(QString("NmBaseClientPlugin::createMessageListCommands(): unknown menuType()=%1").arg(request.menuType()));
 break;
 }
 }
-NMLOG("<--NmBaseClientPlugin::createMessageListCommands()");
 }
 /*!
 Create Viewer view command actions.
 Internal helper method.
 */
 void NmBaseClientPlugin::createViewerViewCommands(
 const NmActionRequest &request,
 QList<NmAction *> &actionList)
 {
-NMLOG("NmBaseClientPlugin::createViewerViewCommands()-->");
+NM_FUNCTION;
 switch (request.menuType()) {
 	case NmActionOptionsMenu:
 		{
 			mViewerViewRequest = request;
 actionList.append(deleteAction);
 break;
 }
 default:
 {
-NMLOG(QString("NmBaseClientPlugin::createViewerViewCommands(): Unknown menuType()=%1").arg(request.menuType()));
+NM_COMMENT(QString("NmBaseClientPlugin::createViewerViewCommands(): unknown menuType()=%1").arg(request.menuType()));
 break;
 }
 }
 }
 */
 void NmBaseClientPlugin::createEditorViewCommands(
 const NmActionRequest &request,
 QList<NmAction *> &actionList)
 {
-NMLOG("NmBaseClientPlugin::createEditorViewCommands()-->");
+NM_FUNCTION;
 switch (request.menuType()) {
 case NmActionToolbar:
 {
 mEditorToolBarRequest = request;
 actionList.append(sendAction);
 break;
 }
 default:
 {
-NMLOG(QString("NmBaseClientPlugin::createEditorViewCommands(): Unknown menuType()=%1").arg(request.menuType()));
+NM_COMMENT(QString("NmBaseClientPlugin::createEditorViewCommands(): unknown menuType()=%1").arg(request.menuType()));
 break;
 }
 }
-NMLOG("<--NmBaseClientPlugin::createEditorViewCommands()");
 }
 /*!
 Marks the message as read.
 */
 void NmBaseClientPlugin::markAsRead()
 {
-NMLOG("NmBaseClientPlugin::markAsRead()-->");
+NM_FUNCTION;
 updateEnvelopeProperty(MarkAsRead);
-NMLOG("<--NmBaseClientPlugin::markAsRead()");
 }
 /*!
 Marks the message as unread.
 */
 void NmBaseClientPlugin::markAsUnread()
 {
-NMLOG("NmBaseClientPlugin::markAsUnread()-->");
+NM_FUNCTION;
 updateEnvelopeProperty(MarkAsUnread);
-NMLOG("<--NmBaseClientPlugin::markAsUnread()");
 }
 /*!
 Handles requests.
 */
 void NmBaseClientPlugin::handleRequest(NmActionResponseCommand command, const NmActionRequest &request)
 {
+NM_FUNCTION;
 NmActionObserver *observer = request.observer();
 if (observer) {
 NmActionResponse response(command, request);
 observer->handleActionCommand(response);
 }
 /*!
 Store envelope property.
 */
 void NmBaseClientPlugin::updateEnvelopeProperty(NmEnvelopeProperties property)
 {
-NMLOG("NmBaseClientPlugin::updateEnvelopeProperty()-->");
+NM_FUNCTION;
 QList<const NmMessageEnvelope*> envelopeList;
 NmMessageEnvelope *envelope =
 mMenuRequest.requestData().value<NmMessageEnvelope*>();
 if (envelope) {
 mMenuRequest.folderId(),
 property,
 envelopeList);
 }
 envelopeList.clear();
-NMLOG("<--NmBaseClientPlugin::updateEnvelopeProperty()");
+}
-}

changeset 43	99bcbff212ad
parent 40	2c62ef3caffd
child 66	084b5b1f02a7