Commit Graph

8038 Commits

Author SHA1 Message Date
Mahmoud Badri
ffe3670d90 QmlDesigner: Implement changing effect maker preview image
Fixes: QDS-10625
Change-Id: I48ef68fd4b64a37de3dc60f5decfcda1b43496dc
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-19 14:17:12 +00:00
Henning Gruendl
da92e16a92 QmlDesigner: Add tooltip on elided pills
Change-Id: I4a40070b958a46e46009ba8f141fd5c286858ab7
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-19 12:43:34 +00:00
Brook Cronin
37c4937d6d QmlDesigner: Add new icons
* Add new icons
* Change position code editor button
* Add eliding to the code preview

Change-Id: Ib47b0e28ae9b4deebc7bace942f43d8249f46299
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-19 12:43:04 +00:00
Thomas Hartmann
e156854fc3 QmlDesigner: One more missing qualification
Change-Id: I394e58b2cccdfbfcacd13ff2c5cefba8d4719ef4
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-19 12:24:47 +00:00
Brook Cronin
f5e01b8b09 QmlDesigner: Fix Pill eliding logic
Change-Id: I573251001b2e77ff3f3fb0046615d65de814c21d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-19 11:25:10 +00:00
Henning Gruendl
560b77d64b QmlDesigner: Fix Connections in ConnectionsEditor
Fix Implicitly defined onFoo properties in Connections are deprecated.

Change-Id: I0f2460dd4b69c070f4982ca0ec13b19cfda0342b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-19 10:20:37 +00:00
Thomas Hartmann
94bd14eb46 QmlDesigner: Bump QDS version in template
Change-Id: If05eb88eabd59d0a63944887f896e32da2b9c202
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-19 09:03:17 +00:00
Thomas Hartmann
1b9ed62028 QmlDesigner: Close dialog if target is removed
If the target is removed also the connection is removed and
we close the dialog.

Change-Id: I361e89ef64484e39bc0068e103f542cbc9dcbf78
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-09-18 15:54:39 +00:00
Thomas Hartmann
0547cff092 QmlDesigner: Update branch for designer components
Change-Id: I370fcd7eb15a26d28e60dc8bf2cdf24c29a43957
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-18 15:52:45 +00:00
Henning Gruendl
2a135f5d14 QmlDesigner: Fix long expression pill texts
* Elide static texts
* Clip dynamic texts

Change-Id: I90a511ec6dd35d2b65f4064bc09c0a83e8d1e905
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-18 15:43:02 +00:00
Thomas Hartmann
5ff6fe0eba QmlDesigner: Add missing qualification
This was leading to random errors.

Change-Id: I51ec0c71ac1bd3ea7bd966eeb4d3a2b9cfeb0159
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-09-18 13:53:35 +00:00
Miikka Heikkinen
a6e8a247b3 QmlDesigner: Fix minimum value for NumberAnimation to and from fields
Change-Id: Ic5fcb1d69ab0c3369dacbc93da71714b20253e25
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-18 13:03:43 +00:00
Aleksei German
4949c1911e QmlDesigner: Add code preview indentation
Task-number: QDS-10680
Change-Id: I61528f517ed4baef2115fbddf1b014b9f7f966d2
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-18 12:42:46 +00:00
Miikka Heikkinen
516a2238e2 QmlDesigner: Ensure we save the latest values on 3D snap dialog close
Track value property of spin boxes changes directly instead of the
extra valueModified signal, which is not emitted in all cases.

Also removed duplicate applying of snap configuration.

Fixes: QDS-10653
Change-Id: If0ce7bffa1dcfb5b01e80b6e962f356f91f44d51
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-09-18 10:09:31 +00:00
Henning Gruendl
44699727ad QmlDesigner: Close dialog when view loses focus
Change-Id: Ib48229615ee9b2ccef1a8be98086a93851dae6af
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-18 09:58:43 +00:00
Henning Gruendl
f25ce01ead QmlDesigner: Close dialog when view loses focus
Change-Id: I4666953ff862886fbb02fb3982d6856a223fe969
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-15 19:50:41 +00:00
Brook Cronin
a496ac5d02 QmlDesigner: Design fixes for connections popout
Change-Id: I06968cfef23f8b296f1ba6b07e57cdc96701447b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-09-15 17:21:33 +00:00
Henning Gruendl
5aa3e573ce QmlDesigner: Fix empty literal remove
Fix issue that literal token is not immediately when pressing backspace
and text is empty.

