FCL/sf/app/contacts: comparison phonebookui/pbkcommonui/src/cntnamesview

equal deleted inserted replaced

-:d508aa856878
+:d30183af6ca6
 #include "cntfetchcontactpopup.h"
 #include "cntextensionmanager.h"
 #include "cntglobal.h"
 #include "cntdebug.h"
 #include "cntapplication.h"
+#include <cntabstractengine.h>
 #include <cntuiextensionfactory.h>
 #include <cntuisocialextension.h>
 #include <hbabstractviewitem.h>
 #include <hblistview.h>
 #include <hblistviewitem.h>
 #include <hblineedit.h>
 #include <hbindexfeedback.h>
 #include <hbscrollbar.h>
-#include <hbgroupbox.h>
 #include <hbsearchpanel.h>
 #include <hbtoolbar.h>
 #include <hbframebackground.h>
 #include <hbshrinkingvkbhost.h>
 #include <hbmessagebox.h>
 #include <QInputContext>
 const char *CNT_CONTACTLIST_XML = ":/xml/contacts_namelist.docml";
 static const int CNT_MIN_ROW_COUNT = 2;
-CntNamesViewPrivate::CntNamesViewPrivate(CntExtensionManager &extensionManager) :
+CntNamesViewPrivate::CntNamesViewPrivate() :
 QObject(),
-mExtensionManager(extensionManager),
 mViewManager(NULL),
 mListModel(NULL),
 mListView(NULL),
 	mEmptyList(NULL),
-mBanner(NULL),
 mSearchPanel(NULL),
 mLoader(NULL),
 mVirtualKeyboard(NULL),
 mNamesAction(NULL),
 mMenuBuilder(NULL),
 SLOT(showContextMenu(HbAbstractViewItem*,QPointF)));
 connect(list(), SIGNAL(activated (const QModelIndex&)), this,
 SLOT(showContactView(const QModelIndex&)));
 mEmptyList = static_cast<HbLabel*> (document()->findWidget("emptyLabel"));
-mBanner = static_cast<HbGroupBox*> (document()->findWidget("banner"));
 mSearchPanel = static_cast<HbSearchPanel*> (document()->findWidget("searchPanel"));
 connect(mSearchPanel, SIGNAL(exitClicked()), this, SLOT(hideFinder()));
 connect(mSearchPanel, SIGNAL(criteriaChanged(QString)), this, SLOT(setFilter(QString)));
 HbMainWindow* win = mView->mainWindow();
 }
 CNT_EXIT
 }
-void CntNamesViewPrivate::activate(CntAbstractViewManager* aMgr, const CntViewParameters aArgs)
+void CntNamesViewPrivate::activate(const CntViewParameters aArgs)
 {
 CNT_ENTRY
-mViewManager = aMgr;
+mViewManager = &mEngine->viewManager();
 if (mView->mainWindow() != NULL && !(mView->visibleItems() & Hb::AllItems))
 {
 hideFinder();
 }
 QContactDetailFilter filter;
 filter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType);
 QString typeContact = QContactType::TypeContact;
 filter.setValue(typeContact);
-mListModel = new CntListModel(mViewManager->contactManager(SYMBIAN_BACKEND), filter);
+mListModel = new CntListModel( &mEngine->contactManager(SYMBIAN_BACKEND), filter);
 list()->setModel(mListModel);
 }
 mNamesAction->setChecked(true);
 mView->setNavigationAction(mSoftkey);
 }
 changeDeleteActionStatus();
-QContactManager* contactManager = aMgr->contactManager( SYMBIAN_BACKEND );
+QContactManager* contactManager = &mEngine->contactManager( SYMBIAN_BACKEND );
 // make connections unique, that is, duplicate connections are not connected again
 connect(contactManager, SIGNAL(contactsAdded(const QList<QContactLocalId>&)),
 this, SLOT(handleContactAddition(const QList<QContactLocalId>&)), Qt::UniqueConnection);
 connect(contactManager, SIGNAL(contactsRemoved(const QList<QContactLocalId>&)),
 this, SLOT(handleContactRemoval(const QList<QContactLocalId>&)), Qt::UniqueConnection);
 void CntNamesViewPrivate::focusLineEdit()
 {
 CNT_ENTRY
 HbLineEdit *editor = static_cast<HbLineEdit*>(mSearchPanel->primitive("lineedit"));
-editor->setObjectName("focusLineEdit");
-editor->setInputMethodHints(Qt::ImhNoPredictiveText);
 if (editor)
 {
+editor->setObjectName("focusLineEdit");
+editor->setInputMethodHints(Qt::ImhNoPredictiveText);
 editor->setText("");
 editor->setFocus();
 // This opens the VKB
 QInputContext *ic = qApp->inputContext();
 {
 QEvent *event = new QEvent(QEvent::RequestSoftwareInputPanel);
 ic->filterEvent(event);
 delete event;
 }
 }
 CNT_EXIT
 }
 {
 CNT_ENTRY
 mListModel->showMyCard(false);
+HbListViewItem* proto = mListView->listItemPrototype();
+proto->setTextFormat( Qt::RichText );
+mView->hideItems(Hb::AllItems);
 focusLineEdit();
-mView->hideItems(Hb::AllItems);
-mImportSim->setVisible(false);
-mNewContact->setVisible(false);
-mMultipleDeleter->setVisible(false);
-HbAction* settings = static_cast<HbAction*>(document()->findObject("cnt:settings") );
-settings->setVisible(false);
 CNT_EXIT
 }
 void CntNamesViewPrivate::hideFinder()
 CNT_ENTRY
 document()->load( CNT_CONTACTLIST_XML, "no_find" );
 mView->showItems(Hb::AllItems);
