Commit Graph

6682 Commits

Author SHA1 Message Date
Eike Ziller
3b9b9bdc0b Merge remote-tracking branch 'origin/6.0'
Change-Id: Ia7fc255ee8680e6beac5d4d878f446fe40873183
2021-11-08 09:46:57 +01:00
Miikka Heikkinen
590d01e8a9 QmlDesigner: Block modifying imports when editing in-file subcomponent
Adding import statements fails silently when editing in-file
subcomponent, and removing them can crash creator, so block various
cases in component library, navigator, and 3D edit view that do this.

Fixes: QDS-5353
Change-Id: Ide5429cd97d2bf78f884b14e83cdffd10399f929
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-05 12:44:21 +00:00
Tomi Korpipaa
69c8be67ae Add particle editor support
Add a way to edit and view particles visually, as editing
only the properties in property editor does not help visualize
how the particle effect is going to look. Support toggling the
effects on/off, pausing, resuming, and scrubbing the time back
and forth. Only the selected particle system is animated to allow
concentrating on that particular system without being confused
by other possible particle systems.

Fixes: QDS-4623
Change-Id: I2677c56a73279d451d77df1d131bd7294e6b23bb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-05 11:31:31 +00:00
Henning Gruendl
02b8bb3ac4 QmlDesigner: Add wizard font icons
Task-number: QDS-5284
Change-Id: Ifb1e4128d4ae74396a35566bae2c43017c4e1f34
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-04 19:46:22 +00:00
Eike Ziller
e6d31c2b37 Merge remote-tracking branch 'origin/6.0'
Change-Id: I560583b200db8f180574256d6d851a867be11c37
2021-11-04 13:52:30 +01:00
Samuel Ghinet
b7d0902257 Add new theme colors necessary for New Project Dialog on QDS
We need colors for the dialog box background, and for warning text messages.

Note: We currently don't have carefully picked colors for warning, so I used
standard yellow (ffff00). The values, for each theme, will need to be adjusted
later on.

Task-number: QDS-4490
Change-Id: I257522216b03610d9f12951e7cb6f7cfa182489f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-04 11:18:40 +00:00
Henning Gruendl
0484d574d6 QmlDesigner: Add QtMultimedia
Add property editor sheets and item library entries for QtMultimedia.

Task-number: QDS-5147
Change-Id: Ic4fc2926e7bf5aa5376f3fd7b6b5e452034e4001
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-03 18:56:10 +00:00
Eike Ziller
a759a4e8da Plugin wizard: Make github workflow work with Qt 5 and 6
The new default build of Qt Creator is Qt 6 based, so we need to make
sure that that actually works.

Change-Id: I6195f9d46cd020175daf8bc4caaa003fa7ae2b52
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-11-03 14:56:38 +00:00
Mahmoud Badri
fe20c60c69 QmlDesigner: Support dnd bridge files to the assets lib
Fixes: QDS-5278
Change-Id: I2e77ddcbdd6d97ca9d63ee2c8e4871302e8636b1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-01 11:15:45 +00:00
Mahmoud Badri
7ca826e2f3 QmlDesigner: Close component library's context menus when layout change
Fixes: QDS-5351
Change-Id: I06e02b7c137d2398528e6d4120d9ffbc7632c7a7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-11-01 11:07:35 +00:00
Eike Ziller
4dac32d661 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Id5e67457e2c8c96cfcd29fb5469b6650ec7bcc94
2021-11-01 09:46:02 +01:00
Eike Ziller
3e83122888 Themes: Do not force Fusion style, use macOS dark mode instead
We forced Fusion style on all platforms if the theme was a dark one, so
the dark appearance would be handled correctly even if the "native"
QStyle didn't.

On macOS, use the system's dark mode instead, which handles window
decoration correctly and uses native controls. Switching the QStyle also
messed up things like labels of standard buttons.

Remove the hardcoded "Fusion" style from all themes and set the
preferred style to Fusion automatically on Windows and Linux if the
theme states a DarkUserInterface and no PreferredStyles is set.

