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

equal deleted inserted replaced

-:474929a40a0f
+:87476091b3f5
 #include <QApplication>
 #include <QStateMachine>
 #include <QState>
 #include <QFinalState>
-#include <QGraphicsLinearLayout>
-#include <QParallelAnimationGroup>
-#include <QPropertyAnimation>
-#include <QGraphicsDropShadowEffect>
-#include <QGraphicsSceneResizeEvent>
-#include <QGesture>
-#include <QGraphicsScene>
-#include <qservicemanager.h>
-#include <qservicefilter.h>
-#include <qserviceinterfacedescriptor.h>
-#include <HbInstantFeedback>
-#include <HbTouchArea>
 #include "hsdatabase.h"
 #include "hsdomainmodeldatastructures.h"
 #include "hsscene.h"
 #include "hspage.h"
 #include "hswidgethost.h"
-#include "hswidgettoucharea.h"
+#include "hswidgethostvisual.h"
+#include "hshostedwidgetfactory.h"
 #include "hswidgetcomponentregistry.h"
 #include "hswidgetcomponent.h"
 #include "hsconfiguration.h"
 #include "hscontentservice.h"
+#include "hsgui.h"
 // Helper macros for connecting state entry and exit actions.
 #define ENTRY_ACTION(state, action) \
 connect(state, SIGNAL(entered()), SLOT(action()));
 #define EXIT_ACTION(state, action) \
 connect(state, SIGNAL(exited()), SLOT(action()));
-QTM_USE_NAMESPACE
 /*!
 \class HsWidgetHost
 \ingroup group_hsdomainmodel
 /*!
 Constructs a new widget host with given \a databaseId and
 \a parent item.
 */
-HsWidgetHost::HsWidgetHost(int databaseId, QGraphicsItem *parent)
+HsWidgetHost::HsWidgetHost(int databaseId, QObject *parent)
-: HbWidget(parent),
+: QObject(parent),
+mVisual(new HsWidgetHostVisual),
 mDatabaseId(databaseId),
 mStateMachine(0),
 mWidget(0),
 mPage(0),
 mComponent(0),
 mIsFinishing(false)
 {
-setFlag(QGraphicsItem::ItemClipsChildrenToShape);
-setFlag(QGraphicsItem::ItemHasNoContents);
-grabGesture(Qt::TapGesture);
-grabGesture(Qt::TapAndHoldGesture);
-grabGesture(Qt::PanGesture);
-grabGesture(Qt::PinchGesture);
-grabGesture(Qt::SwipeGesture);
-grabGesture(Qt::CustomGesture);
-setupTouchArea();
-setupEffects();
 setupStates();
+mVisual->setVisualModel(this);
 }
 /*!
 Destructor.
 */
 HsWidgetHost::~HsWidgetHost()
 {
+delete mVisual;
 }
 /*!
 Creates a new widget host instance based on the give
 \a widgetData and \a preferences. Returns the created
 } else {
 return false;
 }
 mPage = page;
 return true;
 }
 /*!
 Returns the containing page for this widget. Returns 0
 Loads presentation based on the current orientation.
 Returns true on success, otherwise returns false.
 */
 bool HsWidgetHost::loadPresentation()
 {
-return loadPresentation(HsScene::orientation());
+return loadPresentation(HsGui::instance()->orientation());
 }
 /*!
 Loads presentation based on the given \a orientation.
 Returns true on success, otherwise returns false.
 data.orientation = orientation;
 data.widgetId = mDatabaseId;
 if (!db->widgetPresentation(data)) {
 return false;
 }
-setPos(data.x, data.y);
+mVisual->setPos(data.x, data.y);
-setZValue(data.zValue);
+mVisual->setZValue(data.zValue);
 return true;
 }
 /*!
 Saves the current presentation.
 Returns true on success, otherwise returns false.
 */
 bool HsWidgetHost::savePresentation()
 {
-return savePresentation(HsScene::orientation());
+return savePresentation(HsGui::instance()->orientation());
 }
 /*!
 Saves the current presentation for the given \a orientation.
 Returns true on success, otherwise returns false.
 {
 HsDatabase *db = HsDatabase::instance();
 HsWidgetPresentationData data;
 data.orientation = orientation;
-data.setPos(pos());
+data.setPos(mVisual->pos());
-data.zValue = zValue();
+data.zValue = mVisual->zValue();
 data.widgetId = mDatabaseId;
 return db->setWidgetPresentation(data);
 }
 /*!
 {
 HsDatabase *db = HsDatabase::instance();
 return db->deleteWidgetPresentation(mDatabaseId, orientation);
 }
-/*!
+HsWidgetHostVisual *HsWidgetHost::visual() const
-Reimplemented from QGraphicsItem. Returns the shape of the
+{
-this widget host. The shape is computed based on the contained
+return mVisual;
-widget.
-*/
-QPainterPath HsWidgetHost::shape() const
-{
-QPainterPath path;
-if (mWidget) {
-QRectF currRect = rect();
-path = mWidget->shape();
-QRectF pathRect(path.boundingRect());
-if (pathRect.width() > currRect.width()
-|| pathRect.height() > currRect.height()) {
-QPainterPath newPath(currRect.topLeft());
-newPath.addRect(currRect);
-path = path.intersected(newPath);
-}
-}
-return path;
 }
 /*!
 \fn HsWidgetHost::event_startAndShow()
 Initiates a transition to show state.
 \fn HsWidgetHost::faulted()
 Notifies the home screen framework that this widget
 host has moved to faulted state.
 */
