From 8deeceb12e68dd429ee53d6ef667f1ec79bce4de Mon Sep 17 00:00:00 2001
From: Venu <venugopal.shivashankar@digia.com>
Date: Wed, 4 Jun 2014 15:20:38 +0200
Subject: Doc: Updated layouts docs with images and snippets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The images and the corresponding snippets
should help the reader understand the Quick Layouts
better.

Task-number: QTBUG-33799
Change-Id: I0a4831f33d99de87fcd7cb68a36844885509bb06
Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
---
 src/layouts/doc/images/columnlayout.png | Bin 0 -> 348 bytes
 src/layouts/doc/images/gridlayout.png   | Bin 0 -> 2530 bytes
 src/layouts/doc/images/rowlayout.png    | Bin 0 -> 2627 bytes
 src/layouts/qquicklinearlayout.cpp      |  86 ++++++++++++++++++++++++++++----
 4 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 src/layouts/doc/images/columnlayout.png
 create mode 100644 src/layouts/doc/images/gridlayout.png
 create mode 100644 src/layouts/doc/images/rowlayout.png

diff --git a/src/layouts/doc/images/columnlayout.png b/src/layouts/doc/images/columnlayout.png
new file mode 100644
index 00000000..f03eb7b9
Binary files /dev/null and b/src/layouts/doc/images/columnlayout.png differ
diff --git a/src/layouts/doc/images/gridlayout.png b/src/layouts/doc/images/gridlayout.png
new file mode 100644
index 00000000..493813c4
Binary files /dev/null and b/src/layouts/doc/images/gridlayout.png differ
diff --git a/src/layouts/doc/images/rowlayout.png b/src/layouts/doc/images/rowlayout.png
new file mode 100644
index 00000000..519a62fd
Binary files /dev/null and b/src/layouts/doc/images/rowlayout.png differ
diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp
index ea772225..2db7bee0 100644
--- a/src/layouts/qquicklinearlayout.cpp
+++ b/src/layouts/qquicklinearlayout.cpp
@@ -69,6 +69,39 @@
         \li \l{Layout::alignment}{Layout.alignment}
     \endlist
 
+    \image rowlayout.png
+
+    \code
+    RowLayout {
+        id: layout
+        anchors.fill: parent
+        spacing: 6
+        Rectangle {
+            color: 'teal'
+            Layout.fillWidth: true
+            Layout.minimumWidth: 50
+            Layout.preferredWidth: 100
+            Layout.maximumWidth: 300
+            Layout.minimumHeight: 150
+            Text {
+                anchors.centerIn: parent
+                text: parent.width + 'x' + parent.height
+            }
+        }
+        Rectangle {
+            color: 'plum'
+            Layout.fillWidth: true
+            Layout.minimumWidth: 100
+            Layout.preferredWidth: 200
+            Layout.preferredHeight: 100
+            Text {
+                anchors.centerIn: parent
+                text: parent.width + 'x' + parent.height
+            }
+        }
+    }
+    \endcode
+
     Read more about attached properties \l{QML Object Attributes}{here}.
     \sa ColumnLayout
     \sa GridLayout
@@ -98,6 +131,36 @@
         \li \l{Layout::alignment}{Layout.alignment}
     \endlist
 
+    \image columnlayout.png
+
+    \code
+    ColumnLayout{
+        spacing: 2
+
+        Rectangle {
+            Layout.alignment: Qt.AlignCenter
+            color: "red"
+            Layout.preferredWidth: 40
+            Layout.preferredHeight: 40
+        }
+
+        Rectangle {
+            Layout.alignment: Qt.AlignRight
+            color: "green"
+            Layout.preferredWidth: 40
+            Layout.preferredHeight: 70
+        }
+
+        Rectangle {
+            Layout.alignment: Qt.AlignBottom
+            Layout.fillHeight: true
+            color: "blue"
+            Layout.preferredWidth: 70
+            Layout.preferredHeight: 40
+        }
+    }
+    \endcode
+
     Read more about attached properties \l{QML Object Attributes}{here}.
 
     \sa RowLayout
@@ -114,6 +177,8 @@
     \ingroup layouts
     \brief Provides a way of dynamically arranging items in a grid.
 
+
+
     If the GridLayout is resized, all items in the layout will be rearranged. It is similar
     to the widget-based QGridLayout. All visible children of the GridLayout element will belong to
     the layout. If you want a layout with just one row or one column, you can use the
@@ -127,16 +192,19 @@
     columns the layout can have, before the auto-positioning wraps back to the beginning of the
     next row. The \l columns property is only used when \l flow is  \c GridLayout.LeftToRight.
 
+    \image gridlayout.png
+
     \code
-        GridLayout {
-            id: grid
-            columns: 3
-            Text { text: "Three" }
-            Text { text: "words" }
-            Text { text: "in" }
-            Text { text: "a" }
-            Text { text: "row" }
-        }
+    GridLayout {
+        id: grid
+        columns: 3
+
+        Text { text: "Three"; font.bold: true; }
+        Text { text: "words"; color: "red" }
+        Text { text: "in"; font.underline: true }
+        Text { text: "a"; font.pixelSize: 20 }
+        Text { text: "row"; font.strikeout: true }
+    }
     \endcode
 
     The \l rows property works in a similar way, but items are auto-positioned vertically. The \l
-- 
cgit v1.2.1