Fixes: QTCREATORBUG-22477
Change-Id: I91c9143a8703fcec7aa08201de9fc33d1799196d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-01 07:54:04 +00:00
Andre Hartmann
78a1beb06e Debugger: Improve handling of stdint types
* Make (u)intX_t known as integral type
* Handle uint8_t[] the same way as char[] and unsigned char[]

Task-number: QTCREATORBUG-26501
Change-Id: I1eac21be198f8107f088e56daf435b5bb3217120
Reviewed-by: hjk <hjk@qt.io>
2021-10-29 13:12:02 +00:00
Christian Kandeler
c3a1193969 TextEditor: Add highlighting category for namespaces
... and make use of it in the built-in code model and with clangd.

Task-number: QTCREATORBUG-16580
Change-Id: I8c331f56aa1bbf91c9f768be82a779a72f40c4c7
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-29 08:36:20 +00:00
Henning Gruendl
a9bb006442 QmlDesigner: Fix CharacterSection
* Add enabled state to Weight and Emphasis label
* Rearrange controls in character section

Change-Id: Ie90935a09e1644f642abb232c7e44db7f3a6c8d8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-28 11:35:23 +00:00
Eike Ziller
e6130c9446 Merge remote-tracking branch 'origin/6.0'
Change-Id: Ie46e0028f0dca9f3ddc45ed8794ba6cddd97df26
2021-10-28 10:31:51 +02:00
Miikka Heikkinen
982f23be38 QmlDesigner: Allow invalid property value for QVariant type properties
Invalid QVariant is a valid value for properties of type QVariant, so
propagate the value change from puppet to creator in that case.

Also change the property editor to notify controls of value change in
case of invalid value set, and clear LineEdit when invalid value is
set.

Fixes: QDS-5304
Change-Id: I02c7daaf3cde06317690a32e7ac8a82da754bd58
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-28 07:50:20 +00:00
Artem Sokolovskii
691e340b81 QtcWizard: Fix build empty project
Added TargetName parameter for executable file name
in order to avoid names conflict between qml resource folder and
executable file name.

Fixes: QTCREATORBUG-26375
Change-Id: I7f59b8001246d175a87309a9b31ff7110d76b148
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-10-28 07:26:20 +00:00
Eike Ziller
b5fd63b431 Merge remote-tracking branch 'origin/6.0'
Change-Id: I9b824b8bb7b0b5d76e9e8f28f909b542adf773f0
2021-10-27 12:05:08 +02:00
Henning Gruendl
73fb9d7002 QmlDesigner: Expose state property for 3DObjects
Task-number: QDS-5225
Change-Id: I08b5839ef70dd3e3ea9ebd615646494e3667a479
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 17:54:54 +00:00
Henning Gruendl
92cb2427f8 QmlDesigner: Fix hex label eliding in ColorEditor
Change-Id: I144511f8cfe4caabaf84d19331a6cb4222884cdf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 17:54:46 +00:00
Henning Gruendl
260d323a85 QmlDesigner: Fix GradientPropertySpinBox dragging
Task-number: QDS-3081
Change-Id: Ibcd7d79fbff42bb41a009de37f7200aa50b56827
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 17:54:38 +00:00
Miikka Heikkinen
f0d0ce4c01 QmlDesigner: Do not create pixmap at component completion
Creating an item pixmap will render the entire scene and clear all
dirty flags, so we don't ever want to render just one item without
checking if other items need rendering, too. So pixmap creation is
removed from completeComponent(). Since completeComponent()
already inserts the completed instances to the dirty instance set,
this should not cause any problems; it just defers the rendering to
the next collectItemChangesAndSendChangeCommands() call.

Fixes: QDS-5271
Change-Id: Ic15dbb29f13875b966f4e3c3556a4ecd7194cdd6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 12:50:08 +00:00
Leena Miettinen
ddfea6b648 QML Designer: Fix UI text capitalization and punctuation
Task-number: QTCREATORBUG-26458
Change-Id: Ifffb7e155bf75a47dec9d4bd9842c4acd5aaf2a7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 11:59:37 +00:00
Eike Ziller
588ef08d46 Merge remote-tracking branch 'origin/6.0'
Change-Id: Ib49e73e6c69d71fd0d8402c08f4344476295e409
2021-10-26 09:15:45 +02:00
Christian Stenger
afda00f1fa QmlJS: Update version information
Fixes: QTCREATORBUG-26273
Change-Id: I3a2c7c0d11436655a87d6288412af95ff3ffdaaf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-10-26 04:25:25 +00:00
Leena Miettinen
cd80f0a096 Wizards: Fix description of Qt Application template
The applications can also be run on the mobile device platforms
listed in the wizard dialog.

