Commit Graph

7857 Commits

Author SHA1 Message Date
Mahmoud Badri
230c1331ee QmlDesigner: Implement dragging a bundle texture to a material
Fixes: QDS-9375
Change-Id: Id73e54341e12ec023bb0b55ddffdb7f6b89e2267
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-03-09 09:30:26 +00:00
Thomas Hartmann
c3e5f3e83c QmlDesigner: Use StudioQuickWidget in assets library
The event filter has to be installed on the actual QQuickWidget.
Using registerPropertyMap instead of global context properties.

Task-number: QDS-9124
Change-Id: I9e0e59d4bdf312d98177b8da51761bca8073c9e5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-03-09 08:10:26 +00:00
Thomas Hartmann
fb685307f9 QmlDesigner: Use StudioQuickWidget in content library
The event filter has to be installed on the actual QQuickWidget.
Using registerPropertyMap instead of global context properties.

Task-number: QDS-9124
Change-Id: I148ecc6b489f6d72d80a345aa195f74676a92d51
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-03-09 08:10:12 +00:00
Miikka Heikkinen
333ebb5bc2 QmlDesigner: Fix content library textures tooltip width
Width calculation didn't account for possible status text.

Change-Id: I58378a2dd185ea9ad47459ce107c1c227c2f6fd8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-07 14:24:47 +00:00
Mahmoud Badri
a77ae66ace QmlDesigner: Implement dragging an image to a material
Fixes: QDS-9269
Change-Id: Ia71d87773e6acce6659a30985d77d848feea0a89
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-03-07 10:16:35 +00:00
Thomas Hartmann
91e7efa5e0 QmlDesigner: Use StudioQuickWidget in item library
The event filter has to be installed on the actual QQuickWidget.
Using registerPropertyMap instead of global context properties.

Task-number: QDS-9124
Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-07 10:09:14 +00:00
Miikka Heikkinen
c78c4817cd QmlDesigner: Fix asset drag to material browser
Drag now correctly accepts only assets that can be used as textures.

"selected_texture_changed" custom notification was used in two
semantically slightly different cases, both to indicate selected
texture had changed and that selection should change, which was little
confusing. Split the two cases to separate custom notifications to
clarify the situation and allow "select_texture" to be handled in
material browser even if it sent it. This fixes the issue of newly
added texture not getting selected after drag, because creation was
done by material browser view.

Similar issue was fixed with "selected_material_changed" as well.

Also fixed a couple of cases of drag not being properly ended.

Change-Id: Ie1cae01ef13b687d9e611ac1c91443688001fe49
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-03-07 09:30:08 +00:00
Pranta Dastider
632027aa14 QmlDesigner: Update Tooltips for Layer Section
This patch update tooltip text for Layer section fields
in Property editor.

Fixes: QDS-9201
Change-Id: I179f6feba884f2bdc3cd85d7bd3bcbc982114d75
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-06 14:07:10 +00:00
Miikka Heikkinen
9a55bb0fd0 QmlDesigner: Take content library texture metadata file in use
Metadata file texture_bundle.json will be included with bundle icons,
and it contains details about the texture (format, dimensions, and size)
that are useful to know before downloading the texture.

Metadata is used to generate proper tooltip for non-downloaded textures
in content library.

Also removed default suffix from displayed filename in case metadata is
missing, as it was misleading.

Fixes: QDS-9230
Change-Id: Icbe0bbb7f1e663e0adc41d379231b7f41dc79e31
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-06 12:22:54 +00:00
Pranta Dastider
4ddf7600be QmlDesigner: Update Tooltips for Path View Highlight Section
This patch update tooltip text for Path View Highlight
section fields in Property editor.

Fixes: QDS-9204
Change-Id: Ic6007946386f1e0e5bdcf39bb04b04139c45a6a1
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-06 08:51:17 +00:00
Pranta Dastider
b577188882 QmlDesigner: Update Tooltips for List View Highlight Section
This patch update tooltip text for List View Highlight
section fields in Property editor.

