FCL/sf/app/messaging: comparison messagingapp/msgui/unifiededitor/src/msgunieditorview.cpp

equal deleted inserted replaced

-:ecf6a73a9186
+:60a8a215b0ec
 // SYSTEM INCLUDES
 #include <e32base.h>
 #include <HbMenu>
 #include <HbAction>
-#include <HbToolBar>
 #include <QGraphicsLinearLayout>
-#include <HbGroupBox>
-#include <HbScrollArea>
 #include <QDateTime>
 #include <QDir>
 #include <QBuffer>
 #include <QFile>
 #include <QFileInfo>
+#include <QApplication>
 #include <xqconversions.h>
-#include <HbToolBarExtension>
-#include <HbListWidget>
-#include <HbFrameBackground>
-#include <HbListViewItem>
-#include <HbListWidgetItem>
 #include <HbNotificationDialog>
 #include <HbDeviceNotificationDialog>
 #include <HbMessageBox>
-#include <HbAbstractVkbHost>
 #include <HbMainWindow>
 #include <xqaiwrequest.h>
 #include <xqappmgr.h>
 #include <HbStyleLoader>
+#include<HbInputMethod>
+#include <QTimer>
+#include<QInputContext>
 // QT Mobility for fetching business card
 #include <qmobilityglobal.h>
 #include <qversitwriter.h>
 #include <qversitdocument.h>
 #include <qcontact.h>
 #include <commonphoneparser.h>      // Common phone number validity checker
 // USER INCLUDES
 #include "debugtraces.h"
 #include "msgunieditorview.h"
-#include "msgunieditoraddress.h"
-#include "msgunieditorsubject.h"
-#include "msgunieditorbody.h"
 #include "msgunieditormonitor.h"
-#include "msgunieditorattachmentcontainer.h"
 #include "msgsendutil.h"
 #include "convergedmessageaddress.h"
 #include "UniEditorGenUtils.h"
 #include "unieditorpluginloader.h"
 #include "unieditorplugininterface.h"
 #include "msgsettingsview.h"
 #include "msgcontacthandler.h"
 #include "msgaudiofetcherdialog.h"
+#include "msgunieditorscrollarea.h"
+#include "msgunieditorbodyeditor.h"
 QTM_USE_NAMESPACE
 // Constants
-const QString SEND_ICON("qtg_mono_send");
-const QString ATTACH_ICON("qtg_mono_attach");
 // temporary folder for unieditor
 const QString UNIFIED_EDITOR_TEMP_FOLDER("unifiededitor");
 // invalid chars in vcard
 const QString INVALID_FILENAME_CHARS("[?*<>/\"|\\:]");
 // replacement char for invalid char
 // TODO: how we can avoid this?
 const int MAX_VCARDS(1000);
 // LOCALIZED CONSTANTS
 #define LOC_TITLE hbTrId("txt_messaging_title_messaging")
-//To,Cc.Bcc
-#define LOC_TO  hbTrId("txt_messaging_formlabel_to")
-#define LOC_CC hbTrId("txt_messaging_formlabel_cc")
-#define LOC_BCC hbTrId("txt_messaging_formlabel_bcc")
 //attach options
 #define LOC_PHOTO           hbTrId("txt_messaging_opt_attach_sub_photo")
 #define LOC_SOUND           hbTrId("txt_messaging_opt_attach_sub_sound")
 #define LOC_BUSINESS_CARD   hbTrId("txt_messaging_opt_sub_business_card")
-//options menu.
+////options menu.
+#define LOC_ATTACH          hbTrId("txt_messaging_opt_attach")
 #define LOC_ADD_SUBJECT     hbTrId("txt_messaging_opt_add_subject")
 #define LOC_ADD_CC_BCC      hbTrId("txt_messaging_opt_add_cc_bcc")
 #define LOC_PRIORITY        hbTrId("txt_messaging_opt_priority")
 #define LOC_DELETE_MESSAGE  hbTrId("txt_messaging_opt_delete_message")
 //priority sub menu
 #define LOC_HIGH hbTrId("txt_messaging_opt_attach_sub_high")
 #define LOC_NORMAL hbTrId("txt_messaging_opt_attach_sub_normal")
 #define LOC_LOW hbTrId("txt_messaging_opt_attach_sub_low")
-//group box
-#define LOC_OTHER_RECIPIENTS(n) hbTrId("txt_messaging_title_ln_other_recipients",n)
-#define LOC_OTHER_RECIPIENTS_EXPAND hbTrId("txt_messaging_title_other_recipients")
 //saved to draft note
 #define LOC_SAVED_TO_DRAFTS    hbTrId("txt_messaging_dpopinfo_saved_to_drafts")
 //delete confermation
 #define LOC_NOTE_DELETE_MESSAGE hbTrId("txt_messaging_dialog_delete_message")
-// attachment addition failure note
-#define LOC_UNABLE_TO_ADD_ATTACHMENTS hbTrId("txt_messaging_dpopinfo_unable_to_attach_l1_of_l2")
-//extension list item frame.
-const QString POPUP_LIST_FRAME("qtg_fr_popup_list_normal");
 //settings confirmation
 #define LOC_DIALOG_SMS_SETTINGS_INCOMPLETE hbTrId("txt_messaging_dialog_sms_message_centre_does_not_e")
 #define LOC_DIALOG_MMS_SETTINGS_INCOMPLETE hbTrId("txt_messaging_dialog_mms_access_point_not_defined")
 #define LOC_NOTE_FILES_MISSED_DRAFTS hbTrId("txt_messaging_dpopinfo_some_files_in_the_message")
 // MsgUnifiedEditorView::MsgUnifiedEditorView
 // @see header file
 //---------------------------------------------------------------
 MsgUnifiedEditorView::MsgUnifiedEditorView( QGraphicsItem *parent ) :
 MsgBaseView(parent),
-mSubjectAction(0),
-mCcBccAction(0),
-mSendAction(0),
 mMainLayout(0),
-mSubjectField(0),
-mToField(0),
-mCcField(0),
-mBccField(0),
-mBody(0),
-mContentWidget(0),
 mMsgMonitor(0),
-mAttachmentContainer(0),
 mPluginLoader(0),
 mCanSaveToDrafts(true),
 mVkbHost(NULL),
 	mDialog(NULL),
 mOriginatingSC(0),
 mOriginatingSME(0),
