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

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 ** 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 <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
 // SVG animation is currently disabled because of bugs in QT's svg engine
 #undef HB_SVG_ANIMATION
 static const char *s_unknown = "unknown";
 // Icon name without extension
 /*!
 \class HbIconLoader
 \brief HbIconLoader loads icons according to the Freedesktop Icon Theme Specification
 // Allocated dynamically so it can be deleted before the application object is destroyed.
 // Deleting it later causes segmentation fault.
 static HbIconLoader *theLoader = 0;
 #ifdef HB_ICONIMPL_CACHE
-static QHash<QByteArray, HbIconImpl*> iconImplCache;
+static QHash<QByteArray, HbIconImpl *> iconImplCache;
 #endif
 class HbIconLoaderPrivate
 {
 public:
 static HbIconLoaderPrivate *global();
 static QString removeIconNameSuffix(const QString &iconName);
 /* This method is supposed to work the same way
 as the FindIconHelper in the Icon Theme Spec: */
 static QString findSharedResourceHelper(const QString &resourceName,
 bool mirrored,
-bool& mirroredIconFound,
+bool &mirroredIconFound,
 Hb::ResourceType itemType = Hb::IconResource,
 bool useThemeIndex = true);
 static QString findEffectHelper(const QString &effectName);
 bool isAutomaticallyMirrored(const QString &iconName);
 bool isLayoutMirrored();
 void setLayoutMirrored(bool mirrored);
 #ifdef HB_ICONIMPL_CACHE
-QByteArray createCacheKeyFrom( const QString &iconName,
+QByteArray createCacheKeyFrom(const QString &iconName,
 const QSizeF &size,
 Qt::AspectRatioMode aspectRatioMode,
 QIcon::Mode mode,
 bool mirrored,
 const QColor &color,
 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
 };
 */
 int layoutMirrored;
 };
 HbIconLoaderPrivate::HbIconLoaderPrivate() :
 storedTheme(HbTheme::instance()->name()),
 sourceResolution(144), // This is about the resolution of a Nokia N95 8GB
 resolution(144),
 zoom(1.0),
 animationManager(HbIconAnimationManager::global()),
 animationLoading(false),
 lastIconSource(0),
 layoutMirrored(Unknown)
 {
 }
 HbIconLoaderPrivate::~HbIconLoaderPrivate()
 {
 }
 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;
 }
 return "BLOB";
 }
 return suffix;
 }
-QString HbIconLoaderPrivate::findSharedResourceHelper(const QString &resourceName, bool mirrored, bool& mirroredIconFound, Hb::ResourceType itemType, bool useThemeIndex)
+QString HbIconLoaderPrivate::findSharedResourceHelper(const QString &resourceName, bool mirrored, bool &mirroredIconFound, Hb::ResourceType itemType, bool useThemeIndex)
 {
 Q_UNUSED(useThemeIndex)
 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('/');
 int index = index1 > index2 ? index1 : index2;
 QString iconNameCopy(resourceName);
 if (index > 0) {
-iconNameCopy.insert(index+1, QString("mirrored/"));
+iconNameCopy.insert(index + 1, QString("mirrored/"));
 }
-iconPath = HbStandardDirs::findResource(iconNameCopy, Hb::IconResource);
+if (QFile::exists(iconNameCopy)) {
+iconPath = iconNameCopy;
-if( !iconPath.isEmpty() ) {
+}
+if (!iconPath.isEmpty()) {
 mirroredIconFound = true;
 return iconPath;
 }
 }
-iconPath = HbStandardDirs::findResource(resourceName, Hb::IconResource);
+if (QFile::exists(resourceName)) {
+iconPath = resourceName;
+}
 }
 return iconPath;
