equal
deleted
inserted
replaced
681 { |
681 { |
682 appendViewToBeDeleted(mUniViewer); |
682 appendViewToBeDeleted(mUniViewer); |
683 mUniViewer = NULL; |
683 mUniViewer = NULL; |
684 } |
684 } |
685 |
685 |
686 if (mConversationView) |
|
687 { |
|
688 //clearing content of cv. |
|
689 mConversationView->clearContent(); |
|
690 } |
|
691 |
686 |
692 // reset conversation id published |
687 // reset conversation id published |
693 if(mPreviousView == MsgBaseView::CV && mConversationView) |
688 if(mPreviousView == MsgBaseView::CV && mConversationView) |
694 { |
689 { |
695 mConversationView->setPSCVId(false); |
690 mConversationView->setPSCVId(false); |
764 mUniViewer->setNavigationAction(mBackAction); |
759 mUniViewer->setNavigationAction(mBackAction); |
765 mMainWindow->addView(mUniViewer); |
760 mMainWindow->addView(mUniViewer); |
766 connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this, |
761 connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this, |
767 SLOT(switchView(const QVariantList&))); |
762 SLOT(switchView(const QVariantList&))); |
768 } |
763 } |
769 mUniViewer->populateContent(messageId, true, msgCount); |
764 mUniViewer->populateContent(messageId, true, msgCount, mConversationId); |
770 } |
765 } |
771 |
766 |
772 if(mPreviousView==MsgBaseView::CV && mConversationView) |
767 if(mPreviousView==MsgBaseView::CV && mConversationView) |
773 { |
768 { |
774 mConversationView->setPSCVId(false); |
769 mConversationView->setPSCVId(false); |
924 mUniViewer->setNavigationAction(mBackAction); |
919 mUniViewer->setNavigationAction(mBackAction); |
925 mMainWindow->addView(mUniViewer); |
920 mMainWindow->addView(mUniViewer); |
926 connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this, |
921 connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this, |
927 SLOT(switchView(const QVariantList&))); |
922 SLOT(switchView(const QVariantList&))); |
928 } |
923 } |
929 mUniViewer->populateContent(msgId, true, -1); |
924 mUniViewer->populateContent(msgId, true, -1, mConversationId); |
930 |
925 |
931 mMainWindow->setCurrentView(mUniViewer,true,Hb::ViewSwitchSequential); |
926 mMainWindow->setCurrentView(mUniViewer,true,Hb::ViewSwitchSequential); |
932 } |
927 } |
933 |
928 |
934 // ---------------------------------------------------------------------------- |
929 // ---------------------------------------------------------------------------- |
1098 } |
1093 } |
1099 return msgId; |
1094 return msgId; |
1100 } |
1095 } |
1101 |
1096 |
1102 // ---------------------------------------------------------------------------- |
1097 // ---------------------------------------------------------------------------- |
|
1098 // MsgViewManager::handleKeyEvent |
|
1099 // @see header |
|
1100 // ---------------------------------------------------------------------------- |
|
1101 bool MsgViewManager::handleKeyEvent(int key) |
|
1102 { |
|
1103 MsgBaseView *baseView = static_cast<MsgBaseView *>(mMainWindow->currentView()); |
|
1104 bool eventHandled = false; |
|
1105 if (baseView) { |
|
1106 eventHandled = baseView->handleKeyEvent(key); |
|
1107 } |
|
1108 return eventHandled; |
|
1109 } |
|
1110 |
|
1111 // ---------------------------------------------------------------------------- |
1103 // MsgViewManager::saveContentToDraft |
1112 // MsgViewManager::saveContentToDraft |
1104 // @see header |
1113 // @see header |
1105 // ---------------------------------------------------------------------------- |
1114 // ---------------------------------------------------------------------------- |
1106 void MsgViewManager::openUniEditorActivity(int activityMsgId) |
1115 void MsgViewManager::openUniEditorActivity(int activityMsgId) |
1107 { |
1116 { |