-mReplyPath(false)
+mReplyPath(false),
-{
+mSubjectAction(0),
-connect(this->mainWindow(),SIGNAL(viewReady()),this,SLOT(doDelayedConstruction()));
+mCcBccAction(0),
+mPhotoAction(0),
-addToolBar();
+mSoundAction(0),
+mFocusedWidget(0),
+mMinHeight(0.0),
+mMaxHeight(0.0)
+{
+connect(this->mainWindow(),SIGNAL(viewReady()),this,SLOT(doDelayedConstruction()));
 initView();
+addMenu();
 }
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::~MsgUnifiedEditorView
 // @see header file
 void MsgUnifiedEditorView::initView()
 {
 if (!HbStyleLoader::registerFilePath(":/layouts")) {
 QDEBUG_WRITE("ERROR: MsgUnifiedEditorView -> HbStyleLoader::registerFilePath");
 }
-HbScrollArea* scrollArea = new HbScrollArea(this);
-this->setWidget(scrollArea);
+//message monitor.
+mMsgMonitor = new MsgUnifiedEditorMonitor(this);
-mContentWidget = new HbWidget(this);
-scrollArea->setContentWidget(mContentWidget);
+//Set the invalid msg id
+mOpenedMessageId.setId(-1);
-mMainLayout = new QGraphicsLinearLayout(Qt::Vertical, mContentWidget);
+mMainLayout = new QGraphicsLinearLayout(Qt::Vertical, this);
 qreal vTopSpacing = 0.0;
 qreal vItemSpacing = 0.0;
 style()->parameter("hb-param-margin-gene-top",vTopSpacing);
 style()->parameter("hb-param-margin-gene-middle-vertical",vItemSpacing);
 mMainLayout->setContentsMargins(0,vTopSpacing,0,0);
 mMainLayout->setSpacing(vItemSpacing);
-mMsgMonitor = new MsgUnifiedEditorMonitor(this);
+mScrollArea = new MsgUnifiedEditorScrollArea(mMsgMonitor,this);
-connect(mMsgMonitor, SIGNAL(enableSend(bool)), this, SLOT(enableSendButton(bool)));
+mMainLayout->addItem(mScrollArea);
-mToField = new MsgUnifiedEditorAddress( LOC_TO, mContentWidget );
+mBodyEditor = new MsgUnifiedEditorBodyEditor(this);
-mBody = new MsgUnifiedEditorBody( mContentWidget);
+connect(mScrollArea,SIGNAL(enableMenuAction(int,bool)),this,SLOT(enableMenuAction(int,bool)));
-mMainLayout->addItem(mToField);
+connect(mBodyEditor, SIGNAL(contentsChanged(const QVariant&)),
-mMainLayout->addItem(mBody);
+mMsgMonitor,SLOT(handleContentsChanged(const QVariant&)));
-//Set the invalid msg id
+connect(mMsgMonitor,SIGNAL(enableSend(bool)),
-mOpenedMessageId.setId(-1);
+mBodyEditor,SLOT(enableSendButton(bool)));
-connect(mToField, SIGNAL(sendMessage()), this, SLOT(send()));
+connect(mBodyEditor,SIGNAL(sendMessage()),this,SLOT(send()));
-connect(mToField, SIGNAL(contentChanged()),
-mMsgMonitor, SLOT(handleContentChange()));
+connect(mMsgMonitor,SIGNAL(contentsChanged()),this,SLOT(onContentChanged()));
-connect(mToField, SIGNAL(contentChanged()),this,SLOT(onContentChanged()));
+mMainLayout->addItem(mBodyEditor);
-connect(mBody, SIGNAL(sendMessage()), this, SLOT(send()));
-connect(mBody, SIGNAL(contentChanged()),this,SLOT(onContentChanged()));
+}
-connect(mBody, SIGNAL(contentChanged()),
-mMsgMonitor, SLOT(handleContentChange()));
+//---------------------------------------------------------------
-connect(mBody, SIGNAL(enableSendButton(bool)), this, SLOT(enableSendButton(bool)));
+// MsgUnifiedEditorView::addMenu
+// @see header file
-}
+//---------------------------------------------------------------
 void MsgUnifiedEditorView::addMenu()
 {
 //Create Menu Options
 HbMenu* mainMenu = this->menu();
 mainMenu->setFocusPolicy(Qt::NoFocus);
-//if subject field / cc,bcc fields are already present don't add corresponding actions.
+//attach sub menu
-if(!mSubjectField)
+HbMenu* attachMenu = mainMenu->addMenu(LOC_ATTACH);
-{
+mPhotoAction = attachMenu->addAction(LOC_PHOTO,this,SLOT(fetchImages()));
-mSubjectAction = mainMenu->addAction(LOC_ADD_SUBJECT);
+mSoundAction = attachMenu->addAction(LOC_SOUND,this,SLOT(fetchAudio()));
-}
+attachMenu->addAction(LOC_BUSINESS_CARD,this,SLOT(fetchContacts()));
-if(!mCcField)
+//subject action
-{
+mSubjectAction = mainMenu->addAction(LOC_ADD_SUBJECT);
-mCcBccAction = mainMenu->addAction(LOC_ADD_CC_BCC);
+//CcBcc action
-}
+mCcBccAction = mainMenu->addAction(LOC_ADD_CC_BCC);
+connect(mSubjectAction,SIGNAL(triggered()),this, SLOT(addSubject()));
+connect(mCcBccAction,SIGNAL(triggered()),this, SLOT(addCcBcc()));
+//priority sub menu
 HbMenu* prioritySubMenu = mainMenu->addMenu(LOC_PRIORITY);
 HbAction* highPriorityAction = prioritySubMenu->addAction(LOC_HIGH);
 highPriorityAction->setData(ConvergedMessage::High);
 HbAction* normalPriorityAction = prioritySubMenu->addAction(LOC_NORMAL);
 normalPriorityAction->setData(ConvergedMessage::Normal);
 HbAction* lowPriorityAction = prioritySubMenu->addAction(LOC_LOW);
 lowPriorityAction->setData(ConvergedMessage::Low);
+connect(highPriorityAction, SIGNAL(triggered()), mScrollArea, SLOT(changePriority()));
+connect(normalPriorityAction, SIGNAL(triggered()), mScrollArea, SLOT(changePriority()));
+connect(lowPriorityAction, SIGNAL(triggered()), mScrollArea, SLOT(changePriority()));
 HbAction* deleteMsgAction = mainMenu->addAction(LOC_DELETE_MESSAGE);
-connect(mSubjectAction,SIGNAL(triggered()),this, SLOT(addSubject()));
-connect(mCcBccAction,SIGNAL(triggered()),this, SLOT(addCcBcc()));
-connect(highPriorityAction, SIGNAL(triggered()), this, SLOT(changePriority()));
-connect(normalPriorityAction, SIGNAL(triggered()), this, SLOT(changePriority()));
-connect(lowPriorityAction, SIGNAL(triggered()), this, SLOT(changePriority()));
 connect(deleteMsgAction,SIGNAL(triggered()),this, SLOT(deleteMessage()));
 }
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::openDraftsMessage
+// @see header file
+//---------------------------------------------------------------
 void MsgUnifiedEditorView::openDraftsMessage(const QVariantList& editorData)
 {
 // unpack editor's data
 // first arg is convergedmessage
 QByteArray dataArray = editorData.at(0).toByteArray();
 UniEditorPluginInterface* pluginInterface =
 mPluginLoader->getUniEditorPlugin(messageType);
 mOpenedMessageId.setId(messageId.getId());
-mmOpenedMessageType = messageType;
 //Fetch the converged message from the msgId
-ConvergedMessage* msg;
+ConvergedMessage* msg = pluginInterface->convertFrom(messageId.getId());
-msg = pluginInterface->convertFrom(messageId.getId());
 if( msg != NULL )
 {
 mReplyPath = msg->replyPath();
 if(mReplyPath)
 {
 mOriginatingSC = msg->originatingSC();
 mOriginatingSME = msg->toAddressList().at(0)->address();
 }
 //Populate the content inside editor
-populateContentIntoEditor(*msg,true); // true as it is  draft message
+populateContentIntoEditor(*msg,true,true); // true as it is  draft message
 delete msg;
 }
 mCanSaveToDrafts = false;
 }
-void MsgUnifiedEditorView::fetchMessageFromStore(
+//---------------------------------------------------------------
-ConvergedMessageId& messageId,
+// MsgUnifiedEditorView::fetchMessageFromStore
-ConvergedMessage::MessageType messageType,
+// @see header file
-int editorOperation)
+//---------------------------------------------------------------
+void MsgUnifiedEditorView::fetchMessageFromStore(ConvergedMessageId& messageId,
+ConvergedMessage::MessageType messageType, int editorOperation)
 {
 if(!mPluginLoader)
 {
 mPluginLoader = new UniEditorPluginLoader(this);
 }
 UniEditorPluginInterface* pluginInterface = NULL;
 if( messageType == ConvergedMessage::Mms )
 {
-pluginInterface =
+pluginInterface = mPluginLoader->getUniEditorPlugin(ConvergedMessage::Mms);
-mPluginLoader->getUniEditorPlugin(ConvergedMessage::Mms);
 }
 else // For sms,vcard,vcal cases
 {
-pluginInterface =
+pluginInterface = mPluginLoader->getUniEditorPlugin(ConvergedMessage::Sms);
-mPluginLoader->getUniEditorPlugin(ConvergedMessage::Sms);
 }
 //Fetch the converged message from the msgId
 ConvergedMessage* msg;
 msg = pluginInterface->convertFrom(messageId.getId(),
 mOriginatingSC = msg->originatingSC();
 mOriginatingSME = msg->toAddressList().at(0)->address();
 }
 }
 //Populate the content inside editor
