aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* QtQuick.Dialogs FileDialog: default mode is ExistingFileShawn Rutledge2014-01-031-0/+1
| | | | | | | | | Previously did not sync the mode with the state of the selectExisting property on construction. Task-number: QTBUG-35877 Change-Id: Ifb630fb51c463025ec2f6a1932714f354552c234 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick ColorDialog: ensure slider rotation takes effectShawn Rutledge2013-12-301-0/+5
| | | | | | Task-number: QTBUG-35206 Change-Id: Ia6b4f743cd9bea937eb891ddd16776f975d42bcd Reviewed-by: Jan Arve Sæther <jan-arve.saether@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>
* QtQuick Dialogs: don't use native windows on iOSShawn Rutledge2013-12-161-1/+3
| | | | | | | | | It makes more sense to show the dialogs as items in the scene rather than as undecorated windows. Task-number: QTBUG-35561 Change-Id: I2fb29ed8eeb999b99829a9d5ffc088f401d5d602 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs MessageDialog docsShawn Rutledge2013-11-226-15/+203
| | | | | Change-Id: Ic229a26c395be0542409ba3e13739e55b6ffb521 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Adding FontDialog type to group "dialogs".Jerome Pasion2013-11-131-0/+1
| | | | | | | | | -needed for FontDialog to show up in the landing page. Task-number: QTBUG-33360 Change-Id: Ic3ea5722e963045704e81a673ebd85770c0253a3 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update .qmltypes files for 5.2Alan Alpert2013-11-121-4/+520
| | | | | | | | Task-number: QTBUG-34601 Change-Id: Icf5bdc2ea66b9a13186de957d5ae9c8701b481c7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QtQuick.Dialogs: hide internal functions and propertiesShawn Rutledge2013-11-122-75/+74
| | | | | | | | with double-underscores Change-Id: If397bfaf50e0878516296eb4237bcf012eb8dae4 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* MessageDialog: handle clicked(button, role) signal properlyShawn Rutledge2013-11-083-3/+45
| | | | | | | | | | Depends on I7be753080794adabb784df9b95ac04aa1c29151c in qtbase. Now the Android native dialog can provide the same functionality as the QML and QMessageBox implementations. Change-Id: Icc9c610669742199d48497096524f6cf8ed4d835 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* DefaultMessageDialog: use gadget StandardButton typeShawn Rutledge2013-11-081-36/+36
| | | | | | | | Followup to e17ae3b8b716b00c7cb6156347101f2e789dbd58 : Message.Ok etc. are no longer available. Change-Id: I30fc054fc6ace7dc48951739c88f49db2291a7a9 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: Ie23c3748fbe780fa00f98404238099809df5ef06 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@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-053-17/+16
| | | | | | | | | 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>
* QtQuick.Dialogs DefaultFontDialog: visual improvementsShawn Rutledge2013-10-311-329/+334
| | | | | | | | | | | | | Layout is taller and less wide, by putting weight, style and sample below the other list views. It's more resolution-independent and looks reasonable by default on Android. Renamed Others to Style. Made column headings bold. Text in selected ListItem delegates are in a contrasting color. Delegates are taller so they are easier to select by touch. Task-number: QTBUG-34157 Change-Id: Ia0c96c8556835d689d3c2fd5e2c0d34e421aff76 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs DefaultFileDialog: visual improvementsShawn Rutledge2013-10-301-4/+5
| | | | | | | | Make spacing of controls consistent with the other dialogs. It was too conservative for high-resolution displays anyway. Change-Id: I095d0c8f136b6692cc9c4ac01db748dbef205867 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs MessageDialog: use Flow for button layoutShawn Rutledge2013-10-301-7/+18
| | | | | | | | | | | On mobile platforms the dialog can have more buttons than horizontal space to show them, so it's better to let them wrap around to ensure they are all visible. But Flow does not try to maximize its implicitWidth, so we have to calculate it at the right time before showing the dialog. Change-Id: I5667aa90539f291ae040f2e125abc2dea968f9ac Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs: fake window decoration clips, is opaque for touchShawn Rutledge2013-10-301-0/+3
| | | | | | | | | | | This is the wrapper for dialogs on platforms that don't have top-level windows. Mouse events over any unused area in the dialog would fall through to the surrounding mouse area and close the dialog. Now they don't. Clipping is enabled to ensure that dialog contents don't overflow the "window" frame. Change-Id: Ia3c0ae44bb47d46981daac9febd4cc93228dd20f Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs: handle more keyboard shortcutsShawn Rutledge2013-10-305-42/+129
| | | | | | | | | | | The Back button on Android should close the dialog, but there is a bug that Qt only receives the release, not the press. Otherwise Esc should do the same, Enter should accept, it should be possible to copy the text from the MessageDialog, copy colors to and from the ColorDialog, etc. Change-Id: Ib4d4c58cde9f4bb00ce3d46e2f9ea1aad9d52bb0 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs: resolution-independent controls use actual resolutionShawn Rutledge2013-10-263-5/+6
| | | | | | | | logicalPixelDensity ended up hard-coded on Android, which made the buttons and the FileDialog too small again. Change-Id: Ic1805246c4466d7167d422ba48ae5ec37978d332 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 00:23:34 +0000