equal
deleted
inserted
replaced
240 return false; |
240 return false; |
241 } else { |
241 } else { |
242 currentIndexfile.close(); |
242 currentIndexfile.close(); |
243 if (!iWatcher) { |
243 if (!iWatcher) { |
244 // Set up the file watcher for active theme changes |
244 // Set up the file watcher for active theme changes |
245 TRAP_IGNORE(iWatcher = CHbThemeWatcher::NewL(*this)); |
245 iWatcher = new HbThemeWatcher(*this); |
246 } |
246 } |
247 // Start watching in case of mmc ejection |
247 // Start watching in case of mmc ejection or active theme uninstall |
248 if (iWatcher) { |
248 if (iWatcher) { |
249 iWatcher->startWatchingL(indexFileName); |
249 iWatcher->startWatching(indexFileName); |
250 } |
250 } |
251 } |
251 } |
252 } |
252 } |
253 return true; |
253 return true; |
254 } |
254 } |
1203 TMultiIconSymbParams params = ReadMessageAndRetrieveMultiIconParams(aMessage); |
1203 TMultiIconSymbParams params = ReadMessageAndRetrieveMultiIconParams(aMessage); |
1204 |
1204 |
1205 QColor color = GetColorFromRgba(params.rgba, params.colorflag); |
1205 QColor color = GetColorFromRgba(params.rgba, params.colorflag); |
1206 QString iconId((QChar*)params.multiPartIconId.Ptr(), params.multiPartIconId.Length()); |
1206 QString iconId((QChar*)params.multiPartIconId.Ptr(), params.multiPartIconId.Length()); |
1207 QString fullPath((QChar*)params.multiPartIconList[0].Ptr(), params.multiPartIconList[0].Length()); |
1207 QString fullPath((QChar*)params.multiPartIconList[0].Ptr(), params.multiPartIconList[0].Length()); |
1208 int index = fullPath.lastIndexOf("/"); |
1208 int index = fullPath.lastIndexOf('/'); |
1209 fullPath = fullPath.left(index + 1); |
1209 fullPath = fullPath.left(index + 1); |
1210 iconId.prepend(fullPath); |
1210 iconId.prepend(fullPath); |
1211 HbIconKey finalIconKey(iconId, |
1211 HbIconKey finalIconKey(iconId, |
1212 params.size, |
1212 params.size, |
1213 static_cast<Qt::AspectRatioMode>(params.aspectRatioMode), |
1213 static_cast<Qt::AspectRatioMode>(params.aspectRatioMode), |
1293 /** |
1293 /** |
1294 * HbThemeServerPrivate::IconInfoFromSingleIcon |
1294 * HbThemeServerPrivate::IconInfoFromSingleIcon |
1295 Checks for the cacheItem for a given key, if found gets the data relevant of the cacheItem. |
1295 Checks for the cacheItem for a given key, if found gets the data relevant of the cacheItem. |
1296 */ |
1296 */ |
1297 |
1297 |
1298 bool HbThemeServerSession::IconInfoFromSingleIcon(HbIconKey key, |
1298 bool HbThemeServerSession::IconInfoFromSingleIcon(HbIconKey &key, |
1299 HbSharedIconInfo &stitchedData, const QString & format) |
1299 HbSharedIconInfo &stitchedData, const QString & format) |
1300 { |
1300 { |
1301 HbIconCacheItem* cacheItem = 0; |
1301 HbIconCacheItem* cacheItem = 0; |
1302 |
1302 |
1303 // try to find the icon in other rendering mode, |
1303 // try to find the icon in other rendering mode, |
1340 * HbThemeServerPrivate::createCacheItemData |
1340 * HbThemeServerPrivate::createCacheItemData |
1341 Creates a cacheItem of the given key and insert the item in to the list |
1341 Creates a cacheItem of the given key and insert the item in to the list |
1342 else free the data allocated for the cache. |
1342 else free the data allocated for the cache. |
1343 */ |
1343 */ |
1344 |
1344 |
1345 bool HbThemeServerSession::CreateCacheItemData(HbIconKey key, int options , HbSharedIconInfo &data, bool isMultiIcon) |
1345 bool HbThemeServerSession::CreateCacheItemData(const HbIconKey &key, int options, |
|
1346 HbSharedIconInfo &data, bool isMultiIcon) |
1346 { |
1347 { |
1347 bool insertKeyIntoSessionList = false; |
1348 bool insertKeyIntoSessionList = false; |
1348 data.type = INVALID_FORMAT; |
1349 data.type = INVALID_FORMAT; |
1349 QString format = HbThemeServerUtils::formatFromPath(key.filename); |
1350 QString format = HbThemeServerUtils::formatFromPath(key.filename); |
1350 HbIconCacheItem * cacheItemOfPiece = iServer->iconCacheItem(key, isMultiIcon); |
1351 HbIconCacheItem * cacheItemOfPiece = iServer->iconCacheItem(key, isMultiIcon); |