Commit Graph

7857 Commits

Author SHA1 Message Date
Samuel Ghinet
9147c7abe2 QmlDesigner: Fix renaming a folder in Assets View expands the wrong folder
The previous implementation was saving the _row_ of the TreeView before
performing the rename, and after the rename it was expanding that _row_.
However, when renaming a folder causes it to be moved up or down between
the rows, the saved _row_ number becomes invalid.

The better way is just to use the same mechanism that is being used when
creating a new folder: add the new folder path to a list, and later on
expand rows based on that list.

Task-number: QDS-8896
Change-Id: I6a6bb2faaa7d03ea2af384e5f2b635000577a94c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-03 09:57:35 +00:00
Miikka Heikkinen
15d92cf1e5 Use imagecache for all AssetImageProvider images
TextureImageCacheCollector is added to the existing async image cache
to generate thumbnails for image files.

Fixes: QDS-8581
Change-Id: I4a334b3241688d7a61a0560463bff32763a216a5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-03 09:42:34 +00:00
Henning Gruendl
88e75709d4 QmlDesigner: Fix TopLevelComboBox popup close
Task-number: QDS-8957
Change-Id: I0d4b5d976777c6dc3c15b8eed40bda51198dca7f
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-02 18:35:43 +00:00
Pranta Dastider
cd7a5904bc QmlDesigner: Update Tooltips for BorderImage Section
This patch update tooltip text for Border Image fields
in Property editor.

Fixes: QDS-8929
Change-Id: Ie49549244cf8ea0d7ee52ffe2446b3e25a129e4e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:33:29 +00:00
Pranta Dastider
16c7dd6466 QmlDesigner: Update Tooltips for Icon Section
This patch update tooltip text for Icon fields
in Property editor.

Fixes: QDS-8924
Change-Id: Ic9bd8b025f9218e1492c9ad54c5beaaf350d4596
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:32:41 +00:00
Pranta Dastider
611e0fc8d1 QmlDesigner: Update Tooltips for Button Section
This patch update tooltip text for Button fields
in Property editor.

Fixes: QDS-8927
Change-Id: I11920a2f9680cf0901b9111623f2af3c52eb0b26
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:32:11 +00:00
Pranta Dastider
bea410e987 QmlDesigner: Update Tooltips for AnimatedImage Section
This patch update tooltip text for AnimatedImage fields
in Property editor.

Fixes: QDS-8928
Change-Id: I430d5efe72696c36504364ce3f5bbdff31ebbc54
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:31:09 +00:00
Pranta Dastider
8fc956df48 QmlDesigner: Update Tooltips for Flickable Section
This patch update tooltip text for Flickable fields
in Property editor.

Fixes: QDS-8930
Change-Id: I7a2d4372c3ea9e07db33b344d5db634e050a7837
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 09:44:22 +00:00
Brook Cronin
01c8778fd0 QmlDesigner: Update fit all and selected icons
Change-Id: I40c973867c190d7b585a7e2fafac804d2b505add
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-01 17:40:49 +00:00
Pranta Dastider
4d169f51c0 QmlDesigner: Update Tooltips for ItemDelegate Section
This patch update tooltip text for ItemDelegate fields
in Property editor.

Fixes: QDS-8926
Change-Id: I283c079a42d1c3c531ff5ec7641a715bbfd572b0
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-01 15:19:44 +00:00
Pranta Dastider
a6d4b5d7fa QmlDesigner: Update Tooltips for Button Control Section
This patch update tooltip text for Button Control fields
in Property editor.

Fixes: QDS-8923
Change-Id: Iac208f56ce3dea14a962abf3c6715de0104d1221
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-01 15:19:40 +00:00
Thomas Hartmann
ac673c2603 QmlDesigner: Fix states editor
Change-Id: I3b8bcfe81b673f9a9df895fe5616f3c7c5c2b5e0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-01 15:15:11 +00:00
Henning Gruendl
ef0056284a QmlDesigner: Add support for icon and border style
Change-Id: I9b5edb311a2911c56b42f0e264c942d432b530de
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-01 15:13:57 +00:00
Alessandro Portale
823b8c77a5 QmlEditorWidgets: Tr::tr
Change-Id: I507405fa6d162a72136e76727e27234d3b35172a
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:49:09 +00:00
Alessandro Portale
4d6827dde9 Utils: Tr::tr
Change-Id: Ic03e20993f05fb5b49a12c891d86afb2c8e18e08
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:48:22 +00:00
Alessandro Portale
17b28909a9 QmlJS: Tr::Tr
Excluding the Qml parser, which needs to remain in sync with it's copy
in Qt.

