Commit Graph

7806 Commits

Author SHA1 Message Date
hjk
47e5997e57 Mercurial: Convert to Tr::tr
Change-Id: I2a6ecd17091ffa0100f982848afbf941c6997db7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-06 14:28:09 +00:00
Alessandro Portale
928a7d2087 Git: Convert to Tr::tr
Change-Id: I7fb1753109a9263c70c01713f5f4895db6b73662
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-06 12:32:58 +00:00
Eike Ziller
3811236903 macOS: Fix opening terminal
The scripts executable flag went missing

Amends a7956df3ca

Fixes: QTCREATORBUG-28251
Change-Id: I9773dee3967edc2ebb0eb49c539b37796a48cf5a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-06 11:44:24 +00:00
Alessandro Portale
f8f94a0ce1 QmlJSTools: Convert to using Tr::tr
Change-Id: I40595e560fb2499226bd2c914a0b78ed68f830ab
Reviewed-by: hjk <hjk@qt.io>
2022-10-06 08:54:09 +00:00
Tim Jenssen
964f539e55 Merge remote-tracking branch 'origin/8.0' into 9.0
resolved conflicts:
* doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
* src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
* src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
* src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp

and compile fix in materialbrowserview.cpp

Change-Id: I686e7e93ded8ac1afc792942ded47cd9fe4341ed
2022-10-04 13:44:42 +00:00
Mahmoud Badri
18fd37e331 QmlDesigner: Expand material browser sections when searching
Make sure material browser sections that have matches are expanded while
searching.

Fixes: QDS-7836
Change-Id: Ie30c5425e8efee65cc4bdfa473b269841e73a9d3
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-04 11:30:08 +00:00
Mahmoud Badri
9dda372b7a QmlDesigner: Fix material browser context menu open issue
Allow opening material browser context menu when search is empty.

Fixes: QDS-7837
Change-Id: I473b62d1f1b94a42d5c60f0e06a6d2b76b74ca6d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-04 10:19:57 +00:00
Alessandro Portale
78ef2e2b52 WebAssembly: Convert to using Tr::tr
Change-Id: I7fb420363884236ebd7eeb589a29a475f8911915
Reviewed-by: hjk <hjk@qt.io>
2022-10-04 09:31:38 +00:00
hjk
23e96dd6fe Utils: Use a single QString as data store for FilePath
Plus a few integers to get access to the pieces.

This reduces sizeof(FilePath) from 72 to 32.

Change-Id: I65eb856ad47b6a250c705d8d01893781a21d8e02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-04 07:27:16 +00:00
hjk
63f3921334 CPaster: Convert to Tr::tr
Change-Id: I00242638e483aa9cb5b54473982eed137e859ff6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 10:13:08 +00:00
Christian Stenger
c42ae96ba8 Squish: Move wizard into plugin
Avoids a soft assert when parsing the wizards without having
the Squish plugin enabled.
As the Squish wizard is using customized wizard generators
that are only available if Squish is loaded we should limit
the presence of the wizard file to this case.

Change-Id: I091c1e429f28b07679245abdc9a638135af84761
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-30 09:31:34 +00:00
hjk
dda16c3abc Cvs: Move to Tr::tr
Change-Id: Iba6cfa75745ec2644c1a3dd20949971d16f6dba7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 08:18:24 +00:00
hjk
191815e974 BinEditor: Clean up translation contexts
Change-Id: Ibeb8c93ad1dfa816ccf1160abae8aac6781157d9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 07:32:49 +00:00
hjk
479403e320 Bookmark: Clean up translations
Some unusual contexts went unnoticed so far.

Change-Id: I6017d8ae92310ee3b56538d1fa5c52f0de0a4c8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 07:14:57 +00:00
hjk
685cc1a2fc AutoTools: Move to Tr::tr
Change-Id: I605c2b5c812b500c1db2bdbfab26882ee55249d2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 07:09:50 +00:00
hjk
ab4c9b9679 CMake: Move to Tr::tr
Change-Id: I169da93b5184351cb915d4c198fd33318fcfe06f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 06:56:21 +00:00
Henning Gruendl
502e94cbe9 QmlDesigner: Improve state group rename dialog
If the user presses enter when having focus on the TextField inside the
StateGroup rename dialog it will submit the change and close the dialog.
If the user presses escape it will reject the change and close the
dialog.