+}
 /*
 From Freedesktop.org:
 The exact algorithm (in pseudocode) for looking up an icon in a theme (if the implementation supports SVG) is:
 if filename != none
 return filename
 }
 return none
 }
 With the following helper functions:
 LookupIcon(iconname, size, theme) {
 for each subdir in $(theme subdir list) {
 }
 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()
 {
 if (layoutMirrored == Unknown) {
 // The layout directionality is defined by asking it from the main window.
-QList<HbMainWindow*> allWindows = hbInstance->allMainWindows();
+QList<HbMainWindow *> allWindows = hbInstance->allMainWindows();
-HbMainWindow* primaryWindow = allWindows.value(0);
+HbMainWindow *primaryWindow = allWindows.value(0);
 if (primaryWindow) {
 layoutMirrored = primaryWindow->layoutDirection() == Qt::LeftToRight ? NotMirrored : Mirrored;
 } else {
 // Do not know mirroring state yet, return not mirrored.
 return NotMirrored;
 {
 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.
 temp[6] = 0;
 }
 // Append render mode when creating cache key
 temp[7] = renderMode;
-cacheKey.append((char*)&(temp[0]), sizeof(int)*paramArraySize);
+cacheKey.append((char *)&(temp[0]), sizeof(int)*paramArraySize);
 const QChar *iconNamePtr = iconName.constData();
-cacheKey.append((char*)iconNamePtr, nameSize * sizeof(QChar));
+cacheKey.append((char *)iconNamePtr, nameSize * sizeof(QChar));
 if (mirrored) {
 cacheKey.append('M');
 }
 return cacheKey;
 }
 #endif
 HbIconLoader::HbIconLoader(const QString &appName, QObject *parent)
-: QObject( parent )
+: QObject(parent)
 {
-setObjectName( appName );
+setObjectName(appName);
 d = new HbIconLoaderPrivate();
 // Set default rendering mode to EHWRendering
 renderMode = EHWRendering;
 // Delete the icon loader when the application is destroyed.
 connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(destroy()));
 connect(HbLayoutDirectionNotifier::instance(), SIGNAL(layoutDirectionChangeStarted()),
 this, SLOT(updateLayoutDirection()));
 #ifdef HB_TOOL_INTERFACE
 // This enables partial theme updates.
 connect(&hbInstance->theme()->d_ptr->iconTheme, SIGNAL(iconsUpdated(QStringList)), this, SLOT(themeChange(QStringList)));
 #endif
 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 (QDir::isRelativePath(iconName)) {
+if (HbThemeUtils::isLogicalName(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;
 }
 }
 bool HbIconLoader::iconsExist(const QString &iconName, const QStringList &suffixList)
 {
-QString name = HbIconLoaderPrivate::removeIconNameSuffix(iconName);
 bool found = true;
+bool logicalName = HbThemeUtils::isLogicalName(iconName);
+int suffixIndex = iconName.length();
+if (!logicalName) {
+// If it is an absolute icon path, the suffix is inserted before the file extension
+int index = iconName.lastIndexOf(QChar('.'));
+if (index > 0) {
+suffixIndex = index;
+}
+}
 foreach (const QString &suffix, suffixList) {
 bool dummy = false;
-QString path = HbIconLoaderPrivate::findSharedResourceHelper(name + suffix, false, dummy);
+QString nameWithSuffix = iconName;
+nameWithSuffix.insert(suffixIndex, suffix);
+QString path = HbIconLoaderPrivate::findSharedResourceHelper(nameWithSuffix, false, dummy);
 if (path.isEmpty()) {
 found = false;
 break;
 }
 }
 return d->resolution;
 }
 void HbIconLoader::applyResolutionCorrection(QSizeF &size)
 {
 size = size * (qreal)(d->resolution) / (qreal)(d->sourceResolution) * d->zoom;
 }
 void HbIconLoader::themeChange(const QStringList &updatedFiles)
 {
-foreach (HbFrameDrawerPrivate *frameDrawer, this->frameDrawerInstanceList) frameDrawer->themeChange(updatedFiles);
+foreach(HbFrameDrawerPrivate * frameDrawer, this->frameDrawerInstanceList) frameDrawer->themeChange(updatedFiles);
 }
 void HbIconLoader::destroy()
 {
 if (theLoader) {
 // This method is called upon the signal 'layoutDirectionChangeStarted',
 // which is emitted before the signal 'layoutDirectionChanged'. Icon
 // classes use that signal to update their pixmaps, so the new layout
 // directionality must be updated in the icon loader before that.
 // Thus, there are these separate signals.
-QList<HbMainWindow*> allWindows = hbInstance->allMainWindows();
+QList<HbMainWindow *> allWindows = hbInstance->allMainWindows();
-HbMainWindow* primaryWindow = allWindows.value(0);
+HbMainWindow *primaryWindow = allWindows.value(0);
 d->setLayoutMirrored(primaryWindow->layoutDirection() == Qt::RightToLeft);
 }
 void HbIconLoader::handleForegroundLost()
 {
 #if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
 // Remove SGImage /NVG type of icons
 freeGpuIconData();
 // delete the VGImage
 HbEglStates *eglStateInstance = HbEglStates::global();
 eglStateInstance->handleForegroundLost();
 // notify the server to clear the SGImage and NVG type of icons from the client's session
 /*!
 * Removes the  IconImpl entry from the client side cache
 */
 void HbIconLoader::removeItemInCache(HbIconImpl *iconImpl)
 {
 #ifdef HB_ICONIMPL_CACHE
-if ( iconImpl ) {
+if (iconImpl) {
 iconImplCache.remove(iconImplCache.key(iconImpl));
 }
 #else
 Q_UNUSED(iconImpl);
 #endif
 *  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
 This is a wrapper for findSharedResourceHelper(). It is used for getting
 resources from the themeserver.
 The return value is either same as \a name, when the file is not found in the
 theme, or the full path and name to the file found in the theme. In certain
 situations the return value can also be an empty string, therefore it should
 /*!
 This function is used to register the IconEngine instance to IconLoader
 */
 void HbIconLoader::storeIconEngineInfo(HbIconEngine *iconEngine)
 {
-iconEngineList.append( iconEngine );
+iconEngineList.append(iconEngine);
 }
 /*!
 This function is used to unregister the Iconengine instance from Iconloader
 */
 void HbIconLoader::removeIconEngineInfo(HbIconEngine *iconEngine)
 {
 iconEngineList.removeOne(iconEngine);
 }
 /*!
 This function is used to register the FrameDrawerPrivate instance to IconLoader
 */
-void HbIconLoader::storeFrameDrawerInfo( HbFrameDrawerPrivate *frameDrawer )
+void HbIconLoader::storeFrameDrawerInfo(HbFrameDrawerPrivate *frameDrawer)
 {
 frameDrawerInstanceList.append(frameDrawer);
 }
 /*!
 This function is used to unregister the FrameDrawerPrivate instance from IconLoader
 */
-void HbIconLoader::removeFrameDrawerInfo( HbFrameDrawerPrivate *frameDrawer )
+void HbIconLoader::removeFrameDrawerInfo(HbFrameDrawerPrivate *frameDrawer)
 {
 frameDrawerInstanceList.removeOne(frameDrawer);
 }
 void HbIconLoader::resolveCleanIconName(HbIconLoadingParams &params) const
 {
 // Replace empty icon name with the "unknown" icon if needed.
 if (params.iconName.isEmpty() && params.options.testFlag(ReturnUnknownIcon)) {
 params.cleanIconName = QString(s_unknown);
 } else {
 params.cleanIconName = params.iconName;
 }
 }
 QSizeF HbIconLoader::getAnimationDefaultSize(HbIconAnimationDefinition &def, HbIconLoadingParams &params)
 {
 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());
 QList<HbIconAnimationDefinition::AnimationFrame> frameDefs = def.frameList();
 QList<HbIconAnimationFrameSet::FrameData> frameList;
 #ifdef HB_ICON_TRACES
 if (!params.animator) {
 qDebug() << "HbIconLoader: no animator ptr provided, loading only frame 1 out of" << frameDefs.count();
 } else {
 qDebug() << "HbIconLoader: loading" << frameDefs.count() << "frames";
 // ...otherwise load the frame with the loader
 if (!frameReady) {
 // Frame-by-frame animations are always loaded in normal mode.
 // The mode is applied when the icon is painted.
 newFrame.pixmap = HbIconLoader::loadIcon(
 frame.iconName,
 params.purpose,
 params.size,
 params.aspectRatioMode,
 QIcon::Normal,
 params.options,
 0,
 params.color);
 newFrame.duration = frame.duration;
 newFrame.assignJumps(frame.jumps);
 }
 // Append the frame to the animation frame list
 frameList.append(newFrame);
 }
 // Take default size from the first frame
 QSizeF renderSize = QSizeF(params.canvasPixmap.size());
-if(!params.isDefaultSize) {
+if (!params.isDefaultSize) {
 renderSize.scale(params.size, params.aspectRatioMode);
 } else if (params.options.testFlag(ResolutionCorrected)) {
 applyResolutionCorrection(renderSize);
 }
 QString iconPath = d->findSharedResourceHelper(params.cleanIconName, params.mirrored, params.mirroredIconFound);
 bool iconFound = !iconPath.isEmpty();
 #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();
-if (iconFound) {
-iconPath = params.iconName;
-}
-}
 // Use the 'unknown' icon, if needed, when the queried icon was not found.
 if (!iconFound) {
 if (params.options.testFlag(ReturnUnknownIcon)) {
 iconPath = d->findSharedResourceHelper(s_unknown, false, params.mirroredIconFound);
 }
 return iconPath;
 }
 /*!
 * \fn HbIconImpl *HbIconLoader::getIconFromServer()
 *
 * Initiate an IPC to themeserver to get the icon-data from the server.
 *
 */
 HbIconImpl *HbIconLoader::getIconFromServer(HbIconLoadingParams &params)
 {
 HbIconImpl *icon = 0;
 #ifdef HB_ICON_TRACES
 qDebug() << "HbIconLoader::getIconFromServer: req to server for" << params.iconFileName;
 #endif
 params.color,
 params.renderMode);
 //Creates HbIconImpl instance based on the type of data returned by themeserver.
 //HbIconImpl thus created could be any one of the following impl-types:
 //1. HbSgImageIconImpl
 //2. HbNvgIconImpl
 //3. HbPixmapIconImpl
 icon = HbIconImplCreator::createIconImpl(iconInfo, params);
 #ifdef HB_ICON_TRACES
 QSizeF renderSize;
 if (svgRenderer && svgRenderer->isValid()) {
 renderSize = QSizeF(svgRenderer->defaultSize());
-if(!params.isDefaultSize) {
+if (!params.isDefaultSize) {
 renderSize.scale(params.size, params.aspectRatioMode);
 } else if (params.options.testFlag(ResolutionCorrected)) {
 applyResolutionCorrection(renderSize);
 }
 QPainter painter;
 painter.begin(&pm);
 svgRenderer->render(&painter, QRectF(QPointF(), renderSize.toSize()));
 painter.end();
 }
 source->releaseSvgRenderer();
 }
 void HbIconLoader::loadPictureIcon(HbIconLoadingParams &params)
 {
 qreal sx = 1.0;
 qreal sy = 1.0;
 bool scale = false;
-if(!params.isDefaultSize) {
+if (!params.isDefaultSize) {
 scale = true;
 renderSize.scale(params.size, params.aspectRatioMode);
 } else if (params.options.testFlag(ResolutionCorrected)) {
 qreal scaleFactor = (qreal)(d->resolution) / (qreal)(d->sourceResolution) * d->zoom;
 if (!qFuzzyCompare(scaleFactor, qreal(1.0))) {
 renderSize *= scaleFactor;
 }
 }
 if (scale) {
 // Determine scale factor as QPicture doesn't allow for scaling
 sx = renderSize.width() / picSize.width();
 sy = renderSize.height() / picSize.height();
 }
 QPixmap &pm = params.canvasPixmap;
 bool animationCreated = false;
 if (imgRenderer && imgRenderer->canRead()) {
 renderSize = QSizeF(imgRenderer->size());
-if(!params.isDefaultSize) {
+if (!params.isDefaultSize) {
 renderSize.scale(params.size, params.aspectRatioMode);
 } else if (params.options.testFlag(ResolutionCorrected)) {
 applyResolutionCorrection(renderSize);
 }
 }
 QImage img = imgRenderer->read();
 params.canvasPixmap = QPixmap::fromImage(img);
 }
 source->releaseImageReader();
 }
 void HbIconLoader::loadPixmapIcon(HbIconLoadingParams &params, const QString &format)
 {
 // This test implementation improves resize speed up to 5 times..
 if (!params.isDefaultSize && !params.size.isEmpty()) {
 // Smooth scaling is very expensive (size^2). Therefore we reduce the size
 // to 1.5 of the destination size and using fast transformation.
 // Therefore we speed up but don't loose quality..
-if ( pm.size().width() > ( 4 * params.size.toSize().width() ) ) {
+if (pm.size().width() > (4 * params.size.toSize().width())) {
 // Improve scaling speed by add an intermediate fast transformation..
-QSize intermediate_size = QSize( params.size.toSize().width() * 2, params.size.toSize().height() * 2 );
+QSize intermediate_size = QSize(params.size.toSize().width() * 2, params.size.toSize().height() * 2);
 pm = pm.scaled(
 intermediate_size,
 params.aspectRatioMode,
-Qt::FastTransformation ); // Cheap operation!
+Qt::FastTransformation);  // Cheap operation!
 }
 #endif // ENABLE_EXPERIMENTAL_RESIZE_BOOST__
 pm = pm.scaled(
 params.size.toSize(),
 params.aspectRatioMode,
 Qt::SmoothTransformation); // Expensive operation!
 #ifdef ENABLE_EXPERIMENTAL_RESIZE_BOOST__
 }
 #endif
 }
 source->deletePixmapIfLargerThan(PIXMAP_SIZE_LIMIT);
 }
 /*!
 * \fn void HbIconLoader::switchRenderingMode()
 *
 * This function gets notified when the rendering mode of the application changes e.g
 * ( Hardware - Software rendering or vice versa ). If the mode is changed from
 *  Hardware to Software, all Hardware rendered icons will release the GPU resources.
 *  This function also initiates an IPC call to ThemeServer, so that the server
 *  can do its part of cleanup.
 *  \a newRenderMode new rendering mode of application
 */
 void HbIconLoader::switchRenderingMode(HbRenderingMode newRenderMode)
 {
 #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
 }
 }
 }
 /*!
 * \fn HbIconImpl* HbIconLoader::loadIcon()
 *
 * This function is responsible for loading a single-piece icon .
 * First it checks whether the icon is present on the application (client)cache,
 * if found it increments the ref-count of the HbIconImpl and returns. If the icon
 * is not found in the client's impl-cache, it initiates an IPC to themeserver
 * to load the icon. It receives HbSharedIconInfo from themeserver, creates a HbIconImpl
 * from this data, inserts this into client's icon-impl-cache and returns.
 *
 */
 HbIconImpl *HbIconLoader::loadIcon(
 const QString &iconName,
 IconDataType type,
 HbIconLoader::Purpose purpose,
 const QSizeF &size,
 Qt::AspectRatioMode aspectRatioMode,
 QIcon::Mode mode,
 IconLoaderOptions options,
 HbIconAnimator *animator,
 const QColor &color)
 {
 #ifdef HB_ICON_TRACES
 QString debugString = "HbIconLoader::loadIcon START - ";
 debugString.append('x');
 debugString.append(QString::number(size.height()));
 }
 qDebug() << debugString;
 #endif
