Commit Graph

8373 Commits

Author SHA1 Message Date
Shrief Gabr
f5cb1530a4 QmlDesigner: Add context menu to the cell
Task-number: QDS-11253
Change-Id: I4b93feb867d0d78d9e9b473c9dd6a645c031ccaf
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-01-16 14:09:12 +00:00
Ali Kianian
daf23602fe QmlDesigner: Use ColorEditor as view delegate in CollectionEditor
Use StudioControls.ColorEditor as a view delegate for the
CollectionDetailsView

Task-number: QDS-11114
Change-Id: Ic91d734c4fc62ddb51c4db7029714d409d51b732
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-01-16 09:23:39 +00:00
Mahmoud Badri
f8e9592824 QmlDesigner: Prevent saving an effect with invalid name using keyboard
Fixes: QDS-11605
Change-Id: Ice1cdc715c24534d045491ede3dbfc0c3e0cbe59
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-01-15 16:02:37 +00:00
Karim Abdelrahman
94125f9416 QmlDesigner: Disable MCU unsupported workspace and views
This patch disable unsupported 3D workspace and some views
from view menu and toolbar combobox

Task-number: QDS-10336
Change-Id: Ic97baead8029a93ae95707b9349f81f02adb6335
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-01-15 12:43:38 +00:00
Ali Kianian
208fa8f3e7 QmlDesigner: Select columns by left click on Model Editor
* HelperWidgets.ToolTip is replaced by ToolTip in order to prevent
mouse are conflict
* The content of the tooltip is updated by activation
* CollectionDetailsModel notifies changes on column type

Fixes: QDS-11591
Change-Id: I0b5e42b7a8656e3119f7ac60f6be78d6ca46e055
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-01-12 11:22:08 +00:00
Henning Gruendl
009b664b7b QmlDesigner: Avoid ScrollView flick deceleration
Slow down the deceleration of the HelperWidgets.ScrollView by setting
flickDeceleration to a high value.

Change-Id: Ib001968a545984d570f5ac1d9f242d5071bee867
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-01-08 14:11:29 +00:00
Henning Gruendl
e6cc2eeba6 QmlDesigner: Fix unfocused TextField selection
Change-Id: Idd5438fa77d4aa783f71a6826b3e2234da326c34
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-12-19 10:44:25 +00:00
Miikka Heikkinen
6bf7ae11a0 Effect Maker: Change blur helper to match helper on qtquickdesigner
When running effect in project, source property for effect doesn't
seem to have actual dimensions, so use the root item dimensions.

Task-number: QDS-11542
Change-Id: Ibc4053224de8882dead338f1833bf65397f5eac3
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-12-19 09:16:00 +00:00
Ali Kianian
f41b69159b QmlDesigner: Extract unique property name by collection name
- The property names of the data store are defined after converting
collection names to a proper unique property name.
- Now, Spaces are supported in the collection names.
- Collection property names will remain the same by collection
renames, and only the modelName will change

Task-number: QDS-11462
Change-Id: I2031c2e0a9afc5388386dc6e54c66e75f0d13ded
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
2023-12-15 14:08:21 +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
Shrief Gabr
6b6f74ccad QmlDesigner: Create data type warnings for CollectionDetailsModel
Task-number: QDS-11079
Change-Id: I8cb5167d71ff96d01313bc559401e16f0925afbb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-12-14 13:12:57 +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
Tim Jenssen
d186d9df6a Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I0a598ba1b4d57be361a7a203d0c39e99b5cd5fba
2023-12-13 14:53:17 +00:00
Mahmoud Badri
82a0ae5caf QmlDesigner: Add 'save as' icon and update zoom and save icons
Change-Id: Id05dd67407dd8a4db0056caa94c61b459bd4ab23
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-12-13 09:38:31 +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
Shrief Gabr
8f51c7a75d QmlDesigner: Modify model export functions
Task-number: QDS-11298
Change-Id: I919c8cd4ecac4bad7dab4d4fdf2d1cf3548cd95b
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-12-11 14:51:19 +00:00
Mahmoud Badri
fba2fda788 EffectMaker: improve save changes dialog
- move cancel button to the left
- rename don't save to discard changes
- update buttons sizes to match their content
- remove few useless parts and reorganize the layout

