diff -r ecf6a73a9186 -r 60a8a215b0ec messagingapp/msgui/conversationview/src/msgconversationwidget.cpp --- a/messagingapp/msgui/conversationview/src/msgconversationwidget.cpp Tue Oct 05 13:58:47 2010 +0530 +++ b/messagingapp/msgui/conversationview/src/msgconversationwidget.cpp Tue Oct 19 11:30:16 2010 +0530 @@ -15,7 +15,8 @@ * */ #include "msgconversationwidget.h" - +#include "msgconversationviewitem.h" +#include "msgbodytextedit.h" #include #include #include @@ -89,7 +90,8 @@ { - init(); + MsgConversationViewItem* item = static_cast(parent); + init(item); } //--------------------------------------------------------------- @@ -105,7 +107,7 @@ // MsgConversationWidget::init // @see header file //--------------------------------------------------------------- -void MsgConversationWidget::init() +void MsgConversationWidget::init(MsgConversationViewItem* item) { // Common to SMS/MMS @@ -121,8 +123,9 @@ mSubjectTextItem->setTextWrapping(Hb::TextNoWrap); HbStyle::setItemName(mSubjectTextItem, "subject"); - mBodyTextItem = new HbTextItem(this); - mBodyTextItem->setTextWrapping(Hb::TextWordWrap); + //passing MsgConversationViewItem object for handling gestures + mBodyTextItem = new MsgBodyTextEdit(item, this); + HbStyle::setItemName(mBodyTextItem, "bodyText"); mPreviewIconItem = new HbIconItem(this); @@ -176,7 +179,7 @@ } HbStyle::setItemName(mBodyTextItem, "bodyText"); - mBodyTextItem->setText(body); + mBodyTextItem->setPlainText(body); mBodyTextItem->show(); } @@ -622,8 +625,8 @@ mSendingState =Unknown; mNotificationState =0; - if(mBodyTextItem){ - mBodyTextItem->setText(QString()); + if(mBodyTextItem){ + mBodyTextItem->setPlainText(QString()); mBodyTextItem->hide(); HbStyle::setItemName(mBodyTextItem, ""); }