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

equal deleted inserted replaced

-:0f22fb80ebba
+:cd10d5b85554
 #include <HbStyleLoader>
 #include <HbAction>
 #include "locationpickerproxymodel.h"
 #include "locationpickerdatamanager.h"
-#include "locationpickercontent.h"
 #include "locationpickercollectionlistcontent.h"
 #include "locationpickercollectioncontent.h"
 // ----------------------------------------------------
 // LocationPickerLandscapeView::LocationPickerLandscapeView()
 // ----------------------------------------------------
 LocationPickerLandscapeView::LocationPickerLandscapeView(HbDocumentLoader* aLoader)
 :mDocumentLoader(aLoader),
-mLocationPickerContent(NULL),
-mLocationPickerCollectionListContent(NULL),
 mAllAction(NULL),
 mCollectionAction(NULL),
 mSearchAction(NULL),
 mAscendingAction(NULL),
 mDescendingAction(NULL),
 //create grid view item
 mGridViewItem = new HbGridViewItem();
 mGridViewItem->setObjectName("locationgrid");
 // create back action
-mLandscapeBackAction = new HbAction(Hb::BackAction);
+mLandscapeBackAction = new HbAction(Hb::BackNaviAction);
 setNavigationAction(mLandscapeBackAction);
 connect(mLandscapeBackAction, SIGNAL(triggered()), this,
 SLOT(backButtonTriggered()));
 }
 // ----------------------------------------------------
 // LocationPickerPotraitView::~LocationPickerLandscapeView()
 // ----------------------------------------------------
 LocationPickerLandscapeView::~LocationPickerLandscapeView()
 {
 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 LocationPickerLandscapeView::init(Qt::Orientation aOrientation )
+void LocationPickerLandscapeView::init(Qt::Orientation aOrientation, QStandardItemModel *aModel )
 {
-// Create Collection List Content
+mModel = aModel;
-mLocationPickerCollectionListContent = new LocationPickerCollectionListContent(aOrientation);
+//create proxy model
+mProxyModel = new LocationPickerProxyModel( aOrientation , this  );
-mLocationPickerContent = new LocationPickerContent(aOrientation);
+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
 	 mGridView = qobject_cast<HbGridView*> (mDocumentLoader->findObject(QString(
 "gridView")));
 //get the action items from docml
 QString("descendingAction")));
 if( !mAllAction || !mCollectionAction || !mSearchAction || !mGridView || !mAscendingAction || !mDescendingAction)
 {
 qFatal("Error Reading Docml");
 }
