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

equal deleted inserted replaced

-:7cbcb2896f0e
+:a642906a277a
 *
 */
 #include "cntnamesview_p.h"
 #include "cntactionlauncher.h"
-#include "cntfetchcontactsview.h"
+#include "cntfetchcontactpopup.h"
 #include "cntextensionmanager.h"
 #include "cntglobal.h"
 #include "cntdebug.h"
+#include "cntapplication.h"
 #include <cntuiextensionfactory.h>
 #include <cntuisocialextension.h>
-#include <qapplication.h>
 #include <hbabstractviewitem.h>
 #include <hbaction.h>
 #include <hbmenu.h>
 #include <hbtoolbar.h>
 #include <hbmainwindow.h>
 #include <hbframebackground.h>
 #include <hbshrinkingvkbhost.h>
 #include <hbmessagebox.h>
 #include <hbparameterlengthlimiter.h>
+#include <QInputContext>
 const char *CNT_CONTACTLIST_XML = ":/xml/contacts_namelist.docml";
 static const int CNT_MIN_ROW_COUNT = 2;
 CntNamesViewPrivate::CntNamesViewPrivate(CntExtensionManager &extensionManager) :
 QObject(),
 mLoader(NULL),
 mVirtualKeyboard(NULL),
 mNamesAction(NULL),
 mMenuBuilder(NULL),
 mHandledContactId(0),
-mFetchView(NULL),
 mIsDefault(true),
 mId( namesView ),
 mActionGroup(NULL),
 	mMenu(NULL),
 	mFilterChanged(false)
 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)));
-CNT_EXIT
+HbMainWindow* win = mView->mainWindow();
+CntApplication* cntApp = static_cast<CntApplication*>(qApp);
+connect(win, SIGNAL(viewReady()), cntApp, SIGNAL(applicationReady()));
+#ifdef __WINS__
+mView->menu()->addAction("Change Orientation", this, SLOT(switchOrientation()) );
+#endif
+CNT_EXIT
+}
+void CntNamesViewPrivate::switchOrientation()
+{
+HbMainWindow* win = mView->mainWindow();
+Qt::Orientation orientation = win->orientation();
+win->setOrientation( orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal );
 }
 CntNamesViewPrivate::~CntNamesViewPrivate()
 {
 CNT_ENTRY
 void CntNamesViewPrivate::activate(CntAbstractViewManager* aMgr, const CntViewParameters aArgs)
 {
 CNT_ENTRY
 mViewManager = aMgr;
+if (mView->mainWindow() != NULL && !(mView->visibleItems() & Hb::AllItems))
+{
+hideFinder();
+}
 if (!mListModel) {
 QContactDetailFilter filter;
 filter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType);
 QString typeContact = QContactType::TypeContact;
 if (aArgs.value(ESelectedAction) == CNT_CREATE_ACTION || aArgs.value(ESelectedAction) == CNT_EDIT_ACTION)
 {
 setScrollPosition(aArgs.value(ESelectedContact).value<QContact>().localId());
 }
+if ( aArgs.value( EExtraAction ).toString() == CNT_FIND_ACTION  )
+{
+showFinder();
+}
 CNT_EXIT
 }
 void CntNamesViewPrivate::deactivate()
 {
 CNT_ENTRY
+HbMainWindow* win = mView->mainWindow();
-if (!(mView->visibleItems() & Hb::AllItems))
+if ( win != NULL)
 {
-hideFinder();
+CntApplication* cntApp = static_cast<CntApplication*>(qApp);
-}
+disconnect(win, SIGNAL(viewReady()), cntApp, SIGNAL(applicationReady()));
+}
 delete mMenuBuilder;
 mMenuBuilder = NULL;
 CNT_EXIT
 }
 if (editor)
 {
 editor->setText("");
 editor->setFocus();
+// This opens the VKB
+QInputContext *ic = qApp->inputContext();
+if (ic)
+{
+QEvent *event = new QEvent(QEvent::RequestSoftwareInputPanel);
+ic->filterEvent(event);
+delete event;
+}
 }
 CNT_EXIT
 }
 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
