Commit Graph

8660 Commits

Author SHA1 Message Date
Brook Cronin
bc64870688 QmlDesigner: Add new icons for content updates
Change-Id: Id5f1694eb301157cad3e67bd576df184527dd6a1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-02 16:41:31 +00:00
Aleksei German
3c36e77858 QmlDesigner: Fix some escape characters
Task-number: QDS-9415
Change-Id: I6459451d0f7699c727b2e0baad726f5c6af2ca74
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-02 13:32:03 +00:00
Henning Gruendl
65600c8805 QmlDesigner: Fix EditableListView
- Fix ComboBox value not cleared after last material removed
- Add ListValidator
- Use ListValidator for the EditableListView in order to properly check
  for acceptable input in regards to textRole and valueRole

Task-number: QDS-9645
Task-number: QDS-9891
Task-number: QDS-9896
Change-Id: Ia3ebad1f8080a4a4ef6bd0da6a72e335d1e76643
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-06-01 22:20:02 +00:00
Robert Löhning
0ccdb4a547 German translation: Don't use title case for "Configure Project" button
It looks odd and seems to be inconsistent.

Change-Id: I5c0a075edc27c526aa445f31d031dd234cdc2ccd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 15:12:54 +00:00
Thomas Hartmann
ef03466273 QmlDesigner: Bump QDS version in project template
Change-Id: Ic58c2ae17a5d209f148ea8083947457516dd97d7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-01 12:47:06 +00:00
Miikka Heikkinen
f8bb89c121 QmlDesigner: Add delay to bake lights setup dialog tooltips
Fixes: QDS-9898
Change-Id: Ica886bc878932e9f94109fc1ae5d06e880e80801
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-01 10:57:05 +00:00
Eike Ziller
10bf294975 Use KiB/MiB/GiB/TiB for 1024-based units
That is also consistent with our file properties panel

Change-Id: Ief62f8c067896a410878cfa4c36f17c6daf6fee7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-06-01 08:49:46 +00:00
Thomas Hartmann
e9ae73a4cd QmlDesigner: Prefix QDS specific properties in templates
For now we only do this in the MCU template.

Task-number: QDS-9970
Change-Id: I3829d86bdde05ba5fc25e64d2bbeea3f3531ba53
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-05-31 19:06:27 +00:00
Eike Ziller
7bd06829c4 Tr/VCS: Fix various issues with translations
Inserting the name for the "commit" operation into messages relies on a
certain sentence structure and doesn't work with translations. Same for
"optional" error messages. Use different complete messages for the
different cases instead.

Avoid explicit line endings, use automatic word wrap instead.

Add some quotes and full stops.

Fix message with plural.

Don't use %n for constant number (inline in message with assert).

Improve confusing tool tip for instant blame.

Change-Id: Ic8453763279753ebd5898858951acddcf311e6e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2023-05-31 10:53:24 +00:00
Eike Ziller
bc52355f98 Tr: Move some html out of texts
Change-Id: I46c8d81630e18e244f16cefe696d662632340008
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-30 08:51:04 +00:00
Eike Ziller
4f1560666a Don't use uppercase ALT for shortcut strings
It works, but we otherwise consistently use "Alt"

Change-Id: I539a481aae1fb3d7da0a05d732122f3b81abfccb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-30 07:50:24 +00:00
Eike Ziller
14fe48dff7 Tr/Python: Simplify UI text for translation
Parametrize link target, and use markdown for simpler link syntax.

Change-Id: I6d1bae0431aa4e5bd7c7ad39b1219289eda40391
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-30 07:28:24 +00:00
Eike Ziller
ba21749832 Tr/Clang: Use markdown for easier translations
It was weird that the </a> was floating around without a corresponding
opening tag, and the markdown "[text](%1)" is simpler than
"<a %1>text</a>"

Change-Id: Ic0bdc155b1bfef07845a36935dd5fbbb70692b45
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-30 07:28:09 +00:00
Eike Ziller
6e7bb28f09 Tr: Add missing full stops
Change-Id: I2debc56d0740eaa30c7d597eae18910f319c1d98
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-26 13:50:18 +00:00
Eike Ziller
f2c1455025 Tr: Wrap file paths with ""
Change-Id: Iee0e941ff503ff485e8e9c0d9fe3e52eea9042d5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-26 13:50:07 +00:00
Eike Ziller
b7f8143728 Tr: Various small fixes
Change-Id: Ic86d6b6a4aae7b301557eaa4296beb9a31399e03
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-26 13:30:36 +00:00
Eike Ziller
90a6faed4e Merge remote-tracking branch 'origin/10.0' into 11.0
Conflicts:
	src/plugins/qtsupport/exampleslistmodel.cpp

