FCL/sf/mw/homescreensrv: comparison contentstorage/caclient/src/caitemmodel.cpp

equal deleted inserted replaced

-:9b022b1f357c
+:e0aa398e6810
 QSharedPointer<CaEntry> CaItemModel::entry(const QModelIndex &index) const
 {
 return m_d->entry(index);
 }
+QList<int> CaItemModel::getUninstallingEntriesIds(int componentId)
+{
+return m_d->getUninstallingEntriesIds(componentId);
+}
+void CaItemModel::updateProgress(int id, int valueOfProgress)
+{
+m_d->updateProgress(id, valueOfProgress);
+}
 /*!
 Constructor
 \param query needed to create model
 \param pointer to public implementation object connected
 */
 QVariant CaItemModelPrivate::data(const QModelIndex &modelIndex,
 int role) const
 {
 CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::data");
 QVariant variant;
-if (modelIndex.isValid()) {
+QSharedPointer<CaEntry> pEntry = entry(modelIndex);
+if (!pEntry.isNull()) {
 switch (role) {
 case Qt::DisplayRole:
-variant = displayRole(modelIndex);
+variant = displayRole(pEntry.data());
 break;
 case Qt::DecorationRole:
-variant = QVariant(HbIcon(entry(modelIndex)->makeIcon(mSize)));
+variant = QVariant(HbIcon(pEntry->makeIcon(mSize)));
 break;
 case CaItemModel::IdRole:
-variant = QVariant(entry(modelIndex)->id());
+variant = QVariant(pEntry->id());
 break;
 case CaItemModel::TypeRole:
-variant = QVariant(entry(modelIndex)->entryTypeName());
+variant = QVariant(pEntry->entryTypeName());
 break;
 case CaItemModel::FlagsRole:
-variant = qVariantFromValue(entry(modelIndex)->flags());
+variant = qVariantFromValue(pEntry->flags());
 break;
 case CaItemModel::TextRole:
-variant = QVariant(entry(modelIndex)->text());
+variant = QVariant(pEntry->text());
 break;
 case CaItemModel::FullTextRole:
-variant = QVariant(entry(modelIndex)->text() + QString(" ")
+variant = QVariant(pEntry->text() + QString(" ") + pEntry->description());
-+ entry(modelIndex)->description());
 break;
 case CaItemModel::UninstalRole:
-	    variant = QVariant(entry(modelIndex)->attribute(UNINSTALL_PROGRESS_APPLICATION_ATTRIBUTE_NAME).toInt());
+variant = QVariant(
-break;
+pEntry->attribute(UNINSTALL_PROGRESS_APPLICATION_ATTRIBUTE_NAME).toInt());
+break;
+case CaItemModel::CollectionTitleRole:
+if (!pEntry->attribute(COLLECTION_TITLE_NAME).isNull()) {
+variant = QVariant(pEntry->
+attribute(COLLECTION_TITLE_NAME).toUtf8());
+}
+else {
+variant = QVariant(pEntry->text());
+}
+break;
 default:
 variant = QVariant(QVariant::Invalid);
 }
 }
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::data");
 \param modelIndex index of entry in model
 \retval pointer to an entry
 */
 QSharedPointer<CaEntry> CaItemModelPrivate::entry(const QModelIndex &modelIndex) const
 {
-if (modelIndex.column() == 1) {
+if (modelIndex.isValid()) {
-return mParentEntry;
+if (modelIndex.column() == 1) {
-} else {
+return mParentEntry;
-return mEntries.at(modelIndex.row());
+}
-}
+else {
+int row = modelIndex.row();
+if (row >= mEntries.count()) {
+return QSharedPointer<CaEntry> ();
+}
+else {
+return mEntries.at(row);
+}
+}
+}
+return QSharedPointer<CaEntry> ();
 }
 /*!
 Disables or enables secondline feature of the model
 \param secondLine disables or enables second line
 /*!
 Returns proper display role for item
 \param modelIndex item index
 \retval QVariant containing display role
 */
-QVariant CaItemModelPrivate::displayRole(const QModelIndex &modelIndex) const
+QVariant CaItemModelPrivate::displayRole(const CaEntry* entry) const
 {
 CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::displayRole")
 QVariant result;
 if (mSecondLineVisibility) {
-if (entry(modelIndex)->description().isEmpty()) {
+if (entry->description().isEmpty()) {
-result = entry(modelIndex)->text();
+result = entry->text();
 } else {
 QList<QVariant> text;
-text << entry(modelIndex)->text();
+text << entry->text();
-text << entry(modelIndex)->description();
+text << entry->description();
 result = QVariant(text);
 }
 } else {
-result = entry(modelIndex)->text();
+result = entry->text();
 }
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::displayRole")
 return result;
 }
 }
 return false;
 }
+QList<int> CaItemModelPrivate::getUninstallingEntriesIds(int componentId)
+{
+CaQuery* query = new CaQuery(mQuery);
+QString compId(QString().setNum(componentId));
+query->setAttribute(QString("component_id"), compId);
+QList<int> ids = mService->getEntryIds(*query);
+delete query;
+return ids;
+}
+void CaItemModelPrivate::updateProgress(int id, int valueOfProgress)
+{
+int updateIndex = mEntries.updateProgress(id, valueOfProgress);
+if (updateIndex >= 0) {
+emit m_q->dataChanged(
+index(updateIndex), index(updateIndex));
+}
+}
 /*!
 Updates model with fresh entries and resets model
 */
 void CaItemModelPrivate::updateModel()
 {
 {
 CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::handleAddItems");
 const int oldItemCount(mEntries.count());
 if (oldItemCount) {
 const int newItemCount(itemsList.count());
+int i = 0;
+QList<int> oldList = mEntries.orderedIdList();
+//we loop through items to find first added
+while (i < oldList.count()) {
+if (oldList[i] != itemsList[i]) {
+oldList.takeAt(i);
+} else {
+++i;
+}
+}
 if (newItemCount == oldItemCount) {
 // count is the same - check if item order changed
-if (itemsList == mEntries.orderedIdList()) {
+if (itemsList == oldList) {
 // assume that if the order has not changed
 // it had to be the secondary lines
-updateModel();
+emit m_q->dataChanged(index(0), index(m_q->rowCount()-1));
 } else {
 updateLayout();
 }
 } else {
-int i = 0;
-QList<int> oldList = mEntries.orderedIdList();
-//we loop through items to find first added
-while (i < oldList.count()) {
-if (oldList[i] != itemsList[i]) {
-oldList.takeAt(i);
-} else {
-++i;
-}
-}
 updateModel();
 //i is the index of first added item
-emit m_q->scrollTo(i, QAbstractItemView::PositionAtTop);
 }
+emit m_q->scrollTo(i, QAbstractItemView::PositionAtTop);
 } else {
 // items added to an empty list - add all as a single block
 addItemBlock(itemsList);
 }
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::handleAddItems");
 handleAddItems(ids);
 } else {
 removeItems(ids);
 }
 emitEmpty(previousCount);
+emitCountChange(previousCount);
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateModelContent");
 }
 /*!
 Emits empty signal if model state was changed
 }
 if ( !previousCount && rowCount()) {
 emit m_q->empty(false);
 }
 }
+/*!
+Emits empty signal if count of item in model was change
+\param previousCount
+*/
+void CaItemModelPrivate::emitCountChange(int previousCount)
+{
+if (previousCount != rowCount()) {
+emit m_q->countChange();
+}
+}

changeset 109	e0aa398e6810
parent 103	b99b84bcd2d1
child 115	3ab5c078b490