summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/positioners.qdoc22
-rw-r--r--doc/src/declarative/qdeclarativemodels.qdoc4
-rw-r--r--doc/src/getting-started/how-to-learn-qt.qdoc4
-rwxr-xr-xdoc/src/template/style/style.css11
-rw-r--r--doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc4
5 files changed, 35 insertions, 10 deletions
diff --git a/doc/src/declarative/positioners.qdoc b/doc/src/declarative/positioners.qdoc
index ed320a1..d97acbd 100644
--- a/doc/src/declarative/positioners.qdoc
+++ b/doc/src/declarative/positioners.qdoc
@@ -53,7 +53,9 @@ graphical elements:
\section2 Column
-\floatright qml-column.png
+\div{float-right}
+\inlineimage qml-column.png
+\enddiv
\l Column items are used to vertically arrange items. The following example
uses a Column item to arrange three \l Rectangle items in an area defined
@@ -68,7 +70,9 @@ must be added to a parent Rectangle, if desired.
\section2 Row
-\floatright qml-row.png
+\div{float-right}
+\inlineimage qml-row.png
+\enddiv
\l Row items are used to horizontally arrange items. The following example
uses a Row item to arrange three rounded \l Rectangle items in an area defined
@@ -83,7 +87,9 @@ left around the edges of the horizontally centered Row item.
\section2 Grid
-\floatright qml-grid-spacing.png
+\div{float-right}
+\inlineimage qml-grid-spacing.png
+\enddiv
\l Grid items are used to place items in a grid or table arrangement.
The following example uses a Grid item to place four \l Rectangle items
@@ -102,8 +108,10 @@ at the appropriate places in the Grid definition.
\section2 Flow
-\floatright qml-flow-text1.png
-\floatright qml-flow-text2.png
+\div{float-right}
+\inlineimage qml-flow-text1.png
+\inlineimage qml-flow-text2.png
+\enddiv
\l Flow items are used to place items like words on a page, with rows or
columns of non-overlapping items.
@@ -129,7 +137,9 @@ control of spacing between items and between lines of items.
\section1 Repeaters
-\floatright qml-repeater-grid-index.png
+\div{float-right}
+\inlineimage qml-repeater-grid-index.png
+\enddiv
Repeaters create items from a template for use with positioners, using data
from a model. Combining repeaters and positioners is an easy way to lay out
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index a61b115..495b3bd 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -504,7 +504,9 @@ a Web browser.
\l ListView shows a classic list of items with horizontal or vertical placing
of items.
-\floatright qml-listview-snippet.png
+\div{float-right}
+\inlineimage qml-listview-snippet.png
+\enddiv
The following example shows a minimal ListView displaying a sequence of
numbers (using an \l{QML Data Models#An Integer}{integer as a model}).
diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index e5f1ff9..0d5fd0a 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -51,7 +51,9 @@
key overviews to deepen your understanding of Qt: The Qt \l{Object
Model} and \l{Signals and Slots}.
- \floatleft qtdemo-small.png
+ \div{float-left}
+ \inlineimage qtdemo-small.png
+ \enddiv
\section1 Getting an Overview
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 04d8c05..d623bd4 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -176,7 +176,16 @@
{
/* background-color: #E6E6E6;*/ /* disabled until further notice */
}
-
+
+ div.float-left
+ {
+ float: left; margin-right: 2em
+ }
+ div.float-right
+ {
+ float: right; margin-left: 2em
+ }
+
span.comment
{
color: #008B00;
diff --git a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
index 598cbea..e74c84c 100644
--- a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
@@ -41,7 +41,9 @@
现在您已经编写了一些小型可用的应用程序,并对 Qt 编程有更加广泛的了解。您可以直接着手做自己的项目,但我们建议您阅读以下一些关键简介以加深您对 Qt 的了解:\l{Qt Object Model}Qt 对象模型}和\l{Signals and Slots}{信号和槽}。
- \floatleft qtdemo-small.png
+ \div {float-left}
+ \inlineimage qtdemo-small.png
+ \enddiv
\section1 了解概况