-populateContentIntoEditor(*msg);
+populateContentIntoEditor(*msg,false,true);
 delete msg;
 }
 }
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::populateContent
+// @see header file
+//---------------------------------------------------------------
 void MsgUnifiedEditorView::populateContent(const QVariantList& editorData)
 {
 // unpack editor's data
 // first arg is convergedmessage
 QByteArray dataArray = editorData.at(0).toByteArray();
 // population logic based on editor Operation command
 switch(editorOp)
 {
 case MsgBaseView::ADD_SUBJECT:
 {
-addSubject();
+//setfocus also.
-setFocus(mSubjectField);
+addSubject(true);
 }
 break;
 case MsgBaseView::ADD_VCARD:
 {
 contactsFetched(editorData.at(2));
 case MsgBaseView::FORWARD_MSG:
 {
 fetchMessageFromStore(*messageDetails->id(),
 messageDetails->messageType(),
 UniEditorPluginInterface::Forward);
-}
+return;
-break;
+}
 case MsgBaseView::REPLY_MSG:
 {
 fetchMessageFromStore(*messageDetails->id(),
 messageDetails->messageType(),
 UniEditorPluginInterface::Reply);
-}
+return;
-break;
+}
 case MsgBaseView::REPLY_ALL_MSG:
 {
 fetchMessageFromStore(*messageDetails->id(),
 messageDetails->messageType(),
 UniEditorPluginInterface::ReplyAll);
-}
+return;
-break;
+}
 default:
 break;
 }
-// additional common operations for non-forwarded messages
+populateContentIntoEditor(*messageDetails,false,false);
-if(editorOp != MsgBaseView::FORWARD_MSG)
-{
-if(editorOp == MsgBaseView::ADD_RECIPIENTS)
-{
-// CV sends contact card address as the first address
-ConvergedMessageAddressList toAddresses =
-messageDetails->toAddressList();
-int addrCount = toAddresses.count();
-if(addrCount > 0)
-{
-// add contact card address first
-ConvergedMessageAddress *firstAddress =
-new ConvergedMessageAddress();
-firstAddress->setAlias(toAddresses.at(0)->alias());
-firstAddress->setAddress(toAddresses.at(0)->address());
-ConvergedMessageAddressList firstList;
-firstList << firstAddress;
-mToField->setAddresses(firstList);
-// add remaining contacts now
-ConvergedMessageAddressList otherList;
-for(int i=1; i<addrCount; i++)
-{
-otherList << toAddresses.at(i);
-}
-mToField->setAddresses(otherList);
-}
-}
-else
-{
-mToField->setAddresses(messageDetails->toAddressList());
-}
-QString bodyTxt = messageDetails->bodyText();
-mBody->setText(bodyTxt);
-int attachmentCount = messageDetails->attachments().count();
-QStringList pendingAttList;
-for(int i=0; i<attachmentCount; i++)
-{
-int imageSize=0;
-QString mimeType;
-TMsgMediaType mediaType = EMsgMediaUnknown;
-QString filePath = messageDetails->attachments().at(i)->filePath();
-UniEditorGenUtils* genUtils = q_check_ptr(new UniEditorGenUtils);
-TRAP_IGNORE(genUtils->getFileInfoL(filePath,imageSize,
-mimeType,mediaType));
-delete genUtils;
-switch(mediaType)
-{
-case EMsgMediaImage:
-{
-mBody->setImage(filePath);
-}
-break;
-case EMsgMediaAudio:
-{
-mBody->setAudio(filePath);
-}
-break;
-default:
-{
-pendingAttList << filePath;
-}
-break;
-}
-}
-// add pending attachments in bulk
-addAttachments(pendingAttList);
-}
 delete messageDetails;
 }
-void MsgUnifiedEditorView::populateContentIntoEditor(
+//---------------------------------------------------------------
-const ConvergedMessage& messageDetails,bool draftMessage)
+// MsgUnifiedEditorView::populateContentIntoEditor
+// @see header file
+//---------------------------------------------------------------
+void MsgUnifiedEditorView::populateContentIntoEditor(const ConvergedMessage& messageDetails,
+bool draftMessage,
+bool checkForInline)
 {
 // skip first-time MMS type switch note for draft
+if(draftMessage)
+{
 mMsgMonitor->setSkipNote(true);
-mToField->skipMaxRecipientQuery(true);
+}
-mToField->setAddresses(messageDetails.toAddressList(),draftMessage);
+//scrollarea populate contents
-if(messageDetails.ccAddressList().count() > 0 )
+mScrollArea->populateContent(messageDetails,draftMessage,checkForInline);
-{
-if(!mCcField)
+//body editor populate contents
-{
+mBodyEditor->populateContent(messageDetails);
-addCcBcc();
-}
-mCcField->setAddresses(messageDetails.ccAddressList(),draftMessage);
-}
-if(messageDetails.bccAddressList().count() > 0 )
-{
-if(!mBccField)
-{
-addCcBcc();
-}
-mBccField->setAddresses(messageDetails.bccAddressList(),draftMessage);
-}
-if(messageDetails.subject().size() > 0)
-{
-if(!mSubjectField)
-{
-addSubject();
-}
-mSubjectField->setText(messageDetails.subject());
-}
-if(messageDetails.priority()==ConvergedMessage::High ||
-messageDetails.priority() == ConvergedMessage::Low)
-{
-if(!mSubjectField)
-{
-addSubject();
-}
-mSubjectField->setPriority(messageDetails.priority());
-}
-QString bodyTxt = messageDetails.bodyText();
-mBody->setText(bodyTxt);
-ConvergedMessageAttachmentList attachmentList =
-messageDetails.attachments();
-int attachmentCount = attachmentList.count();
-UniEditorGenUtils* genUtils = q_check_ptr(new UniEditorGenUtils);
-QStringList pendingAttList;
-for( int i=0; i < attachmentCount; i++ )
-{
-QString filePath = messageDetails.attachments().at(i)->filePath();
-if(attachmentList.at(i)->attachmentType() ==
-ConvergedMessageAttachment::EInline)
-{
-int imageSize=0;
-QString mimeType;
-TMsgMediaType mediaType = EMsgMediaUnknown;
-TRAP_IGNORE(genUtils->getFileInfoL(filePath,imageSize,
-mimeType,mediaType));
-switch(mediaType)
-{
-case EMsgMediaImage:
-{
-mBody->setImage(filePath,draftMessage);
-break;
-}
-case EMsgMediaAudio:
-{
-mBody->setAudio(filePath);
-break;
-}
-default:
-{
-pendingAttList << filePath;
-break;
-}
-}
-}
-else
-{
-pendingAttList << filePath;
-}
-}
-// add pending attachments to editor
-addAttachments(pendingAttList);
-delete genUtils;
-// ensure that any msg-type change after this are shown
-mToField->skipMaxRecipientQuery(false);
 mMsgMonitor->setSkipNote(false);
 }
