diff -r 15bc1d5d6267 -r ae34e1715e21 emailuis/nmailui/src/nmeditorview.cpp --- a/emailuis/nmailui/src/nmeditorview.cpp Fri Jul 23 19:09:50 2010 +0300 +++ b/emailuis/nmailui/src/nmeditorview.cpp Thu Aug 05 21:09:09 2010 +0300 @@ -22,8 +22,10 @@ // extension list item frame. static const QString NmPopupListFrame = "qtg_fr_popup_list_normal"; - static const QString NmDelimiter("; "); +static const QString NmPriorityLow("low"); +static const QString NmPriorityNormal("normal"); +static const QString NmPriorityHigh("high"); /*! \class NmEditorView @@ -56,7 +58,8 @@ mAttachmentPicker(NULL), mCcBccFieldVisible(false), mServiceSendingDialog(NULL), - mIsNotFetchedBefore(true) + mIsNotFetchedBefore(true), + mHiddenPriorityName(NmPriorityNormal) { NM_FUNCTION; @@ -409,11 +412,12 @@ startParam.mailboxId(), startParam.folderId(), startParam.messageId()); - mIsNotFetchedBefore = false; } else { startMessageCreation(startParam); } + + mIsNotFetchedBefore = false; } } @@ -958,7 +962,10 @@ QList list; extMngr.getActions(request, list); for (int i = 0; i < list.count(); i++) { - mPrioritySubMenu->addAction(list[i]); + // check what priority has already been selected and hide it from options menu + if (!list[i]->objectName().contains(mHiddenPriorityName)) { + mPrioritySubMenu->addAction(list[i]); + } } mPrioritySubMenu->setObjectName("editorPrioritySubMenu"); mPrioritySubMenu->setTitle(hbTrId("txt_mail_opt_add_priority")); @@ -1371,12 +1378,15 @@ if (mMessage) { NmMessagePriority messagePriority = NmMessagePriorityNormal; + mHiddenPriorityName = NmPriorityNormal; if (priority == NmActionResponseCommandPriorityHigh) { messagePriority = NmMessagePriorityHigh; + mHiddenPriorityName = NmPriorityHigh; } else if (priority == NmActionResponseCommandPriorityLow) { messagePriority = NmMessagePriorityLow; + mHiddenPriorityName = NmPriorityLow; } mMessage->envelope().setPriority(messagePriority); }