--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp Wed Aug 18 09:40:07 2010 +0300
@@ -34,7 +34,8 @@
// Initialization of a static member variable.
int HsMenuService::mAllCollectionsId = 0;
-
+const char COLLECTION_TITLE_NAME[] = "title_name";
+const char COLLECTION_SHORT_NAME[] = "short_name";
/*!
Returns all applications model
\param sortAttribute :: SortAttribute
@@ -63,22 +64,16 @@
/*!
Returns all collections model
- \param sortAttribute :: SortAttribute
- \param details : switch to return details or not
\retval HsMenuItemModel: all collections model
*/
-HsMenuItemModel *HsMenuService::getAllCollectionsModel(
- HsSortAttribute sortAttribute)
+HsMenuItemModel *HsMenuService::getAllCollectionsModel()
{
- qDebug() << "HsMenuService::getAllCollectionsModel" << "sortAttribute:"
- << sortAttribute;
+ qDebug() << "HsMenuService::getAllCollectionsModel";
HSMENUTEST_FUNC_ENTRY("HsMenuService::getAllCollectionsModel");
CaQuery query;
query.setParentId(allCollectionsId());
query.setFlagsOn(VisibleEntryFlag);
query.setFlagsOff(MissingEntryFlag);
- query.setSort(HsMenuServiceUtils::sortBy(sortAttribute),
- HsMenuServiceUtils::sortOrder(sortAttribute));
HsMenuItemModel *model = new HsMenuCollectionsItemModel(query);
HSMENUTEST_FUNC_EXIT("HsMenuService::getAllCollectionsModel");
return model;
@@ -276,6 +271,8 @@
<< collection;
collection->setText(newCollectionName);
+ collection->setAttribute(COLLECTION_TITLE_NAME, newCollectionName);
+ collection->setAttribute(COLLECTION_SHORT_NAME, newCollectionName);
result = CaService::instance()->updateEntry(*collection);
}
HSMENUTEST_FUNC_EXIT("HsMenuService::renameCollection");