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

equal deleted inserted replaced

-:f9ce957a272c
+:cdae8c6c3876
 #include <HbAction>
 #include <HbIcon>
 #include "hsidlestate.h"
 #include "hsidlewidget.h"
+#include "hsdomainmodeldatastructures.h"
 #include "hsscene.h"
 #include "hspage.h"
 #include "hswidgethost.h"
 #include "hswallpaper.h"
-#include "hspagedata.h"
 #include "hsselectbackgroundstate.h"
 #include "hstrashbinwidget.h"
 #include "hspageindicator.h"
 #include "hsapptranslator.h"
 #include "hswidgetpositioningonorientationchange.h"
 #include "hsmenueventfactory.h"
+#include "hshomescreenstatecommon.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()));
 // Helper macros for connecting and disconnecting mouse event handlers.
 #define CONNECT_MOUSE_EVENT_HANDLER(signal, slot) \
-connect(mUiWidget, SIGNAL(signal(QGraphicsItem*, QGraphicsSceneMouseEvent*, bool&)), \
+connect(mUiWidget, SIGNAL(signal(QGraphicsItem*,QGraphicsSceneMouseEvent*,bool&)), \
-SLOT(slot(QGraphicsItem*, QGraphicsSceneMouseEvent*, bool&)));
+SLOT(slot(QGraphicsItem*,QGraphicsSceneMouseEvent*,bool&)));
 #define DISCONNECT_MOUSE_EVENT_HANDLER(signal, slot) \
-disconnect(mUiWidget, SIGNAL(signal(QGraphicsItem*, QGraphicsSceneMouseEvent*, bool&)), \
+disconnect(mUiWidget, SIGNAL(signal(QGraphicsItem*,QGraphicsSceneMouseEvent*,bool&)), \
-this, SLOT(slot(QGraphicsItem*, QGraphicsSceneMouseEvent*, bool&)));
+this, SLOT(slot(QGraphicsItem*,QGraphicsSceneMouseEvent*,bool&)));
 namespace
 {
-const char APP_LIB_BUTTON[] =
+const char gApplicationLibraryIconName[] = "qtg_mono_applications_all";
-"hs_applib_button.png";
+const char gAddPageTextName[]            = "txt_homescreen_opt_add_page";
-/*const char TXT_HOMESCREEN_TITLE_OFFLINE[] =
+const char gRemovePageTextName[]         = "txt_homescreen_opt_remove_page";
-"txt_homescreen_title_offline";*/
+const char gToOnlineTextName[]           = "txt_homescreen_opt_home_screen_to_online";
-const char TXT_HOMESCREEN_OPT_ADD_PAGE[] =
+const char gToOfflineTextName[]          = "txt_homescreen_opt_home_screen_to_offline";
-"txt_homescreen_opt_add_page";
+const char gChangeWallpaperTextName[]    = "txt_homescreen_list_change_wallpaper";
-const char TXT_HOMESCREEN_OPT_REMOVE_PAGE[] =
+const char gAddContentTextName[]         = "txt_homescreen_list_add_content";
-"txt_homescreen_opt_remove_page";
+//const char gTitleOfflineTextName[]       = "txt_homescreen_title_offline";
-const char TXT_HOMESCREEN_OPT_HOME_SCREEN_TO_ONLINE[] =
-"txt_homescreen_opt_home_screen_to_online";
-const char TXT_HOMESCREEN_OPT_HOME_SCREEN_TO_OFFLINE[] =
-"txt_homescreen_opt_home_screen_to_offline";
-const char TXT_HOMESCREEN_LIST_CHANGE_WALLPAPER[] =
-"txt_homescreen_list_change_wallpaper";
-const char TXT_HOMESCREEN_LIST_ADD_CONTENT[] =
-"txt_homescreen_list_add_content";
 }
 /*!
 \class HsIdleState
 \ingroup group_hshomescreenstateplugin
 /*!
 Constructs a new idle state with the given \a parent.
 */
 HsIdleState::HsIdleState(QState *parent)
 : QState(parent),
