Update the examples to the new QGraphicsListView changes.

7 files changed, 25 insertions, 20 deletions

diff --git a/examples/chat/chatview.cpp b/examples/chat/chatview.cpp
index fb4d265..1a59a92 100644
--- a/examples/chat/chatview.cpp
+++ b/examples/chat/chatview.cpp
@@ -60,7 +60,7 @@ void ChatViewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
     const qreal line = QFontMetrics(chatView->font()).height();
     painter->save();
     painter->setPen(Qt::gray);
-    painter->drawText(QRectF(0, 0, size().width(), line), Qt::AlignCenter, nick);
+    painter->drawText(QRectF(0, 0, geometry().width(), line), Qt::AlignCenter, nick);
     painter->restore();
 
     QRectF rect = option->rect.adjusted(0, line, 0, 0);
@@ -72,7 +72,7 @@ void ChatViewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
     painter->drawText(rect, Qt::AlignCenter|Qt::TextWordWrap, text);
 }
 
-QSizeF ChatViewItem::sizeHint(int index, const QStyleOptionViewItemV4 *option, Qt::SizeHint which, const QSizeF &constraint) const
+QSizeF ChatViewItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     switch (which) {
         case Qt::MinimumSize:
@@ -80,16 +80,16 @@ QSizeF ChatViewItem::sizeHint(int index, const QStyleOptionViewItemV4 *option, Q
             const ChatView *chatView = qobject_cast<ChatView*>(view());
             static const QSizeF padding(chatView->borders().sourceLeftBorder + chatView->borders().sourceRightBorder,
                                          chatView->borders().sourceTopBorder + chatView->borders().sourceBottomBorder);
-            const QSizeF content = QtGraphicsListViewItem::sizeHint(index, option, which, constraint);
+            const QSizeF content = QtGraphicsListViewItem::sizeHint(which, constraint);
             const qreal height = padding.height() + content.height() + QFontMetrics(chatView->font()).height();
-            return QSizeF(size().width(), height);
+            return QSizeF(geometry().width(), height);
         }
         case Qt::MaximumSize:
             return QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
         default:
             break;
     }
-    return QtGraphicsListViewItem::sizeHint(index, option, which, constraint);
+    return QtGraphicsListViewItem::sizeHint(which, constraint);
 }
 
 ChatView::ChatView(QGraphicsWidget *parent, Qt::WindowFlags wFlags)
@@ -122,7 +122,7 @@ void ChatView::itemsInserted(int index, int count)
 {
     for (int i = 0; i < count; ++i) {
         if (ChatViewItem *item = static_cast<ChatViewItem*>(itemForIndex(index + i)))
-            item->startAnimation(QPointF(0, size().height() + item->size().height()), item->pos());
+            item->startAnimation(QPointF(0, geometry().height() + item->geometry().height()), item->pos());
     }
 }
 
diff --git a/examples/chat/chatview.h b/examples/chat/chatview.h
index b23a374..4875d7d 100644
--- a/examples/chat/chatview.h
+++ b/examples/chat/chatview.h
@@ -38,7 +38,7 @@ public:
     ChatViewItem(int index, QtGraphicsListView *view);
     void startAnimation(const QVariant &start, const QVariant &end);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget=0);
-    QSizeF sizeHint(int index, const QStyleOptionViewItemV4 *option, Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
 private:
     QPropertyAnimation *m_animation;
 };
diff --git a/examples/examples.pro b/examples/examples.pro
index 29d22a8..f6994f3 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -9,11 +9,11 @@ SUBDIRS = \
           treeAdaptor \
           gridView \
           pathView \
