summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/declarative/fx/qfxborderimage.h2
-rw-r--r--src/declarative/fx/qfxcomponentinstance.h3
-rw-r--r--src/declarative/fx/qfxflickable.h31
-rw-r--r--src/declarative/fx/qfxflipable.h2
-rw-r--r--src/declarative/fx/qfxfocusscope.h1
-rw-r--r--src/declarative/fx/qfxkeyproxy.h2
-rw-r--r--src/declarative/fx/qfxloader.h6
-rw-r--r--src/declarative/fx/qfxrepeater.h5
-rw-r--r--src/declarative/fx/qfxwebview.cpp1
-rw-r--r--src/declarative/fx/qfxwebview.h31
-rw-r--r--tests/auto/declarative/qmlparser/FailingComponent.qml5
11 files changed, 54 insertions, 35 deletions
diff --git a/src/declarative/fx/qfxborderimage.h b/src/declarative/fx/qfxborderimage.h
index c6885fb..7d29fc8 100644
--- a/src/declarative/fx/qfxborderimage.h
+++ b/src/declarative/fx/qfxborderimage.h
@@ -79,7 +79,7 @@ public:
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
void setSource(const QUrl &url);
-signals:
+Q_SIGNALS:
void tileModeChanged();
protected:
diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h
index 940fb6d..f2d3f9d 100644
--- a/src/declarative/fx/qfxcomponentinstance.h
+++ b/src/declarative/fx/qfxcomponentinstance.h
@@ -50,6 +50,9 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+//### remove
+//### add component property to Loader
+
class QFxComponentInstancePrivate;
class Q_DECLARATIVE_EXPORT QFxComponentInstance : public QFxItem
{
diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h
index 4fcaf44..4f5fb6a 100644
--- a/src/declarative/fx/qfxflickable.h
+++ b/src/declarative/fx/qfxflickable.h
@@ -56,26 +56,31 @@ class Q_DECLARATIVE_EXPORT QFxFlickable : public QFxItem
Q_OBJECT
Q_PROPERTY(bool overShoot READ overShoot WRITE setOverShoot)
- Q_PROPERTY(int viewportWidth READ viewportWidth WRITE setViewportWidth NOTIFY viewportWidthChanged)
+ Q_PROPERTY(int viewportWidth READ viewportWidth WRITE setViewportWidth NOTIFY viewportWidthChanged) //### qreal
Q_PROPERTY(int viewportHeight READ viewportHeight WRITE setViewportHeight NOTIFY viewportHeightChanged)
- Q_PROPERTY(qreal xPosition READ xPosition WRITE setXPosition NOTIFY positionChanged)
- Q_PROPERTY(qreal yPosition READ yPosition WRITE setYPosition NOTIFY positionChanged)
+ Q_PROPERTY(qreal xPosition READ xPosition WRITE setXPosition NOTIFY positionChanged) //### viewportX, positionXChannged
+ Q_PROPERTY(qreal yPosition READ yPosition WRITE setYPosition NOTIFY positionChanged) //### ^^^
+
+ Q_PROPERTY(int velocityDecay READ velocityDecay WRITE setVelocityDecay NOTIFY velocityDecayChanged) //### qreal deceleration
+ Q_PROPERTY(int maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity) ///### qreal, use same units as follow (pixels/s)
+
+ Q_PROPERTY(qreal xVelocity READ xVelocity NOTIFY velocityChanged) //### horizontalVelocity
+ Q_PROPERTY(qreal yVelocity READ yVelocity NOTIFY velocityChanged) //### verticalVelocity
Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged)
Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged)
- Q_PROPERTY(int velocityDecay READ velocityDecay WRITE setVelocityDecay NOTIFY velocityDecayChanged)
- Q_PROPERTY(int maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity)
- Q_PROPERTY(bool locked READ isLocked WRITE setLocked)
- Q_PROPERTY(DragMode dragMode READ dragMode WRITE setDragMode)
- Q_PROPERTY(qreal xVelocity READ xVelocity NOTIFY velocityChanged)
- Q_PROPERTY(qreal yVelocity READ yVelocity NOTIFY velocityChanged)
+
+ Q_PROPERTY(bool locked READ isLocked WRITE setLocked) //### interactive, ensure flicking is stopped, etc.
+ Q_PROPERTY(DragMode dragMode READ dragMode WRITE setDragMode) //### remove. Consider a better way to implement different drag behaviour
+
Q_PROPERTY(bool atXEnd READ isAtXEnd NOTIFY isAtBoundaryChanged)
Q_PROPERTY(bool atYEnd READ isAtYEnd NOTIFY isAtBoundaryChanged)
Q_PROPERTY(bool atXBeginning READ isAtXBeginning NOTIFY isAtBoundaryChanged)
Q_PROPERTY(bool atYBeginning READ isAtYBeginning NOTIFY isAtBoundaryChanged)
- Q_PROPERTY(qreal pageXPosition READ pageXPosition NOTIFY pageChanged)
- Q_PROPERTY(qreal pageYPosition READ pageYPosition NOTIFY pageChanged)
- Q_PROPERTY(qreal pageWidth READ pageWidth NOTIFY pageChanged)
- Q_PROPERTY(qreal pageHeight READ pageHeight NOTIFY pageChanged)
+
+ Q_PROPERTY(qreal pageXPosition READ pageXPosition NOTIFY pageChanged) //### visibleArea.xPosition
+ Q_PROPERTY(qreal pageYPosition READ pageYPosition NOTIFY pageChanged) //### visibleArea.yPosition
+ Q_PROPERTY(qreal pageWidth READ pageWidth NOTIFY pageChanged) //### visibleArea.widthRatio
+ Q_PROPERTY(qreal pageHeight READ pageHeight NOTIFY pageChanged) //### visibleArea.heightRatio
Q_PROPERTY(QmlList<QObject *>* flickableData READ flickableData)
Q_PROPERTY(QmlList<QFxItem *>* flickableChildren READ flickableChildren)
diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h
index 0ab8fd2..3c5df3b 100644
--- a/src/declarative/fx/qfxflipable.h
+++ b/src/declarative/fx/qfxflipable.h
@@ -62,6 +62,8 @@ class Q_DECLARATIVE_EXPORT QFxFlipable : public QFxItem
Q_PROPERTY(QFxItem *front READ front WRITE setFront)
Q_PROPERTY(QFxItem *back READ back WRITE setBack)
Q_PROPERTY(Side side READ side NOTIFY sideChanged)
+ //### flipAxis
+ //### flipRotation
public:
QFxFlipable(QFxItem *parent=0);
~QFxFlipable();
diff --git a/src/declarative/fx/qfxfocusscope.h b/src/declarative/fx/qfxfocusscope.h
index 28a6e30..e337fc6 100644
--- a/src/declarative/fx/qfxfocusscope.h
+++ b/src/declarative/fx/qfxfocusscope.h
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+//### set component root as focusscope
class Q_DECLARATIVE_EXPORT QFxFocusScope : public QFxItem
{
Q_OBJECT
diff --git a/src/declarative/fx/qfxkeyproxy.h b/src/declarative/fx/qfxkeyproxy.h
index e77ffac..d5f8c7c 100644
--- a/src/declarative/fx/qfxkeyproxy.h
+++ b/src/declarative/fx/qfxkeyproxy.h
@@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
+//### move to Keys attached property as Keys.forwardTo
+
class QFxKeyProxyPrivate;
class Q_DECLARATIVE_EXPORT QFxKeyProxy : public QFxItem
{
diff --git a/src/declarative/fx/qfxloader.h b/src/declarative/fx/qfxloader.h
index f11d116..9acd336 100644
--- a/src/declarative/fx/qfxloader.h
+++ b/src/declarative/fx/qfxloader.h
@@ -56,7 +56,11 @@ class Q_DECLARATIVE_EXPORT QFxLoader : public QFxItem
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
- Q_PROPERTY(QFxItem *item READ item)
+ Q_PROPERTY(QFxItem *item READ item) //### NOTIFY itemChanged
+ //### sourceItem
+ //### sourceComponent
+ //### status, progress
+ //### resizeMode { NoResize, SizeLoaderToItem (default), SizeItemToLoader }
public:
QFxLoader(QFxItem *parent=0);
diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qfxrepeater.h
index 7fa914e..0ec9a42 100644
--- a/src/declarative/fx/qfxrepeater.h
+++ b/src/declarative/fx/qfxrepeater.h
@@ -55,9 +55,10 @@ class Q_DECLARATIVE_EXPORT QFxRepeater : public QFxItem
{
Q_OBJECT
- Q_PROPERTY(QVariant dataSource READ dataSource WRITE setDataSource)
- Q_PROPERTY(QmlComponent *component READ component WRITE setComponent)
+ Q_PROPERTY(QVariant dataSource READ dataSource WRITE setDataSource) //### model
+ Q_PROPERTY(QmlComponent *component READ component WRITE setComponent) //### delegate
Q_CLASSINFO("DefaultProperty", "component")
+ //### count
public:
QFxRepeater(QFxItem *parent=0);
virtual ~QFxRepeater();
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 7247837..72f5c18 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -68,6 +68,7 @@ static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system
class QFxWebSettings : public QObject {
Q_OBJECT
/*
+ ### Add these
StandardFont,
FixedFont,
SerifFont,
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index 40c86b4..4d59995 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -77,6 +77,10 @@ private:
class QFxWebViewAttached;
class QFxWebSettings;
+//### TODO: new web "windows" (popups)
+//### TODO: browser plugins
+//### TODO: smart zooming using e.g. DIV
+
class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem
{
Q_OBJECT
@@ -85,25 +89,26 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem
Q_PROPERTY(QPixmap icon READ icon NOTIFY iconChanged)
Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
- Q_PROPERTY(QString status READ status NOTIFY statusChanged)
+ Q_PROPERTY(QString status READ status NOTIFY statusChanged) //### statusText
- Q_PROPERTY(int mouseX READ mouseX)
+ Q_PROPERTY(int mouseX READ mouseX) //### remove and find way to handle double clicking
Q_PROPERTY(int mouseY READ mouseY)
Q_PROPERTY(QString html READ html WRITE setHtml)
- Q_PROPERTY(int idealWidth READ idealWidth WRITE setIdealWidth NOTIFY idealWidthChanged)
- Q_PROPERTY(int idealHeight READ idealHeight WRITE setIdealHeight NOTIFY idealHeightChanged)
- Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize)
- Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
+ Q_PROPERTY(int idealWidth READ idealWidth WRITE setIdealWidth NOTIFY idealWidthChanged) //### widthHint
+ Q_PROPERTY(int idealHeight READ idealHeight WRITE setIdealHeight NOTIFY idealHeightChanged) //### heightHint
+ Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize) //### remove
+ Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) //### change immediately
Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+ //### status
- Q_PROPERTY(bool interactive READ interactive WRITE setInteractive NOTIFY interactiveChanged)
+ Q_PROPERTY(bool interactive READ interactive WRITE setInteractive NOTIFY interactiveChanged) //### Really needed here??
- Q_PROPERTY(QObject* reload READ reloadAction CONSTANT)
- Q_PROPERTY(QObject* back READ backAction CONSTANT)
- Q_PROPERTY(QObject* forward READ forwardAction CONSTANT)
- Q_PROPERTY(QObject* stop READ stopAction CONSTANT)
+ Q_PROPERTY(QObject* reload READ reloadAction CONSTANT) //### QAction
+ Q_PROPERTY(QObject* back READ backAction CONSTANT) //### QAction
+ Q_PROPERTY(QObject* forward READ forwardAction CONSTANT) //### QAction
+ Q_PROPERTY(QObject* stop READ stopAction CONSTANT) //### QAction
Q_PROPERTY(QFxWebSettings* settings READ settingsObject CONSTANT)
@@ -181,7 +186,7 @@ Q_SIGNALS:
void statusChanged();
void zoomFactorChanged();
- void loadStarted();
+ void loadStarted(); //### document with \qmlsignal
void loadFinished();
void loadFailed();
@@ -189,7 +194,7 @@ Q_SIGNALS:
void doubleClick();
public Q_SLOTS:
- QVariant evaluateJavaScript (const QString&);
+ QVariant evaluateJavaScript(const QString&);
private Q_SLOTS:
void expandToWebPage();
diff --git a/tests/auto/declarative/qmlparser/FailingComponent.qml b/tests/auto/declarative/qmlparser/FailingComponent.qml
deleted file mode 100644
index 1c01e3d..0000000
--- a/tests/auto/declarative/qmlparser/FailingComponent.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import Qt 4.6
-
-Object {
- a: 10
-}
generated by cgit v0.12 at 2024-10-22 03:14:15 (GMT)