FCL/sf/mw/hb: comparison src/hbtools/hbthemeindexer/main.cpp

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 **
 ****************************************************************************/
 #include <hbiconsource_p.h>
 #include <hbthemeindex_p.h>
+#include <hbhash_p.h>
 #include <assert.h>
 #include <iostream>
 #include <QApplication>
 #include <QStringList>
 #include <QTextStream>
 #include <QString>
 #include <QFile>
 #include <QMap>
 #include <QDir>
+#if !defined(QT_DLL) && !defined(QT_SHARED)
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qsvg)
+#endif
 #define RESOURCE_LIB_NAME "HbCore"
 #define WIN32_DEBUG_SUFFIX "d"
 #define MAC_DEBUG_SUFFIX "_debug"
 continue;
 }
 LockedList.append(line);
 }
 }
-}
-QSize getDefaultSize(const QString &filename)
-{
-HbIconSource source(filename);
-return source.defaultSize().toSize();
 }
 void appendItem(HbThemeIndexItemData &itemData, const QString &itemName)
 {
 bool alreadyExists = false;
 // Define fileName (remove file extension)
 QString iconname;
 // If we come here, the filename must end with .* (e.g. .svg)
 iconname = filename.left(filename.lastIndexOf('.'));
-itemData.itemNameHash = HbThemeIndex::hash(iconname);
+itemData.itemNameHash = hbHash(iconname);
 // Define default size
-QSize defaultSize = getDefaultSize(fullFilename);
+HbIconSource source(fullFilename);
+if (itemData.itemType != HbThemeIndexItemData::NvgItem) {
+if (!source.imageReader()) {
+std::cout << "ERROR: could not read file " << fullFilename.toStdString() << "\n";
+return; // Don't add invalid file to the index
+}
+}
+QSize defaultSize = source.defaultSize().toSize();
 itemData.defaultWidth = static_cast<quint32>(defaultSize.width());
 itemData.defaultHeight = static_cast<quint32>(defaultSize.height());
 QString mirroredFilepath = fullFilename;
 foreach(QString ext, extList) {
 QString mirroredFilenameCandidate = mirroredFilepath + iconname + ext;
 if (QFile::exists(mirroredFilenameCandidate)) {
+HbIconSource mirroredSource(fullFilename);
+if ((ext != ".nvg") && !mirroredSource.imageReader()) {
+std::cout << "ERROR: could not read file " << fullFilename.toStdString() << "\n";
+continue; // Don't register invalid mirrored icon
+}
 itemData.mirroredItemType = getItemType(mirroredFilenameCandidate);
 // Define mirrored icon size
-QSize mirroredSize = getDefaultSize(mirroredFilenameCandidate);
+QSize mirroredSize = mirroredSource.defaultSize().toSize();
 itemData.mirroredWidth = static_cast<quint32>(mirroredSize.width());
 itemData.mirroredHeight = static_cast<quint32>(mirroredSize.height());
 break;
 }
 }
 case HbThemeIndexItemData::AxmlItem: // fallback, these are handled same way
 case HbThemeIndexItemData::FxmlItem:
 {
 // Define fileName (file extension not removed)
-itemData.itemNameHash = HbThemeIndex::hash(filename);
+itemData.itemNameHash = hbHash(filename);
 if (LockedList.contains(filename)) {
 itemData.flags |= HbThemeIndexItemData::Locked;
 // Remove all found items from the list so that in the end we can handle with missing items.
 LockedList.removeOne(filename);
 int startIndex = line.indexOf("var(") + 4;
 int endIndex = line.indexOf(')');
 value = line.mid(startIndex, endIndex - startIndex).trimmed();
 }
-itemData.itemNameHash = HbThemeIndex::hash(name);
+itemData.itemNameHash = hbHash(name);
 itemData.itemType = HbThemeIndexItemData::ColorItem;
 bool ok = false;
 itemData.colorValue = (quint32)value.toUInt(&ok, 16);   // Might cause compiler warning in 64 bit systems
 appendItem(itemData, name);
 }
 std::cout << "No " << filename.toStdString() << " in theme!\n";
 }
 return;
 }