Fixes: QDS-9203
Change-Id: If69dfbff8adcb47c83da9e02e132081c9ab1bef8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-06 08:51:13 +00:00
Pranta Dastider
fd3d3b5c23 QmlDesigner: Update Tooltips for Grid View Highlight Section
This patch update tooltip text for Grid View Highlight
section fields in Property editor.

Fixes: QDS-9202
Change-Id: Ie16d7df74755d726bb729c2c53490444fefc48fe
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-06 08:51:08 +00:00
Pranta Dastider
4b4ad4001f QmlDesigner: Update Tooltips for Progress Bar Section
This patch update tooltip text for Progress Bar section fields
in Property editor.

Fixes: QDS-9213
Change-Id: Ib5953d93e5a3fba409705632b2a38844491aa5d1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-06 08:50:28 +00:00
Pranta Dastider
566710324a QmlDesigner: Update Tooltips for Group Box Section
This patch update tooltip text for Group Box section fields
in Property editor.

Fixes: QDS-9208
Change-Id: I7c0c27a6e37bae06c552b15abac0ec75661e3580
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-06 08:50:19 +00:00
Pranta Dastider
89eb04f3be QmlDesigner: Update Tooltips for Dial Section
This patch update tooltip text for Dial section fields
in Property editor.

Fixes: QDS-9206
Change-Id: If3033bb6258339bf1d9dbdd2bfed788e65e6ecb1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-06 08:50:13 +00:00
Pranta Dastider
b746b357d7 QmlDesigner: Update Tooltips for Combo Box Section
This patch update tooltip text for Combo Box section fields
in Property editor.

Fixes: QDS-9205
Change-Id: I62fd4c0fe2a1509d3f5264f7e39bb016fc4ba8a2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-06 08:50:07 +00:00
Eike Ziller
36d9341397 Merge remote-tracking branch 'origin/10.0'
Change-Id: Idf151b6cfe87957cf905e67aab6b1275b9f0506a
2023-03-06 08:24:18 +01:00
Christian Stenger
5ea655cabd Dumper: Fix dumping QDir with Qt6.6
Change-Id: I7ef37026c638f7e77e4e34af40c3ecff1e40e8b3
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-06 07:11:05 +00:00
The Qt Project
67b8af1de1 Merge "Merge remote-tracking branch 'origin/9.0' into 10.0" into 10.0 2023-03-03 11:18:26 +00:00
Eike Ziller
3be4cf7521 Merge remote-tracking branch 'origin/9.0' into 10.0
Conflicts:
	share/qtcreator/translations/qtcreator_zh_CN.ts

Change-Id: Iedd37c310b312223bd8a455479770e9359719a07
2023-03-03 11:56:49 +01:00
David Schulz
1124a75948 Debugger: Fix highlighting values and members in memory view
Fixes: QTCREATORBUG-23681
Change-Id: I1420385d0c923be0ae4dd7ef2662263b88623333
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-03 07:04:18 +00:00
Xu Shitong
0e3089314b Chinese translation update for 9.0 (BareMetal / Bazaar / Beautifier)
Change-Id: I17f65523667b03ca50f20b8352004b61c9a8120e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2023-03-02 14:08:55 +00:00
Henning Gruendl
af3c97ea7d QmlDesigner: Fix ButtonRow border overlap on hover
Change-Id: Iccbb35f40538c21dfbc2560d905cb21cb5b0948d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-03-02 12:49:07 +00:00
Thomas Hartmann
e042b7ca59 QmlDesigner: Remove DirectoryFontLoader from MCU template
Change-Id: Ida0f6fa699b2b8d755f13ac0beb7b03d862470e7
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-03-02 12:44:05 +00:00
Eike Ziller
87ede95b5c Merge remote-tracking branch 'origin/10.0'
Change-Id: I7bd186df0bfae7906e980e9c2c811f8dcf29750d
2023-03-02 10:17:58 +01:00
Miikka Heikkinen
b8d0828d37 QmlDesigner: Add caption property to ColorEditor for legacy support
Old Qt5 specifics sheets specify caption property for ColorEditor,
and fail to load if the property doesn't exist, so define the property
for compatibility purposes.

