aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Fix clipping regressionThomas Hartmann2020-05-151-2/+0
| | | | | Change-Id: Iee56c9934042f5bf08ad2059a5f4a4be5ae96c35 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Change default canvas size to 40000Thomas Hartmann2020-05-131-2/+2
| | | | | | | | This is required for the FlowEditor and the canvas size does not really have an impact. Change-Id: I0d5c36ea9290144afe90b1bb254f3b36abc4f026 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add transition item labelHenning Gruendl2020-05-123-7/+86
| | | | | | | | | * Add label to transition item * Change signature of drawArrow() Task-number: QDS-2085 Change-Id: Ia719958ead404ea083a15fdee440a8e6a306ee62 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Adjust list of effectsThomas Hartmann2020-05-071-10/+4
| | | | | Change-Id: I7d69ce83e86cf39b58601487f5d634b9aece211d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add action for selecting effectThomas Hartmann2020-05-074-0/+39
| | | | | Change-Id: I7b89eb688fb7b9a9cd1ad21afcdf67c1662fd110 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix bounding rectangle in FlowEditorThomas Hartmann2020-05-071-1/+2
| | | | | Change-Id: I30c3a5d88bbbe2fce968a23c9f9acb17771366a9 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add allStatesForIdThomas Hartmann2020-05-062-0/+13
| | | | | Change-Id: Ie04c58f50f2c9f5941afac2a3fba714ea9e61eb0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add bezier curves to transition itemHenning Gruendl2020-05-063-91/+224
| | | | | | | | | * Add support for bezier curves on transition item * Rework connection drawing Task-number: QDS-2055 Change-Id: Ifbe30df4965eee0f39681a2285cc664aaffda667 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-05-054-10/+10
|\ | | | | | | Change-Id: Ib971309305e4955a582f85de17e2e2c3365b0e92
| * QmlDesigner: Fix crashThomas Hartmann2020-05-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | Calling m_rewriterView->clearErrorAndWarnings() has side effects that can call back to the model and meta info system. As a consequence meta info data based on the old document is created. This can lead to a crash when the new document is set and the old document is released. Change-Id: I47de904914c1daa8d4a76aa1889f90bd86a07af7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Theme: fix file navigation breadcrumb bar to use theme colorBrook Cronin2020-05-051-1/+1
| | | | | | | | | | Change-Id: Ice727823e6081c02e492c7469ed2f305e81bcb5a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Theme: fix css to use theme colorsBrook Cronin2020-05-052-6/+6
| | | | | | | | | | Change-Id: I82c278696e72d0a1ed08afef0e161fd83be0206f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlDesigner: Allow simple grouping of itemsThomas Hartmann2020-05-054-0/+114
| | | | | | | | | | | | | | | | | | | | We already have the GroupItem. This patch allows to automatically group items in a GroupItem. The option is not visible if studio components are missing. Task-number: QDS-1254 Change-Id: I64da7ec574426c9275fd29e131a1b1d761bf4299 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Remove wrong checksThomas Hartmann2020-05-052-2/+0
| | | | | | | | | | | | | | Those checks are simply wrong. Change-Id: I4fbb9466444719cb61898376a257d41e52a13dc9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Add file selector in design modeThomas Hartmann2020-05-051-0/+2
| | | | | | | | | | Change-Id: I1367f8e7c72405c5e479b0a8c2f6a4d685df3db5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Move designer action to the center of the tool barThomas Hartmann2020-05-052-0/+14
| | | | | | | | | | Change-Id: I7d6b38ea31ebefe0c01acd9360271fc5ba062ffe Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Update icon fontThomas Hartmann2020-05-051-0/+4
| | | | | | | | | | | | | | Change-Id: Ic1b59e1a026c4422b116bc3b5b262d077f1a9a1a Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Delay item library update if content can't be resolvedMiikka Heikkinen2020-05-042-0/+13
| | | | | | | | | | | | | | | | | | | | | | Is some situations, such as creating a new project, the item library model can be updated too early, before the type information is complete. In those cases, try again after a short delay. Change-Id: I47d4766656280db46ef7473796dda961b765c026 Fixes: QDS-2023 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Fix navigator selection when index is invalidMahmoud Badri2020-04-301-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the case when the navigator tree is collapsed and nothing is selected, then a 3D object is dragged to the 3D editor. With this fix, the tree is expanded and selection is shown. This also fixes QDS-1892 partially (i.e. it still happens sometimes but less often). Task-number: QDS-2024 Task-number: QDS-1892 Change-Id: If9233497d0f3c0daffafd939476d7bd64b005c79 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Do not update actions while the rewriter is activeThomas Hartmann2020-04-302-0/+17
| | | | | | | | | | Change-Id: I9cd3c85fab5bbe93012d4279b701f9759c1a46e4 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | QmlDesigner: Add more update options to SelectionContextThomas Hartmann2020-04-303-14/+28
| | | | | | | | | | | | | | | | | | Since we add more and more actions, updating the actions might become a bottleneck. This patch adds more fine grained control. Actions can ignore updates that do not apply. Change-Id: I98dadfb39a5ec7423b00bf3fc69a9707fc162cba Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | QmlDesigner: Add radius to transition itemHenning Gruendl2020-04-293-132/+178
| | | | | | | | | | | | | | | | | | * Add support for rounded corners on transition item * Cleanup connection drawing Task-number: QDS-1788 Change-Id: I53698687b911ad9a43309c53bb599b7f0212f90d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-04-295-29/+23
|\| | | | | | | Change-Id: Ie6bbc48ea0ac9f2ce983825685b4e9b87ec5083d
| * Fix crash with sorting library itemsVikas Pachdha2020-04-294-28/+6
| | | | | | | | | | | | | | | | | | | | Strict weak ordering relation for the comparison was not followed. Using shared_ptr and removing QSharedData. The entry data is shared between instances Task-number: QDS-2011 Change-Id: Idfcd23b2d458f9c7cada47180cb6ab3b4b090416 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Fix bindings in metainfo fileThomas Hartmann2020-04-291-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | Since the parser update the string is not escaped anymore. Which to me is the more correct behavior. We have to remove the escape characters ourselves. Task-number: QDS-2019 Change-Id: I5d03e99ab87b27bfcb22170138b96e50f646e5e4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix clipping issuesThomas Hartmann2020-04-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | Always clip the instanceRenderPixmap against the bounding rectangle. Sometimes the bouding rectangle is updated after the pixmap. Painting outside of the bounding rectangle creates artefacts. Task-number: QDS-1945 Change-Id: I496c4436780eb0455df968d0d30ca2682e93a9ff Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Accept key modifiers while resizingAleksei German2020-04-283-3/+173
| | | | | | | | | | | | Task: QDS-2017 Change-Id: Ided02c5c6600c035ac4bfc3b857910e5850305ed Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix property handling for QVector3D propertiesMiikka Heikkinen2020-04-283-11/+82
| | | | | | | | | | | | | | | | | | | | | | | | QVector3D properties were not consistently handled. Sometimes they were handled as QVector3D and sometimes handling expected a subproperty (e.g. scale.x). Made handling more flexible in a couple of places to fix various issues caused by this. Change-Id: Iacd08b1687efc1fab35742ed1aafda9a8712756b Fixes: QDS-1881 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-04-285-8/+15
|\| | | | | | | Change-Id: I9bc1f87c3ab4a5ff0c84efa05d22763b8a1084c3
| * QmlDesigner: Fix SelectionContext::hasSingleSelectedModelNodeThomas Hartmann2020-04-271-1/+2
| | | | | | | | | | | | | | This one should use AbstractView::asSingleSelectedModelNode. Change-Id: I6bddd62866d50cbda087924bf55446b6cd087085 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Fix crashThomas Hartmann2020-04-271-0/+3
| | | | | | | | | | | | | | | | | | Since we call updateItemSelection via a timer, there is no guarantee a model is attached. Task-number: QDS-1939 Change-Id: I37bf40cf3d6a057a8bc695d0d0ec73b6cf17fdb5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix QML designer item library crashVikas Pachdha2020-04-271-1/+2
| | | | | | | | | | | | Task-number: QDS-2011 Change-Id: Ibf0c6db47eb25b730bc31fc7b52b0ec93ab15a63 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * CMake build: export less generic public includesEike Ziller2020-04-241-1/+3
| | | | | | | | | | | | | | | | | | Do not put every plugin's and lib's source folder into public includes. We require includes of the style <somelib/foo.h> and <someplugin/bar.h> if someone depends on somelib or someplugin. Change-Id: I3a9f200b7c3879cf431b00a1bab4a70f7aa0a9ec Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * QmlDesigner: Further fixes for gcc5.3Christian Stenger2020-04-241-5/+5
| | | | | | | | | | | | | | Amends 8d868d8bbb1742. Change-Id: Ifad7a5d9aa85cf076e2e42ac9489c01dc8995fcd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Rename memberThomas Hartmann2020-04-272-5/+5
| | | | | | | | | | Change-Id: Ia4f249b39b14dc18def62f4d275e3fd1f9f2b0bc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Use proper icons in FlowEditorThomas Hartmann2020-04-272-28/+96
| | | | | | | | | | | | | | The icons are part of the icon font. Change-Id: I5f501ebf74561429738b5b2d4fd007ca22cd7e2d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Update properties in property editorHenning Gruendl2020-04-271-2/+7
| | | | | | | | | | | | | | | | Add missing and cleanup existing properties in property editor. Task-number: QDS-1502 Change-Id: I7bff7bad32b3bfd0742dd1d06f7c3ba12ef1bbca Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Extend icon font supportThomas Hartmann2020-04-274-0/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | * Use ADS::IconProvider to make use of font icons * Add support for IconProvider in FloatingWidgetTitlebar * Add support for named font icon entities in QmlDesigner::Theme * Add level of indirection to Constants.qml to be able to parse it from inside C++ * Add color and HighDPI support in stylehelper * Update icon font and related constants Change-Id: I31ac33917d2db002697ce63f50f5c181c5fdb103 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/4.12' into qds-1.50" into qds-1.50The Qt Project2020-04-249-34/+49
|\ \
| * | Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-04-249-34/+49
| |\| | | | | | | | | | Change-Id: If491fa41c07b9159d1755ef0580b4af6f6ca7d65
| | * QmlDesigner: Delete all bindings to deleted nodeThomas Hartmann2020-04-241-0/+2
| | | | | | | | | | | | | | | | | | | | | When a node is deleted we should remove all bindings to that node. Change-Id: I3a6c3387c535ac8c79bfc83671614ed8abd246a5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Delete dangling transitions when deleting FlowTargetThomas Hartmann2020-04-241-2/+10
| | | | | | | | | | | | | | | Change-Id: Ic2bf68cd19ced976c5337b02bd9b1889c055f182 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Fix compile with gcc5.3Christian Stenger2020-04-242-7/+7
| | | | | | | | | | | | | | | | | | | | | Amends 8d868d8bbb1742. Change-Id: Ic8dd8829e6734031ddc49c75c778f3f6566a0acc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: crash workaroundTim Jenssen2020-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the timer to be safe. The issue is bothering us for a very long time and we were not able to find the real cause. Task-number: QDS-343 Task-number: QDS-1984 Task-number: QTCREATORBUG-20364 Change-Id: I5023f27be25ba7971db80990eeb9562fd63dc15d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * qmldesigner: no need to use QStringTim Jenssen2020-04-231-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia60a0ef4d802a87cb8b7743b678d224c83ba2234 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * QmlDesigner: cleanup ItemLibrary a bitTim Jenssen2020-04-232-15/+3
| | | | | | | | | | | | | | | Change-Id: Ib3b35e68434e94a8dde10653881fc765e449beb1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: use setContextPropertiesTim Jenssen2020-04-233-16/+28
| | | | | | | | | | | | | | | | | | | | | should be faster Change-Id: I3f491237746856c00f13947dfa9e8464a2bd5c25 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * CMake build: Fix devel package issuesEike Ziller2020-04-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Include paths and headers were missing for building a separator Qt Quick Designer plugin. Task-number: QTCREATORBUG-23778 Change-Id: Ib6ba96ad42a8b2b36e0ee2f0e3c51c27f3365d37 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | | QmlDesigner: Implement transition toolThomas Hartmann2020-04-246-2/+545
| | | | | | | | | | | | | | | | | | | | | Implementing a custom tool to create transitions in flows. Change-Id: I721895c67084707bea8504c657ec9af2b5df2c22 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | QmlDesigner: Add setStartFlowItemThomas Hartmann2020-04-242-12/+49
| | | | | | | | | | | | | | | Change-Id: I6ad377bcca4e1db84a802909c1b5d8b9ccfe5a14 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 09:01:26 +0000