-void processDir(const QDir &dir, const QString &themename, const QString targetName, bool subDir = false)
+void processDir(const QDir &dir, const QString &themename, const QString targetName)
 {
-if (!subDir) {
+QString iconPath(dir.absolutePath()+"/icons/"+themename);
-IndexItems.clear();
+QString animationPath(dir.absolutePath()+"/animations/"+themename);
-AddedItems.clear();
+QString effectPath(dir.absolutePath()+"/effects/"+themename);
-MirroredList.clear();
-LockedList.clear();
+// Do the initialization
-createMirroredList(dir.absolutePath()+"/icons/"+themename);
+IndexItems.clear();
-createLockedList(dir.absolutePath()+"/icons/"+themename);
+AddedItems.clear();
-}
+MirroredList.clear();
+LockedList.clear();
-QFileInfoList entries = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
+createMirroredList(iconPath);
-for (int i=0; i<entries.count(); i++) {
+createLockedList(iconPath);
-QFileInfo info = entries.at(i);
-QString file = info.absoluteFilePath();
+// Only check icons under scalable and pixmap folders
-if (info.isDir()) {
+QDir scalableDir(iconPath+"/scalable");
-// Process subdirs recursively
+if (scalableDir.exists()) {
-QDir subDir(file);
+QFileInfoList entries = scalableDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
-processDir(subDir, themename, targetName, true);
+for (int i=0; i<entries.count(); i++) {
-}
+QFileInfo info = entries.at(i);
-// Process file
-if (file.contains("/" + themename + "/", Qt::CaseInsensitive)) {
 processFile(info);
 }
 }
-if (!subDir) {
+QDir pixmapDir(iconPath+"/pixmap");
-// There might still be items in mirrored list (e.g. frames are not actual items, but they are still mirrored)
+if (pixmapDir.exists()) {
-// So just create empty items for the rest of mirrored items in list
+QFileInfoList entries = pixmapDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
-foreach (QString mirrored, MirroredList) {
+for (int i=0; i<entries.count(); i++) {
-HbThemeIndexItemData itemData;
+QFileInfo info = entries.at(i);
-itemData.itemNameHash = HbThemeIndex::hash(mirrored);
+processFile(info);
-itemData.flags |= HbThemeIndexItemData::Mirrorable;
+}
-appendItem(itemData, mirrored);
+}
-}
+QDir animationDir(animationPath);
-// Read application and widget color group CSS files and index their content
+if (animationDir.exists()) {
-// Temporary check
+QFileInfoList entries = animationDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
-if (QFile::exists(dir.absolutePath() + "/style/" + themename + "/variables/color/hbapplicationcolorgroup.css") &&
+for (int i=0; i<entries.count(); i++) {
-QFile::exists(dir.absolutePath() + "/style/" + themename + "/variables/color/hbwidgetcolorgroup.css")) {
+QFileInfo info = entries.at(i);
-if (verboseOn) {
+processFile(info);
-std::cout << "Processing hbapplicationcolorgroup.css and hbwidgetcolorgroup.css";
+}
 }
-indexColorVariables(dir.absolutePath() + "/style/" + themename + "/variables/color/hbapplicationcolorgroup.css");
-indexColorVariables(dir.absolutePath() + "/style/" + themename + "/variables/color/hbwidgetcolorgroup.css");
+QDir effectDir(effectPath);
-} else {
+if (effectDir.exists()) {
-if (verboseOn) {
+QFileInfoList entries = effectDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
-std::cout << "Processing hbcolorgroup.css";
+for (int i=0; i<entries.count(); i++) {
-}
+QFileInfo info = entries.at(i);
-indexColorVariables(dir.absolutePath() + "/style/" + themename + "/variables/color/hbcolorgroup.css");
+processFile(info);
 }
+}
-QDir targetDir;
-if (!targetDir.exists(targetName)) {
+// There might still be items in mirrored list (e.g. frames are not actual items, but they are still mirrored)
-targetDir.mkpath(targetName);
+// So just create empty items for the rest of mirrored items in list
-}
+foreach (QString mirrored, MirroredList) {
-QString filename = targetName + themename + ".themeindex";
+HbThemeIndexItemData itemData;
+itemData.itemNameHash = hbHash(mirrored);
-QFile::remove(filename);
+itemData.flags |= HbThemeIndexItemData::Mirrorable;
-QFile indexFile(filename);
+appendItem(itemData, mirrored);
-if (!indexFile.open(QIODevice::ReadWrite)) {
+}
-std::cout << "ERROR: could not open index file!\n";
-return;
+// Read application and widget color group CSS files and index their content
-}
+// Temporary check
+if (QFile::exists(dir.absolutePath() + "/style/" + themename + "/variables/color/hbapplicationcolorgroup.css") &&
-// Write the header in the beginning of the file
+QFile::exists(dir.absolutePath() + "/style/" + themename + "/variables/color/hbwidgetcolorgroup.css")) {
-HbThemeIndexHeaderV1 header;
-header.version = version;
-header.itemCount = IndexItems.count();
 if (verboseOn) {
-std::cout << "============================TOTALS==============================\n";
+std::cout << "Processing hbapplicationcolorgroup.css and hbwidgetcolorgroup.css";
-std::cout << "Added " << header.itemCount << " items.\n";
+}
-std::cout << "================================================================\n";
+indexColorVariables(dir.absolutePath() + "/style/" + themename + "/variables/color/hbapplicationcolorgroup.css");
-}
+indexColorVariables(dir.absolutePath() + "/style/" + themename + "/variables/color/hbwidgetcolorgroup.css");
+} else {
-// Sort the list
+if (verboseOn) {
-qStableSort(IndexItems.begin(), IndexItems.end(), themeIndexItemDataLessThan);
+std::cout << "Processing hbcolorgroup.css";
+}
-// Write header info into the file stream
+indexColorVariables(dir.absolutePath() + "/style/" + themename + "/variables/color/hbcolorgroup.css");
-qint64 ret = indexFile.write(reinterpret_cast<const char *>(&header), sizeof(HbThemeIndexHeaderV1));
+}
-assert(ret == sizeof(HbThemeIndexHeaderV1));
+QDir targetDir;
-// Write items into the file stream
+if (!targetDir.exists(targetName)) {
-foreach(const HbThemeIndexItemData &itemData, IndexItems) {
+targetDir.mkpath(targetName);
-ret = indexFile.write(reinterpret_cast<const char *>(&itemData), sizeof(HbThemeIndexItemData));
+}
-assert(ret == sizeof(HbThemeIndexItemData));
+QString filename = targetName + themename + ".themeindex";
-}
+QFile::remove(filename);
-indexFile.close();
+QFile indexFile(filename);
-}
+if (!indexFile.open(QIODevice::ReadWrite)) {
+std::cout << "ERROR: could not open index file!\n";
+return;
+}
+// Write the header in the beginning of the file
+HbThemeIndexHeaderV1 header;
+header.version = version;
+header.itemCount = IndexItems.count();
+if (verboseOn) {
+std::cout << "============================TOTALS==============================\n";
+std::cout << "Added " << header.itemCount << " items.\n";
+std::cout << "================================================================\n";
+}
+// Sort the list
+qStableSort(IndexItems.begin(), IndexItems.end(), themeIndexItemDataLessThan);
+// Write header info into the file stream
+qint64 ret = indexFile.write(reinterpret_cast<const char *>(&header), sizeof(HbThemeIndexHeaderV1));
+assert(ret == sizeof(HbThemeIndexHeaderV1));
+// Write items into the file stream
+foreach(const HbThemeIndexItemData &itemData, IndexItems) {
+ret = indexFile.write(reinterpret_cast<const char *>(&itemData), sizeof(HbThemeIndexItemData));
+assert(ret == sizeof(HbThemeIndexItemData));
+}
+indexFile.close();
 }
 void showHelp() {
 std::cout << "Themeindexer.exe usage:\n\n";
 std::cout << "hbthemeindexer [-v] -f filename OR (-n themename) -s themes source directory -t theme index file target directory\n\n";

changeset 34	ed14f46c0e55
parent 6	c3690ec91ef8