summaryrefslogtreecommitdiffstats
path: root/src/widgets/doc/src/widgets-and-layouts
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2012-09-27 15:11:55 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-11 02:47:23 +0200
commitdd8fd13f3f056fcae2ab6b7bee11c18b55b25f5a (patch)
tree828aa41256347590667d7f9571549ccdbbc4cc8e /src/widgets/doc/src/widgets-and-layouts
parent087efb572ace9cbb864c1aab7357916cb7b0428b (diff)
Qt Widgets: Added a landing page
-Landing page which lists articles in the module, including: -Graphics View, Model/View, Style Sheet, and widget galleries -Renamed some titles and a whitespace fix. Change-Id: I84be14d9a425ef380162e9a55ce2742c6812f510 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Diffstat (limited to 'src/widgets/doc/src/widgets-and-layouts')
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/styles.qdoc18
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/widgets.qdoc2
2 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
index 4755217c9f..56801bc1d9 100644
--- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -27,7 +27,7 @@
/*!
\group appearance
- \title Widget Appearance and Style
+ \title Widget Appearance and Style-Related Classes
\brief Classes used for customizing UI appearance and style.
*/
@@ -244,7 +244,7 @@
the PM_LayoutHorizontalSpacing and PM_LayoutVerticalSpacing, which
is the way the java style does it (through QCommonStyle).
Alternatively, you can implement QStyle::layoutSpacing() and
- QStyle::layoutSpacingImplementation() if you need more control over
+ QStyle::layoutSpacingImplementation() if you need more control over
this part of the layout. In these functions you can calculate the
spacing based on control types (QSizePolicy::ControlType) for
different size policies (QSizePolicy::Policy) and also the style
@@ -253,7 +253,7 @@
\section2 Style Options
The sub-classes of QStyleOption contain all information necessary
- to style the individual elements. Style options are instantiated -
+ to style the individual elements. Style options are instantiated -
usually on the stack - and filled out by the caller of the QStyle
function. Depending on what is drawn the style will expect
different a different style option class. For example, the
@@ -538,7 +538,7 @@
details; most widgets follow the same structure as the check
boxes. We have edited the QCommonStyle code somewhat to remove
code that is not directly relevant for check box styling.
-
+
We start with a look at how QCheckBox builds it style option,
which is QStyleOptionButton for checkboxes:
@@ -839,7 +839,7 @@
As mentioned, the style calculates the size of the widgets
contents, which the widgets calculate their size hints from. In
addition, complex controls also use the style to test which
- sub-controls the mouse is over.
+ sub-controls the mouse is over.
\section2 Widget Reference
@@ -1800,7 +1800,7 @@
The setup of the style option for CE_MenuTearOff and
CE_MenuScroller also uses QStyleOptionMenuItem; they only set the
\c menuRect variable in addition to the common settings with
- QStyleOption's \l{QStyleOption::}{initFrom()}.
+ QStyleOption's \l{QStyleOption::}{initFrom()}.
\section3 Menu Bar
@@ -1845,7 +1845,7 @@
QStyleOptionFrame is used for drawing the panel frame The
\l{QStyleOptionFrame::}{lineWidth} is set to PM_MenuBarPanelWidth.
The \l{QStyleOptionFrame::}{midLineWidth} is currently always set
- to 0.
+ to 0.
\section3 Item View Headers
@@ -2048,7 +2048,7 @@
\li shape
\li a QRubberBand::Shape enum value that holds the
shape of the band (which is either a rectangle or a
- line)
+ line)
\endtable
\section3 Dock Widgets
@@ -2068,7 +2068,7 @@
from its main window (i.e., it is a top level window). If it is
docked it draws the indicator dock widget resize handle. We show a
dock widget in both docked and floating state in the plastique
- style:
+ style:
\image javastyle/dockwidgetimage.png
diff --git a/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc b/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
index f7032fb81c..38e7eb6929 100644
--- a/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
@@ -57,7 +57,7 @@
and the layout distributes the available space accordingly.
\table
- \row
+ \row
\li \image qgridlayout-with-5-children.png
\li \image qformlayout-with-6-children.png
\endtable