Task-number: QTCREATORBUG-26477
Change-Id: I845d95c5ca46804691613177d7e285246b1593ba
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-25 15:00:01 +00:00
David Schulz
5a2b58550e Debugger: use Qt version from kit as fallback for dumper
Fixes: QTCREATORBUG-26456
Change-Id: If2cd664212b3fa07d7abaef7a1173f79716884bb
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 12:06:18 +00:00
Tony Leinonen
348c3c98a0 Update missing InputMethodHint values
More values has been added to qnamespace.h that were missing from
this qmltypes file.

Task-number: QTCREATORBUG-22231
Change-Id: I36eb32b70c2bb416ec3770bfe9098e6db7a10930
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-10-22 06:59:22 +00:00
Alessandro Portale
6fd8336b7f Wizards: Remove unused QtQuick.Controls-style preview thumbnails
These were never used. And updated ones are upcoming with the new QDS
application wizards.

Change-Id: I998c3c0b8cfa3033d8be46524db3ed978738e729
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-21 13:16:30 +00:00
Eike Ziller
bb9774de92 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: If8baed5564470e550a0ba5c7720915217eec2412
2021-10-21 09:13:03 +02:00
Orgad Shaneh
3871e40f43 Fix qHash-related size compatibility warnings by MSVC
Change-Id: I3b7981ce78b67db4b996f99682284a0b911d8cd7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-20 15:03:51 +00:00
Eike Ziller
89d37fb65b Merge remote-tracking branch 'origin/5.0' into 6.0
Change-Id: Ibcf3ada2824dbbaae8aed0903af61bc95c1c7ce7
2021-10-20 12:19:31 +02:00
Mahmoud Badri
5de4743bb4 QmlDesigner: Persist horizontal component library's selected category
Moved showing and hiding categories logic to Cpp side so that:
- Currently selected category is persisted when the component library
  model is reset.
- QML side is clean of the mix of logic and UI.

Also reworked some logic/variables that are making the logic complex.

Task-number: QDS-5215
Change-Id: I8e9f5893f37a982283f1b1be9fee022f0b8afa32
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-10-19 14:13:58 +00:00
Samuel Ghinet
df8b62c6fa Add new theme colors necessary for New Project Dialog on QDS
We need colors for the dialog box background, and for warning text messages.

Note: We currently don't have carefully picked colors for warning, so I used
standard yellow (ffff00). The values, for each theme, will need to be adjusted
later on.

Task-number: QDS-4490
Change-Id: I257522216b03610d9f12951e7cb6f7cfa182489f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-14 12:32:29 +00:00
Kaj Grönholm
d8a7c97fcb Use global picking API
When gobal picking is available (Qt 6.2+), use that instead of toggling
models pickable properties.

Task-number: QDS-4978
Change-Id: Id2a501ae97955128874447fa8a3b8afab3d1f2c7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-14 04:08:33 +00:00
Thomas Hartmann
8b45f1f6c5 QmlDesigner: Only create components as primitives if actually possible
The type might not actually be exported and imported as a folder import.

Change-Id: I0ada27d619727044c2f8b8a601a2632a44c5a7cb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-13 09:35:55 +00:00
Aleksei German
3ccf269f81 QmlDesigner: Fix for Binding Editor
- Makes Binding Editor modal
 - Fixes Binding Editors hotkeys and actions
 - Adds Target item, property and expected type into title

Task-numbers: QDS-2819, QDS-4878
Change-Id: Ib5c5f73e6552f58828776043f9b793a24c48a1f8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-12 08:09:19 +00:00
Miikka Heikkinen
9b6f60992c QmlDesigner: Update repeater parent when repeater properties change
Any time repeater properties change, the repeater parent should be
dirtied to ensure it rerenders. Often the rerender is triggered
incidentally due to other triggers, but e.g. in case model value is
changed to zero, or if model property is removed, no other trigger
causes rerender.

