Add a layout direction example to positioners

Task-number:
Reviewed-by: Alan Alpert

11 files changed, 197 insertions, 16 deletions

diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index e03557b..be2d0c7 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -136,7 +136,8 @@ The examples can be found in Qt's \c examples/declarative directory.
 
 \section2 Positioners
 \list
-\o \l{declarative/positioners}{Example}
+\o \l{declarative/positioners/addandremove}{Adding and Removing Items}
+\o \l{declarative/positioners/layoutdirection}{Layout Direction}
 \endlist
 
 \section2 Key Interaction
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 46af110..2dc45e3 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -270,16 +270,26 @@
 */
 
 /*!
-    \title Positioners Example
-    \example declarative/positioners
+    \title Positioners: Adding and Removing Items Example
+    \example declarative/positioners/addandremove
 
-    This example shows how to use positioner elements such as \l Row, \l Column,
-    \l Grid and \l Flow.
+    This example shows how to use the positioner elements such as \l Row, \l Column,
+    \l Grid and \l Flow, in particular how to add and remove items with appropriate transitions.
 
     \image qml-positioners-example.png
 */
 
 /*!
+    \title Positioners: Layout Direction Example
+    \example declarative/positioners/layoutdirection
+
+    This example shows how to control the horizontal layout direction of 
+    \l Row, \l Grid and \l Flow positioners.
+
+    \image qml-positioners-layoutdirection-example.png
+*/
+
+/*!
     \title Key Interaction: Focus Example
     \example declarative/keyinteraction/focus
 
diff --git a/doc/src/images/qml-positioners-layoutdirection-example.png b/doc/src/images/qml-positioners-layoutdirection-example.png
new file mode 100644
index 0000000..2c42b09
--- /dev/null
+++ b/doc/src/images/qml-positioners-layoutdirection-example.png
diff --git a/examples/declarative/positioners/Button.qml b/examples/declarative/positioners/addandremove/Button.qml
index 25907c0..25907c0 100644
--- a/examples/declarative/positioners/Button.qml
+++ b/examples/declarative/positioners/addandremove/Button.qml
diff --git a/examples/declarative/positioners/add.png b/examples/declarative/positioners/addandremove/add.png
index 1ee4542..1ee4542 100644
--- a/examples/declarative/positioners/add.png
+++ b/examples/declarative/positioners/addandremove/add.png
diff --git a/examples/declarative/positioners/positioners.qml b/examples/declarative/positioners/addandremove/addandremove.qml
index 7d6d8fe..7d6d8fe 100644
--- a/examples/declarative/positioners/positioners.qml
+++ b/examples/declarative/positioners/addandremove/addandremove.qml
diff --git a/examples/declarative/positioners/positioners.qmlproject b/examples/declarative/positioners/addandremove/addandremove.qmlproject
index e526217..e526217 100644
--- a/examples/declarative/positioners/positioners.qmlproject
+++ b/examples/declarative/positioners/addandremove/addandremove.qmlproject
diff --git a/examples/declarative/positioners/del.png b/examples/declarative/positioners/addandremove/del.png
index 8d2eaed..8d2eaed 100644
--- a/examples/declarative/positioners/del.png
+++ b/examples/declarative/positioners/addandremove/del.png
diff --git a/examples/declarative/positioners/layoutdirection/layoutdirection.qml b/examples/declarative/positioners/layoutdirection/layoutdirection.qml
new file mode 100644
index 0000000..3e23b15
--- /dev/null
+++ b/examples/declarative/positioners/layoutdirection/layoutdirection.qml
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.1
+
+Rectangle {
+
+    width: column.width + 100
+    height: column.height + 100
+    property int direction: Qt.application.layoutDirection
+
+    Column {
+        id: column
+        spacing: 10
+        anchors.centerIn: parent
+        width: 230
+
+        Text {
+            text: "Row"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+        Row {
+            layoutDirection: direction
+            spacing: 10
+            move: Transition {
+                NumberAnimation {
+                    properties: "x"
+                }
+            }
+            Repeater {
+                model: 4
+                Loader {
+                    property int value: index
+                    sourceComponent: delegate
+                }
+            }
+        }        
+        Text {
+            text: "Grid"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+        Grid {
+           layoutDirection: direction
+           spacing: 10; columns: 4
+           move: Transition {
+               NumberAnimation {
+                   properties: "x"
+               }
+           }
+           Repeater {
+               model: 11
+               Loader {
+                   property int value: index
+                   sourceComponent: delegate
+               }
+            }
+        }
+        Text {
+            text: "Flow"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+        Flow {
+           layoutDirection: direction
+           spacing: 10; width: parent.width
+           move: Transition {
+               NumberAnimation {
+                   properties: "x"
+               }
+           }
+           Repeater {
+               model: 10
+               Loader {
+                   property int value: index
+                   sourceComponent: delegate
+               }
+            }
+        }
+        Rectangle {
+           height: 50; width: parent.width
+           color: mouseArea.pressed ? "black" : "gray"
+           Text {
+                text: direction ? "Right to left" : "Left to right"
+                color: "white"
+                font.pixelSize: 16
+                anchors.centerIn: parent
+            }
+            MouseArea {
+                id: mouseArea
+                onClicked: {
+                    if (direction == Qt.LeftToRight) {
+                        direction = Qt.RightToLeft;
+                    } else {
+                        direction = Qt.LeftToRight;
+                    }
+                }
+                anchors.fill: parent
+            }
+        }
+    }
+    
+    Component {
+        id: delegate
+        Rectangle {
+            width: 50; height: 50
+            color: Qt.rgba(0.8/(parent.value+1),0.8/(parent.value+1),0.8/(parent.value+1),1.0)
+            Text {
+                text: parent.parent.value+1
+                color: "white"
+                font.pixelSize: 20
+                anchors.centerIn: parent
+            }
+        }
+    }
+}
diff --git a/examples/declarative/positioners/layoutdirection/layoutdirection.qmlproject b/examples/declarative/positioners/layoutdirection/layoutdirection.qmlproject
new file mode 100644
index 0000000..e526217
--- /dev/null
+++ b/examples/declarative/positioners/layoutdirection/layoutdirection.qmlproject
@@ -0,0 +1,18 @@
+/* File generated by QtCreator */
+
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 557c88b..a2a167e 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -381,7 +381,7 @@ void QDeclarativeBasePositioner::finishApplyTransitions()
 
   Items with a width or height of 0 will not be positioned.
 
