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

equal deleted inserted replaced

-:cdae8c6c3876
+:4e8ebe173323
 #include <QMetaObject>
 #include <QGraphicsLinearLayout>
 #include <QParallelAnimationGroup>
 #include <QPropertyAnimation>
 #include <QGraphicsDropShadowEffect>
+#include <QGraphicsSceneResizeEvent>
 #include <qservicemanager.h>
 #include <qservicefilter.h>
 #include <qserviceinterfacedescriptor.h>
 #include <HbInstance>
 #include "hsdatabase.h"
 #include "hsdomainmodeldatastructures.h"
 #include "hspage.h"
 #include "hsapp_defs.h"
 #include "hsscene.h"
-#include "cadefs.h"
+#include "hswidgetcomponentregistry.h"
-#include "canotifier.h"
+#include "hswidgetcomponent.h"
-#include "canotifierfilter.h"
-#include "caservice.h"
-#include "caquery.h"
-#include "caentry.h"
 QTM_USE_NAMESPACE
 /*!
 \class HsWidgetHost
 HsWidgetHost::HsWidgetHost(int databaseId, QGraphicsItem *parent)
 : HbWidget(parent),
 mWidget(0),
 mPage(0),
 mState(Constructed),
-mDatabaseId(databaseId)
+mDatabaseId(databaseId),
-{
+mTapAndHoldIcon(0)
-CaQuery query;
+{
-query.setEntryTypeNames(QStringList(widgetTypeName()));
+setFlags(QGraphicsItem::ItemClipsChildrenToShape);
-CaNotifierFilter filter(query);
-CaNotifier *notifier = CaService::instance()->createNotifier(filter);
-notifier->setParent(this);
-connect(notifier,
-SIGNAL(entryChanged(CaEntry,ChangeType)),
-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));
 Destructor.
 */
 HsWidgetHost::~HsWidgetHost()
 {
 }
 /*!
 Load hosted widget from plugin and validate it.
 Returns true if widget construction is successfull.
 */
 bool HsWidgetHost::load()
 data.id = mDatabaseId;
 if (!db->widget(data)) {
 return false;
 }
-mUri = data.uri;
+	mUri = data.uri;
 // Create the hosted widget.
 QServiceManager manager;
 QServiceFilter filter("com.nokia.symbian.IHomeScreenWidget");
 filter.setServiceName(mUri);
 QList<QServiceInterfaceDescriptor> interfaces = manager.findInterfaces(filter);
 delete widgetObject;
 return false;
 }
 setProperty("isOnline", mIsOnlineProperty);
+	setProperty("rootPath", mRootPathProperty);
 setMethod("onInitialize()", mOnInitializeMethod);
 setMethod("onUninitialize()", mOnUninitializeMethod);
 if (hasSignal("setPreferences(const QStringList&)")) {
 connect(mWidget, SIGNAL(setPreferences(QStringList)),
 }
 if (hasSignal("error()")) {
 connect(mWidget, SIGNAL(error()),
 SLOT(onError()));
 }
-loadWidgetPresentation();
+mWidget->installEventFilter(this);
-QGraphicsLinearLayout *layout = new QGraphicsLinearLayout;
+	loadWidgetPresentation();
-layout->setContentsMargins(0, 0, 0, 0);
-layout->addItem(mWidget);
+HsScene *scene = HsScene::instance();
-setLayout(layout);
+setMaximumSize(scene->maximumWidgetSizeInPixels());
+setMinimumSize(scene->minimumWidgetSizeInPixels());
+mWidget->setParentItem(this);
+setNewSize(mWidget->size());
 return true;
 }
 bool HsWidgetHost::setPage(HsPage *page)
 "portrait" : "landscape";
 HsWidgetPresentationData data;
 data.key      = key;
 data.setPos(pos());
