FCL/sf/mw/hb: comparison src/hbcore/theme/hbthemeclient

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 #include "hbthemeclient_p.h"
 #include "hbthemeclient_p_p.h"
 #include "hbsharedmemorymanager_p.h"
 #include "hbmemoryutils_p.h"
-static HbThemeClient *clientInst=0;
+static const QLatin1String ResourceStylePath(":/themes/style/hbdefault/");
+static HbThemeClient *clientInst = 0;
 /**
 * Constructor
 */
 HbThemeClient::HbThemeClient():d_ptr(new HbThemeClientPrivate)
 */
 bool HbThemeClient::connectToServer()
 {
 Q_D(HbThemeClient);
 return d->connectToServer();
-}
-QSizeF HbThemeClient::getSharedIconDefaultSize(const QString &iconPath)
-{
-Q_D(HbThemeClient);
-return d->getSharedIconDefaultSize(iconPath);
 }
 /**
 * HbThemeClient::getSharedIconInfo()
 *
 }
 /**
 * HbThemeClient::getSharedStyleSheet()
 *
-* \a fielName  css filename
+* \a filePath  css filepath. Only acceptable path separator is '/'.
 * \a priority  layer priority
 */
-HbCss::StyleSheet *HbThemeClient::getSharedStyleSheet(const QString &fileName,
+HbCss::StyleSheet *HbThemeClient::getSharedStyleSheet(const QString &filePath,
 HbLayeredStyleLoader::LayerPriority priority)
 {
-int offset = -1;
+const QString filePathFixed = QDir::fromNativeSeparators(filePath);
-if( HbLayeredStyleLoader::Priority_Core == priority ) {
-offset = sharedCacheItemOffset(HbSharedCache::Stylesheet, fileName);
+HbCss::StyleSheet *styleSheet = 0;
-}
+bool requestFromServer = true;
-if ( -1 != offset ) {
+if (filePathFixed.startsWith(QLatin1Char(':')) && !filePathFixed.startsWith(ResourceStylePath)) {
-HbCss::StyleSheet *styleSheet =
+//filePathFixed is located in application resource, parse it on client side.
-HbMemoryUtils::getAddress<HbCss::StyleSheet>(HbMemoryManager::SharedMemory,
+requestFromServer = false;
-offset);
+}
-return styleSheet;
+if (requestFromServer) {
-}
+int offset = -1;
-Q_D(HbThemeClient);
+if(HbLayeredStyleLoader::Priority_Core == priority) {
-return d->getSharedStyleSheet(fileName,priority);
+offset = sharedCacheItemOffset(HbSharedCache::Stylesheet, filePathFixed);
+}
+if ( -1 != offset ) {
+styleSheet =
+HbMemoryUtils::getAddress<HbCss::StyleSheet>(HbMemoryManager::SharedMemory,
+offset);
+} else {
+Q_D(HbThemeClient);
+styleSheet = d->getSharedStyleSheet(filePathFixed, priority);
+}
+}
+return styleSheet;
 }
 /**
 * HbThemeClient::getSharedLayoutDefs()
-*
+* \a filePath  layout definition filepath. Only acceptable path separator is '/'.
-* \a fileName
+* \a layout  layout name
-* \a layout
+* \a section section name
-* \a section
+*/
-*/
+HbWidgetLoader::LayoutDefinition *HbThemeClient::getSharedLayoutDefs(const QString &filePath,
-HbWidgetLoader::LayoutDefinition *HbThemeClient::getSharedLayoutDefs(const QString &fileName,
 const QString &layout,
 const QString &section)
 {
-int offset = sharedCacheItemOffset(HbSharedCache::LayoutDefinition,
+const QString filePathFixed = QDir::fromNativeSeparators(filePath);
-fileName + layout + section);
-if ( -1 != offset ) {
+HbWidgetLoader::LayoutDefinition *layoutDefinition = 0;
-HbWidgetLoader::LayoutDefinition *layoutDefs =
+bool requestFromServer = true;
-HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(HbMemoryManager::SharedMemory,
+if (filePathFixed.startsWith(QLatin1Char(':')) && !filePathFixed.startsWith(ResourceStylePath)) {
-offset);
+//filePathFixed is located in application resource, parse it on client side.
-return layoutDefs;
+requestFromServer = false;
 }
-Q_D(HbThemeClient);
+if (requestFromServer) {
-return d->getSharedLayoutDefs(fileName,layout,section);
+int offset = sharedCacheLayoutDefinitionOffset(filePathFixed, layout, section);
+if (offset != -1) {
+layoutDefinition =
+HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(
+HbMemoryManager::SharedMemory, offset);
+} else {
+Q_D(HbThemeClient);
+layoutDefinition = d->getSharedLayoutDefs(filePathFixed, layout, section);
+}
+}
+return layoutDefinition;
 }
 /**
 * HbThemeClient::deviceProfiles()
 */
 HbDeviceProfileList *HbThemeClient::deviceProfiles()
 }
 /**
 * HbThemeClient::getSharedEffect()
 *
-* \a filePath
+* \a filePath. Only acceptable path separator is '/'.
 */
 HbEffectFxmlData *HbThemeClient::getSharedEffect(const QString &filePath)
 {
-int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePath);
+const QString filePathFixed = QDir::fromNativeSeparators(filePath);
+int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePathFixed);
 if ( -1 != offset ) {
 HbEffectFxmlData  *effectFxmlData =
 HbMemoryUtils::getAddress<HbEffectFxmlData>(HbMemoryManager::SharedMemory, offset);
 return effectFxmlData;
 }
 Q_D(HbThemeClient);
-return d->getSharedEffect(filePath);
+return d->getSharedEffect(filePathFixed);
 }
 /**
 * HbThemeClient::addSharedEffect()
 *
-* \a filePath
+* \a filePath. Only acceptable path separator is '/'.
 */
 bool HbThemeClient::addSharedEffect(const QString& filePath)
 {
-int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePath);
+const QString filePathFixed = QDir::fromNativeSeparators(filePath);
+int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePathFixed);
 if ( -1 != offset ) {
 // effect already added.
 return true;
 }
 Q_D(HbThemeClient);