Change-Id: I7ba2401ad6adfa689f697188feb7b30a71d82eeb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-15 16:58:01 +00:00
Henning Gruendl
9b2d6f5edd QmlDesigner: Fix Connections Popup layout
* Set proper width on labels
* Set proper width on StatementEditor
* Forward backend property into StatementEditor

Change-Id: Ia0db6ff7f235bd8d25eb0f36124fa158b76aaf04
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-15 16:57:51 +00:00
Henning Gruendl
55034b1cde QmlDesigner: Pill redesign
Change-Id: I3c28599c3cbc1555fbdb206e387dccf6f45a77cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-15 16:57:34 +00:00
Miikka Heikkinen
f3036d52e5 QmlDesigner: Fix dragging 3D snap configuration spinboxes
Changed to use HelperWidgets.DoubleSpinBox, which has the proper drag
support built into it and implemented required context functions.

Fixes: QDS-10639
Change-Id: I6fce39251d7f754985f95bba5784784fc6eb8fae
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-09-15 12:52:30 +00:00
Henning Gruendl
b73b94d27a QmlDesigner: Remove anchors from positioner child
Change-Id: Ibff848d5f80ac74491ab77e88baffb4d0e1454bf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-15 12:48:05 +00:00
Henning Gruendl
954385c34d QmlDesigner: Fix wrong role name
Change-Id: I195ead9ade9c4bc430bdee630f533e6e04e15027
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-15 12:47:54 +00:00
Henning Gruendl
6d5ceadccf QmlDesigner: Improve type selection
* Disable custom item in Connection Editor type selection
* Rename Unknown to Custom

Change-Id: I9fa8c9ab6284503d5ccc61813454b9d10f291a06
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-15 11:33:49 +00:00
Henning Gruendl
5ed667c554 QmlDesigner: Add chevron to items with children
Add chevron to the ItemDelegates of the SuggestionPopup if items have
children. This indicates that the user can click on it and go deeper.

Change-Id: I905769b8190b81a92025861a3fc38817de5b56ed
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-15 11:33:41 +00:00
Miikka Heikkinen
ac6d875d12 QmlDesigner: Display informative string for 3D support in Qt5 projects
Fixes: QDS-10661
Change-Id: I91ba32e478039711758e19c11d385af9fac4c99f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2023-09-15 08:28:22 +00:00
Henning Gruendl
6fbf77b027 QmlDesigner: Fix open/close Connections Editor
Improve the selection mechanism in all 3 Connections Editor tabs. When
a new item is added automatically select it and open the popup. When the
current item is removed, close the dialog. When the dialog is closed
deselect the item.

Change-Id: I918bbff6b290b38d496de8c2fa5f31d617f4d21c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 17:17:28 +00:00
Aleksei German
26ac6c2606 QmlDesigner: Integrate Editor into Connections
Task-number: QDS-10530
Change-Id: I579c5e5d55b2136b96e32a448315dda8e720f2fb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 17:16:47 +00:00
Henning Gruendl
9be23b73ea QmlDesigner: Align code preview properly
Change-Id: I05599041b69edf7c8ecaeeff0144d1a4ed6117c3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-14 15:04:21 +00:00
Tim Jenssen
a603b65f18 Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I2bf1a2a72d9765d9b4088840414b4933644db47a
2023-09-14 12:23:01 +00:00
Ali Kianian
252a1f3c74 QmlDesigner: Add a view for single collection
Change-Id: Iee103cf9344872e0f2eaa564fa1feeaea4d26d6a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-09-14 10:44:05 +00:00
Ali Kianian
f12f3790da QmlDesigner: Implement Collection Editor
Data could be loaded from a csv or json file, and would be appended
to the collection node.

Task-number: QDS-10462
Change-Id: I60294582331ba20eb5ecb5d8fd591055c0eb6d1e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 10:43:57 +00:00
Henning Gruendl
650dabdc25 QmlDesigner: Add scroll bars to SuggestionPopup
* Add scroll bars
* Fix focus style for expression builder