-  \sa Row, Grid, Flow, {declarative/positioners}{Positioners example}
+  \sa Row, Grid, Flow, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
     \qmlproperty Transition Column::add
@@ -421,7 +421,7 @@ void QDeclarativeBasePositioner::finishApplyTransitions()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
   \qmlproperty int Column::spacing
@@ -524,7 +524,7 @@ void QDeclarativeColumn::reportConflictingAnchors()
 
   Items with a width or height of 0 will not be positioned.
 
-  \sa Column, Grid, Flow, {declarative/positioners}{Positioners example}
+  \sa Column, Grid, Flow, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
     \qmlproperty Transition Row::add
@@ -563,7 +563,7 @@ void QDeclarativeColumn::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
   \qmlproperty int Row::spacing
@@ -591,7 +591,7 @@ QDeclarativeRow::QDeclarativeRow(QDeclarativeItem *parent)
     the right anchor remains to the right of the row.
     \endlist
 
-    \sa Grid::layoutDirection, Flow::layoutDirection
+    \sa Grid::layoutDirection, Flow::layoutDirection, {declarative/positioners/layoutdirection}{Layout directions example}
 */
 Qt::LayoutDirection QDeclarativeRow::layoutDirection() const
 {
@@ -728,7 +728,7 @@ void QDeclarativeRow::reportConflictingAnchors()
 
   Items with a width or height of 0 will not be positioned.
 
-  \sa Flow, Row, Column, {declarative/positioners}{Positioners example}
+  \sa Flow, Row, Column, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
     \qmlproperty Transition Grid::add
@@ -766,7 +766,7 @@ void QDeclarativeRow::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
   \qmlproperty int Grid::spacing
@@ -868,7 +868,7 @@ void QDeclarativeGrid::setFlow(Flow flow)
     \l Grid::flow property.
     \endlist
 
-    \sa Flow::layoutDirection, Row::layoutDirection
+    \sa Flow::layoutDirection, Row::layoutDirection, {declarative/positioners/layoutdirection}{Layout directions example}
 */
 Qt::LayoutDirection QDeclarativeGrid::layoutDirection() const
 {
@@ -1092,7 +1092,7 @@ void QDeclarativeGrid::reportConflictingAnchors()
 
   Items with a width or height of 0 will not be positioned.
 
-  \sa Column, Row, Grid, {declarative/positioners}{Positioners example}
+  \sa Column, Row, Grid, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
     \qmlproperty Transition Flow::add
@@ -1131,7 +1131,7 @@ void QDeclarativeGrid::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
   \qmlproperty int Flow::spacing
@@ -1210,8 +1210,9 @@ void QDeclarativeFlow::setFlow(Flow flow)
     \l Flow::flow property.
     \endlist
 
-    \sa Grid::layoutDirection, Row::layoutDirection
+    \sa Grid::layoutDirection, Row::layoutDirection, {declarative/positioners/layoutdirection}{Layout directions example}
 */
+
 Qt::LayoutDirection QDeclarativeFlow::layoutDirection() const
 {
     Q_D(const QDeclarativeFlow);