Commit Graph

115 Commits

Author SHA1 Message Date
Henning Gruendl
2860e57112 QmlDesigner: Add lock functionality to navigator
* Update icon font and change related theme and constants files
* Add locked column to Navigator
* Add auxiliary property "locked"
* Integrate locked feature into the following components:
  * Transition Editor
  * Connection Editor
  * Form Editor
  * Text Editor
  * Timeline
  * Navigator
  * State Editor

Task-number: QDS-826
Change-Id: Ibf3ae96e0d5daeb1ab00279b94df5aaabe75e0bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 15:24:55 +00:00
Eike Ziller
3a602e8338 Replace qrand with QRandomGenerator
Task-number: QTCREATORBUG-24098
Change-Id: I91b610409a413c7d76b3c5dd43cf581a960edf7d
Reviewed-by: hjk <hjk@qt.io>
2020-09-18 14:12:23 +00:00
Miikka Heikkinen
0b6be2f93d QmlDesigner: Update resources file system model on model attach
Removed the update from old places.
ViewManager::attachItemLibraryView one was never called and
the other DesignDocument::updateFileName one gets called incorrectly
on any file rename, not just the currently open one.

Change-Id: I822ced6fe32dd9625d605e33046c808eb2272028
Fixes: QDS-2721
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-11 07:36:06 +00:00
Thomas Hartmann
95e0b71b88 QmlDesigner: Do not assume MCU as the default
Fixes the sympton of QDS-2554, but not the real issue.

Task-number: QDS-2554
Change-Id: I8e0aca0b843bcb2befdc2d9a85b2dbfdb468ffb2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-17 16:07:54 +00:00
Tim Jenssen
b8cd87dea0 Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Conflicts:
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
	src/plugins/qmldesigner/qmldesigner.qbs

Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
2020-06-26 16:51:22 +02:00
Thomas Hartmann
2f66b1d49a QmlDesigner: Rename 3d-active-scene to active3dScene
For annotations this has to be a valid QML property.

Task-number: QDS-2269
Change-Id: Ib6483a9dd673ddf24b8688909c599a518dfb361c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-11 17:12:20 +00:00
Christian Kandeler
02785342ac Fix some clang warnings about unused lambda captures
There are more, but we need to keep those because MSVC believes they are
required. This is the subset that satisifies both compilers.

Change-Id: I0b0a63d5496acc119a7f0513d3a1da0b76fa1fca
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-24 08:44:58 +00:00
Mahmoud Badri
11bd2f8deb Enable Copy, Cut, and Paste in the Editor 3D
Task-number: QDS-1563
Change-Id: I22c3017b8c158d8bc084f050baef89fa8fffd365
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 13:25:58 +00:00
Thomas Hartmann
620e17cf7b QmlDesigner: Implement usage of qtForMCUs property
If qtForMCUs is set in the qmlproject file we disable unsupported
properties like roation, transformOrigin or layer.

Change-Id: I75d9677beca3d4ce71f975b4f0ae75e63967d143
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-28 15:27:36 +00:00
Thomas Hartmann
95953f949a QmlDesigner: Only scatter item if they have positions
Task-number: QDS-1642
Change-Id: I0e99cfc9027e283d3dc6ce239a74c48bfc092e99
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:03:26 +00:00
hjk
479def8190 QmlDesiger: Use ProjectExplorer::Target instead of Project plus Kit
A Target is pretty much exactly that.

Change-Id: Icd6041428ecd616906d5fbf74a5b87ea4b5c8103
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-10-31 11:33:45 +00:00
Thomas Hartmann
cf1be67264 QmlDesigner: Use lambdas for transactions
Using lambdas we do not have to repeat the try catch block all
over again.
This also avoids sublte mistakes when catching the exception.

Change-Id: I514fa9b64f43ef08fdc27bf702ec2b173ab1dfd6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-06 12:56:34 +00:00
hjk
473a741c9f Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 12:23:26 +00:00
Orgad Shaneh
1e138fbe10 Remove excess blank lines after namespace
Change-Id: I4e4f83017f2bfc2cf842c4c971ed4b05e0447e6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-27 06:50:16 +00:00
Eike Ziller
443931c1da Help: Move resolution of help from multiple candidate IDs to HelpItem
No need for code duplication.

