Commit Graph

7857 Commits

Author SHA1 Message Date
The Qt Project
e65e5243f8 Merge "Merge remote-tracking branch 'origin/9.0' into qds/dev" into qds/dev 2022-12-09 13:07:47 +00:00
Thomas Hartmann
56450a8fe6 QmlDesigner: Update application template for QDS projects
This updates the application template to download
the designer components.

* Added a cmake configure option BUILD_QDS_COMPONENTS
* We use the qds-3.9 branch of qtquickdesigner-components

Change-Id: I046e2c7e648fe9d3cb6cf8d2cec8eb606432bccd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-08 15:54:26 +00:00
Eike Ziller
b4fed03c27 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/plugins/cppeditor/cppeditorplugin.cpp
	src/plugins/docker/dockerdevice.cpp

Change-Id: I41747ff9490e4ab20340d4d4acb4655100aaa3d2
2022-12-07 10:47:47 +01:00
Miikka Heikkinen
a5fb9fc95f QmlDesigner: Add "Apply as light probe" option to material browser
Textures in material browser can now be applied as light probes to
the active SceneEnvironment node.

Also changed the logic for resolving the active SceneEnvironment node
to prefer a currently single-selected SceneEnvironment node over
the SceneEnvironment node associated with currently active 3D scene.

Fixes: QDS-8472
Change-Id: I9a3a7b9c2fad3c8120e85ade507a7ea66de19f1d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-07 09:20:50 +00:00
Tim Jenssen
c9f7d893f4 Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I7f394c76256d1d24fbc2d40937f3f7a63fb854c1
2022-12-06 16:31:58 +00:00
Miikka Heikkinen
fb24f791b8 QmlDesigner: Fix texture source path for newly created textures
Fixes: QDS-8448
Change-Id: Ibaf51444f2dff8d3de95edd4c8afbc7bc2cd2241
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-06 15:49:27 +00:00
Mahmoud Badri
2987f5a96c QmlDesigner: Show content library material + button only on hover
Fixes: QDS-8486
Change-Id: I2207e6558d2124bd9f602e6571ac3958da3c9cdf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-12-05 12:14:47 +00:00
Henning Gruendl
e1fce66f38 QmlDesigner: Remove unnecessary function
Change-Id: I3a8c29ba7e24b10df957b4cb8fdb9f6e3acd6855
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-05 10:33:13 +00:00
Thomas Hartmann
06b40d0aaa QmlDesigner: Bump version in application template
Change-Id: I5ecbe2da5e403f883344f9e0987ab11585140603
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-02 11:41:34 +00:00
Samuel Ghinet
e774aa238b Add "Add Texture" and "Add Light Probe" actions to Assets Library
When the user right-clicks on an image asset, "Add Light probe" now
appears in the context menu. When the user right-clicks one or more
image assets, "Add texture" or "Add textures" becomes available.

Task-number: QDS-8344
Change-Id: Ia8d8379be2a0a285b33e4a230e08527c18756b47
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-02 10:45:41 +00:00
Miikka Heikkinen
57448021b8 QmlDesigner: Fix content library visibility logic
Also fix enable logic of context menus in content library.

Fixes: QDS-8446
Change-Id: I82f80779f507aa5336ebafac5cffc36365238fc5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-02 08:19:56 +00:00
Henning Gruendl
d9054d1f10 QmlDesigner: Add qt insight infrastructure
* Add InsightSection for property editor
* Add functions in property editor qml backend, context object and view
* Add InsightTracker in text to model merger
* Add auxiliary data properties

Task-number: QDS-7489
Task-number: QDS-7833
Task-number: QDS-8073
Change-Id: I3fbec3d387f815d71640b512e67829076b600d11
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-01 16:50:44 +00:00
Mahmoud Badri
fd4d1f08fa QmlDesigner: Add a tooltip to material browser textures
Change-Id: I5a2dd41602bb03357fdd1b7280242f6ea43ff56f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-12-01 13:44:20 +00:00
Mahmoud Badri
5f7d36d1cb QmlDesigner: Fix material browser's textures search
Change-Id: Ia0750f0f61d821deeb1d0d3630fb770803e604ee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-12-01 09:09:08 +00:00
Marcus Tillmanns
d5b585dad6 Debugger: Fix dumper for std::string from lib++ in GDB
Fixes: QTCREATORBUG-28511
Change-Id: I56ca11c9a5f9b7a885bbaa0223bd2f47ea4abb4b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-12-01 06:55:20 +00:00
Mahmoud Badri
b5befc6945 QmlDesigner: Fix content library sections not collapsing after search
Also enabled the auto expand for textures and environments tabs

