aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Add missing includeRobert Loehning2020-10-201-0/+2
| | | | | | | | Amends 3614ab81ce9726b17b0c725ff55e1ae5be3ab7d1 Change-Id: Ib8a02fe5829462379ae9a665b5c0e8e8832cc090 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix incorrect conversion between double and int/longEike Ziller2020-10-201-1/+1
| | | | | | | | | | | And fix macOS build which complained that std::abs with doubles is ambiguous (between int and long and long long). Amends aaf564cab7cbb0a79c37098bd9642a72cef9a9ba Change-Id: I87d4453afa4dda676cc27c219d7dbfc22fcee70a Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Remove AnnotationToolMahmoud Badri2020-10-203-354/+0
| | | | | | | | | | Remove AnnotationTool from FormEditor's selected item's tools. Change-Id: I797ed4002d14c04956aaeb5d779f1cf3f326f849 Fixes: QDS-2970 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CurveEditor: Fix bounding rect computation for the graphicssceneKnud Dollereder2020-10-198-10/+56
| | | | | | | Task-number: QDS-2957 Change-Id: I0019d538e7460e923b35024bd02f7186e1935f6b Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix reversed order on Navigator dropHenning Gruendl2020-10-191-3/+3
| | | | | | Task-number: QDS-2910 Change-Id: Iab58b79b6f3cdb3f922824a7f608b633b019c9ae Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-10-192-7/+27
|\ | | | | | | Change-Id: If549dd1bc610704ece881c408cf44192dabed8b9
| * Automatic generation of Description & Display Condition tabLukasz Ornatek2020-10-162-7/+27
| | | | | | | | | | | | | | Task-number: QDS-2862 Change-Id: I367f336e84025b593e51faf282ad9c923cfeac54 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
* | QmlDesigner: Add image cacheMarco Bubke2020-10-1618-47/+728
| | | | | | | | | | | | | | | | | | | | | | | | The image cache is saving images and icon of this images in a sqlite database. If there are no images they are generated in the backgound. The icons are fetched by item library. Task-number: QDS-2782 Task-number: QDS-2783 Task-number: QDS-2858 Change-Id: I5a32cccfef7f8fd8eb78902605a09f5da18ce88e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Sort items in FileResourceModelHenning Gruendl2020-10-162-10/+29
| | | | | | | | | | | | | | | | | | * Sort items in FileResourceModel * Add FileSystemWatcher on directory Task-number: QDS-2919 Change-Id: I0ba50f03d4f901a48709ed0cc0e7f05d3037aeec Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | QmlDesigner: Bind meta info cache to modelMarco Bubke2020-10-141-1/+1
| | | | | | | | | | | | | | | | A global variable is not helping for multithreading and the cache has anyway a 1:1 relationshit to the model. Change-Id: Ic05f32744b70ef63aa5ae7d475afc0b5b17f2f09 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Enable touch-pad navigationKnud Dollereder2020-10-1219-52/+308
| | | | | | | | | | | | | | | | | | | | For the curve-editor, transition-editor and timeline Renamed ruler-scaling-factor to zoom in order to not confuse it with ruler-scale-factor Change-Id: I099e8e9a1e6092c9abb0a1a935fb8510aa90d5e4 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Icon visibility in navigatorHenning Gruendl2020-10-122-0/+7
| | | | | | | | | | | | | | | | | | Show alias, visibility and lock icons in the navigator only when either checked or hovered. Task-number: QDS-2785 Change-Id: I1eca1b9f44cfbdd839daa64849156e1c9ffa4acd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add lock functionality to navigatorHenning Gruendl2020-10-1231-85/+396
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update icon font and change related theme and constants files * Add locked column to Navigator * Add auxiliary property "locked" * Integrate locked feature into the following components: * Transition Editor * Connection Editor * Form Editor * Text Editor * Timeline * Navigator * State Editor Task-number: QDS-826 Change-Id: Ibf3ae96e0d5daeb1ab00279b94df5aaabe75e0bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Show anchors menu only if applicableThomas Hartmann2020-10-121-10/+10
| | | | | | | | | | | | Change-Id: I09e6e14f96b62b561027694ebc5a73b51c6ab8d8 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Disable group menue if selection is emptyThomas Hartmann2020-10-121-1/+6
| | | | | | | | | | | | Change-Id: I1b64bbe7a6217ed08c8a1f72435cd67eea6209a0 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into 4.14Orgad Shaneh2020-10-121-0/+1
|\| | | | | | | Change-Id: Ifa2e1ced939e1d049ba6de667b31ab9945094b87
| * qmldesigner: fix missing update after setFrameColorTim Jenssen2020-10-121-0/+1
| | | | | | | | | | Change-Id: I9d809bb62bdd3b0d141e1cff39cbf4a9fca58c39 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Compile with Qt 6hjk2020-10-082-2/+2
| | | | | | | | | | | | | | | | Qt 6 does cannot handle forward-declared types in signal declarations. Change-Id: Iad4a810841df3d077750ad76c892bdb7eecc0a80 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.14' into masterEike Ziller2020-10-084-143/+60
|\ \ | | | | | | | | | Change-Id: Ie53b4c2516d80a653d51bc6b666040c586ce44ab
| * | QmlDesigner: MCU Metadata improvementsAleksei German2020-10-081-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduced allowChildren switch Task: QDS-2794 Change-Id: Ie992fb173e8eacb27b10679d5ff28238277aa346 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: MCU configurations metadataAleksei German2020-10-064-139/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Removed c++ hardcoded info about QDS MCU restrictions -Instead replaced it with dynamically loaded qml files -Replaced QLists with QSet/QHash to improve performance Task: QDS-2794 Change-Id: Ifc23d1299155001b6573dc0ed789dda5d2cfaf24 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Remove unused private functionsAlessandro Portale2020-10-082-39/+0
|/ / | | | | | | | | | | | | As found by Cppcheck. Change-Id: I697ea69992425ff41e35990ad00be312b35ba70a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | QmlDesigner: Show selection in DebugViewThomas Hartmann2020-10-051-0/+12
| | | | | | | | | | Change-Id: Ica85a227e6976464480a3b3dd91d4d42f1ed1528 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix crashThomas Hartmann2020-10-052-4/+8
| | | | | | | | | | | | | | We have to check if the view is actually detached. Change-Id: I160c1a15f921092ef66999ed6a27ffcdbbe205d9 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Do not keep separate selection stateThomas Hartmann2020-10-054-10/+6
| | | | | | | | | | | | | | | | When nodes are deleted the selection can changes without a notifier. There is no reason to keep the selection separately. Change-Id: I166d3695762e3d5cd6ff4808586384fd26bafef4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | QmlDesigner: Disable TimelineEditorView when not visibleThomas Hartmann2020-10-023-0/+19
| | | | | | | | | | | | | | Change-Id: If67a027c9ad52b2b2fa62df8cf94afdd1c2c49d7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Disable TransitionEditorView when not visibleThomas Hartmann2020-10-023-0/+19
| | | | | | | | | | | | | | Change-Id: I76a1829dae18d651168f92558d65beb8b94f1f88 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner Disable FormEditorView when not visibleThomas Hartmann2020-10-024-21/+64
| | | | | | | | | | | | Change-Id: I4bf6f3747cfd11fa31bdd386efc11fc27dbfe45c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Respect canBeContainer on drag from library to navigatorMiikka Heikkinen2020-10-021-11/+28
| | | | | | | | | | | | | | | | | | | | If the parent node can't be a container for the newly created node, the newly created node is deleted within the same transaction. Change-Id: I4f4771add3aae5b4509b3bb0a8fbabfed2e7c99e Fixes: QDS-2660 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Disallow the creation of invalid curveKnud Dollereder2020-09-299-9/+207
| | | | | | | | | | | | | | | | | | but allow invalid initialized curves to be moved into a legal state. Visualize invalid curve-segments by painting them in the errorColor Fixes: QDS-2130 Change-Id: Ida44c3b4f5e3d113df7d1e8e7a2b965d26f43815 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Respect cancel on crumblebar save confirmation dialogMiikka Heikkinen2020-09-292-8/+12
| | | | | | | | | | | | | | Change-Id: I682494100ff90c45e3a4bb1137701d603c548478 Fixes: QDS-2704 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | QmlDesigner: Show tooltip preview image for Textures with sourceItemMiikka Heikkinen2020-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For non-component sourceItems, the preview shown is simply whatever image has been stored for form editor for that item. If the sourceItem is component, the preview image is the same as sourceItem's preview image, as the form editor image for components often includes unnecessary empty space. Note that currently the image stored for form editor doesn't include child items, so this is not a perfect solution. It is however in line with what form editor shows for the texture. Change-Id: I3c0c629ca5e7fa25dbcb390c53e3865e34d5e729 Fixes: QDS-2824 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | QmlDesigner: Add navigator tooltip for 2D componentsMiikka Heikkinen2020-09-2910-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables showing preview tooltip for 2D (Item based) components. We render the component from scratch for this purpose instead of using existing renders done for form editor to ensure preview doesn't include any local changes to component. Also cache tooltips as QPixmaps in NodeInstanceView instead of QImages to avoid unnecessary image to pixmap conversions when using cached data. Change-Id: I3082c5c846f605a765a81408767266d1ff7a12d7 Fixes: QDS-2762 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Adapt to key sequence changes in Qt6Eike Ziller2020-09-292-9/+9
| | | | | | | | | | | | | | | | | | | | Use operator| instead of operator+ which was removed. Individual keys in QKeySequence are now QKeyCombinations instead of ints. Task-number: QTCREATORBUG-24098 Change-Id: I43a6122cf660e6a6de7edbf3ac9954e0a39cec06 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Use ElidingLabel for preview tooltip labelsMiikka Heikkinen2020-09-292-3/+22
| | | | | | | | | | | | Change-Id: I641a6d93cccd888f494f2d7a7ce095c66bed92e0 Fixes: QDS-2821 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-234-5/+14
|\| | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/mcusupport/mcusupportoptions.cpp Change-Id: I3fd0d0a6a3ff30bb990da3dc0f78e69f9e1247ef
| * QmlDesigner: Minor Fixes for QDS MCU compatibilityAleksei German2020-09-191-1/+1
| | | | | | | | | | Change-Id: I401ecf9ce12d7020e78a5449b321fb7927caffed Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Fix range for "Fixed Frame" in Timeline settingsThomas Hartmann2020-09-191-1/+8
| | | | | | | | | | | | Change-Id: I71bdae7144ae91b9b8b8c8e2088b87310d2f4a2e Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Fix StateEditor show event updateHenning Gruendl2020-09-171-1/+1
| | | | | | | | | | | | Task-number: QDS-2798 Change-Id: Ic27e7491012b227e144cdae68ead8ac534cc0d5a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Add GridView to ListModelEditorMarco Bubke2020-09-171-2/+4
| | | | | | | | | | | | | | | | We could simply test for the model property but this can lead to strange behaviour. Change-Id: I4e326890fb02d312b5210089c957dce026a09f94 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add navigator tooltip for 3D Components with Node rootMiikka Heikkinen2020-09-223-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | This enables showing preview tooltip for all imported 3D models. Also moved the preview image handling out of the model and into NodeInstanceView, where it fits more naturally. Change-Id: I48135d06aa8d9313525dae618e22692563da78fd Fixes: QDS-2807 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add navigator tooltip for 3D Model nodesMiikka Heikkinen2020-09-221-0/+3
| | | | | | | | | | | | | | | | | | | | Only the source and geometry properties of the model is taken from the node, rest of the properties are always same for consistent style. Change-Id: I2355ce91c3e3d6f23b9f27ecf31430e3e13d0c80 Fixes: QDS-2764 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Remove usages of Core::IdEike Ziller2020-09-211-1/+2
| | | | | | | | | | | | | | It moved to Utils. Change-Id: Ia4d12bb07db2d59b1cb084b2ebdea20e6e3b40ad Reviewed-by: hjk <hjk@qt.io>
* | QmlDesigner: Add unique ids for the toolbar action of TransitionEditorThomas Hartmann2020-09-212-7/+16
| | | | | | | | | | | | Change-Id: Ibb73da4655f55023c7e1e61226d33c586d9a9099 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add menuIds to TransitionEditorActionsThomas Hartmann2020-09-211-11/+19
| | | | | | | | | | | | Change-Id: I33c94e99404952c461cd548cce2e741a496de538 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add reverse item order in navigatorHenning Gruendl2020-09-217-38/+116
| | | | | | | | | | | | | | | | | | Extend drag and drop, move and reparenting buttons to take into account reverse item option. Task-number: QDS-2773 Change-Id: I755e233511567c12d171245efbdca4044e896ba2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix build with Qt6Eike Ziller2020-09-2111-19/+28
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I3d5c7d821402acc13ccd505550afc66a531b13b5 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Replace qrand with QRandomGeneratorEike Ziller2020-09-181-4/+7
| | | | | | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I91b610409a413c7d76b3c5dd43cf581a960edf7d Reviewed-by: hjk <hjk@qt.io>
* | QmlDesigner: Fix QTC_ASSERTThomas Hartmann2020-09-181-1/+5
| | | | | | | | | | | | | | The ModelNode has to be always valid, but not the QmlItemNode. Change-Id: I906f2f6ec101b5d19223a3b5103c81c76f2585fe Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-1719-250/+1583
|\| | | | | | | | | | | | | Conflicts: src/plugins/qmakeprojectmanager/qmakeproject.cpp Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 07:16:36 +0000