+if(this->mainWindow()->orientation() == Qt::Horizontal)
+{
+int rowCount = mGridView->rowCount();
+int columnCount = mGridView->columnCount();
+mGridView->setRowCount(columnCount);
+mGridView->setColumnCount(rowCount);
+}
 //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(mGridView, SIGNAL(activated(const QModelIndex &)), this, SLOT(handleActivated(const QModelIndex &)));
 }
 void LocationPickerLandscapeView::manageGridView()
 {
-// Create Locationpicker Content
+//set the appropriate model
-if (!mLocationPickerContent->locationsFound())
+switch(mViewType)
 {
-//if no location entries present
+case ELocationPickerContent:
-mGridView->setModel(mLocationPickerContent->getStandardModel(),mGridViewItem);
+{
-disableTabs();
+mGridView->setModel(mProxyModel,mGridViewItem);
-mViewType = ELocationPickerContent;
+mAllAction->setChecked(true);
-}
+mCollectionAction->setChecked(false);
-else
+}
-{
+break;
-//set the appropriate model
+case ELocationPickerCollectionContent:
-switch(mViewType)
+{
-{
+setCollectionData(mCategoryId);
-case ELocationPickerContent:
+mCollectionAction->setChecked(true);
-{
+mAllAction->setChecked(false);
-mGridView->setModel(mLocationPickerContent->getGridProxyModel(),mGridViewItem);
+}
-mAllAction->setChecked(true);
+break;
-mCollectionAction->setChecked(false);
+}
 }
-break;
-case ELocationPickerCollectionContent:
-{
-setCollectionData(mCategoryId);
-mCollectionAction->setChecked(true);
-mAllAction->setChecked(false);
-}
-break;
-}
-}
-}
-void LocationPickerLandscapeView::disableTabs()
-{
-mAllAction->setDisabled(true);
-mCollectionAction->setDisabled(true);
-mSearchAction->setDisabled(true);
-mAscendingAction->setDisabled(true);
-mDescendingAction->setDisabled(true);
-}
 // -----------------------------------------------------------------------------
 // LocationPickerLandscapeView::handleActivated()
 // -----------------------------------------------------------------------------
 void LocationPickerLandscapeView::handleActivated(const QModelIndex &aIndex)
 {
 //handle the activated signal according to model set
 switch(mViewType)
 {
 case ELocationPickerContent:
 {
-QModelIndex  index = mLocationPickerContent->getGridProxyModel()->mapToSource(
+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(
-aIndex.row(), mCategoryId);
-setCollectionData(mCategoryId);
-emit sendCategoryID(mCategoryId);
-}
-break;
-//default
 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);
 emit selectItem(lm);
 }
 break;
 default:
 break;
 void LocationPickerLandscapeView::sortAscending()
 {
 //check the model set and do sorting accordingly
 if (mViewType == ELocationPickerContent)
 {
-mLocationPickerContent->getGridProxyModel()->sort(0, Qt::AscendingOrder);
+mProxyModel->sort(0, Qt::AscendingOrder);
 }
 else
 {
 mCollectionContent->getProxyModel()->sort(0, Qt::AscendingOrder);
 }
 void LocationPickerLandscapeView::sortDescending()
 {
 //check the model set and do sorting accordingly
 if (mViewType == ELocationPickerContent)
 {
-mLocationPickerContent->getGridProxyModel()->sort(0, Qt::DescendingOrder);
+mProxyModel->sort(0, Qt::DescendingOrder);
 }
 else
 {
 mCollectionContent->getProxyModel()->sort(0, Qt::DescendingOrder);
 }
 void LocationPickerLandscapeView::allTabTriggered()
 {
 //execute only if tab is not pressed
 if (mAllAction->isChecked())
 {
-mGridView->setModel(mLocationPickerContent->getGridProxyModel(),mGridViewItem);
+mGridView->setModel(mProxyModel,mGridViewItem);
 mAscendingAction->setEnabled(true);
 mDescendingAction->setEnabled(true);
 mCollectionAction->setChecked(false);
 mViewType = ELocationPickerContent;
 		   //delete mCollectionContent if coming back from collectioncontent
 emit switchToSearchView();
 }
 void LocationPickerLandscapeView::setCollectionData( quint32 aCategoryId )
 {
-mCollectionContent
+if(!mCollectionContent)
-= new LocationPickerCollectionContent(this->mainWindow()->orientation() , aCategoryId);
+{
-mGridView->setModel(mCollectionContent->getProxyModel(),mGridViewItem);
+mCollectionContent = new LocationPickerCollectionContent(Qt::Horizontal , aCategoryId);
+}
+if(mCollectionContent->locationFound())
+{
+mGridView->setModel(mCollectionContent->getProxyModel(),mGridViewItem);
+}
+else
+{
+mGridView->setModel(mCollectionContent->getStandardModel(),mGridViewItem);
+}
 mViewType = ELocationPickerCollectionContent;
 //Enable the options
 mAscendingAction->setEnabled(true);
 mDescendingAction->setEnabled(true);
 mCollectionAction->setChecked(true);
 // -----------------------------------------------------------------------------
 void LocationPickerLandscapeView::setViewType(TViewType aViewType)
 {
 mViewType = aViewType;
 }
+// -----------------------------------------------------------------------------
+// LocationPickerLandscapeView::clearContentModel()
+// -----------------------------------------------------------------------------
+void LocationPickerLandscapeView::clearContentModel()
+{
+if(mCollectionContent)
+{
+delete mCollectionContent;
+mCollectionContent = NULL;
+}
+}

changeset 20	cd10d5b85554
parent 17	0f22fb80ebba
child 24	ccec19943943