summaryrefslogtreecommitdiff
path: root/src/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-061-0/+2
|\ | | | | | | Change-Id: Ica2ac2d9c26eadad16509d0512817665566d829c
| * Dialog: Update the title on the window when changing it on the dialogAndy Shaw2019-03-291-0/+2
| | | | | | | | | | | | Change-Id: Id9c60bf10bc0d4fb28ee9a027b84e395e9cb745c Fixes: QTBUG-74350 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-132-2255/+340
| | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: I4e25e1bef8640c0afe21c82217da114e77ba0cf7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | DefaultFileDialog: Don't assign QQmlComponent* to QQuickItem*Ulf Hermann2019-01-241-2/+1
| | | | | | | | | | | | | | | | This used to work, but it's really, really evil. Change-Id: Icd214f7718737600b5c77cdbd72008aa61438729 Fixes: QTBUG-73223 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Fix FileDialog not working with UNC pathsMiguel Costa2018-11-071-0/+2
|/ | | | | | | | | | | | | Excluded from the Windows build a fixup for QUrl's containing too many leading '/'. The fixup was applied on calls to setFolder(const QUrl &f). It was mangling UNC (i.e. network) paths in Windows, causing QQuickFileDialog to reject them. The fixup was introduced in: 48c4c010095e851da3e58ac98514e29dff2e1262 Fixes: QTBUG-67932 Change-Id: Iaab98da9f014156c1d763a57b60ecad41be2e77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Dialogs: allow preventing processing of standard buttonsAlberto Mardegan2018-06-292-15/+76
| | | | | | | | | | | | | | | | | Add an actionChosen() signal to DefaultDialogWrapper, allowing the developer to stop further processing of the event by setting the "accepted" field to false. This is especially useful when some validation on the dialog contents need to take place before the dialog can be accepted. [ChangeLog][Dialogs] Add a signal to the Dialog class to allow the client to intercept the button presses and optionally prevent further processing of the event. This allows performing some validation on the fields before dismissing the dialog. Task-number: QTBUG-69095 Change-Id: I19bca0bd9fcbafc72d337a5870776a96634ba748 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-272-16/+2
| | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Ieb67edec480eba18cdad29f39b262cfb8839bf8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* iOS: Be more explicit about how to get access to the native image pickerAndy Shaw2018-04-161-1/+3
| | | | | Change-Id: I24c265698d118544a470ac91c54d57895544a5ac Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Do not treat winrt as touch based mobile platformv5.11.0-beta4Oliver Wolff2018-04-052-2/+2
| | | | | | | | | | | | | | | | | | | | | While winrt used to be a touch based, mobile platform before, focus has shifted. Widgets were supported from the start and while they are not the main area of focus, disallowing widget dialogs is not the right approach here. Furthermore the current logic of whether widget dialogs should be registered does not work on winrt. The parts containing widgets either have to be removed completely or bound to the same specific conditions everywhere. The mix of setting "no_desktop" and not having widget dialogs unconditionally for "mobile platforms", but then doing additional checks when registering widget dialog types breaks the concept at least for winrt. Task-number: QTBUG-67144 Change-Id: I36fc5b6f8729bbd128faf1de95fc0bba297ab0e9 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Don't conflict with Qt Quick Controls 2 when using the platform dialogsAndy Shaw2018-03-129-52/+52
| | | | | | Change-Id: I7ca87ee59c8d65537713d5d912fdb3ec5bd7dcdb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-121-1/+9
|\ | | | | | | Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-021-1/+9
| |\ | | | | | | | | | Change-Id: I556a8404b908c15eaa71b009319c7f27274b40f1
| | * Document licensesKai Koehne2018-01-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Every module should state the licenses it is available under in it's landing page. Change-Id: Ib2d5f49e57f7f34bf06a558725dcb53152561f8d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-204-7/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id56429b283aff90a18576cbd769b96fa1f0781fa
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-194-7/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/dialogs/qquickabstractfiledialog_p.h tests/auto/controls/data/tst_combobox.qml Change-Id: I62e54d0a2e89d987e05e8dfad6ae6aac1a32cc72
| | * Doc: Change wording on when module was introducedKai Koehne2018-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Change to past tense. Change-Id: I623ecbf4586b9212ceba5be15f18b0946b2de884 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Fix DefaultFileDialog binding loop warningsMitch Curtis2018-01-152-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove change signals from the shortcuts and __shortcuts properties, as they don't change after being populated for the first time. Task-number: QTBUG-53707 Change-Id: If305a6d63ebd98e6082fc5b7d89a63aaab6c1f43 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Dialogs: Fix minor memory leak in QQuickAbstractDialogJarkko Koivikko2018-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Dialogs decoration component is not an Item based object, there is a minor memory leak in error cleanup path, causing the object to leak. Change-Id: I79295378303e460ad0024d5994fed28ddd37b591 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-181-0/+2
|\ \ \ | |/ / | | | | | | Change-Id: Ie66ca17fe8ea49b3637accb468e206657346f4ab
| * | Doc: Maintain the list of highlighted examples locallyTopi Reinio2017-11-101-0/+2
| | | | | | | | | | | | | | | | | | | | | Previously the list was maintained in qtbase. Change-Id: I0510653c08e2e82f949084c5f0e3b1dcae3a81bf Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-12-015-3/+30
|\ \ \ | |/ / | | | | | | Change-Id: Iadff14f78c9d4b5aca9cba8a2728c10b7963d8fc
| * | Add support for the defaultSuffix property in FileDialogAndy Shaw2017-09-175-3/+30
| |/ | | | | | | | | | | | | | | [ChangeLog][FileDialog] Added defaultSuffix property Task-number: QTBUG-39230 Change-Id: I7dc73c332ad62129d7158b6f6f5a614b8582ffbc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-222-6/+6
|/ | | | | Change-Id: I39eb6cd5c6be80b14597b666c6fee05978be26ce Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix support for using QtQuick Dialogs with the QML compilerSimon Hausmann2017-06-011-6/+9
| | | | | | | | | | This is a regression from commit dacb91916b202208681471ba764504c7c7d086f0. Make sure to include the dialogs sources in the resource system when using the compiler. Task-number: QTBUG-60991 Change-Id: I35c3e2e677e4f44ec56fe02b086ce08a8b765d37 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix inclusion of QML files of the Dialogs module in static buildsv5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Simon Hausmann2017-05-221-27/+1
| | | | | | | | | | | | | | This is a regression introduce by commit 751f08cf46f505980b8ebe9a228a6c229b470152. For a build with QML Ahead-of-Time cache creation, we need the qml files in QML_FILES and qml_module.prf takes care of installing them correctly into the file system (caches and sources). For a static build we also need the sources in QML_FILES, in order for their automatic inclusion in the resource system (also by qml_module.prf). Task-number: QTBUG-60861 Change-Id: Id9125530d8b385101994600c1224dbcb2a5333f9 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Connect to QQuickWindow::visibleChanged using QObject member syntaxTor Arne Vestbø2017-04-181-2/+2
| | | | | | | | | | | To disambiguate from QWindow::visibleChanged. Otherwise we get a warning at runtime: QMetaObject::indexOfSignal: signal visibleChanged(bool) from QQuickWindow redefined in QQuickWindowQmlImpl Change-Id: I95f984cface59cd7ec5710235959a1054b26275a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Enable the use of QML caching at build timev5.9.0-beta2Simon Hausmann2017-04-111-2/+6
| | | | | | | Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove spurious Q_INIT_RESOURCE callsSimon Hausmann2017-04-031-2/+0
| | | | | | | | | These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build fix for -no-feature-regularexpressionPaul Olav Tvete2017-03-031-0/+2
| | | | | Change-Id: I211a325b0bd5fb1e5d48b1d378cdce39acb84c96 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Only remember the folder for the next time if the dialog is acceptedAndy Shaw2017-02-212-1/+7
| | | | | | | | | | | If the dialog is not accepted then it should not remember the last folder that was used. This should only happen if the user clicks on OK. [ChangeLog][FileDialogs] Remember the folder only when the file dialog is accepted. Change-Id: I69957e56e887affcab9933562274013fee686063 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-2/+2
|\ | | | | | | Change-Id: I70641d4226d3851277e5d134bdbc68615b33de6a
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-2/+2
| |\ | | | | | | | | | Change-Id: I4a76c586b2e5e49616627c306dd345bdeee64b62
| | * DefaultFileDialog: check cur selection properly on okButton clickedShawn Rutledge2016-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | TableView has currentRow not currentIndex. Task-number: QTBUG-56663 Change-Id: I9376354364bc843d118a672fcd1d9dfbba8e775c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-153-3/+18
|\ \ \ | |/ / | | | | | | Change-Id: I67ccb5a6763045a0728d04e804f8a47c37b425f5
| * | Merge remote-tracking branch 'origin/5.6' into 5.75.7.1Liang Qi2016-11-123-3/+18
| |\ \ | | |/ | | | | | | Change-Id: Idef60aa2d7b55600cca618f0f622e8e18e77f3de
| | * Make FileDialog remember the folderJ-P Nurmi2016-10-073-3/+18
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-54310 Change-Id: I9beef4d983c5fcea4e969cae5090686dfc1d37c6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Rename QQuickDialog to QQuickDialog1v5.8.0-beta1Jake Petroules2016-10-065-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a linking error when Qt is built statically and both Qt Quick Controls 1 and Qt Quick Controls 2 are used in the same application, due to Qt Quick Controls 2 also containing a class named QQuickDialog. Change-Id: I16ad8b1a3c75d0fa3e4ba1c3ab54a63caf05bbea Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Leutgöb <alex@v-play.net> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-alpha1Liang Qi2016-08-309-19/+19
|\ \ \ | |/ / | | | | | | Change-Id: I4f85412071d34b44f76870753e171e0beae2e7b9
| * | Fix ColorDialog.color and FontDialog.font update on acceptJ-P Nurmi2016-08-179-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using native dialogs, ColorDialog.color was not updated at all, and FontDialog.font was incorrectly following FontDialog.currentFont. Promote the overridden accept() methods to the abstract base classes so the native dialogs get the appropriate property updates on accept the same way compared to the non-native dialogs. Task-number: QTBUG-55298 Change-Id: I9ac8f5ecc60884cd98b58d09ef3dcb4baf47772d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-2411-27/+34
|\ \ \ | |/ / | | | | | | Change-Id: I2ee8bf8c1b79386c88134c985e5ef5751f38c054
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9
| | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Icd9ae9ef887b99b96177ec7b590fc3f35da18c82 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1011-27/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| | * Dialogs: enforce changes in minimum sizeShawn Rutledge2016-05-101-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OS X, if visible: true is declared, the dialog can be shown before the changes in 10f0ae7c571b7e0de41d5fdc5627db6a1ddeb926 are able to set the minimumWidth/Height properties. QWindow::setMinimumWidth() also does not force the window to be wider if it is already shown. Task-number: QTBUG-49058 Change-Id: Id87d92072904555639e1695851d908550d22fe86 Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * fix example installsOswald Buddenhagen2016-04-281-2/+2
| | | | | | | | | | | | | | | | | | | | | this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Doc: Rename conflicting groupTopi Reinio2016-04-286-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A group name 'dialogs' conflicts with a page elsewhere in the documentation. Renamed to be more specific, and removed the \group command - it's not required for generating annotated lists, and was not linked to. Change-Id: I571702ece13d5eb57a984cec47811b7d58cc0121 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| | * Dialog: allow proper resize and default size for contentAlberto Mardegan2016-04-131-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Dialog use implicitly positioned items as content. This makes impossible to use item, that can be properly resized with change of dialog window size and has proper default size (set implicit width and height). This change made it use implicit size if there is one item or fallback to previous algorithm, that use childrenRect for explicitly sized and positioned items, so it won't break behavior of the existing applications. [ChangeLog][Dialog] Proper resize and default size for content Task-number: QTBUG-49058 Change-Id: I7fa4da7d5fd39d47f60ba9f43c88f78e75739b0a Initial-patch-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-086-29/+65
|\ \ \ | |/ / | | | | | | Change-Id: I8e90cb522fc01dd647ba0a66f2192d0713cd378d
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-082-0/+0
| |\ \ | | |/ | | | | | | Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
View Lorry Controller Status