FCL/sf/mw/hgwidgets: comparison ganeswidgets/src/HgContainer.cpp

equal deleted inserted replaced

-:c863538fcbb6
+:4fa04caf0f43
 */
 #include <QGesture>
 #include <QPainter>
 #include <QTimer>
-#include <hbgridviewitem>
+#include <HbMainWindow>
-#include <hbmainwindow>
+#include "HgContainer.h"
-#include "hgcontainer.h"
 #include "hgmediawallrenderer.h"
 #include "hgquad.h"
 #include "hgvgquadrenderer.h"
 #include "hgvgimage.h"
 #include "hgwidgetitem.h"
 #include "trace.h"
-//#include <hbstyleoptioncheckbox.h>
+#include <HbCheckBox>
-//#include <hbcheckbox>
+#include <HbGridViewItem>
-#include <hbgridviewitem>
+#include <HbGridView>
-#include <hbgridview>
+#include <HbIconItem>
-#include <hbiconitem>
+#include <QAbstractItemModel>
-#include <qabstractitemmodel>
+#include <HbTapGesture>
-#include <hbtapgesture>
 #include "hglongpressvisualizer.h"
 static const qreal KSpringKScrolling(50.0);
 static const qreal KSpringKScrollBar(10.0);
 static const qreal KSpringDampingScrolling(20.0);
 FUNC_LOG;
 mOrientation = orientation;
 mRenderer->setOrientation(orientation);
 mRenderer->setScrollDirection(orientation, animate);
-if (!mSpring.isActive() && mSpring.pos().x() > worldWidth())
+if (mSpring.isActive()) {
-boundSpring();
+// Need to stop scrolling.
+mSpring.cancel();
+}
 }
 void HgContainer::scrollToPosition(qreal value, bool animate)
 {
 FUNC_LOG;
 int HgContainer::flags(int index) const
 {
 if (index >= 0 && index < itemCount()) {
 if (mSelectionMode != HgWidget::NoSelection) {
-// TODO, fix these returns values when we can use the checkbox indicators.
 if (mSelectionModel && mSelectionModel->isSelected(mSelectionModel->model()->index(index, 0))) {
 return 1; // TODO: Assign flag to mark indicator
 } else
-return 0;
+return 2;
 }
 }
 return 0;
 }
 void HgContainer::gestureEvent(QGestureEvent *event)
 {
 FUNC_LOG;
+if (mItems.count() == 0) {
+// we have no items so no need to handle the gesture.
+event->ignore();
+return;
+}
 bool eventHandled(false);
 // Event may contain more than one gesture type
 HbTapGesture *tap = 0;
 if (QGesture *gesture = event->gesture(Qt::TapGesture)) {
 tap = static_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
 mRenderer = createRenderer(scrollDirection);
 mOrientation = scrollDirection;
 mQuadRenderer = mRenderer->getRenderer();
-QImage markImage(":/images/mark.svg");
+// Fetch icons for marking mode (on and off states).
-if (markImage.isNull()) {
-ERROR("Failed to load :/images/mark.svg");
-}
 mMarkImageOn = mQuadRenderer->createNativeImage();
-HANDLE_ERROR_NULL(mMarkImageOn);
-if (mMarkImageOn) {
-mMarkImageOn->setImage(markImage);
-}
-/*    mMarkImageOn = mQuadRenderer->createNativeImage();
 HANDLE_ERROR_NULL(mMarkImageOn);
 mMarkImageOff = mQuadRenderer->createNativeImage();
 HANDLE_ERROR_NULL(mMarkImageOff);
-// Fetch icons for marking mode (on and off states).
+// Since there is no way to create the icons directly currently
-QGraphicsItem* checkBox = style()->createPrimitive(HbStyle::P_CheckBox_icon, this);
+// lets create HbCheckBox and ask primitives from it.
-HbIconItem* iconItem = static_cast<HbIconItem*>(checkBox);
+HbCheckBox* checkBox = new HbCheckBox();
-HbStyleOptionCheckBox checkBoxOption;
+checkBox->setCheckState(Qt::Checked);
-checkBoxOption.state = QStyle::State_On;
+QGraphicsItem *icon = checkBox->HbWidget::primitive("icon");
-style()->updatePrimitive(iconItem, HbStyle::P_CheckBox_icon, &checkBoxOption);
+HbIconItem *iconItem = 0;
+if (icon) {
-if (mMarkImageOn) {
+iconItem = static_cast<HbIconItem*>(icon);
-mMarkImageOn->setPixmap(iconItem->icon().pixmap());
+if (mMarkImageOn) {
-}
+mMarkImageOn->setPixmap(iconItem->icon().pixmap());
+}
-checkBoxOption.state = QStyle::State_Off;
+}
-style()->updatePrimitive(iconItem, HbStyle::P_CheckBox_icon, &checkBoxOption);
+checkBox->setCheckState(Qt::Unchecked);
-if (mMarkImageOff) {
+icon = checkBox->HbWidget::primitive("icon");
-mMarkImageOff->setPixmap(iconItem->icon().pixmap());
+if (icon) {
-}
+iconItem = static_cast<HbIconItem*>(icon);
+if (mMarkImageOff) {
+mMarkImageOff->setPixmap(iconItem->icon().pixmap());
+}
+}
 delete checkBox;
-*/
 connect(&mSpring, SIGNAL(updated()), SLOT(updateBySpringPosition()));
 connect(&mSpring, SIGNAL(started()), SIGNAL(scrollingStarted()));
 connect(&mSpring, SIGNAL(started()), SLOT(onScrollingStarted()));
 connect(&mSpring, SIGNAL(ended()), SIGNAL(scrollingEnded()));
 connect(&mSpring, SIGNAL(ended()), SLOT(onScrollingEnded()));
 QList<HgQuad*> quads = mRenderer->getVisibleQuads();
 QList<QModelIndex> result;
 for (int i = 0; i < quads.count(); i++) {
 bool ok;
 int index = quads.at(i)->userData().toInt(&ok);
-result.append(itemByIndex(index)->modelIndex());
+HgWidgetItem *item = itemByIndex(index);
+if (item)
+result.append(item->modelIndex());
 }
 qSort(result);
 return result;
 }
 void HgContainer::itemDataChanged(const int &firstIndex, const int &lastIndex)
 {
 FUNC_LOG;
 int firstItemOnScreen = 0, lastItemOnScreen = 0;
 firstItemOnScreen = mSpring.pos().x();
 firstItemOnScreen *= rowCount();
 int itemsOnScreen = mRenderer->getVisibleQuads().count();
 lastItemOnScreen = firstItemOnScreen+itemsOnScreen;
-if ((firstIndex >= firstItemOnScreen && firstIndex < lastItemOnScreen) ||
+if ( itemsOnScreen == 0 || (firstIndex >= firstItemOnScreen && firstIndex < lastItemOnScreen) ||
 (lastIndex >= firstItemOnScreen && lastIndex < lastItemOnScreen)) {
 update();
 }
 }
 void HgContainer::selectItem(int index)
 {
+Q_UNUSED(index)
 // TODO: replace this with own selection implementation
 /*    if (index < 0 && index >= mItems.count())
 return;
 mHitItemIndex = index;

changeset 5	4fa04caf0f43
parent 3	c863538fcbb6
child 8	15f034b8a3b5