summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxgridview.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/fx/qfxgridview.h')
-rw-r--r--src/declarative/fx/qfxgridview.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h
index 4ebd311..996141f 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qfxgridview.h
@@ -60,12 +60,12 @@ class Q_DECLARATIVE_EXPORT QFxGridView : public QFxFlickable
Q_PROPERTY(QVariant model READ model WRITE setModel)
Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate)
Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
- Q_PROPERTY(QFxItem *current READ currentItem NOTIFY currentIndexChanged)
+ Q_PROPERTY(QFxItem *currentItem READ currentItem NOTIFY currentIndexChanged)
Q_PROPERTY(int count READ count NOTIFY countChanged)
Q_PROPERTY(QmlComponent *highlight READ highlight WRITE setHighlight)
- Q_PROPERTY(bool autoHighlight READ autoHighlight WRITE setAutoHighlight)
+ Q_PROPERTY(bool highlightFollowsCurrentItem READ highlightFollowsCurrentItem WRITE setHighlightFollowsCurrentItem)
Q_PROPERTY(Flow flow READ flow WRITE setFlow)
- Q_PROPERTY(bool wrap READ isWrapEnabled WRITE setWrapEnabled)
+ Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled)
Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer)
Q_PROPERTY(int cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellSizeChanged)
Q_PROPERTY(int cellHeight READ cellHeight WRITE setCellHeight NOTIFY cellSizeChanged)
@@ -90,8 +90,8 @@ public:
QmlComponent *highlight() const;
void setHighlight(QmlComponent *highlight);
- bool autoHighlight() const;
- void setAutoHighlight(bool);
+ bool highlightFollowsCurrentItem() const;
+ void setHighlightFollowsCurrentItem(bool);
Q_ENUMS(Flow)
enum Flow { LeftToRight, TopToBottom };
@@ -130,6 +130,7 @@ private Q_SLOTS:
void trackedPositionChanged();
void itemsInserted(int index, int count);
void itemsRemoved(int index, int count);
+ void itemsMoved(int from, int to, int count);
void destroyRemoved();
void createdItem(int index, QFxItem *item);
void destroyingItem(QFxItem *item);