FCL/sf/mw/hb: comparison src/hbcore/image/hbiconloader.cpp

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
-#include <hbiconloader_p.h>
+#include "hbiconloader_p.h"
-#include "hbthemecommon_p.h"
-#include <QDir>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QPicture>
-#include <QPainter>
-#include <QStyleOption>
-#include <QApplication> //krazy:exclude=qclasses
-#include <QtAlgorithms>
-#include <QTime>
-#include <QSvgRenderer>
-#include <QImageReader>
-#include <QHash>
 #include "hbframedrawer_p.h"
 #include "hbicontheme_p.h"
-#include "hbstandarddirs_p.h"
 #include "hblayoutdirectionnotifier_p.h"
 #include "hbinstance.h"
 #include "hbiconanimation_p.h"
 #include "hbiconanimator.h"
 #include "hbiconanimator_p.h"
 #include "hbpixmapiconimpl_p.h"
 #include "hbiconsource_p.h"
 #include "hbthemeindex_p.h"
 #include "hbthemecommon_p.h"
 #include "hbiconimplcreator_p.h"
+#include "hbstandarddirs_p.h"
+#include <QDir>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QPicture>
+#include <QPainter>
+#include <QStyleOption>
+#include <QApplication> //krazy:exclude=qclasses
+#include <QtAlgorithms>
+#include <QTime>
+#include <QSvgRenderer>
+#include <QImageReader>
+#include <QHash>
 #ifdef HB_NVG_CS_ICON
 #include "hbeglstate_p.h"
 #endif
 const QSizeF &size,
 Qt::AspectRatioMode aspectRatioMode,
 QIcon::Mode mode,
 bool mirrored,
 const QColor &color,
-HbRenderingMode renderMode);
+HbRenderingMode renderMode );
 #endif
-public: // data
+public:
 QString storedTheme;
 int sourceResolution;
 int resolution;
 qreal zoom;
 bool animationLoading;
 // <-- Frame-by-frame animation support ------------------------------------
 HbIconSource *lastIconSource;