+HbListViewItem* proto = mListView->listItemPrototype();
+proto->setTextFormat( Qt::PlainText );
 mListModel->showMyCard(true);
 if (mFilterChanged)
 {
 QContactDetailFilter filter;
 filter.setValue(typeContact);
 mListModel->setFilter(filter);
 mFilterChanged = false;
 }
-mNewContact->setVisible(true);
-mImportSim->setVisible(true);
-mMultipleDeleter->setVisible(true);
-HbAction* settings = static_cast<HbAction*>(document()->findObject("cnt:settings") );
-settings->setVisible(true);
 CNT_EXIT
 }
 bool CntNamesViewPrivate::isFinderVisible()
 {
 }
 void CntNamesViewPrivate::handleExtensionAction()
 {
 CNT_ENTRY
+CntExtensionManager& mgr = mEngine->extensionManager();
-for (int i = 0; i < mExtensionManager.pluginCount(); i++)
+for (int i = 0; i < mgr.pluginCount(); i++)
 {
-CntUiSocialExtension* socialExtension = mExtensionManager.pluginAt(i)->socialExtension();
+CntUiSocialExtension* socialExtension = mgr.pluginAt(i)->socialExtension();
 if (socialExtension)
 {
 CntViewParameters params;
 socialExtension->handleToolbarAction(params);
 if (params.count())
 void CntNamesViewPrivate::deleteContact(QContact& aContact)
 {
 CNT_ENTRY
-QContactManager* manager = mViewManager->contactManager( SYMBIAN_BACKEND );
+QContactManager& manager = mEngine->contactManager( SYMBIAN_BACKEND );
-QString name = manager->synthesizedContactDisplayLabel(aContact);
+QString name = manager.synthesizedContactDisplayLabel(aContact);
 if (name.isEmpty())
 {
 name = hbTrId("txt_phob_list_unnamed");
 }
 {
 CNT_ENTRY
 CntFetchContactPopup* popup = CntFetchContactPopup::createMultiSelectionPopup(
 hbTrId("txt_phob_title_delete_contacts"),
 hbTrId("txt_common_button_delete"),
-*mViewManager->contactManager(SYMBIAN_BACKEND));
+mEngine->contactManager(SYMBIAN_BACKEND));
 connect(popup, SIGNAL(fetchReady(QSet<QContactLocalId>)),
 this, SLOT(handleDeleteMultipleContacts(QSet<QContactLocalId>)) );
+QSet<QContactLocalId> ids;
+popup->setSelectedContacts(ids);
 popup->showPopup();
 CNT_EXIT
 }
 void CntNamesViewPrivate::handleDeleteMultipleContacts( QSet<QContactLocalId> aIds )
 {
 CNT_ENTRY
-QContactManager* manager = mViewManager->contactManager( SYMBIAN_BACKEND );
+mEngine->contactManager( SYMBIAN_BACKEND ).removeContacts(aIds.toList(), NULL);
-foreach ( QContactLocalId id, aIds )
-{
-manager->removeContact( id );
-}
 CNT_EXIT
 }
 void CntNamesViewPrivate::showContactView( const QModelIndex& aIndex )
 void CntNamesViewPrivate::executeAction( QContact& aContact, QContactDetail aDetail, QString aAction )
 {
 CNT_ENTRY
-CntActionLauncher* other = new CntActionLauncher( *mViewManager->contactManager(SYMBIAN_BACKEND), aAction );
+CntActionLauncher* other = new CntActionLauncher( mEngine->contactManager(SYMBIAN_BACKEND), aAction );
 connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*)));
 other->execute(aContact, aDetail);
 CNT_EXIT
 }
 {
 CNT_ENTRY
 if (aAction == HbMessageBox::Delete)
 {
-mViewManager->contactManager( SYMBIAN_BACKEND )->removeContact(mHandledContactId);
+mEngine->contactManager( SYMBIAN_BACKEND ).removeContact(mHandledContactId);
 }
 mHandledContactId = 0;
 CNT_EXIT
 Q_UNUSED(aOldId);
 Q_UNUSED(aNewId);
 changeDeleteActionStatus();
+list()->scrollTo(mListModel->index(0));
 CNT_EXIT
 }
 void CntNamesViewPrivate::setScrollPosition(int focusedContact)
 {
 CNT_ENTRY
 // Scroll to the focused contact
 if ( focusedContact > 0 )
 {
-QContactManager* contactManager = mViewManager->contactManager( SYMBIAN_BACKEND );
+QContactManager& contactManager = mEngine->contactManager( SYMBIAN_BACKEND );
-QContact c = contactManager->contact(focusedContact);
+QContact c = contactManager.contact(focusedContact);
 list()->scrollTo(mListModel->indexOfContact(c), HbAbstractItemView::EnsureVisible);
 }
 CNT_EXIT
 }
 mListView->verticalScrollBar()->setInteractive(true);
 HbFrameBackground frame;
 frame.setFrameGraphicsName("qtg_fr_list_normal");
 frame.setFrameType(HbFrameDrawer::NinePieces);
-mListView->itemPrototypes().first()->setDefaultFrame(frame);
+HbListViewItem* prototype = mListView->listItemPrototype();
+prototype->setDefaultFrame( frame );
 mListView->setUniformItemSizes(true);
 mListView->setItemRecycling(true);
 HbIndexFeedback *indexFeedback = new HbIndexFeedback(mView);

changeset 61	d30183af6ca6
parent 54	47627ab5d7a4
child 66	554fe4dbbb59