aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* QtQuick.Dialogs: deploy qml files only for debug buildsShawn Rutledge2013-10-171-2/+5
| | | | | | | | | | QML_FILES are installed with the qml plugin they belong to. This is helpful for debugging, but redundant because the same QML is also packaged as resources (after 8780af05b1bc63aa71c3a318972465ffdb830070). Task-number: QTBUG-31565 Change-Id: I0b277b62b48e0a742f3ef2ff6ee2a81cc071295e Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Dialogs: use resources for QML and imagesShawn Rutledge2013-10-162-15/+64
| | | | | | | | | | | | | | | | 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>
* QtQuick.Dialogs: on single-window platforms, don't resize the windowShawn Rutledge2013-10-151-1/+4
| | | | | | | | | | | | m_dialogWindow only needs to be set if the dialog has its own window, because otherwise setters such as QQuickAbstractDialog::setHeight (introduced in 37492efee021ccc6e550ecb67a3240b76eb2219e) will result in reshaping the main application window instead of the dialog. Also the window decoration's translucent "veil" should expand to fit the whole application. Change-Id: I16fdb48c54dbc5e758dfec1f18063579ac2bbb05 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add classnames for QML import plugins.Morten Johan Sørvig2013-10-141-0/+1
| | | | | | | | | Needed for static builds. qmlimportscanner will read the "plugin" and "classname" entries. Change-Id: I31939451366ad3e771d516ac426525c8bcdba57d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* qdoc: Added excludedirs to qtquickdialogs.qdocconfMartin Smith2013-10-101-0/+2
| | | | | | | | | Added excludedirs += ../qml to qtquickdialogs.qdocconf. Task-number: QTBUG-33966 Change-Id: I08a74061ed82301712239bc0979ed6fcea0a2448 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Made \since command in Dialog QML types consistent.Jerome Pasion2013-09-253-3/+3
| | | | | | | | -QDoc only requires the version number for Qt versions Task-number: QTBUG-32172 Change-Id: Ifa3a94fa66194807d58b079b4f451af90cc1d00a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Adding QtQuick.Dialogs.MessageDialogShawn Rutledge2013-09-1919-4/+1375
| | | | | Change-Id: Ifa3de21e6f611c24742118d6d178edbe14f243be Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add FontDialog to QtQuick.DialogsLiang Qi2013-09-1813-2/+1413
| | | | | | | | | | | | | 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>
* rerun qmlplugindump for QtQuick.Dialogs, now including QML typesShawn Rutledge2013-09-181-14/+29
| | | | | | | Task-number: QTBUG-33106 Change-Id: Ib2ee0563f423bf7fe1d5990c621c46950f81516a Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Qt Quick Dialogs: can see and control geometry of QML implementationsShawn Rutledge2013-09-172-13/+50
| | | | | | | | | | | QQuickAbstractDialog had x/y/width/height properties already but they didn't do anything. It's still not possible with the native dialogs because neither QPlatformDialogHelper nor QFileDialogOptions etc. have any geometric properties; but the application author can now see and control the geometry of any QML dialog implementation. Change-Id: Icdac9592c72e81175436436027f7fe3d75ff7f42 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add currentColor property to ColorDialog.Mitch Curtis2013-09-174-22/+54
| | | | | | | | | | | | QColorDialog has this property. This patch effectively means that the color property will be set when the dialog closes, instead of whenever the current color in the dialog changes, so pressing cancel will revert the color to what it was before the dialog was opened. [ChangeLog][QtDeclarative][ColorDialog] Added currentColor property. Change-Id: I2ef6b32954342cd2469cf1552d53f9e2fbf3420b 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>
* Allow QtQuick private headers to be used with QT_NO_KEYWORDS.Jocelyn Turcotte2013-09-121-1/+1
| | | | | | | | | | | This is necessary for the QtWebEngine module. This also adds an empty nokeywords test using the same mechanism as qtbase/tests/auto/tools/moc/no-keywords.h to find conflicts at compile time. Change-Id: I9df541720797dd61f078178c2af68ead18ff8bfe Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* DefaultColorDialog bugfix: binding color to a TextFieldShawn Rutledge2013-09-121-1/+1
| | | | | | | | The text field shows the hex value of the currently selected color, but the color to string conversion is not implicit. Change-Id: I914033d6358696b4014ca48bf3ae435c98b5be33 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>
* | QQuickPlatformFileDialog: fix directoryEntered() signal connectionJ-P Nurmi2013-08-271-1/+1
| | | | | | | | | | | | Task-number: QTBUG-33008 Change-Id: I8c4d06bb9dded7b894ca576efd0a64dce9f9a720 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-192-3/+8
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquickgridview/qquickgridview.pro tests/auto/quick/qquickitem/qquickitem.pro Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
| * QtQuick.Dialogs.ColorDialog: set current color in the QColorDialogShawn Rutledge2013-07-311-0/+5
| | | | | | | | | | | | | | | | | | It was a missing feature to set the current color programmatically, either before or after showing the dialog. Task-number: QTBUG-32621 Change-Id: I62a811f7c36eaab5356c5924bf3447deca55ada3 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Make buttons and tabs larger in QML examples and dialogsShawn Rutledge2013-07-291-3/+3
| | | | | | | | | | | | Task-number: QTBUG-32578 Change-Id: Ic89058abc55e5e079f44862986b2132114456147 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-052-8/+27
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557
| * Keep the QML ColorDialog's controls in sync with the color propertyShawn Rutledge2013-07-252-7/+26
| | | | | | | | | | | | | | | | | | | | Until now, the user could change the color by dragging the crosshairs or the sliders, but if the application set the color property, it did not programmatically move the crosshairs and sliders. Task-number: QTBUG-32545 Change-Id: Idd54e711400dfd78d570161297559f9521c1d67f Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Correct initial/minimum size of default QML ColorDialogShawn Rutledge2013-07-251-1/+1
| | | | | | | | | | | | Change-Id: Idd53d9c7246b17a9159faec06a7ce6c6355cd09f Task-number: QTBUG-32572 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | More QUrl/QString conversion in FileDialog implementationShawn Rutledge2013-08-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Followup to 6499098a04c7a8a1193413500cd562f781df38bb : because the signals in QPlatformFileDialogHelper emit URLs and QFileDialog does not provide compatible signals, the bridge class QFileDialogHelper must provide slots to convert strings to URLs and emit the signals. Therefore QFileDialogHelper needs the Q_OBJECT macro, and therefore it helps to move its declaration to the private header to avoid confusing moc. Change-Id: I088ff73d107a460af3f8695401276b45a66b5d59 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | FolderListModel provides file URLs and the QML FileDialog uses themShawn Rutledge2013-07-231-3/+2
| | | | | | | | | | | | | | | | | | This saves a conversion step in the FileDialog and rounds out the FolderListModel API. Task-number: QTBUG-32039 Change-Id: I63bc54cb91673aafba08d0d9f132073c129f0c18 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | QtQuick.Dialogs: use URLs for interface with QPlatformFileDialogHelperShawn Rutledge2013-07-221-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | Depends on f5dbc876378ae58a7bdfe1e9664fc81caca18dfb and 5069e203d7aff7fb49bf746071f66bfd41c1ae89 Reverts commits 17ded06804576dfde1b19f82f168f7ceb09ec92c and and d9751bc29d2f80b86eb237226ce832bf2e372f1d Change-Id: Ibe2347f3b57e4e569bc4966735e9623dfd274628 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Disable dialogs to allow changes in qtbase (use urls internally)Shawn Rutledge2013-07-181-0/+5
| | | | | | | | | | | | | | | | Followup to I9ae09416acdbe437acbe9672d0ecfc42059695ae so qtbase change I61e99d498252241f38ec05724702a90ba050c4bb can get through CI. Change-Id: I8bf3bca9b2a3b00b2471045cdc73f20329f99d9d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-0420-107/+248
|\| | | | | | | Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933
| * FileDialog.folder property should also be a QUrl, for consistencyv5.1.0-rc2v5.1.0Shawn Rutledge2013-06-2810-40/+42
| | | | | | | | | | | | | | | | | | | | In QtQuick we never use plain file paths, because URL is more general. Also use const references for string and URL setters, and fixed the dependency between the FolderListModel's folder, the field for editing it, and the folder property of the AbstractFileDialog. Change-Id: I6e965b80b73d4eb2473712a4f4d4f816b768d802 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * QtQuick.Dialogs: sync the docs with the implementationShawn Rutledge2013-06-274-26/+20
| | | | | | | | | | | | | | | | | | | | We've been using URLs instead of strings for some time now, just forgot to change the docs until now. Task-number: QTBUG-31847 Change-Id: I49a42282aeefb95e4d367397e2f290f4af65687e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Declarative dialog improvements for the non-Window use caseShawn Rutledge2013-06-2610-41/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Doc: Setting navigation variables for Qt Quick DialogsJerome Pasion2013-06-261-0/+3
|/ | | | | | | | -for the navigation bar Change-Id: I0971406e531e515b6afebacc0fe847c51f175d3b Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fixed QCH listings for Qt QML and Qt Quick DialogsJerome Pasion2013-06-061-2/+1
| | | | | | | | | Qt QML: added QML types page as a child in the list Qt Quick Dialogs: "manual" as type taken out Change-Id: I95d77b7582a0f5729801e1e6fb8f5f3242a0b760 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fix various problems in Qt Quick Dialogs documentationTopi Reinio2013-05-291-18/+20
| | | | | | | | | | | | | | | | | This change fixes the following things in .qdocconf: - CamelCase for project name (required for generating valid tags in example manifest file). - Proper selector for QML Types topic - Fix exampledirs to not pull in all the Qt Quick examples - Add examplesinstallpath to make Qt Creator see the examples Also fixes the paths in example docs according to changed exampledirs. Change-Id: If18f7b5a3160d85814d508e1cbfb7bdb1a002c54 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialogs: Create directory structure for documentationCaroline Chao2013-05-285-27/+131
| | | | | Change-Id: I5245a6931606673733130b1f168fddafe8def695 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Add Qt Quick Dialogs to Qt Quick submodules listCaroline Chao2013-05-273-3/+30
| | | | | | | | 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>
* qtdeclarative: update .qmltypes, and use -notrelocatable optionFawzi Mohamed2013-04-241-15/+65
| | | | | | | | this should fix some bugs in the code support due to incorrec/outdated meta info Change-Id: I90925daa5376ebdfb9a6f9d73103893065c15d64 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Get rid of warning Module 'QtQuick.Dialogs'...cannot be protected...Shawn Rutledge2013-03-191-0/+1
| | | | | | | | | | | After I86bc6d975223979c19d94a3fd70e4b5130b73f47 it's possible for qmldir to have the module declaration again. The reason it was absent was that src/imports/dialogs/plugin.cpp was registering new types in initializeEngine. Change-Id: I6b28a3b97df7f7817cfdc1e745c4ce6f048302f1 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add ColorDialog to QtQuick.DialogsShawn Rutledge2013-03-1818-1/+1272
| | | | | | | | | 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>
* Cosmetic changes in DefaultFileDialog and dialog shared controlsShawn Rutledge2013-03-186-61/+40
| | | | | | | | | Implementation of the button for QML-based dialogs matches the one for QML examples. The button and the text field use system palette colors, as does the file dialog. Change-Id: Ibf45d57bdab8799ae6aa69ba543c0e05c55b01d3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Create common base class for declarative dialogsShawn Rutledge2013-03-1514-327/+576
| | | | | | | | 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>
* correct misspellingShawn Rutledge2013-03-121-1/+1
| | | | | | | Canceled Change-Id: Ie080e5be4af0cf60cab56e906f82fb6e7b32c6e3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* adding QtQuick.Dialogs, with FileDialog implementationShawn Rutledge2013-03-0419-0/+1927
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 20:23:24 +0000