-private: // data
+private:
 enum {
 Unknown = 0,
 NotMirrored = 1,
 Mirrored = 2
 };
 }
 QString HbIconLoaderPrivate::removeIconNameSuffix(const QString &iconName)
 {
 QString loweredIconName = iconName.toLower();
-if (loweredIconName.endsWith(".svg")
+if (loweredIconName.endsWith(QLatin1String(".svg"))
-|| loweredIconName.endsWith(".png")
+|| loweredIconName.endsWith(QLatin1String(".png"))
-|| loweredIconName.endsWith(".mng")
+|| loweredIconName.endsWith(QLatin1String(".mng"))
-|| loweredIconName.endsWith(".gif")
+|| loweredIconName.endsWith(QLatin1String(".gif"))
-|| loweredIconName.endsWith(".xpm")
+|| loweredIconName.endsWith(QLatin1String(".xpm"))
-|| loweredIconName.endsWith(".jpg")
+|| loweredIconName.endsWith(QLatin1String(".jpg"))
-|| loweredIconName.endsWith(".nvg")) {
+|| loweredIconName.endsWith(QLatin1String(".nvg"))) {
 return iconName.left(iconName.length() - 4);
 }
-if (loweredIconName.endsWith(".svgz")
+if (loweredIconName.endsWith(QLatin1String(".svgz"))
-|| loweredIconName.endsWith(".qpic")) {
+|| loweredIconName.endsWith(QLatin1String(".qpic"))) {
 return iconName.left(iconName.length() - 5);
 }
 return iconName;
 }
 Q_UNUSED(itemType)
 mirroredIconFound = false;
 QString iconPath;
-if (QDir::isRelativePath(resourceName)) {
+if (HbThemeUtils::isLogicalName(resourceName)) {
-#ifdef Q_OS_SYMBIAN
 // Try to get themed icon information from theme index
 HbThemeIndexResource resource(resourceName);
 if (resource.isValid()) {
 if (mirrored) {
 return resource.fullMirroredFileName();
 } else {
 return resource.fullFileName();
 }
-}
+} else {
-#endif // Q_OS_SYMBIAN
+// Logical name not found in theme index - return empty string
+return QString();
-// If there was no theme index, search the icon in theme icon dirs (slow)
-foreach (const QString &dir, HbThemePrivate::instance()->iconDirectories()) {
-if (mirrored) {
-// If icon is mirrored, try to find the icon in a separate "mirrored" folder used for mirrored icons
-iconPath =  HbStandardDirs::findResource( dir + "mirrored" + '/' + resourceName, Hb::IconResource );
-if( !iconPath.isEmpty() ) {
-mirroredIconFound = true;
-break;
-}
-}
-iconPath =  HbStandardDirs::findResource( dir + resourceName, Hb::IconResource );
-// If the file was found in this dir, return the filename.
-if ( !iconPath.isEmpty() ) {
-break;
-}
 }
 } else {
-// Absolute path. Do not scan through different theme directories.
+// Not a logical name. Check from file system.
-QString iconNameCopy(resourceName);
 if (mirrored) {
 // If icon is mirrored, try to find the icon in a separate "mirrored" folder used for mirrored icons
 // Find the directory part from the full filename
 int index1 = resourceName.lastIndexOf('/');
 iconPath = HbStandardDirs::findResource(resourceName, Hb::IconResource);
 }
 return iconPath;
+}
 /*
 From Freedesktop.org:
 The exact algorithm (in pseudocode) for looking up an icon in a theme (if the implementation supports SVG) is:
 }
 return none
 }
 */
-}
 bool HbIconLoaderPrivate::isAutomaticallyMirrored(const QString &iconName)
 {
-Q_UNUSED(iconName);
 // only place to get mirroring information is from themeindex
-#ifdef Q_OS_SYMBIAN
+// Try to get themed icon information from theme index
-// Try to get themed icon information from theme index
+HbThemeIndexResource resource(iconName);
-HbThemeIndexResource resource(iconName);
+if (resource.isValid()) {
-if (resource.isValid()) {
+return resource.isAutomaticallyMirrored();
-return resource.isAutomaticallyMirrored();
+}
-}
-#endif
 return false;
 }
 bool HbIconLoaderPrivate::isLayoutMirrored()
 {
 layoutMirrored = mirrored ? Mirrored : NotMirrored;
 }
 #ifdef HB_ICONIMPL_CACHE
-QByteArray HbIconLoaderPrivate::createCacheKeyFrom(const QString &iconName, const QSizeF &size,
+QByteArray HbIconLoaderPrivate::createCacheKeyFrom( const QString &iconName,
-Qt::AspectRatioMode aspectRatioMode, QIcon::Mode mode, bool mirrored, const QColor &color,
+const QSizeF &size,
-HbRenderingMode renderMode)
+Qt::AspectRatioMode aspectRatioMode,
+QIcon::Mode mode,
+bool mirrored,
+const QColor &color,
+HbRenderingMode renderMode )
 {
 static const int paramArraySize = 8;
 // This uses QByteArray to improve performance compared to QString.
 // It allows appending stuff with less heap allocations and conversions compared to using QString.
 d->animationLoading = false;
 return size;
 }
 }
-// Step 2: There was no animation definition, try to get default size from theme index if it is a themed icon
+// Step 2: There was no animation definition,
+// try to get default size from theme index if it is a themed icon (logical name).
-// TODO: change this to simpler function call in Symbian OS env
+if (HbThemeUtils::isLogicalName(iconName)) {
-if (QDir::isRelativePath(iconName)) {
-#ifdef Q_OS_SYMBIAN
 // Try to get themed icon information from theme index
 HbThemeIndexResource resource(iconName);
 if (resource.isValid()) {
 // Try to get themed icon default size from theme index
 if (params.mirrored && resource.mirroredItemSize().isValid()) {
 size = resource.mirroredItemSize();
 } else {
 size = resource.defaultItemSize();
 }
-// Returns invalid size if there is a valid theme index, but the item was not found there.
+}
-return size;
+// Returns invalid size if the index did not provide the size
-} else {
+return size;
-// Step 3: Theme index was not used, try to get icon's default size from theme server's default size cache.
-params.iconFileName = resolveIconFileName(params);
-}
-#else
-params.iconFileName = resolveIconFileName(params);
-#endif
 } else { // Absolute path, use it directly without resolving anything.
 params.iconFileName = iconName;
 }
 // If icon filename could not be resolved, return
 return size;
 }
 QString format = formatFromPath(params.iconFileName);
