Commit Graph

85691 Commits

Author SHA1 Message Date
Mahmoud Badri
a4e65cfb0d EffectMaker: Elide long uniform names
Also fix preview toolbar vertical alignment

Fixes: QDS-10559
Change-Id: I6f03a4232742c0ea3afca042e15711f1abb272c5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
2023-11-10 14:31:38 +00:00
Tim Jenßen
172f889223 qds: enable EffectMakerNew
Change-Id: Id1170ba7d9e61102c2e1d400f184ff3da53eacc2
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-10 14:18:50 +00:00
Thomas Hartmann
6d3c08ac4b QmlDesigner: Always enable model editor
Change-Id: I4a83b4b61e468b6db6c2930fa4e8ae470f8dbc72
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-10 14:17:49 +00:00
Eike Ziller
09f43e79cf Dock widgets: Add collapse/uncollapse functionality
Add a button that can be used to collapse a dock widget's contents
temporarily, as an alternative to removing and re-adding it.

To achieve that, remove the inner widget of the dock widget and store it
in an inner pointer. Just setting the inner widget invisible/visible
does not work, because the title widget of a dock widget with invisible
inner widget becomes 0 for some reason. We also need to add a dummy
widget with a maximum height, to make the dock widget resize and not be
resizable afterwards.

Do not allow collapsing if the dock is the only one in the area, in a
horizontal layout, floating, or tabbed.

Change-Id: Ibc1acb59d58069f08184e65c4814642acb0028ee
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-10 13:48:30 +00:00
Miikka Heikkinen
d0a7b9b359 EffectMaker: Fix qsb tool version parameter
Change-Id: I4a1ceafba63d466d9cec555b332d6894b1016ba4
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-10 13:38:45 +00:00
hjk
cd6311a125 Core: Remove Q_OBJECT from CommandPrivate
We don't really use any of the additional functionality.

Change-Id: I5fd7b7c9ce5dac457179f1fe8dcfbf3d3395cc93
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-10 13:36:32 +00:00
Eike Ziller
d6ea403d0f Improve styling of dock title widgets
Use styled bar and set size to the "single row tool bar" size, which
makes it fit better with the rest of the layout/UI.
For example there is no "black-white-black" bars in the analyzer views
with timelines like QML Profiler, or in the Compiler Explorer. Also the
top bar(s) are nicely aligned e.g. in the default debugger layout when
the debugger is running.

Also switch to custom buttons.

Change-Id: I52f95e3fbb32718b131fde39d75a20105fb0304a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-10 13:32:35 +00:00
Jarek Kobus
c5cb637b96 SettingsDialog: Use locale aware sorting
Still it's not perfect, as it seems the order is like:
"Qt Quick", "Środowisko", "System kontroli wersji",
while the proper one should be:
"Qt Quick", "System kontroli wersji", "Środowisko",
but that's still better than before, when
"Środowisko" was after the letter "Z".

Change-Id: Ib1642f54ed57f798a614f1f3a2d805fb1fdaf1bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-10 12:15:11 +00:00
Alessandro Portale
4b98bebb86 Utils: Change prefix of global static variable names from m_ to s_
Change-Id: Ibf50f1e4db1791e6800b508f80fe1e0cc9d12ef7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-10 11:38:35 +00:00
hjk
9c45399d14 Beautifier: Simplify plugin setup
Change-Id: I9614acaa46075ae1a627997d0261d7c647c7352c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-10 11:19:59 +00:00
Eike Ziller
e6a39128f5 Merge remote-tracking branch 'origin/12.0'
Change-Id: Ib9f8b81d60162a8b01e7c627ba54901af68afa98
2023-11-10 11:23:21 +01:00
Cristian Adam
f90f60bb32 CMake: Fix QTC_STATIC_BUILD
Change-Id: Idfcd36f2d5fdaf09c958ff101aa5e83e0a29cb58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-10 10:11:18 +00:00
Yasser Grimes
52818b8367 McuSupport: Prevent crash while selecting QtMCUs kits for previewing
Users tend to select QtMCUs kits when opening a QtMCUs project in Design
Studio this leads to a crash on some of them because of incompatible or
broken kit configurations (but not QtMCUs desktop kits)

This patch will prevent the crash by preventing the use of QtMCUs kit
and issues a warning about it.

Fixes: QDS-10143
Change-Id: I54acd7b3f1439492bc37979028a1c2d4548da4cf
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-10 09:36:29 +00:00
Ali Kianian
c2581b3bc4 QmlDesigner: Consider an initial value for the model files
Task-number: QDS-11176
Change-Id: I5d35628022194760f63f26c67bc273d02b061575
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-10 09:29:33 +00:00
Thomas Hartmann
4121772030 QmlDesigner: Open Connection Editor from context menu
Open the ConnectionsDialog from context menu.