-          iconList \
-          spreadsheet \
+          # iconList \
+          # spreadsheet \
 
 
-!contains(DEFINES, QT_NO_PRINTER) SUBDIRS += printing
+# !contains(DEFINES, QT_NO_PRINTER) SUBDIRS += printing
 
 exists($$QMAKE_INCDIR_QT/QtCore/qeasingcurve.h) {
     SUBDIRS += \
diff --git a/examples/listModel/listModel.pro b/examples/listModel/listModel.pro
index 6ebed11..598fd49 100644
--- a/examples/listModel/listModel.pro
+++ b/examples/listModel/listModel.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = listModel
 include (../examples.pri)
+CONFIG += debug
 
 HEADERS += model.h
 SOURCES += main.cpp \
diff --git a/examples/listModel/model.cpp b/examples/listModel/model.cpp
index 3be8314..d18da24 100644
--- a/examples/listModel/model.cpp
+++ b/examples/listModel/model.cpp
@@ -44,7 +44,7 @@ QHash<int,QVariant> Model::data(int index, const QList<int> &roles) const
     if (index >= 0 && index < strings.count())
         for (int i = 0; i < roles.count(); ++i)
             if (roles.at(i) == Qt::DisplayRole)
-                hash.insert(Qt::DisplayRole, strings.at(index));
+                hash.insert(Qt::DisplayRole, strings.at(index) + QString::number(index));
     return hash;
 }
 
diff --git a/examples/photoAlbum/main.cpp b/examples/photoAlbum/main.cpp
index de13e70..47d53db 100644
--- a/examples/photoAlbum/main.cpp
+++ b/examples/photoAlbum/main.cpp
@@ -48,11 +48,11 @@ QSizeF Photo::sizeHint(int index, const QStyleOptionViewItemV4 *option, Qt::Size
     Q_UNUSED(constraint);
     switch (which) {
         case Qt::MinimumSize:
-            return QSizeF(1, 1);
+            return QSizeF(50, 50);
         case Qt::PreferredSize:
-            return view()->size().boundedTo(constraint);
+            return QSizeF(640, 480);//view()->size().boundedTo(constraint);
         case Qt::MaximumSize:
-            return constraint;
+            return QSizeF(640, 480);//qvariant_cast<QPixmap>(data().value(Qt::DecorationRole)).size();
         default:
             break;
     }
@@ -159,7 +159,9 @@ void ViewTransition::onTransition(QEvent *event)
             m_to->setOffsetToEnsureIndexIsVisible(index); // ### FIXME center on item
             m_to->doLayout(); // ensure the item is layed out
             qobject_cast<QtKineticListController*>(m_to->controller())->stop();
-            m_animation->setTargetObject(m_to->itemForIndex(index));
+            //qDebug() << "to" << ((QObject*)m_to->itemForIndex(index)) << index;
+            //qDebug() << "from" << ((QObject*)m_from->itemForIndex(index)) << index;
+            m_animation->setTargetObject(reinterpret_cast<QObject*>(m_to->itemForIndex(index)));
             m_animation->setStartValue(m_from->itemGeometry(index));
             m_animation->setEndValue(m_to->itemGeometry(index));
         }
@@ -224,6 +226,7 @@ int main(int argc, char *argv[])
     listController->setCenterOnItemEnabled(true);
 
     QtGraphicsGridView *gridView = new QtGraphicsGridView(4, Qt::Vertical);
+    //QtGraphicsListView *gridView = new QtGraphicsListView();
     QtKineticListController *gridController = new QtKineticListController(&widget);
 
     gridView->setItemCreator(new QtGraphicsListViewItemCreator<Photo>());
@@ -256,7 +259,7 @@ int main(int argc, char *argv[])
 
     stateMachine.addState(listState);
     stateMachine.addState(gridState);
-    stateMachine.setInitialState(listState);
+    stateMachine.setInitialState(gridState);
     stateMachine.start();
 
     // run
diff --git a/examples/photoAlbum/photoAlbum.qrc b/examples/photoAlbum/photoAlbum.qrc
index b63b8fc..696a364 100644
--- a/examples/photoAlbum/photoAlbum.qrc
+++ b/examples/photoAlbum/photoAlbum.qrc
@@ -1,10 +1,11 @@
 <RCC>
-    <qresource prefix="/" >
+    <qresource prefix="/">
         <file>images/background.jpg</file>
-        <file>images/go.jpg</file>
+        <file>images/beach.jpg</file>
         <file>images/contrast.jpg</file>
-        <file>images/nightfall.jpg</file>
+        <file>images/film_frame.jpg</file>
         <file>images/flower.jpg</file>
-        <file>images/beach.jpg</file>
+        <file>images/go.jpg</file>
+        <file>images/nightfall.jpg</file>
     </qresource>
 </RCC>