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

equal deleted inserted replaced

-:474929a40a0f
+:87476091b3f5
 #include <HbInstance>
 #include "hsdomainmodeldatastructures.h"
 #include "hspage.h"
+#include "hspagevisual.h"
 #include "hspagetoucharea.h"
 #include "hspagenewwidgetlayout.h"
 #include "hsscene.h"
 #include "hsdatabase.h"
 #include "hswidgethost.h"
+#include "hswidgethostvisual.h"
 #include "hswallpaper.h"
 #include "hswidgetpositioningonwidgetadd.h"
 #include "hswidgetpositioningonorientationchange.h"
 #include "hsconfiguration.h"
+#include "hsgui.h"
 /*!
 \class HsPage
 \ingroup group_hsdomainmodel
 Constructor.
 \a parent Owner.
 \a aFlags Window flags.
 */
-HsPage::HsPage(QGraphicsItem* parent)
+HsPage::HsPage(QObject* parent)
-: HbWidget(parent),
+: QObject(parent),
 mDatabaseId(-1),
+mPageVisual(new HsPageVisual),
 mWallpaper(0),
 mRemovable(true),
-mTouchArea(0),
 mPageMargin(0.0)
 {
-setFlag(QGraphicsItem::ItemHasNoContents);
-setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
-QSizePolicy::Ignored));
-setupTouchArea();
 //Page margin
 mPageMargin = HSCONFIGURATION_GET(pageMargin);
 connect(HsConfiguration::instance(), SIGNAL(propertyChanged(QString)), SLOT(onPageMarginChanged(QString)));
 }
 /*!
 Destructor.
 */
 HsPage::~HsPage()
 {
+// visuals are owned by widget host, detach those from page visual
+HsWidgetHostVisual *visual(0);
+foreach (HsWidgetHost *widget, mWidgets) {
+visual = widget->visual();
+visual->setParent(0);
+if (visual->scene()) {
+visual->scene()->removeItem(visual);
+}
+}
+foreach (HsWidgetHost *widget, mNewWidgets) {
+visual = widget->visual();
+visual->setParent(0);
+if (visual->scene()) {
+visual->scene()->removeItem(visual);
+}
+}
+foreach (HsWidgetHost *widget, mUnavailableWidgets) {
+visual = widget->visual();
+visual->setParent(0);
+if (visual->scene()) {
+visual->scene()->removeItem(visual);
+}
+}
+qDeleteAll(mWidgets);
+qDeleteAll(mNewWidgets);
+qDeleteAll(mUnavailableWidgets);
+delete mPageVisual;
 delete mWallpaper;
 }
 /*!
 Returns the database id.
 */
 void HsPage::setDatabaseId(int id)
 {
 mDatabaseId = id;
 }
+/*
 void HsPage::setGeometry(const QRectF &rect)
 {
 if (mTouchArea) {
 mTouchArea->resize(rect.size());
 }
 HbWidget::setGeometry(rect);
 }
+*/
 /*!
 Loads widgets.
 */
 bool HsPage::load()
 {
 mWallpaper = new HsPageWallpaper(this);
 }
 foreach (HsWidgetData data, datas) {
 HsWidgetHost *widget = new HsWidgetHost(data.id);
-mWidgets.append(widget);
+if (!widget->loadPresentation(Qt::Horizontal) &&
-connectWidget(widget);
+!widget->loadPresentation(Qt::Vertical)) {
 widget->setPage(this);
-widget->setParentItem(this);
+widget->visual()->hide();
-widget->startWidget(isDefaultPage());
+connectWidget(widget);
-}
+mNewWidgets << widget;
+}
-connect(HsScene::mainWindow(),
+else {
+mWidgets.append(widget);
+connectWidget(widget);
+widget->setPage(this);
+widget->visual()->setParentItem(this->visual());
+widget->startWidget(isDefaultPage());
+}
+}
+connect(HsGui::instance(),
 SIGNAL(orientationChanged(Qt::Orientation)),
 SLOT(onOrientationChanged(Qt::Orientation)));
 return true;
 }
 return false;
 }
 connectWidget(widgetHost);
 mWidgets << widgetHost;