-void MsgUnifiedEditorView::addToolBar()
+//---------------------------------------------------------------
-{
+// MsgUnifiedEditorView::addSubject
-//Create Tool Bar
+// @see header file
-HbToolBar *toolBar = new HbToolBar();
+//---------------------------------------------------------------
-toolBar->setOrientation(Qt::Horizontal);
+void MsgUnifiedEditorView::addSubject(bool needFocus)
+{
-//tool bar extension for attach action.
+//triggered from menu so need a focus.
-HbToolBarExtension* attachExtension = new HbToolBarExtension();
-mAttachAction = toolBar->addExtension(attachExtension);
-mAttachAction->setIcon(HbIcon(ATTACH_ICON));
-mTBExtnContentWidget = new HbListWidget();
-mTBExtnContentWidget->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Fixed);
-mTBExtnContentWidget->addItem(LOC_PHOTO);
-mTBExtnContentWidget->addItem(LOC_SOUND);
-mTBExtnContentWidget->addItem(LOC_BUSINESS_CARD);
-HbListViewItem *prototype = mTBExtnContentWidget->listItemPrototype();
-HbFrameBackground frame(POPUP_LIST_FRAME, HbFrameDrawer::NinePieces);
-prototype->setDefaultFrame(frame);
-connect(mTBExtnContentWidget, SIGNAL(activated(HbListWidgetItem*)),
-this, SLOT(handleViewExtnActivated(HbListWidgetItem*)));
-connect(mTBExtnContentWidget, SIGNAL(activated(HbListWidgetItem*)),
-attachExtension, SLOT(close()));
-attachExtension->setContentWidget(mTBExtnContentWidget);
-//Add Action to the toolbar and show toolbar
-mSendAction = toolBar->addAction(HbIcon(SEND_ICON),QString(),this,SLOT(send()));
-mSendAction->setDisabled(true);
-setToolBar(toolBar);
-}
-void MsgUnifiedEditorView::addSubject()
-{
-if(mSubjectField)
-{ // do nothing if already present
-return;
-}
-int index =0;
-int offset = 1;
-if(mAttachmentContainer)
-{
-++offset;
-}
-index = mMainLayout->count() - offset;
-mSubjectField = new MsgUnifiedEditorSubject( mContentWidget);
-mMainLayout->insertItem(index,mSubjectField);
-connect(mSubjectField, SIGNAL(contentChanged()),
-mMsgMonitor, SLOT(handleContentChange()));
-connect(mSubjectField, SIGNAL(contentChanged()),this,SLOT(onContentChanged()));
-//set focus to subject field.
 HbAction* subjectAction = qobject_cast<HbAction*>(this->sender());
 if(subjectAction)
 {
-setFocus(mSubjectField);
+needFocus = true;
 }
+mScrollArea->addSubject(needFocus);
-// remove mainmenu's "Add Subject" action
+}
-if(mSubjectAction)
-{
+//---------------------------------------------------------------
-HbMenu* mainMenu = this->menu();
+// MsgUnifiedEditorView::addCcBcc
-mainMenu->removeAction(mSubjectAction);
+// @see header file
-mSubjectAction->setParent(NULL);
+//---------------------------------------------------------------
-delete mSubjectAction;
+void MsgUnifiedEditorView::addCcBcc(bool needFocus)
-}
+{
-}
-void MsgUnifiedEditorView::addCcBcc()
-{
-if(mCcField && mBccField)
-{ // do nothing if already present
-return;
-}
-mCcField    = new MsgUnifiedEditorAddress( LOC_CC, mContentWidget );
-mBccField   = new MsgUnifiedEditorAddress( LOC_BCC, mContentWidget );
-mCcField->skipMaxRecipientQuery(true);
-mBccField->skipMaxRecipientQuery(true);
-connect(mCcField, SIGNAL(sendMessage()), this, SLOT(send()));
-connect(mCcField, SIGNAL(contentChanged()), mMsgMonitor, SLOT(handleContentChange()));
-connect(mCcField, SIGNAL(contentChanged()),this,SLOT(onContentChanged()));
-connect(mBccField, SIGNAL(sendMessage()), this, SLOT(send()));
-connect(mBccField, SIGNAL(contentChanged()), mMsgMonitor, SLOT(handleContentChange()));
-connect(mBccField, SIGNAL(contentChanged()),this,SLOT(onContentChanged()));
-HbWidget* groupWidget = new HbWidget(mContentWidget);
-groupWidget->setContentsMargins(0,0,0,0);
-QGraphicsLinearLayout* ccBccLayout = new QGraphicsLinearLayout(Qt::Vertical, groupWidget);
-ccBccLayout->setContentsMargins(0,0,0,0);
-qreal vItemSpacing = 0.0;
-style()->parameter("hb-param-margin-gene-middle-vertical",vItemSpacing);
-ccBccLayout->setSpacing(vItemSpacing);
-ccBccLayout->addItem(mCcField);
-ccBccLayout->addItem(mBccField);
-HbGroupBox* groupBox = new HbGroupBox(0);
-groupBox->setObjectName("groupBox");
-groupBox->setContentWidget(groupWidget);
-groupBox->setHeading(LOC_OTHER_RECIPIENTS_EXPAND);
-mMainLayout->insertItem(1,groupBox);
-connect(groupBox, SIGNAL(toggled(bool)), this, SLOT(updateOtherRecipientCount(bool)));
-// add subject field too
-addSubject();
 //set focus to Cc field.
 HbAction* ccBccAction = qobject_cast<HbAction*>(this->sender());
-if(mCcBccAction)
+if(ccBccAction)
 {
-setFocus(mCcField);
+needFocus = true;
 }
-// remove mainmenu's "Add Cc/Bcc" & "Add Subject" actions
+mScrollArea->addCcBcc(needFocus);
-if(mCcBccAction)
-{
-HbMenu* mainmenu = this->menu();
-mainmenu->removeAction(mCcBccAction);
-mCcBccAction->setParent(NULL);
-delete mCcBccAction;
-}
-this->updateGeometry();
-}
-void MsgUnifiedEditorView::updateOtherRecipientCount(bool state)
-{
-HbGroupBox* groupBox = qobject_cast<HbGroupBox*>(sender());
-if(groupBox)
-{
-if(!state)
-{
-groupBox->setHeading(LOC_OTHER_RECIPIENTS_EXPAND);
-}
-else
-{
-int addrCount = mCcField->addressCount();
-addrCount += mBccField->addressCount();
-if(addrCount > 0)
-{
-groupBox->setHeading(LOC_OTHER_RECIPIENTS(addrCount));
-}
-}
-}
-}
-void MsgUnifiedEditorView::changePriority()
-{
-HbAction* action = qobject_cast<HbAction*>(sender());
-ConvergedMessage::Priority priority = ConvergedMessage::Normal;
-if(action)
-{
-int data = action->data().toInt();
-priority = ConvergedMessage::Priority(data);
-}
 addSubject();
-mSubjectField->setPriority(priority);
+}
-}
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::deleteMessage
+// @see header file
+//---------------------------------------------------------------
 void MsgUnifiedEditorView::deleteMessage()
 {
 HbMessageBox::question(LOC_NOTE_DELETE_MESSAGE,this,
 SLOT(onDialogDeleteMsg(HbAction*)),
 HbMessageBox::Delete | HbMessageBox::Cancel);
 }
