summaryrefslogtreecommitdiff
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* Improve edit view 3D "on top" logicqds/v1.4.0-rc1Mahmoud Badri2019-12-1314-144/+283
| | | | | | | | | | | | | | | | | | | | | | - Proxy dialog removed - When the QDS window is minimized/maximized, the edit view 3D follows. The opposite is not true (edit view 3D can be minimized separately). - Edit view 3D is always on top of QDS window. Only exception is when a popup is shown (so that the user can handle the popup). - External apps go normally on top of the edit view 3D. Known (non critical) issues: - Activating the edit view 3D doesn't raise() the QDS window, so if an external app is on top of the edit view 3D then the view is clicked, the external app will be in between the view and the QDS window. - Closing the edit view 3D from the x button doesnt work (causes a restart). This is not in the scope of this commit. Task-number: QDS-1179 Change-Id: I1dd72590037be295b94735de96772307ba14c59c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix rotation resulting in NaN angle sometimesMiikka Heikkinen2019-12-131-0/+5
| | | | | | | Change-Id: I88f866c6649f7ec25bc96a7393d0930685e5382b Fixes: QDS-1341 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Properly update 3D edit view cameras and lightsMiikka Heikkinen2019-12-135-26/+57
| | | | | | | | | | | Now edit view will create and remove cameras and light gizmos properly when cameras and lights are added or deleted. Change-Id: I858752c1410f3a40ea2adaf538c281aaee94ec58 Fixes: QDS-1267 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix material managerHenning Gruendl2019-12-111-4/+9
| | | | | | Task-number: QDS-1332 Change-Id: I70828c3ce584ab72115f92dda4a27341e00085e2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Use separate MouseArea3D to calculate drag vectorMiikka Heikkinen2019-12-1112-20/+92
| | | | | | | | | | | | | Using the MouseArea3D linked to gizmo to manage the drag leads to slight unwanted drift on the drag plane, as it moves with the gizmo. Fixed by using a helper MouseArea3D to calculate drag vector. Helper area's transform is set at mouse press time and is not changed during the drag. Change-Id: I50d3f738277bd34005c977423d114abc8dbed520 Fixes: QDS-1312 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Update selection box on parent changeMiikka Heikkinen2019-12-111-0/+4
| | | | | | | | | | Selection box geometry update sets explicit global transform for selection box root. The transform depends on the target node parent, so if the parent changes, the box needs to be updated. Change-Id: Iccf8b7e863bcfe541bbb4f60a4094739a7513e8d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix more warnings about unused parameters and functionsChristian Kandeler2019-12-101-0/+4
| | | | | Change-Id: I8b569fcf60a0a21c6828d612997bbba0f737c806 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add item layer propertiesHenning Gruendl2019-12-064-0/+433
| | | | | | | Task-number: QDS-1305 Change-Id: I0d6a390ac05f6bda9f11ecb25b461c95519d8bb3 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: Add control for material managementHenning Gruendl2019-12-063-0/+275
| | | | | | | | | | - Create EditableListView for material management - Add id list functionality to PropertyEditorValue Task-number: QDS-1258 Task-number: QDS-1256 Change-Id: I1694648b36845b22f4773ecbd578d77c22c934e2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Wizard: Fix test registration to ctestChristian Stenger2019-12-051-4/+4
| | | | | Change-Id: Ia30cdf1ce690a2ebbc2e991e4e3f8a029e4768ed Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Fix selection box size calculationsMiikka Heikkinen2019-12-042-5/+21
| | | | | | | | | | | | Selection box for zero size items ended up being infinite, which broke some functionality like fit to camera. Now boxes should be correctly zero sized for non-model items. This also fixes issues with parent box size if it has zero size children. Change-Id: I3c8fae3ee971fbb0cf9e0de2615c107ce97a76f8 Fixes: QDS-1287 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix planar scaling randomly setting the third axis to zeroMiikka Heikkinen2019-12-041-3/+3
| | | | | | | | | | All the math before checking if the scaling axis is zero can cause enough rounding errors to make qFuzzyIsNull to not think the value is zero anymore, so check increase the check range. Change-Id: I776d44886f061be6c1fd91c09eb8efcfb29e0936 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix 3D edit gizmos orientation and rotation orderMiikka Heikkinen2019-12-0410-32/+93
| | | | | | | | | | When selected node has non-default rotation order or orientation, gizmos need to account for that. Change-Id: Ie3817fd057b43f708ac1feea3e98e1e44f56d66a Fixes: QDS-1290 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Debugger/Dumper: Fix dumping CPlusPlus::TokenNikolai Kosjar2019-12-041-1/+1
| | | | | Change-Id: I368f5227ecb675a653f65d76e83622305390b5ff Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QmlDesigner: Make imported models selectableMiikka Heikkinen2019-12-035-15/+53
| | | | | | | | | | | | Import creates an opaque Component, which can contain one or more pickable models. We mark all instanceless models pickable according to the parent instance pickable status and specify the parent instance as the pick target using a dynamic property. Change-Id: I05b96ee48eb8f246c50b2254d620b621e2437aa5 Fixes: QDS-1282 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Do not zoom camera when changing viewMahmoud Badri2019-12-035-14/+15
| | | | | | | | | When changing the view by clicking the axis helper, maintain the current view camera zoom Task-number: QDS-1274 Change-Id: Icb502bd70da1e6348be90a52885366393ea072c6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Implement multiselection for edit 3D viewMiikka Heikkinen2019-11-288-140/+273
| | | | | | | | | Multiselection works in 3D edit view with ctrl-click just like it does on the Design Studio. Change-Id: I266f2de11758bed064f44dd97cd79189e3e1f831 Fixes: QDS-1265 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Use proxy dialog for 3D edit viewThomas Hartmann2019-11-2813-4/+251
| | | | | | | | | | | | | | | | | | | To integrate the 3D edit view in the qml2puppet process, we create a dialog in the Qt Creator process. This dialog acts as a proxy that manages the actual window. For this I introduced a new command that allows showing, hiding, resizing and moving of the 3D edit view. The 3D edit view always follows the proxy dialog. During moving and resizing we hide the window to avoid artefacts. At this point in time the proxy widget is a dialog, but it could also be a dockwidget or any other QWidget in the future. Task-number: QDS-1179 Change-Id: I67ccab49eb2de9ba23098a67b2f9577f6c7fd3ac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner Removed some debug outputv4.11.0-rc1Aleksei German2019-11-271-1/+0
| | | | | Change-Id: Iaa03c5783cc76b94364eda184d439024c35c4102 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix RealSpinBoxInputHenning Gruendl2019-11-271-0/+1
| | | | | | | | | | Fixes RealSpinBoxInput scroll behavior. Without this change the RealSpinBox would block the ScrollView from getting mouse wheel events, which means whenever the mouse is hovering over a RealSpinBox the ScrollView can't be scrolled via the mouse wheel. Change-Id: I4533e36700fc2652a9c246a0e30613c71258edaf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Implement 3D edit view top controls UIMahmoud Badri2019-11-2617-35/+122
| | | | | | | | | | | | | Implement global/local, projection type, and default light controls UI. Also small tweaks: - Fixed ortho. camera near clipping - Grid color darkened a bit - Selection rect color changed to yellow Task-number: QDS-1250 Change-Id: I03cf2023ee1b8a6a0768e4dbf7d6fee621a25ce2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix editable ComboBox popup selectionHenning Gruendl2019-11-261-1/+18
| | | | | | | | | | This patch introduces a new state called 'popup' to disable text editing while the popup is opened and enables text editing whenever the popup is closed. Task-number: QDS-1262 Change-Id: I74ad4723d2cfe81447e94c37e9ba1f0913790d97 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Offset move/scale gizmo label in screen spaceMiikka Heikkinen2019-11-261-2/+1
| | | | | | | | | Offsetting in scene space resulted in label being inconsistent distance away from the object, depending on zoom and angle. Change-Id: Ief555de664c042bb1a5c93af0ee7e5a1c3e7ce0a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Block selection of hidden objectsMiikka Heikkinen2019-11-263-12/+51
| | | | | | | | | If eyeball is turned off for object, it shouldn't be pickable in 3D edit view. Change-Id: Ib9308aaaecc822f448591f249bd96ffb5d0c9c48 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add UX approved gradient background to 3D edit viewMiikka Heikkinen2019-11-251-17/+34
| | | | | | | Change-Id: I18b976324f57cf559a43d9ff239796cf25b3cb2f Fixes: QDS-1202 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix sticky popupsHenning Gruendl2019-11-253-6/+12
| | | | | | Task-number: QTCREATORBUG-23102 Change-Id: I53a2abc67221b714e2b4ff7d09045f0b817b59d2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Center on selection box when fit tool is used in 3D EditMiikka Heikkinen2019-11-255-8/+31
| | | | | | | | | Instead of centering edit camera on selected object, center it on the selection box, which includes child objects. Change-Id: I7315a4bcfffc74e72a2b21d0a04fc99ee9f4f3c3 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Implement group selection boxes in 3D edit viewMiikka Heikkinen2019-11-227-65/+210
| | | | | | | | | | | | Object's selection box now includes the bounds of all of its descendants. Selection boxes of immediate children of a selected object are also drawn. Individual/group selection buttons also now work as expected. Change-Id: Ice7ef9a536e32c6bb6da70fe23bf0a38e72c14f8 Fixes: QDS-1210 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Implement fit selection button in 3D edit viewMiikka Heikkinen2019-11-229-8/+51
| | | | | | | | | Shortcuts for scale and move were also updated to correct ones. Change-Id: Iffcad0c81475553003962e65dc059879a237546e Fixes: QDS-1235 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Implement axis helper on 3D edit viewMiikka Heikkinen2019-11-2211-9/+297
| | | | | | | | | | Axis helper shows up on top right corner of 3D edit view. Clicking on axis helper arms zooms camera on that side of the selected object. Change-Id: Ibd81a933036f7965f825e3dc97ad7156da62e14c Fixes: QDS-1205 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix build errorMiikka Heikkinen2019-11-221-0/+3
| | | | | Change-Id: I53d425d0b6f4e66c09bd988bd188218cbf51a99c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* QmlDesigner: Implement selection box to 3D edit viewMiikka Heikkinen2019-11-229-9/+381
| | | | | | | Change-Id: Ib0b13ecd7946e3b7da8ed06d4f5965e06e51a152 Fixes: QDS-1210 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix issues with MouseArea3D deactivation detectionMiikka Heikkinen2019-11-224-9/+17
| | | | | | | | | | | Existing mouse grab is now released when MouseArea3D is deactivated or set to no longer grab the mouse. Various gizmos were also set to follow MouseArea3D's dragging property instead of keeping track of drag themselves. Change-Id: I49f968f20b26eb222fc8635b943e9144073fb164 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add UX approved light icons for 3D editviewMiikka Heikkinen2019-11-2210-27/+42
| | | | | | | | | Light icons have a color overlay that indicates light color. Change-Id: I5f6d80f63d0916dd7cb7b2d5345d586aacd550ef Fixes: QDS-1209 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Some fixes to edit 3D after UX reviewMiikka Heikkinen2019-11-223-7/+6
| | | | | | | | | | | - Slightly larger cam plane rotate ring to avoid overlap - Scale tool is always local - Little more transparent and borderless light/cam icons when selected - Center light/cam icon on the object Change-Id: Icb24d89fb3ea852b139677aebe797881a12e474a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Implement better camera navigation in 3D edit viewMiikka Heikkinen2019-11-2212-142/+300
| | | | | | | | | | | | Edit camera is now controlled as in Qt 3D Studio: ALT + left button orbits camera. ALT + middle button pans camera. ALT + right button zooms camera. Wheel zooms camera. Task-number: QDS-1206 Change-Id: Ia72644073d172b00483ceed8bcc5ffb8dce68741 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Update Russian translationSergey Belyashov2019-11-211-1005/+2438
| | | | | | Change-Id: Idb0d3ab7aaf49cb050e246ec8324ab2c1add8057 Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* QmlDesigner: Implement proper helper grid for 3D edit viewMiikka Heikkinen2019-11-187-13/+346
| | | | | | | Change-Id: I9e33218d4b1528610155c5fb9bf94a9597ee23df Fixes: QDS-1204 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Finalize camera visualization in edit 3D viewMiikka Heikkinen2019-11-188-15/+24
| | | | | | | | | | | | Added the UX approved camera icons, which will now turn transparent and ignore mouse events when camera is selected so they do not interfere with transform gizmos. Frustum visualization also changes color according to selection state. Change-Id: Id77066d9abb2b54696fae833201236afa238486a Fixes: QDS-1208 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Implement RotateGizmo for 3D edit viewMiikka Heikkinen2019-11-188-25/+629
| | | | | | | | | | Added a gizmo for rotating selected object either freely or locked around X, Y, Z, or camera axis. Change-Id: Ib43c7dd3fc0f49f384d5920fce21ea932c4fc90d Task-number: QDS-1196 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Wizards: Fix Qt Quick2 Extension wizardChristian Stenger2019-11-151-1/+12
| | | | | | | | | | | Show kits selection page already while configuring the project via wizard instead of falling back to the target selection after the project had been opened. Regression with 6c9f75ff4a6a98cb45fa48928b1d8ef25d3d14ad. Change-Id: I9bf70f306dde3a570ab4ca3e4380040d6c6e4e23 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix filename spelling in qrcHenning Gruendl2019-11-131-1/+1
| | | | | Change-Id: I90fb27156d51ad5160b57ea476017a17dc757043 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* QmlDesigner Add Binding Editor support to StatesAleksei German2019-11-131-0/+3
| | | | | Change-Id: I3ccce5e2bfbbfa0dfba1e438d527fa18348005b5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: PropertyEditor TextSection cleanupHenning Gruendl2019-11-135-8/+97
| | | | | Change-Id: I042f38303aad016d939a39c7a638d330fca2ba58 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Implement EditView3D's toolbarMahmoud Badri2019-11-1323-15/+172
| | | | | | | | | | Move and scale shortcuts are temporarily set to (M) and (T) instead of (W) and (R) to avoid interference with the WASD RF controller Task-number: QDS-1201 Change-Id: Ia7ebb6c0d39880be6b87b12d0a4a1d16638fd141 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Implement DnD 3D objects from the item library to the EditView3DMahmoud Badri2019-11-1212-0/+170
| | | | | | | | | | Proof of concept drag and drop implementation. Basic functionality working but needs polish. Task-number: QDS-1132 Change-Id: Ie3b9e80de9a414c4955d6e38daf338045bc1e614 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Qml2Puppet: Compile fixhjk2019-11-111-0/+2
| | | | | | | Add missing #include. Amends db7087225de. Change-Id: I8d9147fb788ee47b37dac9f347a6828250eec1e0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Implement camera frustum visualization for edit 3DMiikka Heikkinen2019-11-1111-9/+348
| | | | | | | Task-number: QDS-1208 Change-Id: I3241fcdc68d01666a2536df32f170cd898cbd7af Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Forward ComboBox TextInputHenning Gruendl2019-11-081-0/+2
| | | | | Change-Id: I22b0992808b2a39de1baa45452351099b7d78ba0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* macOS: Fix opening and running in terminal with zshEike Ziller2019-11-081-2/+16
| | | | | | | | We need to read different startup files for zsh. Task-number: QTCREATORBUG-21712 Change-Id: Id10b185e3957b44423e847114adc1b3085a8089d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
View Lorry Controller Status