diff -r e78d6e055a5b -r b34d53f6acdf contentstorage/caclient/src/caitemmodel.cpp --- a/contentstorage/caclient/src/caitemmodel.cpp Fri Jul 23 14:03:00 2010 +0300 +++ b/contentstorage/caclient/src/caitemmodel.cpp Fri Aug 06 13:40:46 2010 +0300 @@ -388,6 +388,16 @@ return m_d->entry(index); } +QList 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 @@ -476,8 +486,8 @@ break; case CaItemModel::CollectionTitleRole: if (!pEntry->attribute(COLLECTION_TITLE_NAME).isNull()) { - variant = QVariant(hbTrId(pEntry-> - attribute(COLLECTION_TITLE_NAME).toUtf8())); + variant = QVariant(pEntry-> + attribute(COLLECTION_TITLE_NAME).toUtf8()); } else { variant = QVariant(pEntry->text()); @@ -693,6 +703,24 @@ } +QList CaItemModelPrivate::getUninstallingEntriesIds(int componentId) +{ + CaQuery* query = new CaQuery(mQuery); + QString compId(QString().setNum(componentId)); + query->setAttribute(QString("component_id"), compId); + QList 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 */ @@ -824,7 +852,7 @@ 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(); } @@ -1049,3 +1077,4 @@ emit m_q->countChange(); } } +