-void MsgUnifiedEditorView::removeAttachmentContainer()
+//---------------------------------------------------------------
-{
+// MsgUnifiedEditorView::addAttachments
-if(mAttachmentContainer)
+// @see header file
-{
+//---------------------------------------------------------------
-mMainLayout->removeItem(mAttachmentContainer);
-mAttachmentContainer->setParent(NULL);
-delete mAttachmentContainer;
-mAttachmentContainer = NULL;
-}
-}
 void MsgUnifiedEditorView::addAttachments(QStringList files)
 {
-int fcount = files.count();
+mScrollArea->addAttachments(files);
-int i=0;
+}
-for(i=0; i<fcount; i++)
-{
+//---------------------------------------------------------------
-int status = addAttachment(files.at(i));
+// MsgUnifiedEditorView::send
-if(status == MsgAttachmentContainer::EAddSizeExceed)
+// @see header file
-{
+//---------------------------------------------------------------
-QString displayStr = QString(LOC_UNABLE_TO_ADD_ATTACHMENTS)
-.arg(fcount-i).arg(fcount);
-HbNotificationDialog::launchDialog(displayStr);
-break;
-}
-}
-}
-int MsgUnifiedEditorView::addAttachment(const QString& filepath)
-{
-// do nothing if filepath is empty
-if(filepath.isEmpty())
-{
-return MsgAttachmentContainer::EAddSuccess;
-}
-if(!mAttachmentContainer)
-{
-mAttachmentContainer = new MsgAttachmentContainer( mContentWidget);
-connect(mAttachmentContainer, SIGNAL(emptyAttachmentContainer()),
-this, SLOT(removeAttachmentContainer()));
-connect(mAttachmentContainer, SIGNAL(contentChanged()),
-mMsgMonitor, SLOT(handleContentChange()));
-connect(mAttachmentContainer, SIGNAL(contentChanged()),
-this,SLOT(onContentChanged()));
-int index = mMainLayout->count() - 1;
-mMainLayout->insertItem(index,mAttachmentContainer);
-}
-int ret = mAttachmentContainer->addAttachment(filepath);
-if(ret != MsgAttachmentContainer::EAddSuccess)
-{
-// delete container, if it is empty
-if(mAttachmentContainer->count() == 0)
-{
-removeAttachmentContainer();
-}
-}
-return ret;
-}
 void MsgUnifiedEditorView::send()
 {
 activateInputBlocker();
 // first run the address validation tests
-if( !mToField->validateContacts() ||
+if(!mScrollArea->contactsValid() ||
-(mCcField && !mCcField->validateContacts()) ||
+!MsgUnifiedEditorMonitor::readyForSend())
-(mBccField && !mBccField->validateContacts()) )
 {
 deactivateInputBlocker();
 return;
 }
 // converged msg for sending
 ConvergedMessage msg;
 ConvergedMessage::MessageType messageType = MsgUnifiedEditorMonitor::messageType();
 msg.setMessageType(messageType);
-// we need to remove duplicate addresses
-bool removeDuplicates = true;
-ConvergedMessageAddressList addresses =
-mToField->addresses(removeDuplicates);
-if(messageType == ConvergedMessage::Sms &&
-addresses.isEmpty())
-{
-// no recipient specified for sms, do not send msg
-deactivateInputBlocker();
-return;
-}
-ConvergedMessageAddressList ccAddresses;
-ConvergedMessageAddressList bccAddresses;
-if(mCcField)
-{
-ccAddresses = mCcField->addresses(removeDuplicates);
-}
-if(mBccField)
-{
-bccAddresses = mBccField->addresses(removeDuplicates);
-}
-if( messageType == ConvergedMessage::Mms &&
-addresses.isEmpty() &&
-ccAddresses.isEmpty() &&
-bccAddresses.isEmpty())
-{
-// no recipient specified for mms, do not send msg
-deactivateInputBlocker();
-return;
-}
 //close vkb before switching view.
 mVkbHost->closeKeypad(true);
 int result = packMessage(msg);
 if(result == KErrNotFound)
 }
 // send message
 MsgSendUtil *sendUtil = new MsgSendUtil(this);
 int sendResult = sendUtil->send(msg);
 delete sendUtil;
 // all checks and validations happen before send
 if( sendResult == KErrNone)
 {
 //After sending the new content to drafts chk if the msg
 //was originally opened from drafts and delete the opened entry
 mPluginLoader = new UniEditorPluginLoader(this);
 }
 UniEditorPluginInterface* pluginInterface =
 mPluginLoader->getUniEditorPlugin(messageType);
-//TODO delete the entry
+//delete the entry
 pluginInterface->deleteDraftsEntry(mOpenedMessageId.getId());
 }
-ConvergedMessageAddressList addrList = addresses;
+ConvergedMessageAddressList addrList = msg.toAddressList() +
-QString receipient;
+msg.ccAddressList() +
+msg.bccAddressList();
 int recepientCount = addrList.count();
-if(recepientCount)
-{
+QVariantList params;
-receipient = addrList.at(0)->address();
-}
+if(recepientCount == 1 )
+{
-if( mCcField && mBccField)
+params << MsgBaseView::CV;  // target view
-{
+params << MsgBaseView::UNIEDITOR; // source view
-addrList = ccAddresses;
+QString receipient = addrList.at(0)->address();
-int ccCount = addrList.count();
+params << receipient;
-recepientCount += ccCount;
+}
-if(ccCount)
+else
 {
-receipient = addrList.at(0)->address();
+params << MsgBaseView::CLV;// target view
-}
+params << MsgBaseView::UNIEDITOR; // source view
-addrList = bccAddresses;
-int bccCount = addrList.count();
-recepientCount += bccCount;
-if(bccCount)
-{
-receipient = addrList.at(0)->address();
-}
-}
-QVariantList params;
-if(recepientCount == 1 )
-{
-params << MsgBaseView::CV;  // target view
-params << MsgBaseView::UNIEDITOR; // source view
-params << receipient;
-}
-else
-{
-params << MsgBaseView::CLV;// target view
-params << MsgBaseView::UNIEDITOR; // source view
 }
 deactivateInputBlocker();
 emit switchView(params);
+mCanSaveToDrafts = false;
 }
 else
 {
 deactivateInputBlocker();
 if(sendResult == KErrNotFound)
 {
 if (messageType == ConvergedMessage::Sms)
 {
 HbMessageBox::question(LOC_DIALOG_SMS_SETTINGS_INCOMPLETE,
 this,SLOT(onDialogSmsSettings(HbAction*)),
 HbMessageBox::Ok | HbMessageBox::Cancel);
 }
 else
 {
 HbMessageBox::question(LOC_DIALOG_MMS_SETTINGS_INCOMPLETE,
 this,SLOT(onDialogMmsSettings(HbAction*)),
 HbMessageBox::Ok | HbMessageBox::Cancel);
 }
 }
 }
 }
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::packMessage
+// @see header file
+//---------------------------------------------------------------
 int MsgUnifiedEditorView::packMessage(ConvergedMessage &msg, bool isSave)
 {
 // reset reply-path if originating SME constraint is broken
 if(mReplyPath && isReplyPathBroken())
 {
 msg.setOriginatingSC(mOriginatingSC);
 }
 ConvergedMessage::MessageType messageType = MsgUnifiedEditorMonitor::messageType();
 msg.setMessageType(messageType);
-// If isSave is true (save to draft usecase), then don't remove duplicates
-// If isSave is false (send usecase), then remove duplicates
-bool removeDuplicates = !isSave;
-ConvergedMessageAddressList addresses =
-mToField->addresses(removeDuplicates);
-ConvergedMessageAddressList ccAddresses;
-ConvergedMessageAddressList bccAddresses;
-ConvergedMessageAttachmentList mediaList;
-int errorCode = 0;
-	//Don't format the addresses for save to drfats case
-	if(!isSave)
-	{
-formatAddresses(addresses);
-}
-msg.addToRecipients(addresses);
-msg.setBodyText(mBody->text());
 msg.setDirection(ConvergedMessage::Outgoing);
 QDateTime time = QDateTime::currentDateTime();
 msg.setTimeStamp(time.toTime_t());
-if(messageType == ConvergedMessage::Mms)
-{
+//pack message data from mscrollarea.
-if(mCcField)
+int errorCode = mScrollArea->packMessage(msg,isSave);
-{
-ccAddresses = mCcField->addresses(removeDuplicates);
+//pack message data from body editor.
-}
+mBodyEditor->packMessage(msg);
-if(mBccField)
+return errorCode;
-{
+}
-bccAddresses = mBccField->addresses(removeDuplicates);
-}
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::saveContentToDrafts
-if(removeDuplicates)
+// @see header file
-{
+//---------------------------------------------------------------
-int matchDigitsCount = MsgUnifiedEditorAddress::contactMatchDigits();
-//comapre cc and to field,remove duplicate from cc
-foreach(ConvergedMessageAddress *ccAddress,ccAddresses)
-{
-foreach(ConvergedMessageAddress *toAddress,addresses)
-{
-if(0 == ccAddress->address().right(matchDigitsCount).compare(toAddress->address().right(matchDigitsCount)))
-{
-ccAddresses.removeOne(ccAddress);
-}
-}
-}
-//comapre bcc and cc field,remove duplicate from bcc
-foreach(ConvergedMessageAddress *bccAddress,bccAddresses)
-{
-foreach(ConvergedMessageAddress *ccAddress,ccAddresses)
-{
-if(0 == bccAddress->address().right(matchDigitsCount).compare(ccAddress->address().right(matchDigitsCount)))
-{
-bccAddresses.removeOne(bccAddress);
-}
-}
-}
-//comapre bcc and to field,remove duplicate from bcc
-foreach(ConvergedMessageAddress *bccAddress,bccAddresses)
-{
-foreach(ConvergedMessageAddress *toAddress,addresses)
-{
-if(0 == bccAddress->address().right(matchDigitsCount).compare(toAddress->address().right(matchDigitsCount)))
-{
-bccAddresses.removeOne(bccAddress);
-}
-}
-}
-}
-if(ccAddresses.count()>0)
-{
-		//Don't format the addresses for save to drfats case
-	    if(!isSave)
-	    {
-formatAddresses(ccAddresses);
-}
-msg.addCcRecipients(ccAddresses);
-}
-if(bccAddresses.count()>0)
-{
-		//Don't format the addresses for save to drfats case
-	    if(!isSave)
-	    {
-formatAddresses(bccAddresses);
-		}
-msg.addBccRecipients(bccAddresses);
-}
-if(mSubjectField)
-{
-msg.setSubject(mSubjectField->text());
-msg.setPriority(mSubjectField->priority());
-}
-QStringList mediafiles(mBody->mediaContent());
-if (!mediafiles.isEmpty())
-{
-for (int i = 0; i < mediafiles.size(); ++i)
-{
-if(QFile::exists(mediafiles.at(i)))
-{
-ConvergedMessageAttachment* attachment =
-new ConvergedMessageAttachment(
-mediafiles.at(i),
-ConvergedMessageAttachment::EInline);
-mediaList << attachment;
-}
-else
-{   mBody->removeMediaContent(mediafiles.at(i));
-errorCode = KErrNotFound;
-}
-}
-}
-if(mediaList.count() > 0)
-{
-msg.addAttachments(mediaList);
-}
-}
-// sms/mms attachment list
-ConvergedMessageAttachmentList attachmentList;
-if(mAttachmentContainer)
-{
-MsgUnifiedEditorAttachmentList editorAttachmentList =
-mAttachmentContainer->attachmentList();
-for (int i = 0; i < editorAttachmentList.count(); ++i)
-{
-if(QFile::exists(editorAttachmentList.at(i)->path()))
-{
-ConvergedMessageAttachment* attachment =
-new ConvergedMessageAttachment(
-editorAttachmentList.at(i)->path(),
-ConvergedMessageAttachment::EAttachment);
-attachmentList << attachment;
-}
-else
-{
-mAttachmentContainer->deleteAttachment(editorAttachmentList.at(i));
-errorCode = KErrNotFound;
-}
-}
-}
-if(attachmentList.count() > 0)
-{
-msg.addAttachments(attachmentList);
-}
-return errorCode;
-}
 int MsgUnifiedEditorView::saveContentToDrafts()
 {
 if(!mCanSaveToDrafts)
 {
 return mOpenedMessageId.getId(); // return currently opened message id
 }
 activateInputBlocker();
 ConvergedMessage::MessageType messageType = MsgUnifiedEditorMonitor::messageType();
-ConvergedMessageAddressList addresses = mToField->addresses();
 UniEditorPluginInterface* pluginInterface = NULL;
 if( mOpenedMessageId.getId() != -1)
 {
 if(!mPluginLoader)
 {
 mPluginLoader = new UniEditorPluginLoader(this);
 }
-pluginInterface =
+pluginInterface = mPluginLoader->getUniEditorPlugin(messageType);
-mPluginLoader->getUniEditorPlugin(messageType);
+}
-}
+// if empty msg, do not save
-if(messageType == ConvergedMessage::Sms &&
+if( MsgUnifiedEditorMonitor::messageSize() <= 0 &&
-addresses.isEmpty() &&
+MsgUnifiedEditorMonitor::msgAddressCount() <= 0 )
-MsgUnifiedEditorMonitor::bodySize() <= 0 &&
-MsgUnifiedEditorMonitor::containerSize() <= 0)
 {
 if(mOpenedMessageId.getId() != -1)
 {
 pluginInterface->deleteDraftsEntry(mOpenedMessageId.getId());
 }
-// if empty msg, do not save
 deactivateInputBlocker();
 return INVALID_MSGID;
 }
