summaryrefslogtreecommitdiff
path: root/src/dialogs/qquickfiledialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-161-86/+0
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/dialogs/qquickabstractfiledialog.cpp src/dialogs/qquickfiledialog.cpp Change-Id: I60aab7c7e819f82f82fc30f473b36a7a57d9a91a
| * FileDialog: move shortcuts properties up to QQuickAbstractFileDialogShawn Rutledge2016-02-021-86/+0
| | | | | | | | | | | | | | | | | | | | | | QQuickQFileDialog does not inherit QQuickFileDialog, so the documented shortcuts property was not defined if your platform happens to use the QFileDialog implementation. As long as we are moving the public property, it's easiest to move everything related to shortcuts. Task-number: QTBUG-50673 Change-Id: Ic2baf4a3c83ca12edf11d7d011aaa78a389e0fde Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-041-12/+15
| | | | | | | | | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Replace foreach with range-based forAnton Kudryavtsev2016-01-161-2/+2
|/ | | | | Change-Id: Ieb9019b62696479a4e0317a590bceaeb30abf62c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Dialogs: add shortcuts even when they point to non-existing dirsRichard Moe Gustavsen2015-03-311-29/+28
| | | | | | | | | | | | | | | | | Currently, shortcuts will only be added if the directories they point to exists. Since QStandardPaths::writableLocation() is documented to return paths that might not yet exist, bindings like the following will cause warnings on e.g iOS: FileDialog { folder: shortcuts.pictures; selectExisting: false } This patch will change this, so that we always add all shortcuts, to not cause trouble for bindings. That way the app can also take the necessary steps to check and create a shortcut up front before showing the dialog. Change-Id: Iba85710c87ae95e82728695cf958e1bf4394bc7c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Dialogs: store m_shortcutDetails as JS arrayRichard Moe Gustavsen2015-03-301-16/+14
| | | | | | | | Simplify the code a bit by storing the shortcuts as an JS array that keeps track of its own length. Change-Id: I4aa3c353d9d88d58feaf8e452cf11cc5bc05646c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* docs: document the FileDialog shortcuts propertyShawn Rutledge2015-03-181-0/+4
| | | | | | | Also made other minor doc corrections. Change-Id: Ied1bf38ee54d793df675e3e437d5fcd055ac0f15 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
* FileDialog: make the save/load distinction function properlyShawn Rutledge2015-03-181-12/+36
| | | | | | | | | | | - shortcuts need to be different: use QStandardPaths::writableLocation if it's a "save" dialog - that means shortcuts need to change dynamically, because the same dialog instance can be reused for both purposes - DefaultFileDialog.qml changes its button labels accordingly Change-Id: Ie90d96cc686caf30e86669a79e613585f8fb3704 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* FileDialog: expose several QStandardPaths in the shortcuts propertyShawn Rutledge2015-03-181-23/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | QStandardPaths::PicturesLocation is a specialized kind of file URL on iOS; if this folder is set, then when the dialog is opened, it will be the new dialog helper which uses the native picture gallery picker interface. This will always work, so we do not need to check whether the path exists. The application developer needs to have a way to get that platform-specific (and odd-looking) URL by name, so the FileDialog.shortcuts property is now public API: a map from programmatic names (similar to those in QStandardPaths) to URLs. But DefaultFileDialog.qml should not display the names from this map, because they are not translated to the user's language. So __shortcuts is added as a private property providing a map from programmatic name to an object containing the translated name and the URL. This makes possible setting FileDialog { folder: shortcuts.pictures } which will open the special image gallery browser on iOS; and several other paths from QStandardPaths can be set in the same way. [ChangeLog][QtQuick.Dialogs] added FileDialog.shortcuts to enable setting the starting folder to a standard system path. Setting folder to shortcuts.pictures will result in a special image gallery dialog on iOS. Change-Id: I14f04712eb4f44ff422ac91a8720b9e3ff8fb920 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* Dialogs: update license headersJ-P Nurmi2015-02-111-16/+19
| | | | | | Change-Id: I1abdce308929507416b5f24b4442d0b978886a46 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-081-1/+1
| | | | | Change-Id: I1eb87e2037ecf36b7d313d11bf3215fa70d26b59 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* FileDialog: several logic corrections in handling the enter keyShawn Rutledge2014-10-291-8/+9
| | | | | | | | | | | | | | | | | | | | A "save as" dialog does not need to validate existence of the file. When the user presses enter in the text field at the top, and the text field contains a path to a directory, it usually means enter the directory; but if the dialog is for choosing a directory, then pressing enter will mean enter the directory if the dialog is not already viewing that one, or else accept the current directory as the choice if the table view does not have focus on some other row. When the user presses enter in table view, go down into a directory only if a directory is selected; otherwise accept the current selection. When the user clicks a row in the table, copy the path of that row into the text field so that it is possible to edit the path before pressing Enter or OK (behavior similar to a native dialog that has an editable path, such as GTK). Task-number: QTBUG-39435 Change-Id: Ibd5e988624c5b1072a12239d681cbdc812e0a697 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-08-251-19/+11
| | | | | | | | | - 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: 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/+1
| | | | | | | | 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>
* FileDialog: new features in DefaultFileDialog.qmlShawn Rutledge2014-02-111-0/+41
| | | | | | | | | | | | | | Use a ComboBox for the filters. Add a sidebar showing shortcuts for the common paths and drives that the user will most likely need, and an editable list of favorite paths. [ChangeLog][QtQuickDialogs][FileDialog] The FileDialog fallback QML implementation now uses QtQuick.Controls, and has added features including a Combobox for file extension filters, and a sidebar with common paths, drives/volumes and favorite paths. Change-Id: I228ebdadcf338917db81a2b3d03d3c0b09584e7d Reviewed-by: Liang Qi <liang.qi@digia.com>
* move QtQuick.Dialogs from qtdeclarative to qtquickcontrolsShawn Rutledge2014-01-031-0/+172
This will enable using Controls in the QML dialog implementations. For now, Controls are used only as drop-in replacements for the Button, Checkbox, and TextField which were custom implementations in the qtdeclarative module before. Change-Id: Ic79e9e8e5715a72ce51f4c724bfdfd33653300f2 Reviewed-by: Liang Qi <liang.qi@digia.com>