FCL/sf/app/homescreen: comparison homescreenapp/hsdomainmodel/src/hswidgethost.cpp

equal deleted inserted replaced

-:f9ce957a272c
+:cdae8c6c3876
 #include <HbInstance>
 #include "hswidgethost.h"
 #include "hsdatabase.h"
-#include "hswidgetdata.h"
+#include "hsdomainmodeldatastructures.h"
 #include "hspage.h"
 #include "hsapp_defs.h"
 #include "hsscene.h"
 #include "cadefs.h"
 #include "canotifier.h"
 \brief Homescreen widget runner.
 Is responsible of running a homescreen widget. Each
 homescreen widget has its own host.
 */
-HsWidgetHost* HsWidgetHost::createInstance(const HsWidgetData &widgetData,
+HsWidgetHost* HsWidgetHost::createInstance(HsWidgetData &widgetData,
-const QVariantMap &preferences)
+const QVariantHash &preferences)
 {
-HsWidgetHost *host = NULL;
 HsDatabase* db = HsDatabase::instance();
 Q_ASSERT(db);
-int databaseId = -1;
+if (db->insertWidget(widgetData)) {
-if (db->insertWidget(widgetData, databaseId)) {
+db->setWidgetPreferences(widgetData.id, preferences);
-db->setWidgetPreferences(databaseId, preferences);
+return new HsWidgetHost(widgetData.id);
-host = new HsWidgetHost(databaseId);
+}
-}
+return 0;
-return host;
 }
 /*!
 Construct a widget host for the given \a databaseId.
 \a parent becomes the parent item for the host.
 */
 HsWidgetHost::HsWidgetHost(int databaseId, QGraphicsItem *parent)
 : HbWidget(parent),
 mWidget(0),
 mPage(0),
+mState(Constructed),
 mDatabaseId(databaseId)
 {
 CaQuery query;
 query.setEntryTypeNames(QStringList(widgetTypeName()));
 CaNotifierFilter filter(query);
 CaNotifier *notifier = CaService::instance()->createNotifier(filter);
 notifier->setParent(this);
 connect(notifier,
-SIGNAL(entryChanged(const CaEntry&, ChangeType)),
+SIGNAL(entryChanged(CaEntry,ChangeType)),
-SLOT(onEntryChanged(const CaEntry&, ChangeType)), Qt::QueuedConnection);
+SLOT(onEntryChanged(CaEntry,ChangeType)), Qt::QueuedConnection);
 /* TODO: Uncomment after the Qt bug has been fixed.
 QGraphicsDropShadowEffect *effect =
 new QGraphicsDropShadowEffect(this);
 effect->setColor(QColor(0, 0, 0, 150));
 if (mWidget) {
 return false;
 }
 HsDatabase *db = HsDatabase::instance();
-Q_ASSERT(db);
 // Find the widget data.
-HsWidgetData widgetData;
+HsWidgetData data;
-if (!db->widget(mDatabaseId, widgetData, false)) {
+data.id = mDatabaseId;
-return false;
+if (!db->widget(data)) {
-}
+return false;
+}
-mUri = widgetData.uri();
+mUri = data.uri;
 // Create the hosted widget.
 QServiceManager manager;
-QServiceFilter filter("com.nokia.IHomeScreenWidget");
+QServiceFilter filter("com.nokia.symbian.IHomeScreenWidget");
-filter.setServiceName(widgetData.uri());
+filter.setServiceName(mUri);
 QList<QServiceInterfaceDescriptor> interfaces = manager.findInterfaces(filter);
-if(interfaces.isEmpty()) {
+if (interfaces.isEmpty()) {
 return false;
 }
 QObject *widgetObject = manager.loadInterface(interfaces.first());
 mWidget = qobject_cast<QGraphicsWidget *>(widgetObject);
 {
 HsDatabase* db = HsDatabase::instance();
 Q_ASSERT(db);
 HsWidgetData data;
-if (db->widget(mDatabaseId, data, false)) {
+data.id = mDatabaseId;
+if (db->widget(data)) {
 if (!page) {
-data.setPageId(-1);
+data.pageId = -1;
 } else {
-data.setPageId(page->databaseId());
+data.pageId = page->databaseId();
 }
-if (!db->updateWidget(data, false)) {
+if (!db->updateWidget(data)) {
 return false;
 }
 } else {
 return false;
 }
 Returns true if this the database operation succeeds,
 false otherwise
 */
 bool HsWidgetHost::deleteFromDatabase()
 {
-if (HsDatabase::instance()->deleteWidget(mDatabaseId)) {
+HsDatabase *db = HsDatabase::instance();
-mDatabaseId = -1;
-return true;
+if (!db->deleteWidget(mDatabaseId)) {
-}
+return false;
-return false;
+}
+mDatabaseId = -1;
+return true;
 }
 /*!
 Set widget presentation by using current values.
 Return true if successfull.
 bool HsWidgetHost::setWidgetPresentation()
 {
 HsDatabase *db = HsDatabase::instance();
 Q_ASSERT(db);
-QString key = hbInstance->orientation() == Qt::Vertical ?
+QString key = HsScene::orientation() == Qt::Vertical ?
 "portrait" : "landscape";
 HsWidgetPresentationData data;
-data.setWidgetId(databaseId());
+data.key      = key;
-data.setKey(key);
+data.setPos(pos());
-data.setPosition(pos());
 data.setSize(size());
-data.setZValue(zValue());
+data.zValue   = zValue();
+data.widgetId = databaseId();
-HsWidgetPresentationData temp;
+return db->setWidgetPresentation(data);
-if (!db->widgetPresentation(databaseId(), key, temp)) {
-if (!db->insertWidgetPresentation(data)) {
-return false;
-}
-} else {
-data.setId(temp.id());
-if (!db->updateWidgetPresentation(data)) {
-return false;
-}
-}
-return true;
 }
 /*!
 Set widget presentation data. Return true if successfull
 */
 bool HsWidgetHost::setWidgetPresentationData(HsWidgetPresentationData &presentationData)
 {
-presentationData.setWidgetId(mDatabaseId);
+HsDatabase *db = HsDatabase::instance();
-return HsDatabase::instance()->insertWidgetPresentation(presentationData);
+Q_ASSERT(db);
-}
+presentationData.widgetId = mDatabaseId;
+return db->setWidgetPresentation(presentationData);
+}
 /*!
 Get widget presentation data matching given \a key.
 Data is returned on given empty \a presentationData. Return true if successfull
 */
