FCL/sf/app/messaging: comparison messagingapp/msgui/conversationview/src/msgconversationviewitem.cpp

equal deleted inserted replaced

-:ebfee66fde93
+:84197e66a4bd
 // MsgConversationViewItem::MsgConversationViewItem
 // Constructor
 //---------------------------------------------------------------
 MsgConversationViewItem::MsgConversationViewItem(QGraphicsItem* parent) :
 HbListViewItem(parent), mIncoming(false), mConversation(0),
-mMessageStateIconItem(0)
+mIncomingMsgStateIconItem(0), mOutgoingMsgStateIconItem(0)
 {
 }
 //---------------------------------------------------------------
 // MsgConversationViewItem::MsgConversationViewItem
 //---------------------------------------------------------------
 // MsgConversationViewItem::createItem
 // Create a new decorator item.
 //---------------------------------------------------------------
 MsgConversationViewItem* MsgConversationViewItem::createItem()
 {
-return new MsgConversationViewItem(*this);
+MsgConversationViewItem *item = new MsgConversationViewItem(*this);
-}
+item->init();
+return item;
+}
 //---------------------------------------------------------------
 // MsgConversationViewItem::updateChildItems
 //
 //---------------------------------------------------------------
 void MsgConversationViewItem::updateChildItems()
 {
-if (!mMessageStateIconItem)
-{
-mMessageStateIconItem = new HbIconItem(this);
-HbStyle::setItemName(mMessageStateIconItem, "msgStateIcon");
-}
 QModelIndex index = modelIndex();
 #ifdef _DEBUG_TRACES_
 qCritical() << "START MsgConversationViewItem::updateChildItems: "
 << index.data(ConvergedMsgId).toInt();
 //---------------------------------------------------------------
 // MsgConversationViewItem::updateSmsTypeItem
 // @see header file
 //---------------------------------------------------------------
-void MsgConversationViewItem::updateSmsTypeItem(const QModelIndex& index, int messageSubType)
+void MsgConversationViewItem::updateSmsTypeItem(const QModelIndex& index,
-{
+int messageSubType)
+{
-if (!mConversation)
-{
-mConversation = new MsgConversationWidget(this);
-HbStyle::setItemName(mConversation, "msgconvwidget");
-}
 mIncoming = false;
 mConversation->resetProperties();
 int direction = index.data(Direction).toInt();
 if (direction == ConvergedMessage::Incoming)
 {
 setIncoming(true);
 mConversation->setIncoming(true);
-mMessageStateIconItem->setVisible(false);
+mIncomingMsgStateIconItem->setVisible(false);
 }
 else if (direction == ConvergedMessage::Outgoing)
 {
 setIncoming(false);
 mConversation->setIncoming(false);
 mConversation->setNotificationState(notificationState);
 setNotificationStateIcon(notificationState);
 }
 else
 {
-mMessageStateIconItem->setVisible(false);
+mIncomingMsgStateIconItem->setVisible(false);
 }
 }
 else if (direction == ConvergedMessage::Outgoing)
 {
 setIncoming(false);
 //preview image
 bool hasImage = (msgProperty & EPreviewImage) ? true : false;
 if (hasImage)
 {
-int msgId = index.data(ConvergedMsgId).toInt();
+QVariant previewData = index.data(PreviewIcon);
-mConversation->setPreviewIconPath(previewPath, msgId);
+HbIcon previewIcon;
+previewIcon = qvariant_cast<HbIcon> (previewData);
+mConversation->setPreviewIcon(previewIcon);
 mConversation->setImage(true);
 }
 bool hasVideo = (msgProperty & EPreviewVideo) ? true : false;
 {
 mConversation->setImage(false);
 mConversation->setAudio(true);
 mConversation->displayAudioIcon();
 mConversation->setSubject(LOC_RINGING_TONE);
+mConversation->setBodyText(bodyText);
 }
 else if (messageSubType == ConvergedMessage::VCard)
 {
 mConversation->setImage(false);
 mConversation->setAudio(true);
 // MsgConversationViewItem::containsPoint
 //
 //---------------------------------------------------------------
 bool MsgConversationViewItem::containsPoint(const QPointF& point)
 {
-return mConversation->boundingRect().
+return mConversation->boundingRect(). contains(mConversation->mapFromScene(
-contains(mConversation->mapFromScene(point));
+point));
 }
 //---------------------------------------------------------------
 // MsgConversationViewItem::setIncoming
 // @see header file
 //---------------------------------------------------------------
 void MsgConversationViewItem::setIncoming(bool incoming)
 {
 mIncoming = incoming;
+if (mIncoming)
+{
+HbStyle::setItemName(mOutgoingMsgStateIconItem, "");
+mOutgoingMsgStateIconItem->setVisible(false);
+HbStyle::setItemName(mIncomingMsgStateIconItem,
+"msgStateIconIncoming");
+}
+else
+{
+HbStyle::setItemName(mIncomingMsgStateIconItem, "");
+mIncomingMsgStateIconItem->setVisible(false);
+HbStyle::setItemName(mOutgoingMsgStateIconItem,
+"msgStateIconOutgoing");
+}
 }
 //---------------------------------------------------------------
 // MsgConversationViewItem::isIncoming
 // @see header file
 // MsgConversationViewItem::setMessageStateIcon
 // @see header file
 //---------------------------------------------------------------
 void MsgConversationViewItem::setMessageStateIcon(int messageState)
 {
-HbIconAnimator& iconAnimator = mMessageStateIconItem->animator();
+HbIconAnimator& iconAnimator = mOutgoingMsgStateIconItem->animator();
-HbIconAnimationManager* iconAnimationManager = HbIconAnimationManager::global();
+HbIconAnimationManager* iconAnimationManager =
+HbIconAnimationManager::global();
 switch (messageState)
 {
 case ConvergedMessage::Waiting:
 case ConvergedMessage::Scheduled:
 case ConvergedMessage::Sending:
 {
-	        bool defined = iconAnimationManager->addDefinitionFile(ANIMATION_FILE);
+bool defined = iconAnimationManager->addDefinitionFile(
-	    HbIcon animIcon;
+ANIMATION_FILE);
+HbIcon animIcon;
 animIcon.setIconName(ANIMATION_ICON_NAME);
-QSizeF size = mMessageStateIconItem->size();
+QSizeF size = mOutgoingMsgStateIconItem->size();
-mMessageStateIconItem->setIcon(animIcon);
+mOutgoingMsgStateIconItem->setIcon(animIcon);
-mMessageStateIconItem->setVisible(true);
+mOutgoingMsgStateIconItem->setVisible(true);
 iconAnimator.startAnimation();
-repolish();
 break;
 }
 case ConvergedMessage::Suspended:
 {
 iconAnimator.stopAnimation();
-mMessageStateIconItem->setIcon(MSG_OUTBOX_ICON);
+mOutgoingMsgStateIconItem->setIcon(MSG_OUTBOX_ICON);
-mMessageStateIconItem->setVisible(true);
+mOutgoingMsgStateIconItem->setVisible(true);
 break;
 }
 case ConvergedMessage::Resend:
 {
 iconAnimator.stopAnimation();
-mMessageStateIconItem->setIcon(MSG_OUTBOX_ICON);
+mOutgoingMsgStateIconItem->setIcon(MSG_OUTBOX_ICON);
-mMessageStateIconItem->setVisible(true);
+mOutgoingMsgStateIconItem->setVisible(true);
 break;
 }
 case ConvergedMessage::Failed:
 {
 iconAnimator.stopAnimation();
-mMessageStateIconItem->setIcon(MSG_FAIL_ICON);
+mOutgoingMsgStateIconItem->setIcon(MSG_FAIL_ICON);
-mMessageStateIconItem->setVisible(true);
+mOutgoingMsgStateIconItem->setVisible(true);
 break;
 }
 case ConvergedMessage::Unknown:
 default:
 {
 iconAnimator.stopAnimation();
-mMessageStateIconItem->setVisible(false);
+mOutgoingMsgStateIconItem->setVisible(false);
 break;
 }
 }
 }
 // @see header file
 //---------------------------------------------------------------
 void MsgConversationViewItem::setNotificationStateIcon(int notificationState)
 {
-HbIconAnimator& iconAnimator = mMessageStateIconItem->animator();
+HbIconAnimator& iconAnimator = mIncomingMsgStateIconItem->animator();
-HbIconAnimationManager* iconAnimationManager = HbIconAnimationManager::global();
+HbIconAnimationManager* iconAnimationManager =
+HbIconAnimationManager::global();
 switch (notificationState)
 {
 case ConvergedMessage::NotifRetrieving:
 case ConvergedMessage::NotifWaiting:
 {
 //TODO: Temp icon until official icons are received
-bool defined = iconAnimationManager->addDefinitionFile(ANIMATION_FILE);
+bool defined = iconAnimationManager->addDefinitionFile(
+ANIMATION_FILE);
 HbIcon animIcon;
 animIcon.setIconName(ANIMATION_ICON_NAME);
-QSizeF size = mMessageStateIconItem->size();
+QSizeF size = mIncomingMsgStateIconItem->size();
-mMessageStateIconItem->setIcon(animIcon);
+mIncomingMsgStateIconItem->setIcon(animIcon);
-mMessageStateIconItem->setVisible(true);
+mIncomingMsgStateIconItem->setVisible(true);
 iconAnimator.startAnimation();
-repolish();
 break;
 }
 default:
 {
 iconAnimator.stopAnimation();
-mMessageStateIconItem->setVisible(false);
+mIncomingMsgStateIconItem->setVisible(false);
 break;
 }
 }
 }
 void MsgConversationViewItem::pressStateChanged (bool pressed, bool animate)
 {
 mConversation->pressStateChanged(pressed, animate);
 }
+//---------------------------------------------------------------
+// MsgConversationViewItem::init
+// @see header file
+//---------------------------------------------------------------
+void MsgConversationViewItem::init()
+{
+mConversation = new MsgConversationWidget(this);
+HbStyle::setItemName(mConversation, "msgconvwidget");
+mIncomingMsgStateIconItem = new HbIconItem(this);
+mOutgoingMsgStateIconItem = new HbIconItem(this);
+}
 // EOF

changeset 34	84197e66a4bd
parent 31	ebfee66fde93
child 43	35b64624a9e7