Change-Id: I08308a90082b0c73ff9a6bf34b255764e07f20df
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-11 14:09:20 +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
Shrief Gabr
5f26d1e4eb QmlDesigner: Remove datatype names from column
Task-number: QDS-11460
Change-Id: I9501db735a5b0b4eb54740b8a4d3e20287aa4207
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-12-08 10:51:10 +00:00
Mahmoud Badri
268fa9fe65 EffectMaker: Show current composition name
Fixes: QDS-11442
Change-Id: I047040e42fd60c00abe2be7e2210fc8bb53678cb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
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-12-08 09:04:43 +00:00
Mahmoud Badri
dfcb3d0462 QmlDesigner: Improve collection editor edit column dialog
- move name and type fields to same line as their labels to reduce
dialog's height
- remove "force" option, force by default after showing a warning
- focus and select name field upon dialog open
- when opening the dialog for last column, align right to avoid overflow
- bunch of cleanups and naming improvements

Fixes: QDS-11245
Fixes: QDS-11250
Change-Id: I613a9cf693320b0bc0768ea709eb47e00d218222
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>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
2023-12-08 08:57:07 +00:00
Miikka Heikkinen
b5370c435e EffectMaker: Block adding same effect node twice
The actual blocking is done at uniform level, as the problem of having
same effect node twice is duplicate uniforms.

Fixes: QDS-11470
Change-Id: I77b15b4a207efaebff39b4f6b1700d70262abcdb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-07 08:37:29 +00:00
Friedemann Kleint
332a742e0b pdb: Fix command line arguments
pdbbridge uses exec() on the main file which causes the inferior to
use its sys.argv. Inferiors using argparse would then fail since they
cannot make use of the working directory passed.

To fix this, append the inferior arguments separated by "--" and
change sys.argv accordingly.

Change-Id: I35caf4b3ec19c5259c0d4235787c03a3e592768a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-06 12:20:48 +00:00
Ali Kianian
70f9e35c62 QmlDesigner: Polish the ui of the Model Editor
- The main toolbar of the Model editor is aligned with the rest
  of the ui
- Update/Save icon is updated
- Tooltips for save and export actions are modified
- Minimum size for the Model editor is applied

Fixes: QDS-11449
Fixes: QDS-11244
Change-Id: Ice389ae439ac855eb3a5d3197a2365e6d2506a90
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-12-04 10:06:10 +00:00
Miikka Heikkinen
6e566bac27 EffectMaker: Hide properties that use custom value
These properties would require custom editor, so hide them for now.
Typically there is no need to change these values from defaults.

Fixes: QDS-11419
Change-Id: Ia91d48f5df86885420dccef47ed024af4cc8f430
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-12-01 14:12:09 +00:00
Henning Gruendl
277463bb90 QmlDesigner: Fix ColorPicker EyeDropper
Task-number: QDS-11451
Change-Id: I8889e0475647bec480757652b84a5751642a6a07
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-12-01 13:55:34 +00:00
Henning Gruendl
db0e1a62fc QmlDesigner: Fix UrlChooser tooltip binding loop
Task-number: QDS-11454
Change-Id: I519df644b4a034bcb103eeecc8bbf52504a9036d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-01 13:16:05 +00:00
Henning Gruendl
25ec12ac17 QmlDesigner: Fix property name for SectionLabel
Task-number: QDS-11469
Change-Id: I7b7d772792fe79d6d3ccc34e8a58c92a018cca6e
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-01 13:15:16 +00:00
Henning Gruendl
64b50adbf6 QmlDesigner: Hide categories in Qt Insight view
The configuration file of Qt Insight changed its form which means
predefined categories were dropped and events took over. The insight
view needs to be improved in that matter. For the upcoming release we
hide categories all together in order to not create confusion.