-ConvergedMessageAddressList ccAddresses;
-ConvergedMessageAddressList bccAddresses;
-if(mCcField)
-{
-ccAddresses = mCcField->addresses();
-}
-if(mBccField)
-{
-bccAddresses = mBccField->addresses();
-}
-int subectSize =0;
-if(mSubjectField)
-{
-subectSize = mSubjectField->text().size();
-}
-if( messageType == ConvergedMessage::Mms &&
-addresses.isEmpty() &&
-ccAddresses.isEmpty() &&
-bccAddresses.isEmpty() &&
-subectSize <= 0 &&
-MsgUnifiedEditorMonitor::bodySize() <= 0 &&
-MsgUnifiedEditorMonitor::containerSize() <= 0)
-{
-if(mOpenedMessageId.getId() != -1)
-{
-pluginInterface->deleteDraftsEntry(mOpenedMessageId.getId());
-}
-// if empty msg, do not send
-deactivateInputBlocker();
-return INVALID_MSGID;
-}
 ConvergedMessage msg;
 int result = packMessage(msg, true);
 if(result == KErrNotFound)
 {
 HbNotificationDialog::launchDialog(LOC_NOTE_FILES_MISSED_DRAFTS);
-if(messageType == ConvergedMessage::Sms &&
+}
-addresses.isEmpty() &&
-MsgUnifiedEditorMonitor::bodySize() <= 0 &&
-MsgUnifiedEditorMonitor::containerSize() <= 0)
-{
-if(mOpenedMessageId.getId() != -1)
-{
-pluginInterface->deleteDraftsEntry(mOpenedMessageId.getId());
-}
-// if empty msg, do not save
-deactivateInputBlocker();
-return INVALID_MSGID;
-}
-}
 // save to drafts
 MsgSendUtil *sendUtil = new MsgSendUtil(this);
 int msgId = sendUtil->saveToDrafts(msg);
 delete sendUtil;
 if(res)
 {
 HbDeviceNotificationDialog::notification("", LOC_SAVED_TO_DRAFTS);
 }
+mCanSaveToDrafts = false;
 return msgId;
 }
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::handleKeyEvent
+// @see header file
+//---------------------------------------------------------------
 bool MsgUnifiedEditorView::handleKeyEvent(int key)
 {
 bool eventHandled = false;
-if (Qt::Key_Yes == key && mSendAction->isEnabled()) {
+if (Qt::Key_Yes == key) {
 eventHandled = true;
 send();
 }
 return eventHandled;
-}
-void MsgUnifiedEditorView::resizeEvent( QGraphicsSceneResizeEvent * event )
-{
-Q_UNUSED(event)
-#ifdef _DEBUG_TRACES_
-qDebug()<<"resize event";
-#endif
-mContentWidget->resize(this->rect().width(),this->rect().height()+1);
 }
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::createVCards
 // @see header file
 searchFileName.append(QString::number(i));
 }
 searchFileName.append(FILE_EXTN);
 // check if filename is already used by an attachment in container
-bool alreadyExists = false;
+if(!mScrollArea->fileNameInUse(searchFileName))
-if(mAttachmentContainer)
-{
-MsgUnifiedEditorAttachmentList attList =
-mAttachmentContainer->attachmentList();
-int attCount = attList.count();
-for(int j=0; j<attCount; j++)
-{
-QFileInfo fileinfo(attList.at(j)->path());
-if(searchFileName == fileinfo.fileName())
-{
-alreadyExists = true;
-break;
-}
-}
-}
-if(!alreadyExists)
 {
 if(i>0)
 {
 suggestedName.append(QString::number(i));
 }
 filepath.append(suggestedName);
 filepath.append(FILE_EXTN);
 return filepath;
 }
-void MsgUnifiedEditorView::handleViewExtnActivated(HbListWidgetItem* item)
-{
-QString itemText = item->text();
-if(itemText == LOC_PHOTO)
-{
-//launch photo picker.
-fetchImages();
-}
-else if(itemText == LOC_SOUND)
-{
-//launch audio picker
-fetchAudio();
-}
-else if(itemText == LOC_BUSINESS_CARD)
-{
-//launch contact card picker.
-fetchContacts();
-}
-}
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::fetchContacts
 // @see header file
 //---------------------------------------------------------------
 {
 QCRITICAL_WRITE("AIW-ERROR: NULL request");
 return;
 }