-widgetHost->setParentItem(this);
+widgetHost->visual()->setParentItem(visual());
 return true;
 }
 /*!
 return false;
 }
 disconnectWidget(widgetHost);
 mWidgets.removeOne(widgetHost);
-widgetHost->setParentItem(0);
+widgetHost->visual()->setParentItem(0);
 return true;
 }
 /*!
 }
 if (mNewWidgets.contains(widgetHost)) {
 return true;
 }
-HsWidgetPresentationData presentation;
+widgetHost->setPage(this);
-QPointF adjustedWidgetPos = adjustedWidgetPosition(widgetHost->geometry());
-presentation.orientation = HsScene::orientation();
+widgetHost->visual()->hide();
-if (!widgetHost->getPresentation(presentation)) {
-presentation.orientation = HsScene::orientation();
-presentation.setPos(adjustedWidgetPos);
-presentation.zValue = 0;
-widgetHost->savePresentation(presentation);
-}
-widgetHost->hide();
-widgetHost->setPos(adjustedWidgetPos);
-widgetHost->setZValue(presentation.zValue);
 connectWidget(widgetHost);
 mNewWidgets << widgetHost;
 return true;
 {
 if (mNewWidgets.isEmpty()) {
 return;
 }
-HsPageNewWidgetLayout *newWidgetLayout = static_cast<HsPageNewWidgetLayout *>(layout());
+HsPageNewWidgetLayout *newWidgetLayout = static_cast<HsPageNewWidgetLayout *>(visual()->layout());
 if (!newWidgetLayout) {
 newWidgetLayout = new HsPageNewWidgetLayout(mTouchPoint);
-setLayout(newWidgetLayout);
+visual()->setLayout(newWidgetLayout);
 }
 updateZValues();
 HsWidgetHost *widget = 0;
 for (int i = 0; i < mNewWidgets.count(); ++i) {
 widget = mNewWidgets.at(i);
 newWidgetLayout->addItem(widget);
 widget->setPage(this);
-widget->setParentItem(this);
+widget->visual()->setParentItem(visual());
 widget->showWidget();
-widget->show();
+widget->visual()->show();
 }
 mWidgets << mNewWidgets;
 mNewWidgets.clear();
 }
 Clears new widgets list and resets layout.
 */
 void HsPage::resetNewWidgets()
 {
 mNewWidgets.clear();
-setLayout(0);
+visual()->setLayout(0);
 }
 /*!
 Remove page and all it's contained widgets from database
 */
 bool HsPage::deleteFromDatabase()
 {
+HsWidgetHostVisual *visual(0);
 foreach (HsWidgetHost *widget, mWidgets) {
+visual = widget->visual();
+visual->setParent(0);
+if (visual->scene()) {
+visual->scene()->removeItem(visual);
+}
 widget->remove();
 }
 mWidgets.clear();
 foreach (HsWidgetHost *widget, mNewWidgets) {
+visual = widget->visual();
+visual->setParent(0);
+if (visual->scene()) {
+visual->scene()->removeItem(visual);
+}
 widget->remove();
 }
 mNewWidgets.clear();
 foreach (HsWidgetHost *widget, mUnavailableWidgets) {
+visual = widget->visual();
+visual->setParent(0);
+if (visual->scene()) {
+visual->scene()->removeItem(visual);
+}
 widget->remove();
 }
 mUnavailableWidgets.clear();
 if (mWallpaper) {
 /*!
 Returns rect of rectangular where widgets are allowed to be placed in the page.
 */
 QRectF HsPage::contentGeometry()
 {
-return contentGeometry(HsScene::mainWindow()->orientation());
+return contentGeometry(HsGui::instance()->orientation());
 }
 /*!
 Returns rect of rectangular where widgets are allowed to be placed in the page.
 */
 QRectF HsPage::contentGeometry(Qt::Orientation orientation)
 {
-QRectF pageRect = HsScene::mainWindow()->layoutRect();
+QRectF pageRect = HsGui::instance()->layoutRect();
-if (orientation != HsScene::orientation()) {
+if (orientation != HsGui::instance()->orientation()) {
 qreal width = pageRect.width();
 qreal height = pageRect.height();
 pageRect.setWidth(height);
 pageRect.setHeight(width);
 }
 /*!
 Returns rect of rectangular where widgets are allowed to be placed in the page.
 */
 QRectF HsPage::contentRect()
 {
-return contentRect(HsScene::mainWindow()->orientation());
+return contentRect(HsGui::instance()->orientation());
 }
 /*!
 Returns rect of rectangular where widgets are allowed to be placed in the page.
 */
 QRectF rect = contentGeometry(orientation);
 rect.moveTopLeft(QPointF(0,0));
 return rect;
 }
+HsPageVisual *HsPage::visual() const
+{
+return mPageVisual;
+}
 /*!
 Calls onShow() for contained widgets.
 */
 void HsPage::showWidgets()
 {
 foreach (HsWidgetHost *widget, mWidgets) {
-if (widget->parentItem() == this) {
+if (widget->visual()->parentItem() == visual()) {
 widget->showWidget();
 }
 }
 }
 Calls onHide() for contained widgets.
 */
 void HsPage::hideWidgets()
 {
 foreach (HsWidgetHost *widget, mWidgets) {
-if (widget->parentItem() == this) {
+if (widget->visual()->parentItem() == visual()) {
 widget->hideWidget();
 }
 }
 }
 int z = 0;
 if (!mWidgets.isEmpty()) {
 QMultiMap<qreal, HsWidgetHost *> map;
 foreach (HsWidgetHost *widget, mWidgets) {
-map.insert(widget->zValue(), widget);
+map.insert(widget->visual()->zValue(), widget);
 }
 QList<HsWidgetHost *> sortedWidgets = map.values();
 HsWidgetHost *activeWidget = HsScene::instance()->activeWidget();
 sortedWidgets.removeOne(activeWidget);
 sortedWidgets.append(activeWidget);
 }
 foreach (HsWidgetHost *widget, sortedWidgets) {
-widget->setZValue(z++);
+widget->visual()->setZValue(z++);
 widget->savePresentation();
 }
 }
 if (!mNewWidgets.isEmpty()) {
 foreach (HsWidgetHost *widget, mNewWidgets) {
-widget->setZValue(z++);
+widget->visual()->setZValue(z++);
 widget->savePresentation();
 }
 }
 }
 /*!
 return HsScene::instance()->pages().indexOf(this);
 }
 /*!
 Create touch area for page.
 */
-void HsPage::setupTouchArea()
+/*void HsPage::setupTouchArea()
 {
 mTouchArea = new HsPageTouchArea(this);
 mTouchArea->setZValue(-1);
-}
+}*/
 /*!
 Utility to connect widget signals to page.
 */
 void HsPage::connectWidget(HsWidgetHost *widget)
 {
 connect(widget, SIGNAL(finished()), SLOT(onWidgetFinished()));
 connect(widget, SIGNAL(faulted()), SLOT(onWidgetFaulted()));
-connect(widget, SIGNAL(resized()), SLOT(onWidgetResized()));
+connect(widget->visual(), SIGNAL(resized()), SLOT(onWidgetResized()));
 connect(widget, SIGNAL(available()), SLOT(onWidgetAvailable()));
 connect(widget, SIGNAL(unavailable()), SLOT(onWidgetUnavailable()));
 }
 /*!
 Disconnect widget signals from page
 */
 void HsPage::disconnectWidget(HsWidgetHost *widget)
 {
+widget->visual()->disconnect(this);
 widget->disconnect(this);
 }
 /*!
 Disconnect and remove widget
 */
 // It can be in new widget list if we haven't layouted it yet
 // or layouted new widget and widget list
 if (!mNewWidgets.removeOne(widget)) {
 mWidgets.removeOne(widget);
 }
+if (widget){
+HsWidgetHostVisual *visual = widget->visual();
+visual->setParentItem(0);
+if (visual->scene()) {
+visual->scene()->removeItem(visual);
+}
+}
 disconnectWidget(widget);
 widget->remove();
 }
 /*!
 Calculates new widget position on page when widget size changes. If page has layout then there are new widgets
 and we use layout to calculate new widget positions.
 */
 void HsPage::onWidgetResized()
 {
-if ( !layout() ) {
+if (!visual()->layout()) {
-HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
+HsWidgetHostVisual *widgetVisual = qobject_cast<HsWidgetHostVisual *>(sender());
-widget->setPos(adjustedWidgetPosition(widget->geometry()));
+widgetVisual->setPos(adjustedWidgetPosition(widgetVisual->geometry()));
 } else {
-layout()->invalidate();
+visual()->layout()->invalidate();
 }
 }
 /*!
 Show widget if it came available
 */
 void HsPage::onWidgetAvailable()
 {
 HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
+HsWidgetHostVisual *widgetVisual(widget->visual());
 mUnavailableWidgets.removeOne(widget);
 mWidgets.append(widget);
-widget->setParentItem(this);
+widgetVisual->setParentItem(visual());
 widget->startWidget(isActivePage());
-widget->show();
+widgetVisual->show();
 }
 /*!
 Update internal bookkeeping and hide widget
 */
 void HsPage::onWidgetUnavailable()
 {
 HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
+HsWidgetHostVisual *widgetVisual(widget->visual());
 if (mWidgets.contains(widget)) {
 mWidgets.removeOne(widget);
 } else if (mNewWidgets.contains(widget)) {
 mNewWidgets.removeOne(widget);
 return;
 }
 mUnavailableWidgets.append(widget);
-widget->hide();
+widgetVisual->hide();
-widget->setParentItem(0);
+widgetVisual->setParentItem(0);
 }
 /*!
 Run positioning algorithm for widgets which don't have position on
 target orientation. Otherwise set orientation positions for widgets.
 QRectF from = contentGeometry(orientationFrom);
 QRectF to = contentGeometry(orientation);
 HsWidgetPresentationData presentation;
 presentation.orientation = orientation;
+HsWidgetHostVisual *visual(0);
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+QList<HsWidgetHost*> newWidgets;
+#endif //HSWIDGETORGANIZER_ALGORITHM
 foreach (HsWidgetHost *widget, mWidgets) {
+visual = widget->visual();
 if (!widget->getPresentation(presentation)) {
+#ifndef HSWIDGETORGANIZER_ALGORITHM
 QList<QRectF> geometries = converter->convert(
-from, QList<QRectF>() << widget->geometry(), to);
+from, QList<QRectF>() << visual->geometry(), to);
-widget->setGeometry(geometries.first());
+visual->setGeometry(geometries.first());
 widget->savePresentation();
+#else //HSWIDGETORGANIZER_ALGORITHM
+newWidgets << widget;
+#endif //HSWIDGETORGANIZER_ALGORITHM
 } else {
 QRectF adjustWidgetPosition;
-adjustWidgetPosition = widget->geometry();
+adjustWidgetPosition = visual->geometry();
 adjustWidgetPosition.moveTopLeft(presentation.pos());
-widget->setPos(adjustedWidgetPosition(adjustWidgetPosition));
+visual->setPos(adjustedWidgetPosition(adjustWidgetPosition));
-widget->setZValue(presentation.zValue);
+visual->setZValue(presentation.zValue);
 widget->savePresentation(); //Needed to follow pageMargin dynamic change
 }
 }
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+// sort new widgets in order
+if (newWidgets.count()) {
+// TODO: read from configuration? or just use height for portrait and width for landscape (currently only height is used)
+sortOrder order(height);
+if(orientation == Qt::Horizontal) {
+order = width;
+}
+sortWidgets(order, newWidgets);
+// get rects for new widgets
+QList<QRectF> newRects;
+foreach (HsWidgetHost *newWidget, newWidgets) {
+newRects << QRectF(QPointF(), newWidget->visual()->preferredSize());
+}
+// get page rect
+QRectF pageRect = contentGeometry();
+// scan existing widgets rects
+QList<QRectF> existingRects;
+foreach (HsWidgetHost *widget, mWidgets) {
+if (!newWidgets.contains(widget)) {
+existingRects << QRectF(widget->visual()->pos(), widget->visual()->preferredSize());
+}
+}
+// calculate new widget positions with "stuck 'em all"-algorithm
+HsWidgetPositioningOnWidgetAdd *algorithm =
+HsWidgetPositioningOnWidgetAdd::instance();
+QList<QRectF> calculatedRects =
+algorithm->convert(pageRect, existingRects, newRects, QPointF());
+for ( int i=0; i<newWidgets.count(); i++) {
+int j = mWidgets.indexOf(newWidgets.at(i));
+mWidgets.at(j)->visual()->setGeometry(calculatedRects.at(i));
+mWidgets.at(j)->savePresentation();
+}
+}
+#endif //HSWIDGETORGANIZER_ALGORITHM
 }
 void HsPage::onPageMarginChanged(const QString &value)
 {
 if (value == "pageMargin") {
 mPageMargin = HSCONFIGURATION_GET(pageMargin);
+HsWidgetHostVisual *visual(0);
 if (!mWidgets.isEmpty()) {
 foreach (HsWidgetHost *widget, mWidgets) {
-widget->setPos(adjustedWidgetPosition(widget->geometry()));
+visual = widget->visual();
+visual->setPos(adjustedWidgetPosition(visual->geometry()));
 widget->savePresentation();
 }
 }
 if (!mNewWidgets.isEmpty()) {
 foreach (HsWidgetHost *widget, mNewWidgets) {
-widget->setPos(adjustedWidgetPosition(widget->geometry()));
+visual = widget->visual();
+visual->setPos(adjustedWidgetPosition(visual->geometry()));
 widget->savePresentation();
 }
 }
 }
 }
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+// TODO: sorting should be done in algorithm class, make widget<->rect mapping here and move sortWidgets function to algorithm side
+/*!
+Sorts widgets in height/width order
+*/
+void HsPage::sortWidgets(sortOrder order, QList<HsWidgetHost*> &widgets)
+{
+QList<HsWidgetHost*> tmpWidgets;
+for ( int i = 0; i < widgets.count(); i++) {
+int index = 0;
+// add first widget to sorted list
+if (i == 0) {
+tmpWidgets << widgets.at(i);
+} else {
+// go through existing widgets in the sorted list
+for ( int j = 0; j < tmpWidgets.count(); j++) {
+// sort widgets in height order
+if (order == height) {
+/* if widgets heigth is smaller on already
+existing ones in the list -> increment index
+*/
+if (widgets.at(i)->visual()->preferredHeight() <= tmpWidgets.at(j)->visual()->preferredHeight()) {
+index++;
+}
+// sort widgets in width order
+} else {
+/* if widgets width is smaller on already
+existing ones in the sorted list -> increment index
+*/
+if (widgets.at(i)->visual()->preferredWidth() <= tmpWidgets.at(j)->visual()->preferredWidth()) {
+index++;
+}
+}
+}
+// add widget to its correct index in sorted list
+tmpWidgets.insert(index, widgets.at(i));
+}
+}
+widgets = tmpWidgets;
+}
+#endif //HSWIDGETORGANIZER_ALGORITHM

changeset 69	87476091b3f5
parent 63	52b0f64eeb51
child 81	7dd137878ff8