Commit Graph

8715 Commits

Author SHA1 Message Date
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
David Schulz
09e94ae4ac Python: use kits page in python wizards
Change-Id: I1f7aaf145443481546abb868c8c167186600b848
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-28 12:17:14 +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
Eike Ziller
c75a3bcd5d Merge remote-tracking branch 'origin/12.0'
Change-Id: I0ee9c73d7a7e12f98f88b161c35d00ada069cc9d
2023-11-21 14:46:01 +01: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
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
Alexandre Laurent
6e219addb2 Update French translation for QtCreator 12.0
Change-Id: I41ac396ad9cd2b12dff4258278e1384adeda6377
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Olivier Delaune <olivier+qt@delaune.info>
Reviewed-by: Johnny Jazeix <jazeix@gmail.com>
2023-11-20 20:11:11 +00:00
Eike Ziller
e33c15c75d Qt Quick/DS wizard: Fix the QML import path
The wizard builds custom components to a "qml" subdirectory, which the
QML engine is told about in main.cpp, but we need to tell the code model
too, with a QML_IMPORT_PATH cache variable.

Without this, the QML editor shows errors for the module imports.

Change-Id: Ie48e809e2d51cc796c6c6c186a81c67e23a3609b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-20 17:02:56 +00:00
Ali Kianian
96ddb5da8b QmlDesigner: Remove the options from adding model dialog
Task-number: QDS-11234
Change-Id: I064d2fed81a8f2592cfefae2c603b2d790b6bfb3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:59 +00:00
Ali Kianian
9a55e5c3de QmlDesigner: Import a model to the default JSON model group
Task-number: QDS-11312
Change-Id: Ib97273a15db4c7fb46ed01debf99602b71ec7630
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:52 +00:00
Ali Kianian
16e06a0af0 QmlDesigner: Move the action for adding a collection to json
The action should be moved to the tool menu of the Json Collection

Task-number: QDS-11256
Change-Id: Ieb2c9cc4f4b992f1ac3225bbbd90e3d14afdc711
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:42 +00:00
Ali Kianian
42405ffa74 QmlDesigner: Fix the bug for saving collection
- The node resolved path was wrong.
- Also the saving method is cleaned up.

Change-Id: Ic905c20e5899fcc23c97a8d42a1fdf7c0c8e1089
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:33 +00:00
Miikka Heikkinen
9d0fd52a7c EffectMaker: Fix combo box open/close behavior
Fixed inconsistent opening and closing of preview and add effect popups,
when clicking on the content part of the combo box.
Also, pressing Escape now closes opened combobox popups.

Fixes: QDS-11307
Change-Id: I3b3fddbaa743c77fd60833378ab809b17a8f1a84
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 14:52:17 +00:00
Ali Kianian
414649e385 QmlDesigner: Remove the export popup
Task-number: QDS-11242
Change-Id: I3ef24a41e58162eeb34fcf0f220d5854410fbb73
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>
2023-11-20 14:51:39 +00:00
Miikka Heikkinen
38205996af EffectMaker: Add the default image to UrlChooser combo for image values
Fixes: QDS-11221
Change-Id: Ib788c6950c9fc59fd87e199ab6c54bdd274cc8a2
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>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-20 14:51:02 +00:00
Miikka Heikkinen
a2b195580b EffectMaker: Fix popup geometry
Effect Maker preview and node combo box popups will now stay within
the screen boundaries of the screen the parent combo box belongs to.

Fixes: QDS-10512
Change-Id: Ibbfb706499c4b17e27ff5ae471fef8bb9f7384cb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 09:41:13 +00:00
Eike Ziller
1c4de485da Merge remote-tracking branch 'origin/12.0'
Change-Id: Ib09af70f157a6c7d6cbda4e3de678fd2bbceb229
2023-11-20 09:48:43 +01:00
Eike Ziller
fd256b57de German translation: IncrediBuild
Change-Id: I9b801fe83b681551b123ce167a34ec44249a8bd6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-11-20 07:15:52 +00:00
Henning Gruendl
5316586a0a QmlDesigner: Fix popover position
* Remove chevron