Change-Id: Idbe0117ce810b4ab180a7c4f9b7b35c9c4b988e5
2023-05-25 15:49:57 +02:00
Eike Ziller
50f277ef8a German translation: Fossil
Change-Id: Icc9ffe9f992619e5f4bd1a8689f11aa998f9c8ab
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-25 13:17:45 +00:00
Thomas Hartmann
b225db45ec QmlDesigner: Do not create Qt 6 boilerplate code for Qt 5 projects
Task-number: QDS-7674
Change-Id: I339694be3ee74965f73209f3d4a1b2f32e466525
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-25 12:58:52 +00:00
Christian Stenger
caa85795df AutoTest: Provide wizard for adding a test case
Task-number: QTCREATORBUG-28846
Change-Id: I6716540b8bf62479bf45d16230ec91f0ed157001
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-24 08:54:59 +00:00
Tim Jenssen
1b6c0ff56c Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
  coin/instructions/build.yaml
  doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
  share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
  src/libs/CMakeLists.txt
  src/libs/advanceddockingsystem/dockmanager.cpp
  src/libs/advanceddockingsystem/workspacedialog.cpp
  src/plugins/coreplugin/manhattanstyle.cpp
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmldesigner/components/formeditor/toolbox.cpp
  src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
  src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
  src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
  src/plugins/qmlprojectmanager/qmlproject.cpp
  src/tools/qml2puppet/CMakeLists.txt
  tests/unit/unittest/CMakeLists.txt

Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
2023-05-22 21:13:40 +02:00
Ali Kianian
c9649513d1 QmlDesigner: Show texture id in the Material Browser
Task-number: QDS-9051
Change-Id: I98ba9d9e4dd26d616a0fd3186539ad6aeb23a842
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-19 12:28:01 +00:00
The Qt Project
7057962e44 Merge "Merge remote-tracking branch 'origin/10.0'" 2023-05-17 14:23:50 +00:00
Alessandro Portale
07b2a30dfe Qt Quick Application Wizard: Unify Qt version combobox entries
The "compat" variant, which was around for a long time, had a Qt version
combobox with entries following the "Qt x.yz" scheme. This change adds
the Qt prefix also to the combobox of the new wizard.

Fixes: QTCREATORBUG-29126
Change-Id: I4cd59f09248ba487077c2dcdd0828222311dd9a7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-05-17 14:12:20 +00:00
Eike Ziller
8e8ebc8f88 Merge remote-tracking branch 'origin/10.0'
Conflicts:
	coin/instructions/build.yaml

Change-Id: I697b0107e75c6259989247de2180437d7987ff37
2023-05-17 14:55:02 +02:00
Thomas Hartmann
4e2366550c QmlDesigner: Add tooltips to statusbar
Task-number: QDS-9851
Change-Id: If71410189422e577e0ea3540fbdef35803268ea4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
2023-05-16 15:44:29 +00:00
Brook Cronin
9dbb312d77 QmlDesigner: Align button text with other labels
Change-Id: Idd9e91cd6c6726d2fb0c62413f9285968a7db098
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-05-16 10:15:48 +00:00
Eike Ziller
8bd5c67ea8 German translation: CVS
Change-Id: Iac295e700edf365b06b01bbb3a20c2f2f190a5ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-05-16 07:17:50 +00:00
Eike Ziller
c6a69023c9 German translation: VcsBase
Change-Id: I7b9dc7a2e6868481ab900b56acce2a084b203bd9
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-05-15 08:52:23 +00:00
Henning Gruendl
94b019dbe0 QmlDesigner: Add duplicate control
Add a setting/property to the EditableListView in order to control if
it allows duplicates or not. If duplicates are not allowed it will
disable the items in the ComboBox which are already applied to the
assigned backend property.

Task-number: QDS-6730
Change-Id: I31776fdfb14858c431b40d264e8e709009c517b3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-12 10:14:43 +00:00
Henning Gruendl
c4ff1921ee QmlDesigner: Fix ItemFilterComboBox arbitrary edit
- Add onAccepted handler
- Fix onAccepted early return when manualMapping active in base
- Remove import version
- Replace RegExpValidator with RegularExpressionValidator

Task-number: QDS-9858
Change-Id: I5a967abb28dd70e4215efcc3993e084366d4e020
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-12 10:14:32 +00:00
Miikka Heikkinen
7a04f03bc0 QmlDesigner: Persist manual baking mode value
Manual baking mode is stored separately for each View3D in the scene.

Fixes: QDS-9867
Change-Id: I94590c2bded8486c3b526a427930f15b364eb010
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-12 08:19:14 +00:00
Miikka Heikkinen
ac4219c5cd Qmldesigner: Allow exposing nodes as aliases via UI for light baking
Model and light nodes from subcomponents can now be exposed with a
single button press in light baking setup dialog.

Fixes: QDS-9831
Change-Id: Ifcc69955a2dc9378111387694e42f0cdc70173f3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-12 08:18:41 +00:00
Alessandro Portale
9b00ab8d79 Qt Quick Application Wizard: Fix a property assignment
The option "BuildSystem" does not exist, anymore.

Amends: fe45294357