-mVirtualKeyboard->closeKeypad();
-mView->setMaximumHeight(-1);
 document()->load( CNT_CONTACTLIST_XML, "no_find" );
 mView->showItems(Hb::AllItems);
 mListModel->showMyCard(true);
 }
 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::deleteContact(QContact& aContact)
 {
 CNT_ENTRY
 QContactManager* manager = mViewManager->contactManager( SYMBIAN_BACKEND );
-QString name = manager->synthesizedDisplayLabel(aContact);
+QString name = manager->synthesizedContactDisplayLabel(aContact);
+if (name.isEmpty())
+{
+name = hbTrId("txt_phob_list_unnamed");
+}
 mHandledContactId = aContact.localId();
-HbMessageBox::question(HbParameterLengthLimiter(hbTrId("txt_phob_info_delete_1")).arg(name), this, SLOT(handleDeleteContact(HbAction*)),
+HbMessageBox::question(HbParameterLengthLimiter(hbTrId("txt_phob_info_delete_1")).arg(name), this, SLOT(handleDeleteContact(int)),
-hbTrId("txt_common_button_delete"), hbTrId("txt_common_button_cancel"));
+HbMessageBox::Delete | HbMessageBox::Cancel);
 CNT_EXIT
 }
 void CntNamesViewPrivate::deleteMultipleContacts()
 {
 CNT_ENTRY
+CntFetchContactPopup* popup = CntFetchContactPopup::createMultiSelectionPopup(
-if (!mFetchView) {
+hbTrId("txt_phob_title_delete_contacts"),
-mFetchView = new CntFetchContacts(*mViewManager->contactManager( SYMBIAN_BACKEND ));
+hbTrId("txt_common_button_delete"),
-connect(mFetchView, SIGNAL(clicked()), this, SLOT(handleDeleteMultipleContacts()));
+*mViewManager->contactManager(SYMBIAN_BACKEND));
-}
+connect(popup, SIGNAL(fetchReady(QSet<QContactLocalId>)),
+this, SLOT(handleDeleteMultipleContacts(QSet<QContactLocalId>)) );
-mFetchView->setDetails(hbTrId("txt_phob_title_delete_contacts"),hbTrId("txt_common_button_delete"));
-QSet<QContactLocalId> emptyContactsSet;
+popup->showPopup();
+CNT_EXIT
-// Pop up a list of contacts for deletion
+}
-mFetchView->displayContacts(HbAbstractItemView::MultiSelection, emptyContactsSet);
-CNT_EXIT
+void CntNamesViewPrivate::handleDeleteMultipleContacts( QSet<QContactLocalId> aIds )
-}
+{
+CNT_ENTRY
-void CntNamesViewPrivate::handleDeleteMultipleContacts()
-{
-CNT_ENTRY
-QSet<QContactLocalId> selectedContacts = mFetchView->getSelectedContacts();
 QContactManager* manager = mViewManager->contactManager( SYMBIAN_BACKEND );
-if ( !mFetchView->wasCanceled() && !selectedContacts.isEmpty() ) {
+foreach ( QContactLocalId id, aIds )
-foreach ( QContactLocalId id, selectedContacts.values() )
+{
-{
+manager->removeContact( id );
-manager->removeContact( id );
+}
-}
-}
-delete mFetchView;
-mFetchView = NULL;
 CNT_EXIT
 }
 void CntNamesViewPrivate::showContactView( const QModelIndex& aIndex )
 void CntNamesViewPrivate::showContactView( QContact& aContact )
 {
 CNT_ENTRY
 CntViewParameters args;
-args.insert(EViewId, commLauncherView);
+args.insert(EViewId, contactCardView);
 if (aContact.localId() == mListModel->myCardId() && aContact.details().count() <= 4)
 {
 args.insert(EViewId, myCardView);
 }
 if (!(contact.localId() == mListModel->myCardId() && contact.details().count() <= 4))
 {
 if (mMenu)
 {
 delete mMenu;
+mMenu = NULL;
 }
 mMenu = mMenuBuilder->actionMenu( contact, mListModel->myCardId() );
 mMenu->setPreferredPos( aPoint );
 mMenu->open();
 }
 aAction->deleteLater();
 CNT_EXIT
 }
-void CntNamesViewPrivate::handleDeleteContact( HbAction* aAction )
+void CntNamesViewPrivate::handleDeleteContact( int aAction )
 {
 CNT_ENTRY
-HbMessageBox *note = static_cast<HbMessageBox*>(sender());
+if (aAction == HbMessageBox::Delete)
-if (note && aAction == note->actions().first())
 {
 mViewManager->contactManager( SYMBIAN_BACKEND )->removeContact(mHandledContactId);
 }
 mHandledContactId = 0;

changeset 59	a642906a277a
parent 47	7cbcb2896f0e
child 65	ae724a111993