Task-number: QDS-7764
Change-Id: I8626c7b9ca9bf6d087c226343b3e6833641da54c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-29 14:45:50 +00:00
hjk
7ec2e724fe ClearCase: Move to Tr::tr
Change-Id: I0f65dfab1c73315d6877cfcc8a04cf202c0a3cdf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 13:26:03 +00:00
Alessandro Portale
76238bed6c QmakeProjectManager: Convert to using Tr::tr
Change-Id: I08393b1f27bf238c8ac0ccb99e63e56a9d21ecb5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-29 12:08:43 +00:00
Eike Ziller
a254a9ba54 Merge remote-tracking branch 'origin/master' into work
Change-Id: I2235a55a599aaeca5d2b5377300a044b66c17da9
2022-09-29 12:03:13 +02:00
hjk
37db98db30 Debugger: Simplify TypeData setup and registration
Change-Id: Ib23249eae63901d614cbe33fe184f174a10efbe4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-28 11:59:50 +00:00
Alessandro Portale
c06fab97f1 Wizards: Port "Code Snippet" Project Wizard to .json wizard
Code Snippet is the last .xml-based wizard shipped with Qt Creator.
This change ports it to the .json-based wizard format. Instead of
supporting just qmake-based projects (like it did), the new version
supports just CMake-based projects.

Change-Id: Ie64114165fff5d56ddf82041cc4d5f90c44fe77b
Reviewed-by: hjk <hjk@qt.io>
2022-09-27 14:29:05 +00:00
Thomas Hartmann
3b4b8aec4b QmlDesigner: Adjust caption for User Added Properties
Section does not have a tooltip, yet.

Task-number: QDS-7765
Change-Id: I5c0254cb81094be690fc5e9a076752f95f27a482
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2022-09-27 10:23:02 +00:00
Henning Gruendl
79994c8504 QmlDesigner: Fix gap between extended states
Fix the gap between more than 4 extended states in a row.

Change-Id: I9c8435de0cba74267a23a970e0967388692f5811
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-27 09:03:43 +00:00
Miikka Heikkinen
07ab73fe7f QmlDesigner: Disable paste option for the original material
Fixes: QDS-7526
Change-Id: Ifdc220685a4881dc3a397d9148022b9be7b5032a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-09-27 08:51:21 +00:00
Eike Ziller
7eaa36e6e5 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9
2022-09-27 10:03:37 +02:00
hjk
f05a97fce5 Translations: Remove duplicates for "No changes to apply"
Amends 2d203763e8.

Change-Id: Ifb4e18c2f8c63b264a16aa59aa588e44972b2c19
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-26 14:38:58 +00:00
hjk
2d203763e8 Core: Inline externaltoolconfig.ui
Also collapse Core::ExternalToolConfig and Core::Internal::ExternalToolConfig
translation contexts.

Change-Id: I5764a85d8cdb33158a8ff770d5a769a752a051af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-26 14:10:38 +00:00
Christian Kandeler
aed001650a Project wizards: Do not use CMAKE_INCLUDE_CURRENT_DIR
This is an anti-pattern that lets uneducated and/or careless developers
get away with using the wrong type of include, so we should not
encourage its use.
It's also not needed by the wizard-generated code.

Change-Id: Iae508025bcd6659ed5aeb546a3da5f8f72e75059
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-26 13:55:16 +00:00
Mahmoud Badri
d47e9772e0 QmlDesigner: Correct a method's camelCase naming
Change-Id: If9d4b750a09873fc0de8f85edcb41d220cbe5a41
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-26 13:32:25 +00:00
Mahmoud Badri
e31debc0e7 QmlDesigner: Move SearchBox to StudioControls
Fixes: QDS-7759
Change-Id: Idf33aa47f5e793c4053f825ae8a203b97c078bf1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-26 13:25:32 +00:00
Mahmoud Badri
57dc7f8468 QmlDesigner: Remove an external dependency from the SearchBox
Task-number: QDS-7784
Change-Id: Ibd1390398d9984c618da4052560706ac58fb5234
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-26 12:58:38 +00:00
Henning Gruendl
db46d8d76f QmlDesigner: Avoid drag and drop faulty state
Avoid the issue described in QTBUG-106943 by reducing the animation
duration.

Change-Id: Ide2004885d945680fa80cb8d0f10968ae33c8611
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2022-09-26 10:05:59 +00:00
Henning Gruendl
9bde8dc3e8 QmlDesigner: Fix dragging while scrolling
Task-number: QDS-7744
Change-Id: I99de01a09ef939e506c07d411c42bd2b28a53c31
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2022-09-26 10:05:49 +00:00
Henning Gruendl
e32f585fda QmlDesigner: Fix drop incorrect place
* Fix drop incorrect place
* Improve overall drag smoothness