-Q_UNUSED( type )
+Q_UNUSED(type)
-HbIconImpl* icon = 0;
+HbIconImpl *icon = 0;
 if (!size.isValid()) {
 return 0;
 }
 params.aspectRatioMode = aspectRatioMode;
 params.mode = mode;
 params.options = options;
 params.animator = animator;
 params.color = color;
-params.isDefaultSize = ( purpose == AnyPurpose ) && size.isNull();
+params.isDefaultSize = (purpose == AnyPurpose) && size.isNull();
 params.mirrored = options.testFlag(HorizontallyMirrored);
 params.mirroredIconFound = false;
 params.canCache = true;
 params.animationCreated = false;
 params.mirroringHandled = false;
 }
 }
 // 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,
-//look up in the local iconImplCache.
+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);
+HbIconImpl *ptr = iconImplCache.value(cacheKey);
 ptr->incrementRefCount();
 #ifdef HB_ICON_CACHE_DEBUG
-qDebug() << "HbIconLoader::loadIcon(): " << "Cache hit in iconImplCache for" << params.iconName<<params.size.height() <<"X"<< params.size.width() ;
+qDebug() << "HbIconLoader::loadIcon(): " << "Cache hit in iconImplCache for" << params.iconName << params.size.height() << "X" << params.size.width() ;
-qDebug() << "HbIconLoader::loadIcon(): Client RefCount now = " <<ptr->refCount();
+qDebug() << "HbIconLoader::loadIcon(): Client RefCount now = " << ptr->refCount();
 #endif
 return ptr;
 }
 #endif