Task-number: QDS-11443
Change-Id: Ia5faa8574d4c856c8a8ee341f74dc97094fc6cee
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-30 17:40:43 +00:00
Fabian Kosmale
04ebd7b9c3 QmlDesigner: Cleanup HelperWidgets ScrollBars
Change-Id: Ifc49b0a8c629cb6ed65851a782fe1280079b4a5e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-30 17:38:45 +00:00
Fabian Kosmale
a6a8a094c5 HelperWidgets: Explicitly import Basic style
HorizontalScrollBar and VerticalScrollBar customizes ScrollBar. The
default Controls style used in Qt 6 depends on the platform the
application runs on, and in case of Windows, it will use the native
Windows style. The Windows style is not customizable. To avoid issues
(like warnings about transitionDuration not being defined), explicitly
opt into the Basic style, which can be customized.

Fixes: QTBUG-107771
Change-Id: I141b3466964e5c3c64b39ca73a85eac14b9b6202
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-30 17:38:35 +00:00
Ali Kianian
85e8f7e998 QmlDesigner: Remove the collection source item from the ui
- Collection Source Model item is removed from the ui
- Collection items are realigned

Task-number: QDS-11416
Change-Id: Ia185907dec9221494c3551a3a679886910f9cfeb
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-30 11:51:01 +00:00
Mahmoud Badri
1423740e09 QmlDesigner: Add save icon to the icon font
Change-Id: Ic88f61f19142a42cc456cb85f836ea9ed5635c07
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-30 09:51:09 +00:00
Ali Kianian
206ad75359 QmlDesigner: Assign a single collection model to the selected node
Task-number: QDS-11217
Change-Id: I35eb536540faa2299a51d152a29f07c2c36abe41
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-29 14:11:26 +00:00
Ali Kianian
37cca63593 QmlDesigner: Cleanup the templates for DataStore
- Fix the bug which disables the live preview
- The singleton of the DataStore is defined once
- Also modifies the template file formats of the DataStore files

Fixes: QDS-11430
Change-Id: I67e0f64355dccdc32c031bb4dc0fb8edf3fdf64a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-29 13:42:07 +00:00
Thomas Hartmann
c5f023751f QmlDesigner: Use QDS 4.3 in project template
Change-Id: Ib9a6198512115780b6586242294c1c82fccd22dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-28 15:33:01 +00:00
Tim Jenssen
ec59bab491 QmlDesigner: correct JavaScript name
Task-number: QDS-10810
Change-Id: I74c97600fd6284743eb06afcbf4d93d0f6c67633
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-27 08:05:13 +00:00
Aleksei German
fceb1a2e63 QmlDesigner: Fix Kit selector for MCU projects
Task-number: QDS-10337
Change-Id: I896eb826d75fd9ee08e083d45b8f7180abf53c37
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-11-24 15:26:28 +00:00
Miikka Heikkinen
e1d450bcaf EffectMaker: Don't allow saving with pressing enter if save is disabled
Fixes: QDS-11392
Change-Id: Ia600489b39d58a0224f17856f9ab6e2110faee82
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-24 13:40:37 +00:00
Thomas Hartmann
e2c1cfb69f QmlDesigner: Add wizard data for models and backend json data
Added the new files to all wizards, since the change of the
qmldir file otherwise breaks the wizard.
Adding json files to qmlproject for cmake generation.
New files have to be added to cmakefiles.txt.

Change-Id: If00eb4507b6f1364ce3cfa00db39632635febd09
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-24 11:49:23 +00:00
Ali Kianian
50fe4051e3 QmlDesigner: Add the Collection Singleton to the QDS template
Change-Id: I8bad907766dfa0f630cee935d2b587fc613b0922
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-22 16:25:40 +00:00
The Qt Project
ccc9010d26 Merge "Merge remote-tracking branch 'origin/12.0' into qds/dev" into qds/dev 2023-11-21 15:58:24 +00:00
Tim Jenssen
cdb6a5f291 Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I6adb244f39b7d13377cdf377e95d11415603f8ac
2023-11-21 15:58:17 +00:00
Mahmoud Badri
ef6dfc1c76 QmlDesigner: Center the model editor's empty message
Change-Id: I2d26d2a89bdd822a4c9172bbe4b652be642a0d34
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 15:55: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
Mahmoud Badri
b14037f537 QmlDesigner: Add clearList icon to icon font
Change-Id: Ib60120dccca106e723d7eb2fe21ef574de62605a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-21 09:04:46 +00:00