-data.setSize(size());
 data.zValue   = zValue();
 data.widgetId = databaseId();
 return db->setWidgetPresentation(data);
 }
 /*!
-Set widget presentation data. Return true if successfull
+Set widget presentation data. Return true if successfull.
 */
 bool HsWidgetHost::setWidgetPresentationData(HsWidgetPresentationData &presentationData)
 {
 HsDatabase *db = HsDatabase::instance();
 Q_ASSERT(db);
 data.widgetId = mDatabaseId;
 if (!db->widgetPresentation(data)) {
 return false;
 }
-setGeometry(data.geometry());
+setPos(data.x, data.y);
 setZValue(data.zValue);
 return true;
 }
 void HsWidgetHost::initializeWidget()
 {
 if (mState != Constructed) {
 return;
 }
+	// bind component to instance
+	HsWidgetComponent *component = HsWidgetComponentRegistry::instance()->component(mUri);
+	Q_ASSERT(component);
+connect(component, SIGNAL(aboutToUninstall()), SLOT(onFinished()),Qt::QueuedConnection);
+	mRootPathProperty.write(mWidget, component->rootPath());
 setPreferencesToWidget();
 setOnline(HsScene::instance()->isOnline());
 mOnInitializeMethod.invoke(mWidget);
 mState = Initialized;
 widget defines it.
 */
 void HsWidgetHost::uninitializeWidget()
 {
 if (mState != Visible &&
-mState != Hidden) {
+mState != Hidden &&
+mState != Finished) {
 return;
 }
 mOnUninitializeMethod.invoke(mWidget);
 animationGroup->start(QAbstractAnimation::DeleteWhenStopped);
 }
 /*!
+Starts the tap-and-hold animation.
+*/
+void HsWidgetHost::startTapAndHoldAnimation()
+{
+mTapAndHoldIcon = new HbIconItem("tapandhold_animation");
+mTapAndHoldIcon->setZValue(1e6);
+mTapAndHoldIcon->setParentItem(this);
+}
+/*!
+Stops the tap-and-hold animation.
+*/
+void HsWidgetHost::stopTapAndHoldAnimation()
+{
+delete mTapAndHoldIcon;
+mTapAndHoldIcon = 0;
+}
+/*!
+Filters resize events from widgets and resizes inside max/min size boundaries if needed.
+*/
+bool HsWidgetHost::eventFilter(QObject *obj, QEvent *event)
+{
+if (event->type() == QEvent::GraphicsSceneResize ) {
+QGraphicsSceneResizeEvent *resizeEvent = static_cast<QGraphicsSceneResizeEvent*>(event);
+setNewSize(resizeEvent->newSize());
+return true;
+} else {
+// standard event processing
+return HbWidget::eventFilter(obj, event);
+}
+}
+/*!
 Checks if a property with the given \a name
 in the contained widget. If the property exists the \a
 metaProperty is made to reference to it. Returns true if
 the property was found. Otherwise, returns false.
 */
 mWidget->setProperty(name.toLatin1(),
 preferences.value(name));
 }
 return true;
+}
+/*!
+Resizes and sets preferred size for widget layouts
+*/
+void HsWidgetHost::setNewSize(const QSizeF &newSize)
+{
+resize(newSize);
+setPreferredSize(newSize);
 }
 /*!
 This slot is connected to the contained widget's
 setPreferences() signal, if it was defined for
 {
 mState = Faulted;
 emit widgetError(this);
 }
-/*!
-This slot reacts to \a entry change that is described with
-\a changeType. On remove change type, onFinished() signal is
-emitted.
-*/
-void HsWidgetHost::onEntryChanged(const CaEntry &entry,
-ChangeType changeType)
-{
-if (changeType == RemoveChangeType) {
-QString uri = entry.attribute(widgetUriAttributeName());
-if (uri == mUri) {
-onFinished();
-}
-}
-}

changeset 39	4e8ebe173323
parent 36	cdae8c6c3876
child 46	23b5d6a29cce