-if (QDir::isRelativePath(iconName)) {
+// Resolve used icon filename. It uses themeindex for themed icons.
+params.iconFileName = resolveIconFileName(params);
+if (HbThemeUtils::isLogicalName(iconName)) {
 params.iconFileName = resolveIconFileName(params);
-} else {
-params.iconFileName = iconName;
 }
 // If icon filename could not be resolved, return
 if (params.iconFileName.isEmpty()) {
 #ifdef HB_ICON_TRACES
 qDebug() << "HbIconLoader::loadIcon (empty icon) END";
 #endif
 icon = new HbPixmapIconImpl(params.canvasPixmap);
 return icon;
 }
+#ifdef Q_OS_SYMBIAN
+// Check whether icon is in a private directory which cannot be accessed by the theme server
+bool privateDirectory = isInPrivateDirectory(iconName);
+#endif // Q_OS_SYMBIAN
 QString format = formatFromPath(params.iconFileName);
 // Theme server on desktop was found very slow (probably due to IPC with QLocalServer/QLocalSocket).
 // 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 (!options.testFlag(DoNotCache)
 && format != "MNG"
 && format != "GIF"
 && !iconName.startsWith(':') // not using server for app's own resources (iconName is a logical name for theme elements)
-&& manager ) {
+&& !privateDirectory // server cannot load from protected private dir
+&& manager) {
 //Initiate an IPC to themeserver to get the icon-data from the server.
 icon = getIconFromServer(params);
 if (icon) {
 #ifdef HB_ICONIMPL_CACHE
 iconImplCache.insert(cacheKey, icon);
 #ifdef HB_ICON_CACHE_DEBUG
-qDebug() <<"HbIconLoader::loadIcon(): " << params.iconName << " inserted into impl-cache, ref-count now = " << icon->refCount();
+qDebug() << "HbIconLoader::loadIcon(): " << params.iconName << " inserted into impl-cache, ref-count now = " << icon->refCount();
 #endif
 #endif
 return icon;
 }
 if (!params.mirroringHandled) {
 // Apply mirroring if required
 if (params.mirrored && !params.mirroredIconFound) {
 QTransform t;
-t.scale(-1,1);
+t.scale(-1, 1);
 params.canvasPixmap = params.canvasPixmap.transformed(t);
 }
 }
 if (!params.modeHandled) {
 QStyleOption opt(0);
 opt.palette = QApplication::palette();
 params.canvasPixmap = QApplication::style()->generatedIconPixmap(mode, params.canvasPixmap, &opt);
 }
 }
 if ((params.color.isValid()) && (params.mode != QIcon::Disabled)) {
 QPixmap &pm = params.canvasPixmap;
-if(!pm.isNull()) {
+if (!pm.isNull()) {
 QPixmap mask = pm.alphaChannel();
 pm.fill(color);
 pm.setAlphaChannel(mask);
 }
 }
 return icon;
 }
 /*!
 * \fn HbIconImpl* HbIconLoader::loadMultiPieceIcon()
 *
 * This function is responsible for loading a multi-piece icon (e.g. 3-piece or 9-piece).
 * First it checks whether the consolidated (stitched) icon is present in the application (client)
 * cache, if found it increments the ref-count of the HbIconImpl and returns. If the icon
 * is not found in the client's impl-cache, it initiates an IPC to themeserver
 * to try to load the consolidated icon. If the consolidated (stitched) icon fails in themeserver, the server
 * returns a list of icon-data for individual pieces. Each of these pieces will be painted separately
 *
 */
