diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-09-30 12:32:10 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-09-30 13:10:17 +0000 |
| commit | b749f0041d14234083d150e48d273f08c4b1d253 (patch) | |
| tree | a78f94953561d43d0eec78275ff32e2ae1e65729 /src/quicktemplates2/qquickbutton.cpp | |
| parent | be668040b31488ca8e3d8bad10b6bead2bc74491 (diff) | |
Button: add GIFs for flat & highlighted docs
This also removes the state table in the detailed description,
since we have GIFs now.
Change-Id: I4503b67478051eb872f46127da6718092d77d4ff
Task-number: QTBUG-55904
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickbutton.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickbutton.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp index 901f730d..fc34aba4 100644 --- a/src/quicktemplates2/qquickbutton.cpp +++ b/src/quicktemplates2/qquickbutton.cpp @@ -57,17 +57,6 @@ QT_BEGIN_NAMESPACE a question. Typical buttons are \e OK, \e Apply, \e Cancel, \e Close, \e Yes, \e No, and \e Help. - \table - \row \li \image qtquickcontrols2-button-normal.png - \li A button in its normal state. - \row \li \image qtquickcontrols2-button-pressed.png - \li A button that is pressed. - \row \li \image qtquickcontrols2-button-focused.png - \li A button that has active focus. - \row \li \image qtquickcontrols2-button-disabled.png - \li A button that is disabled. - \endtable - A button emits the signal \l {AbstractButton::}{clicked()} when it is activated by the user. Connect to this signal to perform the button's action. Buttons also provide the signals \l {AbstractButton::}{canceled()}, \l {AbstractButton::}{doubleClicked()}, \l {AbstractButton::}{pressed()}, @@ -160,6 +149,8 @@ QFont QQuickButton::defaultFont() const This property holds whether the button is highlighted. + \image qtquickcontrols2-button-highlighted.gif + A button can be highlighted in order to draw the user's attention towards it. It has no effect on keyboard interaction. @@ -186,6 +177,8 @@ void QQuickButton::setHighlighted(bool highlighted) This property holds whether the button is flat. + \image qtquickcontrols2-button-flat.gif + A flat button typically does not draw a background unless it is pressed or checked. The default value is \c false. |