Task-number: QDS-10711
Change-Id: If0b78dc3d9820cdefa7efe9c85dacfae8f3d1d40
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-10 09:28:31 +00:00
Ali Kianian
acd4792ded QmlDesigner: Prevent accepting invalid lines on collection sort
Task-number: QDS-11117
Change-Id: Id603e5a5b85e99cf87972c853b130b26a195b223
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-10 09:27:40 +00:00
Henning Gruendl
0d6e2b10a2 QmlDesigner: Rename window manager uri
Change-Id: Ied88f4cbc394d8faba7280fbd1af210bb7daf76a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-10 08:35:24 +00:00
Mahmoud Badri
43e074581e EffectMaker: Add the change preview bg color editor
Fixes: QDS-10623
Change-Id: I216c254421dc65d21c0a582bcaac02f2fe3227e8
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-11-10 08:30:00 +00:00
Mahmoud Badri
95ed1ab5b9 EffectMaker: Update color value to use the new ColorEditor
Change-Id: I70cb1786667023209539713e2aa3c2149479f3b5
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>
2023-11-10 08:29:10 +00:00
Semih Yavuz
5b1aa26e47 Do not use QDir::separator() in QML reformatter test
That created a mix of / and \\ while building the path. Qt promises to
build paths that conforms to underlying OS if we always use /.

Amends  ffcbbecf27

Change-Id: Iebcb739cc02f0a2d6dd8953943ecfa9cf8fc9aea
Reviewed-by: hjk <hjk@qt.io>
2023-11-10 08:29:03 +00:00
hjk
ef9be25469 Core: Have Core::Action for Help->Contact and Change Log
Change-Id: I606bc69c860222c66b241d25363941dd71aeab85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-10 07:09:23 +00:00
hjk
d391c0c74e Core: Use Core::Action for 'About...' stuff
... and add the necessary Action::setMenuRole()

Change-Id: I2bb309ae115c1e015ff848e0712327360ead23cd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-10 06:54:35 +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
Ali Kianian
0b50d22bbd QmlDesigner: Rename some expressions
Task-number: QDS-11168
Change-Id: Id402267708eeed794b78766e9b5504fbb636d357
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 17:51:36 +00:00
Artem Sokolovskii
9c4ba3ff21 QuickFix: Fix add definition for templated function
- Fix add definition for templated function in templated
class
- Fix "inline" placement for templated function

Fixes: QTCREATORBUG-29408
Change-Id: I15f7793c9ae1e49d8338c1120135ddd1afbca4ca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-09 17:07:53 +00:00
hjk
ec99782105 Revert "ProjectExplorer: Use more Ids instead of Kit in KitModel"
This reverts commit 05e7308c08.

Currently kit cloning crashes, and the trivial fix loses re-foucssing
on the newly cloned kit.

Change-Id: Id34d4430f97ab5825d5203096fbd1551464f80cb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-09 16:32:28 +00:00
Henning Gruendl
6b2963e678 QmlDesigner: Add color editor to StudioControls
* Add QML Window based popover to StudioControls
* Add color editor to StudioControls
* Move color editor modules to StudioControls
* Move IconIndicator to StudioControls
* Move ToolTipArea to StudioControls
* Add color backend to qmldesignerbase to allow control value binding
* Use popover in connections editor
* Add window manager to send focus changes to QML Windows
* Update ColorEditor UX
* Remove HelperWindow workaround for GradientPresetList (Qt 5 vs 6)
* Fix eye dropper for QWindow

Task-number: QDS-10926
Change-Id: Ia87b30543affde88faaef2ebdf120cb5d348c935
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 15:05:50 +00:00
Mahmoud Badri
44ce489ea3 EffectMaker: improve save dialog
Few fixes and tweaks

Change-Id: I4071b93a64f839c3f2e9ccdc8f648d907723610e
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>
2023-11-09 14:35:52 +00:00
hjk
c26521aeb3 Core: Fix Action setters
In some cases the data needs to be forwarded to the command's action.

Change-Id: I3ae066cbac393d78808d697beb3df29cbdee3315
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-09 13:01:59 +00:00
Christian Kandeler
e3c1179abb CppEditor: Manually indent moved comments
Using the indenter yields unepected results in certain contexts.

Fixes: QTCREATORBUG-29786
Change-Id: Id15eff841d2aa54e7fff65c6bf728516e03f9fc6
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-09 12:51:10 +00:00
Olivier De Cannière
08546615f2 Qml Debugger: Do not focus the current frame when adding a watch
The other debuggers do not cause the view to jump to the current frame
when adding a watch. Make the Qml debugger also not do this.

This is done in a slightly hacky way by preventing the gotoLocation of
the next handleFrame call to be executed. Ideally, the logic to
retrieve the value of locals should be separated from the logic to jump
to a specific frame. Right now the jump is implicit when updating the
locals.

Fixes: QTCREATORBUG-29329
Change-Id: I4b8f5c99ae41c92c3394f86da481303d4765f897
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-11-09 12:24:52 +00:00
Eike Ziller
2f7bfd3ef8 TextEditorActionHandler: Reduce noise
By using namespace Core