Fixes: QDS-8443
Change-Id: I190f919ccb2cff90c7cd151e65b77ebd52f0a87c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-29 14:55:31 +00:00
Miikka Heikkinen
34b966c21d QmlDesigner: Show informative message when texture library is not found
Fixes: QDS-8444
Change-Id: Ief36595fda27b075ef3362d6f393655c56fd9940
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-29 12:03:28 +00:00
Miikka Heikkinen
26c1747ae6 QmlDesigner: Fix issues with adding texture as light probe
Changed resolving the currently active scene environment to be done
on demand instead of trying to track it realtime, since resolving it
is relatively cheap operation, so it doesn't cause noticeable delay
at context menu opening. The alternative would be to implement multiple
different notification handlers in ContentLibraryView, which would slow
down all operations and would be much more complex to ensure all edge
cases are covered.

Fixes: QDS-8437
Change-Id: Ib33cd1ad549d836b9d780f9b0f92e70d223e2a25
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-29 11:06:54 +00:00
Eike Ziller
c3b05f1ef1 German translation: CMake
Change-Id: Ied82a653d6e1cc6336e501c79728ceb085c7d49d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-29 09:13:57 +00:00
Mahmoud Badri
397e5f3022 QmlDesigner: Prevent content lib scroll when context-menu is open
Fixes: QDS-8441
Change-Id: Idfc3400fac43668d14cd5ff85cb42d745ef97dfe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-28 15:42:45 +00:00
Orgad Shaneh
157f2bcd39 Merge remote-tracking branch 'origin/9.0'
Change-Id: I231d35f492713f317773b79478b5f7fb97a4fe50
2022-11-28 17:29:19 +02:00
Henning Gruendl
5b19c034ed QmlDesigner: Remove error states editor
Remove the error "Unable to assign [undefined] to QUrl" thrown by the
states editor.

Change-Id: Ic48deddbe698f161f486003ccaf9eb22d0ee65a9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-28 11:46:24 +00:00
Henning Gruendl
4b72ac3022 QmlDesigner: Fix states editor dialog not closing
Task-number: QDS-8439
Change-Id: Idf633b345de6e4f124b2f621699615ac6d764ceb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-28 11:45:57 +00:00
Thomas Hartmann
ee10ba1909 QmlDesigner: Add support for tooltip in item library
This allows to define tool tips in the .metainfo files.

Change-Id: I3236c6e9f374a052e99b18d8c3983bfd0f072162
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-28 10:35:25 +00:00
Henning Gruendl
7d13c82750 QmlDesigner: Expose realValue from SpinBox
Task-number: QDS-8191
Change-Id: I265c4a95e84f6ef10a4c69f9a0089970f16f4bbf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-28 10:06:25 +00:00
Henning Gruendl
62d86837e9 QmlDesigner: Fix states editor none visual items
When using any none visual item as root (e.g. Window) which don't have
a state property the support for adding a state on the root item needs
to be deactivated otherwise QtDS is crashing. The new states editor was
missing that.
On the other hand the use of StatesGroup with none visual items is
supported.

Change-Id: I194913719a13099ce8ac7cde5f78083ef84dc37f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-28 10:06:08 +00:00
Mahmoud Badri
ea55e01051 QmlDesigner: Focus material browser's sections separately
Focus is shown by a thicker selection border for material and
texture items. Delete shortcut works on the selected focused item.

Fixes: QDS-8401
Change-Id: I1ddbbd595a0da3f0e2b7cf2bb9e611532770bc3c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-28 09:32:58 +00:00
Miikka Heikkinen
ddecd338a8 QmlDesigner: Unify texture image providers
Texture editor, material browser, and UrlChooser all had separate
texture providers that served nearly identical purpose.
Unified all use cases to use same PropertyEditorImageProvider.
This provider is asynchronous, which combined with enabling caching on
Image elements, significantly improves responsiveness of the material
browser UI when there are many textures shown in the browser.

Fixes: QDS-8387
Change-Id: I2888aee2f4320dba9456fa046c9ede319673a3d9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-25 15:31:04 +00:00
Samuel Ghinet
056165d071 Use double underscores instead of single ones in QML
Also, fixed some QML errors -- they didn't have any real consequence,
so they could be considered warnings. Also, AssetsView._modelIndex()
was being called with two arguments instead of one -- this didn't
result in any warnings.

Change-Id: I08274a49531a4082fa94fb89e4230fdac5b1b658
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-25 11:57:02 +00:00
Samuel Ghinet
afc7cd2c98 QmlDesigner: Use a vertical scrollbar for "Confirm Delete Files"
Also, replaced the widgets code with QML.

Task-number: QDS-8033
Change-Id: I29f4e0bc02294e839e352096c3d4394a764cfe76
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-25 11:50:42 +00:00
Mahmoud Badri
6747e666b9 QmlDesigner: Open TextureEditor by double-clicking a texture
Change-Id: I58645f31f244cf4e5909b35f1cae224a55f4e9a4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2022-11-25 11:02:42 +00:00
Eike Ziller
2605639144 German translation: Clang*
Change-Id: I7712ea38738448d9e017fb805d7adba11ae13c04
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-25 09:39:26 +00:00
Henning Gruendl
3321261cf3 QmlDesigner: Fix DragHandler being disabled
The blockDragHandler property got broken when a menu item triggered a
model reset as the popup close signal wasn't triggered from the delegate
anymore.