Task-number: QDS-7733
Change-Id: I70e23df54c0e52b423c21b883924c5daee955d0a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-26 08:27:31 +00:00
Eike Ziller
4c13b7ca65 Fix duplicate translations
Amends 6bc77c7c37

Change-Id: I2623bfa2ca2640cde4b95e5617e3d2a0991f6b96
Reviewed-by: hjk <hjk@qt.io>
2022-09-26 07:43:59 +00:00
hjk
ded6500922 Bazaar: Convert to Tr::tr
Change-Id: If49e9ccf9426f049bff842b1facbd408d1d54d4e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-26 06:00:44 +00:00
Thomas Hartmann
85b911d30b QmlDesigner: Fix anchor targets
In some cases the binding for anchor targets is not properly resolved.
Using explicitly the root context we define the ids in does solve
the issue.

Change-Id: I69e5bd237668719ec9417d30d0bac8635c79506a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-23 14:53:48 +00:00
Thomas Hartmann
507b1fff39 QmlDesigner: Create importComponentObject in root context
This might be the implicit default, but let's make this
explicit.

Change-Id: Ic42735b12f22819767ceb642d265f813201c9146
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-23 14:53:41 +00:00
Henning Gruendl
d920139302 QmlDesigner: Fix binding editor empty expression
If the user pressed "Accept" on the binding editor if the text was empty
a dialog with a warning popped up. This fix avoids sending empty strings
to backend when condition.

Task-number: QDS-7729
Change-Id: I77e5e9d34f8566dc4ed215c839b01186d839a2df
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-23 14:50:35 +00:00
Miikka Heikkinen
3d672dbf16 QmlDesigner: Fix material 2D view preview for material root components
Change-Id: I7930e5087014b47ccc054109cbb607ef9c373515
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-23 14:12:15 +00:00
Thomas Hartmann
5b0bb02115 QmlDesigner: Fix ColorDialog popup
Change-Id: I7f8daa6e9b26ae8244de1f7ab7c7db1dfa9b7e52
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-09-23 12:42:54 +00:00
Miikka Heikkinen
c909e791d6 QmlDesigner: Remove unused variable
Change-Id: Ifaddb79f01887d73cc2d715ba45f41f2dcd30a0a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-09-23 11:25:26 +00:00
Henning Gruendl
a7c15838e2 QmlDesigner: Add tooltips in StateEditor
Task-number: QDS-7736
Change-Id: I6732043da895e04e6ed70f74d8342ba7ff7354fe
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-23 09:21:03 +00:00
Henning Gruendl
66ec244cf9 QmlDesigner: Fix TextField context menu
Fix TextField keeping its selection after context menu is opened. Due to
this bug QTBUG-71723 being closed the behavior changed. Also the states
when condition TextField needed to be context menu aware to not set a
new expression when the context menu is opened, otherwise it will
immediately reset the model and the context menu wont show up if the
content was edited.

Task-number: QDS-7730
Change-Id: Ic0e63cd3d244bd7f83bcb0edd3b31c0ca1f0a5df
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-23 09:20:21 +00:00
Henning Gruendl
a8f46ac852 QmlDesigner: Add Timer specifics
Task-number: QDS-7582
Change-Id: I8254012970cd54e450853e026b421c73258c1346
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-23 09:20:09 +00:00
Eike Ziller
6bc77c7c37 T9n: Fix after changing "Switch To" to book style capitalization
Book style is a specialty of english, no need to break existing
translations.

Amends 7be9d0f567

Change-Id: Ic9a7c4110e38aaace4d93092b706330e9a05f565
Reviewed-by: hjk <hjk@qt.io>
2022-09-23 08:13:50 +00:00
Alessandro Portale
9e9c0630ee Welcome: Convert to using Tr::tr
Change-Id: Ibcef6dab32894d3032b44965bdcd92fa4f6f780a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-09-23 06:40:43 +00:00
Henning Gruendl
3d3290424a QmlDesigner: Make easing curve button non checkable
Change-Id: Ia25e710f6cc978645144beaf05a8f53fd0de989f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 20:26:47 +00:00
Henning Gruendl
ff33f7b7cc QmlDesigner: Fix state drop in same position
Avoid calling executeDrop() if the state is drop at the same index.

Task-number: QDS-7731
Change-Id: I91a2be11ce4f1c34c55ecb6dcc0c75f07114703a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 20:26:26 +00:00