FCL/sf/mw/homescreensrv: comparison contentstorage/caclient/stub/src/hswidgetregistryservice.cpp

equal deleted inserted replaced

-:d2f833ab7940
+:7aaf39b772ac
 }
 /*!
 ?Qt_style_documentation
 */
-QList<HsWidgetToken> HsWidgetRegistryServicePrivate::widgets()
+QList<HsWidgetComponentDescriptor> HsWidgetRegistryServicePrivate::widgets()
 {
-QList<HsWidgetToken> widgets;
+QList<HsWidgetComponentDescriptor> widgets;
 QMapIterator<QString, QStringList> i(mManifestDirectories);
 while (i.hasNext()) {
 i.next();
 QStringList manifestFileList = i.value();
 }
 /*!
 ?Qt_style_documentation
 */
+/*
 IHsWidgetProvider *HsWidgetRegistryServicePrivate::loadProviderFromPlugin(
 const QString &pluginName)
 {
 QPluginLoader loader(pluginName);
 QObject *plugin = loader.instance();
 }
 // qDebug("Widget provider load failed - Not found.")
 return 0;
 }
+*/
 /*!
 ?Qt_style_documentation
 */
 QStringList HsWidgetRegistryServicePrivate::readManifestDirectories(const QString &path)
 }
 /*!
 ?Qt_style_documentation
 */
-QList<HsWidgetToken> HsWidgetRegistryServicePrivate::readManifestFile(
+QList<HsWidgetComponentDescriptor> HsWidgetRegistryServicePrivate::readManifestFile(
 const QString &manifestFilePath)
 {
-QList<HsWidgetToken> widgets;
+QList<HsWidgetComponentDescriptor> widgets;
 QStringList filters("*.manifest");
 QDir dir(manifestFilePath);
 QStringList manifestDir = dir.entryList(filters, QDir::Files);
 if (!manifestDir.isEmpty()) {
 // ?
 QString fileName = manifestDir.first();
 HsWidgetComponentParser componentParser(dir.absoluteFilePath(fileName));
 if ( !componentParser.error() ) {
-HsWidgetToken widgetToken;
 HsWidgetComponentDescriptor widgetDescriptor = componentParser.widgetComponentDescriptor();
-widgetToken.mUri = widgetDescriptor.uri;
+widgetDescriptor.library = manifestFilePath + "/" + widgetDescriptor.uri + ".dll";
-widgetToken.mLibrary = manifestFilePath + "/" + widgetDescriptor.uri + ".dll";
-widgetToken.mTitle = widgetDescriptor.title;
 if (widgetDescriptor.iconUri.length() > 0 ) {
-widgetToken.mIconUri = manifestFilePath + "/" + widgetDescriptor.iconUri;
+widgetDescriptor.iconUri = manifestFilePath + "/" + widgetDescriptor.iconUri;
 }
-widgetToken.mDescription = widgetDescriptor.description;
+if (widgetDescriptor.previewImage.length() > 0 ) {
+widgetDescriptor.previewImage = manifestFilePath + "/" + widgetDescriptor.previewImage;
+}
 int widgetUid = dir.dirName().toUInt(0, 16);
-widgetToken.mUid = widgetUid;
+widgetDescriptor.uid = widgetUid;
-widgets << widgetToken;
+widgets << widgetDescriptor;
 qDebug() << "HsWidgetRegistryServicePrivate::readManifestFile - " \
 "widget added: " << fileName;
 }
-#if 0
-if (fileName != "hsposterwidgetprovider.manifest") {
-// Directory differs from the poster widget's directory
-// which is not supported for the time being.
-//            manifest.loadFromXml(dir.absoluteFilePath(fileName));
-//            widgets = manifest.widgets();
-int widgetUid = dir.dirName().toUInt(0, 16);
-// ?
-for (int i=0; i<widgets.count(); i++) {
-widgets[i].mUid = widgetUid;
-widgets[i].mLibrary = manifestFilePath + "/" + widgets[i].mLibrary;
-if (widgets[i].mIconUri != "") {
-// ?
-widgets[i].mIconUri = manifestFilePath + "/" + widgets[i].mIconUri;
-}
-}
-qDebug() << "HsWidgetRegistryServicePrivate::readManifestFile - " \
-"widget added: " << fileName;
-}
-#endif
 }
 return widgets;
 }
 /*!
 // ?
 for(int i=0; i < pathList.count(); i++) {
 QDir registryDir(pathList.at(i));
-	if(!registryDir.exists()) {
+if(!registryDir.exists()) {
-		// ?
+// ?
 registryDir.mkpath(pathList.at(i));
 }
 }
 mFileSystemWatcher.removePaths(QStringList(mManifestDirectories.keys()));
 void HsWidgetRegistryServicePrivate::installerStateChanged(int newValue)
 {
 Q_UNUSED(newValue);
 /*
 if ((newValue & KSASwisOperationMask) == ESASwisNone) {
-	// ?
+// ?
 mInstallerObserver.unSubscribe();
 mInstallerObserver.disconnect();
 QStringList originalList = mManifestDirectories.value(mLatestChangedDirectory);
 QStringList currentList = readManifestDirectories(mLatestChangedDirectory);
 doWidgetAdd(mLatestChangedDirectory, originalList, currentList);
 /*!
 Fetch available widgets information
 Return List of widget tokens.
 */
-QList<HsWidgetToken> HsWidgetRegistryService::widgets()
+QList<HsWidgetComponentDescriptor> HsWidgetRegistryService::widgets()
 {
 return mPrivate->widgets();
 }
 /*!
 /*!
 Emits the widgetAddedToRegistry() signal
 \a widgetsAdded Identifies the added widgets.
 */
-void HsWidgetRegistryService::emitWidgetAddedToRegistry(const QList<HsWidgetToken> &widgetsAdded)
+void HsWidgetRegistryService::emitWidgetAddedToRegistry(const QList<HsWidgetComponentDescriptor> &widgetsAdded)
 {
 emit widgetAddedToRegistry(widgetsAdded);
 }

changeset 99	7aaf39b772ac
parent 93	82b66994846c
child 119	50e220be30d1