summaryrefslogtreecommitdiff
path: root/src/dialogs/qquickdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix documentation issues for Qt Quick DialogsTopi Reinio2014-10-061-8/+12
| | | | | | | | | | | | | - Document clickedButton property for Dialog, MessageDialog - Update Dialog::accepted() and rejected() documentation - Remove duplicate documentation for Dialog::visible property - Update description of modality property for ColorDialog, FontDialog - Fix broken links Change-Id: I5b73ea5cbccf1ad0203351730197336e1c6e1b98 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4J-P Nurmi2014-09-181-1/+1
|\ | | | | | | | | | | | | Conflicts: src/controls/qquickmenupopupwindow.cpp Change-Id: Ibc10e7da3b3a2983c022b8973cd80cb1a7e110af
| * Dialogs: correct C++ warningsShawn Rutledge2014-09-031-1/+1
| | | | | | | | | | | | | | | | Initialization order, and mistaken use of comparison instead of assignment. Change-Id: Ic9fbcac1085d84294386311f967209a6b33f2297 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-281-32/+9
|\ \ | |/ | | | | Change-Id: I4aa5c960a03616d95f9e1d10b4c8ba222997a24d
| * Dialog: initialize enabled and clicked buttonsShawn Rutledge2014-08-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | When the dialog becomes visible, no button has been clicked yet: we are waiting for the user to do that. Failure to initialize m_clickedButton made the logic in accept() and reject() unreliable: accept() does not imply OK unless we are sure the user did not click any other button, and the same with reject() implying Cancel. Change-Id: I340c18bd0fca6cc9a7274c1063882de425444326 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Dialog: do not emit signals twice when a button is clickedShawn Rutledge2014-08-231-32/+0
| | | | | | | | | | | | | | | | | | | | buttonClicked() is public API, whereas click(button, role) is called when a button is clicked. So there is no need to have buttonClicked() connect to anything internally. Task-number: QTBUG-40613 Change-Id: I25872d532ba77b4d708a2c25b31b6064fd5da599 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-251-18/+10
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I470909ba0980db33ab551790d619c59a35978590 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Doc: Use \value command for documenting flags for QML propertiesTopi Reinio2014-08-051-29/+55
|/ | | | | | | | | | | | Replace the table structure with \value commands for documenting acceptable values for Dialog::standardButtons and MessageDialog::standardButtons properties, and remove the unnecessary \enum definitions. Task-number: QTBUG-35019 Change-Id: Ifcb9ae8b2fbe6859fae324d855a395e4d1d224c1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialog: Add missing docsShawn Rutledge2014-07-091-9/+220
| | | | | | | Also fixed a qWarning and updated example import statement. Change-Id: I873b52e297bbefe66c6c131573804eee98c40a2f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Dialogs: implementation prop renamed to contentItem; API cleanupShawn Rutledge2014-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | - contentItem is a common name for an item inside something such as a window or a flickable. We now consider it adequate API that you can directly set this to some item which you want to fill the whole dialog instead of adding an item as a child of the default property and being subject to the dialog's margins and space reservation for buttons. - contentItem MUST be an Item. Allowing the old "implementation" property to alternatively be a ready-made Window was just a hypothetical use case, but if anyone made use of that, then it would be a problem to have that kind of dialog on a GUI that cannot have windows (such as Android or EGLFS). So there's no point in having the possibility as long as we cannot emulate windows as items. - standardButtonsRightModel and standardButtonsLeftModel are implementation details so they should not be exposed as properties which Creator can discover; users shouldn't depend on them. Task-number: QTBUG-38056 Change-Id: Iefa3def314353495cfe8d1ef9f775a8e46d5bcf4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Append handler names to \qmlsignal documentationSze Howe Koh2014-03-181-0/+4
| | | | | Change-Id: I5e06bdf03ba1ba8e5fe7669f690420dc9a039129 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Replace module includes in dialogsAndrew Knight2014-03-111-0/+2
| | | | | | | | Replace a number of QtQml module inclusions with their more specific counterparts, possibly leading to decreased compilation time. Change-Id: I9b48b06e884d46c6440725a704951dc87e2e93db Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialogs: fix compiler warningShawn Rutledge2014-02-281-1/+1
| | | | | | | StandardButton is a 32-bit type again. Change-Id: I8aba4150cee169ef837891e9d72a64d48db32346 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QPlatformDialogHelper::buttonLayout returns int*Shawn Rutledge2014-02-171-1/+1
| | | | | Change-Id: Ia453bbe65fb64a7d9523e270e1b6f644d8e3a7a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QtQuick.Dialogs: added Dialog: wrapper for arbitrary contentShawn Rutledge2014-02-151-0/+271
It provides only a button box, so the application developer can supply the rest of the dialog contents. This is useful for various kinds of dialogs that prompt the user for input. [ChangeLog][QtQuickDialogs][Dialog] Dialog is a new wrapper component for dialogs with standard buttons and custom content items. Change-Id: I0434bed5f504820dc0a668cb993a94980f99852a Reviewed-by: Liang Qi <liang.qi@digia.com>
View Lorry Controller Status