diff options
Diffstat (limited to 'examples/widgets')
-rw-r--r-- | examples/widgets/doc/images/itemviews-editabletreemodel.png | bin | 32534 -> 30556 bytes | |||
-rw-r--r-- | examples/widgets/doc/images/stylesheet-pagefold.png | bin | 15989 -> 29118 bytes | |||
-rw-r--r-- | examples/widgets/doc/src/basiclayouts.qdoc | 6 | ||||
-rw-r--r-- | examples/widgets/doc/src/calendarwidget.qdoc | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/widgets/doc/images/itemviews-editabletreemodel.png b/examples/widgets/doc/images/itemviews-editabletreemodel.png Binary files differindex a151ea857f..ff6cf637a1 100644 --- a/examples/widgets/doc/images/itemviews-editabletreemodel.png +++ b/examples/widgets/doc/images/itemviews-editabletreemodel.png diff --git a/examples/widgets/doc/images/stylesheet-pagefold.png b/examples/widgets/doc/images/stylesheet-pagefold.png Binary files differindex 5ccb4edbc9..d1358f326b 100644 --- a/examples/widgets/doc/images/stylesheet-pagefold.png +++ b/examples/widgets/doc/images/stylesheet-pagefold.png diff --git a/examples/widgets/doc/src/basiclayouts.qdoc b/examples/widgets/doc/src/basiclayouts.qdoc index 01bcaa8c1a..e9d7cea21b 100644 --- a/examples/widgets/doc/src/basiclayouts.qdoc +++ b/examples/widgets/doc/src/basiclayouts.qdoc @@ -67,11 +67,11 @@ In the constructor, we first use the \c createMenu() function to create and populate a menu bar and the \c createHorizontalGroupBox() function to create a group box containing four buttons with a - horizontal layout. Next we use the \c createGridGroupBox() function + horizontal layout. Next, we use the \c createGridGroupBox() function to create a group box containing several line edits and a small text editor which are displayed in a grid layout. Finally, we use the \c createFormGroupBox() function to create a group box with - three labels and three input fields: a line edit, a combo box and + three labels and three input fields: a line edit, a combo box, and a spin box. \snippet layouts/basiclayouts/dialog.cpp 1 @@ -111,7 +111,7 @@ \snippet layouts/basiclayouts/dialog.cpp 4 We use the QBoxLayout::addWidget() function to add the widgets to - the end of layout. Each widget will get at least its minimum size + the end of the layout. Each widget will get at least its minimum size and at most its maximum size. It is possible to specify a stretch factor in the \l {QBoxLayout::addWidget()}{addWidget()} function, and any excess space is shared according to these stretch diff --git a/examples/widgets/doc/src/calendarwidget.qdoc b/examples/widgets/doc/src/calendarwidget.qdoc index eaf8f547da..c04fab1fc7 100644 --- a/examples/widgets/doc/src/calendarwidget.qdoc +++ b/examples/widgets/doc/src/calendarwidget.qdoc @@ -110,8 +110,8 @@ size hints of its contents widgets. To ensure that the window isn't automatically resized every time - we change a property of the QCalendarWidget (e.g., hiding the - navigation bar, trhe vertical header, or the grid), we set the + we change a property of the QCalendarWidget (for example, hiding the + navigation bar, the vertical header, or the grid), we set the minimum height of row 0 and the minimum width of column 0 to the initial size of the QCalendarWidget. @@ -126,8 +126,8 @@ the formatting specified by the user. The \c createGeneralOptionsGroupBox() function is somewhat large - and several widgets are set up the same way; we look at parts of - its implementation here and skip the rest: + and several widgets are set up in the same way. We will look at + parts of its implementation here and skip the rest: \snippet widgets/calendarwidget/window.cpp 10 \dots @@ -146,7 +146,7 @@ \snippet widgets/calendarwidget/window.cpp 11 \dots - After creating the widgets, we connect the signals and slots. We + After having created the widgets, we connect the signals and slots. We connect the comboboxes to private slots of \c Window or to public slots provided by QComboBox. |