Fixes: QDS-9256
Change-Id: I6b56d98fd711d21272e914f6e167aa1cf8e07070
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-02 08:43:56 +00:00
Ali Kianian
003ae4db87 QmlDesigner: Show the material name in the property editor
The material name for the property editor's material field
is presented in the following format:
MaterialName [MaterialId]

Task-number: QDS-8663
Change-Id: I59fdfcb52ecb2ce9a1079ae20b7e2d748bbc1d61
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-03-01 16:50:04 +00:00
Eike Ziller
c8567312f6 Plugin wizard: Fix missing include, add some test infrastructure
Just basic CMake setup that is needed for actually adding tests.

Change-Id: Ief778c28f27ff122c82a190a334b7a932bead658
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-01 14:06:24 +00:00
David Schulz
f3cbd506dd Debugger: Avoid looking up qt symbols globally to get the qt namespace
This can get very expensive for targets that have a lot or big modules,
but are not linked against Qt. On the downside we might not be able to
identify Qt namespaces in static builds.

Task-number: QTCREATORBUG-18287
Change-Id: I90e0c4afcde17fd81d49017e828ce59f0abe9b5c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-01 11:43:19 +00:00
David Schulz
fb8182ca7c Debugger: fix QJSValue dumper for Qt >= 6.5
and disable the QV4::Value dumper for that version.

Change-Id: I31a0ddba2bdab3b196e4fc5298fd8e7c10f9dc92
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-01 09:51:07 +00:00
David Schulz
8288a4c563 Debugger: fix dumper for QVariant containing a QList<int>
...for Qt 6.5.
Found by dumper tests.

Change-Id: Ibb9ccf72a5f18e203e37123f1fc5458142bd4efc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-01 09:32:27 +00:00
Friedemann Kleint
03e1c18f78 Qt Designer Custom Widget wizard: Generate XML as raw string literal
It makes it easier to customize it later on.

Change-Id: Ie4ac7830a5544746d621b5ba34d174b3f8e3676a
Reviewed-by: hjk <hjk@qt.io>
2023-03-01 09:16:24 +00:00
Friedemann Kleint
745de1b34d Qt Designer Custom Widget wizard: Update code templates
- Introduce nullptr, member initialization, override.

Change-Id: I1088e124bf554050f71f002e6af31a2432479f99
Reviewed-by: hjk <hjk@qt.io>
2023-03-01 09:16:16 +00:00
Friedemann Kleint
e538e8f2e7 Qt Designer Custom Widget wizard: Remove remains of Qt 4
Clean the .pro files and use Qt 5 plugin metadata instead of old
exports.

Change-Id: I24c96d90f5dc45ecd20064159eb175e0e0475a34
Reviewed-by: hjk <hjk@qt.io>
2023-03-01 09:16:05 +00:00
Eike Ziller
5e866bbf2f Translations: Fix duplicate messages
Amends 6bb756ba1c

Change-Id: I6e5c3e7d2846ab8a49409b242a3474547380252e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-28 14:02:13 +00:00
Eike Ziller
6bb756ba1c Debugger actions: Move <p> out of tr()
This is just there at the front to force word-wrap on the tooltips, it
shouldn't be part of the translated text.

Change-Id: I62157aba303071677ca89929f9e56c03ee1f21e7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-02-27 13:38:27 +00:00
David Schulz
a4fb9e20cb Debugger: improve dump time for various msvc std containers
... by caching the info whether we have a debug build. This avoids
expanding members of the container to check for a potential offset of
the actual data.

