Commit Graph

6879 Commits

Author SHA1 Message Date
Thomas Hartmann
12923a433f QmlDesigner: Add App postfix to project name in cmakelists.txt
Change-Id: Idae3a257ce8b93b7f172fe4a64d548cde54ab7ef
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-16 13:54:55 +00:00
Thomas Hartmann
bed1d5dbf5 QmlDesigner: Fix cmake template for Android
Task-number: QDS-6420
Change-Id: Iac4286b20d763debef082b48e266da121c43ff4b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-16 13:41:16 +00:00
Robert Löhning
59a721c0ea QmlDesigner: Compile fix for Qt 5.15
error: passing ‘const QQmlContext’ as ‘this’ argument discards qualifiers

Change-Id: I4fa9ed0098f5bd63925534459d1171d7c9430897
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-15 12:36:52 +00:00
Samuel Ghinet
ec55793a22 New Project Dialog: Use hover states for interactive items
Also, changed the "Save Preset" dialog so that, when the user presses
Enter, the dialog will be accept-ed.

Task-number: QDS-5741
Change-Id: I7056d1184a3d9d400ac718c8d434cf2ad36ed35e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-15 12:06:07 +00:00
Miikka Heikkinen
72e4287ac3 QmlDesigner: Fix navigator preview of Models
Now we resolve absolute source url for our preview model, so it
will always find the custom mesh files.

Also always use the Node type preview if the instance is a component,
even if the root node is Model. This ensures the preview works properly
in case there are child nodes inside the component.

Fixes: QDS-6204
Change-Id: I48ef273e5a5dca13abe25816b5edf0be7dd217ff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-15 10:45:24 +00:00
Tim Jenssen
6973ee14c4 qds: use double click to create a new project
Change-Id: I77c1d8ed483d5971135469231657d5580617242d
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-11 14:29:46 +00:00
Miikka Heikkinen
8b27281354 QmlDesigner: Show error message on import log for failed 3D import
The import is done on puppet side, so we use a log file to pass the
error message.

Also changed how import process is matched to the import, so that
exit code is no longer needed for this purpose. Crashes are also
now reported as import errors.

Task-number: QDS-6402
Change-Id: Ie14cd1df0bbba965d8e5f2aa7302a955e944379b
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-11 14:18:04 +00:00
Miikka Heikkinen
eeddae0d2b QmlDesigner: Fix runtime JS warning
Particle emitter gizmos do not have locked property.

Change-Id: I4f11dbd52256b365402e647024d4d258351a3c60
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-10 13:44:58 +00:00
Thomas Hartmann
234cdd1255 QmlDesigner: Fix design themes for alternating rows
We use the same color for base and alternativeBase, which has the
same effect as setting setAlternatingRowColors to false.

Task-number: QDS-6245
Change-Id: I1308b70790227327808d042f5b2626dd92db19ef
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-10 10:20:48 +00:00
Samuel Ghinet
ccc5cd04d3 New Project dialog fix: "Orientation" button doesn't work for equal sizes
If the width equaled the height, for the project, then the orientation
button didn't change visual state, when clicked.

Also, renamed some fields in qml from "project" to "preset", because
they actually refer to the preset, not to the project to be created.

Task-number: QDS-5925
Change-Id: Ia776b24e0bf29a4bdf0e2f9f6ff26e5c0137ba4f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-10 09:55:42 +00:00
Miikka Heikkinen
be9b71af2f QmlDesigner: Fix runtime puppet compilation error
Change-Id: I6c3b1ce317305b6cbc088971beaa1700b5327682
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-10 08:43:01 +00:00
Henning Gruendl
1960d8f2cf QmlDesigner: Fix currentItem undefined
Change-Id: I90abc31a9a89834ac6ff5addba407feafa25310d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-09 14:52:36 +00:00
Samuel Ghinet
a61f7db1ea Fix: Recents don't show up for Custom presets
In the New Project dialog for QDS, if the user had created a project
from a User-defined (i.e. Custom) preset, this preset did not appear
under the Recents tab.

Task-number: QDS-4989
Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-09 10:55:49 +00:00
Miikka Heikkinen
2c32c9c991 QmlDesigner: Deactivate particle system when locked
Particle systems are now deactivated in 3D edit view unless nodes from
exactly one system are selected. Selected nodes that are not part of
any particle system are ignored for this determination. This now also
includes deactivating previously active system when an empty
selection is received from creator side (happens e.g. when selected
system is locked).

Fixes: QDS-6405
Change-Id: I5b1636640594e51db5d6e725684075727536b1a5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-08 11:32:54 +00:00
Samuel Ghinet
618eda3572 Implement custom presets
Task-number: QDS-4989
Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-08 09:39:43 +00:00
Miikka Heikkinen
ec02c157ee QmlDesigner: Simplify hidden and locked handling for gizmos
There is no need to have an event filter to listen to changes to
_edit3dLocked and _edit3dHidden properties, as they are only changed
in one place. We can simply emit the change notification there.

