Commit Graph

32 Commits

Author SHA1 Message Date
Mahmoud Badri
6bdaac3b20 EffectMaker: Don't clear effect name when clearing the nodes list
Change-Id: Ic805d72b2600db88dab9887552faa8aef19423d7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-01-18 09:18:56 +00:00
Mahmoud Badri
dc42b62ddf Effect Maker: Enable helper nodes
Helper nodes are nodes that another node depends on and are added
automatically when the depending node is added. Helper nodes are
placed before all other nodes. Helper nodes that do not contain
any properties are not shown. Helper nodes keep reference count
and are removed when last referring node is removed.

Task-number: QDS-11193
Change-Id: I036019afb1414ec6e98b2f949a18bd217753a910
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-14 15:17:22 +00:00
Mahmoud Badri
434d0faaa0 EffectMaker: Add 'assign to selected' feature
Fixes: QDS-11444
Change-Id: I17b5397b88eeccaae585e84d7ce62f4f80474f87
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-14 09:39:30 +00:00
Mahmoud Badri
ff03588f7e EffectMaker: Add 'save as' functunality
Also some tweaks

Change-Id: Icc4767b816d1917cd674b20283d43e33ffb36219
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-14 09:37:40 +00:00
Mahmoud Badri
d9774e7faf EffectMaker: confirm save changes before opening an composition
Change-Id: I05659e4cdeba5dc5f437d2fb99bc3768c6a1522d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-12 13:49:43 +00:00
Mahmoud Badri
9d8aa76b4c EffectMaker: Show save popup when adding a new effect
when there is an untitled effect composition in the effect maker.

Change-Id: I3d905202e52b1242949d72f1870d4cc06efe080b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-12 12:16:04 +00:00
Mahmoud Badri
2af5ce7fa9 EffectMaker: Generate unique effect name when saving
Change-Id: Ib602b778d810fe0d6c0d70879b1002c1749fe196
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-11 14:59:24 +00:00
Mahmoud Badri
cc07031cd6 EffectMaker: Improve adding and saving compositions
Add and implement 2 icons for adding and saving compositions.

Fixes: QDS-11511
Change-Id: I113eeb81ea05fc6db9019d95d476bc0fe20b409f
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-08 15:41:50 +00:00
Miikka Heikkinen
fc456a74d4 EffectMaker: Fix crash after opening saved effect when nodes exist
Clear and removeAllNodes functions were consolidated into one clear()
function, which now properly resets the entire model. This makes UI
properly synced to actual model state when composition is opened, so
the phantom nodes will no longer appear.

Fixes: QDS-11347
Change-Id: I204760cca6af669daa43a18bfb199dfbf14b73cb
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 13:59:04 +00:00
Miikka Heikkinen
77678c7bce EffectMaker: Add clear all nodes button
Fixes: QDS-11335
Change-Id: I5d0e0e11baabe780c19234410814a9f6eb45130d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-21 11:36:23 +00:00
Miikka Heikkinen
10792b1eb3 EffectMaker: Fix effect node deletion
Now the correct node is deleted.

Fixes: QDS-11330
Change-Id: Id7402ea6b4f258d32e851de2118e53f26a6c632a
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>
2023-11-21 08:50:47 +00:00
Amr Essam
306ce4ab35 EffectMaker: Open saved compositions
- Also fixing issues related to image paths
- Composition name is shown in save dialog when re-save
- Clear current composition for reset or open a new one

Task-number: QDS-11192
Change-Id: I97aad4b5216e6b116343bb274db0f9abd1275fec
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-15 14:29:52 +00:00
Amr Essam
c946a30f36 QmlDesigner: Save effect resources
Also effects are now can be dragged in the form editor

Task-number: QDS-10500
Change-Id: I5a701b8077231bcbb299c0c4f1cbf2f5173a14dd
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-09 23:05:34 +00:00
Amr Essam
0cbda147a8 QmlDesigner: Export effect maker composition qep project into assets
Meanwhile, composition resources are not yet exported

Task-number: QDS-10500
Change-Id: I3687d1d62a64472c7ec84716c584dced5fbb6a85
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 10:02:19 +00:00
Mahmoud Badri
d9ab8e8bef QmlDesigner: Update light baking and effect maker pause icons
Also hide the code icon from effect maker

