diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h --- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h Thu May 27 12:46:08 2010 +0300 @@ -21,6 +21,7 @@ #include #include #include +#include #include "hstest_global.h" HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest) @@ -28,7 +29,6 @@ class QGraphicsItem; class QGraphicsSceneMouseEvent; class QPropertyAnimation; -class HbView; class HbAction; class HbContinuousFeedback; class HsIdleWidget; @@ -75,6 +75,7 @@ void addPageToScene(int pageIndex); qreal parallaxFactor() const; void updateZoneAnimation(); + void showTrashBin(); void removeActivePage(); private slots: @@ -136,28 +137,25 @@ QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered); void onOrientationChanged(Qt::Orientation orientation); - void widgetInteraction_onTapAndHoldTimeout(); void sceneInteraction_onTapAndHoldTimeout(); - void onTitleChanged(QString title); - void onAddContentActionTriggered(); - bool openTaskSwitcher(); void zoneAnimationFinished(); + void onSceneMenuTriggered(HbAction *action); + void onRemovePageMessageBoxClosed(HbAction *action); void onSceneMenuAboutToClose(); - void onRemovePageMessageBoxClosed(HbAction *action); private: - HbView *mView; HbAction *mNavigationAction; HsIdleWidget *mUiWidget; + QTimer mTimer; qreal mTapAndHoldDistance; qreal mPageChangeZoneWidth; - QPointF mSceneMenuPos; + QPointF mTouchScenePos; HsTitleResolver *mTitleResolver; QPropertyAnimation *mZoneAnimation; bool mPageChanged; @@ -167,6 +165,7 @@ bool mTrashBinFeedbackAlreadyPlayed; qreal mDeltaX; + QPointer mSceneMenu; #ifdef Q_OS_SYMBIAN XQSettingsManager *mSettingsMgr; #endif