FCL/sf/app/homescreen: comparison homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp

equal deleted inserted replaced

-:474929a40a0f
+:87476091b3f5
 #include "hsidlestate.h"
 #include "hsidlewidget.h"
 #include "hsdomainmodeldatastructures.h"
 #include "hsscene.h"
 #include "hspage.h"
+#include "hspagevisual.h"
 #include "hswidgethost.h"
+#include "hswidgethostvisual.h"
 #include "hswallpaper.h"
 #include "hswallpaperselectionstate.h"
 #include "hstrashbinwidget.h"
 #include "hspageindicator.h"
 #include "hsmenueventfactory.h"
 #include "hshomescreenstatecommon.h"
 #include "hstitleresolver.h"
 #include "hsmenuservice.h"
-#include "hsgui.h"
 #include "hsconfiguration.h"
 #include "hsmessageboxwrapper.h"
 #include "hspropertyanimationwrapper.h"
+#include "hsgui.h"
+namespace
+{
+//User adds a new page to home screen
+const char hsLocTextId_OptionsMenu_AddPage[] = "txt_homescreen_opt_add_page";
+//User removes page from home screen
+const char hsLocTextId_OptionsMenu_RemovePage[] = "txt_homescreen_opt_remove_page";
+//Sends request to all widgets to enable data connections
+const char hsLocTextId_OptionsMenu_HsToOnline[] = "txt_homescreen_opt_home_screen_to_online";
+//Sends request to all widgets to disable data connections
+const char hsLocTextId_OptionsMenu_HsToOffline[] = "txt_homescreen_opt_home_screen_to_offline";
+//Home screen canvas menu item for opening picture gallery
+const char hsLocTextId_ContextMenu_ChangeWallpaper[] = "txt_homescreen_list_change_wallpaper";
+//Home screen canvas menu item for opening Application library
+const char hsLocTextId_ContextMenu_AddContent[] = "txt_homescreen_list_add_content";
+//Home screen options menu item for opening Task switcher
+const char hsLocTextId_OptionsMenu_TaskSwitcher[] = "txt_homescreen_opt_task_switcher";
+//Heading text in confirmation dialog while removing page with content
+const char hsLocTextId_Title_RemovePage[] = "txt_homescreen_title_remove_page";
+//Text in confirmation dialog while removing page with content
+const char hsLocTextId_Confirmation_RemovePage[] = "txt_homescreen_info_page_and_content_will_be_remov";
+}
 // 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()));
-namespace
-{
-const char gApplicationLibraryIconName[] = "qtg_mono_applications_all";
-//User adds a new page to home screen
-const char hsLocTextId_OptionsMenu_AddPage[] = "txt_homescreen_opt_add_page";
-//User removes page from home screen
-const char hsLocTextId_OptionsMenu_RemovePage[] = "txt_homescreen_opt_remove_page";
-//Sends request to all widgets to enable data connections
-const char hsLocTextId_OptionsMenu_HsToOnline[] = "txt_homescreen_opt_home_screen_to_online";
-//Sends request to all widgets to disable data connections
-const char hsLocTextId_OptionsMenu_HsToOffline[] = "txt_homescreen_opt_home_screen_to_offline";
-//Home screen canvas menu item for opening picture gallery
-const char hsLocTextId_ContextMenu_ChangeWallpaper[] = "txt_homescreen_list_change_wallpaper";
-//Home screen canvas menu item for opening Application library
-const char hsLocTextId_ContextMenu_AddContent[] = "txt_homescreen_list_add_content";
-//Home screen options menu item for opening Task switcher
-const char hsLocTextId_OptionsMenu_TaskSwitcher[] = "txt_homescreen_opt_task_switcher";
-//Heading text in confirmation dialog while removing page with content
-const char hsLocTextId_Title_RemovePage[] = "txt_homescreen_title_remove_page";
-//Text in confirmation dialog while removing page with content
-const char hsLocTextId_Confirmation_RemovePage[] = "txt_homescreen_info_page_and_content_will_be_remov";
-//Button in confirmation dialog while removing page with content
-//const char hsLocTextId_ConfirmationButton_Ok[] = "txt_homescreen_button_ok";
-//Button in confirmation dialog while removing page with content
-//const char hsLocTextId_ConfirmationButton_Cancel[] = "txt_homescreen_button_cancel";
-}
 /*!
 \class HsIdleState
 \ingroup group_hshomescreenstateplugin
 \brief Controller part of the home screen idle state.
 Constructs a new idle state with the given \a parent.
 */
 HsIdleState::HsIdleState(QState *parent)
 : QState(parent),
 mNavigationAction(0),