Change-Id: I1045a0718b5b86ef13164e215e5f0f1420487497
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
2023-11-08 14:53:15 +00:00
Amr Essam
2b39682889 QmlDesigner: Add effect maker animation support
Task-number: QDS-11145
Change-Id: I59c68199a5616c095e9cac06a53fbc6a0635d6a8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-06 13:06:59 +00:00
Mahmoud Badri
3a2927e200 EffectMaker: Allow scrolling color editors
This also removes a warning when using the mouse wheel over the
color editor.

Fixes: QDS-11066
Change-Id: Ic32cb7d74c77ea29566a9f2f7f8dbd464d1ed6ab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-30 10:08:29 +00:00
Amr Essam
96dfdfc0b7 QmlDesigner: Fix some parsing issues in effect maker
Task-number: QDS-10987
Change-Id: Ifeb42f9e04ba39ddaa45a03b60eb12ce1652c61a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-20 11:45:44 +00:00
Mahmoud Badri
1d04d50c78 EffectMaker: Add save dialog
Change-Id: Ic538e6c8c9d3ac19bd8726b95d93a9b1f292a437
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-20 11:12:12 +00:00
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
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
Mahmoud Badri
c5c1612c6b QmlDesigner: Implement disabling effect maker composition nodes
Disabling happens using a new button added to the section.
Also a small tweak to disable drag button when there is only one section
in a category.

Fixes: QDS-10575
Change-Id: I33884a5b333c54b2bae650943940d4858f489f7a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-09-07 14:53:06 +00:00
Mahmoud Badri
9bbe78df8b QmlDesigner: Implement effect maker node drag to reorder
Also small relevant tweaks

Fixes: QDS-10411
Change-Id: I332482d4726c79786edbc0a5fa1e8f6489d77f11
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-05 09:12:33 +00:00
Mahmoud Badri
e6529d3d0e QmlDesigner: Wire effect maker composition node value to UI
Wire the value, min/max values to the UI. Also small relevant UI tweaks.

Change-Id: Id067cabd07bdc3ec02682a0a78c01a31e65ecdf6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-08-21 12:06:24 +00:00
Mahmoud Badri
85bf537fc0 QmlDesigner: Implement basic composition node delegate
Task-number: QDS-10404
Change-Id: Ia456fb96c157d5e8d6206732c90d761c59b27fab
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-08-17 13:52:07 +00:00
Mahmoud Badri
b4d153562b QmlDesigner: Add effect maker main UI buttons and toolbars
Also refactor some components into separate files.

Fixes: QDS-10409
Change-Id: Ifb6380214b85d9f1d67fbb99269d135234abf1d5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-17 08:39:59 +00:00
Mahmoud Badri
bf6ea8496a QmlDesigner: Refactor Effect maker nodes view
Also add node click handler

Change-Id: I4b4e327f5c69f27d64ef2f2c3d13628aea46f0af
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-08-15 13:08:33 +00:00
Mahmoud Badri
0c6bc8382f QmlDesigner: Add a ScrollView to the effect maker nodes popup
Also make nodes size smaller and small tweaks to margins.

Change-Id: I044684d1a57d1da2ed8b5768df80fb0948f94882
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-08-15 08:36:09 +00:00
Mahmoud Badri
56303d62a6 QmlDesigner: Load effect maker nodes' icons
Also remove some unused code.

Fixes: QDS-10426
Change-Id: I71c4fde339261e2856472c15bde56ee8850ed236
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-08-14 09:15:27 +00:00
Mahmoud Badri
6e2c62776b QmlDesigner: Implement effect maker nodes popup and load data in it
Change-Id: I95625f2eaf8aac71679b2f816dd20a9167849830
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-08-11 10:13:04 +00:00
Mahmoud Badri
63dd551b06 QmlDesigner: Add effect maker nodes popup window
Barebone combobox custom popup implementation. This allows the popup to
extend outside the Qml limits. Window content to be implemented
separately.

Task-number: QDS-10403
Change-Id: Ic59d6a8436630d1dcd76063425ce311e5bdff190
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-10 07:57:33 +00:00
Amr Essam
64377d9e0c QmlDesigner: Implement effect maker view
Initial basic logic for a view and simple functionality to be extended.
The view is hidden by default during development and enabled via an env var.

Task-number: QDS-10401
Change-Id: I5c2e1e20aca6c53c1ed273136ee6204145f15def
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>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
2023-08-08 11:56:31 +00:00