aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickdialogbuttonbox_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Fix enum warningsMitch Curtis2018-08-231-15/+4
| | | | | | | | | | | | | QPlatformDialogHelper's meta-object is added to QQuickDialogButtonBox's meta-object as a related meta object, and all of its enums are merged into the same namespace by the QML engine. This produces a conflict with the enum values of the ButtonLayout in QQuickDialogButtonBox, which is a duplicate of the one that's already pulled in. Fixes: QTBUG-70141 Task-number: QTBUG-70141 Change-Id: Ib33dc8ddbe8aa80d03183eb23861658c9e978f04 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Move buttonLayoutChange() signal to the correct placeJ-P Nurmi2018-04-251-0/+2
| | | | | | | | | It was accidentally moved from QQuickDialogButtonBox to QQuickContainer when the contentWidth and contentHeight properties were promoted in commit 086dc431. Change-Id: Iffc41cb1f28f00f99cfdffa3626234a45997f91d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Promote contentWidth and contentHeight to QQuickContainerJ-P Nurmi2018-04-111-14/+0
| | | | | | | | | | Now we have contentWidth and contentHeight promoted/unified to QQuickPane and QQuickContainer, and all relevant types inherit the properties from there. The next step is to promote read-only versions all the way up to the QQuickControl base class. Change-Id: Ic6ed5d7b7852b0c7faaa59b9a261c360bc63fb6a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* DialogButtonBox: add contentWidth and contentHeightJ-P Nurmi2018-04-101-0/+12
| | | | | | | | | | | | | | This is a follow-up to f1f884d3, which mentioned that: This can be fixed properly in dev by providing separate contentWidth and contentHeight properties that cleanly propagate the content size to QML. [ChangeLog][Controls][DialogButtonBox] Added contentWidth and contentHeight properties. Change-Id: I4b53702568c55d666bccb587af9fe8c8eba0b63d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add DialogButtonBox::buttonLayoutJ-P Nurmi2018-02-171-0/+22
| | | | | | | | [ChangeLog][Controls][DialogButtonBox] Added buttonLayout property that can be used to arrange the buttons. Change-Id: I9160e5df86a0c9444b45ed9f585c50166c145671 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Re-order revision 3 members and add explanatory commentsJ-P Nurmi2017-11-061-4/+4
| | | | | | | | | | | | We've come to realize that even though it's tempting to group similar properties together, organizing the API so that revisions are grouped together makes future maintenance more pleasant. It's a lot easier to to see what was added and when. The same was done for earlier revisions in 5.9 in commit 430fe83. Change-Id: I738d7fdadd348c21737228c37d0f31e39b37f8e7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickDialogButtonBox: add missing signalsJ-P Nurmi2017-05-191-0/+3
| | | | | | | | | | | There were no convenience signals for Apply, Reset, and Discard. [ChangeLog][Controls][DialogButtonBox] Added missing applied(), reset(), and discarded() signals. Task-number: QTBUG-59423 Change-Id: I49ccc60672fadf64283ff3a6e043c3892cd291ba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Port from QT_NO_ACCESSIBILITY to QT_CONFIG(accessibility)J-P Nurmi2017-02-241-1/+1
| | | | | Change-Id: I03deebff661746d49e537af5b1c8899b938efb0d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Welcome to 2017J-P Nurmi2017-01-091-1/+1
| | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove DialogButtonBox::flatJ-P Nurmi2016-06-301-5/+0
| | | | | | | | | | | | The Material Design allows mixing standard flat buttons with non-flat custom buttons. It is enough that the delegate provides flat standard buttons by default. It is better to not force all buttons to be flat, but let the user freely specify whether custom buttons are flat. This API has not yet been released, so it is still safe to remove. Change-Id: Iec400553ccefb47f20fb98d64919491d9bb27cbe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add DialogButtonBoxJ-P Nurmi2016-06-151-0/+160
[ChangeLog][Controls] Added DialogButtonBox to provide convenience for handling dialog buttons. DialogButtonBox is able to create a set of standard buttons with a single line of QML code, and provides convenient accepted() and rejected() signals. Task-number: QTBUG-51090 Change-Id: I9b3c6ba1b2836dadf9a2ac9086be1eba214e7c4d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>