diff -r 30f14686fb04 -r 2b1b11a301d2 homescreenapp/hsdomainmodel/inc/hspage.h --- a/homescreenapp/hsdomainmodel/inc/hspage.h Wed Jun 23 18:03:36 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hspage.h Tue Jul 06 14:06:53 2010 +0300 @@ -26,6 +26,7 @@ class HsWidgetHost; class HsPageData; class HsWallpaper; +class HsPageTouchArea; HOMESCREEN_TEST_CLASS(TestHsDomainModel) @@ -41,6 +42,8 @@ int databaseId() const; void setDatabaseId(int id); + void setGeometry(const QRectF &rect); + bool load(); HsWallpaper *wallpaper() const; @@ -49,7 +52,7 @@ bool removeWidget(HsWidgetHost *widgeHost); QList newWidgets(); - bool addNewWidget(HsWidgetHost *widgetHost); + bool addNewWidget(HsWidgetHost *widgetHost, const QPointF &position = QPointF()); void layoutNewWidgets(); void resetNewWidgets(); bool deleteFromDatabase(); @@ -64,6 +67,8 @@ static HsPage *createInstance(const HsPageData &pageData); + QPointF mTouchPoint; + public slots: void showWidgets(); void hideWidgets(); @@ -75,6 +80,7 @@ private: Q_DISABLE_COPY(HsPage) + void setupTouchArea(); void connectWidget(HsWidgetHost *widget); void disconnectWidget(HsWidgetHost *widget); @@ -94,7 +100,8 @@ QList mWidgets; QList mNewWidgets; QList mUnavailableWidgets; - + HsPageTouchArea *mTouchArea; + HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel) };