-/*!
-\fn HsWidgetHost::resized()
-Notifies the home screen framework that this widget
-host has resized itself.
-*/
 /*!
 \fn HsWidgetHost::available()
 Notifies the home screen framework that this widget
 is now available.
 /*!
 Starts the drag effect.
 */
 void HsWidgetHost::startDragEffect()
 {
-/* TODO: Uncomment after the Qt bug has been fixed.
+mVisual->startDragEffect();
-QGraphicsDropShadowEffect *effect =
-static_cast<QGraphicsDropShadowEffect *>(graphicsEffect());
-*/
-HbInstantFeedback::play(HbFeedback::ItemPick);
-setTransformOriginPoint(rect().center());
-QParallelAnimationGroup *animationGroup = new QParallelAnimationGroup();
-QPropertyAnimation *animation = new QPropertyAnimation(this, "scale");
-animation->setDuration(HSCONFIGURATION_GET(widgetDragEffectDuration));
-animation->setEndValue(1.1);
-animationGroup->addAnimation(animation);
-/* TODO: Uncomment after the Qt bug has been fixed.
-animation = new QPropertyAnimation(effect, "offset");
-animation->setDuration(200);
-animation->setEndValue(QPointF(8 ,8));
-animationGroup->addAnimation(animation);
-*/
-animationGroup->start(QAbstractAnimation::DeleteWhenStopped);
 }
 /*!
 Starts the drop effect.
 */
 void HsWidgetHost::startDropEffect()
 {
-/* TODO: Uncomment after the Qt bug has been fixed.
+mVisual->startDropEffect();
-QGraphicsDropShadowEffect *effect =
-static_cast<QGraphicsDropShadowEffect *>(graphicsEffect());
-*/
-HbInstantFeedback::play(HbFeedback::ItemDrop);
-QParallelAnimationGroup *animationGroup = new QParallelAnimationGroup;
-QPropertyAnimation *animation = new QPropertyAnimation(this, "scale");
-animation->setDuration(HSCONFIGURATION_GET(widgetDropEffectDuration));
-animation->setEndValue(1);
-animationGroup->addAnimation(animation);
-/* TODO: Uncomment after the Qt bug has been fixed.
-animation = new QPropertyAnimation(effect, "offset");
-animation->setDuration(200);
-animation->setEndValue(QPointF(3, 3));
-animationGroup->addAnimation(animation);
-*/
-animationGroup->start(QAbstractAnimation::DeleteWhenStopped);
-}
-/*!
-Reimplemented from QObject for monitoring changes in
-contained widget's size.
-*/
-bool HsWidgetHost::eventFilter(QObject *watched, QEvent *event)
-{
-if (event->type() == QEvent::GraphicsSceneResize ) {
-QGraphicsSceneResizeEvent *resizeEvent =
-static_cast<QGraphicsSceneResizeEvent *>(event);
-setNewSize(resizeEvent->newSize());
-emit resized();
-}
-return HbWidget::eventFilter(watched, event);
-}
-/*!
-Reimplemented from HbWidget for pan gesture handling.
-*/
-void HsWidgetHost::gestureEvent(QGestureEvent *event)
-{
-HsScene *scene = HsScene::instance();
-QGesture *gesture = event->gesture(Qt::PanGesture);
-if (gesture) {
-switch (gesture->state()) {
-case Qt::GestureStarted:
-grabMouse();
-emit scene->pagePanStarted(event);
-break;
-case Qt::GestureUpdated:
-emit scene->pagePanUpdated(event);
-break;
-case Qt::GestureFinished:
-case Qt::GestureCanceled:
-ungrabMouse();
-emit scene->pagePanFinished(event);
-break;
-default:
-break;
-}
-}
-}
-/*!
-\fn HsWidgetHost::mousePressEvent(QGraphicsSceneMouseEvent *)
-Reimplemented from QGraphicsItem for eating all mouse presses.
-*/
-/*!
-Configures the touch are for this widget host.
-*/
-void HsWidgetHost::setupTouchArea()
-{
-mTouchArea = new HsWidgetTouchArea(this);
-mTouchArea->setZValue(1);
-}
-/*!
-Configures the effects for this widget host.
-*/
-void HsWidgetHost::setupEffects()
-{
-/* TODO: Uncomment after the Qt bug has been fixed.
-QGraphicsDropShadowEffect *effect =
-new QGraphicsDropShadowEffect(this);
-effect->setColor(QColor(0, 0, 0, 150));
-effect->setBlurRadius(5);
-effect->setOffset(3);
-setGraphicsEffect(effect);
-*/
 }
 /*!
 Configures the state machine for this widget host.
 */
 int index = object->indexOfSignal(
 QMetaObject::normalizedSignature(signature));
 return index >= 0;
 }