-request->setSynchronous(false); // synchronous
+request->setSynchronous(false); // asynchronous
 // Result handlers
 connect (request, SIGNAL(requestOk(const QVariant&)),
 this, SLOT(contactsFetched(const QVariant&)));
 connect (request, SIGNAL(requestError(int,const QString&)),
 if(!request)
 {
 QCRITICAL_WRITE("AIW-ERROR: NULL request");
 return;
 }
-request->setSynchronous(false); // synchronous
+request->setSynchronous(false); // asynchronous
 connect(request, SIGNAL(requestOk(const QVariant&)),
 this, SLOT(imagesFetched(const QVariant&)));
 connect(request, SIGNAL(requestError(int,const QString&)),
 this, SLOT(serviceRequestError(int,const QString&)));
 {
 QStringList fileList = result.value<QStringList>();
 if ( fileList.size()>0 )
 {
 QString filepath(QDir::toNativeSeparators(fileList.at(0)));
-mBody->setImage(filepath);
+mScrollArea->setImage(filepath);
 }
 }
 }
 //---------------------------------------------------------------
 {
 mainWindow()->setInteractive(true);
 }
 //---------------------------------------------------------------
-// MsgUnifiedEditorView::setAttachOptionEnabled
+// MsgUnifiedEditorView::enableMenuAction
 // @see header file
 //--------------------------------------------------------------
-void MsgUnifiedEditorView::setAttachOptionEnabled(
+void MsgUnifiedEditorView::enableMenuAction(int action, bool enable)
-MsgUnifiedEditorView::TBE_AttachOption opt, bool enable)
+{
-{
+switch(action)
-HbListWidgetItem* wgtItem = mTBExtnContentWidget->item(opt);
+{
-wgtItem->setEnabled(enable);
+case SOUND:
+{
+if(mSoundAction)
+{
+mSoundAction->setEnabled(enable);
+}
+break;
+}
+case PHOTO:
+{
+if(mPhotoAction)
+{
+mPhotoAction->setEnabled(enable);
+}
+break;
+}
+case SUBJECT: //subject action has to be removed
+{
+// remove mainmenu's "Add Subject" action
+if(mSubjectAction)
+{
+this->menu()->removeAction(mSubjectAction);
+mSubjectAction->setParent(NULL);
+delete mSubjectAction;
+mSubjectAction = NULL;
+}
+break;
+}
+case CCBCC: //CcBcc action has to be removed
+{
+// remove mainmenu's "Add Cc/Bcc" & "Add Subject" actions
+if(mCcBccAction)
+{
+this->menu()->removeAction(mCcBccAction);
+mCcBccAction->setParent(NULL);
+delete mCcBccAction;
+mCcBccAction = NULL;
+}
+break;
+}
+default:
+break;
+}
 }
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::vkbOpened
 // @see header file
 //---------------------------------------------------------------
 void MsgUnifiedEditorView::vkbOpened()
 {
 hideChrome(true);
+//get focussed object.
+HbInputMethod* im =   HbInputMethod::activeInputMethod();
+HbInputFocusObject* focusObj =   im->focusObject();
+if(focusObj)
+{
+QObject* obj =   focusObj->object();
+mFocusedWidget = qobject_cast<QGraphicsWidget*>(obj);
+HbAbstractEdit* editor = qobject_cast<HbAbstractEdit*>(obj);
+if(editor)
+{
+connect(editor,SIGNAL(contentsChanged()),this,SLOT(ensureVisibility()));
+}
+}
+QRectF appRect = mVkbHost->applicationArea();
+if(this->mainWindow()->orientation() == Qt::Vertical)
+{
+this->setMaximumHeight(appRect.height());
+mScrollArea->resize(-1,-1);
+}
+else
+{
+if(mFocusedWidget)
+{
+qreal vItemSpacing = 0.0;
+style()->parameter("hb-param-margin-gene-middle-vertical",vItemSpacing);
+mMinHeight = mFocusedWidget->minimumHeight();
+mMaxHeight = mFocusedWidget->maximumHeight();
+qreal newHeight = appRect.height()-vItemSpacing-1;
+mFocusedWidget->setMinimumHeight(newHeight);
+mFocusedWidget->setMaximumHeight(newHeight);
+mFocusedWidget->resize(mFocusedWidget->rect().width(),newHeight);
+}
+}
+//do layouting after some delay.
+QTimer::singleShot(50,this,SLOT(doLayout()));
 disconnect(mVkbHost,SIGNAL(keypadOpened()),this,SLOT(vkbOpened()));
-}
+connect(this->mainWindow(),SIGNAL(aboutToChangeOrientation()),this,SLOT(resetLayout()));
+}
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::vkbClosed
 // @see header file
 //---------------------------------------------------------------
 void MsgUnifiedEditorView::vkbClosed()
 {
 hideChrome(false);
+resetLayout();
 connect(mVkbHost,SIGNAL(keypadOpened()),this,SLOT(vkbOpened()));
-}
+disconnect(this->mainWindow(),SIGNAL(aboutToChangeOrientation()),this,SLOT(resetLayout()));
-//---------------------------------------------------------------
+}
-// MsgUnifiedEditorView::vkbAboutToOpen
-// @see header file
+//---------------------------------------------------------------
-//---------------------------------------------------------------
+// MsgUnifiedEditorView::doLayout
-void MsgUnifiedEditorView::vkbAboutToOpen()
+// @see header file
-{
+//---------------------------------------------------------------
-	  //This is done to avoid user action on attachment
+void MsgUnifiedEditorView::doLayout()
-	  //toolbar button when vkb is opening
+{
-mAttachAction->setDisabled(true);
+if(mFocusedWidget && mVkbHost->keypadStatus() == HbVkbHost::HbVkbStatusOpened)
-disconnect(mVkbHost,SIGNAL(aboutToOpen()),
+{
-this,SLOT(vkbAboutToOpen()));
+if(this->mainWindow()->orientation() == Qt::Vertical)
-}
+{
+ensureVisibility();
-//---------------------------------------------------------------
+}
-// MsgUnifiedEditorView::vkbAboutToClose
+else
-// @see header file
+{
-//---------------------------------------------------------------
+qreal vItemSpacing = 0.0;
-void MsgUnifiedEditorView::vkbAboutToClose()
+style()->parameter("hb-param-margin-gene-middle-vertical",vItemSpacing);
-{
-mAttachAction->setDisabled(false);
+if(mScrollArea->isAncestorOf(mFocusedWidget))
-connect(mVkbHost,SIGNAL(aboutToOpen()),
+{
-this,SLOT(vkbAboutToOpen()));
+QPointF p = mScrollArea->mapFromScene(mFocusedWidget->scenePos());
+mScrollArea->scrollContentsTo(p,0);
+mScrollArea->enableScrolling(false);
+mScrollArea->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
+}
+QPointF pp = mapFromScene(mFocusedWidget->scenePos());
+qreal delta = pp.y() - vItemSpacing;
+this->setTransform(QTransform::fromTranslate(0, -delta), true);
+}
+}
+}
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::resetLayout
+// @see header file
+//---------------------------------------------------------------
+void MsgUnifiedEditorView::resetLayout()
+{
+//disconnect signal from previously focused object.
+if(mFocusedWidget)
+{
+HbAbstractEdit* editor = qobject_cast<HbAbstractEdit*>(mFocusedWidget);
+disconnect(editor,SIGNAL(contentsChanged()),this,SLOT(ensureVisibility()));
+}
+if(this->mainWindow()->orientation() == Qt::Vertical)
+{
+this->setMaximumHeight(-1);
+mScrollArea->scrollContentsTo(QPointF(0,0),0);
+mScrollArea->resize(-1,-1);
+}
+else
+{
+this->resetTransform();
+if(mFocusedWidget)
+{
+if(mMinHeight >0)
+{
+mFocusedWidget->setMinimumHeight(mMinHeight);
+mMinHeight = 0.0;
+}
+if(mMaxHeight >0)
+{
+mFocusedWidget->setMaximumHeight(mMaxHeight);
+mMaxHeight = 0.0;
+}
+if(mScrollArea->isAncestorOf(mFocusedWidget))
+{
+mScrollArea->enableScrolling(true);
+mScrollArea->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAutoHide);
+mScrollArea->scrollContentsTo(QPointF(0,0),0);
+}
+mFocusedWidget = NULL;
+}
+}
+}
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::ensureVisibility
+// @see header file
+//---------------------------------------------------------------
+void MsgUnifiedEditorView::ensureVisibility()
+{
+if(mFocusedWidget && mVkbHost->keypadStatus() == HbVkbHost::HbVkbStatusOpened)
+{
+if(this->mainWindow()->orientation() == Qt::Vertical)
+{
+if ( mScrollArea->isAncestorOf(mFocusedWidget))
+{
+QRectF scrollRect = mScrollArea->sceneBoundingRect();
+QRectF editorRect = mFocusedWidget->sceneBoundingRect();
+if (!scrollRect.contains(editorRect) ||
+scrollRect.intersects(editorRect))
+{
+if (editorRect.height() < scrollRect.height()) {
+// Whole editor rect fits into scroll area. Move it there.
+if (editorRect.bottom() > scrollRect.bottom()) {
+// Scroll upwards.
+mScrollArea->ensureVisible(mScrollArea->contentWidget()->mapFromScene(editorRect.bottomLeft()));
+} else {
+// Scroll downwards.
+mScrollArea->ensureVisible(mScrollArea->contentWidget()->mapFromScene(editorRect.topLeft()));
+}
+}
+}
+}
+}
+}
+}
+//---------------------------------------------------------------
+// MsgUnifiedEditorView::focusChanged
+// @see header file
+//---------------------------------------------------------------
+void MsgUnifiedEditorView::focusChanged()
+{
+//disconnect signal from previously focused object.
+if(mFocusedWidget)
+{
+HbAbstractEdit* editor = qobject_cast<HbAbstractEdit*>(mFocusedWidget);
+disconnect(editor,SIGNAL(contentsChanged()),this,SLOT(ensureVisibility()));
+}
+//connect signal for newly focused object.
+HbInputMethod* im =   HbInputMethod::activeInputMethod();
+HbInputFocusObject* focusObj =   im->focusObject();
+if(focusObj)
+{
+QObject* obj =   focusObj->object();
+mFocusedWidget = qobject_cast<QGraphicsWidget*>(obj);
+HbAbstractEdit* editor = qobject_cast<HbAbstractEdit*>(obj);
+if(editor)
+{
+connect(editor,SIGNAL(contentsChanged()),this,SLOT(ensureVisibility()));
+}
+}
 }
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::onAudioSelected
 // @see header file
 //---------------------------------------------------------------