Change-Id: I08f4334b3d480e4395a0c017634dd42f8eff74bb
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-14 09:59:27 +00:00
Henning Gruendl
89d5795f7a QmlDesigner: Hide QML debug output
Change-Id: Ice49d7ab5a5d90feccf52f98b1049576f96ae275
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 09:59:17 +00:00
Henning Gruendl
1824ccd380 QmlDesigner: Add placeholder in expression builder
Task-number: QDS-10667
Change-Id: Iad83ba5e398b06ebafb64ab1d5d9a2a5543a7204
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 09:17:59 +00:00
Henning Gruendl
b55d44080a QmlDesigner: Remove QML debug output
Change-Id: Icdd705a43ddcca10ca1ec5e6dc1ec72f8f208a94
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 09:17:52 +00:00
Henning Gruendl
1327a2c7ce QmlDesigner: Add transient scroll bar
Add transient scroll bar to connections editor

Change-Id: Id4afd661da2fcdeacd2a4a0de0e0b9999c14dec2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-13 16:55:12 +00:00
Henning Gruendl
91029f9752 QmlDesigner: Fix ComboBox not closing
Change-Id: I562005d3102efafc52cc01b161aeaeba56581095
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-13 14:49:47 +00:00
Henning Gruendl
ffd23a68a2 QmlDesigner: Remove QML output
Change-Id: I40263a26304904a827a90f86272eacb2d1684a69
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-13 14:49:39 +00:00
Henning Gruendl
9f391acdd9 QmlDesigner: Add focus handling to close popup
Add proper focus handling to the expression builder in order to close
the popup when e.g. clicking outside.

Change-Id: I5ea8422c727b5fc6e47dc77866b709e4ec04e6fd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-13 14:49:31 +00:00
Ali Kianian
251e1cca4c QmlDesigner: Make shortcut accessible from the MenuItem
The shortcut property is accessible directly for the MenuItem.

Change-Id: I6d956859411a02dcd9c9610cfa4ccffb2e7867e7
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-12 15:42:17 +00:00
Henning Gruendl
ed6f870a81 QmlDesigner: Add operators to expression builder
* Show operator fills when cursor is placed at position where operator
  is required
* Convert operators from real syntax to text version

Task-number: QDS-10630
Task-number: QDS-10638
Change-Id: Iffceb24024b7cde9a93c2acd0033fedd54e2ee32
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-12 10:45:39 +00:00
Henning Gruendl
28933f2d4d QmlDesigner: Expand and hide root item
Hide and expand root item in the tree model of the connections editor
search result.

Change-Id: If6591077fee59542153f2167dfd43c8132b66c95
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-11 10:46:03 +00:00
Henning Gruendl
41ee64b8a4 QmlDesigner: Remove debug UI in connections editor
Change-Id: Ifc3c0b3c1fa09eff0b0ea650540ceeb00091789d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-11 10:45:52 +00:00
Henning Gruendl
171e11b4c7 QmlDesigner: Fix Expression Editor
* Fix cursor placement after submit
* Remove pill indicator for wrong ordering
* Fix PropertyTreeModel root child count and parent name

Change-Id: I169396cf3cc62890fafe0bfe75d736be3ca8d47f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-11 10:45:47 +00:00
Henning Gruendl
522a622e9a QmlDesigner: Fix QML window hide issue on macOS
Task-number: QDS-10585
Change-Id: Iabf834627701d84bd693db6d22c3699e1209fccf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-11 10:02:59 +00:00
Knud Dollereder
2dda34f781 Extend bindingmodel and minor fixes
- Include singletons in the list of sources (former sourceModelNodes)
- Do not suggest sources on bindings that are initialized without a
  source node. Prevent constructs like
  "property string p: button.qsTr("STREXPR3")".
- Allow changing the name of the target property and update the
  delegate properly when doing so.
- Remove superfluous emitCurrentIndex emission from the
  dynamicpropertiesmodel.
- Add missing qml imports.

Note that it is still possible to create illegal constructs if the user
wants to.

Change-Id: I084978f2f8d451df076d1b556db15764e17e31fb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-11 09:15:31 +00:00
Henning Gruendl
5e8b5ec1f0 QmlDesigner: Integrate Expression Builder
Task-number: QDS-10587
Change-Id: Ifc13a8364fccb74cb60d683f0e6c322d80baab50
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-08 14:15:40 +00:00
Mahmoud Badri
af2738ec33 QmlDesigner: Add effect maker uniform's tooltip
Change-Id: I4787e1bcadb24d8ff34d26964bdc4f2e97704124
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-09-08 11:04:15 +00:00
Mahmoud Badri
7fbcf4a38e QmlDesigner: Add empty placeholder to effect maker's view
Fixes: QDS-10592
Change-Id: Icc6193b358b83fce2a229321e30880e35e074055
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-08 08:26:03 +00:00