Fixes: QDS-6403
Change-Id: I8136f38fd8e435e3a4dbd69d70169496e1675dfa
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-08 07:38:41 +00:00
Mahmoud Badri
c250d31ca0 QmlDesigner: Enable dropping external assets to a specific folder
Fixes: QDS-6311
Change-Id: I25bccfa6788e3b5d47fc598decbf7e03a00399b4
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-04 10:14:00 +00:00
Miikka Heikkinen
98673190ad QmlDesigner: Add visualization gizmo for ParticleEmitter3D
Particle emitters are now visualized in 3D edit view either by
a small sphere for point emitters or by a proper model for
model based emitters. The visualization model is rendered
transparent. The visualization models can be displayed either
always or only when the parent particle system is active
in editor.

Trail emitters are not visualized, as any visualization would
be misleading, since these emitters follow generated particles.

Fixes: QDS-6189
Change-Id: Idb6f12cadd9cea8110e5290cc18443aeb62c38d6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-03 09:34:57 +00:00
Mahmoud Badri
85eae98e6e QmlDesigner: Allow deleting multiple selected assets
Also small relevant cleanup to the code.

Fixes: QDS-6312
Change-Id: I31ed0204ad9ae541a822cc4b58ef303aa3da7a68
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-01 11:59:43 +00:00
Thomas Hartmann
5a31ba3564 QmlDesigner: Change states thumbnail size to 320, 320
Task-number: QDS-6390
Change-Id: Id125e96a6b1615b7ac5c8eafe680f61b84a5353c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-01 10:26:41 +00:00
Mahmoud Badri
5d770bc8c4 QmlDesigner: Fix overlap of empty assets placeholder and search box
Change-Id: I959073fb037fad6d960821297d8546951e748343
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-28 13:33:27 +00:00
Thomas Hartmann
ee4757a8e8 QmlDesigner: Use LoggingCategory in ImageContainer
Change-Id: Ibdce399fc2df19883d6ffd12e9441c58d46035ec
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 20:47:09 +00:00
Mahmoud Badri
45364d4327 QmlDesigner: Disable scrolling when context menu is open
Disable components and assets views scrolling when the context menu
is open.

Fixes: QDS-6317
Change-Id: Ibdbf29b14d0383fd2b876c655ccb17c35fdb6aff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2022-02-23 18:12:22 +00:00
Mahmoud Badri
ed21e25e14 CrashPad: Remove the 1 crash per hour limitation
Change-Id: Ie7634012f15059fd204cb03e37afd3d63d7bfb29
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-02-23 13:00:59 +00:00
Thomas Hartmann
a62aef2438 QmlDesigner: Set proper size if there is no project import
Change-Id: I29d8dbbac49c694439a600cfe393c6a475362714
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 12:39:49 +00:00
Henning Gruendl
872a93447b QmlDesigner: Update import version wizard qml.tpl
Change-Id: Ie1cdc6bd18cec1f6e0d1492033f43c23717d68a9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-22 16:47:13 +00:00
Thomas Hartmann
d913f5d886 QmlDesigner: Add comment to .ui.qml files
Add comment to the beginning of .ui.qml files that explains that
.ui.qml files are declarative.

Task-number: QDS-5964
Change-Id: Ie49bae33fb18ee42d4ab20986b72c2deadd5b734
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-22 16:11:11 +00:00
Thomas Hartmann
456a949244 QmlDesigner: Add comment to all .ui.qml files in wizards
Add comment to the beginning of .ui.qml files that explains that
.ui.qml files are declarative.

Task-number: QDS-5964
Change-Id: I040443b42a0e2907452d5b6d9d056746d3b75ff3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-22 16:09:30 +00:00
Thomas Hartmann
4cc94375d8 QmlDesigner: Rename custom className property to classNamePrivateInternal
This property is used for the class name, but "className" could be also
used by the actual application.

Task-number: QDS-6309
Change-Id: I752fafbcae434a8b2b96646e2473b6fedd93a160
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-22 15:26:19 +00:00
Henning Gruendl
e714b04242 QmlDesigner: Fix shift in component type TextField
Change-Id: I5dc4f7b0887405082456b511b57598e3e6e38ec0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-22 14:08:19 +00:00
Henning Gruendl
08668e71da QmlDesigner: Disable fill type outside base state
Disable fill type ComboBox in ColorEditor when not in base state. Add
tool tip to make user aware.

Task-number: QDS-6184
Change-Id: Iee5644fff16fe93f2090e1cb117e96bb436fe1dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-22 12:22:13 +00:00
Thomas Hartmann
3f078ee89d QmlDesigner: Add preview of pure 3D component in form editor
If the root node is a 3D node we show a preview similar to
the state preview in the form editor. The size of the preview
is hard coded as (640, 480).