Change-Id: I3d2c795d072b8de5818e1844b8126e526339c0da
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-02-01 11:28:02 +00:00
Eike Ziller
1ee005aef4 Qt Quick Designer: Adapt to naming change in IContext
Since context help is no longer based solely on an ID.

Change-Id: I34bb81b70632df9fb75bdcf28b022418d4aa764b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-01-29 15:58:06 +00:00
Eike Ziller
282805b66d Rename IContext::HelpIdCallback -> IContext::HelpCallback
It no longer takes an ID but a HelpItem.

Change-Id: I0aa738549fea4fcfd0151adc2dfd642c63f0f60d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-01-29 07:58:19 +00:00
Alessandro Portale
859d847769 QmlDesigner: Modernize
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default

Change-Id: Ic42b5c59fed5a4a01853138542d8156471e86f58
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-25 12:53:26 +00:00
Thomas Hartmann
963ffb1096 QmlDesigner: Write annotations if file is saved
Change-Id: I729205715493f65b83e2de6f09d3d968187afe7a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-17 12:31:23 +00:00
Thomas Hartmann
af857296aa QmlDesigner: Fix potential crash
Change-Id: I850778e9534da4546e09c7d6368639b35488df33
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-04 13:19:44 +00:00
Tim Jenssen
2e25ce32cb QmlDesigner: fix crash on exit
Change-Id: I2e72699dd3f49c917a28d724753e27701a930fac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-03-28 13:16:23 +00:00
Thomas Hartmann
a7515d25a9 QmlDesigner: Avoid detachs
The non const overloads of first() and last() do detach
if the reference count is higher than 1.
Therefore we use constFirst() and constLast() instead.

Change-Id: I737cfc428f1c21f16185b9b51175e181c0ec7068
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-23 10:14:12 +00:00
Nikolai Kosjar
dd06a4188d Core: Return context help id by callback
...to support asynchronous providers.

Change-Id: I483489c74e7886d5bc2bf00b65540c3d2c7afee0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-18 13:54:02 +00:00
Thomas Hartmann
63cd9cd780 QmlDesigner: Refactor DesignDocument and DesignDocumentView
We want to be able to reuse the copy and paste code in other parts.
Therefore we move most of the code to DesignDocumentView.

Change-Id: Ia0de109e92b128aef4c18255621767280e0dcfef
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-10 15:15:44 +00:00
Tobias Hunger
18f38ff18e Project: Make Project::files return a FileNameList
Change-Id: I75ceb22ac65b8288d824f229d44089cba6fc8ea3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-12-08 09:09:59 +00:00
Tim Jenssen
668c87ffd9 QmlDesigner: reduce editor changed signals
- detaching the TextEditView already emits the TextEditor change signal
   -> so removing the call from QmlDesignerPlugin::deactivateAutoSynchronization()
 - in case the user closed explicit the editor we do not want to emit any
   signals anymore

Change-Id: Idb5c2cdde583f7d32f2a9ef5628d1b6d3fc7bb3f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-10-18 14:16:30 +00:00
Tim Jenssen
0de18abbc2 QmlDesigner: use initializer lists
Change-Id: Ibdc46d30ad3f2b703d4cbdd796a1032030bd17cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-26 14:18:48 +00:00
Orgad Shaneh
5221d5f06a QmlDesigner: Use Qt5-style connect
+ De-slot where possible

Change-Id: Ibd2edbef7b7712aba20593bd0417940e828e0c9c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-20 10:42:45 +00:00
Tim Jenssen
fa84524c0c QmlDesigner: rename RewriterError -> DocumentMessage
Change-Id: I8cbb1b8b83ec10c33e416de96a09281208be8773
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-10 16:22:23 +00:00
Thomas Hartmann
d4aa4523b7 QmlDesigner: Avoid throwing in the destructor of transactions
Since C++11 destructors do not throw by default.

Change-Id: Ic6403704587999464011fcaa1f9ac7df3e4ee49d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:26:17 +00:00
Tobias Hunger
c230f3427e QmlDesigner: Remove dead code
Change-Id: Iaa32c7fffeef88f8f9cd4434d3b7e2551f9de12e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-11-29 16:31:20 +00:00
Tim Jenssen
9844cd242e QmlDesigner: space only cleanups
Change-Id: I959208b27694ff3c75650a3f482a0a975ca6e769
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-21 15:08:34 +00:00
Tim Jenssen
4dffc26cd1 QmlDesigner: use Utils::FileName
No behavior change.