-HbIconImpl* HbIconLoader::loadMultiPieceIcon(const QStringList &listOfIcons,
+HbIconImpl *HbIconLoader::loadMultiPieceIcon(const QStringList &listOfIcons,
 HbMultiPartSizeData &multiPartIconData,
 const QSizeF &size,
 Qt::AspectRatioMode aspectRatioMode,
 QIcon::Mode mode,
 IconLoaderOptions options,
 QVector<HbIconImpl *> &multiPieceImpls,
 const QColor &color)
 {
 Q_UNUSED(color);
-HbIconImpl* icon = 0;
+HbIconImpl *icon = 0;
 if (listOfIcons.count() == 0) {
 return icon;
 }
 // Whether the icon should be horizontally mirrored
 bool mirrored = options.testFlag(HorizontallyMirrored);
 // Whether mirrored version of the icon was found in the file system (otherwise it's mirrored by code).
 bool mirroredIconFound = false;
 // 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);
+HbIconImpl *ptr = iconImplCache.value(cacheKey);
 ptr->incrementRefCount();
 #ifdef HB_ICON_CACHE_DEBUG
 qDebug() << "HbIconLoader::loadMultiPieceIcon()" << "Cache hit in iconImplCache " << multiPartIconData.multiPartIconId << size.height() << "X" << size.width() ;
 qDebug() << "HbIconLoader::loadMultiPieceIcon : Client RefCount now = " << ptr->refCount();
 #endif
 #ifdef  Q_OS_SYMBIAN
 //If consolidated icon was not found in the client's cache, initiate an IPC to load
 //the consolidated icon on themeserver
 iconInfo = HbThemeClient::global()->getMultiPartIconInfo(iconPathList,
 multiPartIconData, size, aspectRatioMode, mode,
 (mirrored && !mirroredIconFound), options, color, renderMode);
 #ifdef HB_ICON_TRACES
 qDebug() << "HbIconLoader::getMultiPartIconInfo, offset from server: " << iconInfo.pixmapData.offset << iconPathList;
 #endif
 //Since the consolidated icon-creation failed on themeserver, request loading of individual
 //frame-items in a single IPC request to themeserver
 getMultiIconImplFromServer(iconPathList, sizeList,
 aspectRatioMode,
 mode,
 mirrored,
 mirroredIconFound,
 options,
 color,
 HbIconLoader::AnyType,
 HbIconLoader::AnyPurpose,
 multiPieceImpls,
 renderMode);
 #else
 //For OS other than Symbian, call HbIconLoader::loadIcon to individually load icons
 for (int i = 0; i < count; i++) {
 HbIconImpl *impl = loadIcon(iconPathList[i], HbIconLoader::AnyType,
 HbIconLoader::AnyPurpose,
 return icon;
 }
 }
 // Initiates an IPC call to the ThemeServer to unload ( decrement ref count ) the icon
-void HbIconLoader::unLoadIcon(HbIconImpl * icon, bool unloadedByServer)
+void HbIconLoader::unLoadIcon(HbIconImpl *icon, bool unloadedByServer)
 {
 if (!icon) {
 return;
 }
 icon->decrementRefCount();
 if (icon->refCount() == 0 && icon->isCreatedOnServer()) {
 if (!unloadedByServer) {
 HbThemeClient::global()->unloadIcon(icon->iconFileName(),
 icon->keySize(),
 icon->iconAspectRatioMode(),
 icon->iconMode(),
 icon->isMirrored(),
 icon->color(),
 icon->iconRenderingMode()
 );
 }
 #ifdef HB_ICONIMPL_CACHE
 int rem = iconImplCache.remove(iconImplCache.key(icon));
 if (rem > 0) {
 return pixmap;
 }
 /*!
 * \fn void HbIconLoader::getMultiIconImplFromServer()
 *
 * This function is responsible for loading individual pieces of a multi-piece icon.
 * This gets called if the consolidated icon-creation process on themeserver has failed.
 * 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,
 HbIconLoader::IconLoaderOptions options,
 const QColor &color,
 HbIconLoader::IconDataType type,
 HbIconLoader::Purpose,
 QVector<HbIconImpl *> & iconImplList,
 HbRenderingMode currRenderMode)
 {
 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++) {
+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],
-//look up in the local iconImplCache.
+aspectRatioMode,
+mode,
+mirrored,
+color,
+currRenderMode);
+//look up in the local iconImplCache.
 //If found return the ptr directly
-HbIconImpl * ptr = 0;
+HbIconImpl *ptr = 0;
 if (iconImplCache.contains(cacheKey)) {
 ptr = iconImplCache.value(cacheKey);
 // if a specific frame-item is found in local impl-cache,
 // increment the ref count and remove the entry from the list that needs to be sent to server.
 ptr->incrementRefCount();
 #ifdef HB_ICON_CACHE_DEBUG
 qDebug() << "HbIconLoader::getMultiIconImplFromServer()" << "Cache hit in iconImplCache ";
 qDebug() << "HbIconLoader::getMultiIconImplFromServer : Client RefCount now = " << ptr->refCount();
 int count = multiPartIconList.count();
 if (count > 0) {
 HbSharedIconInfoList iconInfoList = HbThemeClient::global()->getMultiIconInfo(multiPartIconList, sizeList,
 aspectRatioMode, mode, mirrored, options, color, currRenderMode);
-HbIconImpl* impl = 0;
+HbIconImpl *impl = 0;
 HbIconLoadingParams params;
 params.aspectRatioMode = aspectRatioMode;
 params.mode = mode;
 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
 */
 void HbIconLoader::unLoadMultiIcon(QVector<HbIconImpl *> &multiPieceImpls)
 {
 QStringList iconNameList;
 QVector<QSizeF> sizeList;
 // Decrement the ref count. If its zero, remove it from the client cache (if defined) and
 // then send to server for unload.
-foreach(HbIconImpl* impl, multiPieceImpls) {
+foreach(HbIconImpl * impl, multiPieceImpls) {
 impl->decrementRefCount();
 if (impl->refCount() == 0 && impl->isCreatedOnServer()) {
 #ifdef HB_ICONIMPL_CACHE
 int rem = iconImplCache.remove(iconImplCache.key(impl));
 if (rem > 0) {
 #ifdef HB_ICON_TRACES
-qDebug()<<"HbIconLoader::unLoadMultiIcon :Removed from HbIconImpl Cache "<<rem<< impl->iconFileName()<< impl->keySize().height()<<"X"<<impl->keySize().width() ;
+qDebug() << "HbIconLoader::unLoadMultiIcon :Removed from HbIconImpl Cache " << rem << impl->iconFileName() << impl->keySize().height() << "X" << impl->keySize().width() ;
 #endif
 }
 #endif
 // List of icons to be unloaded.
-iconNameList<<impl->iconFileName();
+iconNameList << impl->iconFileName();
-sizeList<<impl->keySize();
+sizeList << impl->keySize();
 }
 }
+if (iconNameList.count() > 0) {
+HbThemeClient::global()->unLoadMultiIcon(iconNameList,
+sizeList,
+multiPieceImpls[0]->iconAspectRatioMode(),
+multiPieceImpls[0]->iconMode(),
+multiPieceImpls[0]->isMirrored(),
+multiPieceImpls[0]->color(),
+multiPieceImpls[0]->iconRenderingMode()
+);
+}
+}
+bool HbIconLoader::isInPrivateDirectory(const QString &filename)
+{
+Q_UNUSED(filename);
+bool isPrivate = false;
-if(iconNameList.count() > 0) {
+#ifdef Q_OS_SYMBIAN
-HbThemeClient::global()->unLoadMultiIcon(iconNameList,
+if (filename.length() > 11) {
-sizeList,
+// Private dir starts with e.g. "z:/private/"
-multiPieceImpls[0]->iconAspectRatioMode(),
+if (filename[1] == ':' && (filename[2] == '/' || filename[2] == '\\') &&
-multiPieceImpls[0]->iconMode(),
+(filename[10] == '/' || filename[10] == '\\') && filename.mid(3, 7).compare("private"), Qt::CaseInsensitive) {
-multiPieceImpls[0]->isMirrored(),
+isPrivate = true;
-multiPieceImpls[0]->color(),
+}
-multiPieceImpls[0]->iconRenderingMode()
+}
-);
+#endif
-}
+return isPrivate;
 }
 // End of File

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 7	923ff622b8b9
child 21	4633027730f5
child 34	ed14f46c0e55