Change-Id: I76aa3fe05cf1a4a4f74944d67d3fa7c6c273af6a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 13:24:52 +00:00
hjk
dfaebde520 ProjectExplorer: Simplify a complex translatable string
Change-Id: I51a3f18b2c05eb7371d77c18f3f390f5809e2920
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-09 06:46:29 +00:00
Alessandro Portale
fe45294357 Wizards: Remove build system step from Qt Quick Application wizard
Qbs is now covered by the "compat" wizard

This reverts commit 13cf1ee948.

Change-Id: Ic11a6bd4847d08b60f77421ecbc168bc46c50c6a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-05 15:16:26 +00:00
Aleksei German
45599845e8 QmlDesigner: Fix for Qt for MCUs metadata, sheets
Includes:
- adds metadata sheets for newer version
- bumps metadata.qml default version
- tweaks to allowed properties and types
- some resorting and minor reformating of the metadata
- property editor sheet mcu-related changes for Timer

Task-number: QDS-9823
Change-Id: Iedb27047c533b80ba008afeee1ea28a99c8ab19d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-05-05 10:23:48 +00:00
Miikka Heikkinen
dce30450a3 QmlDesigner: Add UI for lights baking setup
Instead of directly baking, bake lights action now opens baking setup
dialog, where user can set up baking related properties for
models and lights in the scene, including those exposed from
subcomponents.

Fixes: QDS-9805
Change-Id: I9e0bae98d8a79be4cf8b09ef989c41083a7fbf5d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-05 09:38:53 +00:00
Eike Ziller
7724f8653f Merge remote-tracking branch 'origin/10.0'
Change-Id: I7a3925ad8e4f97461b64a70217102ed900430253
2023-05-05 10:39:47 +02:00
Kai Köhne
15193d3250 Simplify generated CMakeLists.txt
Fixes: QDS-9700
Change-Id: I2376e3938fb6f95d2cc53ad96b40c04ac7ce780e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-05 08:35:43 +00:00
Tim Jenssen
1f2f223dd7 Merge remote-tracking branch 'origin/10.0' into qds/dev
Change-Id: Ifb5f580cfea7c0d166756938b013a338279d45d9
2023-05-04 13:45:45 +00:00
Haowei Hsu
e8717ba85e l10n(zh_TW): Fix translations of 'Sidebar'
* Sidebar: 邊欄,邊列 -> 側邊條

Change-Id: I01393615d25f42bd8ca584b3895ab02c2296a3bb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: 林博仁(Buo-ren, Lin) <Buo.Ren.Lin@gmail.com>
Reviewed-by: Cheng-Chia Tseng <zerngjia@gmail.com>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2023-05-03 07:20:24 +00:00
Henning Gruendl
949c380018 QmlDesigner: Fix TextFieldSpecifics
Add TextInputSection to TextFieldSpecifics as TextField inherits from
TextInput. Align the properties of the contained sections to the ones in
TextInputSpecifics. Also adjust TextArea specifics to also contain
TextInputSection.

Task-number: QDS-9792
Change-Id: I3a4a734d965f3834ccd1e5cad23bb125b9ca592c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-28 14:33:40 +00:00
Christian Kandeler
dbfd378f5c Wizards: Fix "New Class" with QML_ELEMENT and no QQuickItem include
Amends 2f94e93334.

Fixes: QTCREATORBUG-29092
Change-Id: Ic27729a601534f5b4ed98451f637b9d49029a33a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
2023-04-28 12:52:46 +00:00
Tim Jenßen
9c2a73b1c8 Merge remote-tracking branch 'origin/10.0' into qds/dev
Change-Id: I51801c3bec7e29f7c7384d86d79b4fcabb4f99c1
2023-04-27 20:30:00 +02:00
Henning Gruendl
3b8c38c7f0 QmlDesigner: Add support for valueRole in ComboBox
- Add support for valueRole in HelperWidget.ComboBox in order to allow
  for custom JS arrays that define value and text role
- Replace specialized invokables in item filter model which are only
  available in that particular model with general purpose functionality
  provided by QML ComboBox
- Remove unnecessary functions from item filter model

Task-number: QDS-8737
Change-Id: I58bd3fed395961ac4495a0c6e9ff47c9b87e0de2
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-04-27 17:44:01 +00:00
Henning Gruendl
6eccd82515 QmlDesigner: Fix SpinBox value reset on focus loss
Task-number: QDS-9770
Change-Id: I8a4d73e7abe8dbb5c62c571fc9980a0f78a5f819
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-27 15:33:58 +00:00
Leena Miettinen
e7b5e64a70 Doc: Remove detailed info about wizard templates
Improve descriptions of some wizard templates.

Task-number: QTCREATORBUG-28996
Change-Id: Ib53fa38918120af60a03f3850fed7db1e6f0c391
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-26 12:18:57 +00:00
Eike Ziller
c9696fbabb Merge remote-tracking branch 'origin/10.0'
Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
2023-04-24 08:52:35 +02:00
Eike Ziller
646f95811d German translation: Python
Change-Id: I86e11626122c88a307134ae352331845fa4b394d
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-24 06:14:03 +00:00