Change-Id: If7f96522b093c17422fa38102bffe11ede016063
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-22 10:43:49 +00:00
Thomas Hartmann
3be545123a QmlDesigner: Add QMLSCENE_CORE_PROFILE for Qt 5
Task-number: QDS-5522
Change-Id: Iff3591e05a172716f3f37963e0430875e3ad9e04
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-21 13:22:14 +00:00
Thomas Hartmann
6104806208 QmlDesigner: Add new workspaces
Task-number: QDS-6234
Change-Id: I839459c18fd0937615d97c7b74584e97300b430b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-02-21 11:32:26 +00:00
Alessandro Portale
a0d19e088e Wizards: Remove the .ui.qml wizard
Qt Creator does not offer editing .ui.qml documents, so it should not
produce them. For creating and editing .ui.qml, please use Qt Design
Studio.

Fixes: QTCREATORBUG-27085
Change-Id: I8bce9379a4bff8762a694067c25a0b266c41c417
Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-02-18 15:55:22 +00:00
Thomas Hartmann
8538f919ca QmlDesigner: Adjust wizard template
Instead of using the constants we can use the size of the
main screen directly. This has the advantage that if
the size of the main screen changes without adjusting
the constants it still works.

Change-Id: I602cf4089249e90efb6a35b803d67df6ca2b1bab
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-18 10:59:07 +00:00
Leena Miettinen
1f3e6b4c7a Android: Fix punctuation and wording of messages
Task-number: QTCREATORBUG-27055
Change-Id: I4180717163ec52a405c40e1a932713dda27c3f38
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-18 07:27:41 +00:00
Mahmoud Badri
81c9051feb QmlDesigner: Fix rename asset folder dialog's error text width
Fixes: QDS-6202
Change-Id: Iea6714561ce23e3a18889ab5d684fbeae85d62fe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-17 14:16:49 +00:00
Mahmoud Badri
9c4e4309f8 QmlDesigner: Close Assets Library context menu on press outside
Fixes: QDS-6197
Change-Id: I0c694b5a64bc0a41e905523b16552d6b0493eac6
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-17 13:57:52 +00:00
Leena Miettinen
1a90f06fe5 QML Designer: Fix UI text
Fix capitalization of strings and the wording of tooltips.

Task-number: QTCREATORBUG-27055
Change-Id: Id8e324b44574b9cf0d1522ae204b452cea6193cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-02-17 12:05:26 +00:00
Christian Kandeler
120218e0fd Update qbs submodule
... to HEAD of 1.22 branch.

Change-Id: Ib15854a88b6265f341c42f2b62d67f914fb9e747
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-17 09:18:12 +00:00
Miikka Heikkinen
6173b78860 QmlDesigner: Allow going into component from item library
Added "Go into Component" to item library context menu for items that
have customComponentSource available. Doubleclicking on the item also
does the same.

Fixes: QDS-5786
Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-15 14:43:47 +00:00
Mahmoud Badri
d1fd23100a QmlDesigner: Fix assets library warning case
Fixed a warning that appears if the search moves from the
"no match found" case to a match case. Also added a small optimization
to searching.

Change-Id: I9e4759fe00959bcbe1a7018c1bdc6cc43069fca7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-14 17:12:33 +00:00
Christian Kandeler
b31a569b36 Project wizards: Use more recent default C++ standard version
Fixes: QTCREATORBUG-27045
Change-Id: Ia637c6f364d4f651c56f7ffab649fa8e62b5a2cb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-14 14:02:06 +00:00
Tim Jenssen
f9cceb6267 qds: remove redundant "QtStudio" feature
Nowadays, the decision which wizards will be shown are
done throw the StudioWelcome plugin if it is initialized or not.

Change-Id: Ief95fa8f813408522ac43c31dd6f4ffb069338d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-02-14 10:33:26 +00:00
Christian Kandeler
fde7b90ee9 Fix some warnings
Change-Id: I2991f0ab84b26c93c0dbe2ec79f7638d299e3d39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 12:14:27 +00:00
Henning Gruendl
92c786d21e QmlDesigner: Add new color values
Add DSgreenLight, DSamberLight, DSredLight colors

Task-number: QDS-6174
Change-Id: I59e745aabc8b8182c36027f875af7709f8c62060
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 11:35:28 +00:00
Henning Gruendl
3688ee17fc QmlDesigner: Add new icons to icon font
Add downloadUnavailable, downloadUpdate, downloaded icons

Task-number: QDS-6174
Change-Id: I473cd786b3eb12aeb79b737141a7bb8da381e0e5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2022-02-11 10:42:01 +00:00
Eike Ziller
b98de260e3 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I61bc71d3a4e786b5392aed408f0efe4d28fe7e67
2022-02-11 10:49:15 +01:00
Thomas Hartmann
52e3f2cd5f QmlDesigner: Cache last image in 3D view and add busy indicator
This patch caches the last image from a document/model.
The result ist that when reopening a file in the 3D editor
the user sees immediately something.
Since the view is not interactive, yet, we show a busy indicator
until the view is fully initialized.

Change-Id: I26c8b0ea69f98ceb41580624c51d48d1e633ab80
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-10 21:00:11 +00:00