Change-Id: Icd27f26e75c09561b2ec5fb8cf1f80dad7dd5b86
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2023-11-17 18:45:56 +00:00
Henning Gruendl
84cf414a1a QmlDesigner: Fix color editor details model
Task-number: QDS-11268
Change-Id: I043c5a4144778d29c54df9e448a86c855270f427
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-17 18:37:56 +00:00
Thomas Hartmann
32e9f3cfd4 QmlDesigner: Rename boolean to bool
boolean is not a QML type and Qt 6.5.4 does check this.

Change-Id: I09055cfecf8f91766c8c4f2806150fefa7301741
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-17 14:28:42 +00:00
Ali Kianian
18461884e0 QmlDesigner: Fix the bug for overriding Final property
Task-number: QDS-11301
Change-Id: I11a9941a344f7091405bd8e4cd5de10bf66c6c2e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-17 13:26:01 +00:00
Jarek Kobus
ea5195afff Translations: Update Polish translations
Change-Id: Ibd4f5736eceed9c2eee4f8e4b6efa17d4b33e539
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Patryk Stachniak <patryk.stachniak@scythe-studio.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2023-11-17 11:27:02 +00:00
Jarek Kobus
20752a7811 Translations: Clean update of Polish ts file
Change-Id: Id4ec2377443b8fe42fa51f38c63a7a6c3bd6e6ee
Reviewed-by: Patryk Stachniak <patryk.stachniak@scythe-studio.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-17 11:26:52 +00:00
Henning Gruendl
c3f9d43aca QmlDesigner: Fix PopupDialog popup location
* Restrict popup location to single screen given by global position
* Reintroduce PopupDialog title bar drag
* Fix global popup show on linux

Change-Id: If1923151cb9d0ec4286f27aeae2baa292e017eb5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-16 17:57:28 +00:00
Tim Jenssen
9f1d23df00 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Ic852bc9977d0292fb6cd93a319f4bfdebb22a1b0
2023-11-16 17:17:46 +01:00
David Schulz
8c337722d0 LLDB: check for msvc/windows target in lldbbridge
Change-Id: I404630592e021688628d02ec71ea00cb2db8358e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-16 11:27:29 +00:00
Ali Kianian
95dfd52712 QmlDesigner: Fix the delete dialog size problem for CollectionEditor
Task-number: QDS-11284
Change-Id: Iba60a27b0037c7db4270603f22855fac4a9c1d05
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-16 11:09:22 +00:00
Mahmoud Badri
68be6228db QmlDesigner: Icon font updates
Added:
- deletepermanently_medium.svg
- alphabetical_medium.svg
- assignTo_medium.svg
- comboBox_medium.svg
- createObject_medium.svg
- recent_medium.svg

Modified:
- addcolumnleft_medium.svg
- addcolumnright_medium.svg
- addrowabove_medium.svg
- addrowbelow_medium.svg
- deletecolumn_medium.svg
- deleterow_medium.svg
- export_medium.svg
- import_medium.svg
- tableView_medium.svg

Removed:
- downloadcsv_large.svg
- downloadcsv_medium.svg
- downloadjson_large.svg
- downloadjson_medium.svg
- uploadcsv_large.svg
- uploadcsv_medium.svg
- uploadjson_large.svg
- uploadjson_medium.svg

Change-Id: Ib5fb5ee5dfb3224ad99ee895d83a8910a5cc18c5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-16 11:02:04 +00:00
Thomas Hartmann
b7657a8d23 QmlDesigner: Add source property to MediaPlayer
Change-Id: Ie70e6f8c0e8d3ac316b98bc43f3cb7baecbb9d1b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-15 16:57:00 +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