aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Add image cacheMarco Bubke2020-10-167-3/+145
| | | | | | | | | | | | 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: Return placeholder preview image for non-visual componentsMiikka Heikkinen2020-10-121-2/+29
| | | | | | | | | | | | Preview image is returned when a 2D item render results in a blank image. Also improved device pixel ratio handling. No longer always render preview at 2x ratio, if not needed. Change-Id: I67b7563dffea523ea85be23b6a0e8b802c0f03fb Fixes: QDS-2893 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Implement different render path for Qt 6Thomas Hartmann2020-10-0911-24/+155
| | | | | | | | | | | | | | When building with Qt 6 or if qmlpuppet_unifiedRenderPath is set in the environment we switch to a different render path. In this case we use QQuickWindow::grabWindow() and render the root item. No composition is done in the Qt Creator process anymore. This is a similar approach we already take for the 3D view. Performance is acceptable and we fix rendering issues related to effects and layers. Change-Id: Ic963eca047e0bf16ca3a099ec94658ae2af0fb63 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Show tooltip preview image for Textures with sourceItemMiikka Heikkinen2020-09-291-1/+6
| | | | | | | | | | | | | | | | | | 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-292-71/+164
| | | | | | | | | | | | | | | | | 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>
* QmlPuppet: Update 3D edit view on property removalMiikka Heikkinen2020-09-292-0/+8
| | | | | | Change-Id: I9cdcc7a4a1515b6046bc2c7c78de196a2c7d8c22 Fixes: QDS-2840 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix compile when building without Quick3DChristian Stenger2020-09-231-0/+2
| | | | | | | Amends 31ec38dba5e. Change-Id: I33156223023b4077581375b9f28cc5633dfdcfdb Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Add navigator tooltip for 3D Components with Node rootMiikka Heikkinen2020-09-222-31/+56
| | | | | | | | | | | | 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-12/+19
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-171-1/+4
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmakeprojectmanager/qmakeproject.cpp Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed
| * QmlPuppet: Return color propertyMichael Winkelmann2020-09-141-1/+4
| | | | | | | | | | Change-Id: Icc25fb0408aae50f67633688f221194ab6f77cd3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | QmlDesigner: Add navigator preview tooltip for materialsMiikka Heikkinen2020-09-166-25/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Request 3D preview image for material instances from puppet to show on tooltip. Support for effect previews is also done, but handler for it is not registered, as effects cannot be shared between windows due to issue QTBUG-86616. Also refactored the preview image support out of navigator to make it more accessible by other components. Change-Id: Ie08ba218f929660c2e43d39578997a5a1a883efd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-1411-24/+425
|\| | | | | | | | | | | | | Conflicts: src/plugins/languageclient/languageclientcompletionassist.cpp Change-Id: If12e1c532e5623ef063681309a918e7b51117b1c
| * QmlDesigner: Introduce multiple node instance serverMarco Bubke2020-09-1111-24/+425
| | | | | | | | | | | | | | | | | | | | | | | | For capturing data we need a atomic mechanism. So in one process multiple node instance server can be started and then a command is send back that a scene is created. It can be used to ensure that captured data of views is up to date. Task-number: QDS-2630 Change-Id: Iea8d0b036b6384c9c1b0f91af401f2b1f1978c12 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-031-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
| * QmlPuppet: Fall back to primitive creation if component creation failsMiikka Heikkinen2020-09-011-3/+6
| | | | | | | | | | | | | | | | This ensures components defined in .qml files get loaded properly. Change-Id: I070132ab5ad58b2531f27f623f218e0ee3565c5b Fixes: QDS-2697 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-214-18/+19
|\| | | | | | | | | | | | | Conflicts: CMakeLists.txt Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
| * QmlPuppet: Refactor ChangeIdsCommandMichael Winkelmann2020-08-203-4/+3
| | | | | | | | | | Change-Id: I75de863121b66a5050226dd5c8914229cb1af608 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlPuppet: Refactor ChangeFileUrlCommandMichael Winkelmann2020-08-202-2/+2
| | | | | | | | | | Change-Id: I900f530109b6cdbb22d8138094443b48834d16cb Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlPuppet: Refactor ChangeBindingsCommandMichael Winkelmann2020-08-202-2/+2
| | | | | | | | | | Change-Id: Id3020a73f59a1adfd25066a37d083d923e77956b Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlPuppet: Refactor ChangeAuxiliaryCommandMichael Winkelmann2020-08-182-2/+2
| | | | | | | | | | Change-Id: I32eb04db96322883aa908e22724756f5e25ded09 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * QmlDesigner: Extend captured dataMarco Bubke2020-08-171-8/+10
| | | | | | | | | | Change-Id: I780815e6f42be4f3aceb1d784a685cc330572832 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-138-75/+232
|\| | | | | | | | | | | | | Conflicts: src/plugins/android/androiddeployqtstep.cpp Change-Id: Id624bad384050d567efba0700046331086cb12dd
| * Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-08-138-75/+232
| |\ | | | | | | | | | Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
| | * Prepare merge of qds-1.59 to 4.13qds-1.59Marco Bubke2020-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | It is not compiling but we are closing this branch anyway. Change-Id: If96318175d92ae492871d668d5c937c473fd05d5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Split messaging and process for puppetsMarco Bubke2020-08-108-69/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to implement custom puppets. The new connection manager will restucture the code and it add a mechanism to capture data too. Task-number: QDS-2529 Change-Id: I5d15c3303ef1c9a3e25ba197d350e0d561ce813a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * QmlDesigner: Fix prefiew sizeMarco Bubke2020-07-171-4/+1
| | | | | | | | | | | | | | | Change-Id: I126c50209f2849d0212f0d295b35cba0f25f2728 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | Some Qt6 compilationhjk2020-07-131-1/+0
|/ / | | | | | | | | Change-Id: Icbc9ed41e75799d2d0e16ef16379fec05f80b62e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Handle active scene id change properly on edit 3D viewMiikka Heikkinen2020-06-291-1/+15
| | | | | | | | | | | | | | | | | | | | The scene id shown on the corner of edit 3D view is updated and toolstates are also stored under the new id. Change-Id: Ib3ac2f2bb829a5d908e22932c313c76bd4143592 Fixes: QDS-2277 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | QmlDesigner: Update 3D edit view on state changeMiikka Heikkinen2020-06-292-0/+8
| | | | | | | | | | | | Change-Id: I56b16afe4d9ccab802d6e07f60b57e46a353cc26 Fixes: QDS-2378 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-06-263-10/+18
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/clangformat/clangformatplugin.cpp src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp src/plugins/qmldesigner/qmldesigner.qbs Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
| * QmlDesigner: Fix crash on puppetThomas Hartmann2020-06-261-4/+8
| | | | | | | | | | Change-Id: I233d3dab5a509bfd7c9a30c7dcc15dcf8751f456 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * qmldesigner: add language to create scene commandTim Jenssen2020-06-113-10/+18
| | | | | | | | | | | | | | | | and also save the last used language to settings Task-number: QDS-2218 Change-Id: Ib82f7bc755755661183452b32829be3d048d9947 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | QmlDesigner: Fix crash on puppetThomas Hartmann2020-06-251-4/+8
| | | | | | | | | | Change-Id: I233d3dab5a509bfd7c9a30c7dcc15dcf8751f456 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Improve usage of QML items as quick3d texturesMiikka Heikkinen2020-06-2510-1/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Quick3D Texture elements require some window signals to show QML item as texture, so we fake them to make textures appear in form editor and state preview. To prevent texture mirroring, flipV value is force set at proxy creation. To keep state preview up to date, we trigger multiple render passes if there are any QML items used as texture sources in quick3D textures. Task-number: QDS-2290 Change-Id: I16c34aad943213c0b737fdb073333be3bbd40f2d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | qmlpuppet: Fix function linkageChristian Kandeler2020-06-151-1/+1
| | | | | | | | | | | | | | | | Putting static functions into a header file causes warnings in all cpp files that include the header and don't use the function. Change-Id: I9147c034092515e486dc6113a1b053f4d8094686 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/qds-1.59'Tim Jenssen2020-06-111-1/+2
|\| | | | | | | Change-Id: I8891e7490a7fd51997a3b57561961f6134be3252
| * QmlDesigner: Fix puppet crashThomas Hartmann2020-06-101-1/+2
| | | | | | | | | | Change-Id: I2a408d090c4bbf2c3da7f03473312eff4b7e6c34 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Restore the previously active 3D scene on scene creationMiikka Heikkinen2020-06-091-15/+31
| | | | | | | | | | | | | | | | | | Store the last active scene in global 3D tool state and restore it when a scene is created after puppet relaunch. Change-Id: Ie2d69f6db6798ab383c66d38b2dea7eba13adc97 Fixes: QDS-2239 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix drag-adjusting values not ending up with correct valueMiikka Heikkinen2020-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When drag-adjusting e.g. brightness or position of the object in 3D edit view, the value ending up in property editor and qml doc didn't always match what was displayed on 3D edit view. This happened because ValuesModifiedCommand was compressed to 100ms intervals, but any property changes also sent ValuesChangedCommand at 16ms interval, which changed the instance value at backend, but not the model value. Fixed by comparing modified value to model value instead of instance value. Also made the 100ms compression timer singleshot, so the backend wouldn't be unnecessarily bombarded with ValuesModifiedCommand when holding the mouse still while dragging. Change-Id: If86dcd61bcf0c04735d65648e4c34d9d214c5313 Fixes: QDS-2081 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add brightness control to light gizmoMiikka Heikkinen2020-06-092-23/+30
|/ | | | | | | | | Brightness can be controlled by dragging on the brightness indicator arrow of the light gizmo in 3D edit view. Change-Id: I317f5ee08b59bcc0bebf3fdf59861df15ef13c84 Fixes: QDS-2039 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix compilation under linuxHenning Gruendl2020-06-031-0/+1
| | | | | Change-Id: I3070876f0549a9fb7c3a52c5bc99638bad2d2894 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix changePreviewImageSizeThomas Hartmann2020-05-261-0/+3
| | | | | | | | | If the size is invalid set the default size. Invalid size most likely means the setting was removed. Change-Id: I3f1dad5bdac799673d37036099d954caab9aca19 Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* qmlpuppet: enable the use of multilanguage databaseTim Jenssen2020-05-262-2/+57
| | | | | Change-Id: I2277348ac1e6b5025e75c640da83da30294c9d10 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59Tim Jenssen2020-05-121-0/+2
|\ | | | | | | Change-Id: Ic0edcce1268b9cc47c91364eeb84e3b3f7dfe134
| * QmlDesigner: Expose component urlThomas Hartmann2020-05-061-0/+2
| | | | | | | | | | Change-Id: I2b1708e6f87b00ad0b56c04f591ba24720a886ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Preview size is now changeableMarco Bubke2020-05-124-7/+21
| | | | | | | | | | | | | | | | | | | | You can now change the preview size with rootModelNode.setAuxiliaryData("previewSize@Internal", size); If size is null it will use the bounding box size. Change-Id: Icbe747ccc5a2e26e79783825d2ed94ecc640012b Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add ChangeLanguage commandMarco Bubke2020-04-292-0/+2
|/ | | | | | Change-Id: If79de7d04717ad81af05411e61c262b9ff70129b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Inspect components for existing statesThomas Hartmann2020-04-217-0/+31
| | | | | | | | | For each created items we retrieve a list of the names of all existing states. Task-number: QDS-1978 Change-Id: I8e85e439fce3c6204cb8bcf69f6be847cc8dae5c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Allow setting state propertyThomas Hartmann2020-04-211-4/+4
| | | | | | | | This has to be blocked only for the root item. Task-number: QDS-1979 Change-Id: Ia05255468623fe715e3f7172e2f058a70629b783 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 16:31:38 +0000