-bool HsWidgetHost::widgetPresentationData(
+bool HsWidgetHost::widgetPresentationData(const QString &key,
-const QString &key,
+HsWidgetPresentationData &presentationData)
-HsWidgetPresentationData &presentationData)
+{
-{
+HsDatabase *db = HsDatabase::instance();
-return HsDatabase::instance()->widgetPresentation(mDatabaseId,key,presentationData);
+Q_ASSERT(db);
+presentationData.key = key;
+presentationData.widgetId = mDatabaseId;
+return db->widgetPresentation(presentationData);
 }
 /*!
 Return HsWidgetPresentationData for given \a orientation
 */
 QString key = orientation == Qt::Vertical ?
 "portrait" : "landscape";
 HsWidgetPresentationData data;
-if (db->widgetPresentation(databaseId(), key, data)) {
+data.key = key;
+data.widgetId = mDatabaseId;
+if (db->widgetPresentation(data)) {
 return data;
 } else {
 return HsWidgetPresentationData();
 }
 }
 /*!
 Load HsWidgetPresentationData for current orientation
 */
 bool HsWidgetHost::loadWidgetPresentation()
 {
 HsDatabase *db = HsDatabase::instance();
-Q_ASSERT(db);
+QString key = HsScene::orientation() == Qt::Vertical ?
-QString key = hbInstance->orientation() == Qt::Vertical ?
 "portrait" : "landscape";
 HsWidgetPresentationData data;
-if (!db->widgetPresentation(databaseId(), key, data)) {
+data.key = key;
-return false;
+data.widgetId = mDatabaseId;
-}
+if (!db->widgetPresentation(data)) {
+return false;
-setGeometry(QRectF(data.position(), data.size()));
+}
-setZValue(data.zValue());
+setGeometry(data.geometry());
+setZValue(data.zValue);
 return true;
 }
 /*!
 HsDatabase *db = HsDatabase::instance();
 Q_ASSERT(db);
 QString key = orientation == Qt::Vertical ?
 "portrait" : "landscape";
-HsWidgetPresentationData data;
+return db->deleteWidgetPresentation(mDatabaseId, key);
-if (!db->widgetPresentation(databaseId(), key, data)) {
-return true;
-} else {
-if (!db->deleteWidgetPresentation(data.id())) {
-return false;
-}
-}
-return true;
 }
 /*!
 \fn void HsWidgetHost::finished()
 This signal is emitten after the contained widget
 /*!
 Calls the widget's onInitialize() slot if the
 widget defines it.
 */
 void HsWidgetHost::initializeWidget()
 {
+if (mState != Constructed) {
+return;
+}
 setPreferencesToWidget();
 setOnline(HsScene::instance()->isOnline());
 mOnInitializeMethod.invoke(mWidget);
+mState = Initialized;
 }
 /*!
 Calls the widget's onShow() slot if the
 widget defines it.
 */
 void HsWidgetHost::showWidget()
 {
+if (mState != Initialized &&
+mState != Hidden) {
+return;
+}
 mOnShowMethod.invoke(mWidget);
+mState = Visible;
 }
 /*!
 Calls the widget's onHide() slot if the
 widget defines it.
 */
 void HsWidgetHost::hideWidget()
 {
+if (mState != Initialized &&
+mState != Visible) {
+return;
+}
 mOnHideMethod.invoke(mWidget);
+mState = Hidden;
 }
 /*!
 Calls the widget's onUninitialize() slot if the
 widget defines it.
 */
 void HsWidgetHost::uninitializeWidget()
 {
+if (mState != Visible &&
+mState != Hidden) {
+return;
+}
 mOnUninitializeMethod.invoke(mWidget);
+mState = Uninitialized;
 }
 /*!
 Calls the widget's widgetOnlineState property if the
 widget defines it.
 bool HsWidgetHost::setPreferencesToWidget()
 {
 HsDatabase *db = HsDatabase::instance();
 Q_ASSERT(db);
-QVariantMap preferences;
+QVariantHash preferences;
 if (!db->widgetPreferences(mDatabaseId, preferences)) {
 return false;
 }
 QStringList names = preferences.keys();
 {
 if (names.isEmpty()) {
 return;
 }
-QVariantMap preferences;
+QVariantHash preferences;
 foreach (QString name, names) {
 QVariant value = mWidget->property(name.toLatin1());
 preferences.insert(name, value);
 }
 when it has finished its execution and is ready for
 removal from the homescreen.
 */
 void HsWidgetHost::onFinished()
 {
+mState = Finished;
 emit widgetFinished(this);
 }
 /*!
 This slot reacts to the widgets error() signal, if it was
 defined for the widget. The widget emits the signal in
 failure cases.
 */
 void HsWidgetHost::onError()
 {
+mState = Faulted;
 emit widgetError(this);
 }
 /*!
 This slot reacts to \a entry change that is described with

changeset 36	cdae8c6c3876
parent 35	f9ce957a272c
child 39	4e8ebe173323