Change-Id: I22f475f265dd74687e3239c4d6916c777798a447
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:48:12 +00:00
Thomas Hartmann
310e703aa1 QmlDesigner: Use QDS 4.0 branch for components
Change-Id: Ia19b434c25623308f6581db68482c3bf5d92fd51
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-01 13:03:00 +00:00
David Schulz
739d4942e2 Merge remote-tracking branch 'origin/master' into 10.0
Change-Id: I9f6090e2a9f62fd3a9823f5a7342ea423dfbb2ac
2023-02-01 05:24:33 +00:00
Thomas Hartmann
770463877c QmlDesigner: Fix designer theme
Change-Id: I2585acd1105390287eac1b0a0729c08321cce298
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-31 14:36:32 +00:00
Thomas Hartmann
080c8af850 Add DStoolbarBackground
Change-Id: Ied42d086af2aba2ce54b2ad9ed411feea7817416
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-31 14:05:20 +00:00
Thomas Hartmann
724eb54387 Add QDSTheme to theming and use it in ManhattanStyle
Change-Id: If3f634cd96665150b27605eaf7a2a5d4ea7078b6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-31 12:41:07 +00:00
Alessandro Portale
97002f934f QmlProjectManager: Fix the "Qt Quick UI Prototype" wizard
The wizard uses the the same main.qml.tpl template as the "Qt Quick
Application" wizard. That file was renamed to Main.qml.tpl.

Change-Id: I7978cd2a09da7aa70a75f9cc5cb6e7b6dcdff058
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-01-31 08:33:17 +00:00
Fabian Kosmale
fa2ea6fd97 QtQuickApplication template: Support more modern API
(Re)add a way to select the minimum supported Qt version. If it is >=
6.4, connect to QQmlApplicationEngine::objectCreationFailed instead of
objectCreated, getting rid of the status check.
Moreover, if we have Qt >= 6.4, also use qt_standard_project_setup
instead of manually enabling AUTOMOC. That is available since 6.3, but
no need to clutter the version selection list with too many entries.
If only 6.5 or higher is required, put the QML files under
AUTO_RESOURCE_PREFIX, and use loadFromModule instead of load.
Unconditionally rename  main.qml to Main.qml, which is necessary for
loadFromModule to work, and making this conditional on the used Qt
version is more trouble than it is worth.

For qbs, we do not yet put the files under the auto resource prefix, so
do not use loadFromModule there.

Fixes: QTBUG-47996
Change-Id: Ib8ca375c2316b58eecf54009d36fc9f7dac7c1f4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-31 06:38:19 +00:00
Brook Cronin
9ed9e466f7 QmlDesigner: update icon font
Change-Id: Ib26c9253ff012845e806a68be20d292c22e292ee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-30 13:59:36 +00:00
Tasuku Suzuki
8cb0858574 Improve console app template
Set QtCore explicitly instead of removing QtGui from default modules.
Update CONFIG with the new feature introduced in QTBUG-27079

Change-Id: Id2b5cc7c9534618b88c4683253af6c2a8fd90816
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-30 13:47:32 +00:00
Tasuku Suzuki
2f94e93334 "New Class" wizard: Add QML_ELEMENT checkbox
Change-Id: I219b539ba5f36c895be1042a74571e54a0c67ec6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-30 13:46:49 +00:00
Alessandro Portale
0a30b8aa26 QmlProjectManager: Fix Qt Quick UI Prototype wizard
Fix the path to the main.qml template. Remove all Qt version quirks,
since "Qt Quick Application" project wizards are for Qt 6 from now on.

Amends: 4e0b4fcc92

Fixes: QTCREATORBUG-28722
Change-Id: I338f52f215afc8591fadb12c2ad3ca58d32ec7c7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-30 13:39:19 +00:00
Samuel Ghinet
8bb6d0936d QmlDesigner: Do not show file size for directories
Task-number: QDS-8877
Change-Id: I4d4e8a76f65f2b8eebf77e391bd0c499ed49f7c8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-30 12:35:44 +00:00
Samuel Ghinet
7ccd8eb295 QmlDesigner: Make the selected style appear selected even when hovered
In the New Project dialog, when browsing thorough the Styles, the
border of each style becomes white on hover, and when selected, the
border is blue. When a Style item was both hovered and selected,
though, the border was shown as white (i.e. highlighted). It should
be blue (selected) instead.

Task-number: QDS-8875
Change-Id: I4573ff57b7b5561f17f1fe6adf3fa214a62d5538
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-30 11:26:10 +00:00
Henning Gruendl
a7a4cbfe25 QmlDesigner: Fix TopLevelComboBox hover
Change-Id: I3531e010d9a13b11d2b93d1aa8f019307919268d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-27 13:52:36 +00:00
Thomas Hartmann
c615f456df QmlDesigner: Fix FilterComboBox
The import for Controls shadowed the type of the local ComboBox.
Therefore ComboBox.ActivatedReason.Other
became undefined and this call was never executed:

onTriggered: control.compressedActivated(myTimer.activatedIndex,ComboBox.ActivatedReason.Other)

Task-number: QDS-8948
Change-Id: I8140f8e2905588687d9879a0828b28ba212c02d2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-27 12:45:31 +00:00
Henning Gruendl
87d3056a15 QmlDesigner: Update icon font
Change-Id: Ic3b418bd1f17c0283cc9d12a8c7fee21c72c9d61
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-27 11:44:27 +00:00
Łukasz Wojniłowicz
b05a34b81e Debugger: Don't try to iterate on non-existent subprinters
gobject_gdb.py puts the pretty_printer_lookup function into
gdb.pretty_printers. Trying to access subprinters of it causes the
AttributeError exception.

