Commit Graph

7857 Commits

Author SHA1 Message Date
Tim Jenssen
ad3169bedd qds: fix mobile scroll projects template
I guess this was removed by accident at
d99a6d2efe
so I just adding it back now.

Task-number: QDS-8111
Change-Id: Ib42ce5cc0cf13608f07b0671adce149c15878ef0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-10-27 15:06:40 +00:00
Thomas Hartmann
ed0727e88f QmlDesigner: Add option for Qt 6.4
Change-Id: I7548a680a5773d7d2799fa5998bdc0956fb2e9c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-26 14:05:17 +00:00
Tim Jenssen
aa33927651 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertychangesmodel.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertymodel.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.h

Change-Id: Ib029a830ee99190bc4ea2ad75d9300bfa86b42d9
2022-10-25 19:02:15 +02:00
Miikka Heikkinen
8da35bac0f QmlDesigner: Add support for SpecularGlossyMaterial
Task-number: QDS-8087
Change-Id: Ic5cdca5d61d5f4ad11f63f3f5a59907798cde763
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-25 15:06:35 +00:00
Thomas Hartmann
f8a272e076 QmlDesigner: Bump QDS version in .qmlproject
Change-Id: I39cefcd5c1a16fd56eb05c485eeb11471683aeec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-10-25 14:45:43 +00:00
Thomas Hartmann
0e7bb80408 QmlDesigner: Use QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT
At least for now this is the better default for QDS.
See also for example the SafeRenderer items.

Task-number: QDS-4812
Change-Id: I03d614ec52c1e5ab11576bbfdaa3bad0d72f0fbf
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2022-10-25 09:11:07 +00:00
Leena Miettinen
51c1accfa5 Qt Quick Designer: Fix references to changed view names in UI text
- Form Editor > 2D
- 3D Editor > 3D
- Text Editor > Code

Task-number: QTCREATORBUG-28334
Change-Id: I65f693b47b1c361dae3c270333ff036e4c473b9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-24 08:17:17 +00:00
Thomas Hartmann
7092d8da22 QmlDesigner: Fix ColorEditorPopup on Qt 6.4
With Qt 6.4 the position of the loader is not set to 0 by default.
Using anchors does fix this.

Task-number: QDS-8018
Change-Id: I74623cff1f02968515fe7452cc770534f43c2d77
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-10-21 15:28:26 +00:00
Eike Ziller
698583dc01 Translations: Get some translations for Text Editor settings back
Display, font and tab settings.
No idea when that broke, but it is trivial to get back.

Change-Id: I96b809cb40c899bb62ddeaab03343181826930a8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-21 13:59:24 +00:00
Eike Ziller
7e60e6197a TextEditor: Fix wrong space in behavior settings
German translation done separately

Change-Id: I746ab8455109d83ca69c0add0a8d9e34555bea18
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-21 12:44:04 +00:00
Mahmoud Badri
bad166cda8 QmlDesigner: Maintain bundle categories expand state
Prevent categories auto-expanding when adding an bundle material
instance. Also some relevant tweaks.

Fixes: QDS-8043
Change-Id: Id87886c6d6e065f2c9c1253279348e076bc4d97f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-21 10:00:01 +00:00
Mahmoud Badri
2ccc4a03ed Revert "QmlDesigner: Add "imported" icon to the icons font"
This reverts commit b0fa747565.

Reason for revert: imported icon not needed anymore. also removed icons are needed.

Change-Id: I2d3423a585358abd760f55bba1215d6d2878fdc1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-21 09:40:44 +00:00
Eike Ziller
8beb1fe775 Merge remote-tracking branch 'origin/8.0' into 9.0
Change-Id: Icd606068e77d6845cbbda5d48eda477cb21a312f
2022-10-21 10:03:56 +02:00
Mahmoud Badri
70f532c43f QmlDesigner: Allow drag-n-drop a bundle material to materials section
Fixes: QDS-8041
Change-Id: I848f636f41c58e11c719517f4073243a76e293b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-20 16:35:27 +00:00
Eike Ziller
57a3afbb70 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp

Change-Id: I435b955899fcc70faaec6332de55283cf16b694f
2022-10-20 15:28:23 +02:00
Eike Ziller
7b449c9463 Merge commit '029f926bcfcbb01' (origin/8.0) into 9.0
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

Change-Id: Iff498a1024f4a152ebdd3516ba13fa16cb6932d9
2022-10-20 15:01:00 +02:00
Henning Gruendl
cf9b36a6c7 QmlDesigner: Use AUX property to remember state
Use AUX properties to save the StateThumbnail state (property changes or
thumbnail). Also the save the state of the property changes state
section (expanded or collapsed).