-mView(0), mSoftKeyAction(0), mUiWidget(0),
+mView(0), mNavigationAction(0), mUiWidget(0),
 mTapAndHoldDistance(16),
 mPageChangeZoneWidth(60)
 {
 setupStates();
 mTimer.setSingleShot(true);
 ENTRY_ACTION(state_moveWidget, action_moveWidget_reparentToControlLayer)
 ENTRY_ACTION(state_moveWidget, action_moveWidget_startWidgetDragAnimation)
 ENTRY_ACTION(state_moveWidget, action_moveWidget_connectMouseEventHandlers)
 ENTRY_ACTION(state_moveWidget, action_moveWidget_connectGestureTimers)
 EXIT_ACTION(state_moveWidget, action_moveWidget_reparentToPage)
 EXIT_ACTION(state_moveWidget, action_moveWidget_startWidgetDropAnimation)
 EXIT_ACTION(state_moveWidget, action_moveWidget_disconnectMouseEventHandlers)
 EXIT_ACTION(state_moveWidget, action_moveWidget_disconnectGestureTimers)
 animation->setEndValue(pageLayerXPos(targetPageIndex));
 animation->setDuration(duration);
 animationGroup->addAnimation(animation);
 animation = new QPropertyAnimation(mUiWidget->sceneLayer(), "x");
-animation->setEndValue(parallaxFactor() * pageLayerXPos(targetPageIndex));
+animation->setEndValue((parallaxFactor() * pageLayerXPos(targetPageIndex)) - HSBOUNDARYEFFECT / 2);
 animation->setDuration(duration);
 animationGroup->addAnimation(animation);
 animationGroup->start(QAbstractAnimation::DeleteWhenStopped);
 Inserts new page at index position \a pageIndex in the scene.
 */
 void HsIdleState::addPageToScene(int pageIndex)
 {
 HsPageData data;
-data.setIndex(pageIndex);
+data.indexPosition = pageIndex;
 HsPage *page = HsPage::createInstance(data);
 page->load();
 HsScene::instance()->addPage(page);
 mUiWidget->insertPage(pageIndex, page);
 }
 page layer widths, and page count.
 */
 qreal HsIdleState::parallaxFactor() const
 {
 qreal clw = mUiWidget->controlLayer()->size().width();
-qreal slw = mUiWidget->sceneLayer()->size().width();
+qreal slw = mUiWidget->sceneLayer()->size().width() - HSBOUNDARYEFFECT;
 int n = HsScene::instance()->pages().count();
 if (n < 2) {
 return 1;
 } else {
 return (slw - clw) / ((n - 1) * clw);
 {
 if (!mView) {
 mUiWidget = new HsIdleWidget;
 mView = HsScene::mainWindow()->addView(mUiWidget);
 mView->setContentFullScreen();
-mView->setTitle("Home Screen"/*hbTrId(TXT_HOMESCREEN_TITLE_OFFLINE)*/);
+mView->setTitle("Home Screen"/*hbTrId(gTitleOfflineTextName)*/);
-mSoftKeyAction = new HbAction(this);
+mNavigationAction = new HbAction(this);
-mSoftKeyAction->setIcon(HbIcon(APP_LIB_BUTTON));
+mNavigationAction->setIcon(HbIcon(gApplicationLibraryIconName));
-connect(mSoftKeyAction, SIGNAL(triggered()), SIGNAL(event_applicationLibrary()));
+connect(mNavigationAction, SIGNAL(triggered()), SIGNAL(event_applicationLibrary()));
+mView->setNavigationAction(mNavigationAction);
 #ifndef Q_OS_SYMBIAN
 connect(HsAppTranslator::instance(),
 SIGNAL(languageChanged()), SLOT(translateUi()));
 #endif
 // TODO: Workaround to Qt/Hb layouting bugs.
 QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 }
-HsScene::mainWindow()->addSoftKeyAction(Hb::SecondarySoftKey, mSoftKeyAction);
 HsScene::mainWindow()->setCurrentView(mView);
 }
 /*!
 Lays out the active page's new widgets that were added
 widget->initializeWidget();
 widget->showWidget();
 }
 page->layoutNewWidgets();
-page->resetNewWidgets();
 }
 /*!
 Moves the scene and page layers so that the active
 page is shown.
 */
 void HsIdleState::action_idle_showActivePage()
 {
 qreal x = pageLayerXPos(HsScene::instance()->activePageIndex());
 mUiWidget->pageLayer()->setX(x);
-mUiWidget->sceneLayer()->setX(parallaxFactor() * x);
+mUiWidget->sceneLayer()->setX((parallaxFactor() * x) - HSBOUNDARYEFFECT / 2);
 }
 /*!
 Connects the orientation change event handler.
 */
 /*!
 Cleans up the idle view.
 */
 void HsIdleState::action_idle_cleanupView()
 {
-HsScene::mainWindow()->removeSoftKeyAction(
-Hb::SecondarySoftKey, mSoftKeyAction);
 }
 /*!
 Disconnects the orientation change event handler.
 */
 /*!
 Updates the options menu content.
 */
 void HsIdleState::action_waitInput_updateOptionsMenu()
 {
+HsScene *scene = HsScene::instance();
 HbMenu *menu = new HbMenu();
-menu->addAction(hbTrId(TXT_HOMESCREEN_OPT_ADD_PAGE),
+// Add page
-this, SIGNAL(event_addPage()));
+if (scene->pages().count() < scene->maximumPageCount()) {
-menu->addAction(hbTrId(TXT_HOMESCREEN_OPT_REMOVE_PAGE),
+menu->addAction(hbTrId(gAddPageTextName),
-this, SIGNAL(event_removePage()))->setEnabled(
+this, SIGNAL(event_addPage()));
-HsScene::instance()->activePage()->isRemovable());
+}
-if (HsScene::instance()->isOnline()) {
+// Remove page
-menu->addAction(hbTrId(TXT_HOMESCREEN_OPT_HOME_SCREEN_TO_OFFLINE),
+if (scene->activePage()->isRemovable()) {
+menu->addAction(hbTrId(gRemovePageTextName),
+this, SIGNAL(event_removePage()));
+}
+// Online / Offline
+if (scene->isOnline()) {
+menu->addAction(hbTrId(gToOfflineTextName),
 this, SIGNAL(event_toggleConnection()));
 } else {
-menu->addAction(hbTrId(TXT_HOMESCREEN_OPT_HOME_SCREEN_TO_ONLINE),
+menu->addAction(hbTrId(gToOnlineTextName),
 this, SIGNAL(event_toggleConnection()));
 }
 #ifndef Q_OS_SYMBIAN
 menu->addAction(hbTrId("txt_homescreen_opt_switch_language"),
 void HsIdleState::action_sceneMenu_showMenu()
 {
 HbMenu menu;
 HbAction *changeWallpaperAction =
-menu.addAction(hbTrId(TXT_HOMESCREEN_LIST_CHANGE_WALLPAPER));
+menu.addAction(hbTrId(gChangeWallpaperTextName));
 HbAction *addContentAction =
-menu.addAction(hbTrId(TXT_HOMESCREEN_LIST_ADD_CONTENT));
+menu.addAction(hbTrId(gAddContentTextName));
 HbAction *action = menu.exec(mSceneMenuPos);
 if (action == changeWallpaperAction) {
 emit event_selectSceneWallpaper();
 } else if (action == addContentAction) {
 HsScene *scene = HsScene::instance();
 int pageIndex = scene->pages().count();
 addPageToScene(pageIndex);
 scene->setActivePageIndex(pageIndex);
 startPageChangeAnimation(pageIndex, 700);
-mUiWidget->pageIndicator()->addItem(true, true);
+mUiWidget->pageIndicator()->addItem(pageIndex);
+mUiWidget->showPageIndicator();
 }
 /*!
 Removes an existing page from the scene.
 */
 HsPage *page = scene->activePage();
 int pageIndex = scene->activePageIndex();
 mUiWidget->removePage(pageIndex);
 scene->removePage(page);
-page->deleteFromDatabase();
 delete page;
 pageIndex = pageIndex == 0 ? 0 : pageIndex - 1;
 scene->setActivePageIndex(pageIndex);
 startPageChangeAnimation(pageIndex, 200);
-mUiWidget->pageIndicator()->removeItem();
+mUiWidget->pageIndicator()->removeItem(pageIndex);
 mUiWidget->setActivePage(pageIndex);
+mUiWidget->showPageIndicator();
 }
 /*!
 Toggles the homescreen online/offline state.
 */
 if (!mTimer.isActive()) {
 return;
 }
 QPointF point =
-event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton);
+event->scenePos() - event->buttonDownScenePos(Qt::LeftButton);
 if (mTapAndHoldDistance < point.manhattanLength()) {
 mTimer.stop();
 mUiWidget->sendDelayedPress();
 }
 }
 if (!mTimer.isActive()) {
 return;
 }
 QPointF point =
-event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton);
+event->scenePos() - event->buttonDownScenePos(Qt::LeftButton);
 if (mTapAndHoldDistance < point.manhattanLength()) {
 mTimer.stop();
 mUiWidget->clearDelayedPress();
 emit event_moveScene();
 }
 Q_UNUSED(filtered)
 HsWidgetHost *widget = HsScene::instance()->activeWidget();
 Q_ASSERT(widget);
-QPointF delta(event->screenPos() - event->lastScreenPos());
+QPointF delta(event->scenePos() - event->lastScenePos());
 QRectF region =  mView->rect().adjusted(10, 55, -10, -10);
 QPointF position = widget->geometry().center() + delta;
 if (!region.contains(position)) {
 position.setX(qBound(region.left(), position.x(), region.right()));
 position.setY(qBound(region.top(), position.y(), region.bottom()));
 mUiWidget->trashBin()->activate();
 } else {
 mUiWidget->trashBin()->deactivate();
 }
-if (!mUiWidget->pageIndicator()->isAnimatingCurrentItemChange()) {
+if (!mUiWidget->pageIndicator()->isAnimationRunning()) {
 mUiWidget->showTrashBin();
 }
 }
 /*!
 Q_UNUSED(watched)
 Q_UNUSED(filtered)
 HsScene *scene = HsScene::instance();
 qreal delta =
-event->screenPos().x() - event->buttonDownScreenPos(Qt::LeftButton).x();
+event->scenePos().x() - event->buttonDownScenePos(Qt::LeftButton).x();
-qreal x = qBound(pageLayerXPos(scene->pages().count() - 1),
+qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - HSBOUNDARYEFFECT / 2 / parallaxFactor(),
 pageLayerXPos(scene->activePageIndex()) + delta,
-pageLayerXPos(0));
+pageLayerXPos(0) + (HSBOUNDARYEFFECT / 2 / parallaxFactor()) - qreal(0.5));
 mUiWidget->pageLayer()->setX(x);
-mUiWidget->sceneLayer()->setX(parallaxFactor() * x);
+mUiWidget->sceneLayer()->setX((parallaxFactor() * x) - HSBOUNDARYEFFECT / 2);
 }
 /*!
 Handles mouse release events for the moveScene state.
 Filters events for the item \a watched. \a event is the
 QSizeF pageSize = pages.first()->size();
 int pageIndex = HsScene::instance()->activePageIndex();
 QPointF delta(
-event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton));
+event->scenePos() - event->buttonDownScenePos(Qt::LeftButton));
-if (delta.x() < -pageSize.width() / 2) {
+if (delta.x() < -pageSize.width() / 3) {
 pageIndex = qMin(pageIndex + 1, pages.count() - 1);
-} else if(pageSize.width() / 2 < delta.x()) {
+} else if (pageSize.width() / 3 < delta.x()) {
 pageIndex = qMax(pageIndex - 1, 0);
 }
 HsScene::instance()->setActivePageIndex(pageIndex);
 void HsIdleState::onOrientationChanged(Qt::Orientation orientation)
 {
 QList<HsPage *> pages = HsScene::instance()->pages();
 QList<HsWidgetHost *> widgets;
 HsWidgetHost *widget = 0;
+const int KChromeHeight = 64; // TODO: get this somewhere
+const int KWidgetAdjust = 10; // TODO: get this somewhere
 for (int i = 0; i < pages.count(); ++i) {
 widgets = pages[i]->widgets();
 for (int j = 0; j < widgets.count(); ++j) {
 widget = widgets[j];
 HsWidgetPresentationData presentation = widget->widgetPresentation(orientation);
-if (presentation.id() < 0) {
+if (presentation.widgetId < 0) {
 QList<QRectF> geometries =
 HsWidgetPositioningOnOrientationChange::instance()->convert(
-pages[i]->rect().adjusted(10, 10, -10, -10), QList<QRectF>() << widget->geometry(),
+QRectF(0, KChromeHeight, pages[i]->rect().height(), pages[i]->rect().width()-KChromeHeight).adjusted(KWidgetAdjust, KWidgetAdjust, -KWidgetAdjust, -KWidgetAdjust),
-QRectF(0, 0, pages[i]->rect().height() + 40,
+QList<QRectF>() << widget->geometry(),
-pages[i]->rect().width() - 40).adjusted(10, 10, -10, -10));
+QRectF(0, KChromeHeight, pages[i]->rect().width(), pages[i]->rect().height()-KChromeHeight).adjusted(KWidgetAdjust, KWidgetAdjust, -KWidgetAdjust, -KWidgetAdjust));
 widget->setGeometry(geometries.first());
 widget->setWidgetPresentation();
 } else {
-widget->setGeometry(QRectF(presentation.position(), presentation.size()));
+widget->setGeometry(presentation.geometry());
-widget->setZValue(presentation.zValue());
+widget->setZValue(presentation.zValue);
 }
 }
 }
 action_idle_showActivePage();
 }
 if (pageIndex == scene->pages().count()) {
 if (scene->pages().last()->widgets().isEmpty()) {
 return;
-} else {
+} else if (scene->pages().count() < scene->maximumPageCount()) {
 addPageToScene(pageIndex);
 mUiWidget->showPageIndicator();
-mUiWidget->pageIndicator()->addItem(true);
+mUiWidget->pageIndicator()->addItem(pageIndex);
+} else {
+return;
 }
 }
 scene->setActivePageIndex(pageIndex);
 startPageChangeAnimation(pageIndex, 200);
 /*!
 Translates the home screen ui.
 */
 void HsIdleState::translateUi()
 {
-mView->setTitle("Home Screen"/*hbTrId(TXT_HOMESCREEN_TITLE_OFFLINE)*/);
+mView->setTitle("Home Screen"/*hbTrId(gTitleOfflineTextName)*/);
 action_waitInput_updateOptionsMenu();
 }
 #ifdef COVERAGE_MEASUREMENT
 #pragma CTC ENDSKIP
 #endif //COVERAGE_MEASUREMENT

changeset 36	cdae8c6c3876
parent 35	f9ce957a272c
child 39	4e8ebe173323