-mUiWidget(0),
 mTitleResolver(0),
-mZoneAnimation(0),
 mAllowZoneAnimation(false),
-mPageChangeAnimation(0),
 mContinuousFeedback(0),
 mTrashBinFeedbackAlreadyPlayed(false),
 mDeltaX(0),
 mSceneMenu(0)
 #ifdef Q_OS_SYMBIAN
 /*!
 Destroys this idle state.
 */
 HsIdleState::~HsIdleState()
 {
-if (mZoneAnimation) {
-mZoneAnimation->stop();
-delete mZoneAnimation;
-}
-if (mPageChangeAnimation) {
-mPageChangeAnimation->stop();
-delete mPageChangeAnimation;
-}
 // TODO: Uncomment when updated API available
 //delete mContinuousFeedback;
 }
 /*!
 EXIT_ACTION(state_moveScene, action_moveScene_disconnectGestureHandlers)
 ENTRY_ACTION(state_addPage, action_addPage_addPage)
 ENTRY_ACTION(state_preRemovePage, action_preRemovePage_showQuery)
+EXIT_ACTION(state_preRemovePage, action_preRemovePage_exit);
 ENTRY_ACTION(state_removePage, action_removePage_startRemovePageAnimation)
 EXIT_ACTION(state_removePage, action_removePage_removePage)
 ENTRY_ACTION(state_toggleConnection, action_toggleConnection_toggleConnection)
 /*!
 Computes the page layer x position based on the given \a pageIndex.
 */
 qreal HsIdleState::pageLayerXPos(int pageIndex) const
 {
-return -pageIndex * HsScene::mainWindow()->layoutRect().width();
+return -pageIndex * HsGui::instance()->layoutRect().width();
 }
 /*!
 Starts the page change animation based on the given \a targetPageIndex
 and \a duration.
 */
 void HsIdleState::startPageChangeAnimation(int targetPageIndex, int duration)
 {
-if (mPageChangeAnimation->isRunning()) {
+HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
-mPageChangeAnimation->stop();
+if (animation->isRunning()) {
+animation->stop();
 }
-mPageChangeAnimation->disconnect(this);
+animation->disconnect(this);
-mPageChangeAnimation->setEndValue(pageLayerXPos(targetPageIndex));
+animation->setEndValue(pageLayerXPos(targetPageIndex));
-mPageChangeAnimation->setDuration(duration);
+animation->setDuration(duration);
-connect(mPageChangeAnimation,
+connect(animation,
 SIGNAL(finished()),
 SLOT(pageChangeAnimationFinished()),
 Qt::UniqueConnection);
-mPageChangeAnimation->start();
+animation->start();
 HbInstantFeedback::play(HSCONFIGURATION_GET(pageChangeFeedbackEffect));
-mUiWidget->showPageIndicator();
+HsGui::instance()->idleWidget()->showPageIndicator();
-mUiWidget->setActivePage(targetPageIndex);
+HsGui::instance()->idleWidget()->setActivePage(targetPageIndex);
 }
 /*!
 Starts the page change zone animation (crawling) based on the given a\ duration
 */
 } else {
 return;
 }
 int bounceEffect = HSCONFIGURATION_GET(bounceEffect);
+HsPropertyAnimationWrapper *pageCrawlingAnimation =
+HsGui::instance()->pageCrawlingAnimation();
 if (isInLeftPageChangeZone()) {
-mZoneAnimation->setEndValue(pageLayerXPos(scene->activePageIndex()) + bounceEffect);
+pageCrawlingAnimation->setEndValue(pageLayerXPos(scene->activePageIndex()) + bounceEffect);
 } else {
-mZoneAnimation->setEndValue(pageLayerXPos(scene->activePageIndex()) - bounceEffect);
+pageCrawlingAnimation->setEndValue(pageLayerXPos(scene->activePageIndex()) - bounceEffect);
 }
-mZoneAnimation->setDuration(duration);
+pageCrawlingAnimation->setDuration(duration);
-mZoneAnimation->setDirection(QAbstractAnimation::Forward);
+pageCrawlingAnimation->setForward();
-connect(mZoneAnimation,
+connect(pageCrawlingAnimation,
 SIGNAL(finished()),
 SLOT(zoneAnimationFinished()),
 Qt::UniqueConnection);
-mZoneAnimation->start();
+pageCrawlingAnimation->start();
 }
 /*!
 Checks if the active widget is located inside the left or right
 page change zone.
 Checks if touch point in the active widget is located inside the right
 page change zone.
 */
 bool HsIdleState::isInRightPageChangeZone()
 {
-qreal pageWidth = HsScene::mainWindow()->layoutRect().width();
+qreal pageWidth = HsGui::instance()->layoutRect().width();
 return mWidgetHotSpot.x() > pageWidth - HSCONFIGURATION_GET(pageChangeZoneWidth);
 }
 /*!
 Inserts new page at index position \a pageIndex in the scene.
 HsPageData data;
 data.indexPosition = pageIndex;
 HsPage *page = HsPage::createInstance(data);
 page->load();
 HsScene::instance()->addPage(page);
-mUiWidget->insertPage(pageIndex, page);
+HsGui::instance()->idleWidget()->insertPage(pageIndex, page);
 }
 /*!
 Checks if page change zone animation needs to be started or stopped
 */
 void HsIdleState::updateZoneAnimation()
 {
+HsPropertyAnimationWrapper *pageCrawlingAnimation =
+HsGui::instance()->pageCrawlingAnimation();
 if (!mAllowZoneAnimation) {
-mZoneAnimation->stop();
+pageCrawlingAnimation->stop();
 } else if (isInPageChangeZone()) {
 // should we start it
-if (mZoneAnimation->state() == QAbstractAnimation::Stopped &&
+if (!pageCrawlingAnimation->isRunning() &&
-!mPageChangeAnimation->isRunning()) {
+!HsGui::instance()->pageChangeAnimation()->isRunning()) {
 startPageChangeZoneAnimation(HSCONFIGURATION_GET(pageChangeZoneAnimationDuration));
 }
-} else if (mZoneAnimation->state() == QAbstractAnimation::Running) {
+} else if (pageCrawlingAnimation->isRunning()) {
 // Not in zone, but still running
-if (mZoneAnimation->direction() == QAbstractAnimation::Forward){
+if (pageCrawlingAnimation->isForward()){
 // reverse
-mZoneAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
+pageCrawlingAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
-mZoneAnimation->setDirection(QAbstractAnimation::Backward);
+pageCrawlingAnimation->setBackward();
 }
 }
 }
 /*!
 Selects which trash bin icon is shown or not shown at all
 */
 void HsIdleState::showTrashBin()
 {
-if (mUiWidget->trashBin()->isUnderMouse()) {
+if (HsGui::instance()->idleWidget()->trashBin()->isUnderMouse()) {
 if (!mTrashBinFeedbackAlreadyPlayed) {
 HbInstantFeedback::play(HSCONFIGURATION_GET(widgetOverTrashbinFeedbackEffect));
 mTrashBinFeedbackAlreadyPlayed = true;
 }
-mUiWidget->trashBin()->activate();
+HsGui::instance()->idleWidget()->trashBin()->activate();
 } else {
-mUiWidget->trashBin()->deactivate();
+HsGui::instance()->idleWidget()->trashBin()->deactivate();
 mTrashBinFeedbackAlreadyPlayed = false;
 }
-if (!mUiWidget->pageIndicator()->isAnimationRunning()) {
+if (!HsGui::instance()->idleWidget()->pageIndicator()->isAnimationRunning()) {
-mUiWidget->showTrashBin();
+HsGui::instance()->idleWidget()->showTrashBin();
 }
 }
 /*!
 If called for the first time, setups the idle view.
 Updates the soft key action and sets the idle view
 as the current view to the main window.
 */
 void HsIdleState::action_idle_setupView()
 {
-HbView *idleView = HsGui::idleView();
+HsGui::instance()->setupIdleUi();
-if (!idleView) {
+connect(HsGui::instance(),SIGNAL(navigateToApplibrary()),SIGNAL(event_applicationLibrary()),Qt::UniqueConnection);
-mUiWidget = new HsIdleWidget;
-idleView = HsScene::mainWindow()->addView(mUiWidget);
-idleView->setContentFullScreen();
-mNavigationAction = new HbAction(this);
-mNavigationAction->setIcon(HbIcon(gApplicationLibraryIconName));
-mNavigationAction->setObjectName("applib_navigation_action");
-connect(mNavigationAction, SIGNAL(triggered()), SIGNAL(event_applicationLibrary()));
-idleView->setNavigationAction(mNavigationAction);
-HsGui::setIdleView(idleView);
-delete mPageChangeAnimation;
-mPageChangeAnimation = NULL;
-mPageChangeAnimation = new HsPropertyAnimationWrapper;
-mPageChangeAnimation->setTargetObject(mUiWidget);
-mPageChangeAnimation->setPropertyName("sceneX");
-delete mZoneAnimation;
-mZoneAnimation = NULL;
-mZoneAnimation = new QPropertyAnimation(mUiWidget, "sceneX");
-}
-HsScene::mainWindow()->setCurrentView(idleView);
 }
 /*!
 Sets the idle view's title.
 */
 Updates the idle view's title.
 */
 void HsIdleState::onTitleChanged(QString title)
 {
 qDebug() << "HsIdleState::onTitleChanged() to title: " << title;
-HsGui::idleView()->setTitle(title);
+HsGui::instance()->idleView()->setTitle(title);
 }
 /*!
 */
 mDeltaX = gesture->sceneOffset().x();
 HsScene *scene = HsScene::instance();
 int bounceEffect = HSCONFIGURATION_GET(bounceEffect);
-qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - bounceEffect / 2 / mUiWidget->parallaxFactor(),
+qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - bounceEffect / 2 / HsGui::instance()->idleWidget()->parallaxFactor(),
 pageLayerXPos(scene->activePageIndex()) + mDeltaX,
-pageLayerXPos(0) + (bounceEffect / 2 / mUiWidget->parallaxFactor()));
+pageLayerXPos(0) + (bounceEffect / 2 / HsGui::instance()->idleWidget()->parallaxFactor()));
-mUiWidget->setSceneX(x);
+HsGui::instance()->idleWidget()->setSceneX(x);
 }
 void HsIdleState::onPagePanFinished(QGestureEvent *event)
 {
 HbPanGesture *gesture = qobject_cast<HbPanGesture *>(
 HsScene *scene = HsScene::instance();
 scene->setActiveWidget(widget);
 mWidgetHotSpot = qobject_cast<HbTapAndHoldGesture *>(
 event->gesture(Qt::TapAndHoldGesture))->scenePosition();
-mWidgetHotSpotOffset = mWidgetHotSpot - widget->pos();
+mWidgetHotSpotOffset = mWidgetHotSpot - widget->visual()->pos();
 emit event_moveWidget();
 }
 void HsIdleState::onWidgetMoveUpdated(const QPointF &scenePos, HsWidgetHost *widget)
 {
-QRectF widgetRect = widget->geometry();
+QRectF widgetRect = widget->visual()->geometry();
 // Move widget to updated position.
 mWidgetHotSpot = scenePos;
 widgetRect.moveTopLeft(mWidgetHotSpot - mWidgetHotSpotOffset);
 // When moving widget can go over the pages left border.
 qreal lowerBoundX = -widgetRect.width();
 // When moving widget can go over the pages right border.
-QRectF pageRect = HsGui::idleView()->rect();
+QRectF pageRect = HsGui::instance()->idleView()->rect();
 qreal upperBoundX = pageRect.width();
 // When moving widget can go under the chrome at the pages upper border.
 // Notice that chrome height is 64 pixels.
 qreal lowerBoundY = qreal(64) - widgetRect.height();
 qreal widgetX = qBound(lowerBoundX, widgetRect.x(), upperBoundX);
 qreal widgetY = qBound(lowerBoundY, widgetRect.y(), upperBoundY);
 // If using ItemClipsChildrenToShape-flag in widgethost then
 // setPos does not update position here, however setGeometry does it, QT bug?
-widget->setGeometry(widgetX, widgetY, widgetRect.width(), widgetRect.height());
+widget->visual()->setGeometry(widgetX, widgetY, widgetRect.width(), widgetRect.height());
 if (HSCONFIGURATION_GET(isSnapEnabled)) {
-mSnapResult = HsWidgetPositioningOnWidgetMove::instance()->run(widget->sceneBoundingRect());
+mSnapResult = HsWidgetPositioningOnWidgetMove::instance()->run(widget->visual()->sceneBoundingRect());
 if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) {
 if (mSnapResult.hasHorizontalSnap) {
 showVerticalLine();
 }
 {
 HsScene *scene = HsScene::instance();
 QApplication::instance()->installEventFilter(scene);
 scene->activePage()->showWidgets();
 qreal x = pageLayerXPos(scene->activePageIndex());
-mUiWidget->setSceneX(x);
+HsGui::instance()->idleWidget()->setSceneX(x);
 }
 /*!
 Connects the orientation change event handler.
 */
 void HsIdleState::action_idle_connectOrientationChangeEventHandler()
 {
-connect(HsScene::mainWindow(),
+connect(HsGui::instance(),
 SIGNAL(orientationChanged(Qt::Orientation)),
 SLOT(action_idle_orientationChanged()));
 }
 void HsIdleState::action_idle_orientationChanged()
 void HsIdleState::action_idle_cleanupView()
 {
 HsScene *scene = HsScene::instance();
 QApplication::instance()->removeEventFilter(scene);
 scene->activePage()->hideWidgets();
+HsGui::instance()->disconnect(this,SIGNAL(event_applicationLibrary()));
 //Close options menu on view change
-HsGui::idleView()->setMenu(NULL);
+HsGui::instance()->idleView()->setMenu(NULL);
 //Close context menu on view change
 if (mSceneMenu) {
 mSceneMenu->close();
 }
 /*!
 Disconnects the orientation change event handler.
 */
 void HsIdleState::action_idle_disconnectOrientationChangeEventHandler()
 {
-disconnect(HsScene::mainWindow(),
+disconnect(HsGui::instance(),
 SIGNAL(orientationChanged(Qt::Orientation)),
 this, SLOT(action_idle_orientationChanged()));
 }
 /*!
 } else {
 menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOnline),
 this, SIGNAL(event_toggleConnection()));
 }
-HsGui::idleView()->setMenu(menu);
+HsGui::instance()->idleView()->setMenu(menu);
 }
 void HsIdleState::action_waitInput_connectGestureHandlers()
 {
 HsScene *scene = HsScene::instance();
 */
 void HsIdleState::action_moveWidget_reparentToControlLayer()
 {
 HsWidgetHost *widget = HsScene::instance()->activeWidget();
 Q_ASSERT(widget);
-widget->setParentItem(mUiWidget->controlLayer());
+widget->visual()->setParentItem(HsGui::instance()->idleWidget()->controlLayer());
-mUiWidget->showTrashBin();
+HsGui::instance()->idleWidget()->showTrashBin();
 }
 /*!
 Starts the widget drag effect.
 */
 foreach (HsWidgetHost* widget, activePage->widgets()) {
 //If the above function returns the active widget, skip over it as widget and mMovingRect represent same widget.
 if (widget == activeWidget) {
 continue;
 }
-QRectF widgetRect = widget->geometry();
+QRectF widgetRect = widget->visual()->geometry();
 incativeWidgetRects.append(widgetRect);
 }
 return incativeWidgetRects;
 }
 /*!
 Reparents the active widget to the active page.
 */
 void HsIdleState::action_moveWidget_reparentToPage()
 {
-if (mZoneAnimation
+HsPropertyAnimationWrapper *pageCrawlingAnimation =
-&& mZoneAnimation->state() == QAbstractAnimation::Running
+HsGui::instance()->pageCrawlingAnimation();
-&& mZoneAnimation->direction() == QAbstractAnimation::Forward) {
+if (pageCrawlingAnimation->isRunning()&&
-mZoneAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
+pageCrawlingAnimation->isForward()) {
-mZoneAnimation->setDirection(QAbstractAnimation::Backward);
+pageCrawlingAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
+pageCrawlingAnimation->setBackward();
 }
 HsScene *scene = HsScene::instance();
 HsPage *page = scene->activePage();
 HsWidgetHost *widget = scene->activeWidget();
-if (mUiWidget->trashBin()->isUnderMouse()) {
+if (HsGui::instance()->idleWidget()->trashBin()->isUnderMouse()) {
 HbInstantFeedback::play(HSCONFIGURATION_GET(widgetDropToTrashbinFeedbackEffect));
 widget->page()->removeWidget(widget);
 widget->remove();
 scene->setActiveWidget(0);
 } else {
 if (widget->page() != page) {
 widget->page()->removeWidget(widget);
 page->addExistingWidget(widget);
-if (HsScene::orientation() == Qt::Horizontal) {
+if (HsGui::instance()->orientation() == Qt::Horizontal) {
 widget->removePresentation(Qt::Vertical);
 } else {
 widget->removePresentation(Qt::Horizontal);
 }
 }
 //Set the snap position of the widget and save the position
-QRectF widgetRect = widget->geometry();
+QRectF widgetRect = widget->visual()->geometry();
 if (mSnapResult.hasHorizontalSnap) {
 widgetRect.moveLeft(mSnapResult.horizontalSnapPosition);
 }
 if (mSnapResult.hasVerticalSnap) {
 widgetRect.moveTop(mSnapResult.verticalSnapPosition);
 }
 QPointF adjustedWidgetPosition = page->adjustedWidgetPosition(widgetRect);
-widget->setPos(adjustedWidgetPosition);
+widget->visual()->setPos(adjustedWidgetPosition);
 widget->savePresentation();
 page->updateZValues();
 }
-widget->setParentItem(HsScene::instance()->activePage());
+widget->visual()->setParentItem(HsScene::instance()->activePage()->visual());
-mUiWidget->showPageIndicator();
+HsGui::instance()->idleWidget()->showPageIndicator();
 }
 /*!
 Starts the widget drop effect.
 */
 Moves to the nearest page.
 */
 void HsIdleState::action_moveScene_moveToNearestPage()
 {
 QList<HsPage *> pages = HsScene::instance()->pages();
-QSizeF pageSize = pages.first()->size();
+QSizeF pageSize = pages.first()->visual()->size();
 int pageIndex = HsScene::instance()->activePageIndex();
 if (mDeltaX < -HSCONFIGURATION_GET(pageChangePanDistanceInPixels)) {
 pageIndex = qMin(pageIndex + 1, pages.count() - 1);
 pageIndex = qMax(pageIndex - 1, 0);
 }
 HsScene::instance()->setActivePageIndex(pageIndex);
+HsPage *page = HsScene::instance()->activePage();
+if (page) {
+QList<HsWidgetHost *> widgets = page->newWidgets();
+if (!widgets.isEmpty()) {
+foreach (HsWidgetHost *widget, widgets) {
+widget->startWidget();
+}
+}
+page->layoutNewWidgets();
+}
 startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(pageChangeAnimationDuration));
 }
 void HsIdleState::action_moveScene_disconnectGestureHandlers()
 {
 HsScene *scene = HsScene::instance();
 	int pageIndex = scene->activePageIndex() + 1;
 addPageToScene(pageIndex);
 scene->setActivePageIndex(pageIndex);
 startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(newPageAddedAnimationDuration));
-mUiWidget->pageIndicator()->addItem(pageIndex);
+HsGui::instance()->idleWidget()->pageIndicator()->addItem(pageIndex);
-mUiWidget->showPageIndicator();
+HsGui::instance()->idleWidget()->showPageIndicator();
 }
+/*!
+Displays a confirmation query before page is removed if there are widgets on page
+*/
 void HsIdleState::action_preRemovePage_showQuery()
 {
 HsScene *scene = HsScene::instance();
 HsPage *page = scene->activePage();
 emit event_removePage();
 }
 }
 /*!
+Make sure confirmation query gets closed if user exits preRemovePage state e.g. by pressing application key
+*/
+void HsIdleState::action_preRemovePage_exit()
+{
+if (mMessageBoxWrapper) {
+mMessageBoxWrapper->close();
+}
+}
+/*!
 Start remove page animation.
 */
 void HsIdleState::action_removePage_startRemovePageAnimation()
 {
 HsScene *scene = HsScene::instance();
 int nextPageIndex(pageToRemoveIndex);
 nextPageIndex++;
 if (isLastPage) {
 nextPageIndex--;
 }
+HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
-if (mPageChangeAnimation->isRunning()) {
+if (animation->isRunning()) {
-mPageChangeAnimation->stop();
+animation->stop();
 }
-mPageChangeAnimation->disconnect(this);
+animation->disconnect(this);
-connect(mPageChangeAnimation,
+connect(animation,
 SIGNAL(finished()),
 SIGNAL(event_waitInput()),
 Qt::UniqueConnection);
-mPageChangeAnimation->setEndValue(pageLayerXPos(nextPageIndex));
+animation->setEndValue(pageLayerXPos(nextPageIndex));
-mPageChangeAnimation->setDuration(HSCONFIGURATION_GET(pageRemovedAnimationDuration));
+animation->setDuration(HSCONFIGURATION_GET(pageRemovedAnimationDuration));
-mPageChangeAnimation->start();
+animation->start();
 HbInstantFeedback::play(HSCONFIGURATION_GET(pageChangeFeedbackEffect));
 }
 /*!
 Removes an existing page from the scene.
 */
 void HsIdleState::action_removePage_removePage()
 {
-if (mPageChangeAnimation->isRunning()) {
+HsIdleWidget *idleWidget = HsGui::instance()->idleWidget();
-mPageChangeAnimation->stop();
+HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
-}
 HsScene *scene = HsScene::instance();
 HsPage *pageToRemove = scene->activePage();
+if (animation->isRunning()) {
+animation->stop();
+}
 // remove from ui
-mUiWidget->removePage(pageToRemove->pageIndex());
+idleWidget->removePage(pageToRemove->pageIndex());
-mUiWidget->showPageIndicator();
+idleWidget->showPageIndicator();
 // update data model
-HsScene::instance()->removePage(pageToRemove);
+scene->removePage(pageToRemove);
 // Take new active page (previous was removed) and move scene to right position
 qreal x = pageLayerXPos(scene->activePageIndex());
-mUiWidget->setSceneX(x);
+idleWidget->setSceneX(x);
 // delete it
 pageToRemove->deleteLater();
 }
 /*!
 */
 void HsIdleState::zoneAnimationFinished()
 {
 HsScene *scene = HsScene::instance();
 int pageIndex = scene->activePageIndex();
+HsGui *gui(HsGui::instance());
-if (mZoneAnimation->direction() == QAbstractAnimation::Forward) {
+if (gui->pageCrawlingAnimation()->isForward()) {
 if (isInLeftPageChangeZone() &&
 0 < pageIndex) {
 --pageIndex;
 } else if (isInRightPageChangeZone() &&
 pageIndex < scene->pages().count()) {
 ++pageIndex;
 }
 if (pageIndex == scene->pages().count()) {
 if (pageIndex < HSCONFIGURATION_GET(maximumPageCount)) {
 addPageToScene(pageIndex);
-mUiWidget->showPageIndicator();
+gui->idleWidget()->showPageIndicator();
-mUiWidget->pageIndicator()->addItem(pageIndex);
+gui->idleWidget()->pageIndicator()->addItem(pageIndex);
 }
 }
 scene->setActivePageIndex(pageIndex);
 startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(pageChangeAnimationDuration));
 } else {
 scene->setActivePageIndex(pageIndex);
-mUiWidget->setActivePage(pageIndex);
+gui->idleWidget()->setActivePage(pageIndex);
 }
 }
 /*!
 Page change animation has been finished.
 */
 void HsIdleState::updatePagePresentationToWidgetSnap()
 {
 QRectF containerRect = HsScene::instance()->activePage()->contentGeometry();
 HsWidgetHost *activeWidget = HsScene::instance()->activeWidget();
-HsWidgetPositioningOnWidgetMove::instance()->setPagePresentation(containerRect, createInactiveWidgetRects(), activeWidget->geometry());
+HsWidgetPositioningOnWidgetMove::instance()->setPagePresentation(
+containerRect, createInactiveWidgetRects(), activeWidget->visual()->geometry());
 }
 /*!
 Reset Snap position, hide the snap lines
 */
 //As the Vertical Line position is at the same place,
 //the timer was started when vertical line positions were at different locations
 //the line will be shown when the timer expires.
 //If timer has already expired, just show the line, which is redrawn to new geometry.
 if (!mVerticalSnapLineTimer.isActive()) {
-mUiWidget->showVerticalSnapLine(mSnapResult.verticalSnapLine);
+HsGui::instance()->idleWidget()->showVerticalSnapLine(mSnapResult.verticalSnapLine);
 }
 }
 }
 /*!
 Timer for showing the Vertical line expires
 */
 void HsIdleState::onVerticalSnapLineTimerTimeout()
 {
-mUiWidget->showVerticalSnapLine(mSnapResult.verticalSnapLine);
+HsGui::instance()->idleWidget()->showVerticalSnapLine(mSnapResult.verticalSnapLine);
 }
 /*!
 Hide the Vertical line for Snap guidance
 */
 void HsIdleState::hideVerticalLine()
 {
-mUiWidget->hideVerticalSnapLine();
+HsGui::instance()->idleWidget()->hideVerticalSnapLine();
 mVerticalSnapLineTimer.stop();
 }
 /*!
 Show the Horizontal line for Snap guidance
 hideHorizontalLine();
 mHorizontalSnapLineTimer.start();
 }
 else {
 if (!mHorizontalSnapLineTimer.isActive()) {
-mUiWidget->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
+HsGui::instance()->idleWidget()->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
 }
 }
 }
 /*!
 Timer for showing the Horizontal line expires
 */
 void HsIdleState::onHorizontalSnapLineTimerTimeout()
 {
-mUiWidget->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
+HsGui::instance()->idleWidget()->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
 }
 /*!
 Hide the Horizontal line for Snap guidance
 */
 void HsIdleState::hideHorizontalLine()
 {
-mUiWidget->hideHorizontalSnapLine();
+HsGui::instance()->idleWidget()->hideHorizontalSnapLine();
 mHorizontalSnapLineTimer.stop();
 }
 /*!
 Handles updating the Snap algorithm with page presentation on page change

changeset 69	87476091b3f5
parent 63	52b0f64eeb51
child 71	1db7cc813a4e