Change-Id: I00ce7b62866dd9c06a1f0abef0c7043ece023d34
Reviewed-by: hjk <hjk@qt.io>
2023-01-26 17:09:11 +00:00
Henning Gruendl
910a09cdf3 QmlDesigner: Fix TypeError in StudioControls
Fix TypeError in StudioControls MenuItem. Cannot read property 'width'
of null.

Change-Id: I12eb2d781874f80837e1122692e540188bcd2658
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-26 16:06:09 +00:00
Miikka Heikkinen
52181f0208 QmlDesigner: Add designer specifics for QtQuick3D.SpatialAudio
Despite SpatialAudio being a submodule of QtQuick3D, it is actually
implemented in qtmultimedia repository. The designer specifics for
QtMultimedia types are implemented in creator repository, so same was
done for SpatialAudio types.

Fixes: QDS-8530
Change-Id: I5a06125fa0b6910c17ca9838a35ff9c01a723056
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-26 15:17:19 +00:00
Alessandro Portale
f46af497e1 Translations: Prefix translation contexts for libraries with "::"
Change-Id: I0631ad6fdc9f341a162d879e54ff09fbdb74398e
Reviewed-by: hjk <hjk@qt.io>
2023-01-26 14:51:03 +00:00
Ali Kianian
757a6f2e12 QmlDesigner: Handle QmlEditorMenu in Manhattan style
* QmlEditorMenu is handled in Manhattan style.
* Icons are available for cascading menu items in macOS.
* Shortkeys hints are handled and right aligned in the menu.
* The style is customized  QmlEditorMenu.

Task-number: QDS-8720
Change-Id: Iff5ebae0dce70dade5b48a1abe4232e70d6953d6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-26 14:33:07 +00:00
Thomas Hartmann
a51941db31 QmlDesigner: Implement styles in the status bar
Change-Id: I8413394484dc9d19e1bbe64391cefaba0f976f94
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 10:00:32 +00:00
Thomas Hartmann
656eb38432 QmlDesigner: Add preview zoom menu to top toolbar
Change-Id: I4b47a36a75d90fed010ec347228cd9328913fb8e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:31:06 +00:00
Thomas Hartmann
8972858014 QmlDesigner: First iteration of status bar
Change-Id: I085ae1d31a2eb6801f193558bf03905ce70bd435
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:30:39 +00:00
Thomas Hartmann
dcc5d875f0 QmlDesigner: Add option to open combobox upwards
Change-Id: I2abbee4886a1a35e5b43d0bdab02fb18310f0fc3
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-26 09:26:33 +00:00
Thomas Hartmann
fecd361483 QmlDesigner: Add missing tooltips
Change-Id: I90f157e6396733a6c6b7f9ccee052cdb5e30e291
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 18:40:42 +00:00
Eike Ziller
e9b177db7d Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/libs/utils/filepath.cpp

Change-Id: I04761cf7c99ed67322a592cbd0ae48c1ae9c708a
2023-01-25 14:11:01 +01:00
Henning Gruendl
b40e4960ce QmlDesigner: Fix current workspace emit
Change-Id: I0a83a5632946aaecdfa1eee796ea1c88006fb5ab
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 12:56:02 +00:00
Henning Gruendl
742b0d9e1b QmlDesigner: Fix click outside TopLevelComboBox
Fix click outside of TopLevelComboBox closing the popup.

Change-Id: I936e667a2a6f51e29b17933a6819c80f48c734de
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 12:11:30 +00:00
Henning Gruendl
5e7b97c7b4 QmlDesigner: Fix activated on TopLevelComboBox
Change-Id: Iedea97ff7837a1424cec872f66fd6e5861c74869
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 10:41:55 +00:00
Thomas Hartmann
2e334303fe QmlDesigner: Add top level toolbar
* Added Designer\TopToolBar=true to .ini to enable toolbar
* Added backend to CrumbleBar
* Added crumble bar
* Added QML toolbar
* Disabled original toolbar in DesignModeWidget
* Added callback to DesignerActionManager
* Added id to ZoomPreviewAction
* Dock Manager is exposed in DesignModeWidget
* Added new version of icon font

Change-Id: I8c8ad16137c84229854a1d0fa6dfdf498edf4253
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-24 17:13:54 +00:00
Pranta Dastider
cc76b36c64 QmlDesigner: Update Tooltips for Character Section
This patch update tooltip text for Character Section fields
in Property editor.

Fixes: QDS-8806
Change-Id: I5f03394a79c8ce187309ddbb0f35d99d062f11a1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-24 10:50:49 +00:00
Pranta Dastider
3f4f6fa611 QmlDesigner: Update Tooltips for TEXT and FONT EXTRAS Sections
This patch update tooltip text for Text Extras
and Font Extras Section fields in Property editor.

Fixes: QDS-8807
Change-Id: I3253f21f5466368098d4c330986caa0ec1e81696
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-24 10:50:43 +00:00
Alessandro Portale
540b679c14 QmlDebug: Tr::tr
Change-Id: I420f15db36a3da30a0a788c0af09e935f62902c7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-01-24 10:24:53 +00:00