Change-Id: I7e8bc51bf1fed99159945c656402bb315aebc3f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-13 09:51:32 +00:00
Thomas Hartmann
18817a9a74 QmlDesigner: set QT_QUICK_CONTROLS_CONF
If we have a qtquickcontrols2.conf we set QT_QUICK_CONTROLS_CONF
for the qml2puppet.

For this we have to forward the project to PuppetCreator.
I forwarded the project instead of just the path to qtquickcontrols2.conf,
because we most likely add more project specific features in the future.

Change-Id: I0a90636ca6903e28499018c8d769bb07f7be5bb6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-28 14:33:42 +00:00
Tim Jenssen
8fbd3cd32e QmlDesigner: fix regression from last code cleanup
Task-number: QTCREATORBUG-16516
Change-Id: Ic77d325c131a594f69b6fbbb6b1d6be6374b45a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-29 14:30:47 +00:00
Thomas Hartmann
334273be84 QmlDesigner: Update qrc files
This triggers an update on every qrc file.

Change-Id: Id34873e3bd8190d79773fbc3a8a90699d4e49cb0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-29 13:14:44 +00:00
Tim Jenssen
fccd50d32b QmlDesigner: small code cleanup
Change-Id: I4cbfa65c5b8481c859081f43893431c0b93b3cd7
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-27 13:31:08 +00:00
Tobias Hunger
98192159da Revert "QmlDesigner: Use generic signaling from project"
The code that this depends on is not there yet.

This reverts commit e6f0695751.

Change-Id: I61d4ff735342731a781960b19b047613b58a23b5
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-13 12:42:22 +00:00
Tobias Hunger
e6f0695751 QmlDesigner: Use generic signaling from project
Change-Id: I135ffcbff3651fe7ff7bc1525881f805a820fb10
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-13 11:21:20 +00:00
Tim Jenssen
61bafe3407 QmlDesigner: keep warnings for later showing
Change-Id: I5f9c51480a1d0276a356737ab1f91a8f76443c5a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-29 08:06:54 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:57:01 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-18 12:12:57 +00:00
Nikita Baryshnikov
b76b1bd0aa QmlDesigner: remove unused function
since 2f7e85ebcf

Change-Id: Ib369cb818ef3a002aafcbdb7925a2c82ea6e8e30
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-07-29 11:27:01 +00:00
Thomas Hartmann
893dfade18 QmlDesigner: QT_NO_CAST_FROM_ASCII fixes
Change-Id: I45cd69bb863dbf7fc51f6d64fa4b2509c0e2ecee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 12:56:31 +00:00
Thomas Hartmann
2f7e85ebcf QmlDesigner: Change the priority of projects and kits
First we try to find a project that contains the document.
We fallback to the current project.
If the kit of the active target is invalid we return 0.

Before any newly created qml file used the fallback puppet.

Change-Id: Ide3333455d85418459924e507f4f5e77afae4188
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:46 +00:00
Thomas Hartmann
231404ecac QmlDesigner: Change signature of DesignDocument::fileName()
Change-Id: I58041af21f20373adf88ec5d2b5b3af785e3faff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:37 +00:00
Thomas Hartmann
e55119bb3a QmlDesigner: Add missing return to DesignDocument::contextHelpId()
Change-Id: I51e3b08efeda4da8cd2aee84e832a5f8c110b8bb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:31 +00:00
Thomas Hartmann
8cdfc4e097 QmlDesigner.Rewriter: Cleaning up the warning code
The class is renamed to RewriterError and moved outside of RewriterView.
Reason: Inner classes cannot be forward declared in C++.

Changing RewriterView::Error to RewriterError, because inner
classes cannot be forward declared.

Change-Id: I51e3b08efeda44a8cd2abe84e833a5f8c190b84e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:12:32 +00:00
Friedemann Kleint
fe2addf515 Clean exported headers of the TextEditor plugin.
Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-26 13:15:29 +00:00
Orgad Shaneh
88e7f935f4 ProjectExplorer: Use FileName for Node::path
Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-13 13:14:03 +00:00