-// Theme server on desktop was found very slow (probably due to IPC with QLocalServer/QLocalSocket).
+// Step 3: Get the default size from the icon file in the client side
-// disabling icon sharing via theme server until theme server performance on desktop is improved
-#ifdef Q_OS_SYMBIAN
-GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory)
-// Try to take data from server if parameters don't prevent it
-if (manager && format != "MNG" && format != "GIF" &&
-!iconName.startsWith(':')) { // not using server for app's own resources (iconName is a logical name for theme elements)
-#ifdef HB_ICON_TRACES
-qDebug() << "HbIconLoader::DefaultSize req to server " << params.iconFileName;
-#endif
-QSizeF sizeFromServer = HbThemeClient::global()->getSharedIconDefaultSize(params.iconFileName);
-#ifdef HB_ICON_TRACES
-qDebug() << "HbIconLoader::DefaultSize result from server" << sizeFromServer;
-#endif
-if (sizeFromServer.isValid()) {
-return sizeFromServer;
-}
-}
-#endif // Q_OS_SYMBIAN
-// Step 4: Get the default size from the icon file in the client side
 HbIconSource *source = getIconSource(params.iconFileName, format);
 size = source->defaultSize();
 #ifdef HB_ICON_TRACES
 qDebug() << "HbIconLoader::DefaultSize from file" << params.iconFileName << size;
 *  It also resets the engine's iconImpl and MaskableIcon's iconImpl
 */
 void HbIconLoader::freeGpuIconData()
 {
 #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
-	for( int i = 0; i < iconEngineList.count(); i++ ) {
+for( int i = 0; i < iconEngineList.count(); i++ ) {
 HbIconEngine *engine = iconEngineList.at(i);
-	    engine->resetIconImpl();
+engine->resetIconImpl();
-	}
+}
-	for(int i = 0; i< frameDrawerInstanceList.count(); i++) {
+for(int i = 0; i< frameDrawerInstanceList.count(); i++) {
-	    HbFrameDrawerPrivate * fd = frameDrawerInstanceList.at(i);
+HbFrameDrawerPrivate * fd = frameDrawerInstanceList.at(i);
-	    if ( (fd->iconFormatType() == SGIMAGE) || (fd->iconFormatType() == NVG) ) {
+if ( (fd->iconFormatType() == SGIMAGE) || (fd->iconFormatType() == NVG) ) {
-	        fd->resetMaskableIcon();
+fd->resetMaskableIcon();
-	    }
+}
-	}
+}
 #endif
 }
 /*!
 \internal
 {
 QList<HbIconAnimationDefinition::AnimationFrame> frameDefs = def.frameList();
 QList<HbIconAnimationFrameSet::FrameData> frameList;
 // Get the default size from the first animation frame
-params.cleanIconName = frameDefs.at(0).iconName;
+return HbIconLoader::defaultSize(frameDefs.at(0).iconName, QString(), params.options);
-params.iconFileName = resolveIconFileName(params);
-QString format = formatFromPath(params.iconFileName);
-// Try to get the default size from server if the icon is not such that is loaded in client side.
-if (format != "MNG"
-&& format != "GIF"
-&& !params.iconFileName.startsWith(':'))
-{
-QSizeF defSize = HbThemeClient::global()->getSharedIconDefaultSize(params.iconFileName);
-if (defSize.isValid()) {
-return defSize;
-}
-}
-// Otherwise get if by calling HbIconLoader::defaultSize for the first animation frame
-return HbIconLoader::defaultSize(params.iconFileName, QString(), params.options);
 }
 void HbIconLoader::loadAnimation(HbIconAnimationDefinition &def, HbIconLoadingParams &params)
 {
 Q_ASSERT(!def.isNull());
 #ifdef HB_ICON_TRACES
 qDebug() << params.cleanIconName << " => " << iconPath;
 #endif
 // If not found then it can still be a normal file specified with a relative path.
 if (!iconFound) {
-iconFound = QFile(params.iconName).exists();
+iconFound = QFile::exists(params.iconName);
 if (iconFound) {
 iconPath = params.iconName;
 }
 }
 // Use the 'unknown' icon, if needed, when the queried icon was not found.
 #ifndef Q_OS_SYMBIAN
 Q_UNUSED(newRenderMode)
 #endif
 #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
 if (newRenderMode != renderMode) {
 if (newRenderMode == ESWRendering) {
 // switching from HW to SW mode
 freeGpuIconData();
 }
 if (HbThemeClient::global()->switchRenderingMode(newRenderMode)) {
 renderMode = newRenderMode;
 }
 }
 #endif
 }
 // Step 2: There was no animation definition, try get icon from server
 if (!params.animationCreated) {
 #ifdef HB_ICONIMPL_CACHE
-QByteArray cacheKey = d->createCacheKeyFrom( params.iconName, params.size, params.aspectRatioMode,
+QByteArray cacheKey = d->createCacheKeyFrom( params.iconName,
-params.mode, params.mirrored, params.color, params.renderMode );
+params.size,
+params.aspectRatioMode,
+params.mode,
+params.mirrored,
+params.color,
+params.renderMode );
 //look up in the local iconImplCache.
 //If found return the ptr directly
 if (iconImplCache.contains(cacheKey)) {
 HbIconImpl * ptr = iconImplCache.value(cacheKey);
 ptr->incrementRefCount();
 qDebug() << "HbIconLoader::loadIcon(): Client RefCount now = " <<ptr->refCount();
 #endif
 return ptr;
 }
 #endif
-if (QDir::isRelativePath(iconName)) {
+if (HbThemeUtils::isLogicalName(iconName)) {
 params.iconFileName = resolveIconFileName(params);
 } else {
 params.iconFileName = iconName;
 }
 // We don't want to get the consolidated icon for only NVG build, ie. without SGImage lite support.
 // Consolidated icon will be created for NVG with SGImage lite support.
 // and when NVG is not available.
 #if defined(HB_ICONIMPL_CACHE)
-QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconData.multiPartIconId, size,
+QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconData.multiPartIconId,
-aspectRatioMode, mode, mirrored, color, renderMode);
+size,
+aspectRatioMode,
+mode,
+mirrored,
+color,
+renderMode);
 //If consolidated icon found in the client's cache, increment ref-count and return
 if (iconImplCache.contains(cacheKey)) {
 HbIconImpl * ptr = iconImplCache.value(cacheKey);
 ptr->incrementRefCount();
 #ifdef HB_ICON_CACHE_DEBUG
 * This function initiates a single IPC to themeserver in which it sends out icon-parameters
 * for each of the frame-items and gets back a list of HbSharedIconInfo corresponding to
 * individual pieces.
 *
 */
 void HbIconLoader::getMultiIconImplFromServer(QStringList &multiPartIconList,
 QVector<QSizeF> &sizeList,
 Qt::AspectRatioMode aspectRatioMode,
 QIcon::Mode mode,
 bool mirrored,
 bool mirroredIconFound,
 Q_UNUSED(type);
 QVector<int> posList;
 #ifdef HB_ICONIMPL_CACHE
 // search the client cache first before asking the server
 for(int i = 0; i < multiPartIconList.count(); i++) {
-QByteArray cacheKey = d->createCacheKeyFrom( multiPartIconList[i], sizeList[i], aspectRatioMode,
+QByteArray cacheKey = d->createCacheKeyFrom( multiPartIconList[i],
-mode, mirrored, color, currRenderMode );
+sizeList[i],
+aspectRatioMode,
+mode,
+mirrored,
+color,
+currRenderMode );
 //look up in the local iconImplCache.
 //If found return the ptr directly
 HbIconImpl * ptr = 0;
 if (iconImplCache.contains(cacheKey)) {
 ptr = iconImplCache.value(cacheKey);
 params.size = sizeList.at(i);
 impl = HbIconImplCreator::createIconImpl(iconInfoList.icon[i], params);
 #ifdef HB_ICONIMPL_CACHE
-QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconList[i], sizeList.at(i) , aspectRatioMode,
+QByteArray cacheKey = d->createCacheKeyFrom( multiPartIconList[i],
-mode, mirrored, color, currRenderMode);
+sizeList.at(i) ,
+aspectRatioMode,
+mode,
+mirrored,
+color,
+currRenderMode );
 iconImplCache.insert(cacheKey, impl);
 #ifdef HB_ICON_CACHE_DEBUG
 qDebug() << "HbIconLoader::getMultiIconImplFromServer(): " << params.iconName << " inserted into impl-cache, ref-count now = " << impl->refCount();
 #endif

changeset 5	627c4a0fd0e7
parent 2	06ff229162e9
child 6	c3690ec91ef8