-return d->addSharedEffect(filePath);
+return d->addSharedEffect(filePathFixed);
 }
 /**
 * HbThemeClient::unloadIcon()
 *
 delete clientInst;
 clientInst = 0;
 }
 /**
-* sharedCacheItemOffset  function returns the offset of the cache item
+* returns the offset of the cache item for the given key
-* for the given key
 * \param key
 *
 */
-int HbThemeClient::sharedCacheItemOffset(HbSharedCache::ItemType type, const QString & key)
+int HbThemeClient::sharedCacheItemOffset(HbSharedCache::ItemType type, const QString &key)
 {
 int offset = -1;
 HbSharedCache *cache = HbSharedCache::instance();
 if (cache) {
 offset = cache->offset(type, key);
+}
+return offset;
+}
+/**
+* returns the offset of the layout definition for the given file, layout and section.
+*/
+int HbThemeClient::sharedCacheLayoutDefinitionOffset(const QString &fileName,
+const QString &layout,
+const QString &section)
+{
+int offset = -1;
+HbSharedCache *cache = HbSharedCache::instance();
+if (cache) {
+offset = cache->layoutDefinitionOffset(fileName, layout, section);
 }
 return offset;
 }
 #ifdef HB_THEME_SERVER_MEMORY_REPORT
 bool HbThemeClient::switchRenderingMode(HbRenderingMode renderMode)
 {
 Q_D(HbThemeClient);
 return d->switchRenderingMode(renderMode);
 }
+void HbThemeClient::setTheme(const QString &theme)
+{
+Q_D(HbThemeClient);
+d->setTheme(theme);
+}

changeset 5	627c4a0fd0e7
parent 3	11d3954df52a
child 7	923ff622b8b9