aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/dialogs/plugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* remove QtQuick.Dialogs and related modulesShawn Rutledge2014-01-071-214/+0
| | | | | | | | | | | | They are being moved to the QtQuick Controls repository (see change ba9ba084124403bd8930e29d8afcea9d64b6c0b6 in qtquickcontrols). This makes it possible to use QtQuick Controls in the implementation. [ChangeLog][QtQuick][Dialogs]Moved dialog implementations from qtdeclarative module to qtquickcontrols module due to dependencies Change-Id: I76d5b71b185dd14a188ea68f18bfec61b4bf2f41 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs: check for inheriting from QApplicationShawn Rutledge2013-12-291-1/+1
| | | | | | | | | Widget-based dialogs are allowed if the application is a QApplication, but subclassing is OK too. Task-number: QTBUG-35769 Change-Id: Iec329792d7c1d85adcb1c3542444f0e92792b20b Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add missing Q_INIT_RESOURCETor Arne Vestbø2013-11-051-0/+7
| | | | | | | | | | The library needs to do Q_INIT_RESOURCE for all resources it uses internally, otherwise static linking will fail, and the user has no idea how to rectify it as the name of the missing resource is not known. Change-Id: I8ea766e63cff22bbb0c45e6125c3a07948de2274 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Replace Message attached property with gadget typesShawn Rutledge2013-11-051-2/+5
| | | | | | | | | This is a more efficient way to expose the StandardButton and StandardIcon enums. Change-Id: I9d0becf54be2a883d55c9eaeaf10b83b23e59f3c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Dialogs: use resources for QML and imagesShawn Rutledge2013-10-161-15/+42
| | | | | | | | | | | | | | | | All the qml and image files are embedded in the QtQuick.Dialogs plugin. If DefaultFileDialog.qml is missing from the installation directory, loading from resources will be enabled. Otherwise, the files will be loaded from the local path. This is analogous to change b2e5d1acb1aca93157a6d4d0a026153134f9ad01 in Qt Quick Controls: it reduces the number of files that need to be installed, but also preserves ease of debugging whenever the QML files are separately installed. Task-number: QTBUG-31565 Change-Id: Idbe6be5d818eb6a25367f2053ea52bc7ac1485bc Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Adding QtQuick.Dialogs.MessageDialogShawn Rutledge2013-09-191-1/+14
| | | | | Change-Id: Ifa3de21e6f611c24742118d6d178edbe14f243be Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add FontDialog to QtQuick.DialogsLiang Qi2013-09-181-0/+11
| | | | | | | | | | | | | As with FileDialog, it tries QPA, then QFontDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. The update of plugins.qmltypes files will be in a separate commit. Task-number: QTBUG-31852 Done-with: Shawn Rutledge <shawn.rutledge@digia.com> Change-Id: I066ebbcf44c413af26020ddf8414252b99f5218b Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* fixed warnings in dialog module when PURE_QML_ONLY is definedShawn Rutledge2013-09-171-1/+4
| | | | | | | There are a couple of unused parameters in that case. Change-Id: Ica81621e7d74474cbfa0b54c20501ecc72661c08 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-09-061-2/+1
|\ | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qv8debugservice.cpp src/qml/qml/v8/qv8engine.cpp tests/auto/quick/qquickitem/qquickitem.pro Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31
| * Fix compiler warning about unused variableKai Koehne2013-09-041-1/+1
| | | | | | | | | | Change-Id: I2dda2462170658a678a35a6fafdb5d39a8d8e9f4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Remove DIALOGS_MAJOR_MINOR define in QtQuick.Dialogs codeLiang Qi2013-07-151-10/+9
|/ | | | | | | It's unconvenient with it to extent Dialogs to multiple versions. Change-Id: I8c7059921875764dc74f80321caebfad16965a6a Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Declarative dialog improvements for the non-Window use caseShawn Rutledge2013-06-261-10/+21
| | | | | | | | | | | | | Platforms like Android and EGL don't support multiple top-level windows, so we have to avoid trying to use widget-based dialogs (because a widget dialog on top of a scene graph will result in a second window), allow the QML dialog to be an Item, and decorate it to look like a window. Task-number: QTBUG-31898 Change-Id: I9af049f3265188e8be677a05a8bc6d1699b4cd00 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Dialogs: Create directory structure for documentationCaroline Chao2013-05-281-27/+0
| | | | | Change-Id: I5245a6931606673733130b1f168fddafe8def695 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Add Qt Quick Dialogs to Qt Quick submodules listCaroline Chao2013-05-271-1/+28
| | | | | | | | And add a landing page for Qt Quick Dialogs. Change-Id: I0c2611bf5cdbf9937b4fd94228915553d8b3bb77 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Add ColorDialog to QtQuick.DialogsShawn Rutledge2013-03-181-0/+12
| | | | | | | | | As with FileDialog, it tries QPA, then QColorDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. Change-Id: I384928e1f7322bb6b867d4618d07c88c70e3cbfe Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Create common base class for declarative dialogsShawn Rutledge2013-03-151-54/+43
| | | | | | | | QQuickAbstractFileDialog inherits QQuickAbstractDialog, and so can the future platform dialog types. Also some header comment corrections. Change-Id: I86bc6d975223979c19d94a3fd70e4b5130b73f47 Reviewed-by: Liang Qi <liang.qi@digia.com>
* adding QtQuick.Dialogs, with FileDialog implementationShawn Rutledge2013-03-041-0/+140
This will obsolete the QFileDialogItem in desktop components and be available to all QtQuick applications. The QML FileDialog type is dynamically defined in the plugin by detecting which implementation will work on the current platform. Change-Id: I073c7a84bff6c02cf592dc46822a5a4b9c9bcaea Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>