Task-number: QDS-8133
Change-Id: If135b12a127f5fea8f3f392e0fd6475c4e188e67
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-25 08:59:30 +00:00
Henning Gruendl
fd1864d678 QmlDesigner: Fix disappearing plus states editor
* Fix issue the plus (Canvas) in the states editor is not drawn when
  the view was hidden before and comes back on
* Improve paint method

Task-number: QDS-8419
Change-Id: I959b4b6a418deba95380d8f5cafc7af09a0362e8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-25 08:52:02 +00:00
Henning Gruendl
ccbda4655e QmlDesigner: Fix wrong initial render type quality
Task-number: QDS-8334
Change-Id: I3b79093c67fbde94504277a669448c19911ce97b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-25 08:51:40 +00:00
Tim Jenssen
02c65495d1 Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I5e66666644fd16de60a0158e5e884706622ae3ba
2022-11-24 19:01:47 +01:00
Mahmoud Badri
09c4df833b QmlDesigner: Fix small typo in MaterialBrowser
Fixes: QDS-8422
Change-Id: I9e1cfe677875ea8a7f58f1d52e7d1b9a3d4f8447
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-24 13:33:06 +00:00
Miikka Heikkinen
fea463bb4a QmlDesigner: Drag textures from content library to material browser
Fixes: QDS-8337
Change-Id: Iee42341a18e4acaa0d455aef276df36013ebf21e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-24 11:16:59 +00:00
Mahmoud Badri
34b236e7fb QmlDesigner: Disable assigning a texture to a model with no materials
Disable apply texture to selected model option from texture editor's
toolbar when the selected model has no material. Also relevant fixes
to make sure texture assigning happens in the current state.

Fixes: QDS-8395
Change-Id: Iab2e8fce4696c6bd5d50636b4077362ba04cb8a0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-24 10:45:57 +00:00
Samuel Ghinet
910a8864dc Use QML TreeView in Assets Library
Task-number: QDS-7344
Change-Id: Ia1ea584fc7acabb0d35b745e36fef18799f21ab5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-23 10:00:04 +00:00
Mahmoud Badri
a575cb4f46 QmlDesigner: Implement drag-n-drop a texture to material editor
Fixes: QDS-8339
Change-Id: Iea61c175525fbef25e763454f53e9bcc28847fe2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-23 09:22:13 +00:00
Miikka Heikkinen
ac1af9a582 Implement texture context menu
Apply to selected model/material, delete, duplicate, and
create new options are available in the menu.

Fixes: QDS-8342
Change-Id: Ib9bdc1738500a87361000bcd3e89403e3b8ccef8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-22 10:44:36 +00:00
Miikka Heikkinen
e3a817ec77 QmlDesigner: Hide or disable material browser and editor if no library
If material library is missing, material browser and editor UI should
be disabled, except for material editor main pane in case of root
material node.

Change-Id: I3d2bd545de0649fb90d3fe1f751d46b7c7054bbf
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-22 10:05:55 +00:00
Mahmoud Badri
6d620429c6 QmlDesigner: Fix Material/Texture Editors toolbars issues
Make sure each toolbar's enum is registered under a different URI.

Change-Id: I7613b4018b62188ba3fba5f651d064ada8173066
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-22 09:24:13 +00:00
Mahmoud Badri
4b6b81cd76 QmlDesigner: Fix content library material unimport
Change-Id: I3737682b578cdd991ca761da92cfdcc5506b3629
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-21 14:17:25 +00:00
Mahmoud Badri
88ce27736f QmlDesigner: Add separate + buttons for material browser sections
Fixes: QDS-8343
Change-Id: Id986820c857df241cf25e55416832f189c28bfe0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-21 13:32:45 +00:00
Mahmoud Badri
815dd39e47 QmlDesigner: Implement Texture Editor view
Fixes: QDS-8209
Change-Id: Ief0c9f56da79841c745595024dbcd9219072b681
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-21 10:16:33 +00:00
Eike Ziller
ea79027e20 Merge remote-tracking branch 'origin/9.0'
Change-Id: Idd9c2b1bf787040b7b415b7cda29035227ca1011
2022-11-21 08:57:14 +01:00
Eike Ziller
9a4a3f6bf9 German translation: C++ editor
Change-Id: I07df59d56ac2c4761c873992b67096997388ed34
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-18 12:31:38 +00:00
Eike Ziller
ce26985b6d German translation: Utils
Change-Id: I2cd3d0f8ee0c3ecab9301a2baa5086ef7f4c1172
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-18 12:31:33 +00:00