Task-number: QDS-7732
Change-Id: I607bb05b7c71bb98e7781d058bb5736ab4b77e72
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-20 12:10:25 +00:00
Henning Gruendl
ac0251e106 QmlDesigner: Block DragHandler when menu open
Task-number: QDS-7851
Change-Id: Ia48e326c1f33d7b405eb2f93936e3aa99f0a9e60
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-20 12:09:14 +00:00
Leena Miettinen
c4ac5e414a UI text: Use a full stop in the end of messages
And fix the capitalization of some message box titles.

Task-number: QTCREATORBUG-28334
Change-Id: I858eefd5a12494723c40e0253a3708fa77284d1b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-20 09:25:08 +00:00
Thomas Hartmann
e2706436a9 QmlDesigner: Fix Q_ASSERT
instanceForObject(item) will assert if the instance does not
exist. We already do check if the instance is actually valid.

Change-Id: I0b0ef37d7db3d1e4195504ee8e5f92243bb26d83
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-20 08:19:15 +00:00
Leena Miettinen
7c9d1ef516 UI text: Fix UI text to follow the guidelines
- Fix typos
- Replace "options" with "preferences"
- Fix capitalization
- Remove "please"
- Do not use contractions

Task-number: QTCREATORBUG-28334
Change-Id: Ie029eae435634aa2fb354e173fa107af72f7b025
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-20 07:38:32 +00:00
Leena Miettinen
b9e45d7b30 UI text: Fix spacing in multi-line messages
You need an empty space at the end of a line (before quotes),
but no empty space after \n.

Task-number: QTCREATORBUG-28334
Change-Id: I192836cb10b819a359778879c64e6b80aaa059f2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-20 07:02:52 +00:00
Eike Ziller
10773633f6 Merge remote-tracking branch 'origin/9.0'
Change-Id: I13e71c3ac9fb11ce02af82b3b6e750dc7d7015d4
2022-10-19 14:38:15 +02:00
Eike Ziller
2f3a6fff93 System settings: Fix translations after context change
The context unnecessarily changed from Core::Internal::SystemSettings
to Core::Internal::SystemSettingsWidget. Change it back.
Some translation were partially updated inbetween, remove duplicates
by prefering the new translations.

Amends dae9cb13cf
and b0847af740

Change-Id: If604c5fa0f40d8f5ac273f01c189ffaf45b67811
Reviewed-by: hjk <hjk@qt.io>
2022-10-19 10:12:56 +00:00
Mahmoud Badri
e55ea179c4 QmlDesigner: Extract material browser ctx menus into separate components
Change-Id: I43305567f5224ed8015bcb507c7ee27e268d4d67
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-18 14:54:32 +00:00
Eike Ziller
3bdb1a3edf Merge remote-tracking branch 'origin/9.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/vcsbase/vcscommand.cpp

Change-Id: I2d33113bfb2ea7134550cda1de4e2c21e6711778
2022-10-18 16:51:36 +02:00
Mahmoud Badri
4667d8ae4e QmlDesigner: Disable "add material" actions when QtQuick3D not imported
Fixes: QDS-7516
Change-Id: Id92a76e455b17b6c7baa11f8e472fa0b6bfcde9f
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-18 10:29:18 +00:00
Eike Ziller
ea5a050c5c Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp

Change-Id: I9317da0fc1243b9ce6d87f577aa843c51f132ad7
2022-10-18 10:48:46 +02:00
Miikka Heikkinen
6276f5514d QmlDesigner: Add QML/QtObjectPane.qml
In Qt 6.4 QtObject module resolves as QML, so add corresponding
property pane.

Fixes: QDS-7059
Change-Id: I115bd871132839dc170add254055022840176989
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-18 07:28:19 +00:00
Miikka Heikkinen
fdf1baecd6 QmlDesigner: Create asset_imports directory at project creation
Some watchers won't be initialized correctly if the folder doesn't
exist at project startup. E.g. texture images won't appear in project
view when material with textures is imported, unless asset_imports
already exists at project load.

Task-number: QDS-7813
Change-Id: I79449ae823d9005e74594f08bfa87abf44045caf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-18 07:28:06 +00:00
Ali Kianian
88c7562582 QmlDesigner: Fix the position of placeholder in FilterComboBox
The AutoCompleteString view had a bad position. The text property of the
TextMetrics was wrong, which caused the placeholder to have bad position
since the position was calculated with wrong text.

In addition, I prevented showing the placeholder when the root comboBox
is not opened, because otherwise it may show text when no item is
selected.

The main task was QDS-7662, which is now divided.

Task-number: QDS-7912
Change-Id: Ib937d923191ec3c544dae3259774cd2bb5b7adb0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-10-18 06:24:11 +00:00
Ali Kianian
a0e87e458b Sections could be non-collapsible
A property named collapsible is considered for Sections. The default
value is true for this property.
The section would be affected by the user collapse request if the
collapsible is true (Single collapse by clicking, and colapseAll
request). Otherwise, the section will not be affected by user
requests.