Change-Id: I97f4f6c42d5e0e9487b174b6837dc4cbb3452f2b
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-09 12:10:33 +00:00
Christian Kandeler
09e495f01a ClangCodeModel: Fall back to built-in code model when following symbols
In normal interactive mode, users likely want fuzzy look-up, e.g. to a
non-matching overload if no exact match is present.

Fixes: QTCREATORBUG-29814
Change-Id: I55ca32c001e619d374cc015a7dd2f1564ed2a2c9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-09 11:50:22 +00:00
hjk
5334154ecb GenericProject: Use new Core::Action
Change-Id: I694b29565089baa14b316bca07a8ac29747ac32a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-09 11:33:59 +00:00
Yasser Grimes
8f57d1ec0e McuSupport: Add Shapes moudule include to qmlprojectexporter deploy step
Task-number: QDS-10814
Change-Id: I0453360a501a2cdb21522a6f257523899b36df95
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 10:14:40 +00:00
Alessandro Portale
fd1956a91c QmakeProjectManager: Remove unused functions
These project wizard related functions are unused remnants from when a
couple of wizards were still implemented in C++. The wizards have since
been reimplemented as .json wizards.

Change-Id: I4cef7ef26cb66e86ef968645c68f3234d4dc15b6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-09 10:04:11 +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
Shrief Gabr
a923d3ca4a QmlDesigner: Reset column data type when context menu is closed
Task-number: QDS-11101
Change-Id: I60c35ac01107c3ff79f2b637294997bfa62f4f5e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-09 09:40:21 +00:00
The Qt Project
841d9d739e Merge "Merge remote-tracking branch 'origin/12.0' into qds/dev" into qds/dev 2023-11-09 09:24:26 +00:00
Henning Gruendl
b2c4dd6811 QmlDesigner: Remove vertical scroll bar gap
Since we have the transient scroll bars in place, we usually let them
overlap with the content as they will fade out when not in use.

Change-Id: I49c06468d467b7b1b3af954f3319b6bb0b36d324
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 09:08:14 +00:00
Henning Gruendl
17d386f25b QmlDesigner: Remove vertical scroll bar gap
Since we have the transient scroll bars in place, we usually let them
overlap with the content as they will fade out when not in use.

Change-Id: I686d7c374066063c7bce8eca35646d704c633e8f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 09:08:09 +00:00
Thomas Hartmann
070022e9e2 TextEditor: Allow to programmatically highlight a block by cursor
This can be used in QmlDesigner to highlight the currently selected
QML object.

Change-Id: I9907d54f767c7d034739d4111a46cd994c961426
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-09 08:53:25 +00:00
Tim Jenßen
058fd820e5 Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I1e38a9dc4402a4cf836c32a6b0e5f49a836574b7
2023-11-09 08:46:51 +00:00
Thomas Hartmann
ad49605ea9 QmlDesigner: Highlight selected node in code editor
We also highlight the drag target when using drag and drop.

Task-number: QDS-10869
Change-Id: Ic396848f93deaa3cce899c2cf431d5a7f5a940f5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-09 08:46:33 +00:00
Leena Miettinen
266f9bc632 Doc: Turn "Specifying Environment Settings" into how-tos
Add a line drawing that describes the environment settings
hierarchy.

Task-number: QTCREATORBUG-29361
Change-Id: I7869797154c0e70263528a8635ea7f2dcee30f30
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-09 08:23:10 +00:00
hjk
792d88aa05 Core: Introduce Menu and Action classes
Idea is to have a bit more "object { propertySetter }" kind of pattern
for common cases and to couple actions and menus only via Ids, not
real objects.

In a LayoutBuilder context this might later look like

    Menu {
        id(BOOKMARKS_MENU),
        title(Tr::tr("&Bookmarks")),
        container(Core::Constants::M_TOOLS)
    }

in the end.

Overall line count increases but I claim it reduces complexity on the
user code side.

Change-Id: I166e0c8c6b3036430dc464fd652fb37ded21c09a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-09 08:00:37 +00:00
Christian Stenger
e5c4d20e2b LanguageClient: Reset maximum restart tries on explicit restart
If the user forces the language client to restart for whatever reason
the client may end up in not starting anymore depending on the
number of restarts that had been done already.
So, explicitly reset the counter in case the user triggers the
restart.

Change-Id: Ie5f33c8dc3d565b6126badc9708906fc14f4e743
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-09 07:58:13 +00:00
hjk
05e7308c08 ProjectExplorer: Use more Ids instead of Kit in KitModel
The idea is to slowly move towards a uniform approach to handle the
Kits/Qt Version/Debugger/Toolchain/... managers/settings.

Change-Id: I6ddba968a51d9468bb0dfec74b2fb8b902d11294
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-09 07:55:28 +00:00
Eike Ziller
7bd99104e0 Merge remote-tracking branch 'origin/12.0'
Change-Id: I2594f193260a103e1c4484fcab974213c881353d
2023-11-09 08:22:27 +01:00
Christian Stenger
4436e96f91 Debugger: Fix compile with Qt6.2
Amends 43f99cb53b.

Change-Id: Ia28b129f761e8cfe6dd3a908ccfcf50d043d1639
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-09 07:16:08 +00:00