summaryrefslogtreecommitdiffstats
path: root/editorlib/qml
Commit message (Collapse)AuthorAgeFilesLines
* Fix 'redo' tooltip on the tool barHEADmasterMegidd Git2018-08-071-1/+1
| | | | | | | | | The tool tip of the redo button is fixed by replacing the copy-&-pasted "undoText" identifier with "redoText". Change-Id: I34325ad700b9b88fb01111272664c368903a0ba7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change editor save format from QML to JSON + QGLTF when supportedMiikka Heikkinen2016-12-161-2/+8
| | | | | Change-Id: If2bf099b5e77b3350ee5670e968cfa9a96d563b2 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add option to GLTF export selected entity instead of whole sceneMiikka Heikkinen2016-11-101-4/+29
| | | | | Change-Id: I1526c1cc17722eb1f4745b0ffd69fecdc6c9c9dd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* New export GLTF dialogMiikka Heikkinen2016-11-084-25/+246
| | | | | | | Allows setting export options and more intuitive scene name handling. Change-Id: Iad586760bcdb83ae24ef3118139fb20aac1a56d1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add ability to export the scene as a GLTF sceneMiikka Heikkinen2016-11-042-0/+28
| | | | | | | | | | This functionality requires GLTF exporter plugin support from Qt3D, which isn't yet available. Therefore it is ifdeffed out by default. Uncomment the relevant define in editorlib.pro to enable. Change-Id: Iad26d12cbb40c5ca366d98cd26e51786f21803fb Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update icons and shortcutsMiikka Heikkinen2016-09-156-120/+242
| | | | | Change-Id: Ibe9bdc5f44b6ad397397a2025adb867be54eb289 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable dragging via helper arrowsMiikka Heikkinen2016-09-153-4/+14
| | | | | | | Also added local/global helper arrow toggle. Change-Id: I48552e06388ccc14a530acb8f719efa5c4fbfa0b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add a simple way to move and orient camera to six main axis pointsMiikka Heikkinen2016-09-144-1/+88
| | | | | | | | The selection affects the active camera, whether it is the freeview or a scene camera. Change-Id: I605696208443b5cf889e65c17d5e31fb28008ace Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Display world coordinates of the mouse cursor on toolbarMiikka Heikkinen2016-09-095-17/+41
| | | | | | | | | If not drag scaling/rotating/translating an entity, shows the coordinate on helper plane. When dragging, shows the drag handle coordinate. Change-Id: I50fd226bfb323d0d4ed4df24efc61aacb98c4fd2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Automatically add the wizard generated scene to RESOURCESMiikka Heikkinen2016-07-011-6/+3
| | | | | Change-Id: I8a6db83ed51fac9fee44f6acd8d81c2f6e68c804 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Open the correct scene when opening the embedded editorMiikka Heikkinen2016-06-292-11/+23
| | | | | Change-Id: Ie308ea0bc5024c539caca4e4d514bbf214c9dc6e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Creator plugin launches embedded editorMiikka Heikkinen2016-06-2842-959/+1055
| | | | | | | | There's not yet any interaction between embedded editor and creator, such as opening the correct file. Change-Id: I1b8507ca209ba2387e0c1dfa8657bd45560a671a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix the behavior of TextInput field inside treeviewMiikka Heikkinen2016-06-225-24/+28
| | | | | | | | | Now the TextInput field properly hides when it should. It also no longer hogs the focus when hidden. Change-Id: I634befb62af4ba7f8d5822d3128df36b54141f4e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Use QtQuick.Controls 2.0 ApplicationWindowMiikka Heikkinen2016-06-211-2/+3
| | | | | | | Now that menubar is gone, we don't need to use old version anymore. Change-Id: I104f877caa1bfb9a4abebb834ed2014fcfc877cb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Added new image for invalid drag and removed old unused imagesTitta Heikkala2016-06-211-2/+1
| | | | | Change-Id: I2de6149d77f949cbc6ed43e7547021639881166f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash when undo/redoing the deletion of the last cameraMiikka Heikkinen2016-06-201-1/+1
| | | | | | | | While redoing the camera deletion, a new command was pushed into the undo stack, which corrupted the stack. Change-Id: I0dd04a67f4811fc7a1dacdac3397e68f58ae48d3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix index corruption related to entity removalMiikka Heikkinen2016-06-201-4/+0
| | | | | | | | | | | The main problem was the selection that was done when the selected entity was removed. Now we change the selection asynchronously in that case, which ensures the selection model on the qml side won't try to access invalid indexes. Change-Id: Ieaf984eed5c74a5d3b595aeb04d23e26f66a0db9 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Keep tree view scroll position when model is resetMiikka Heikkinen2016-06-171-0/+7
| | | | | | Change-Id: Idf2adb94a1d80edba022545d7d1637c0c4cdd6e5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fixed apply-cancel for languageTomi Korpipää2016-06-161-6/+12
| | | | | | Change-Id: Ib6be8884d5076a706092ded79469870a75fc0115 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change selection box colorMiikka Heikkinen2016-06-161-1/+1
| | | | | | Change-Id: Id95b10fb81b0c21b77d374c6f4dafd739b675496 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Changed snap to grid to snap corners to the grid.Miikka Heikkinen2016-06-161-0/+8
| | | | | | | | | Mouse modifier keys ctrl and alt can now also be stacked on translate and scale. Change-Id: I5252b9d98482e7ea9ff7244e1a51239d68dbdf31 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Set default folders to dialogsTitta Heikkala2016-06-161-0/+2
| | | | | | | | The default folders need to be set also for dialogs opened after unsaved dialog. Change-Id: I476b1b09a84934c4a07727f0ec82a6548c73667d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Changed text alignment for texture selection buttonTitta Heikkala2016-06-161-0/+8
| | | | | Change-Id: I8e60b6ee1482c0b1fcb605251ac2bd5ded0dc8a7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Added autosave flag to persistent settingsTomi Korpipää2016-06-151-20/+53
| | | | | | | | Fixed apply-cancel functionality Change-Id: Ibc7838973e0fa509079b1fc47dffa6f355518b9d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Styled threeview's scrollbarTitta Heikkala2016-06-141-0/+30
| | | | | Change-Id: I9677ab85c0bb867442157ee516572be199928577 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Multiselect refactoringMiikka Heikkinen2016-06-144-79/+59
| | | | | | | | | Now store multiselection status and list on c++ side only to reduce problems from keeping them properly synchronized. Change-Id: If3277bb1eca5ffc7a7749e300e0cc6de4ccf9df2 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fixed context menu paste in 3D viewTomi Korpipää2016-06-142-13/+14
| | | | | | Change-Id: I2842079120aafa8046b96629acdb7b97d8762319 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Default folder bug fixTomi Korpipää2016-06-132-4/+8
| | | | | | | | Property bindings always set all folders to default after restart. Now folders are reset to default only when default folder is changed. Change-Id: I8b067d64e3fecee414fdd9297fee1ad91eeee34f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update translationsTitta Heikkala2016-06-131-8/+8
| | | | | | | | Updated strings for unsaved changes dialogs. Also updated sentence case for Finnish. Change-Id: Iaae2918f6544937eea7291ecfbf109e4a0395a4d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Set FileDialog folderTomi Korpipää2016-06-135-14/+80
| | | | | | | | | Set default folder for file dialogs. There are be three folders dialogs should remember: save/load, import and texture. Change-Id: Id5acce311f1174188263684c80e15549a8310cd5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Persistent settings support addedTomi Korpipää2016-06-133-13/+60
| | | | | | | Note: The rest will be added in a separate task Change-Id: I0f6f0fb345e35d4fb97737d61a4c25f7aac48a11 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Show dialog on "new" and "open" if there are unsaved changesTomi Korpipää2016-06-101-4/+46
| | | | | | Change-Id: Id36f925f911e0c08feca7944e6874c4b8cc4679b Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Removed deselectionTomi Korpipää2016-06-101-18/+3
| | | | | Change-Id: I966ca8d7cd59c0510647252b0c1808e35e61df50 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change group box to always tightly contain group contentsMiikka Heikkinen2016-06-102-3/+14
| | | | | | | | | | Added drag handle for actual group/mesh translation point for groups/meshes that are not centered around their translation point. For additional clarity, added a line between the selection box translation handle and group/mesh translation point handle. Change-Id: I25146a68472f3f1b3703cbbcc1a60464d4c87260 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Changed treeview branch indicatorTitta Heikkala2016-06-101-0/+15
| | | | | | Change-Id: I9e9ad5944f4973f6f0aec19238cc227b2ec9ffc3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Prevent multiselecting scene rootTomi Korpipää2016-06-101-2/+9
| | | | | | Change-Id: I141557a593a2a2e186ec4728fdeb90c6029f2c8e Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change ToolSeparator widthTitta Heikkala2016-06-101-1/+1
| | | | | Change-Id: I90cea047e6c01f054bcecf1f883318ad755070ac Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix camera projection type title appearanceTitta Heikkala2016-06-101-0/+14
| | | | | Change-Id: I1cc80eda2d635a6c0eb1d271fdc210240fe65229 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fixed helper plane orientation on "new"Tomi Korpipää2016-06-101-2/+1
| | | | | Change-Id: I83dcb396823d901d27d62182cdbe1e8a82c71d95 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Make grouping work correctly with multiselected parents and childrenMiikka Heikkinen2016-06-091-4/+15
| | | | | Change-Id: Ie0a933d4ab2adf699ea2b343aa744e1b6d7a677c Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Add saved file to application titleTitta Heikkala2016-06-091-1/+8
| | | | | | Change-Id: Ic1b068425a075be1e927c93ab6d1d6559e106c5b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Support for copy, cut and paste in tree viewTomi Korpipää2016-06-093-7/+40
| | | | | Change-Id: Id9f42a3b2b190b6eab0506ff74030e959ef59731 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fixed deleting and duplicating multiselectionTomi Korpipää2016-06-092-6/+16
| | | | | Change-Id: I24f98923b518966a7b7571eed7194ae75ddbe6cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fixed group selection context menuTomi Korpipää2016-06-091-1/+0
| | | | | | Change-Id: I159df3add5a3bf4f6e6f46df65db573d3181e553 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make translate handle to be on top of scale handles alwaysMiikka Heikkinen2016-06-081-0/+1
| | | | | Change-Id: Idf21a8df5e3aad8457b29daa86951062d403866f Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Group box changed to encompass all grouped entitiesMiikka Heikkinen2016-06-082-6/+13
| | | | | | | | | | Related changes also included: - When grouping items, the new group will be centered to items - Fixes to missing drag handles on group box and extra selection boxes after multiselection. Change-Id: I323324d674021a5487fed0953bea67012cb73abf Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Update menusTitta Heikkala2016-06-082-12/+5
| | | | | | | New menu icons added. Removed unnecessary title from EntityMenu. Change-Id: I74697face4e65500bb1d33702798e233fe78cbc9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Open texture selection dialog also from texture imageTitta Heikkala2016-06-071-0/+4
| | | | | Change-Id: I7486e30aad664f8262fae95ce857c4cf9a002d6b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Support for copy, cut and paste in 3D viewTomi Korpipää2016-06-072-1/+100
| | | | | | Change-Id: Ifb8ef79820aa5d25c25354ddcf6c3056777753f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* New toolbar buttons and settings dialogTitta Heikkala2016-06-065-191/+286
| | | | | | | | | | Introduced new settigs dialog that has some of the old menu items. Rest of the old menu items are moved to toolbar. The old menu is removed altogether. Change-Id: Idf8a9aab4217c9bc5b39890a3cca24cf9f35888c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>