Also moved the repeater parent checks into QuickItemNodeInstance
to avoid polluting Qt5NodeInstanceServer with such stuff.

Fixes: QDS-5233
Change-Id: Idd89e23c5ad022d26f443d665dac81dc2cbb0b28
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-11 08:44:13 +00:00
Eike Ziller
2ae0d4d0b1 Merge remote-tracking branch 'origin/6.0'
Change-Id: I655155b35747082ac891a4b95e1680871d9b3234
2021-10-08 16:00:32 +02:00
Alessandro Portale
f3276a96e9 Wizards: Adapt QtQuickPrototype wizard to recent template changes
Handle the new isQt6 property.

amends: 77fed0b0fd

Task-number: QTCREATORBUG-26373
Change-Id: Iff6fb8f91954aa116b8f1c461c7db45f321325fd
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-10-06 13:21:33 +00:00
Miikka Heikkinen
2ab6f800b3 QmlDesigner: Fix issues with Components and Repeaters
- Fixed state preview rendering by deparenting nodes under
  component wraps.
- Ensure state preview image is always clipped to root item.
  The state preview bounding box broke when Repeater was direct
  child of root and had delegate with rotation.
- Allow dragging items under Repeater to create implicit component.
- Allow dragging Components under Repeater.
- Do not ask for target property when Component is dragged under
  any node.
- Update nodeSource properly when reparenting implicit component
  or removing last child of a Component item.
- Fixed scene update when last child of a repeater is deleted/moved.

Fixes: QDS-5197
Change-Id: Iaaf1745e25db3522ffc1dba7fd1b051da29f5aec
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-05 09:12:12 +00:00
Miikka Heikkinen
4036c20f63 QmlDesigner: Add Loader and Repeater to component library
Also fixes some issues with Repeater usage.

Fixes: QDS-5149
Change-Id: I259dcb73be634150dd0c5e602165b63112ec958c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-10-05 09:11:59 +00:00
Eike Ziller
5b1f14f4aa Merge remote-tracking branch 'origin/6.0'
Change-Id: Ic6f91a71dd7d540eb9b6c27ba5ef9931583566b5
2021-10-05 09:52:55 +02:00
Eike Ziller
31bcc0ca2c Merge remote-tracking branch 'origin/5.0' into 6.0
Change-Id: I311d1128c6a299c1db8717a12b40393055a889bb
2021-10-05 09:13:56 +02:00
Knud Dollereder
ed465a81f5 Do not reset the render-image size to (0,0) when reaching the size limit
The size of the image to be rendered for the FormEditor is computed from
the bounding box enclosing the items within the scene.
There is a size limit, when reached the size was reset to (0,0) leading
to an empty FormEditor image. This is now fixed by returning the
bounding box of the root item in case this limit is reached.

Change-Id: I58366610da2e90c34aea6117e225765ff4b3288b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-04 09:26:54 +00:00
Miina Puuronen
d0a4fc4b2c QmlDesigner: Implement a horizontal layout for Component Library
The view from vertical to horizontal is changed with Loader, depending
on Library's width. Vertical layout (old) is mostly the same as before.
Added new property categorySelected for categories. Items are also now
hoverable.

Task-number: QDS-4764
Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-30 13:07:56 +00:00
Henning Gruendl
502afc754b QmlDesigner: Fix ColorEditor gradient controls
Fix ColorEditor gradient controls not updating their value on changing
the gradient or selecting another item containing a gradient.

Task-number: QDS-5183
Change-Id: Icbec41f8db90f1e9c4ff0f3564ad6ed1df667f0f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-30 12:55:16 +00:00
Alessandro Portale
05e89384e2 Wizards: Turn icons into themed icons
Turn the current un-themed icons into icon masks which now get recolored
according to the current theme.

Change-Id: I435f9a43dae04797ad0b948992f77179d93164a8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-28 11:31:16 +00:00
Orgad Shaneh
74713e5ef1 Merge remote-tracking branch 'origin/5.0'
Change-Id: I7ca9791b95032a1f276c520f8eefde3801510eb9
2021-09-27 13:22:58 +03:00