FCL/sf/app/messaging: comparison messagingapp/msgui/msgapp/src/msglistview.cpp

equal deleted inserted replaced

-:a32b19fb291e
+:5b14749788d7
 //itemspecific menu
 #define LOC_OPEN hbTrId("txt_common_menu_open")
 #define LOC_SAVETO_CONTACTS hbTrId("txt_messaging_menu_save_to_contacts")
 #define LOC_DELETE_CONVERSATION hbTrId("txt_messaging_menu_delete_conversation")
-#define LOC_OPEN_CONTACT_INFO hbTrId("txt_messaging_menu_open_contact_info")
+#define LOC_OPEN_CONTACT_INFO hbTrId("txt_messaging_menu_contact_info")
-#define LOC_BUTTON_DELETE hbTrId("txt_common_button_delete")
-#define LOC_BUTTON_CANCEL hbTrId("txt_common_button_cancel")
 //main menu
 #define LOC_SETTINGS    hbTrId("txt_messaging_opt_settings")
 #define LOC_TB_VIEW_EXTN hbTrId("txt_messaging_button_view")
 //---------------------------------------------------------------
 // MsgListView::MsgListView
 // @see header
 //---------------------------------------------------------------
 MsgListView::MsgListView(QGraphicsItem *parent) :
-MsgBaseView(parent),
+MsgBaseView(parent)
-mItemLongPressed(false)
+{
-{
+//These changes are needed for splash implementation to avoid flicker
-connect(this->mainWindow(),SIGNAL(viewReady()),this,SLOT(doDelayedConstruction()));
+setupToolBar();
-}
+setupMenu();
+// Create parent layout.
+mMainLayout = new QGraphicsLinearLayout(Qt::Vertical);
+mMainLayout->setContentsMargins(0, 0, 0, 0);
+mMainLayout->setSpacing(0);
+// Create view heading.
+HbGroupBox *viewHeading = new HbGroupBox();
+viewHeading->setHeading(LOC_VIEW_HEADING);
+// Add view heading widget to main layout.
+mMainLayout->addItem(viewHeading);
+this->setLayout(mMainLayout);
+connect(this->mainWindow(), SIGNAL(viewReady()), this,
+SLOT(doDelayedConstruction()));
+}
 //---------------------------------------------------------------
 // MsgListView::~MsgListView
 // @see header
 //---------------------------------------------------------------
 // MsgListView::longPressed
 // @see header
 //---------------------------------------------------------------
 void MsgListView::longPressed(HbAbstractViewItem* viewItem, const QPointF& point)
 {
-mItemLongPressed = true;
 if (this->isVisible()) {
 // Set the current index as the present Item's index.
 // By default it will not be set.
 mMsgList->setCurrentIndex(viewItem->modelIndex(), QItemSelectionModel::Select);
 // MsgListView::openConversation
 // @see header
 //---------------------------------------------------------------
 void MsgListView::openConversation(const QModelIndex& index)
 {
-if(mItemLongPressed)
-{
-mItemLongPressed = false;
-return;
-}
 //TODO: model populating possibilities.
 if (index.isValid()) {
 QVariant conversationId = index.data(ConversationId);
 // Launch conversation view
 #ifdef _DEBUG_TRACES_
 qDebug() << "Inside MsgListView::deleteItem";
 #endif
 //confirmation dialog.
 HbMessageBox::question(LOC_DIALOG_DELETE_CONVERSATION,
 this,SLOT(onDialogDeleteMsg(HbAction*)),
-LOC_BUTTON_DELETE, LOC_BUTTON_CANCEL);
+HbMessageBox::Delete | HbMessageBox::Cancel);
 #ifdef _DEBUG_TRACES_
 qDebug() << " Leaving MsgConversationView::deleteItem";
 #endif
 }
 //---------------------------------------------------------------
 // MsgListView::setupView
 // @see header
 //---------------------------------------------------------------
 void MsgListView::setupListView()
 {
-// Create parent layout.
-QGraphicsLinearLayout *mainLayout = new QGraphicsLinearLayout(Qt::Vertical);
-mainLayout->setContentsMargins(0, 0, 0, 0);
-mainLayout->setSpacing(0);
-// Create view heading.
-HbGroupBox *viewHeading = new HbGroupBox();
-viewHeading->setHeading(LOC_VIEW_HEADING);
 // Register the custorm css path.
 HbStyleLoader::registerFilePath(":/clv");
 mMsgList = new HbListView(this);
 mMsgList->setScrollingStyle(HbScrollArea::PanOrFlick);
 mMsgList->setClampingStyle(HbScrollArea::BounceBackClamping);
 mMsgList->setLayoutName("custom");
 mMsgList->setItemRecycling(true);
 mMsgList->setUniformItemSizes(true);
 MsgListViewItem *prototype = new MsgListViewItem(this);
 mMsgList->setItemPrototype(prototype);
+mMsgList->setModel(ConversationsEngine::instance()->getConversationsSummaryModel());
-// Set proxy model
-QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
-proxyModel->setDynamicSortFilter(true);
-proxyModel->setSourceModel(ConversationsEngine::instance()->getConversationsSummaryModel());
-proxyModel->setSortRole(TimeStamp);
-proxyModel->sort(0, Qt::DescendingOrder);
-mMsgList->setModel(proxyModel);
-connect(ConversationsEngine::instance(), SIGNAL(conversationListModelPopulated()),
-this, SLOT(populateListView()));
 // Single tap list item
-connect(mMsgList, SIGNAL(activated(const QModelIndex&)),
+connect(mMsgList, SIGNAL(activated(const QModelIndex&)), this,
-this, SLOT(openConversation(const QModelIndex&)));
+SLOT(openConversation(const QModelIndex&)));
 // Long tap list item
-connect(mMsgList, SIGNAL(longPressed(HbAbstractViewItem*, const QPointF&)),
+connect(mMsgList,
-this, SLOT(longPressed(HbAbstractViewItem*, const QPointF&)));
+SIGNAL(longPressed(HbAbstractViewItem*, const QPointF&)), this,
+SLOT(longPressed(HbAbstractViewItem*, const QPointF&)));
-// Add all widgets to main layout.
-mainLayout->addItem(viewHeading);
+// enable tap after delete is completed
-mainLayout->addItem(mMsgList);
+connect(ConversationsEngine::instance(),
+SIGNAL(conversationListEntryDeleted( int )), this,
-this->setLayout(mainLayout);
+SLOT(enableListitem( int )));
-}
+// Add list view to main layout.
+mMainLayout->addItem(mMsgList);
+}
 //---------------------------------------------------------------
 // MsgListView::addMenu
 // @see header
 //---------------------------------------------------------------
 HbToolBarExtension *viewExtn = new HbToolBarExtension();
 HbAction *viewAction = toolBar->addExtension(viewExtn);
 viewAction->setIcon(HbIcon(SORT_ICON));
 mViewExtnList = new HbListWidget();
+mViewExtnList->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Fixed);
 mViewExtnList->addItem(LOC_TB_EXTN_DRAFTS);
 mViewExtnList->addItem(LOC_TB_EXTN_CONVERSATIONS);
 HbListViewItem *prototype = mViewExtnList->listItemPrototype();
 HbFrameBackground frame(POPUP_LIST_FRAME, HbFrameDrawer::NinePieces);
 //---------------------------------------------------------------
 // MsgListView::doDelayedConstruction
 // @see header
 //---------------------------------------------------------------
 void MsgListView::doDelayedConstruction()
 {
-setupToolBar();
 setupListView();
-setupMenu();
 disconnect(this->mainWindow(),SIGNAL(viewReady()),this,SLOT(doDelayedConstruction()));
 }
 //---------------------------------------------------------------
 //---------------------------------------------------------------
 // MsgListView::onDialogDeleteMsg
 // @see header
 //---------------------------------------------------------------
 void MsgListView::onDialogDeleteMsg(HbAction* action)
 {
 HbMessageBox *dlg = qobject_cast<HbMessageBox*> (sender());
-if (action == dlg->actions().at(0)) {
+if (action == dlg->actions().at(0))
+{
 QModelIndex index = mMsgList->currentIndex();
-if(index.isValid())
+if (index.isValid())
+{
+HbAbstractViewItem *item = mMsgList->currentViewItem();
+item->ungrabGesture(Qt::TapGesture);
+qint64 conversationId = index.data(ConversationId).toLongLong();
+ConversationsEngine::instance()->deleteConversations(
+conversationId);
+}
+}
+}
+//---------------------------------------------------------------
+// MsgListView::enableListitem
+// @see header
+//---------------------------------------------------------------
+void MsgListView::enableListitem(int conversationId)
+{
+QAbstractItemModel* proxyModel = mMsgList->model();
+QModelIndexList indexList = proxyModel->match(proxyModel->index(0, 0),
+ConversationId, conversationId, 1, Qt::MatchExactly);
+HbAbstractViewItem* item = NULL;
+int count = indexList.count();
+	// only item is expected to be the result of the above match function
+if (1 == count)
 {
-qint64 conversationId = index.data(ConversationId).toLongLong();
+item = mMsgList->itemByIndex(indexList[0]);
-ConversationsEngine::instance()->deleteConversations(conversationId);
+if (item)
+{
+item->grabGesture(Qt::TapGesture);
+}
 }
 }
-}
 //EOF

branch	GCC_SURGE
changeset 47	5b14749788d7
parent 27	e4592d119491
parent 44	36f374c67aa8