Task-number: QDS-7527
Change-Id: Ic4c9d0489d4b8c9ec90a0c71c755fa4c52935d39
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-18 06:22:55 +00:00
Orgad Shaneh
ac28843c3a Themes: Use lighter link colors in dark themes
Fixes: QTCREATORBUG-28152
Change-Id: Id387d20373a3e19a36af9ec8f8c44798e1008ed1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-17 16:21:43 +00:00
Eike Ziller
66b99b5086 Fix translations of FolderNavigationWidget after moving to Core
It moved from ProjectExplorer::Internal to Core, and there is no reason
to throw the translations away.

German translation is fixed separately.

Amends dc5717bd06

Change-Id: I7a0a88c70e3454374de0b994fa1c20557c9a24e8
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 13:59:48 +00:00
Eike Ziller
86beb2a950 Fix translations of file properties dialog
After inlining the UI file. Context changed and moved into the namespace
"Core::...".

German translation is updated separately.

Amends 568f83d964

Change-Id: I0540a533113f3f38ab527a6c6d8614c2699a6578
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 13:56:23 +00:00
Mahmoud Badri
b983b8aa52 QmlDesigner: Implement unimporting bundle materials
Fixes: QDS-7904
Change-Id: I08642c25a2844547d0104a7b3d9fda6afe47cd38
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-17 08:05:50 +00:00
hjk
689ba1ead1 Debugger: Fix internal FilePath dumper
Amends 23e96dd6fe.

Change-Id: Ia602f09e4138125d41cb455b847e8b85ad767782
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-13 13:24:49 +00:00
Marco Bubke
ba891e7f34 QmlDesigner: Prevent calling the node instance view directly
Views should not write to the node instance view directly. Instead they
should use the model for manipulation.

Change-Id: I3941cc691addab939b8032952230cbe03951730b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-12 16:29:56 +00:00
Orgad Shaneh
7388003d16 Wizard: Add CMakeLists.txt.user to generated .gitignore
Fixes: QTCREATORBUG-25969
Change-Id: I72c8da5400e41194db6b239c2845fe110c2e3cf7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-11 17:27:03 +00:00
Tasuku Suzuki
52672b5f6c SessionDialog: rename Switch To to Open and reorder buttons
To be consistent with the SessionNameInputDialog that has the button
"... and Open" to switch to a session.
Buttons should be ordered by like a typical file menu
- new
- open(ex- switch to)
- save(rename/clone)
- close(delete)

Change-Id: I875446352100500eaae4b0ecef4faa6442aef539
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-11 10:53:29 +00:00
hjk
19f2a95e1c Nim: Convert to Tr::tr
Change-Id: Iad4641479d566347ef9acdfb0a04f37907ac4a2d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-11 05:48:46 +00:00
hjk
c4957f9fdb BareMetal: Convert to Tr::tr
Change-Id: I7ac423c13d95b33cad332d2ce9fafb4f658980bc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-11 05:47:24 +00:00
Miikka Heikkinen
b8f4cd97d1 Fix copying dynamic properties on materials
Fixes: QDS-7803
Change-Id: I24c8cd269965552a62fbbbc521efbff00811fa43
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-10 13:53:03 +00:00
Mahmoud Badri
b0fa747565 QmlDesigner: Add "imported" icon to the icons font
Change-Id: I100a382a549b1945d7c7e83de0a3ffa609b5148c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-10 13:46:32 +00:00
Samuel Ghinet
7319eac283 Refactor Assets Library
Extracted the dialogs, the context menu, and the assets view into
separate qml files. Also, reordered some functions in the assets
library model

Task-number: QDS-7344
Change-Id: Ida21b60d30f34723c07b2659a138e14b95598421
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-10 12:00:23 +00:00
Alessandro Portale
c6244ac8df Meson: Fix .ts context names
Change-Id: If69784dcacfdb5974adc9b457e360c9b4b584102
Reviewed-by: hjk <hjk@qt.io>
2022-10-10 10:53:16 +00:00
Henning Gruendl
a7ceb64895 QmlDesigner: Add arrow to MenuItem for sub menus
Task-number: QDS-7867
Change-Id: Ia2c9dcf4534a5ccc2525f36720acb2d7f971abe4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-10 10:35:55 +00:00
hjk
9e2ec17f36 Meson: Convert to Tr::tr
Change-Id: I37e8a8c559464f7d55e17a5ca08e8d8d9760a4d6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-10 10:19:19 +00:00
Marc Mutz
8eb4d52342 Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.

Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.

Task-number: QTBUG-99313
Change-Id: I88edd91395849574436299b8badda21bb93bea39
Reviewed-by: hjk <hjk@qt.io>
2022-10-07 13:47:53 +00:00
Alessandro Portale
5c65115271 Android: Convert to using Tr::tr
Change-Id: Ie9110093101b0f49808b4da7b13ac3f47c3bb994
Reviewed-by: hjk <hjk@qt.io>
2022-10-07 10:24:32 +00:00