FCL/sf/mw/homescreensrv: comparison tsdevicedialog/tsdevicedialogplugin/src/tsmodel.cpp

equal deleted inserted replaced

-:3ab5c078b490
+:0b3699f6c654
 /*!
 Constructor
 \param query used to create model
 \param pointer to parent object
 */
 TsModel::TsModel(TsTaskMonitor &applicationSrv,
 QObject &activitySrv,
 QObject *parent) :
 QAbstractListModel(parent),
 mEntries(),
 mApplicationService(applicationSrv),
 mActivityService(activitySrv),
 mMaxItems(maxItems)
 {
 #ifdef Q_OS_SYMBIAN
 XQSettingsManager *crManager = new XQSettingsManager;
 XQCentralRepositorySettingsKey itemsNumberKey(TSDeviceDialogUid, ItemsLimit);
 QVariant itemsNumberVariant =
 crManager->readItemValue(itemsNumberKey, XQSettingsManager::TypeInt);
 if (!itemsNumberVariant.isNull()) {
 int number = itemsNumberVariant.toInt();
 if (number > 0) {
 mMaxItems = number;
 }
 }
-iAppArcSession.Connect();
 #endif
 connect(&activitySrv,
-	SIGNAL(dataChanged()),
+SIGNAL(dataChanged()),
-			 this,
+this,
-			 SLOT(updateActivities()));
+SLOT(updateActivities()));
 connect(&applicationSrv,
-	        SIGNAL(taskListChanged()),
+SIGNAL(taskListChanged()),
-			this,
+this,
-			SLOT(updateApplications()));
+SLOT(updateApplications()));
 fullUpdate();
 }
 /*!
 Destructor
 */
 TsModel::~TsModel()
 {
-#ifdef Q_OS_SYMBIAN
-iAppArcSession.Close();
-#endif
 qDeleteAll(mEntries);
 }
 /*!
 Returns count of rows in model
 {
 Q_UNUSED(parent);
 return mEntries.count();
 }
-bool TsModel::insertRows(int row, int count, TsModelItem* item, const QModelIndex & parent)
+bool TsModel::insertRows(int row, int count, TsModelItem *item, const QModelIndex &parent)
 {
 beginInsertRows(parent, row, row+count-1);
 mEntries.insert(row, item);
 endInsertRows();
 return true;
 }
-bool TsModel::removeRows(int row, int count, const QModelIndex & parent)
+bool TsModel::removeRows(int row, int count, const QModelIndex &parent)
 {
+TsModelItem *oldItem = mEntries.at(row);
 beginRemoveRows(parent, row, row + count - 1);
 mEntries.removeAt(row);
+delete oldItem;
 endRemoveRows();
 return true;
 }
-bool TsModel::moveRows(int oldPosition, int newPosition, const QModelIndex & parent)
+bool TsModel::moveRows(int oldPosition, int newPosition, const QModelIndex &parent)
 {
 beginMoveRows(parent, oldPosition, oldPosition, parent, newPosition);
 mEntries.move(oldPosition, newPosition);
 endMoveRows();
 return true;
 }
-bool TsModel::updateRows(int row, TsModelItem* item)
+bool TsModel::updateRows(int row, TsModelItem *item)
 {
 TsModelItem *oldItem = mEntries.at(row);
 mEntries[row] = item;
 delete oldItem;
 /*!
 Close one of moder entries
 */
 void TsModel::closeApplication(const QModelIndex &index)
 {
 if (!index.isValid() ||
 !entry(index)->data(TsDataRoles::Closable).toBool()) {
 return;
 }
 entry(index)->close();
 }
 /*!
 Updates model with fresh entries
 */
 void TsModel::updateApplications()
 {
-RDebug::Printf( "TsModel::updateApps \n");
-RDebug::Printf(" from %d \n: ",this);
 QList<TsTaskChange>  changes(mApplicationService.changeList());
-if(changes.count() == 0)
+if (changes.count() == 0) {
-{
 //no applications - only activities on list
 return;
 }
 //check 1st item whether we have cancel change - if so reset model
 if (changes[0].first.changeType() == TsTaskChangeInfo::EChangeCancel) {
 }
 for (int iter(0); iter < changes.count(); iter++) {
 switch (changes[iter].first.changeType()) {
 case TsTaskChangeInfo::EChangeDelete :
 removeRows(changes[iter].first.oldOffset(), 1);
-break;
+//we had max rows before delete - so there is possibility to add
+//one activity
+if(mEntries.count() + 1 == maxRowCount()) {
+beginInsertRows(QModelIndex(), mEntries.count(), mEntries.count());
+getActivities(false);
+endInsertRows();
+}
+break;
 case TsTaskChangeInfo::EChangeInsert :
 insertRows(changes[iter].first.newOffset(), 1,
 new TsEntryModelItem(changes[iter].second));
-break;
+//we have too many items - delete some activities if we can
+while(mEntries.count() > maxRowCount() && mActivitiesCount > 0) {
+removeRows(mEntries.count()-1, 1);
+mActivitiesCount--;
+}
+break;
 case TsTaskChangeInfo::EChangeMove :
 moveRows(changes[iter].first.oldOffset(), changes[iter].first.newOffset());
 break;
 case TsTaskChangeInfo::EChangeUpdate :
 updateRows(changes[iter].first.oldOffset(),
 new TsEntryModelItem(changes[iter].second));
 break;
 default:
 break;
 }
 }
 //because delete entries are at end of changelist - iterate backwards
 /*!
 reset model using full application and activities lists
 */
 void TsModel::fullUpdate()
 {
+beginResetModel();
 qDeleteAll(mEntries);
 mEntries.clear();
+mActivitiesCount = 0;
 getApplications();
 getActivities();
 endResetModel();
 }
 /*!
 Read list of running applications
 */
 void TsModel::getApplications()
 {
-RDebug::Printf( "CTsTaskMonitorClientImpl::RunL \n");
 //get all running applications and append to entries list
 TsModelItem *entry(0);
 QList< TsTaskChange> tasks(mApplicationService.changeList(true));
-foreach (TsTaskChange taskData, tasks) {
+foreach(TsTaskChange taskData, tasks) {
 if (!taskData.second.isNull()) {
 entry = new TsEntryModelItem(taskData.second);
 if (entry) {
 mEntries.append(entry);
 }
 }
 /*!
 Read current activities
 */
-void TsModel::getActivities()
+void TsModel::getActivities(bool fullUpdate)
 {
 //get activities
-TsModelItem *entry(0);
+int maxActivitiesCount = maxRowCount() - mEntries.count() + mActivitiesCount;
-QList<QVariantHash> activities;
+if (maxActivitiesCount > 0) {
-QMetaObject::invokeMethod(&mActivityService,
+QList<QVariantHash> activities;
-"activitiesList",
+QMetaObject::invokeMethod(&mActivityService,
-Q_RETURN_ARG(QList<QVariantHash>,
+"activitiesList",
-activities));
+Q_RETURN_ARG(QList<QVariantHash>, activities),
-foreach(QVariantHash activity, activities) {
+Q_ARG(int, maxActivitiesCount));
-prepareActivityEntry(activity);
+int iterPos = fullUpdate ? 0 : mActivitiesCount;
-entry = new TsActivityModelItem(*this, mActivityService, activity);
+for(int iter(iterPos); iter< activities.count(); iter++) {
-if (maxRowCount() <= mEntries.count()) {
+mEntries.append(new TsActivityModelItem(*this, mActivityService, activities[iter]));
-delete entry;
+mActivitiesCount++;
-break;
 }
-mEntries.append(entry);
+}
-}
-}
-/*!
-Modify activity entry replacing application id with name
-*/
-void TsModel::prepareActivityEntry(QVariantHash &activity)
-{
-if (!activity.contains(TsActivityModelItem::applicationKeyword())) {
-activity.insert(TsActivityModelItem::applicationKeyword(),
-activity.contains(ActivityApplicationKeyword) ?
-getApplicationName(activity[ActivityApplicationKeyword].toInt()) :
-QString::null);
-}
-}
-/*!
-Return application name
-\param id - reqiested application identyfier
-*/
-QString TsModel::getApplicationName(int id)
-{
-QString retVal;
-#ifdef Q_OS_SYMBIAN
-TApaAppInfo info;
-iAppArcSession.GetAppInfo( info, TUid::Uid(id));
-retVal = QString::fromUtf16(info.iShortCaption.Ptr(),
-info.iShortCaption.Length());
-#endif
-return retVal;
 }
 /*!
 Called when some item was changed
 \param itemPtr - address of updated item
 */
 TsModelItem *TsModel::entry(const QModelIndex &index) const
 {
 return mEntries.at(index.row());
 }

changeset 121	0b3699f6c654
parent 115	3ab5c078b490
child 119	50e220be30d1