-void
+void MsgUnifiedEditorView::onAudioSelected(QString& filePath)
-MsgUnifiedEditorView::onAudioSelected(QString& filePath)
 {
 if (!filePath.isEmpty())
 {
-mBody->setAudio(filePath);
+mScrollArea->setAudio(filePath);
 }
 }
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::hideChrome
 //
 // MsgUnifiedEditorView::doDelayedConstruction
 //
 //---------------------------------------------------------------
 void MsgUnifiedEditorView::doDelayedConstruction()
 {
-addMenu();
 createTempFolder();
 //Create VKB instance and listen to VKB open and close signals.
-mVkbHost = new HbAbstractVkbHost(this);
+mVkbHost = new MsgUniEditorVkbHost(this);
+connect(mVkbHost, SIGNAL(focusChanged()), this, SLOT(focusChanged()));
 connect(mVkbHost, SIGNAL(keypadOpened()), this, SLOT(vkbOpened()));
 connect(mVkbHost, SIGNAL(keypadClosed()), this, SLOT(vkbClosed()));
-connect(mVkbHost,SIGNAL(aboutToOpen()),this,SLOT(vkbAboutToOpen()));
-connect(mVkbHost,SIGNAL(aboutToClose()),this,SLOT(vkbAboutToClose()));
 disconnect(this->mainWindow(),SIGNAL(viewReady()),this,SLOT(doDelayedConstruction()));
 }
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::createTempFolder
 //
 //trigger back action.
 HbAction* backAction = this->navigationAction();
 if (backAction) {
 backAction->trigger();
 }
 }
 }
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::onDialogSmsSettings
 //---------------------------------------------------------------
 void MsgUnifiedEditorView::onDialogSmsSettings(HbAction* action)
 {
 HbMessageBox *dlg = qobject_cast<HbMessageBox*> (sender());
-if (action == dlg->actions().at(0)) {
+if (action == dlg->actions().at(0))
+{
 QVariantList params;
 params << MsgBaseView::MSGSETTINGS;// target view
 params << MsgBaseView::UNIEDITOR; // source view
 params << MsgSettingsView::SMSView;
 emit switchView(params);
 }
 }
 //---------------------------------------------------------------
 // MsgUnifiedEditorView::onDialogMmsSettings
 params << MsgSettingsView::MMSView;
 emit switchView(params);
 }
 }
-//---------------------------------------------------------------
-// MsgUnifiedEditorView::enableSendButton
-// @see header file
-//--------------------------------------------------------------
-void MsgUnifiedEditorView::enableSendButton(bool enable)
-{
-if(mSendAction)
-{
-// enable/disable based on only if its disabled/enabled.
-// this check is to avoid unnecessary calls to mSendAction->setEnabled(enable);
-if(mSendAction->isEnabled() != enable )
-mSendAction->setEnabled(enable);
-}
-}
-// ----------------------------------------------------------------------------
-// MsgUnifiedEditorView::formatAddresses
-// @see header
-// ----------------------------------------------------------------------------
-void MsgUnifiedEditorView::formatAddresses(
-ConvergedMessageAddressList& addresses)
-{
-for(int i=0; i < addresses.count() ;i++ )
-{
-QString addr = addresses[i]->address();
-HBufC *tempAddr = XQConversions::qStringToS60Desc(addr);
-TPtr ptr = tempAddr->Des();
-// Note: This is just to parse spaces etc away from phonenumbers.
-//       Ignore EFalse returned for email addresses.
-CommonPhoneParser::ParsePhoneNumber(ptr ,
-CommonPhoneParser::ESMSNumber );
-addr = XQConversions::s60DescToQString(tempAddr->Des());
-addresses[i]->setAddress(addr);
-delete tempAddr;
-}
-}
 // ----------------------------------------------------------------------------
 // MsgUnifiedEditorView::isReplyPathBroken
 // @see header
 // ----------------------------------------------------------------------------
 bool MsgUnifiedEditorView::isReplyPathBroken()
 {
 // 1. Never set for MMS
 // 2. if additional recipients exits
 if( (MsgUnifiedEditorMonitor::messageType() == ConvergedMessage::Mms) ||
-(mToField->addressCount() != 1) )
+(MsgUnifiedEditorMonitor::msgAddressCount() != 1) )
 {
 // broken
 return true;
 }
 // 3. if only recipient is not same as originating SME
 QString dispName;
 int phCount;
 int origCntLocalId = MsgContactHandler::resolveContactDisplayName(
 mOriginatingSME, dispName, phCount);
 int currCntLocalId = -1;
-QString currAddress(mToField->addresses().at(0)->address());
+QString currAddress;
+ConvergedMessageAddress* currentAdd = mScrollArea->currentAddress();
+if(currentAdd)
+{
+currAddress = currentAdd->address();
+delete currentAdd;
+}
 if(origCntLocalId != -1)
 {
 currCntLocalId = MsgContactHandler::resolveContactDisplayName(
 currAddress, dispName, phCount);
 }
 return true;
 }
 }
 else
 { // atleast one contact is not present in contacts db
 // direct compare
 UniEditorGenUtils* genUtils = q_check_ptr(new UniEditorGenUtils);
 bool compareResult = false;
 TRAP_IGNORE(
 compareResult = genUtils->MatchPhoneNumberL(
 *XQConversions::qStringToS60Desc(mOriginatingSME),
 *XQConversions::qStringToS60Desc(currAddress))
 );
 delete genUtils;
 if(!compareResult)

changeset 76	60a8a215b0ec
parent 73	ecf6a73a9186