-/*!
-Resizes this widget host to the given \a size.
-*/
-void HsWidgetHost::setNewSize(const QSizeF &size)
-{
-mTouchArea->resize(size);
-resize(size);
-setPreferredSize(size);
-}
 /*!
 Assigns preferences for the contained widget.
 Returns true on success, otherwise returns false.
 */
 Loads the contained widget from a widget plugin and
 connects to it's meta interface.
 */
 void HsWidgetHost::action_load()
 {
-QServiceManager manager;
+mWidget = HsHostedWidgetFactory::instance()->createWidget(mComponent->uri());
-QServiceFilter filter("com.nokia.symbian.IHomeScreenWidget");
+if (!mWidget) {
-filter.setServiceName(mComponent->uri());
-QList<QServiceInterfaceDescriptor> interfaces = manager.findInterfaces(filter);
-if (interfaces.isEmpty()) {
 emit event_faulted();
 return;
 }
+// must have fuctions
-QObject *widgetObject = manager.loadInterface(interfaces.first());
+if (!setMethod("onShow()", mOnShowMethod) ||
-mWidget = qobject_cast<QGraphicsWidget *>(widgetObject);
-if (!mWidget ||
-!setMethod("onShow()", mOnShowMethod) ||
 !setMethod("onHide()", mOnHideMethod)) {
+delete mWidget;
 mWidget = 0;
-delete widgetObject;
 emit event_faulted();
 return;
 }
+mVisual->setWidget(mWidget);
 setMethod("onInitialize()", mOnInitializeMethod);
 setMethod("onUninitialize()", mOnUninitializeMethod);
 setProperty("isOnline", mIsOnlineProperty);
 if (hasSignal("error()")) {
 connect(mWidget, SIGNAL(error()),
 SLOT(onError()), Qt::QueuedConnection);
 }
-mWidget->installEventFilter(this);
-setMinimumSize(HSCONFIGURATION_GET(minimumWidgetSizeInPixels));
-setMaximumSize(HSCONFIGURATION_GET(maximumWidgetSizeInPixels));
 loadPresentation();
-mWidget->setParentItem(this);
-setNewSize(mWidget->size());
 QString objName(mComponent->uri());
 objName.append(":");
 objName.append(QString::number(mDatabaseId));
-setObjectName(objName);
+mVisual->setObjectName(objName);
 }
 /*!
 Unloads the contained widget.
 */
 void HsWidgetHost::action_unload()
 {
+mVisual->setWidget(0);
 delete mWidget;
 mWidget = 0;
 		// This is needed because QServicePluginCleanup is
 // deleted asynchronously via the eventloop (deleteLater).
 // Here we want the plugin to unload synchronously.

changeset 69	87476091b3f5
parent 62	341166945d65
child 81	7dd137878ff8