Change-Id: I4d7ac83003c303185ae51d57f0f0571b627edf22
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-27 12:26:37 +00:00
David Schulz
5169469911 Debugger: add <load more> functionality to array dumper
Change-Id: Ib44748fa3218788ca20a99b0a0f4cd85716dde06
Reviewed-by: hjk <hjk@qt.io>
2023-02-27 08:35:32 +00:00
Miikka Heikkinen
26e2342e24 QmlDesigner: Don't change focus on expand when focus is in search box
This is to avoid search box focus loss if search autoexpands sections.

Fixes: QDS-9259
Change-Id: Ief99643d52413fe83d4b5ac5ea3438d6116d64c7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-24 14:41:49 +00:00
Samuel Ghinet
192ac5db61 QmlDesigner: Allow dragging image Assets to the Material Browser
When dragging an image from the Assets Library to the Textures section
of the Material Browser, now Textures will be created from those
assets.

Task-number: QDS-8783
Change-Id: Ibbfb8697705a7d1af7714f3a32caff24282ee7a9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-24 12:45:06 +00:00
Henning Gruendl
d42af9246f QmlDesigner: Update 3D Animation workspace
Task-number: QDS-9184
Change-Id: Ic45d778b0ac3704c8f706fb2a7ab00103cc1d145
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-24 09:37:34 +00:00
Henning Gruendl
383315b64a QmlDesigner: Fix DoubleButton state
Fix an issue that appears when pressing the button and moving away from
it but still hold the mouse button down.

Change-Id: I06b456e410352862ea28f04e7cfaf3bdb27ae7d4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-24 09:16:11 +00:00
Brook Cronin
57ef24fa77 QmlDesigner: Fix workspaces for 4.0
Change-Id: Id6f599faa203e3260ba4cdd6a3677ddafa1a0a75
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-23 14:42:48 +00:00
Miikka Heikkinen
d39f469e51 QmlDesigner: Fix focus issues in material browser
Fixed focus loss on context menu close.
Fixed an issue with main view also handling cursor and enter keys when
editing material name.
Expanding a section now focuses the expanded section.
Dragging items from content library now focuses correct section.

Fixes: QDS-9215
Change-Id: I2176c7e52d8855c547db426b55ab739ca8f1db06
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-23 12:38:29 +00:00
Pranta Dastider
c178f45d5e QmlDesigner: Update Tooltips for Frame Section
This patch update tooltip text for Frame
section fields in Property editor.

Fixes: QDS-9207
Change-Id: Iece6c73e77ca33c93f4845e18b93c10ab73f34b1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-23 11:05:02 +00:00
Samuel Ghinet
6c8d75e690 QmlDesigner: Fix textures becoming misaligned in a search
When doing a search, some textures appeared misaligned. This was caused
by the fact that the "invisible" (i.e. hidden) textures had their Image
set correctly as invisible but the delegate itself remained visible.

Task-number: QDS-9234
Change-Id: Ia2cd6f4f6795bb435567b8915e770b78461babed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-02-23 09:55:00 +00:00
Thomas Hartmann
cc0af7c3f1 QmlDesigner: Define mainUiFile in application template
Task-number: QDS-9242
Change-Id: I9811762f7f138f2ea0ffcb3fb93e0225cbd47e51
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-22 15:35:29 +00:00
Henning Gruendl
5020398865 QmlDesigner: Fix SearchBox resizing
Task-number: QDS-9236
Change-Id: I326ac238bf9a0a8f519a32fb9fc1c9ac6da15cb4
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-22 15:02:01 +00:00
Henning Gruendl
5c9758a104 QmlDesigner: Fix SearchBox resizing
Task-number: QDS-9235
Change-Id: I8802582f5a1574961dfbffdb599b1e10192bc196
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-22 15:01:30 +00:00
Ali Kianian
a98c6583be QmlDesigner: Modify the style of slider for panelwidgets
Task-number: QDS-9134
Change-Id: Ie1a6ab94a546247e0cdd35798fc8085be005d13c
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-21 15:41:58 +00:00