FCL/sf/app/location: comparison locationpickerservice/src/locationpickerpotraitview.cpp

equal deleted inserted replaced

-:0f22fb80ebba
+:cd10d5b85554
 // ======== MEMBER FUNCTIONS ========
 // ----------------------------------------------------
 // LocationPickerPotraitView::LocationPickerView()
 // ----------------------------------------------------
-LocationPickerPotraitView::LocationPickerPotraitView(HbDocumentLoader* aLoader)
+LocationPickerPotraitView::LocationPickerPotraitView( HbDocumentLoader* aLoader )
 :mDocumentLoader(aLoader),
-mLocationPickerContent(NULL),
 mLocationPickerCollectionListContent(NULL),
+mProxyModel(NULL),
 mAllAction(NULL),
 mCollectionAction(NULL),
 mSearchAction(NULL),
 mAscendingAction(NULL),
 mDescendingAction(NULL),
 mListView(NULL),
 mCollectionContent(NULL),
 mViewType(ELocationPickerContent)
 {
 // create back action
-mPotraitBackAction = new HbAction(Hb::BackAction);
+mPotraitBackAction = new HbAction(Hb::BackNaviAction);
 // add back key action
 setNavigationAction(mPotraitBackAction);
 //connect to slots
 connect(mPotraitBackAction, SIGNAL(triggered()), this,
 SLOT(backTriggered()));
 // LocationPickerPotraitView::~LocationPickerView()
 // ----------------------------------------------------
 LocationPickerPotraitView::~LocationPickerPotraitView()
 {
 delete mCollectionContent;
-delete mLocationPickerContent;
 delete mLocationPickerCollectionListContent;
 delete mAllAction;
 delete mCollectionAction;
 delete mAscendingAction;
 delete mDescendingAction;
 {
 //if current model is collection content, go back to collectionlist content
 if(mViewType == ELocationPickerCollectionContent)
 {
 colectionTabTriggered();
-delete mCollectionContent;
+emit collectionContentExited();
-mCollectionContent=NULL;
 }
 else
 {
 //complete the service
 emit completeService();
 // ----------------------------------------------------
 // LocationPickerPotraitView::init()
 // ----------------------------------------------------
-void LocationPickerPotraitView::init(Qt::Orientation aOrientation )
+void LocationPickerPotraitView::init( bool aPopulated, Qt::Orientation aOrientation, QStandardItemModel *aModel )
 {
+mModel = aModel;
+if(aPopulated)
+{
 // Create Collection List Content
 mLocationPickerCollectionListContent = new LocationPickerCollectionListContent(aOrientation);
-mLocationPickerContent = new LocationPickerContent(aOrientation);
+//create proxy model
+mProxyModel = new LocationPickerProxyModel( aOrientation , this  );
+mProxyModel->setSourceModel(aModel);
+// set sort properties
+mProxyModel->setDynamicSortFilter(TRUE);
+mProxyModel->setSortRole(Qt::DisplayRole);
+mProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
+// sort in ascending order
+mProxyModel->sort(0, Qt::AscendingOrder);
+}
 //Get HbAction items
 mListView = qobject_cast<HbListView*> (mDocumentLoader->findObject(QString(
 "ListView")));
 //get the action items from docml
 mAllAction = qobject_cast<HbAction*> (mDocumentLoader->findObject(QString(
 "allAction")));
 mCollectionAction = qobject_cast<HbAction*> (mDocumentLoader->findObject(
 QString("collectionAction")));
 "searchAction")));
 mAscendingAction = qobject_cast<HbAction*> (mDocumentLoader->findObject(
 QString("ascendingAction")));
 mDescendingAction = qobject_cast<HbAction*> (mDocumentLoader->findObject(
 QString("descendingAction")));
-if( !mAllAction || !mCollectionAction || !mSearchAction || !mListView || !mAscendingAction || !mDescendingAction)
+if( !mAllAction || !mCollectionAction || !mSearchAction || !mAscendingAction || !mDescendingAction || !mListView)
 {
 qFatal("Error Reading Docml");
 }
 //connect to slots
 connect(mAscendingAction, SIGNAL(triggered()), this, SLOT(sortAscending()));
 connect(mDescendingAction, SIGNAL(triggered()), this,
 SLOT(sortDescending()));
 //connect all action Items to respective slots
 // connect the signal of the list activated to a slot.
 connect(mListView, SIGNAL(activated(const QModelIndex &)), this, SLOT(handleActivated(const QModelIndex &)));
 }
 void LocationPickerPotraitView::manageListView()
 {
-if (!mLocationPickerContent->locationsFound())
+//set the appropriate model
-{
+switch(mViewType)
-//if no location entries present
+{
-mListView->setModel(mLocationPickerContent->getStandardModel(),mListItem);
+case ELocationPickerContent:
-disableTabs();
+{
-}
+mListItem->setGraphicsSize(HbListViewItem::Thumbnail);
-else
+mListView->setModel(mProxyModel,mListItem);
-{
+mAllAction->setChecked(true);
-//set the appropriate model
+mCollectionAction->setChecked(false);
-switch(mViewType)
+mViewType = ELocationPickerContent;
-{
+}
-case ELocationPickerContent:
+break;
-{
+case ELocationPickerCollectionListContent:
-mListItem->setGraphicsSize(HbListViewItem::Thumbnail);
+{
-mListView->setModel(mLocationPickerContent->getListProxyModel(),mListItem);
+mListItem->setGraphicsSize(HbListViewItem::MediumIcon);
-mAllAction->setChecked(true);
+mListView->setModel(mLocationPickerCollectionListContent->getStandardModel(),mListItem);
-mCollectionAction->setChecked(false);
+mCollectionAction->setChecked(true);
-mViewType = ELocationPickerContent;
+mAllAction->setChecked(false);
-}
+mViewType = ELocationPickerCollectionListContent;
-break;
+}
-case ELocationPickerCollectionListContent:
+break;
-{
+case ELocationPickerCollectionContent:
-mListItem->setGraphicsSize(HbListViewItem::MediumIcon);
+{
-mListView->setModel(mLocationPickerCollectionListContent->getStandardModel(),mListItem);
+setCollectionData(mCategoryId);
 mCollectionAction->setChecked(true);
 mAllAction->setChecked(false);
-mViewType = ELocationPickerCollectionListContent;
+mViewType = ELocationPickerCollectionContent;
 }
 break;
-case ELocationPickerCollectionContent:
+default:
-{
+break;
-setCollectionData(mCategoryId);
+}
-mCollectionAction->setChecked(true);
+}
-mAllAction->setChecked(false);
-mViewType = ELocationPickerCollectionContent;
-}
+void LocationPickerPotraitView::disableTabs( QStandardItemModel *aModel )
-break;
+{
-default:
+//if no location entries present
-break;
+mListView->setModel(aModel,mListItem);
-}
-}
-}
-void LocationPickerPotraitView::disableTabs()
-{
 mAllAction->setDisabled(true);
 mCollectionAction->setDisabled(true);
 mSearchAction->setDisabled(true);
 mAscendingAction->setDisabled(true);
 mDescendingAction->setDisabled(true);
 }
 // -----------------------------------------------------------------------------
 // LocationPickerView::handleActivated()
 // -----------------------------------------------------------------------------
-void LocationPickerPotraitView::handleActivated(const QModelIndex &aIndex)
+void LocationPickerPotraitView::handleActivated( const QModelIndex &aIndex )
 {
 //handle the activated signal according to model set
 switch(mViewType)
 {
 case ELocationPickerContent:
 {
-QModelIndex   index = mLocationPickerContent->getListProxyModel()->mapToSource(
+if(!mProxyModel)
+{
+break;
+}
+QModelIndex   index = mProxyModel->mapToSource(
 aIndex);
 quint32 lm = 0;
-mLocationPickerContent->getDataManager()->getData(index.row(), lm);
+QStandardItem* item = mModel->item( index.row(), index.column() );
+QVariant var = item->data( Qt::UserRole );
+lm = var.toUInt();
 //item selected, complete request
 emit selectItem( lm );
 }
 break;
 case ELocationPickerCollectionListContent:
 {
-mLocationPickerCollectionListContent->getDataManager()->getData(
+mLocationPickerCollectionListContent->getData(
-aIndex.row(), mCategoryId);
+aIndex, mCategoryId );
 mViewType = ELocationPickerCollectionContent;
 //send categoryID to set the collection content
 emit sendCategoryID(mCategoryId);
 }
 break;
 case ELocationPickerCollectionContent:
 {
+if(!mCollectionContent->getProxyModel())
+{
+break;
+}
 QModelIndex  index = mCollectionContent->getProxyModel()->mapToSource(
 aIndex);
 quint32 lm = 0;
-mCollectionContent->getDataManager()->getData(index.row(), lm);
+mCollectionContent->getData(index, lm);
 //item selected, complete request
 emit selectItem(lm);
 }
 break;
 default:
 void LocationPickerPotraitView::sortAscending()
 {
 //check the model set and do sorting accordingly
 if (mViewType == ELocationPickerContent)
 {
-mLocationPickerContent->getListProxyModel()->sort(0, Qt::AscendingOrder);
+mProxyModel->sort(0, Qt::AscendingOrder);
 }
 else
 {
 mCollectionContent->getProxyModel()->sort(0, Qt::AscendingOrder);
 }
 void LocationPickerPotraitView::sortDescending()
 {
 //check the model set and do sorting accordingly
 if (mViewType == ELocationPickerContent)
 {
-mLocationPickerContent->getListProxyModel()->sort(0, Qt::DescendingOrder);
+mProxyModel->sort(0, Qt::DescendingOrder);
 }
 else
 {
 mCollectionContent->getProxyModel()->sort(0, Qt::DescendingOrder);
 }
 emit handleAllList();
 }
 else
 {
 mListItem->setGraphicsSize(HbListViewItem::Thumbnail);
-mListView->setModel(mLocationPickerContent->getListProxyModel(),mListItem);
+mListView->setModel(mProxyModel,mListItem);
 mCollectionAction->setChecked(false);
 }
 mAscendingAction->setEnabled(true);
 mDescendingAction->setEnabled(true);
 //delete mCollectionContent if coming back from collectioncontent
 // -----------------------------------------------------------------------------
 // LocationPickerView::setCollectionData()
 // -----------------------------------------------------------------------------
 void LocationPickerPotraitView::setCollectionData( quint32 acategoryId )
 {
-mCollectionContent
-= new LocationPickerCollectionContent(this->mainWindow()->orientation() , acategoryId);
+if(!mCollectionContent)
+{
+mCollectionContent
+= new LocationPickerCollectionContent(Qt::Vertical , acategoryId);
+}
 mListItem->setGraphicsSize(HbListViewItem::Thumbnail);
-mListView->setModel(mCollectionContent->getProxyModel(),mListItem);
+if(mCollectionContent->locationFound())
+{
+mListView->setModel(mCollectionContent->getProxyModel(),mListItem);
+}
+else
+{
+mListView->setModel(mCollectionContent->getStandardModel(),mListItem);
+}
 mViewType = ELocationPickerCollectionContent;
 //Enable the options
 mAscendingAction->setEnabled(true);
 mDescendingAction->setEnabled(true);
 mCollectionAction->setChecked(true);
 // -----------------------------------------------------------------------------
 void LocationPickerPotraitView::setViewType(TViewType aViewType)
 {
 mViewType = aViewType;
 }
+// -----------------------------------------------------------------------------
+// LocationPickerView::clearContentModel()
+// -----------------------------------------------------------------------------
+void LocationPickerPotraitView::clearContentModel()
+{
+if(mCollectionContent)
+{
+delete mCollectionContent;
+mCollectionContent = NULL;
+}
+}

changeset 20	cd10d5b85554
parent 17	0f22fb80ebba
child 24	ccec19943943